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

Combination CCPP-related PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output #2264

Merged
merged 27 commits into from
May 20, 2024
+2,500 −2,470
Merged

Combination CCPP-related PR for ozone diagnostics, metadata intent bugfixes, sfcsub.F landmask bugfix, and canopy resistance output #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8a3c3ea
update FV3 submodule pointer and .gitmodules for testing combo_20240503
grantfirl May 3, 2024
0677f8e
update FV3 submodule pointer
grantfirl May 6, 2024
84b7e85
update FV3 submodule pointer
grantfirl May 6, 2024
82db6fb
add metadata change in CMEPS to compile
grantfirl May 6, 2024
60ead43
update FV3
grantfirl May 7, 2024
51c6379
Merge branch 'develop' into combo_20240503
grantfirl May 7, 2024
03f0949
add initialization fixes in ccpp/physics and update the NUOPC interfa…
grantfirl May 9, 2024
8c0e521
update NoahMP files from CCPP physics PR#205 in NOAHMP-interface/noahmp
grantfirl May 9, 2024
86e348a
Merge branch 'develop' into combo_20240503
grantfirl May 9, 2024
14be469
add test logs
grantfirl May 10, 2024
9cb281e
Merge branch 'develop' into combo_20240503
grantfirl May 13, 2024
c1a0df2
update NOAHMP-interface and FV3 submodule pointer
grantfirl May 15, 2024
010d890
update FV3 submodule
grantfirl May 16, 2024
d6f100f
Merge branch 'develop' into combo_20240503
grantfirl May 16, 2024
53ca93c
Update bl_date.conf
zach1221 May 16, 2024
c79ec3b
add hera RT log passed
FernandoAndrade-NOAA May 17, 2024
08dc34a
add gaea RT log passed
FernandoAndrade-NOAA May 17, 2024
647a7c5
add jet RT log passed
FernandoAndrade-NOAA May 17, 2024
ec83557
Acorn RT Log: Passed
BrianCurtis-NOAA May 17, 2024
2849179
WCOSS2 RT Log: Passed
BrianCurtis-NOAA May 17, 2024
5be89e1
add hercules RT logs: passed
zach1221 May 17, 2024
5060aeb
add orion RT logs: passed
zach1221 May 17, 2024
a30c62e
add derecho RT logs: passed
zach1221 May 17, 2024
b78b259
add control_p8_gnu ORT logs: passed
zach1221 May 17, 2024
73c981c
add regional_control_gnu ORT logs: passed
zach1221 May 17, 2024
69ccd1b
add cpld_control_gnu ORT logs: passed
zach1221 May 17, 2024
64dd0b4
update submodule pointers and .gitmodules after testing
grantfirl May 20, 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
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 1 files
+1 −1 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 3 files
+5 −3 ccpp/data/GFS_typedefs.F90
+2 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
2 changes: 1 addition & 1 deletion NOAHMP-interface/noahmp
Open in desktop
Submodule noahmp updated 6 files
+19 −3 drivers/ccpp/noahmpdrv.F90
+8 −0 drivers/ccpp/noahmpdrv.meta
+39 −15 drivers/ccpp/sfc_diff.f
+1 −1 drivers/nuopc/lnd_comp_driver.F90
+3 −0 drivers/nuopc/lnd_comp_types.F90
+7 −3 src/module_sf_noahmplsm.F90
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240503
export BL_DATE=20240516
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 @@
Mon May 13 18:14:19 UTC 2024
Thu May 16 20:24:57 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 270.538118
0: The maximum resident set size (KB) = 1254096
0: The total amount of wall time = 278.785657
0: The maximum resident set size (KB) = 1253096

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 975.476688
0: The maximum resident set size (KB) = 1230856
0: The total amount of wall time = 945.032567
0: The maximum resident set size (KB) = 1233484

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 237.920448
0: The maximum resident set size (KB) = 1231760
0: The total amount of wall time = 244.990573
0: The maximum resident set size (KB) = 1232508

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 238.597717
0: The maximum resident set size (KB) = 1233284
0: The total amount of wall time = 241.154280
0: The maximum resident set size (KB) = 1233296

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 237.803525
0: The maximum resident set size (KB) = 1234508
0: The total amount of wall time = 242.646838
0: The maximum resident set size (KB) = 1233060

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 241.082583
0: The maximum resident set size (KB) = 1232320
0: The total amount of wall time = 263.767716
0: The maximum resident set size (KB) = 1233204

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_197061/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 = 246.042458
0: The maximum resident set size (KB) = 1232080
0: The total amount of wall time = 246.202485
0: The maximum resident set size (KB) = 1231200

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon May 13 19:16:46 UTC 2024
Elapsed time: 01h:02m:28s. Have a nice day!
Thu May 16 21:50:50 UTC 2024
Elapsed time: 01h:27m:39s. 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 @@
Tue May 14 03:58:00 UTC 2024
Fri May 17 15:45:56 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1600376/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 = 1357.491643
0: The maximum resident set size (KB) = 1368672
0: The total amount of wall time = 1313.057110
0: The maximum resident set size (KB) = 1342956

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1600376/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 = 388.602017
0: The maximum resident set size (KB) = 1356348
0: The total amount of wall time = 518.573154
0: The maximum resident set size (KB) = 1341724

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1600376/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 = 392.294030
0: The maximum resident set size (KB) = 1358828
0: The total amount of wall time = 393.159431
0: The maximum resident set size (KB) = 1342660

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue May 14 04:56:24 UTC 2024
Elapsed time: 00h:58m:24s. Have a nice day!
Fri May 17 16:50:15 UTC 2024
Elapsed time: 01h:04m:19s. 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 @@
Tue May 14 12:09:43 UTC 2024
Fri May 17 13:09:07 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_440332/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/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 = 1347.763107
0: The maximum resident set size (KB) = 583388
0: The total amount of wall time = 1380.751535
0: The maximum resident set size (KB) = 575872

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_440332/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/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 = 2795.464199
0: The maximum resident set size (KB) = 541676
0: The total amount of wall time = 2250.847202
0: The maximum resident set size (KB) = 545220

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_440332/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/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 = 2362.646234
0: The maximum resident set size (KB) = 541132
0: The total amount of wall time = 2153.300954
0: The maximum resident set size (KB) = 541236

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_440332/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_959654/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 = 2378.042584
0: The maximum resident set size (KB) = 541716
0: The total amount of wall time = 2143.988793
0: The maximum resident set size (KB) = 542088

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue May 14 14:52:00 UTC 2024
Elapsed time: 02h:42m:17s. Have a nice day!
Fri May 17 15:35:34 UTC 2024
Elapsed time: 02h:26m:28s. Have a nice day!
Loading
Loading