update externals and compset names and aliases

sjsprecious · Jul 5, 2024 · 3142760 · 3142760
1 parent 87e7662
commit 3142760
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 111 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -26,33 +26,32 @@
 #              repository branches.
 #
 
-
 [submodule "ccs_config"]
 	path = ccs_config
 	url = https://github.com/ESMCI/ccs_config_cesm.git
 	fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
-        fxtag = ccs_config_cesm0.0.109
+        fxtag = ccs_config_cesm1.0.0
         fxrequired = ToplevelRequired
 
-[submodule "share"]
-	path = share
-	url = https://github.com/ESCOMP/CESM_share
-	fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
-        fxtag = share1.1.2
-        fxrequired = ToplevelRequired
-
 [submodule "cime"]
 	path = cime
 	url = https://github.com/ESMCI/cime
 	fxDONOTUSEurl = https://github.com/ESMCI/cime
-        fxtag = cime6.0.246
+        fxtag = cime6.1.0
         fxrequired = ToplevelRequired
 
-[submodule "mpi-serial"]
-	path = libraries/mpi-serial
-	url = https://github.com/ESMCI/mpi-serial
-	fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
-        fxtag = MPIserial_2.5.0
+[submodule "fms"]
+	path = libraries/FMS
+	url = https://github.com/ESCOMP/FMS_interface
+	fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
+        fxrequired = ToplevelRequired
+        fxtag = fi_240516
+
+[submodule "share"]
+	path = share
+	url = https://github.com/ESCOMP/CESM_share
+	fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
+        fxtag = share1.1.2
         fxrequired = ToplevelRequired
 
 [submodule "cam"]
@@ -62,93 +61,98 @@
         fxtag = cam6_4_001
         fxrequired = ToplevelRequired
 
-[submodule "ww3"]
-	path = components/ww3
-	url = https://github.com/ESCOMP/WW3_interface
-	fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
-        fxtag = ww3i_0.0.2
+[submodule "clm"]
+	path = components/clm
+	url = https://github.com/ESCOMP/CTSM
+	fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
         fxrequired = ToplevelRequired
-
+        fxtag = ctsm5.2.007
+
+[submodule "cice"]
+	path = components/cice
+	url = https://github.com/ESCOMP/CESM_CICE
+	fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
+        fxrequired = ToplevelRequired
+        fxtag = cesm_cice6_5_0_9
+
+[submodule "mom"]
+	path = components/mom
+	url = https://github.com/ESCOMP/MOM_interface
+	fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
+        fxrequired = ToplevelRequired
+        fxtag = mi_240522
+
+[submodule "cism"]
+	path = components/cism
+	url = https://github.com/ESCOMP/cism-wrapper.git
+	fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
+        fxtag = cismwrap_2_2_002
+        fxrequired = ToplevelRequired
+
+[submodule "cdeps"]
+	path = components/cdeps
+	url = https://github.com/ESCOMP/CDEPS
+	fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
+        fxrequired = ToplevelRequired
+        fxtag = cdeps1.0.43
+
+[submodule "cmeps"]
+	path = components/cmeps
+	url = https://github.com/ESCOMP/CMEPS.git
+	fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
+        fxrequired = ToplevelRequired
+        fxtag = cmeps1.0.0
+
 [submodule "rtm"]
 	path = components/rtm
 	url = https://github.com/ESCOMP/RTM
 	fxDONOTUSEurl = https://github.com/ESCOMP/RTM
         fxrequired = ToplevelRequired
         fxtag = rtm1_0_80
 
-[submodule "pysect"]
-	path = tools/statistical_ensemble_test/pyCECT
-	url = https://github.com/NCAR/PyCECT
-	fxDONOTUSEurl = https://github.com/NCAR/PyCECT
-        fxrequired = ToplevelRequired
-        fxtag = 3.2.2
-
-[submodule "mosart"]
-	path = components/mosart
-	url = https://github.com/ESCOMP/MOSART
-	fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
+[submodule "ww3"]
+	path = components/ww3
+	url = https://github.com/ESCOMP/WW3_interface
+	fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
+        fxtag = ww3i_0.0.2
         fxrequired = ToplevelRequired
-        fxtag = mosart1.1.02
-
+
 [submodule "mizuroute"]
 	path = components/mizuroute
 	url = https://github.com/ESCOMP/mizuRoute
 	fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
         fxrequired = ToplevelRequired
         fxtag = cesm-coupling.n02_v2.1.3
 
-[submodule "fms"]
-	path = libraries/FMS
-	url = https://github.com/ESCOMP/FMS_interface
-	fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
+[submodule "mosart"]
+	path = components/mosart
+	url = https://github.com/ESCOMP/MOSART
+	fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
         fxrequired = ToplevelRequired
-        fxtag = fi_240516
-        
+        fxtag = mosart1.1.02
+
 [submodule "parallelio"]
 	path = libraries/parallelio
 	url = https://github.com/NCAR/ParallelIO
 	fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
         fxrequired = ToplevelRequired
         fxtag = pio2_6_2
 
-[submodule "cdeps"]
-	path = components/cdeps
-	url = https://github.com/ESCOMP/CDEPS
-	fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
+[submodule "mpi-serial"]
+	path = libraries/mpi-serial
+	url = https://github.com/ESMCI/mpi-serial
+	fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
+        fxtag = MPIserial_2.5.0
         fxrequired = ToplevelRequired
-        fxtag = cdeps1.0.43
 
-[submodule "cmeps"]
-	path = components/cmeps
-	url = https://github.com/ESCOMP/CMEPS.git
-	fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
+[submodule "pysect"]
+	path = tools/statistical_ensemble_test/pyCECT
+	url = https://github.com/NCAR/PyCECT
+	fxDONOTUSEurl = https://github.com/NCAR/PyCECT
         fxrequired = ToplevelRequired
-        fxtag = cmeps1.0.0
+        fxtag = 3.2.2
 
-[submodule "cice"]
-	path = components/cice
-	url = https://github.com/ESCOMP/CESM_CICE
-	fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
-        fxrequired = ToplevelRequired
-        fxtag = cesm_cice6_5_0_9
 
-[submodule "cism"]
-	path = components/cism
-	url = https://github.com/ESCOMP/cism-wrapper.git
-	fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
-        fxtag = cismwrap_2_2_002
-        fxrequired = ToplevelRequired
+
 
-[submodule "clm"]
-	path = components/clm
-	url = https://github.com/ESCOMP/CTSM
-	fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
-        fxrequired = ToplevelRequired
-        fxtag = ctsm5.2.008
 
-[submodule "mom"]
-	path = components/mom
-	url = https://github.com/ESCOMP/MOM_interface
-	fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
-        fxrequired = ToplevelRequired
-        fxtag = mi_240522
diff --git a/ccs_config b/ccs_config
diff --git a/cime b/cime
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -39,23 +39,23 @@
   <!-- 1850 compsets Default, Mosart, Wave for CESM3 -->
 
   <compset>
-    <alias>BLT1850</alias>
-    <lname>1850_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <alias>B1850C_LSC</alias>
+    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
-    <alias>BLTHIST</alias>
-    <lname>HIST_CAM70%LT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <alias>BHISTC_LSC</alias>
+    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
-    <alias>BMT1850</alias>
-    <lname>1850_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <alias>B1850C_MSC</alias>
+    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <compset>
-    <alias>BMTHIST</alias>
-    <lname>HIST_CAM70%MT_CLM51%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <alias>BHISTC_MSC</alias>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
 

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -46,12 +46,12 @@
 	<comment>20 ypd/ 7100 pe-hrs/simyr expected</comment>
 	<ntasks>
 	  <ntasks_atm>5400</ntasks_atm>
-	  <ntasks_lnd>939</ntasks_lnd>
-	  <ntasks_rof>64</ntasks_rof>
-	  <ntasks_ice>4397</ntasks_ice>
-	  <ntasks_ocn>488</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
+	  <ntasks_lnd>1792</ntasks_lnd>
+	  <ntasks_rof>1792</ntasks_rof>
+	  <ntasks_ice>3608</ntasks_ice>
+	  <ntasks_ocn>612</ntasks_ocn>
+	  <ntasks_glc>4</ntasks_glc>
+	  <ntasks_wav>1</ntasks_wav>
 	  <ntasks_cpl>5400</ntasks_cpl>
 	</ntasks>
 	<nthrds>
@@ -68,10 +68,10 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>1003</rootpe_ice>
-	  <rootpe_ocn>5400</rootpe_ocn>
-	  <rootpe_glc>0</rootpe_glc>
-	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_ice>1792</rootpe_ice>
+	  <rootpe_ocn>5404</rootpe_ocn>
+	  <rootpe_glc>5400</rootpe_glc>
+	  <rootpe_wav>5400</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>

diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
@@ -1,46 +1,46 @@
 <?xml version="1.0"?>
 <testlist version="2.0">
-  <test name="ERI" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="ERI" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>
     <options>
       <option name="wallclock"> 01:00:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
     </machines>
     <options>
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
     </machines>
     <options>
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="BLT1850_v0c" testmods="allactive/defaultio">
+  <test name="SMS_Ld2" grid="ne30pg3_t232" compset="B1850C_MSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
     </machines>
     <options>
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="MCC" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="MCC" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>
     <options>
       <option name="wallclock"> 02:00:00 </option>
     </options>
   </test>
-  <test name="ERS_D" grid="f09_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="ERS_D" grid="f09_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>
@@ -74,15 +74,15 @@
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="ERS_Ld7" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="ERS_Ld7" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho"   compiler="intel" category="prealpha"/>
     </machines>
     <options>
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="PET_PM" grid="ne30pg3_t232" compset="B1850" testmods="allactive/defaultiomi">
+  <test name="PET_PM" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultiomi">
     <machines>
       <machine name="derecho" compiler="gnu" category="prealpha"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
@@ -91,7 +91,7 @@
       <option name="wallclock"> 01:30:00 </option>
     </options>
   </test>
-  <test name="PFS" grid="ne30pg3_t232" compset="BLT1850_v0c" testmods="allactive/defaultio">
+  <test name="PFS" grid="ne30pg3_t232" compset="B1850C_MSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
       <machine name="derecho" compiler="intel" category="prebeta"/>
@@ -100,7 +100,7 @@
       <option name="wallclock"> 00:40:00 </option>
     </options>
   </test>
-  <test name="PFS" grid="f09_t232" compset="B1850" testmods="allactive/maxthroughputb">
+  <test name="PFS" grid="f09_t232" compset="B1850C_LSC" testmods="allactive/maxthroughputb">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_perf"/>
     </machines>
@@ -121,7 +121,7 @@
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="SMS_Ld7" grid="f09_t232" compset="B1850" testmods="allactive/defaultio">
+  <test name="SMS_Ld7" grid="f09_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>

diff --git a/components/cam b/components/cam
diff --git a/components/cism b/components/cism
diff --git a/components/clm b/components/clm
diff --git a/components/cmeps b/components/cmeps
diff --git a/components/mom b/components/mom
diff --git a/libraries/mpi-serial b/libraries/mpi-serial
+6 −1		component_grids_nuopc.xml
+1 −0		machines/cmake_macros/ubuntu-latest.cmake
+0 −71		maps_nuopc.xml
+6 −0		modelgrid_aliases_nuopc.xml
+6 −18		.github/workflows/testing.yml
+2 −1		CIME/XML/files.py
+8 −1		CIME/config.py
+0 −1		CIME/data/config/cesm/config_files.xml
+1 −1		CIME/scripts/query_config.py
+2 −2		CIME/tests/base.py
+7 −17		CIME/tests/test_sys_create_newcase.py
+1 −1		CIME/tests/test_sys_manage_and_query.py
+1 −1		CIME/utils.py
+0 −52		Externals.cfg
+0 −7		Externals_cime.cfg
+7 −20		docker/Dockerfile
+58 −37		docker/entrypoint.sh
+5 −5		.gitmodules
+37 −0		ChangeLog
+1 −1		ccs_config
+1 −1		cime
+1 −1		components/clm
+1 −1		components/cmeps
+1 −1		components/mosart
+1 −0		.git-blame-ignore-revs
+0 −4		.gitignore
+40 −0		.gitmodules
+3 −3		.lib/git-fleximod/git_fleximod/cli.py
+50 −31		.lib/git-fleximod/git_fleximod/git_fleximod.py
+1 −1		.lib/git-fleximod/git_fleximod/gitmodules.py
+6 −6		.lib/git-fleximod/git_fleximod/utils.py
+1 −1		.lib/git-fleximod/pyproject.toml
+1 −1		.lib/git-fleximod/tbump.toml
+2 −2		.lib/git-fleximod/tests/conftest.py
+6 −7		.lib/git-fleximod/tests/test_d_complex.py
+1 −1		README
+17 −14		README_GITFLEXIMOD.rst
+1 −0		bld/CLMBuildNamelist.pm
+1 −0		bld/namelist_files/namelist_defaults_ctsm.xml
+5 −0		bld/namelist_files/namelist_definition_ctsm.xml
+85 −11		cime_config/SystemTests/rxcropmaturity.py
+6 −0		cime_config/SystemTests/rxcropmaturityskipgen.py
+10 −0		cime_config/config_tests.xml
+1 −8		cime_config/testdefs/ExpectedTestFails.xml
+23 −1		cime_config/testdefs/testlist_clm.xml
+1 −1		cime_config/usermods_dirs/PLUMBER2/defaults/user_nl_datm_streams
+294 −0		doc/ChangeLog
+4 −0		doc/ChangeSum
+2 −2		doc/README.CHECKLIST.master_tags
+1 −1		python/ctsm/crop_calendars/check_constant_vars.py
+23 −11		python/ctsm/crop_calendars/check_rx_obeyed.py
+17 −4		python/ctsm/crop_calendars/check_rxboth_run.py
+23 −6		python/ctsm/crop_calendars/cropcal_module.py
+154 −0		python/ctsm/crop_calendars/interpolate_gdds.py
+3 −3		python/ctsm/run_sys_tests.py
+1 −1		python/ctsm/test/test_unit_gen_mksurfdata_jobscript_single.py
+3 −0		src/biogeochem/CMakeLists.txt
+1 −1		src/biogeochem/CNVegStateType.F90
+1 −1		src/biogeochem/CNVegetationFacade.F90
+281 −438		src/biogeochem/DustEmisBase.F90
+62 −0		src/biogeochem/DustEmisFactory.F90
+470 −0		src/biogeochem/DustEmisZender2003.F90
+1 −0		src/biogeochem/test/CMakeLists.txt
+6 −0		src/biogeochem/test/DustEmis_test/CMakeLists.txt
+291 −0		src/biogeochem/test/DustEmis_test/test_DustEmisZender2003.pf
+2 −0		src/biogeophys/CMakeLists.txt
+17 −0		src/biogeophys/CanopyStateType.F90
+18 −0		src/biogeophys/FrictionVelocityMod.F90
+15 −2		src/biogeophys/SaturatedExcessRunoffMod.F90
+80 −2		src/biogeophys/SoilStateInitTimeConstMod.F90
+1 −0		src/biogeophys/test/CMakeLists.txt
+6 −0		src/biogeophys/test/SoilStateInitTimeConst_test/CMakeLists.txt
+81 −0		src/biogeophys/test/SoilStateInitTimeConst_test/test_dust_soil_clay_functions.pf
+19 −18		src/cpl/nuopc/lnd_comp_nuopc.F90
+5 −6		src/main/clm_driver.F90
+9 −8		src/main/clm_instMod.F90
+2 −0		src/main/clm_varctl.F90
+6 −1		src/main/controlMod.F90
+4 −4		src/main/lnd2atmMod.F90
+1 −0		src/unit_test_shr/CMakeLists.txt
+251 −0		src/unit_test_shr/unittestDustEmisInputs.F90
+1 −0		src/unit_test_stubs/share_esmf/CMakeLists.txt
+88 −0		src/unit_test_stubs/share_esmf/ZenderSoilErodStreamType.F90
+1 −1		tools/mksurfdata_esmf/README.md
+0 −2		cesm/nuopc_cap_share/seq_drydep_mod.F90
+16 −11		mediator/med_fraction_mod.F90
+674 −0		COPYING
+0 −0		ChangeLog
+368 −0		INSTALL
+0 −1,048		Makefile.in
+0 −0		NEWS
+0 −7,385		configure
+1 −1		configure.ac
+0 −950		tests/Makefile.in