Skip to content
Draft
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
39 changes: 23 additions & 16 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -11,69 +11,76 @@ fxDONOTUSEurl = https://github.com/ESCOMP/cism
[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime.git
fxtag = cime6.1.122
fxtag = cime6.1.167
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESMCI/cime.git

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

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

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

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

[submodule "ctsm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM.git
fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068
fxtag = ctsm5.4.022
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM.git

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART.git
fxtag = mosart1.1.12
fxtag = mosart1.1.13
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART.git

[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 "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxtag = pio2_6_6
fxtag = pio2_6_8
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO

[submodule "FTorch"]
path = libraries/FTorch
url = https://github.com/ESCOMP/FTorch_interface
fxtag = v0.0.5
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/ESCOMP/FTorch_interface

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

[submodule "tools/CUPiD"]
path = tools/CUPiD
url = https://github.com/NCAR/CUPiD.git
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
fxrequired = ToplevelRequired
fxtag = v0.3.1
fxtag = v0.5.1
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 73 files
+11 −0 .claude/CLAUDE.md
+1 −1 .github/ISSUE_TEMPLATE/feature_request.md
+2 −2 .github/pull_request_template.md
+1 −1 .github/workflows/testing.yml
+10 −0 .gitignore
+1 −1 .pre-commit-config.yaml
+173 −0 AGENTS.md
+9 −8 CIME/Servers/wget.py
+20 −4 CIME/SystemTests/eri.py
+5 −0 CIME/SystemTests/erp.py
+1 −1 CIME/SystemTests/err.py
+0 −65 CIME/SystemTests/ers2.py
+10 −2 CIME/SystemTests/funit.py
+4 −0 CIME/SystemTests/pet.py
+34 −8 CIME/SystemTests/system_tests_common.py
+12 −4 CIME/Tools/Makefile
+37 −7 CIME/Tools/pelayout
+6 −6 CIME/Tools/standard_script_setup.py
+10 −2 CIME/Tools/wait_for_tests
+18 −0 CIME/XML/archive_base.py
+7 −3 CIME/XML/compsets.py
+0 −17 CIME/XML/env_archive.py
+10 −4 CIME/XML/env_batch.py
+1 −10 CIME/XML/env_mach_pes.py
+56 −13 CIME/XML/env_mach_specific.py
+14 −3 CIME/XML/env_workflow.py
+51 −10 CIME/XML/namelist_definition.py
+30 −1 CIME/XML/pes.py
+11 −5 CIME/XML/tests.py
+1 −1 CIME/XML/workflow.py
+180 −102 CIME/bless_test_results.py
+10 −6 CIME/build.py
+11 −1 CIME/case/case.py
+8 −1 CIME/case/case_clone.py
+13 −11 CIME/case/case_run.py
+22 −8 CIME/case/case_setup.py
+136 −81 CIME/case/case_st_archive.py
+3 −0 CIME/case/case_submit.py
+13 −3 CIME/case/check_input_data.py
+143 −3 CIME/compare_namelists.py
+1 −3 CIME/compare_test_results.py
+2 −0 CIME/data/config/cesm/config_files.xml
+1 −0 CIME/data/config/config_headers.xml
+0 −22 CIME/data/config/config_tests.xml
+2 −2 CIME/data/templates/gitignore.template
+9 −1 CIME/get_timing.py
+2 −1 CIME/hist_utils.py
+3 −0 CIME/namelist.py
+1 −1 CIME/non_py/cprnc
+17 −11 CIME/non_py/src/CMake/CIME_initial_setup.cmake
+28 −14 CIME/non_py/src/CMake/CIME_utils.cmake
+35 −0 CIME/non_py/src/CMake/Sourcelist_utils.cmake
+1 −1 CIME/non_py/src/timing/private.h
+1 −1 CIME/scripts/configure
+4 −1 CIME/test_scheduler.py
+5 −4 CIME/test_utils.py
+1 −0 CIME/tests/case_fake.py
+41 −0 CIME/tests/test_sys_cime_case.py
+3 −3 CIME/tests/test_sys_unittest.py
+4 −0 CIME/tests/test_sys_wait_for_tests.py
+13 −14 CIME/tests/test_unit_baselines_performance.py
+41 −0 CIME/tests/test_unit_bless_test_results.py
+5 −0 CIME/tests/test_unit_case.py
+1 −1 CIME/tests/test_unit_case_run.py
+348 −0 CIME/tests/test_unit_case_st_archive.py
+125 −12 CIME/tests/test_unit_xml_namelist_definition.py
+43 −21 CIME/tests/test_unit_xml_tests.py
+77 −31 CIME/tests/utils.py
+28 −10 CIME/utils.py
+202 −167 CIME/wait_for_tests.py
+2 −0 doc/source/ccs/model-configuration/variables/pes.rst
+4 −11 doc/source/system_testing.rst
+16 −6 scripts/fortran_unit_testing/run_tests.py
2 changes: 1 addition & 1 deletion components/cdeps
Submodule cdeps updated 87 files
+5 −5 .github/workflows/extbuild.yml
+1 −1 .gitmodules
+61 −5 cime_config/stream_cdeps.py
+5 −1 datm/CMakeLists.txt
+153 −196 datm/atm_comp_nuopc.F90
+1 −1 datm/cime_config/buildnml
+43 −36 datm/cime_config/config_component.xml
+24 −19 datm/cime_config/namelist_definition_datm.xml
+445 −275 datm/cime_config/stream_definition_datm.xml
+67 −11 datm/cime_config/testdefs/testlist_datm.xml
+223 −274 datm/datm_datamode_clmncep_mod.F90
+97 −100 datm/datm_datamode_core2_mod.F90
+152 −74 datm/datm_datamode_cplhist_mod.F90
+194 −47 datm/datm_datamode_era5_mod.F90
+136 −42 datm/datm_datamode_gefs_mod.F90
+73 −79 datm/datm_datamode_jra_mod.F90
+6 −19 datm/datm_datamode_simple_mod.F90
+172 −0 datm/datm_pres_aero_mod.F90
+98 −0 datm/datm_pres_co2_mod.F90
+113 −0 datm/datm_pres_ndep_mod.F90
+70 −0 datm/datm_pres_o3_mod.F90
+6 −8 dglc/cime_config/namelist_definition_dglc.xml
+0 −2 dglc/cime_config/stream_definition_dglc.xml
+19 −1 dglc/cime_config/testdefs/testlist_dglc.xml
+15 −16 dglc/dglc_datamode_noevolve_mod.F90
+16 −81 dglc/glc_comp_nuopc.F90
+4 −6 dice/cime_config/namelist_definition_dice.xml
+0 −2 dice/cime_config/stream_definition_dice.xml
+16 −2 dice/cime_config/testdefs/testlist_dice.xml
+179 −34 dice/dice_datamode_cplhist_mod.F90
+25 −13 dice/dice_datamode_ssmi_mod.F90
+2 −2 dice/dice_flux_atmice_mod.F90
+42 −109 dice/ice_comp_nuopc.F90
+3 −1 dlnd/CMakeLists.txt
+30 −1 dlnd/cime_config/buildnml
+21 −11 dlnd/cime_config/config_component.xml
+7 −6 dlnd/cime_config/namelist_definition_dlnd.xml
+101 −3 dlnd/cime_config/stream_definition_dlnd.xml
+19 −1 dlnd/cime_config/testdefs/testlist_dlnd.xml
+9 −0 dlnd/cime_config/testdefs/testmods_dirs/dlnd/glc_forcing/shell_commands
+7 −0 dlnd/cime_config/testdefs/testmods_dirs/dlnd/rof_forcing/shell_commands
+206 −0 dlnd/dlnd_datamode_glc_forcing_mod.F90
+276 −0 dlnd/dlnd_datamode_rof_forcing_mod.F90
+77 −183 dlnd/lnd_comp_nuopc.F90
+7 −1 doc/source/datm.rst
+36 −15 doc/source/docn.rst
+6 −0 doc/source/drof.rst
+3 −3 docn/CMakeLists.txt
+21 −3 docn/cime_config/config_component.xml
+23 −29 docn/cime_config/namelist_definition_docn.xml
+91 −3 docn/cime_config/stream_definition_docn.xml
+18 −0 docn/cime_config/testdefs/testlist_docn.xml
+9 −0 docn/cime_config/testdefs/testmods_dirs/docn/multilev_cplhist/shell_commands
+20 −0 docn/cime_config/testdefs/testmods_dirs/docn/multilev_cplhist/user_nl_cpl
+2 −2 docn/docn_datamode_aquaplanet_mod.F90
+66 −20 docn/docn_datamode_cplhist_mod.F90
+0 −172 docn/docn_datamode_iaf_mod.F90
+162 −0 docn/docn_datamode_multilev_cplhist_mod.F90
+26 −29 docn/docn_datamode_multilev_mod.F90
+49 −46 docn/docn_datamode_multilev_sstdata_mod.F90
+74 −33 docn/docn_datamode_som_mod.F90
+35 −31 docn/docn_datamode_sstdata_mod.F90
+2 −2 docn/docn_import_data_mod.F90
+144 −197 docn/ocn_comp_nuopc.F90
+3 −1 drof/CMakeLists.txt
+46 −35 drof/cime_config/config_component.xml
+9 −7 drof/cime_config/namelist_definition_drof.xml
+40 −5 drof/cime_config/stream_definition_drof.xml
+9 −1 drof/cime_config/testdefs/testlist_drof.xml
+6 −0 drof/cime_config/testdefs/testmods_dirs/drof/cplhist_noresm/shell_commands
+123 −0 drof/drof_datamode_copyall_mod.F90
+198 −0 drof/drof_datamode_cplhist_mod.F90
+110 −107 drof/rof_comp_nuopc.F90
+17 −16 dshr/dshr_dfield_mod.F90
+3 −3 dshr/dshr_fldlist_mod.F90
+59 −59 dshr/dshr_mod.F90
+2 −1 dwav/CMakeLists.txt
+0 −2 dwav/cime_config/namelist_definition_dwav.xml
+0 −2 dwav/cime_config/stream_definition_dwav.xml
+108 −0 dwav/dwav_datamode_copyall_mod.F90
+135 −193 dwav/wav_comp_nuopc.F90
+1 −1 fox
+7 −0 share/CMakeLists.txt
+94 −0 share/shr_lnd2rof_tracers_mod.F90
+27 −3 streams/dshr_methods_mod.F90
+671 −335 streams/dshr_strdata_mod.F90
+399 −265 streams/dshr_stream_mod.F90
2 changes: 1 addition & 1 deletion components/clm
Submodule clm updated 351 files
2 changes: 1 addition & 1 deletion components/cmeps
Submodule cmeps updated 68 files
+4 −4 .github/workflows/srt.yml
+1 −0 CODEOWNERS
+4 −1 cesm/driver/esm.F90
+498 −0 cesm/flux_atmocn/flux_atmocn_COARE_mod.F90
+712 −0 cesm/flux_atmocn/flux_atmocn_Diurnal_mod.F90
+351 −0 cesm/flux_atmocn/flux_atmocn_Large.F90
+522 −0 cesm/flux_atmocn/flux_atmocn_UA_mod.F90
+145 −0 cesm/flux_atmocn/flux_atmocn_driver_mod.F90
+24 −2,303 cesm/flux_atmocn/shr_flux_mod.F90
+94 −0 cesm/nuopc_cap_share/shr_lnd2rof_tracers_mod.F90
+18 −0 cesm/share_wrappers/wtracers_mod.F90
+1 −0 cime_config/buildexe
+6 −8 cime_config/buildnml
+4 −39 cime_config/config_component.xml
+8 −62 cime_config/config_component_cesm.xml
+47 −20 cime_config/namelist_definition_drv.xml
+0 −3 doc/source/addendum/fieldnames.rst
+1 −0 med_test_comps/xatm/cime_config/buildlib
+32 −0 med_test_comps/xatm/cime_config/buildnml
+25 −0 med_test_comps/xatm/cime_config/config_component.xml
+529 −0 med_test_comps/xatm/src/atm_comp_nuopc.F90
+1 −0 med_test_comps/xglc/cime_config/buildlib
+32 −0 med_test_comps/xglc/cime_config/buildnml
+26 −0 med_test_comps/xglc/cime_config/config_component.xml
+457 −0 med_test_comps/xglc/src/glc_comp_nuopc.F90
+1 −0 med_test_comps/xice/cime_config/buildlib
+32 −0 med_test_comps/xice/cime_config/buildnml
+26 −0 med_test_comps/xice/cime_config/config_component.xml
+552 −0 med_test_comps/xice/src/ice_comp_nuopc.F90
+1 −0 med_test_comps/xlnd/cime_config/buildlib
+32 −0 med_test_comps/xlnd/cime_config/buildnml
+26 −0 med_test_comps/xlnd/cime_config/config_component.xml
+564 −0 med_test_comps/xlnd/src/lnd_comp_nuopc.F90
+1 −0 med_test_comps/xocn/cime_config/buildlib
+32 −0 med_test_comps/xocn/cime_config/buildnml
+27 −0 med_test_comps/xocn/cime_config/config_component.xml
+475 −0 med_test_comps/xocn/src/ocn_comp_nuopc.F90
+1 −0 med_test_comps/xrof/cime_config/buildlib
+32 −0 med_test_comps/xrof/cime_config/buildnml
+39 −0 med_test_comps/xrof/cime_config/config_component.xml
+473 −0 med_test_comps/xrof/src/rof_comp_nuopc.F90
+39 −0 med_test_comps/xshare/cime_config/buildlib
+853 −0 med_test_comps/xshare/dead_methods_mod.F90
+346 −0 med_test_comps/xshare/dead_nuopc_mod.F90
+1 −0 med_test_comps/xwav/cime_config/buildlib
+32 −0 med_test_comps/xwav/cime_config/buildnml
+26 −0 med_test_comps/xwav/cime_config/config_component.xml
+465 −0 med_test_comps/xwav/src/wav_comp_nuopc.F90
+1 −0 mediator/CMakeLists.txt
+58 −405 mediator/esmFldsExchange_cesm_mod.F90
+12 −140 mediator/fd_cesm.yaml
+18 −4 mediator/med.F90
+4 −622 mediator/med_diag_mod.F90
+293 −0 mediator/med_field_info_mod.F90
+22 −4 mediator/med_fraction_mod.F90
+154 −20 mediator/med_io_mod.F90
+51 −19 mediator/med_map_mod.F90
+318 −181 mediator/med_methods_mod.F90
+59 −82 mediator/med_phases_aofluxes_mod.F90
+0 −1 mediator/med_phases_cdeps_mod.F90
+23 −5 mediator/med_phases_history_mod.F90
+21 −23 mediator/med_phases_post_rof_mod.F90
+78 −55 mediator/med_phases_prep_glc_mod.F90
+8 −1 mediator/med_phases_prep_ocn_mod.F90
+72 −85 mediator/med_phases_prep_rof_mod.F90
+8 −1 mediator/med_phases_prep_wav_mod.F90
+1 −1 ufs/CMakeLists.txt
+34 −0 ufs/wtracers_mod.F90
2 changes: 1 addition & 1 deletion components/mosart
1 change: 1 addition & 0 deletions libraries/FMS
Submodule FMS added at 99a1d4
1 change: 1 addition & 0 deletions libraries/FTorch
Submodule FTorch added at 79e767
2 changes: 1 addition & 1 deletion tools/CUPiD
Submodule CUPiD updated 88 files
+1 −1 .gitignore
+12 −4 .gitmodules
+2 −9 .pre-commit-config.yaml
+1 −0 Contributors.md
+1 −1 LICENSE
+9 −70 README.md
+0 −22 RunCESM.md
+93 −7 cime_config/config_tool.xml
+8 −5 cupid/generate_webpage.py
+1 −0 cupid/git_helper.py
+1 −0 cupid/read.py
+31 −29 cupid/remapping.py
+25 −0 cupid/run_timeseries.py
+44 −4 cupid/timeseries.py
+1 −0 cupid/util.py
+201 −0 cupid_utils/LICENSE
+3 −0 cupid_utils/README.md
+2 −0 cupid_utils/cupid_utils/__init__.py
+4 −0 cupid_utils/cupid_utils/atm/__init__.py
+37 −0 cupid_utils/cupid_utils/atm/averaging_utils.py
+0 −0 cupid_utils/cupid_utils/atm/nmse_utils.py
+0 −0 cupid_utils/cupid_utils/glc/__init__.py
+0 −0 cupid_utils/cupid_utils/glc/utils.py
+4 −0 cupid_utils/cupid_utils/ice/__init__.py
+14 −14 cupid_utils/cupid_utils/ice/plot_diff.py
+12 −12 cupid_utils/cupid_utils/ice/vect_diff.py
+132 −0 cupid_utils/cupid_utils/multi-component/spatial_means.py
+577 −0 cupid_utils/cupid_utils/ocn/regional_utils.py
+8 −0 cupid_utils/cupid_utils/rof/__init__.py
+0 −0 cupid_utils/cupid_utils/rof/colors.py
+0 −0 cupid_utils/cupid_utils/rof/metrics.py
+0 −0 cupid_utils/cupid_utils/rof/utility.py
+0 −0 cupid_utils/input_files/ice/cice_masks.yml
+6 −6 cupid_utils/input_files/ice/cice_vars.yml
+36 −0 cupid_utils/pyproject.toml
+0 −0 cupid_utils/setup/large_river_50.txt
+0 −0 cupid_utils/setup/setup.yaml
+50 −0 docs/RunCESM.md
+86 −0 docs/RunExternalPackages.md
+111 −0 docs/RunStandalone.md
+ docs/_static/images/config/config_1.png
+5 −1 docs/conf.py
+2 −0 docs/index.rst
+2 −2 docs/publishing_notebooks.md
+2 −0 docs/run_external_packages.rst
+2 −0 docs/run_standalone.rst
+57 −23 environments/cupid-analysis.yml
+30 −19 environments/cupid-infrastructure.yml
+2 −1 environments/docs.yml
+1 −0 examples/.gitignore
+4 −0 examples/additional_metrics/config.yml
+79 −16 examples/external_diag_packages/config.yml
+169 −0 examples/intermediary_outputs/config.yml
+88 −20 examples/key_metrics/config.yml
+151 −0 examples/regional_ocean/config.yml
+1 −1 externals/ADF
+1 −0 externals/ILAMB
+1 −0 externals/LDF
+106 −23 helper_scripts/cesm_postprocessing.sh
+130 −0 helper_scripts/find_enddate.py
+48 −4 helper_scripts/generate_adf_config_file.py
+169 −5 helper_scripts/generate_cupid_config_for_cesm_case.py
+58 −43 helper_scripts/generate_ilamb_config_files.py
+293 −0 helper_scripts/generate_ldf_config_file.py
+0 −1 nblibrary/.gitignore
+63 −17 nblibrary/atm/ADF.ipynb
+143 −0 nblibrary/atm/CVDP.ipynb
+7 −6 nblibrary/atm/Global_PSL_NMSE_compare_obs_lens.ipynb
+265 −0 nblibrary/atm/Global_TS_RESTOM_tseries.ipynb
+0 −57 nblibrary/atm/averaging_utils.py
+0 −372 nblibrary/atm/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml
+8 −9 nblibrary/glc/Greenland_SMB_visual_compare_obs.ipynb
+59 −17 nblibrary/ice/Hemis_seaice_visual_compare_contour.ipynb
+262 −399 nblibrary/ice/Hemis_seaice_visual_compare_obs_lens.ipynb
+251 −0 nblibrary/ice/Lab_Sea_ICEFRAC_tseries.ipynb
+171 −0 nblibrary/infrastructure/summary_tables.ipynb
+20 −32 nblibrary/lnd/Global_TerrestrialCouplingIndex_VisualCompareObs.ipynb
+10 −10 nblibrary/lnd/ILAMB.ipynb
+251 −0 nblibrary/lnd/LDF.ipynb
+0 −2 nblibrary/lnd/model_setup.txt
+1 −0 nblibrary/ocn/Global_Ocean_Surface.ipynb
+256 −0 nblibrary/ocn/Regional_Ocean_Animations.ipynb
+310 −0 nblibrary/ocn/Regional_Ocean_Atmospheric_Forcing.ipynb
+629 −0 nblibrary/ocn/Regional_Ocean_OBC.ipynb
+863 −0 nblibrary/ocn/Regional_Ocean_Report_Card.ipynb
+66 −28 nblibrary/rof/global_discharge_gauge_compare_obs.ipynb
+236 −32 nblibrary/rof/global_discharge_ocean_compare_obs.ipynb
+1 −1 pyproject.toml