Skip to content

Bring in the answer changing (for derecho_intel) ccs_config update #3111

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
ekluzek merged 6 commits into from
May 30, 2025
+17 −19
Merged

Bring in the answer changing (for derecho_intel) ccs_config update #3111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b98fb11
Update submodules to cesm3_0_alpha06c, just before the answer change …
ekluzek May 4, 2025
da1ad8a
Revert "Merge pull request #3067 from jedwards4b/st_arvchive_fix"
ekluzek May 1, 2025
9bba4e7
Update to ccs_config to beyond the 1.0.24 tag that changes answers on…
ekluzek May 5, 2025
c7a8f38
Update ccs_config to a branch that has a working build for derecho_gn…
ekluzek May 5, 2025
5122034
Get a working version of ccs_config for DEBUG derecho_gnu mpi-serial
ekluzek May 7, 2025
03cf139
Update ccs_config with a working cray-libsci library which I show wor…
ekluzek May 9, 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
12 changes: 7 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,26 @@ 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.20
#url = https://github.com/ESMCI/ccs_config_cesm.git
url = https://github.com/ekluzek/ccs_config_cesm.git
#fxtag = ccs_config_cesm1.0.32
fxtag = 7d3ec3485a6a59107851dafdb203669128cb73b1
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxtag = cime6.1.59
fxtag = cime6.1.72
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/cime

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxtag = cmeps1.0.33
fxtag = cmeps1.0.39
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
Expand All @@ -100,7 +102,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.8
fxtag = share1.1.9
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand Down
2 changes: 1 addition & 1 deletion ccs_config
Open in desktop
Submodule ccs_config updated 13 files
+5 −0 config_inputdata.xml
+2 −2 machines/Depends.intel
+1 −0 machines/Depends.nvhpc
+14 −0 machines/casper/casper.cmake
+21 −71 machines/casper/config_machines.xml
+8 −4 machines/casper/intel_casper.cmake
+0 −15 machines/casper/pgi_casper.cmake
+13 −12 machines/cmake_macros/gnu.cmake
+6 −0 machines/cmake_macros/nvhpc.cmake
+20 −23 machines/config_workflow.xml
+53 −32 machines/derecho/config_machines.xml
+2 −39 machines/template.cupid
+7 −0 modelgrid_aliases_nuopc.xml
2 changes: 1 addition & 1 deletion cime
Open in desktop
Submodule cime updated 30 files
+1 −0 .git-blame-ignore-revs
+5 −5 .github/workflows/docs.yml
+1 −1 .github/workflows/testing.yml
+2 −2 CIME/SystemTests/eri.py
+4 −1 CIME/SystemTests/ers.py
+1 −1 CIME/SystemTests/restart_tests.py
+6 −0 CIME/SystemTests/system_tests_common.py
+2 −2 CIME/SystemTests/test_mods.py
+7 −0 CIME/Tools/bless_test_results
+23 −4 CIME/Tools/case.setup
+17 −3 CIME/XML/env_batch.py
+5 −1 CIME/XML/env_mach_specific.py
+22 −0 CIME/XML/env_postprocessing.py
+40 −0 CIME/XML/postprocessing.py
+16 −0 CIME/bless_test_results.py
+27 −0 CIME/case/case.py
+5 −2 CIME/case/case_setup.py
+9 −0 CIME/data/config/cesm/config_files.xml
+7 −0 CIME/data/config/config_headers.xml
+11 −5 CIME/hist_utils.py
+5 −4 CIME/jenkins_generic_job.py
+1 −1 CIME/non_py/cprnc
+26 −3 CIME/scripts/create_test.py
+16 −2 CIME/test_scheduler.py
+8 −1 CIME/tests/base.py
+25 −2 CIME/tests/test_sys_cime_case.py
+1 −0 CIME/tests/test_unit_system_tests.py
+68 −0 CIME/tests/test_unit_xml_env_batch.py
+1 −0 CIME/utils.py
+1 −0 CIME/wait_for_tests.py
16 changes: 6 additions & 10 deletions cime_config/config_archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
<hist_file_extension>e</hist_file_extension>
<rest_history_varname>locfnh</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
<rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
<rpointer_content>./$CASE.clm2$NINST_STRING.r.$DATENAME.nc</rpointer_content>
</rpointer>
<test_file_names>
<tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
<tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
<tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
<tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
<tfile disposition="copy">rpointer.lnd</tfile>
<tfile disposition="copy">rpointer.lnd_9999</tfile>
<tfile disposition="copy">casename.clm2.r.1976-01-01-00000.nc</tfile>
<tfile disposition="copy">casename.clm2.rh4.1976-01-01-00000.nc</tfile>
<tfile disposition="move">casename.clm2.h0.1976-01-01-00000.nc</tfile>
Expand All @@ -34,14 +32,12 @@
<hist_file_extension>e</hist_file_extension>
<rest_history_varname>locfnh</rest_history_varname>
<rpointer>
<rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
<rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
<rpointer_content>./$CASE.ctsm$NINST_STRING.r.$DATENAME.nc</rpointer_content>
</rpointer>
<test_file_names>
<tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
<tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
<tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
<tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
<tfile disposition="copy">rpointer.lnd</tfile>
<tfile disposition="copy">rpointer.lnd_9999</tfile>
<tfile disposition="copy">casename.ctsm.r.1976-01-01-00000.nc</tfile>
<tfile disposition="copy">casename.ctsm.rh4.1976-01-01-00000.nc</tfile>
<tfile disposition="move">casename.ctsm.h0.1976-01-01-00000.nc</tfile>
Expand Down
2 changes: 1 addition & 1 deletion components/cmeps
Open in desktop
Submodule cmeps updated 30 files
+4 −4 .github/workflows/extbuild.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
+10 −0 cime_config/config_component.xml
+2 −1 cime_config/namelist_definition_drv.xml
+43 −43 cime_config/testdefs/testlist_drv.xml
+19 −35 mediator/esmFlds.F90
+15 −18 mediator/med.F90
+5 −7 mediator/med_diag_mod.F90
+2 −3 mediator/med_fraction_mod.F90
+35 −57 mediator/med_io_mod.F90
+12 −15 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
+9 −16 mediator/med_phases_history_mod.F90
+11 −13 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
+8 −8 mediator/med_phases_restart_mod.F90
2 changes: 1 addition & 1 deletion share
Open in desktop
Submodule share updated 3 files
+1 −1 buildlib.csm_share
+7 −3 src/shr_abort_mod.F90
+3 −1 src/shr_kind_mod.F90
Loading