Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dumpfields=true option by using ESMF_FieldBundleWrite #2355

Merged
merged 26 commits into from
Jul 30, 2024
Merged

Fix dumpfields=true option by using ESMF_FieldBundleWrite #2355

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ef29b98
Update .gitmodules
DusanJovic-NOAA Feb 9, 2024
ea477ee
Update FV3. Use spack-stack 1.6.0 on Hera to test updates with esmf 8…
DusanJovic-NOAA Feb 15, 2024
37b0f3c
Update FV3
DusanJovic-NOAA May 21, 2024
aaa891a
Merge remote-tracking branch 'origin/develop' into dump_cpl_fields
DusanJovic-NOAA May 21, 2024
9370328
Update FV3
DusanJovic-NOAA Jul 3, 2024
afe3675
Merge remote-tracking branch 'origin/develop' into dump_cpl_fields
DusanJovic-NOAA Jul 3, 2024
0b6e6be
Update FV3
DusanJovic-NOAA Jul 5, 2024
821d3cd
Merge remote-tracking branch 'origin/develop' into dump_cpl_fields
DusanJovic-NOAA Jul 5, 2024
0582ff7
Update FV3
DusanJovic-NOAA Jul 5, 2024
e8819dc
Update rt_utils.sh. Set ECF_HOST on wcoss2 explicitly
DusanJovic-NOAA Jul 8, 2024
bec3865
Update FV3
DusanJovic-NOAA Jul 9, 2024
f567133
Update FV3
DusanJovic-NOAA Jul 16, 2024
74baa18
Merge remote-tracking branch 'origin/develop' into dump_cpl_fields
DusanJovic-NOAA Jul 16, 2024
3601518
Update FV3
DusanJovic-NOAA Jul 26, 2024
d5e8925
Merge remote-tracking branch 'origin/develop' into dump_cpl_fields
DusanJovic-NOAA Jul 26, 2024
b61a9d9
ORT Jobs Completed.
epic-cicd-jenkins Jul 26, 2024
ba4c3ee
add gaea RT log passed
FernandoAndrade-NOAA Jul 29, 2024
a5e5191
add derecho RT logs: passed
zach1221 Jul 29, 2024
04d06a8
add hercules RT logs: passed
zach1221 Jul 29, 2024
4124fe8
Add empty test_changes.list
DusanJovic-NOAA Jul 29, 2024
2f60de8
add orion RT logs: passed
zach1221 Jul 29, 2024
9dce719
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jul 29, 2024
f5de770
add hera RT log passed
FernandoAndrade-NOAA Jul 29, 2024
9fc184a
Acorn RT Log: Passed
BrianCurtis-NOAA Jul 29, 2024
1b5c5b7
add jet RT log passed
FernandoAndrade-NOAA Jul 29, 2024
fda7d16
Revert .gitmodules and update FV3
DusanJovic-NOAA Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/DusanJovic-NOAA/fv3atm
branch = dump_cpl_fields
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 6 files
+1 −1 atmos_model.F90
+1 −1 ccpp/data/GFS_typedefs.meta
+167 −45 cpl/module_cap_cpl.F90
+1 −1 cpl/module_cplscalars.F90
+20 −10 fv3_cap.F90
+7 −2 module_fcst_grid_comp.F90
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Jul 24 20:10:07 UTC 2024
Fri Jul 26 20:30:45 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 287.098363
0: The maximum resident set size (KB) = 1449616
0: The total amount of wall time = 280.977475
0: The maximum resident set size (KB) = 1454304

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 987.462605
0: The maximum resident set size (KB) = 1413952
0: The total amount of wall time = 966.539273
0: The maximum resident set size (KB) = 1439060

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 254.621474
0: The maximum resident set size (KB) = 1413152
0: The total amount of wall time = 249.254197
0: The maximum resident set size (KB) = 1437604

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 249.757061
0: The maximum resident set size (KB) = 1432096
0: The total amount of wall time = 249.618477
0: The maximum resident set size (KB) = 1432416

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 249.818760
0: The maximum resident set size (KB) = 1404272
0: The total amount of wall time = 252.799465
0: The maximum resident set size (KB) = 1431152

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 254.379486
0: The maximum resident set size (KB) = 1415716
0: The total amount of wall time = 246.985477
0: The maximum resident set size (KB) = 1447148

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2835607/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2494518/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 252.840901
0: The maximum resident set size (KB) = 1413640
0: The total amount of wall time = 249.919086
0: The maximum resident set size (KB) = 1434244

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Jul 24 21:22:39 UTC 2024
Elapsed time: 01h:12m:33s. Have a nice day!
Fri Jul 26 21:54:52 UTC 2024
Elapsed time: 01h:24m:07s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Jul 24 19:03:11 UTC 2024
Fri Jul 26 19:19:32 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1901665/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1506640/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -66,14 +66,14 @@ Moving baseline dbg_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 1364.396894
0: The maximum resident set size (KB) = 1503220
0: The total amount of wall time = 1333.999638
0: The maximum resident set size (KB) = 1540440

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1901665/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1506640/rst_rst
Checking test rst results ....
Comparing sfcf021.tile1.nc .....USING NCCMP......OK
Comparing sfcf021.tile2.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -135,14 +135,14 @@ Checking test rst results ....
Comparing RESTART/iced.2021-03-23-21600.nc .....USING NCCMP......OK
Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......OK

0: The total amount of wall time = 571.646799
0: The maximum resident set size (KB) = 1494576
0: The total amount of wall time = 724.841272
0: The maximum resident set size (KB) = 1538712

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1901665/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1506640/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.tile1.nc .........OK
Expand Down Expand Up @@ -205,11 +205,11 @@ Moving baseline std_base files ....
Moving RESTART/iced.2021-03-23-21600.nc .........OK
Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK

0: The total amount of wall time = 430.360696
0: The maximum resident set size (KB) = 1506724
0: The total amount of wall time = 520.811850
0: The maximum resident set size (KB) = 1511524

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Jul 24 20:10:06 UTC 2024
Elapsed time: 01h:06m:56s. Have a nice day!
Fri Jul 26 20:30:45 UTC 2024
Elapsed time: 01h:11m:14s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Jul 24 16:28:05 UTC 2024
Fri Jul 26 16:44:32 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3909363/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268113/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving dynf000.nc .........OK
Expand All @@ -15,14 +15,14 @@ Moving baseline bit_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 1412.442409
0: The maximum resident set size (KB) = 740268
0: The total amount of wall time = 1470.646865
0: The maximum resident set size (KB) = 769104

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3909363/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268113/dcp_dcp
Checking test dcp results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -33,14 +33,14 @@ Checking test dcp results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2294.672242
0: The maximum resident set size (KB) = 705360
0: The total amount of wall time = 2296.345459
0: The maximum resident set size (KB) = 731460

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3909363/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268113/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving dynf000.nc .........OK
Expand All @@ -52,14 +52,14 @@ Moving baseline std_base files ....
Moving NATLEV.GrbF00 .........OK
Moving NATLEV.GrbF06 .........OK

0: The total amount of wall time = 2170.957201
0: The maximum resident set size (KB) = 715832
0: The total amount of wall time = 2252.359216
0: The maximum resident set size (KB) = 715680

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3909363/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_268113/thr_thr
Checking test thr results ....
Comparing dynf000.nc .....USING NCCMP......OK
Comparing dynf006.nc .....USING NCCMP......OK
Expand All @@ -70,11 +70,11 @@ Checking test thr results ....
Comparing NATLEV.GrbF00 .....USING CMP......OK
Comparing NATLEV.GrbF06 .....USING CMP......OK

0: The total amount of wall time = 2158.899518
0: The maximum resident set size (KB) = 704304
0: The total amount of wall time = 2288.966852
0: The maximum resident set size (KB) = 718224

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Wed Jul 24 19:03:10 UTC 2024
Elapsed time: 02h:35m:05s. Have a nice day!
Fri Jul 26 19:19:31 UTC 2024
Elapsed time: 02h:35m:00s. Have a nice day!
Loading
Loading