Skip to content

update CMEPS w/ latest ESCOMP/main; add branch-type startup (was #3029); Allow ihr to be non-mulitples of 6 in ccpp-physics (was #3036) #3030

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

Merged
gspetro-NOAA merged 21 commits into from
Jan 5, 2026
Merged

update CMEPS w/ latest ESCOMP/main; add branch-type startup (was #3029); Allow ihr to be non-mulitples of 6 in ccpp-physics (was #3036) #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3aa281b
prevent branch type restart from setting isRestart true
DeniseWorthen Dec 19, 2025
468a196
point to CMEPS update
DeniseWorthen Dec 19, 2025
0c53d02
add log and test change list
DeniseWorthen Dec 19, 2025
f07ce66
update CMEPS
DeniseWorthen Dec 19, 2025
ad84308
add hercules log; empty test_changes
DeniseWorthen Dec 20, 2025
6e9fa70
Merge remote-tracking branch 'origin/develop' into feature/addbranch_…
DeniseWorthen Dec 23, 2025
6f6f3ed
Merge remote-tracking branch 'origin/develop' into feature/sync_escom…
DeniseWorthen Dec 23, 2025
4b9392d
Merge branch 'develop' into feature/sync_escomp_122025
DeniseWorthen Dec 29, 2025
e565b61
Merge branch 'develop' into feature/addbranch_runtype
DeniseWorthen Dec 29, 2025
8e076dc
Merge branch 'feature/addbranch_runtype' into feature/sync_escomp_122025
DeniseWorthen Dec 29, 2025
d6399ee
Merge remote-tracking branch 'origin/develop' into feature/sync_escom…
DeniseWorthen Dec 30, 2025
4f7220a
point to ATM feature branch
DeniseWorthen Dec 30, 2025
007529b
ORT Jobs Completed.
epic-cicd-jenkins Dec 31, 2025
7c6e3b7
hercules rt log - passed
gspetro-NOAA Dec 31, 2025
90a9708
orion rt log - passed
gspetro-NOAA Dec 31, 2025
a1abae5
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Dec 31, 2025
4d982b5
Acorn RT Log: Passed
BrianCurtis-NOAA Dec 31, 2025
4dc8254
add hera ursa RT logs: passed
jkbk2004 Jan 3, 2026
d8ca96c
add gaeac6 RT log: passed
jkbk2004 Jan 3, 2026
86e4ab5
update CMEPS and revert gitmodules
DeniseWorthen Jan 5, 2026
c0393bc
update ATM and revert gitmodules
DeniseWorthen Jan 5, 2026
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 22 files
+20 −5 .github/workflows/srt.yml
+1 −0 CODEOWNERS
+4 −1 cesm/driver/esm.F90
+484 −0 cesm/flux_atmocn/flux_atmocn_COARE_mod.F90
+714 −0 cesm/flux_atmocn/flux_atmocn_Diurnal_mod.F90
+338 −0 cesm/flux_atmocn/flux_atmocn_Large.F90
+522 −0 cesm/flux_atmocn/flux_atmocn_UA_mod.F90
+141 −0 cesm/flux_atmocn/flux_atmocn_driver_mod.F90
+24 −2,297 cesm/flux_atmocn/shr_flux_mod.F90
+29 −7 cime_config/buildnml
+18 −39 cime_config/config_component.xml
+20 −72 cime_config/config_component_cesm.xml
+23 −22 cime_config/namelist_definition_drv.xml
+3 −3 cime_config/testdefs/testlist_drv.xml
+0 −3 doc/source/addendum/fieldnames.rst
+20 −319 mediator/esmFldsExchange_cesm_mod.F90
+0 −140 mediator/fd_cesm.yaml
+4 −622 mediator/med_diag_mod.F90
+1 −1 mediator/med_internalstate_mod.F90
+12 −77 mediator/med_phases_aofluxes_mod.F90
+1 −1 mediator/med_phases_history_mod.F90
+0 −15 mediator/med_phases_post_rof_mod.F90
2 changes: 1 addition & 1 deletion UFSATM
Open in desktop
Submodule UFSATM updated 1 files
+1 −1 ccpp/physics
6 changes: 3 additions & 3 deletions driver/UFSDriver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ MODULE UFSDriver
#endif
#ifdef FRONT_LM4
use FRONT_LM4, only: LM4_SS => SetServices
#endif
#endif
#ifdef FRONT_NOAHMP
use FRONT_NOAHMP, only: NOAHMP_SS => SetServices
#endif
Expand Down Expand Up @@ -477,7 +477,7 @@ subroutine SetModelServices(driver, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
found_comp = .true.
end if
#endif
#endif
#ifdef FRONT_NOAHMP
if (trim(model) == "noahmp") then
call NUOPC_DriverAddComp(driver, trim(prefix), NOAHMP_SS, &
Expand Down Expand Up @@ -811,7 +811,7 @@ function IsRestart(gcomp, config, rc)

!TODO: this is hard-wired to CIME start/continue types in terms of gcomp
IsRestart = .false.
if (trim(start_type) == trim(start_type_cont) .or. trim(start_type) == trim(start_type_brnch)) then
if (trim(start_type) == trim(start_type_cont)) then
IsRestart = .true.
end if
else
Expand Down
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 Dec 29 18:01:49 UTC 2025
Wed Dec 31 00:58:52 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 264.972448
0: The maximum resident set size (KB) = 1538888
0: The total amount of wall time = 256.581553
0: The maximum resident set size (KB) = 1541904

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 880.967419
0: The maximum resident set size (KB) = 1521056
0: The total amount of wall time = 877.685145
0: The maximum resident set size (KB) = 1517992

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 230.449115
0: The maximum resident set size (KB) = 1553292
0: The total amount of wall time = 231.255494
0: The maximum resident set size (KB) = 1538076

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/mpi_mpi
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 236.101220
0: The maximum resident set size (KB) = 1514468
0: The total amount of wall time = 227.633437
0: The maximum resident set size (KB) = 1547160

Test mpi PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 232.201679
0: The maximum resident set size (KB) = 1531640
0: The total amount of wall time = 231.148856
0: The maximum resident set size (KB) = 1526680

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 231.319849
0: The maximum resident set size (KB) = 1526848
0: The total amount of wall time = 232.493602
0: The maximum resident set size (KB) = 1527784

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_3251171/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2802019/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 = 231.727065
0: The maximum resident set size (KB) = 1533632
0: The total amount of wall time = 230.003200
0: The maximum resident set size (KB) = 1522668

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Dec 29 19:06:01 UTC 2025
Elapsed time: 01h:04m:12s. Have a nice day!
Wed Dec 31 02:02:11 UTC 2025
Elapsed time: 01h:03m:19s. 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 @@
Mon Dec 29 16:33:16 UTC 2025
Tue Dec 30 23:34:10 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_dbg_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2566254/dbg_base_dbg_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2423745/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 = 2319.673071
0: The maximum resident set size (KB) = 1645556
0: The total amount of wall time = 2312.298243
0: The maximum resident set size (KB) = 1649184

Test dbg_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2566254/rst_rst
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2423745/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 = 588.972637
0: The maximum resident set size (KB) = 1625260
0: The total amount of wall time = 591.656337
0: The maximum resident set size (KB) = 1636560

Test rst PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_noaero_p8_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2566254/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2423745/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 = 589.944531
0: The maximum resident set size (KB) = 1632552
0: The total amount of wall time = 587.953075
0: The maximum resident set size (KB) = 1630792

Test std_base PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Dec 29 18:01:49 UTC 2025
Elapsed time: 01h:28m:34s. Have a nice day!
Wed Dec 31 00:58:52 UTC 2025
Elapsed time: 01h:24m:42s. 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 @@
Mon Dec 29 15:37:55 UTC 2025
Tue Dec 30 22:40:15 UTC 2025
Start Operation Requirement Test


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_bit_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2326974/bit_base_bit_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2081646/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 = 621.333281
0: The maximum resident set size (KB) = 893820
0: The total amount of wall time = 615.007189
0: The maximum resident set size (KB) = 891660

Test bit_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2326974/dcp_dcp
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2081646/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 = 499.824872
0: The maximum resident set size (KB) = 865512
0: The total amount of wall time = 504.462394
0: The maximum resident set size (KB) = 864352

Test dcp PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2326974/std_base_std_base
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2081646/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 = 507.607832
0: The maximum resident set size (KB) = 862840
0: The total amount of wall time = 503.627943
0: The maximum resident set size (KB) = 862132

Test std_base PASS


baseline dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-stmp/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/regional_control_std_base_gnu
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2326974/thr_thr
working dir = /scratch3/NCEPDEV/stmp/role.epic/ORT-ptmp/role.epic/FV3_OPNREQ_TEST/opnReqTest_2081646/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 = 501.262703
0: The maximum resident set size (KB) = 866640
0: The total amount of wall time = 503.666981
0: The maximum resident set size (KB) = 864172

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Mon Dec 29 16:33:15 UTC 2025
Elapsed time: 00h:55m:21s. Have a nice day!
Tue Dec 30 23:34:09 UTC 2025
Elapsed time: 00h:53m:54s. Have a nice day!
Loading