Updates for derecho

ESCOMP · Dec 8, 2023 · bf8510a · bf8510a
1 parent 9b1ff37
commit bf8510a
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 1 deletion.
diff --git a/Externals.cfg b/Externals.cfg
@@ -9,7 +9,7 @@ required = True
 local_path = components/cice
 
 [cime]
-tag = cime5.6.45
+tag = cime5.6.47
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 required = True

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -1243,6 +1243,44 @@
     </mach>
   </grid>
 
+  <grid name="a%10x15" >
+    <mach name="derecho" >
+      <pes pesize="any" compset="any">
+        <comment>none</comment>
+              <ntasks>
+                <ntasks_atm>36</ntasks_atm>
+                <ntasks_lnd>36</ntasks_lnd>
+                <ntasks_rof>36</ntasks_rof>
+                <ntasks_ice>36</ntasks_ice>
+                <ntasks_ocn>36</ntasks_ocn>
+                <ntasks_glc>36</ntasks_glc>
+                <ntasks_wav>36</ntasks_wav>
+                <ntasks_cpl>36</ntasks_cpl>
+              </ntasks>
+              <nthrds>
+                <nthrds_atm>1</nthrds_atm>
+                <nthrds_lnd>1</nthrds_lnd>
+                <nthrds_rof>1</nthrds_rof>
+                <nthrds_ice>1</nthrds_ice>
+                <nthrds_ocn>1</nthrds_ocn>
+                <nthrds_glc>1</nthrds_glc>
+                <nthrds_wav>1</nthrds_wav>
+                <nthrds_cpl>1</nthrds_cpl>
+              </nthrds>
+              <rootpe>
+                <rootpe_atm>0</rootpe_atm>
+                <rootpe_lnd>0</rootpe_lnd>
+                <rootpe_rof>0</rootpe_rof>
+                <rootpe_ice>0</rootpe_ice>
+                <rootpe_ocn>0</rootpe_ocn>
+                <rootpe_glc>0</rootpe_glc>
+                <rootpe_wav>0</rootpe_wav>
+                <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
+
   <grid name="any">
     <mach name="any">
       <pes pesize="any" compset="AR9[57]">
@@ -1260,6 +1298,44 @@
     </mach>
   </grid>
 
+  <grid name="a%ne0np4CONUS" >
+    <mach name="derecho" >
+      <pes pesize="any" compset="any">
+        <comment>none</comment>
+              <ntasks>
+                <ntasks_atm>-35</ntasks_atm>
+                <ntasks_lnd>-35</ntasks_lnd>
+                <ntasks_rof>-35</ntasks_rof>
+                <ntasks_ice>-35</ntasks_ice>
+                <ntasks_ocn>-35</ntasks_ocn>
+                <ntasks_glc>-35</ntasks_glc>
+                <ntasks_wav>-35</ntasks_wav>
+                <ntasks_cpl>-35</ntasks_cpl>
+              </ntasks>
+              <nthrds>
+                <nthrds_atm>1</nthrds_atm>
+                <nthrds_lnd>1</nthrds_lnd>
+                <nthrds_rof>1</nthrds_rof>
+                <nthrds_ice>1</nthrds_ice>
+                <nthrds_ocn>1</nthrds_ocn>
+                <nthrds_glc>1</nthrds_glc>
+                <nthrds_wav>1</nthrds_wav>
+                <nthrds_cpl>1</nthrds_cpl>
+              </nthrds>
+              <rootpe>
+                <rootpe_atm>0</rootpe_atm>
+                <rootpe_lnd>0</rootpe_lnd>
+                <rootpe_rof>0</rootpe_rof>
+                <rootpe_ice>0</rootpe_ice>
+                <rootpe_ocn>0</rootpe_ocn>
+                <rootpe_glc>0</rootpe_glc>
+                <rootpe_wav>0</rootpe_wav>
+                <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
+
   <overrides>
     <grid name="any" >
       <mach name="any" >

diff --git a/test/system/archive_baseline.sh b/test/system/archive_baseline.sh
@@ -111,6 +111,16 @@ case $hostname in
     baselinedir="/glade/p/cesm/amwg/cesm_baselines/$cam_tag"
   ;;
 
+  de*)
+    echo "server: derecho"
+    if [ -z "$CAM_FC" ]; then
+      CAM_FC="INTEL"
+    fi
+    test_file_list="tests_pretag_derecho"
+    cam_tag=$1
+    baselinedir="/glade/campaign/cesm/community/amwg/cam_baselines/$cam_tag"
+  ;;
+
   * ) echo "ERROR: machine $hostname not currently supported"; exit 1 ;;
 esac