Skip to content

Commit

Permalink
Merge branch 'develop' into combo_20240503
Browse files Browse the repository at this point in the history
  • Loading branch information
@grantfirl
grantfirl committed May 16, 2024
2 parents 010d890 + 1c6b4d4 commit d6f100f
Show file tree
Hide file tree
Showing 20 changed files with 2,629 additions and 2,123 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ set(JEDI_DRIVER OFF CACHE BOOL "Enable JEDI as top level driver")
set(CMEPS_AOFLUX OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
set(PDLIB OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
set(CDEPS_INLINE OFF CACHE BOOL "Enable CDEPS inline capability")
set(HYDRO OFF CACHE BOOL "Enable hydrostatic set")

set(CMAKE_Platform $ENV{CMAKE_Platform})
if(CMAKE_Platform)
Expand Down Expand Up @@ -122,6 +123,7 @@ message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
message("CDEPS_INLINE ..... ${CDEPS_INLINE}")
message("HYDRO ........... ${HYDRO}")

message("")

Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 4 files
+8 −1 CMakeLists.txt
+1 −1 atmos_cubed_sphere
+4 −2 ccpp/CMakeLists.txt
+37 −16 io/post_fv3.F90
6 changes: 4 additions & 2 deletions NOAHMP-interface/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ endif()

#------------------------------------------------------------------------------
# Add model-specific flags for C/C++/Fortran preprocessor
add_definitions(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM)
add_definitions(-DINTERNAL_FILE_NML)
if (NOT HYDRO)
add_definitions(-DMOIST_CAPPA -DUSE_COND)
endif()
add_definitions(-DINTERNAL_FILE_NML -DNEMS_GSM)

#------------------------------------------------------------------------------
# NOAHMP
Expand Down
8 changes: 8 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,14 @@ export EXTERNAL_IC=.true.
export MAKE_NH=.true.
export MOUNTAIN=.false.
export NA_INIT=1
export DO_VORT_DAMP=.true.
export HYDROSTATIC=.false.
export KORD_XX=9
export KORD_TM=-9
export D_CON=1.
export HORD_XX=5
export HORD_DP=-5
export HORD_TR=8

# Radiation
export DO_RRTMGP=.false.
Expand Down
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Sun May 12 12:30:46 UTC 2024
Mon May 13 18:14:19 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_209637/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 274.685635
0: The maximum resident set size (KB) = 1268520
0: The total amount of wall time = 270.538118
0: The maximum resident set size (KB) = 1254096

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_209637/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 961.766801
0: The maximum resident set size (KB) = 1234336
0: The total amount of wall time = 975.476688
0: The maximum resident set size (KB) = 1230856

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_209637/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 239.860027
0: The maximum resident set size (KB) = 1250884
0: The total amount of wall time = 237.920448
0: The maximum resident set size (KB) = 1231760

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_209637/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 241.404044
0: The maximum resident set size (KB) = 1246748
0: The total amount of wall time = 238.597717
0: The maximum resident set size (KB) = 1233284

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_209637/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 242.962682
0: The maximum resident set size (KB) = 1249268
0: The total amount of wall time = 237.803525
0: The maximum resident set size (KB) = 1234508

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_209637/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 237.070887
0: The maximum resident set size (KB) = 1238956
0: The total amount of wall time = 241.082583
0: The maximum resident set size (KB) = 1232320

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_209637/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1903784/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 = 237.482893
0: The maximum resident set size (KB) = 1245620
0: The total amount of wall time = 246.042458
0: The maximum resident set size (KB) = 1232080

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Sun May 12 13:33:32 UTC 2024
Elapsed time: 01h:02m:46s. Have a nice day!
Mon May 13 19:16:46 UTC 2024
Elapsed time: 01h:02m:28s. Have a nice day!
24 changes: 12 additions & 12 deletions tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon May 13 12:14:02 UTC 2024
Tue May 14 03:58:00 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_963796/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/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 = 1419.286675
0: The maximum resident set size (KB) = 1344244
0: The total amount of wall time = 1357.491643
0: The maximum resident set size (KB) = 1368672

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_963796/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/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 = 385.831343
0: The maximum resident set size (KB) = 1341548
0: The total amount of wall time = 388.602017
0: The maximum resident set size (KB) = 1356348

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_963796/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2934958/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 = 389.117762
0: The maximum resident set size (KB) = 1343228
0: The total amount of wall time = 392.294030
0: The maximum resident set size (KB) = 1358828

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon May 13 13:13:57 UTC 2024
Elapsed time: 00h:59m:55s. Have a nice day!
Tue May 14 04:56:24 UTC 2024
Elapsed time: 00h:58m:24s. Have a nice day!
126 changes: 126 additions & 0 deletions tests/logs/OpnReqTests_cpld_sfs_hydro_hera.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@

baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_std_base_intel
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1959771/rst_rst
Checking test rst results ....
Comparing sfcf021.nc .....USING NCCMP......OK
Comparing sfcf024.nc .....USING NCCMP......OK
Comparing atmf021.nc .....USING NCCMP......OK
Comparing atmf024.nc .....USING NCCMP......OK
Comparing GFSFLX.GrbF21 .....USING CMP......OK
Comparing GFSFLX.GrbF24 .....USING CMP......OK
Comparing GFSPRS.GrbF21 .....USING CMP......OK
Comparing GFSPRS.GrbF24 .....USING CMP......OK

0: The total amount of wall time = 1001.529109
0: The maximum resident set size (KB) = 1728376

Test rst PASS

Mon May 13 19:39:40 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf021.nc .........OK
Moving sfcf024.nc .........OK
Moving atmf021.nc .........OK
Moving atmf024.nc .........OK
Moving GFSFLX.GrbF21 .........OK
Moving GFSFLX.GrbF24 .........OK
Moving GFSPRS.GrbF21 .........OK
Moving GFSPRS.GrbF24 .........OK

0: The total amount of wall time = 1277.784752
0: The maximum resident set size (KB) = 1309112

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.nc .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/sfcf021.nc
Moving sfcf024.nc .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/sfcf024.nc
Moving atmf021.nc .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/atmf021.nc
Moving atmf024.nc .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/atmf024.nc
Moving GFSFLX.GrbF21 .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/GFSFLX.GrbF21
Moving GFSFLX.GrbF24 .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/GFSFLX.GrbF24
Moving GFSPRS.GrbF21 .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/GFSPRS.GrbF21
Moving GFSPRS.GrbF24 .........NOT OK. Missing /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/dbg_base_dbg_base/GFSPRS.GrbF24


Test dbg_base FAIL


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_2311078/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf021.nc .........OK
Moving sfcf024.nc .........OK
Moving atmf021.nc .........OK
Moving atmf024.nc .........OK
Moving GFSFLX.GrbF21 .........OK
Moving GFSFLX.GrbF24 .........OK
Moving GFSPRS.GrbF21 .........OK
Moving GFSPRS.GrbF24 .........OK

0: The total amount of wall time = 1316.780909
0: The maximum resident set size (KB) = 1297596

Test std_base PASS

FAILED TESTS:
Test dbg_base failed in check_result failed
Test dcp failed in check_result failed
Test rst failed in check_result failed
OPERATION REQUIREMENT TEST FAILED
Mon May 13 23:18:35 UTC 2024
Elapsed time: 03h:38m:57s. Have a nice day!
Mon May 13 23:52:01 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3335353/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf021.nc .........OK
Moving sfcf024.nc .........OK
Moving atmf021.nc .........OK
Moving atmf024.nc .........OK
Moving GFSFLX.GrbF21 .........OK
Moving GFSFLX.GrbF24 .........OK
Moving GFSPRS.GrbF21 .........OK
Moving GFSPRS.GrbF24 .........OK

0: The total amount of wall time = 3225.706174
0: The maximum resident set size (KB) = 1322788

Test dbg_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue May 14 00:50:40 UTC 2024
Elapsed time: 00h:58m:40s. Have a nice day!

baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_sfs_hydro_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_3478207/dcp_dcp
Checking test dcp results ....
Comparing sfcf021.nc .....USING NCCMP......OK
Comparing sfcf024.nc .....USING NCCMP......OK
Comparing atmf021.nc .....USING NCCMP......OK
Comparing atmf024.nc .....USING NCCMP......OK
Comparing GFSFLX.GrbF21 .....USING CMP......OK
Comparing GFSFLX.GrbF24 .....USING CMP......OK
Comparing GFSPRS.GrbF21 .....USING CMP......OK
Comparing GFSPRS.GrbF24 .....USING CMP......OK

0: The total amount of wall time = 1556.575445
0: The maximum resident set size (KB) = 1314156

Test dcp PASS

Loading

0 comments on commit d6f100f

Please sign in to comment.