Merge branch 'jgfouca/skybrige_config_mirror' (PR #5)

Mirror skybridge changes from machines to machines-acme [BFB] * jgfouca/skybrige_config_mirror: Mirror skybridge changes from machines to machines-acme
ESMCI · Jul 29, 2015 · a9a1f95 · a9a1f95
2 parents d88a744 + 6f24f31
commit a9a1f95
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 0 deletions.
diff --git a/machines-acme/config_batch.xml b/machines-acme/config_batch.xml
@@ -140,6 +140,15 @@
      <directive>-A ees</directive>
      <directive>-l gres=lscratchd</directive>
    </directives>
+   </batch_system>
+
+     <!-- skybridge is slurm -->
+
+   <batch_system MACH="skybridge" version="x.y">
+     <directives>
+       <directive>--account={{ project }}</directive>
+       <directive>--partition={{ queue }}</directive>
+     </directives>
    </batch_system>
 
   <!-- all pleiades machines are PBS -->

diff --git a/machines-acme/config_compilers.xml b/machines-acme/config_compilers.xml
@@ -456,6 +456,18 @@ for mct, etc.
   <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
 </compiler>
 
+<compiler COMPILER="intel" MACH="skybridge">
+  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
+  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
+  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
+  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
+  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
+  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/projects/ccsm/BLAS-intel -lblas_LINUX</ADD_SLIBS>
+  <ADD_CPPFLAGS> -DHAVE_COMM_F2C </ADD_CPPFLAGS>
+  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
+</compiler>
+
 <compiler COMPILER="gnu" MACH="yellowstone">
   <LAPACK_LIBDIR> /glade/apps/opt/lib </LAPACK_LIBDIR>
 </compiler>

diff --git a/machines-acme/config_machines.xml b/machines-acme/config_machines.xml
@@ -750,6 +750,47 @@
      </mpirun>
 </machine>
 
+<machine MACH="skybridge">
+         <DESC>SNL clust</DESC>
+	 <COMPILERS>intel</COMPILERS>
+	 <MPILIBS>openmpi,mpi-serial</MPILIBS>
+         <OS>LINUX</OS>
+         <CESMSCRATCHROOT>/gscratch/$USER/acme_scratch/skybridge</CESMSCRATCHROOT>
+         <RUNDIR>$CESMSCRATCHROOT/$CASE/run</RUNDIR>
+         <EXEROOT>$CESMSCRATCHROOT/$CASE/bld</EXEROOT>
+         <DIN_LOC_ROOT>/projects/ccsm/inputdata</DIN_LOC_ROOT>
+         <DIN_LOC_ROOT_CLMFORC>/glade/proj2/cgd/tss</DIN_LOC_ROOT_CLMFORC>
+         <DOUT_S_ROOT>$CESMSCRATCHROOT/archive/$CASE</DOUT_S_ROOT>               <!-- complete path to a short term archiving directory -->
+         <DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT>           <!-- complete path to a long term archiving directory -->
+         <CCSM_BASELINE>/projects/ccsm/ccsm_baselines</CCSM_BASELINE>
+         <CCSM_CPRNC>$CCSMROOT/tools/cprnc/build/cprnc</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
+         <BATCHQUERY>qstat</BATCHQUERY>
+         <BATCHSUBMIT>sbatch</BATCHSUBMIT>
+         <BATCHREDIRECT></BATCHREDIRECT>
+         <SUPPORTED_BY>cseg</SUPPORTED_BY>
+         <GMAKE_J>4</GMAKE_J>
+         <MAX_TASKS_PER_NODE>8</MAX_TASKS_PER_NODE>
+	 <PIO_BUFFER_SIZE_LIMIT>1</PIO_BUFFER_SIZE_LIMIT>
+         <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
+         <batch_system type="slurm" version="x.y">
+           <queues>
+             <queue jobmin="1" jobmax="480" default="true">ec</queue>
+           </queues>
+           <walltimes>
+             <walltime default="true">0:50:00</walltime>
+             <walltime ccsm_estcost="0">1:50:00</walltime>
+             <walltime ccsm_estcost="1">4:00:00</walltime>
+           </walltimes>
+         </batch_system>
+         <mpirun mpilib="default">
+           <executable>mpirun</executable>
+           <arguments>
+             <arg name="num_tasks"> -np {{ num_tasks }}</arg>
+             <arg name="tasks_per_node"> -npernode {{ tasks_per_node }}</arg>
+           </arguments>
+         </mpirun>
+</machine>
+
 <machine MACH="blues">
          <DESC>ANL/LCRC Linux Cluster</DESC>
          <COMPILERS>intel,gnu,pgi</COMPILERS>