Skip to content

Update CAM-SIMA externals to match cam6_4_106, plus new CIME tag #412

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
nusbaume merged 3 commits into from
Aug 6, 2025
Merged

Update CAM-SIMA externals to match cam6_4_106, plus new CIME tag #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5a4343
Update externals to match cam6_4_106, plus newer CIME tag for submodu…
nusbaume Aug 5, 2025
3bb9682
Remove mct submodule.
nusbaume Aug 5, 2025
621bd3c
Grab correct cice submodule tag.
nusbaume Aug 5, 2025
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
30 changes: 12 additions & 18 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,57 +32,51 @@
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.21
fxtag = ccs_config_cesm1.0.53
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.61
fxtag = cdeps1.0.73
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
[submodule "cice"]
path = components/cice
url = https://github.com/ESCOMP/CESM_CICE
fxtag = cesm_cice6_6_0_6
fxtag = cesm3_cice6_6_0_13
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.58
fxtag = cime6.1.113
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
fxtag = cismwrap_2_2_005
fxtag = cismwrap_2_2_006
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxtag = ctsm5.3.017
fxtag = ctsm5.3.029
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.33
fxtag = cmeps1.0.47
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
[submodule "fms"]
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxtag = fi_240828
fxtag = fi_250428
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
[submodule "mct"]
path = libraries/mct
url = https://github.com/MCSclimate/MCT
fxtag = MCT_2.11.0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/MCSclimate/MCT
[submodule "mizuRoute"]
path = components/mizuRoute
url = https://github.com/ESCOMP/mizuRoute
Expand All @@ -92,19 +86,19 @@
[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxtag = mosart1.1.07
fxtag = mosart1.1.08
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_3
fxtag = pio2_6_4
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxtag = rtm1_0_84
fxtag = rtm1_0_86
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
[submodule "share"]
Expand All @@ -116,6 +110,6 @@
[submodule "tools/CUPiD"]
path = tools/CUPiD
url = https://github.com/NCAR/CUPiD.git
fxtag = v0.1.4
fxtag = v0.2.1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
2 changes: 1 addition & 1 deletion ccs_config
Open in desktop
Submodule ccs_config updated 42 files
+69 −1 component_grids_nuopc.xml
+5 −0 config_inputdata.xml
+9 −0 machines/Depends.gnu
+2 −2 machines/Depends.intel
+7 −0 machines/Depends.nvhpc
+14 −0 machines/casper/casper.cmake
+3 −3 machines/casper/config_batch.xml
+31 −76 machines/casper/config_machines.xml
+45 −0 machines/casper/gnu_casper.cmake
+26 −6 machines/casper/intel_casper.cmake
+44 −9 machines/casper/nvhpc_casper.cmake
+0 −15 machines/casper/pgi_casper.cmake
+0 −1 machines/cmake_macros/CMakeLists.txt
+3 −3 machines/cmake_macros/CNL.cmake
+1 −0 machines/cmake_macros/Macros.cmake
+21 −18 machines/cmake_macros/gnu.cmake
+15 −41 machines/cmake_macros/intel.cmake
+0 −1 machines/cmake_macros/nag.cmake
+41 −31 machines/cmake_macros/nvhpc.cmake
+3 −1 machines/config_machines.xml
+20 −23 machines/config_workflow.xml
+84 −42 machines/derecho/config_machines.xml
+8 −0 machines/derecho/derecho.cmake
+35 −0 machines/derecho/gnu_derecho.cmake
+16 −0 machines/derecho/intel_derecho.cmake
+24 −4 machines/derecho/nvhpc_derecho.cmake
+22 −23 machines/izumi/config_machines.xml
+1 −0 machines/izumi/gnu_izumi.cmake
+2 −1 machines/izumi/izumi.cmake
+2 −1 machines/izumi/nag_izumi.cmake
+13 −19 machines/perlmutter/config_machines.xml
+11 −0 machines/stampede3-spr/config_batch.xml
+70 −0 machines/stampede3-spr/config_machines.xml
+11 −0 machines/stampede3-spr/intel_stampede3-spr.cmake
+5 −0 machines/stampede3-spr/stampede3-spr.cmake
+2 −39 machines/template.cupid
+12 −0 machines/vista/config_batch.xml
+64 −0 machines/vista/config_machines.xml
+5 −0 machines/vista/nvhpc_vista.cmake
+1 −0 machines/vista/vista.cmake
+28 −0 maps_nuopc.xml
+350 −73 modelgrid_aliases_nuopc.xml
2 changes: 1 addition & 1 deletion cime
Open in desktop
Submodule cime updated 183 files
2 changes: 1 addition & 1 deletion components/cdeps
Open in desktop
Submodule cdeps updated 48 files
+5 −0 cime_config/stream_cdeps.py
+0 −1 datm/CMakeLists.txt
+21 −28 datm/atm_comp_nuopc.F90
+31 −1 datm/cime_config/buildnml
+52 −33 datm/cime_config/config_component.xml
+4 −1 datm/cime_config/namelist_definition_datm.xml
+176 −127 datm/cime_config/stream_definition_datm.xml
+60 −0 datm/cime_config/testdefs/testlist_datm.xml
+0 −216 datm/datm_datamode_cfsr_mod.F90
+21 −16 datm/datm_datamode_clmncep_mod.F90
+5 −3 datm/datm_datamode_core2_mod.F90
+0 −1 datm/datm_datamode_cplhist_mod.F90
+0 −1 datm/datm_datamode_era5_mod.F90
+0 −1 datm/datm_datamode_gefs_mod.F90
+3 −2 datm/datm_datamode_jra_mod.F90
+5 −3 datm/datm_datamode_simple_mod.F90
+6 −5 dglc/dglc_datamode_noevolve_mod.F90
+41 −40 dglc/glc_comp_nuopc.F90
+1 −0 dice/CMakeLists.txt
+202 −0 dice/dice_datamode_cplhist_mod.F90
+1 −3 dice/dice_datamode_ssmi_mod.F90
+85 −16 dice/ice_comp_nuopc.F90
+6 −5 dlnd/lnd_comp_nuopc.F90
+9 −5 doc/source/datm.rst
+3 −0 doc/source/dice.rst
+15 −15 docn/cime_config/config_component.xml
+5 −3 docn/docn_datamode_aquaplanet_mod.F90
+0 −1 docn/docn_datamode_copyall_mod.F90
+21 −7 docn/docn_datamode_cplhist_mod.F90
+0 −2 docn/docn_datamode_iaf_mod.F90
+5 −3 docn/docn_datamode_multilev_dom_mod.F90
+3 −2 docn/docn_datamode_multilev_mod.F90
+0 −1 docn/docn_datamode_som_mod.F90
+2 −4 docn/docn_import_data_mod.F90
+8 −6 docn/ocn_comp_nuopc.F90
+6 −5 drof/rof_comp_nuopc.F90
+17 −9 dshr/dshr_dfield_mod.F90
+37 −413 dshr/dshr_mod.F90
+5 −4 dwav/wav_comp_nuopc.F90
+1 −0 share/CMakeLists.txt
+18 −44 share/nuopc_shr_methods.F90
+11 −47 share/shr_abort_mod.F90
+137 −0 share/shr_is_restart_fh_mod.F90
+47 −1 share/shr_log_mod.F90
+21 −30 streams/dshr_methods_mod.F90
+67 −37 streams/dshr_strdata_mod.F90
+49 −28 streams/dshr_stream_mod.F90
+19 −12 streams/dshr_tinterp_mod.F90
2 changes: 1 addition & 1 deletion components/cice
Open in desktop
Submodule cice updated 9 files
+2 −2 .gitmodules
+1 −1 cime_config/buildlib
+24 −4 cime_config/buildnml
+3 −2 cime_config/config_archive.xml
+3 −3 cime_config/config_compsets.xml
+36 −0 cime_config/config_pes.xml
+246 −40 cime_config/namelist_definition_cice.xml
+22 −22 cime_config/testdefs/testlist_cice.xml
+1 −1 src
2 changes: 1 addition & 1 deletion components/cism
Open in desktop
Submodule cism updated 2 files
+0 −84 CODE_OF_CONDUCT.md
+9 −0 ChangeLog
2 changes: 1 addition & 1 deletion components/clm
Open in desktop
Submodule clm updated 79 files
+6 −0 .git-blame-ignore-revs
+10 −0 .gitignore
+9 −9 .gitmodules
+0 −107 CODE_OF_CONDUCT.md
+107 −52 WhatsNewInCTSM5.3.md
+17 −5 bld/CLMBuildNamelist.pm
+51 −35 bld/namelist_files/namelist_defaults_ctsm.xml
+60 −2 bld/namelist_files/namelist_definition_ctsm.xml
+6 −2 bld/unit_testers/build-namelist_test.pl
+1 −1 ccs_config
+1 −1 cime
+8 −6 cime_config/SystemTests/rxcropmaturity.py
+6 −0 cime_config/SystemTests/rxcropmaturityinst.py
+6 −0 cime_config/SystemTests/rxcropmaturityskipgeninst.py
+1 −4 cime_config/SystemTests/ssp.py
+52 −68 cime_config/SystemTests/sspmatrixcn.py
+20 −0 cime_config/config_tests.xml
+1 −249 cime_config/testdefs/ExpectedTestFails.xml
+345 −289 cime_config/testdefs/testlist_clm.xml
+3 −2 cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
+0 −8 cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/shell_commands
+1 −1 cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/user_nl_clm
+0 −8 cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStreamNoCompFixedBioGeo/shell_commands
+2 −2 cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStreamNoCompFixedBioGeo/user_nl_clm
+1 −1 cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm
+1 −1 components/cism
+1 −1 components/cmeps
+1 −1 components/mizuRoute
+1 −1 components/mosart
+1 −1 components/rtm
+973 −1 doc/ChangeLog
+12 −0 doc/ChangeSum
+3 −1 parse_cime.cs.status
+2 −1 python/ctsm/crop_calendars/convert_axis_time2gs.py
+1 −0 python/ctsm/crop_calendars/cropcal_figs_module.py
+41 −21 python/ctsm/crop_calendars/cropcal_module.py
+44 −6 python/ctsm/crop_calendars/cropcal_utils.py
+12 −1 python/ctsm/crop_calendars/generate_gdds.py
+21 −9 python/ctsm/crop_calendars/generate_gdds_functions.py
+3 −1 python/ctsm/crop_calendars/import_ds.py
+10 −0 python/ctsm/path_utils.py
+4 −82 python/ctsm/site_and_regional/neon_site.py
+41 −0 python/ctsm/site_and_regional/plumber_site.py
+109 −37 python/ctsm/site_and_regional/run_tower.py
+75 −38 python/ctsm/site_and_regional/tower_arg_parse.py
+70 −25 python/ctsm/site_and_regional/tower_site.py
+3 −3 python/ctsm/test/test_sys_modify_singlept_site_neon.py
+0 −71 python/ctsm/test/test_sys_run_neon.py
+213 −0 python/ctsm/test/test_sys_run_tower.py
+0 −76 python/ctsm/test/test_unit_neon_arg_parse.py
+1 −1 python/ctsm/test/test_unit_neon_site.py
+5 −5 python/ctsm/test/test_unit_run_tower.py
+185 −0 python/ctsm/test/test_unit_sspmatrix.py
+107 −0 python/ctsm/test/test_unit_tower_arg_parse.py
+12 −0 python/ctsm/utils.py
+1 −1 share
+1 −13 src/biogeochem/CNPhenologyMod.F90
+2 −2 src/biogeochem/CNVegetationFacade.F90
+1 −1 src/biogeochem/CropType.F90
+1 −1 src/biogeochem/dynCNDVMod.F90
+1 −1 src/biogeophys/SoilTemperatureMod.F90
+9 −5 src/biogeophys/UrbBuildTempOleson2015Mod.F90
+114 −130 src/cpl/lilac/lnd_comp_esmf.F90
+88 −95 src/cpl/nuopc/lnd_comp_nuopc.F90
+1 −1 src/fates
+1 −1 src/init_interp/initInterp.F90
+23 −25 src/main/clm_driver.F90
+11 −0 src/main/clm_varctl.F90
+35 −0 src/main/controlMod.F90
+65 −61 src/main/histFileMod.F90
+2 −3 src/soilbiogeochem/CNSoilMatrixMod.F90
+1 −4 src/unit_test_shr/unittestTimeManagerMod.F90
+2 −1 src/utils/AnnualFluxDribbler.F90
+20 −18 src/utils/clm_time_manager.F90
+115 −23 src/utils/clmfates_interfaceMod.F90
+4 −4 src/utils/test/clm_time_manager_test/test_clm_time_manager.pf
+171 −0 tools/contrib/remove_duplicate_tests.py
+107 −0 tools/contrib/test_rxcropmaturity_python.sh
+5 −5 tools/site_and_regional/run_tower
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated 38 files
+4 −4 .github/workflows/extbuild.yml
+3 −3 .github/workflows/srt.yml
+45 −32 cesm/driver/esm.F90
+29 −18 cesm/driver/esm_time_mod.F90
+4 −3 cesm/flux_atmocn/shr_flux_mod.F90
+6 −4 cesm/nuopc_cap_share/driver_pio_mod.F90
+0 −24 cesm/nuopc_cap_share/seq_drydep_mod.F90
+15 −15 cesm/nuopc_cap_share/shr_drydep_mod.F90
+4 −3 cime_config/config_archive.xml
+10 −0 cime_config/config_component.xml
+1 −0 cime_config/config_component_cesm.xml
+5 −4 cime_config/namelist_definition_drv.xml
+43 −43 cime_config/testdefs/testlist_drv.xml
+19 −35 mediator/esmFlds.F90
+22 −2 mediator/esmFldsExchange_cesm_mod.F90
+32 −0 mediator/esmFldsExchange_ufs_mod.F90
+17 −20 mediator/med.F90
+36 −19 mediator/med_diag_mod.F90
+2 −3 mediator/med_fraction_mod.F90
+4 −2 mediator/med_internalstate_mod.F90
+35 −57 mediator/med_io_mod.F90
+142 −98 mediator/med_map_mod.F90
+31 −43 mediator/med_merge_mod.F90
+90 −141 mediator/med_methods_mod.F90
+8 −11 mediator/med_phases_aofluxes_mod.F90
+24 −22 mediator/med_phases_history_mod.F90
+12 −14 mediator/med_phases_ocnalb_mod.F90
+4 −6 mediator/med_phases_post_glc_mod.F90
+4 −3 mediator/med_phases_post_rof_mod.F90
+9 −12 mediator/med_phases_prep_glc_mod.F90
+0 −1 mediator/med_phases_prep_ice_mod.F90
+1 −1 mediator/med_phases_prep_lnd_mod.F90
+0 −2 mediator/med_phases_prep_ocn_mod.F90
+7 −10 mediator/med_phases_prep_rof_mod.F90
+0 −1 mediator/med_phases_prep_wav_mod.F90
+37 −10 mediator/med_phases_restart_mod.F90
+8 −0 ufs/ccpp/data/MED_typedefs.F90
+20 −0 ufs/ccpp/data/MED_typedefs.meta
2 changes: 1 addition & 1 deletion components/mosart
Open in desktop
Submodule mosart updated 3 files
+20 −0 docs/ChangeLog.md
+2 −4 src/cpl/nuopc/rof_import_export.F90
+13 −7 src/riverroute/mosart_histfile.F90
2 changes: 1 addition & 1 deletion components/rtm
Open in desktop
Submodule rtm updated 4 files
+1 −0 cime_config/testdefs/testlist_rtm.xml
+31 −0 docs/ChangeLog.md
+13 −7 src/riverroute/RtmHistFile.F90
+1 −1 src/riverroute/RtmRestFile.F90
2 changes: 1 addition & 1 deletion libraries/FMS
Open in desktop
Submodule FMS updated 2 files
+1 −1 .gitmodules
+1 −1 src
1 change: 0 additions & 1 deletion libraries/mct
Open in desktop
Submodule mct deleted from 82b007
2 changes: 1 addition & 1 deletion libraries/parallelio
Open in desktop
Submodule parallelio updated 10 files
+3 −0 .github/actions/buildhdf5/action.yml
+9 −11 .github/actions/intelcompilers/action.yml
+2 −2 .github/workflows/autotools.yml
+0 −131 .github/workflows/intel.yml
+0 −77 .github/workflows/withspack.yml
+12 −12 CMakeLists.txt
+4 −4 configure.ac
+24 −8 src/clib/pio_darray_int.c
+7 −15 src/clib/pio_rearrange.c
+3 −3 src/flib/pio_nf.F90
2 changes: 1 addition & 1 deletion tools/CUPiD
Open in desktop
Submodule CUPiD updated 38 files
+7 −3 .github/PULL_REQUEST_TEMPLATE.md
+2 −2 .github/workflows/deploy.yml
+2 −2 .gitignore
+1 −0 Contributors.md
+192 −0 cime_config/config_tool.xml
+6 −3 cupid/clean.py
+154 −12 cupid/cupid_webpage.py
+218 −0 cupid/git_helper.py
+10 −7 cupid/run_diagnostics.py
+7 −2 cupid/run_timeseries.py
+2 −2 cupid/timeseries.py
+4 −0 cupid/util.py
+1 −0 docs/index.rst
+79 −0 docs/publishing_notebooks.md
+1 −1 environments/cupid-analysis.yml
+2 −0 examples/.gitignore
+4 −0 examples/coupled_model/config.yml
+18 −63 examples/external_diag_packages/config.yml
+0 −1 examples/ilamb/.gitignore
+0 −5 examples/ilamb/test_run.sh
+7 −4 examples/key_metrics/config.yml
+1 −1 externals/ADF
+2 −0 helper_scripts/.gitignore
+130 −0 helper_scripts/cesm_postprocessing.sh
+116 −20 helper_scripts/generate_cupid_config_for_cesm_case.py
+162 −0 helper_scripts/generate_ilamb_config_files.py
+2 −0 ilamb_aux/.gitignore
+107 −107 ilamb_aux/ilamb_nohoff_final_CLM_BGC_template.cfg
+79 −79 ilamb_aux/ilamb_nohoff_final_CLM_SP_template.cfg
+11 −7 nblibrary/atm/Global_PSL_NMSE_compare_obs_lens.ipynb
+4 −9 nblibrary/atm/link_to_ADF.ipynb
+6 −3 nblibrary/glc/Greenland_SMB_visual_compare_obs.ipynb
+55 −21 nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb
+1,682 −290 nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb
+46 −4 nblibrary/ice/plot_diff.py
+10 −6 nblibrary/lnd/Global_TerrestrialCouplingIndex_VisualCompareObs.ipynb
+208 −0 nblibrary/lnd/link_to_ILAMB.ipynb
+0 −0 nblibrary/lnd/model_setup.txt