Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into iaurestart
Browse files Browse the repository at this point in the history
  • Loading branch information
@junwang-noaa
junwang-noaa committed Jul 31, 2024
2 parents a2abc9c + b5a1976 commit 40d1371
Show file tree
Hide file tree
Showing 18 changed files with 2,480 additions and 2,656 deletions.
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 33 files
+15 −11 .github/workflows/extbuild.yml
+32 −50 .github/workflows/srt.yml
+0 −4 cesm/driver/esm.F90
+14 −3 cesm/flux_atmocn/shr_flux_mod.F90
+0 −2 cesm/nuopc_cap_share/seq_drydep_mod.F90
+222 −0 cesm/nuopc_cap_share/shr_dust_emis_mod.F90
+4 −2 cime_config/buildexe
+4 −4 cime_config/buildnml
+0 −56 cime_config/config_component.xml
+2 −0 cime_config/config_component_cesm.xml
+85 −246 cime_config/namelist_definition_drv.xml
+27 −0 cime_config/namelist_definition_drv_flds.xml
+7 −1 cime_config/runseq/driver_config.py
+4 −2 cime_config/runseq/runseq_TG.py
+22 −19 cime_config/runseq/runseq_general.py
+518 −482 mediator/esmFldsExchange_cesm_mod.F90
+4 −3 mediator/esmFldsExchange_ufs_mod.F90
+495 −398 mediator/fd_cesm.yaml
+9 −3 mediator/med.F90
+38 −12 mediator/med_diag_mod.F90
+118 −31 mediator/med_fraction_mod.F90
+67 −7 mediator/med_internalstate_mod.F90
+14 −3 mediator/med_phases_aofluxes_mod.F90
+2 −3 mediator/med_phases_cdeps_mod.F90
+19 −6 mediator/med_phases_history_mod.F90
+12 −12 mediator/med_phases_post_glc_mod.F90
+1 −0 mediator/med_phases_post_ocn_mod.F90
+313 −17 mediator/med_phases_post_rof_mod.F90
+38 −27 mediator/med_phases_prep_atm_mod.F90
+70 −51 mediator/med_phases_prep_glc_mod.F90
+40 −12 mediator/med_phases_prep_rof_mod.F90
+5 −4 mediator/med_phases_profile_mod.F90
+4 −3 mediator/med_phases_restart_mod.F90
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 7 files
+1 −1 atmos_model.F90
+1 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+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
2 changes: 1 addition & 1 deletion NOAHMP-interface/noahmp
Submodule noahmp updated 3 files
+50 −47 drivers/ccpp/noahmpdrv.F90
+43 −0 drivers/ccpp/noahmpdrv.meta
+24 −26 src/module_sf_noahmplsm.F90
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=20240624
export BL_DATE=20240724
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 @@
Wed Jul 17 03:56:39 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_618270/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 = 279.926730
0: The maximum resident set size (KB) = 1464436
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_618270/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 = 981.451585
0: The maximum resident set size (KB) = 1435700
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_618270/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 = 251.528579
0: The maximum resident set size (KB) = 1422160
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_618270/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 = 247.727184
0: The maximum resident set size (KB) = 1422076
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_618270/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 = 252.564799
0: The maximum resident set size (KB) = 1432092
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_618270/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 = 248.590179
0: The maximum resident set size (KB) = 1429984
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_618270/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.979968
0: The maximum resident set size (KB) = 1430948
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 17 05:20:20 UTC 2024
Elapsed time: 01h:23m:41s. 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
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Jul 17 02:51:07 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_425938/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 = 1336.337850
0: The maximum resident set size (KB) = 1531400
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_425938/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 = 560.046630
0: The maximum resident set size (KB) = 1537008
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_425938/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 = 424.689553
0: The maximum resident set size (KB) = 1524172
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 17 03:56:38 UTC 2024
Elapsed time: 01h:05m:32s. 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
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Jul 17 00:17:07 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_2874969/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 = 1486.948093
0: The maximum resident set size (KB) = 773156
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_2874969/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 = 2254.792018
0: The maximum resident set size (KB) = 709916
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_2874969/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 = 2233.046743
0: The maximum resident set size (KB) = 722680
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_2874969/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 = 2245.932321
0: The maximum resident set size (KB) = 719656
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 17 02:51:06 UTC 2024
Elapsed time: 02h:33m:59s. Have a nice day!
Fri Jul 26 19:19:31 UTC 2024
Elapsed time: 02h:35m:00s. Have a nice day!
Loading

0 comments on commit 40d1371

Please sign in to comment.