changes for cori-knl

ESMCI · Nov 29, 2016 · bd6739e · bd6739e
1 parent fe77599
commit bd6739e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/cime_config/cesm/machines/config_batch.xml b/cime_config/cesm/machines/config_batch.xml
@@ -362,6 +362,7 @@
    </batch_system>
 
    <batch_system MACH="cori-haswell" type="slurm" version="x.y">
+     <batch_submit>sbatch</batch_submit>
      <directives>
        <directive>-C haswell </directive>
      </directives>
@@ -371,6 +372,17 @@
      </queues>
    </batch_system>
 
+   <batch_system MACH="cori-knl" type="slurm" version="x.y">
+     <batch_submit>sbatch</batch_submit>
+     <directives>
+       <directive>-C knl </directive>
+     </directives>
+     <queues>
+       <queue walltimemax="06:00:00" jobmin="1" jobmax="45440">regular</queue>
+     <!--  <queue walltimemax="00:30:00" jobmin="1" jobmax="3072" default="true">debug</queue> -->
+     </queues>
+   </batch_system>
+
    <batch_system MACH="edison" type="slurm" version="x.y">
      <batch_submit>sbatch</batch_submit>
      <queues>

diff --git a/cime_config/cesm/machines/config_machines.xml b/cime_config/cesm/machines/config_machines.xml
@@ -293,8 +293,10 @@
   </machine>
 
   <machine MACH="cori-haswell">
-    <DESC>NERSC XC40 Haswell, os is CNL, 32 pes/node, batch system is Slurm</DESC>
+    <!-- NODENAME_REGEX makes haswell the default machine for cori -->
+    <!-- to make knl the default comment this line and uncomment the one in cori-knl -->
     <NODENAME_REGEX>cori</NODENAME_REGEX>
+    <DESC>NERSC XC40 Haswell, os is CNL, 32 pes/node, batch system is Slurm</DESC>
     <COMPILERS>intel,gnu,cray</COMPILERS>
     <MPILIBS>mpt,mpi-serial</MPILIBS>
     <CIME_OUTPUT_ROOT>$ENV{SCRATCH}</CIME_OUTPUT_ROOT>
@@ -396,6 +398,9 @@
     </environment_variables>
   </machine>
   <machine MACH="cori-knl">
+    <!-- NODENAME_REGEX makes haswell the default machine for cori -->
+    <!-- to make knl the default comment this line and uncomment the one in cori-knl -->
+    <!-- <NODENAME_REGEX>cori</NODENAME_REGEX> -->
     <DESC>NERSC XC* KNL, os is CNL, 68 pes/node, batch system is Slurm</DESC>
     <COMPILERS>intel,gnu,cray</COMPILERS>
     <MPILIBS>mpt,mpi-serial</MPILIBS>
@@ -446,7 +451,7 @@
 	<command name="rm">cray-netcdf-hdf5parallel</command>
 	<command name="rm">craype-sandybridge</command>
 	<command name="rm">craype-ivybridge</command>
-	<command name="rm">craype</command>
+	<command name="rm">craype-haswell</command>
       </modules>
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
@@ -470,6 +475,7 @@
 	<command name="switch">gcc gcc/6.1.0</command>
       </modules>
       <modules>
+	<command name="load">craype-mic-knl</command>
 	<command name="load">papi/5.4.3.2</command>
 	<command name="swap">craype craype/2.5.5</command>
       </modules>

diff --git a/driver_cpl/cime_config/config_component.xml b/driver_cpl/cime_config/config_component.xml
@@ -2974,14 +2974,6 @@
     <desc>Whether to clean the test after it is built/run</desc>
   </entry>
 
-  <entry id="CCSM_BASELINE">
-    <type>char</type>
-    <default_value>/UNSET</default_value>
-    <group>test</group>
-    <file>env_test.xml</file>
-    <desc>standard baselines root directory for testing</desc>
-  </entry>
-
   <entry id="CCSM_CPRNC">
     <type>char</type>
     <default_value>UNSET</default_value>
@@ -3511,7 +3503,7 @@
       <value compset="_CLM45.+CISM\d">TRUE</value>
       <value compset="_CLM50.+CISM\d">TRUE</value>
       <!-- Turn on two-way coupling for TG compsets - even though there are no
-	   feedbacks for a TG compset, this will give us additional diagnostics -->
+           feedbacks for a TG compset, this will give us additional diagnostics -->
       <value compset="_DLND.+CISM\d">TRUE</value>
     </values>
     <group>run_glc</group>
@@ -3649,5 +3641,3 @@
   </help>
 
 </entry_id>
-
-
diff --git a/utils/python/CIME/case_setup.py b/utils/python/CIME/case_setup.py
@@ -155,7 +155,8 @@ def _case_setup_impl(case, caseroot, clean=False, test_mode=False, reset=False):
 
         # creates the Macros.make, Depends.compiler, Depends.machine, Depends.machine.compiler
         # and env_mach_specific.xml if they don't already exist.
-        configure(Machines(machine=mach), caseroot, ["Makefile"], compiler, mpilib, debug, sysos)
+        if not os.path.isfile("Macros.make") or not os.path.isfile("env_mach_specific.xml"):
+            configure(Machines(machine=mach), caseroot, ["Makefile"], compiler, mpilib, debug, sysos)
 
         # Set tasks to 1 if mpi-serial library
         if mpilib == "mpi-serial":