Skip to content

Commit

Permalink
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpsarmie
dpsarmie committed Sep 3, 2024
2 parents 5bf503b + 9ae4f54 commit 1650d9c
Show file tree
Hide file tree
Showing 21 changed files with 2,377 additions and 2,513 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 14 files
+3 −0 cesm/driver/esm.F90
+68 −10 cime_config/config_component_cesm.xml
+61 −2 cime_config/namelist_definition_drv.xml
+4 −1 mediator/esmFldsExchange_cesm_mod.F90
+10 −0 mediator/fd_cesm.yaml
+3 −4 mediator/med.F90
+15 −7 mediator/med_diag_mod.F90
+69 −30 mediator/med_io_mod.F90
+2 −2 mediator/med_methods_mod.F90
+4 −3 mediator/med_phases_aofluxes_mod.F90
+15 −7 mediator/med_phases_history_mod.F90
+38 −17 mediator/med_phases_post_rof_mod.F90
+2 −1 mediator/med_phases_prep_atm_mod.F90
+37 −16 mediator/med_phases_prep_ocn_mod.F90
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 46 files
+7 −2 ccpp/config/ccpp_prebuild_config.py
+23 −15 ccpp/data/GFS_typedefs.F90
+25 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_c3.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+1 −1 ccpp/suites/suite_FV3_RAP.xml
+1 −1 ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_flake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+1 −1 ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+1 −1 ccpp/suites/suite_FV3_WoFS_v0.xml
+1 −1 ccpp/suites/suite_FV3_global_nest_v1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy2.xml
+1 −1 ccpp/suites/suite_RRFSens_phy3.xml
+1 −1 ccpp/suites/suite_RRFSens_phy4.xml
+1 −1 ccpp/suites/suite_RRFSens_phy5.xml
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240821
export BL_DATE=20240830
6 changes: 2 additions & 4 deletions tests/fv3_conf/cpld_docn_dice.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ if [[ ${OPNREQ_TEST} == true ]]; then
fi

#CDEPS data files
#cp @[INPUTDATA_ROOT]/DOCN_DICE_cplhist/ufs.cpld.cpl*.nc INPUT
module load nco
ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ice*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ocn*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc
cp ../${DEP_RUN}${SUFFIX}/*ice.1h.aux*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
cp ../${DEP_RUN}${SUFFIX}/*ocn.1h.aux*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc

#CDEPS fix files - same for ocn/ice
cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc INPUT
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 @@
Mon Aug 26 19:59:54 UTC 2024
Fri Aug 30 16:11:42 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_255239/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 282.094574
0: The maximum resident set size (KB) = 1459728
0: The total amount of wall time = 285.319725
0: The maximum resident set size (KB) = 1459076

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_255239/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 985.479617
0: The maximum resident set size (KB) = 1417884
0: The total amount of wall time = 980.288173
0: The maximum resident set size (KB) = 1424524

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_255239/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 248.873990
0: The maximum resident set size (KB) = 1437132
0: The total amount of wall time = 248.004317
0: The maximum resident set size (KB) = 1435996

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_255239/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 252.449329
0: The maximum resident set size (KB) = 1422488
0: The total amount of wall time = 254.881553
0: The maximum resident set size (KB) = 1426068

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_255239/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 252.763505
0: The maximum resident set size (KB) = 1423640
0: The total amount of wall time = 247.371317
0: The maximum resident set size (KB) = 1438120

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_255239/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 253.485325
0: The maximum resident set size (KB) = 1438440
0: The total amount of wall time = 247.964958
0: The maximum resident set size (KB) = 1426916

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_255239/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_1541961/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 = 247.766378
0: The maximum resident set size (KB) = 1411920
0: The total amount of wall time = 249.125554
0: The maximum resident set size (KB) = 1430064

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 21:14:01 UTC 2024
Elapsed time: 01h:14m:07s. Have a nice day!
Fri Aug 30 17:24:37 UTC 2024
Elapsed time: 01h:12m:55s. 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 Aug 26 18:51:21 UTC 2024
Fri Aug 30 15:02:11 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_2593550/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/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 = 1361.846982
0: The maximum resident set size (KB) = 1537900
0: The total amount of wall time = 1313.770246
0: The maximum resident set size (KB) = 1554336

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_2593550/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/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 = 715.515398
0: The maximum resident set size (KB) = 1525500
0: The total amount of wall time = 457.172265
0: The maximum resident set size (KB) = 1528760

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_2593550/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_199771/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 = 435.784809
0: The maximum resident set size (KB) = 1528568
0: The total amount of wall time = 498.642653
0: The maximum resident set size (KB) = 1526632

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 19:59:54 UTC 2024
Elapsed time: 01h:08m:34s. Have a nice day!
Fri Aug 30 16:11:42 UTC 2024
Elapsed time: 01h:09m:32s. Have a nice day!
30 changes: 15 additions & 15 deletions tests/logs/OpnReqTests_regional_control_hera.log
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 26 16:17:09 UTC 2024
Fri Aug 30 12:30:13 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_3681501/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_37212/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 = 1404.274425
0: The maximum resident set size (KB) = 769724
0: The total amount of wall time = 1373.944509
0: The maximum resident set size (KB) = 776468

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_3681501/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_37212/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 = 2178.286214
0: The maximum resident set size (KB) = 751032
0: The total amount of wall time = 2170.408116
0: The maximum resident set size (KB) = 721060

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_3681501/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_37212/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 = 2198.737097
0: The maximum resident set size (KB) = 734276
0: The total amount of wall time = 2256.372781
0: The maximum resident set size (KB) = 731244

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_3681501/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_37212/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 = 2321.006507
0: The maximum resident set size (KB) = 742260
0: The total amount of wall time = 2155.006152
0: The maximum resident set size (KB) = 742524

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Aug 26 18:51:20 UTC 2024
Elapsed time: 02h:34m:14s. Have a nice day!
Fri Aug 30 15:02:10 UTC 2024
Elapsed time: 02h:31m:58s. Have a nice day!
Loading

0 comments on commit 1650d9c

Please sign in to comment.