more compset updates

ESCOMP · Nov 15, 2024 · 5d96dbe · 5d96dbe
1 parent b59852b
commit 5d96dbe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,9 +28,9 @@
 
 [submodule "ccs_config"]
         path = ccs_config
-        url = https://github.com/ESMCI/ccs_config_cesm.git
+        url = https://github.com/jedwards4b/ccs_config_cesm.git
         fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
-        fxtag = ccs_config_cesm1.0.10
+        fxtag = ccs_config_cesm1.0.10_update_default_ww3grid
         fxrequired = ToplevelRequired
 
 [submodule "cime"]

diff --git a/ccs_config b/ccs_config
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -52,6 +52,10 @@
     <alias>B1850C_MTso</alias>
     <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
+  <compset>
+    <alias>BMT1850</alias>
+    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
+  </compset>
   <compset>
     <alias>BHISTC_MTso</alias>
     <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
@@ -71,6 +75,10 @@
     <alias>B1850C_LTso</alias>
     <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
+  <compset>
+    <alias>BLT1850</alias>
+    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
+  </compset>
   <compset>
     <alias>BHISTC_LTso</alias>
     <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -75,7 +75,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="M" compset="CAM.*%MT.*MOM6%[^_]*MARBL-BIO">
+<!--      <pes pesize="M" compset="CAM.*%MT.*MOM6%[^_]*MARBL-BIO">
 	<comment></comment>
 	<ntasks>
 	  <ntasks_atm>5400</ntasks_atm>
@@ -107,10 +107,10 @@
 	  <rootpe_wav>0</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
-      </pes>
+      </pes> -->
       <pes pesize="XL" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
 	<comment>20 ypd/ 7100 pe-hrs/simyr expected</comment>
-	<ntasks>
+  	<ntasks>
 	  <ntasks_atm>5400</ntasks_atm>
 	  <ntasks_lnd>1792</ntasks_lnd>
 	  <ntasks_rof>1792</ntasks_rof>
@@ -154,7 +154,7 @@
 	  <ntasks_ice>3608</ntasks_ice>
 	  <ntasks_ocn>3300</ntasks_ocn>
 	  <ntasks_glc>4</ntasks_glc>
-	  <ntasks_wav>1</ntasks_wav>
+	  <ntasks_wav>64</ntasks_wav>
 	  <ntasks_cpl>5400</ntasks_cpl>
 	</ntasks>
 	<nthrds>
+0 −664		component_grids_mct.xml
+0 −59		config_grids_mct.xml
+0 −1,220		maps_mct.xml
+0 −1,261		modelgrid_aliases_mct.xml
+6 −3		modelgrid_aliases_nuopc.xml