Merge branch 'bishtgautam/machinefiles/lbl-lawrencium' (PR #1495)

Minor updates of NETCDF path and queue for the LBL Lawrencium cluster [BFB]
ESMCI · May 12, 2017 · 7511657 · 7511657
2 parents 38fce72 + f682a0c
commit 7511657
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/config/acme/machines/config_batch.xml b/config/acme/machines/config_batch.xml
@@ -366,19 +366,23 @@
    </batch_system>
 
    <batch_system MACH="lawrencium-lr2" type="slurm" >
+     <submit_args>
+       <arg flag="--qos" name="condo_esd2"/>
+     </submit_args>
      <directives>
        <directive>--ntasks-per-node={{ tasks_per_node }}</directive>
-       <directive>--exclusive</directive>
      </directives>
     <queues>
-      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr2</queue>
+      <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr3</queue>
     </queues>
    </batch_system>
 
    <batch_system MACH="lawrencium-lr3" type="slurm" >
+     <submit_args>
+       <arg flag="--qos" name="condo_esd2"/>
+     </submit_args>
      <directives>
        <directive>--ntasks-per-node={{ tasks_per_node }}</directive>
-       <directive>--exclusive</directive>
      </directives>
     <queues>
       <queue walltimemin="0" walltimemax="01:00:00" jobmin="0" jobmax="64" default="true">lr3</queue>

diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml
@@ -1241,11 +1241,13 @@ for mct, etc.
 </compiler>
 
 <compiler COMPILER="intel" MACH="lawrencium-lr2">
+        <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
 	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
 	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
 </compiler>
 
 <compiler COMPILER="intel" MACH="lawrencium-lr3">
+        <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
 	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
 	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
 </compiler>