Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -132,42 +132,42 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
fxtag = v3.0.1
fxtag = v3.1.1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.81
fxtag = ccs_config_cesm1.0.87
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.169
fxtag = cime6.4.1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.1.41
fxtag = cmeps1.1.54
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.93
fxtag = cdeps1.0.101
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.19
fxtag = share1.1.21
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share

Expand All @@ -181,21 +181,21 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
[submodule "cice"]
path = components/cice
url = https://github.com/ESCOMP/CESM_CICE
fxtag = cesm3_cice6_6_3_5
fxtag = cesm3_cice6_6_3_16
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE

[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxtag = ctsm5.4.024
fxtag = ctsm5.4.042
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM

[submodule "fms"]
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxtag = fi_250428
fxtag = fi_260310
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface

Expand Down
2 changes: 1 addition & 1 deletion ccs_config
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 89 files
+67 −0 .agents/skills/cime-documentation-writer/SKILL.md
+78 −0 .agents/skills/cime-sys-testing/SKILL.md
+94 −0 .agents/skills/cime-unit-testing/SKILL.md
+1 −0 .git-blame-ignore-revs
+3 −1 .github/workflows/testing.yml
+22 −171 AGENTS.md
+9 −0 CIME/SystemTests/eri.py
+1 −1 CIME/SystemTests/err.py
+42 −17 CIME/SystemTests/hommebaseclass.py
+4 −0 CIME/SystemTests/mcc.py
+33 −8 CIME/SystemTests/system_tests_common.py
+1 −1 CIME/SystemTests/test_mods.py
+63 −9 CIME/Tools/case.build
+8 −0 CIME/Tools/jenkins_generic_job
+1 −1 CIME/XML/compsets.py
+24 −13 CIME/XML/env_batch.py
+15 −0 CIME/XML/env_mach_specific.py
+49 −20 CIME/XML/machines.py
+1 −3 CIME/XML/namelist_definition.py
+3 −1 CIME/XML/tests.py
+318 −79 CIME/build.py
+1 −2 CIME/build_scripts/buildlib.cprnc
+6 −5 CIME/case/case.py
+7 −4 CIME/case/case_cmpgen_namelists.py
+2 −1 CIME/case/case_run.py
+3 −1 CIME/case/case_submit.py
+3 −1 CIME/compare_namelists.py
+7 −0 CIME/core/__init__.py
+1 −0 CIME/core/config/__init__.py
+182 −0 CIME/core/config/bootstrap.py
+81 −0 CIME/core/exceptions.py
+2 −0 CIME/data/config/cesm/config_files.xml
+7 −0 CIME/data/config/xml_schemas/config_machines.xsd
+10 −0 CIME/data/config/xml_schemas/config_machines_template.xml
+7 −0 CIME/data/config/xml_schemas/config_machines_version3.xsd
+96 −11 CIME/get_tests.py
+24 −2 CIME/hist_utils.py
+4 −0 CIME/jenkins_generic_job.py
+4 −2 CIME/scripts/configure
+42 −0 CIME/scripts/create_test.py
+9 −1 CIME/simple_compare.py
+62 −14 CIME/test_scheduler.py
+23 −0 CIME/tests/test_simple_compare.py
+80 −0 CIME/tests/test_sys_test_scheduler.py
+1 −1 CIME/tests/test_unit_bless_test_results.py
+1 −1 CIME/tests/test_unit_case_run.py
+137 −0 CIME/tests/test_unit_clean_cache.py
+2 −3 CIME/tests/test_unit_configure.py
+174 −0 CIME/tests/test_unit_copy_over_file.py
+191 −0 CIME/tests/test_unit_core_bootstrap.py
+124 −0 CIME/tests/test_unit_core_exceptions.py
+1 −1 CIME/tests/test_unit_expected_fails_file.py
+2 −1 CIME/tests/test_unit_fake_case.py
+162 −0 CIME/tests/test_unit_get_tests.py
+1 −1 CIME/tests/test_unit_grids.py
+51 −1 CIME/tests/test_unit_hist_utils.py
+1 −1 CIME/tests/test_unit_locked_files.py
+461 −0 CIME/tests/test_unit_safe_copy.py
+79 −36 CIME/tests/test_unit_system_tests.py
+137 −0 CIME/tests/test_unit_system_tests_err.py
+507 −0 CIME/tests/test_unit_test_scheduler.py
+1 −1 CIME/tests/test_unit_user_mod_support.py
+38 −1 CIME/tests/test_unit_xml_env_batch.py
+1 −2 CIME/tests/test_unit_xml_grids.py
+50 −8 CIME/tests/test_unit_xml_machines.py
+39 −11 CIME/utils.py
+3 −1 CIME/wait_for_tests.py
+1 −0 doc/.gitignore
+2 −2 doc/requirements.txt
+9 −1 doc/source/ccs/building-a-case.rst
+5 −3 doc/source/ccs/index.rst
+91 −20 doc/source/ccs/model-configuration/support-a-new-machine.rst
+1 −1 doc/source/ccs/model-configuration/variables/compsets.rst
+4 −4 doc/source/ccs/model-configuration/variables/grids.rst
+13 −1 doc/source/ccs/model-configuration/variables/machine.rst
+2 −2 doc/source/ccs/model-configuration/variables/pes.rst
+8 −2 doc/source/ccs/running-a-case.rst
+29 −91 doc/source/ccs/setting-up-a-case.rst
+4 −0 doc/source/ccs/timers.rst
+6 −6 doc/source/ccs/troubleshooting.rst
+1 −1 doc/source/ccs/user-config.rst
+7 −8 doc/source/contributing-guide.rst
+12 −4 doc/source/system_testing.rst
+2 −2 docker/.cime/config_machines.v2.xml
+2 −2 docker/.cime/docker/config_machines.xml
+20 −2 docker/Dockerfile
+18 −24 docker/entrypoint.sh
+18 −18 utils/perl5lib/Config/SetupTools.pm
+6 −0 utils/perl5lib/compilers_translation_tool.pl
2 changes: 1 addition & 1 deletion components/clm
Submodule clm updated 221 files
2 changes: 1 addition & 1 deletion components/cmeps
Submodule cmeps updated 62 files
+4 −6 .github/workflows/srt.yml
+7 −1 cesm/driver/ensemble_driver.F90
+8 −0 cesm/driver/esm.F90
+17 −2 cesm/share_wrappers/wtracers_mod.F90
+2 −2 cime_config/buildexe
+43 −0 cime_config/buildnml
+4 −1 cime_config/config_component.xml
+26 −1 cime_config/config_component_cesm.xml
+84 −14 cime_config/namelist_definition_drv.xml
+11 −0 cime_config/testdefs/testlist_drv.xml
+2 −0 cime_config/testdefs/testmods_dirs/drv/glc_avg_frequently/README
+1 −0 cime_config/testdefs/testmods_dirs/drv/glc_avg_frequently/shell_commands
+3 −0 cime_config/testdefs/testmods_dirs/drv/water_tracers/README
+1 −0 cime_config/testdefs/testmods_dirs/drv/water_tracers/shell_commands
+6 −0 cime_config/testdefs/testmods_dirs/drv/water_tracers/user_nl_cpl
+42 −15 med_test_comps/xatm/src/atm_comp_nuopc.F90
+94 −16 med_test_comps/xglc/src/glc_comp_nuopc.F90
+47 −15 med_test_comps/xice/src/ice_comp_nuopc.F90
+117 −24 med_test_comps/xlnd/src/lnd_comp_nuopc.F90
+52 −15 med_test_comps/xocn/src/ocn_comp_nuopc.F90
+57 −16 med_test_comps/xrof/src/rof_comp_nuopc.F90
+259 −7 med_test_comps/xshare/dead_nuopc_mod.F90
+14 −18 med_test_comps/xwav/src/wav_comp_nuopc.F90
+2 −1 mediator/CMakeLists.txt
+2 −2 mediator/esmFlds.F90
+595 −383 mediator/esmFldsExchange_cesm_mod.F90
+187 −296 mediator/esmFldsExchange_hafs_mod.F90
+91 −36 mediator/esmFldsExchange_ufs_mod.F90
+161 −16 mediator/fd_cesm.yaml
+45 −3 mediator/med.F90
+10 −6 mediator/med_field_info_mod.F90
+35 −5 mediator/med_fraction_mod.F90
+1 −4 mediator/med_internalstate_mod.F90
+118 −117 mediator/med_io_mod.F90
+10 −4 mediator/med_map_mod.F90
+4 −4 mediator/med_merge_mod.F90
+130 −3 mediator/med_methods_mod.F90
+20 −28 mediator/med_phases_aofluxes_mod.F90
+10 −0 mediator/med_phases_history_mod.F90
+4 −0 mediator/med_phases_ocnalb_mod.F90
+10 −1 mediator/med_phases_post_atm_mod.F90
+8 −0 mediator/med_phases_post_glc_mod.F90
+10 −1 mediator/med_phases_post_ice_mod.F90
+6 −0 mediator/med_phases_post_lnd_mod.F90
+10 −1 mediator/med_phases_post_ocn_mod.F90
+6 −0 mediator/med_phases_post_rof_mod.F90
+10 −1 mediator/med_phases_post_wav_mod.F90
+9 −0 mediator/med_phases_prep_atm_mod.F90
+298 −109 mediator/med_phases_prep_glc_mod.F90
+9 −0 mediator/med_phases_prep_ice_mod.F90
+6 −0 mediator/med_phases_prep_lnd_mod.F90
+16 −2 mediator/med_phases_prep_ocn_mod.F90
+7 −1 mediator/med_phases_prep_rof_mod.F90
+12 −1 mediator/med_phases_prep_wav_mod.F90
+7 −2 mediator/med_phases_restart_mod.F90
+38 −0 mediator/med_ufs_trace_wrapper.F90
+10 −10 ufs/ccpp/config/ccpp_prebuild_config.py
+38 −15 ufs/ccpp/data/MED_typedefs.F90
+216 −165 ufs/ccpp/data/MED_typedefs.meta
+1 −1 ufs/flux_atmocn_ccpp_mod.F90
+3 −11 ufs/flux_atmocn_mod.F90
+101 −1 ufs/wtracers_mod.F90
2 changes: 1 addition & 1 deletion components/mizuRoute
Submodule mizuRoute updated 67 files
+3 −3 .config_files.xml
+ docs/source/tech_note/images/overall_comp_workflow.png
+ docs/source/tech_note/images/uh_convolution.png
+1 −1 docs/source/tech_note/lake_routing.rst
+79 −6 docs/source/tech_note/reach_routing.rst
+1 −1 docs/source/users_guide/Build_model.rst
+114 −187 docs/source/users_guide/Control_file.rst
+28 −7 docs/source/users_guide/Hill.rst
+628 −185 docs/source/users_guide/Input_files.rst
+0 −31 docs/source/users_guide/Output_files.rst
+13 −108 docs/source/users_guide/Riv.rst
+ docs/source/users_guide/images/hw_drain_point.png
+1 −1 docs/source/users_guide/testCase.rst
+1 −1 route/build/Makefile
+0 −2 route/build/cpl/RtmFileUtils.F90
+163 −204 route/build/cpl/RtmMod.F90
+1 −13 route/build/cpl/RtmTimeManager.F90
+15 −93 route/build/cpl/RtmVar.F90
+84 −40 route/build/cpl/RunoffMod.F90
+26 −50 route/build/cpl/nuopc/rof_comp_nuopc.F90
+154 −138 route/build/cpl/nuopc/rof_import_export.F90
+6 −6 route/build/src/accum_runoff.f90
+19 −24 route/build/src/allocation.f90
+34 −54 route/build/src/ascii_utils.f90
+0 −2 route/build/src/dataTypes.f90
+15 −10 route/build/src/data_assimilation.f90
+2 −2 route/build/src/datetime_data.f90
+9 −5 route/build/src/dfw_route.f90
+7 −11 route/build/src/domain_decomposition.f90
+4 −4 route/build/src/gamma_func.f90
+1 −1 route/build/src/globalData.f90
+1 −1 route/build/src/historyFile.f90
+8 −6 route/build/src/hydraulic.f90
+12 −40 route/build/src/init_model_data.f90
+4 −11 route/build/src/irf_route.f90
+139 −153 route/build/src/kwe_route.f90
+10 −9 route/build/src/kwt_route.f90
+1 −3 route/build/src/lake_route.f90
+13 −3 route/build/src/main_route.f90
+111 −98 route/build/src/mc_route.f90
+170 −158 route/build/src/mpi_process.f90
+128 −0 route/build/src/mpi_utils.f90
+32 −2 route/build/src/ncio_utils.f90
+32 −71 route/build/src/network_topo.f90
+7 −5 route/build/src/nr_utils.f90
+4 −2 route/build/src/pfafstetter.f90
+7 −11 route/build/src/pio_utils.f90
+4 −4 route/build/src/popMetadat.f90
+2 −2 route/build/src/process_gage_meta.f90
+16 −75 route/build/src/process_ntopo.f90
+1 −9 route/build/src/process_param.f90
+19 −23 route/build/src/process_remap.f90
+42 −41 route/build/src/public_var.f90
+17 −9 route/build/src/read_control.f90
+64 −37 route/build/src/read_restart.f90
+28 −40 route/build/src/read_streamSeg.f90
+6 −3 route/build/src/standalone/get_basin_runoff.f90
+73 −53 route/build/src/standalone/model_setup.f90
+3 −2 route/build/src/standalone/read_remap.f90
+2 −2 route/build/src/standalone/read_runoff.f90
+5 −125 route/build/src/tracer.f90
+1 −2 route/build/src/water_balance.f90
+2 −5 route/build/src/write_restart_pio.f90
+20 −21 route/build/src/write_simoutput_pio.f90
+10 −35 route/build/src/write_streamSeg.f90
+9 −13 route/settings/SAMPLE-coupled.control
+9 −10 route/settings/SAMPLE.control
92 changes: 92 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,98 @@

===============================================================

Tag name: cam6_4_193
Originator(s):cacraigucar
Date: August 6, 2026
One-line Summary: Update externals to match cesm3_0_beta09
Github PR URL: https://github.com/ESCOMP/CAM/pull/1637

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Update externals to match cesm3_0_beta09: https://github.com/ESCOMP/CAM/issues/1636

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: jimmielin

List all files eliminated: N/A

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
M .gitmodules
M ccs_config
M cime
M components/cdeps
M components/cice
M components/clm
M components/cmeps
M components/mizuRoute
M doc/ChangeLog
M libraries/FMS
M share
M src/dynamics/mpas/dycore
- update externals

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_MTso.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
- Failure which was previously discovered in CESM alpha tag testing: See https://github.com/ESCOMP/CAM/issues/1569

SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PASS) details:
- intermittent failure in CTSM code (lnd_set_decomp_and_domain.F90) - It happened to fail this time

ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
ERC_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
ERI_D_Ln18.f09_f09_mt232.FHIST.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
ERI_D_Ln18.f19_f19_mt232.FHIST_C5.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
ERI_D_Ln18.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details:
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: DIFF) details:
ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s_ctem (Overall: DIFF) details:
SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9.f09_f09_mg17.FCts2nudged.derecho_intel.cam-outfrq9s_leapday (Overall: DIFF) details:
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.1850_CAM70%MT%CT4S2_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_SESP.derecho_intel.cam-outfrq9s
(Overall: DIFF) details:
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
- Answer differences due to external updates

derecho/nvhpc/aux_cam:
FAIL ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default MODEL_BUILD time=1699
error message: NVFORTRAN-S-0038-Symbol, chkerr, has not been explicitly declared (/glade/u/home/cacraig/cam_update_beta09/components/cmeps/cime_con fig/../mediator/esmFldsExchange_cesm_mod.F90)
- reported to Jian Sun and Chris Fischer via email

izumi/nag/aux_cam:
FAIL ERC_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_nag.cam-outfrq3s_subcol COMPARE_base_rest
- pre-existing failure -- see https://github.com/ESCOMP/CAM/issues/1514
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF) details:
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: DIFF) details:
- Answer differences due to external updates

izumi/gnu/aux_cam:
ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_gnu.cam-sat_lcltod (Overall: DIFF) details:
SMS_D_Ln9.f10_f10_mg37.FWmaHIST.izumi_gnu.cam-outfrq9s_mee_fluxes (Overall: DIFF) details:
- Answer differences due to external updates

===============================================================
===============================================================

Tag name: cam6_4_192
Originator(s): cacraigucar, peterhjortlauritzen, duncanwp, nusbaume, jimmielin
Date: August 5, 2026
Expand Down
2 changes: 1 addition & 1 deletion libraries/FMS
Submodule FMS updated 2 files
+1 −1 .gitmodules
+1 −1 src