Merge branch 'jgfouca/remove_cori' into master (PR #5742)

Remove cori cime_config settings. Machine has been decommissioned. [BFB]
E3SM-Project · Jun 8, 2023 · d1388dd · d1388dd
2 parents f497cb9 + 2681d31
commit d1388dd
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 1,343 deletions.
diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
diff --git a/cime_config/machines/cmake_macros/gnu_cori-haswell.cmake b/cime_config/machines/cmake_macros/gnu_cori-haswell.cmake
diff --git a/cime_config/machines/cmake_macros/gnu_cori-knl.cmake b/cime_config/machines/cmake_macros/gnu_cori-knl.cmake
diff --git a/cime_config/machines/cmake_macros/intel_cori-haswell.cmake b/cime_config/machines/cmake_macros/intel_cori-haswell.cmake
diff --git a/cime_config/machines/cmake_macros/intel_cori-knl.cmake b/cime_config/machines/cmake_macros/intel_cori-knl.cmake
diff --git a/cime_config/machines/config_batch.xml b/cime_config/machines/config_batch.xml
@@ -268,7 +268,7 @@
   </batch_system>
   <!-- for lawrence livermore computing -->
 
-  <!-- for NERSC machines: cori-haswell,cori-knl -->
+  <!-- for NERSC machines: perlmutter etc -->
   <batch_system type="nersc_slurm" >
     <batch_query per_job_arg="-j">squeue</batch_query>
     <batch_submit>sbatch</batch_submit>
@@ -423,26 +423,6 @@
       </queues>
     </batch_system>
 
-  <batch_system MACH="cori-haswell" type="nersc_slurm">
-     <directives>
-       <directive> --constraint=haswell</directive>
-     </directives>
-     <queues>
-       <queue walltimemax="00:30:00" nodemax="64" strict="true">debug</queue>
-       <queue walltimemax="01:00:00" default="true">regular</queue>
-     </queues>
-  </batch_system>
-
-  <batch_system MACH="cori-knl" type="nersc_slurm">
-    <directives>
-      <directive> --constraint=knl,quad,cache</directive>
-    </directives>
-    <queues>
-      <queue walltimemax="00:30:00" nodemax="512" strict="true">debug</queue>
-      <queue walltimemax="01:15:00" default="true">regular</queue>
-    </queues>
-  </batch_system>
-
   <batch_system MACH="miller" type="miller_slurm">
     <queues>
       <queue walltimemax="06:00:00" nodemax="800" default="true">collaboration</queue>