Merge branch 'bishtgautam/machinefiles/update-support-for-lbl-machine…

…s' (PR #1281) Adds support for LBL Lawrencium cluster [BFB]
E3SM-Project · Feb 22, 2017 · 6bf6754 · 6bf6754
2 parents 2324ac4 + 24e2f9f
commit 6bf6754
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 7 deletions.
diff --git a/cime_config/acme/machines/config_batch.xml b/cime_config/acme/machines/config_batch.xml
@@ -380,25 +380,21 @@
 
    <batch_system MACH="lawrencium-lr2" type="slurm" version="x.y">
      <directives>
-       <directive>--partition=lr2</directive>
        <directive>--ntasks-per-node={{ tasks_per_node }}</directive>
-       <directive>--account={{ project }}</directive>
        <directive>--exclusive</directive>
      </directives>
     <queues>
-      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr_normal</queue>
+      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr2</queue>
     </queues>
    </batch_system>
 
    <batch_system MACH="lawrencium-lr3" type="slurm" version="x.y">
      <directives>
-       <directive>--partition=lr3</directive>
        <directive>--ntasks-per-node={{ tasks_per_node }}</directive>
-       <directive>--account={{ project }}</directive>
        <directive>--exclusive</directive>
      </directives>
     <queues>
-      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr_normal</queue>
+      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr3</queue>
     </queues>
    </batch_system>
 

diff --git a/cime_config/acme/machines/config_machines.xml b/cime_config/acme/machines/config_machines.xml
@@ -2027,7 +2027,9 @@
   <SUPPORTED_BY>gbisht at lbl dot gov </SUPPORTED_BY>
   <GMAKE_J>4</GMAKE_J>
   <MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
+  <PES_PER_NODE>16</PES_PER_NODE>
   <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
+  <SAVE_TIMING_DIR>/global/scratch/$ENV{USER}</SAVE_TIMING_DIR>
   <mpirun mpilib="mpi-serial">
     <executable>mpirun</executable>
     <arguments>
@@ -2042,6 +2044,32 @@
       <arg name="tasks_per_node"> -npernode {{ tasks_per_node }}</arg>
     </arguments>
   </mpirun>
+  <module_system type="module">
+    <init_path lang="sh">/etc/profile.d/modules.sh</init_path>
+    <init_path lang="csh">/etc/profile.d/modules.csh</init_path>
+    <init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
+    <init_path lang="python">/usr/Modules/python.py</init_path>
+    <cmd_path lang="sh">module</cmd_path>
+    <cmd_path lang="csh">module</cmd_path>
+    <cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
+    <cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
+    <modules>
+      <command name="purge"/>
+      <command name="load">cmake</command>
+      <command name="load">perl xml-libxml switch python/2.7.11</command>
+    </modules>
+    <modules compiler="intel">
+      <command name="load">intel/2015.6.233</command>
+      <command name="load">mkl</command>
+    </modules>
+    <modules compiler="intel" mpilib="mpi-serial">
+      <command name="load">netcdf/4.4.0-intel-s</command>
+    </modules>
+    <modules compiler="intel" mpilib="!mpi-serial">
+      <command name="load">openmpi</command>
+      <command name="load">netcdf/4.4.0-intel-p</command>
+    </modules>
+     </module_system>
 </machine>
 
 <machine MACH="lawrencium-lr2">
@@ -2062,8 +2090,9 @@
   <SUPPORTED_BY>gbisht at lbl dot gov</SUPPORTED_BY>
   <GMAKE_J>4</GMAKE_J>
   <MAX_TASKS_PER_NODE>12</MAX_TASKS_PER_NODE>
+  <PES_PER_NODE>12</PES_PER_NODE>
   <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
-
+  <SAVE_TIMING_DIR>/global/scratch/$ENV{USER}</SAVE_TIMING_DIR>
   <mpirun mpilib="mpi-serial">
     <executable>mpirun</executable>
     <arguments>
@@ -2078,6 +2107,32 @@
       <arg name="tasks_per_node"> -npernode {{ tasks_per_node }}</arg>
     </arguments>
   </mpirun>
+  <module_system type="module">
+    <init_path lang="sh">/etc/profile.d/modules.sh</init_path>
+    <init_path lang="csh">/etc/profile.d/modules.csh</init_path>
+    <init_path lang="perl">/usr/Modules/init/perl.pm</init_path>
+    <init_path lang="python">/usr/Modules/python.py</init_path>
+    <cmd_path lang="sh">module</cmd_path>
+    <cmd_path lang="csh">module</cmd_path>
+    <cmd_path lang="perl">/usr/Modules/bin/modulecmd perl</cmd_path>
+    <cmd_path lang="python">/usr/Modules/bin/modulecmd python</cmd_path>
+    <modules>
+      <command name="purge"/>
+      <command name="load">cmake</command>
+      <command name="load">perl xml-libxml switch python/2.7.11</command>
+    </modules>
+    <modules compiler="intel">
+      <command name="load">intel/2015.6.233</command>
+      <command name="load">mkl</command>
+    </modules>
+    <modules compiler="intel" mpilib="mpi-serial">
+      <command name="load">netcdf/4.4.0-intel-s</command>
+    </modules>
+    <modules compiler="intel" mpilib="!mpi-serial">
+      <command name="load">openmpi</command>
+      <command name="load">netcdf/4.4.0-intel-p</command>
+    </modules>
+     </module_system>
 </machine>
 
 <default_run_suffix>

diff --git a/cime_config/acme/machines/config_pio.xml b/cime_config/acme/machines/config_pio.xml
@@ -52,6 +52,8 @@
       <value mach="hobart" compiler="pgi">netcdf</value>
       <value mach="oic2">netcdf</value>
       <value mach="oic5">netcdf</value>
+      <value mach="lawrencium-lr2">netcdf</value>
+      <value mach="lawrencium-lr3">netcdf</value>
       <value mach="cades">netcdf</value>
       <value mpilib="mpi-serial">netcdf</value>
     </values>