diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
index 6bf273f03ded..b82eb059f7f8 100644
--- a/config/acme/machines/config_machines.xml
+++ b/config/acme/machines/config_machines.xml
@@ -60,7 +60,7 @@
   <DESC>NERSC XC30, os is CNL, 24 pes/node, batch system is SLURM</DESC>
   <NODENAME_REGEX>edison</NODENAME_REGEX>
   <TESTS>acme_developer</TESTS>
-  <COMPILERS>intel,intel17,gnu,cray</COMPILERS>
+  <COMPILERS>intel,gnu</COMPILERS>
   <MPILIBS>mpt</MPILIBS>
   <CIME_OUTPUT_ROOT>$ENV{CSCRATCH}/acme_scratch/edison</CIME_OUTPUT_ROOT>
   <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
@@ -85,7 +85,8 @@
     <arguments>
       <arg name="label"> --label</arg>
       <arg name="num_tasks" > -n $TOTALPES</arg>
-      <arg name="thread_count" > -c $ENV{OMP_NUM_THREADS}</arg>
+      <arg name="thread_count"> -c $SHELL{echo 48/`./xmlquery --value MAX_TASKS_PER_NODE`*$ENV{OMP_NUM_THREADS} | bc }</arg>
+      <arg name="binding"> $SHELL{if [ 24 -ge `./xmlquery --value MAX_TASKS_PER_NODE` ]; then echo "--cpu_bind=cores"; else echo "--cpu_bind=threads"; fi} </arg>
     </arguments>
   </mpirun>
   <module_system type="module">
@@ -117,7 +118,6 @@
       <command name="rm">craype-ivybridge</command>
       <command name="rm">craype</command>
       <command name="rm">papi</command>
-      <command name="rm">cmake</command>
       <command name="rm">cray-petsc</command>
       <command name="rm">esmf</command>
     </modules>
@@ -125,68 +125,54 @@
     <modules compiler="intel">
       <command name="load">PrgEnv-intel</command>
       <command name="rm">intel</command>
-      <command name="load">intel/15.0.1.133</command>
+      <command name="load">intel/17.0.2.174</command>
       <command name="rm">cray-libsci</command>
-      <command name="load">cray-mpich/7.2.5</command>
-    </modules>
-    <modules compiler="intel17">
-      <command name="load">PrgEnv-intel</command>
-      <command name="rm">intel</command>
-      <command name="load">intel/17.0.1.132</command>
-      <command name="rm">cray-libsci</command>
-      <command name="load">cray-mpich/7.5.1</command>
-    </modules>
-    <modules compiler="cray">
-      <command name="load">PrgEnv-cray</command>
-      <command name="switch">cce cce/8.5.1</command>
-      <command name="switch">cray-libsci/16.07.1</command>
-      <command name="load">cray-mpich/7.5.1</command>
     </modules>
     <modules compiler="gnu">
       <command name="load">PrgEnv-gnu</command>
-      <command name="switch">gcc gcc/6.2.0</command>
-      <command name="switch">cray-libsci/16.07.1</command>
-      <command name="load">cray-mpich/7.5.1</command>
+      <command name="rm">gcc</command>
+      <command name="load">gcc/6.3.0</command>
+      <command name="rm">cray-libsci</command>
+      <command name="load">cray-libsci/17.06.1</command>
     </modules>
 
     <modules>
+      <command name="load">cray-mpich/7.6.0</command>
+
       <command name="rm">craype</command>
-      <command name="load">craype/2.5.5</command>
+      <command name="load">craype/2.5.12.3</command>
       <command name="load">craype-ivybridge</command>
       <command name="rm">pmi</command>
-      <command name="load">pmi/5.0.10-1.0000.11050.0.0.ari</command>
+      <command name="load">pmi/5.0.12</command>
     </modules>
 
     <modules mpilib="mpi-serial">
+      <command name="rm">cray-netcdf-hdf5parallel</command>
+      <command name="rm">cray-hdf5-parallel</command>
+      <command name="rm">cray-parallel-netcdf</command>
       <command name="load">cray-hdf5/1.8.16</command>
       <command name="load">cray-netcdf/4.4.0</command>
     </modules>
     <modules mpilib="!mpi-serial">
+      <command name="rm">cray-netcdf-hdf5parallel</command>
       <command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
       <command name="load">cray-hdf5-parallel/1.8.16</command>
       <command name="load">cray-parallel-netcdf/1.6.1</command>
     </modules>
-    <modules>
-      <command name="load">git/2.4.6</command>
-      <command name="load">papi/5.4.3.2</command>
-      <command name="load">perl/5.20.0</command>
-      <command name="load">cmake/3.3.2</command>
-      <!--command name="load">cray-petsc/3.5.3.0</command-->
-    </modules>
   </module_system>
 
   <environment_variables>
     <env name="MPICH_ENV_DISPLAY">1</env>
     <env name="MPICH_VERSION_DISPLAY">1</env>
     <env name="MPICH_CPUMASK_DISPLAY">1</env>
+
     <env name="OMP_STACKSIZE">64M</env>
+    <env name="OMP_PROC_BIND">spread</env>
+    <env name="OMP_PLACES">threads</env>
   </environment_variables>
   <environment_variables compiler="intel">
     <env name="FORT_BUFFERED">yes</env>
   </environment_variables>
-  <environment_variables compiler="intel17">
-    <env name="FORT_BUFFERED">yes</env>
-  </environment_variables>
 </machine>
 
 <machine MACH="cori-haswell">
@@ -221,7 +207,7 @@
 	<arg name="num_tasks" > -n $TOTALPES</arg>
         <!--NOTE: hard-coding -c 2 for now, which is only optimal when using full node with no hyper-threading. (ndk) -->
 	<arg name="thread_count" > -c 2 </arg>
-	<!--arg name="binding" > dash-dash-cpu_bind=cores</arg-->
+	<arg name="binding" > --cpu_bind=cores</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -289,10 +275,14 @@
       </modules>
 
       <modules mpilib="mpi-serial">
+        <command name="rm">cray-netcdf-hdf5parallel</command>
+        <command name="rm">cray-hdf5-parallel</command>
+        <command name="rm">cray-parallel-netcdf</command>
 	<command name="load">cray-hdf5/1.8.16</command>
 	<command name="load">cray-netcdf/4.4.0</command>
       </modules>
       <modules mpilib="!mpi-serial">
+	<command name="rm">cray-netcdf-hdf5parallel</command>
 	<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
 	<command name="load">cray-hdf5-parallel/1.8.16</command>
 	<command name="load">cray-parallel-netcdf/1.7.0</command>
@@ -302,7 +292,6 @@
         <command name="load">git/2.9.1</command>
 	<command name="load">cmake/3.3.2</command>
 	<command name="load">pmi/5.0.10-1.0000.11069.183.8.ari</command>
-	<command name="load">papi/5.4.3.2</command>
 	<command name="load">zlib/1.2.8</command>
       </modules>
     </module_system>
@@ -423,7 +412,9 @@
       </modules>
 
       <modules mpilib="mpi-serial">
-	<command name="rm">cray-netcdf-hdf5parallel</command>
+        <command name="rm">cray-netcdf-hdf5parallel</command>
+        <command name="rm">cray-hdf5-parallel</command>
+        <command name="rm">cray-parallel-netcdf</command>
 	<command name="load">cray-hdf5/1.8.16</command>
 	<command name="load">cray-netcdf/4.4.0</command>
       </modules>
@@ -437,9 +428,7 @@
         <command name="load">git/2.9.1</command>
 	<command name="load">cmake/3.3.2</command>
 	<command name="load">pmi/5.0.10-1.0000.11069.183.8.ari</command>
-	<command name="load">papi/5.4.3.2</command>
 	<command name="load">zlib/1.2.8</command>
-	<!--command name="load">cray-petsc/3.7.0.0</command-->
       </modules>
     </module_system>
 
@@ -529,7 +518,6 @@
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
     <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
     <BASELINE_ROOT>/sems-data-store/ACME/baselines</BASELINE_ROOT>
-    <SAVE_TIMING_DIR>/sems-data-store/ACME/timings</SAVE_TIMING_DIR>
     <CCSM_CPRNC>/sems-data-store/ACME/cprnc/build.new/cprnc</CCSM_CPRNC>
     <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
 <!--    <GMAKE>make</GMAKE> <- this doesn't actually work! -->
@@ -594,7 +582,6 @@
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
     <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
     <BASELINE_ROOT>/sems-data-store/ACME/baselines</BASELINE_ROOT>
-    <SAVE_TIMING_DIR>/sems-data-store/ACME/timings</SAVE_TIMING_DIR>
     <CCSM_CPRNC>/sems-data-store/ACME/cprnc/build/cprnc</CCSM_CPRNC>
     <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
 <!--    <GMAKE>make</GMAKE> <- this doesn't actually work! -->
@@ -633,6 +620,7 @@
         <command name="load">sems-openmpi/1.8.7</command>
         <command name="load">sems-cmake/2.8.12</command>
         <command name="load">sems-netcdf/4.4.1/exo_parallel</command>
+        <command name="load">sems-boost/1.58.0/base</command>
       </modules>
     </module_system>
     <environment_variables>
@@ -659,7 +647,6 @@
     <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
     <BASELINE_ROOT>/home/climate1/acme/baselines</BASELINE_ROOT>
     <CCSM_CPRNC>/home/climate1/acme/cprnc/build/cprnc</CCSM_CPRNC>
-    <SAVE_TIMING_DIR>$CIME_OUTPUT_ROOT/timings</SAVE_TIMING_DIR>
     <BATCHQUERY></BATCHQUERY>
     <BATCHSUBMIT></BATCHSUBMIT>
     <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
@@ -722,8 +709,7 @@
   <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/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 -->
   <BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
-  <CCSM_CPRNC>/projects/ccsm/cprnc/build.new/cprnc_wrap</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
-  <SAVE_TIMING_DIR>/projects/ccsm/timings</SAVE_TIMING_DIR>
+  <CCSM_CPRNC>/projects/ccsm/cprnc/build.toss3/cprnc_wrap</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
   <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
   <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
   <GMAKE_J>8</GMAKE_J>
@@ -736,21 +722,20 @@
   <mpirun mpilib="default">
     <executable>mpiexec</executable>
     <arguments>
-      <arg name="bind"> --bind-to-core</arg>
       <arg name="num_tasks"> --n $TOTALPES</arg>
-      <arg name="tasks_per_node"> --npernode $PES_PER_NODE</arg>
+      <arg name="tasks_per_node"> --map-by ppr:{{ tasks_per_numa }}:socket:PE=$ENV{OMP_NUM_THREADS} --bind-to core</arg>
     </arguments>
   </mpirun>
   <mpirun mpilib="mpi-serial">
     <executable></executable>
   </mpirun>
   <module_system type="module">
-    <init_path lang="python">/usr/share/Modules/init/python.py</init_path>
-    <init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
-    <init_path lang="sh">/usr/share/Modules/init/sh</init_path>
-    <init_path lang="csh">/usr/share/Modules/init/csh</init_path>
-    <cmd_path lang="python">/usr/bin/modulecmd python</cmd_path>
-    <cmd_path lang="perl">/usr/bin/modulecmd perl</cmd_path>
+    <init_path lang="python">/usr/share/lmod/lmod/init/python.py</init_path>
+    <init_path lang="perl">/usr/share/lmod/lmod/init/perl.pm</init_path>
+    <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+    <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
+    <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
+    <cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
     <cmd_path lang="csh">module</cmd_path>
     <cmd_path lang="sh">module</cmd_path>
     <modules>
@@ -760,27 +745,18 @@
       <command name="load">sems-python/2.7.9</command>
       <command name="load">sems-cmake</command>
       <command name="load">gnu/4.9.2</command>
-      <command name="load">intel/intel-15.0.3.187</command>
-      <command name="load">libraries/intel-mkl-15.0.2.164</command>
+      <command name="load">sems-intel/16.0.2</command>
+      <command name="load">mkl/16.0</command>
     </modules>
     <modules mpilib="!mpi-serial">
-      <command name="load">openmpi-intel/1.6</command>
-      <command name="load">sems-hdf5/1.8.12/parallel</command>
+      <command name="load">sems-openmpi/1.10.5</command>
       <command name="load">sems-netcdf/4.4.1/exo_parallel</command>
     </modules>
     <modules mpilib="mpi-serial">
-      <command name="load">sems-hdf5/1.8.12/base</command>
       <command name="load">sems-netcdf/4.4.1/exo</command>
     </modules>
   </module_system>
   <environment_variables>
-    <!-- <env name="PATH">/projects/ccsm/cmake-2.8.10.2-Linux-i386/bin:$PATH</env> -->
-    <!-- <env name="PATH">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/bin:$ENV{PATH}</env> -->
-    <!-- <env name="LD_LIBRARY_PATH">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/lib:$ENV{LD_LIBRARY_PATH}</env> -->
-    <!-- <env name="NETCDF_INCLUDES">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/include</env> -->
-    <!-- <env name="NETCDF_LIBS">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/lib</env> -->
-    <!-- <env name="NETCDFROOT">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5</env> -->
-    <!-- <env name="PNETCDFROOT">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5</env> -->
     <env name="NETCDFROOT">$ENV{SEMS_NETCDF_ROOT}</env>
     <env name="NETCDF_INCLUDES">$ENV{SEMS_NETCDF_ROOT}/include</env>
     <env name="NETCDF_LIBS">$ENV{SEMS_NETCDF_ROOT}/lib</env>
@@ -808,7 +784,6 @@
   <DOUT_L_MSROOT>USERDEFINED_optional_run</DOUT_L_MSROOT>           <!-- complete path to a long term archiving directory -->
   <BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
   <CCSM_CPRNC>/projects/ccsm/cprnc/build.new/cprnc_wrap</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
-  <SAVE_TIMING_DIR>/projects/ccsm/timings</SAVE_TIMING_DIR>
   <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
   <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
   <GMAKE_J>8</GMAKE_J>
@@ -816,14 +791,13 @@
   <PES_PER_NODE>16</PES_PER_NODE>
   <PIO_BUFFER_SIZE_LIMIT>1</PIO_BUFFER_SIZE_LIMIT>
   <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
-  <PROJECT>fy150001</PROJECT>
+  <PROJECT>fy150001P</PROJECT>
 
   <mpirun mpilib="default">
     <executable>mpiexec</executable>
     <arguments>
-      <arg name="bind"> --bind-to-core</arg>
       <arg name="num_tasks"> --n $TOTALPES</arg>
-      <arg name="tasks_per_node"> --npernode $PES_PER_NODE</arg>
+      <arg name="tasks_per_node"> --map-by ppr:{{ tasks_per_numa }}:socket:PE=$ENV{OMP_NUM_THREADS} --bind-to core</arg>
     </arguments>
   </mpirun>
   <mpirun mpilib="mpi-serial">
@@ -859,13 +833,6 @@
     </modules>
   </module_system>
   <environment_variables>
-    <!-- <env name="PATH">/projects/ccsm/cmake-2.8.10.2-Linux-i386/bin:$PATH</env> -->
-    <!-- <env name="PATH">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/bin:$ENV{PATH}</env> -->
-    <!-- <env name="LD_LIBRARY_PATH">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/lib:$ENV{LD_LIBRARY_PATH}</env> -->
-    <!-- <env name="NETCDF_INCLUDES">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/include</env> -->
-    <!-- <env name="NETCDF_LIBS">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5/lib</env> -->
-    <!-- <env name="NETCDFROOT">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5</env> -->
-    <!-- <env name="PNETCDFROOT">/projects/ccsm/tpl/netcdf/4.3.2/intel/13.0.1/openmpi/1.6.5</env> -->
     <env name="NETCDFROOT">$ENV{SEMS_NETCDF_ROOT}</env>
     <env name="NETCDF_INCLUDES">$ENV{SEMS_NETCDF_ROOT}/include</env>
     <env name="NETCDF_LIBS">$ENV{SEMS_NETCDF_ROOT}/lib</env>
@@ -876,14 +843,80 @@
   </environment_variables>
 </machine>
 
+<machine MACH="ghost">
+  <DESC>SNL clust</DESC>
+  <NODENAME_REGEX>ghost-login</NODENAME_REGEX>
+  <PROXY>wwwproxy.sandia.gov:80</PROXY>
+  <TESTS>acme_integration</TESTS>
+  <COMPILERS>intel</COMPILERS>
+  <MPILIBS>openmpi,mpi-serial</MPILIBS>
+  <OS>LINUX</OS>
+  <CIME_OUTPUT_ROOT>/gscratch/$USER/acme_scratch/ghost</CIME_OUTPUT_ROOT>
+  <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
+  <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
+  <DIN_LOC_ROOT>/projects/ccsm/inputdata</DIN_LOC_ROOT>
+  <DIN_LOC_ROOT_CLMFORC>/projects/ccsm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+  <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/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 -->
+  <BASELINE_ROOT>/projects/ccsm/ccsm_baselines</BASELINE_ROOT>
+  <CCSM_CPRNC>/projects/ccsm/cprnc/build.toss3/cprnc_wrap</CCSM_CPRNC>                <!-- path to the cprnc tool used to compare netcdf history files in testing -->
+  <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
+  <SUPPORTED_BY>jgfouca at sandia dot gov</SUPPORTED_BY>
+  <GMAKE_J>8</GMAKE_J>
+  <MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
+  <PES_PER_NODE>36</PES_PER_NODE>
+  <PIO_BUFFER_SIZE_LIMIT>1</PIO_BUFFER_SIZE_LIMIT>
+  <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
+  <PROJECT>fy150001</PROJECT>
+
+  <mpirun mpilib="default">
+    <executable>mpiexec</executable>
+    <arguments>
+      <arg name="num_tasks"> --n $TOTALPES</arg>
+      <arg name="tasks_per_node"> --map-by ppr:{{ tasks_per_numa }}:socket:PE=$ENV{OMP_NUM_THREADS} --bind-to core</arg>
+    </arguments>
+  </mpirun>
+  <mpirun mpilib="mpi-serial">
+    <executable></executable>
+  </mpirun>
+  <module_system type="module">
+    <init_path lang="python">/usr/share/lmod/lmod/init/python.py</init_path>
+    <init_path lang="perl">/usr/share/lmod/lmod/init/perl.pm</init_path>
+    <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+    <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
+    <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path>
+    <cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path>
+    <cmd_path lang="csh">module</cmd_path>
+    <cmd_path lang="sh">module</cmd_path>
+    <modules>
+      <command name="purge"/>
+      <command name="load">sems-env</command>
+      <command name="load">sems-git</command>
+      <command name="load">sems-python/2.7.9</command>
+      <command name="load">sems-cmake</command>
+      <command name="load">gnu/4.9.2</command>
+      <command name="load">sems-intel/16.0.2</command>
+      <command name="load" mpilib="!mpi-serial">sems-openmpi/1.10.5</command>
+      <command name="load">mkl/16.0</command>
+      <command name="load">sems-netcdf/4.4.1/exo_parallel</command>
+    </modules>
+  </module_system>
+  <environment_variables>
+    <env name="NETCDFROOT">$ENV{SEMS_NETCDF_ROOT}</env>
+    <env name="PNETCDFROOT" mpilib="!mpi-serial">$ENV{SEMS_NETCDF_ROOT}</env>
+    <env name="NETCDF_INCLUDES">$ENV{SEMS_NETCDF_ROOT}/include</env>
+    <env name="NETCDF_LIBS">$ENV{SEMS_NETCDF_ROOT}/lib</env>
+    <env name="OMP_STACKSIZE">64M</env>
+  </environment_variables>
+</machine>
+
 <machine MACH="blues">
          <DESC>ANL/LCRC Linux Cluster</DESC>
-         <NODENAME_REGEX>b.*.lcrc.anl.gov</NODENAME_REGEX>
+         <NODENAME_REGEX>blogin.*.lcrc.anl.gov</NODENAME_REGEX>
          <TESTS>acme_integration</TESTS>
          <COMPILERS>gnu,pgi,intel,nag</COMPILERS>
          <MPILIBS>mvapich,mpich,openmpi</MPILIBS>
          <CIME_OUTPUT_ROOT>/lcrc/project/$PROJECT/$USER/acme_scratch</CIME_OUTPUT_ROOT>
-	 <SAVE_TIMING_DIR>/lcrc/project/$PROJECT</SAVE_TIMING_DIR>
 	 <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
 	 <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
          <DIN_LOC_ROOT>/home/ccsm-data/inputdata</DIN_LOC_ROOT>
@@ -906,6 +939,12 @@
              <arg name="num_tasks"> -n $TOTALPES </arg>
            </arguments>
          </mpirun>
+         <mpirun mpilib="mpich">
+           <executable>mpiexec</executable>
+           <arguments>
+             <arg name="num_tasks"> -n $TOTALPES </arg>
+           </arguments>
+         </mpirun>
          <mpirun mpilib="mpi-serial">
              <executable></executable>
          </mpirun>
@@ -914,21 +953,39 @@
       <init_path lang="sh">/etc/profile.d/a_softenv.sh</init_path>
       <cmd_path lang="csh">soft</cmd_path>
       <cmd_path lang="sh">soft</cmd_path>
+      <modules>
+        <command name="add">+cmake-2.8.12</command>
+        <command name="add">+python-2.7</command>
+      </modules>
       <modules compiler="gnu">
 	<command name="add">+gcc-5.2</command>
 	<command name="add">+netcdf-4.3.3.1-gnu5.2-serial</command>
-	<command name="add">+cmake-2.8.12</command>
-	<command name="add">+python-2.7</command>
 	<command name="add">+mvapich2-2.2b-gcc-5.2</command>
       </modules>
       <modules compiler="intel">
-	<command name="add">+cmake-2.8.12</command>
-	<command name="add">+python-2.7</command>
 	<command name="add">+intel-15.0</command>
 	<command name="add">+pnetcdf-1.6.1-mvapich2-2.2a-intel-15.0</command>
 	<command name="add">+mvapich2-2.2b-intel-15.0</command>
 	<command name="add">+mkl-11.2.1</command>
       </modules>
+      <modules compiler="pgi">
+        <command name="add">+pgi-15.7</command>
+        <command name="add">+binutils-2.27</command>
+        <command name="add">+netcdf-c-4.4.1-f77-4.4.4-pgi-15.7-serial</command>
+      </modules>
+      <modules compiler="pgi" mpilib="!mpi-serial">
+        <command name="add">+mvapich2-2.2-pgi-15.7</command>
+        <command name="add">+pnetcdf-1.7.0-pgi-15.7-mvapich2-2.2</command>
+      </modules>
+      <modules compiler="nag">
+        <command name="add">+nag-6.0</command>
+        <command name="add">+hdf5-1.8.12-serial-nag</command>
+        <command name="add">+netcdf-4.3.1-serial-nag</command>
+      </modules>
+      <modules compiler="nag" mpilib="!mpi-serial">
+        <command name="add">+mpich3-3.1.4-nag-6.0</command>
+        <command name="add">+pnetcdf-1.6.1-mpich-3.1.4-nag-6.0</command>
+      </modules>
     </module_system>
     <environment_variables compiler="gnu">
       <env name="NETCDFROOT">/soft/netcdf_serial/4.3.3.1/gnu-5.2</env>
@@ -947,6 +1004,18 @@
     <environment_variables compiler="intel" mpilib="mvapich">
       <env name="PNETCDFROOT">/soft/climate/pnetcdf/1.6.1/intel-15.0.1/mvapich2-2.2a-intel-15.0</env>
     </environment_variables>
+    <environment_variables compiler="pgi">
+      <env name="NETCDFROOT">/soft/spack-0.10.0/opt/spack/linux-centos6-x86_64/pgi-15.7-0/netcdf-4.4.1-4el54ak5ic4ukbfxknv64ejvlum2kmy7</env>
+    </environment_variables>
+    <environment_variables compiler="pgi" mpilib="mvapich">
+      <env name="PNETCDFROOT">/soft/spack-0.10.0/opt/spack/linux-centos6-x86_64/pgi-15.7-0/parallel-netcdf-1.7.0-htrulk5hgp3jjci2f72srr5ujkg6q4i6</env>
+    </environment_variables>
+    <environment_variables compiler="nag">
+      <env name="NETCDFROOT">/soft/netcdf/4.3.1-serial/nag-6.0</env>
+    </environment_variables>
+    <environment_variables compiler="nag" mpilib="mpich">
+      <env name="PNETCDFROOT">/home/robl/soft/pnetcf-trunk-mpich-3.1.4-nag-6.0</env>
+    </environment_variables>
     <environment_variables>
       <env name="OMP_STACKSIZE">64M</env>
     </environment_variables>
@@ -954,7 +1023,7 @@
 
 <machine MACH="anvil">
          <DESC>ANL/LCRC Linux Cluster</DESC>
-         <NODENAME_REGEX>b.*.lcrc.anl.gov</NODENAME_REGEX>
+         <NODENAME_REGEX>blogin.*.lcrc.anl.gov</NODENAME_REGEX>
          <TESTS>acme_integration</TESTS>
          <COMPILERS>intel,gnu,pgi</COMPILERS>
          <MPILIBS>mvapich,openmpi</MPILIBS>
@@ -1044,7 +1113,7 @@
     <environment_variables mpilib="!mpi-serial">
       <env name="PNETCDF_PATH">$SHELL{which pnetcdf_version | xargs dirname | xargs dirname}</env>
     </environment_variables>
-    <environment_variables>
+    <environment_variables SMP_PRESENT="TRUE">
       <env name="OMP_STACKSIZE">256M</env>
       <env name="OMP_PROC_BIND">spread</env>
       <env name="OMP_PLACES">threads</env>
@@ -1052,10 +1121,89 @@
       <env name="KMP_HOT_TEAMS_MODE">1</env>
       <env name="KMP_HOT_TEAMS_MAX_LEVEL">1</env>
     </environment_variables>
+    <environment_variables SMP_PRESENT="FALSE" mpilib="mvapich">
+      <env name="MV2_ENABLE_AFFINITY">1</env>
+      <env name="MV2_USE_SHARED_MEM">1</env>
+      <env name="MV2_SMP_USE_CMA">1</env>
+    </environment_variables>
+</machine>
+
+<machine MACH="bebop">
+    <DESC>ANL/LCRC Cluster, Cray CS400, 352-nodes Xeon Phi 7230 KNLs 64C/1.3GHz + 672-nodes Xeon E5-2695v4 Broadwells 36C/2.10GHz, Intel Omni-Path network, SLURM batch system, Lmod module environment.</DESC>
+    <NODENAME_REGEX>beboplogin.*</NODENAME_REGEX>
+    <TESTS>acme_developer</TESTS>
+    <COMPILERS>intel,gnu</COMPILERS>
+    <MPILIBS>impi,mpich,mvapich,openmpi,mpi-serial</MPILIBS>
+    <CIME_OUTPUT_ROOT>/lcrc/group/acme/$USER/acme_scratch/bebop</CIME_OUTPUT_ROOT>
+    <RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
+    <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
+    <DIN_LOC_ROOT>/home/ccsm-data/inputdata</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/home/ccsm-data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
+    <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
+    <BASELINE_ROOT>/lcrc/group/acme/acme_baselines/bebop</BASELINE_ROOT>
+    <CCSM_CPRNC>/lcrc/group/acme/tools/cprnc/cprnc</CCSM_CPRNC>
+    <OS>LINUX</OS>
+    <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
+    <SUPPORTED_BY>acme</SUPPORTED_BY>
+    <GMAKE_J>8</GMAKE_J>
+    <MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
+    <PES_PER_NODE>36</PES_PER_NODE>
+    <PROJECT>acme</PROJECT>
+    <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
+    <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
+    <mpirun mpilib="default"> 
+      <executable>mpirun</executable>
+      <arguments>
+        <arg name="num_tasks" > -n $TOTALPES</arg>
+      </arguments>
+    </mpirun>
+    <module_system type="module">
+      <init_path lang="sh">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/sh</init_path>
+      <init_path lang="csh">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/csh</init_path>
+      <init_path lang="perl">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/perl</init_path>
+      <init_path lang="python">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/init/env_modules_python.py</init_path>
+      <cmd_path lang="perl">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/libexec/lmod perl</cmd_path>
+      <cmd_path lang="python">/home/software/spack-0.10.1/opt/spack/linux-centos7-x86_64/gcc-4.8.5/lmod-7.4.9-ic63herzfgw5u3na5mdtvp3nwxy6oj2z/lmod/lmod/libexec/lmod python</cmd_path>
+      <cmd_path lang="sh">module</cmd_path>
+      <cmd_path lang="csh">module</cmd_path>
+      <modules>
+        <command name="purge"></command>
+      </modules>
+      <modules compiler="intel">
+        <command name="load">intel/17.0.4-74uvhji</command>
+        <command name="load">intel-mkl/2017.3.196-jyjmyut</command>
+      </modules>
+      <modules compiler="gnu">
+        <command name="load">gcc/7.1.0-4bgguyp</command>
+      </modules>
+      <modules mpilib="impi">
+        <command name="load">intel-mpi/2017.3-dfphq6k</command>
+      </modules>
+      <modules>
+        <command name="load">cmake</command>
+	<command name="load">netcdf/4.4.1.1-prsuusl</command>
+        <command name="load">netcdf-fortran/4.4.4-ojwazvy</command>
+        <command name="load">parallel-netcdf/1.8.1</command>
+      </modules>
+    </module_system>
+    <environment_variables>
+      <env name="NETCDF_PATH">$SHELL{which nf-config | xargs dirname | xargs dirname}</env>
+      <env name="PNETCDF_PATH" mpilib="!mpi-serial">$SHELL{which pnetcdf_version | xargs dirname | xargs dirname}</env>
+      <env name="PATH">/lcrc/group/acme/soft/perl/5.26.0/bin:$ENV{PATH}</env>
+    </environment_variables>
+    <environment_variables SMP_PRESENT="TRUE">
+      <env name="OMP_STACKSIZE">128M</env>
+      <env name="OMP_PROC_BIND">spread</env>
+      <env name="OMP_PLACES">threads</env>
+    </environment_variables>
+    <environment_variables>
+      <env mpilib="impi" name="I_MPI_FABRICS">shm:tmi</env>
+    </environment_variables>
 </machine>
 
 <machine MACH="cetus">
-         <DESC>ANL IBM BG/Q, os is BGP, 16 cores/node, batch system is cobalt</DESC>
+         <DESC>ANL IBM BG/Q, os is BGQ, 16 cores/node, batch system is cobalt</DESC>
          <NODENAME_REGEX>cetus</NODENAME_REGEX>
          <TESTS>acme_developer</TESTS>
          <COMPILERS>ibm</COMPILERS>
@@ -1069,7 +1217,6 @@
          <DOUT_L_MSROOT>/home/$USER/csm/$CASE/</DOUT_L_MSROOT>
          <BASELINE_ROOT>/projects/ccsm/ccsm_baselines/</BASELINE_ROOT>
          <CCSM_CPRNC>/projects/ccsm/tools/cprnc/cprnc</CCSM_CPRNC>
-         <SAVE_TIMING_DIR>/projects/$PROJECT</SAVE_TIMING_DIR>
          <OS>BGQ</OS>
          <BATCH_SYSTEM>cobalt</BATCH_SYSTEM>
          <SUPPORTED_BY>   jayesh -at- mcs.anl.gov</SUPPORTED_BY>
@@ -1077,21 +1224,16 @@
          <PES_PER_NODE>4</PES_PER_NODE>
          <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
          <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
-	 <PROJECT>HiRes_EarthSys_2</PROJECT>
+         <PROJECT>ClimateEnergy_2</PROJECT>
          <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
          <mpirun mpilib="default">
            <executable>/usr/bin/runjob</executable>
              <arguments>
-               <arg name="label"> --label short</arg>
-               <!-- Ranks per node!! -->
-               <arg name="tasks_per_node"> --ranks-per-node $PES_PER_NODE</arg>
-               <!-- Total MPI Tasks -->
-               <arg name="num_tasks"> --np $TOTALPES</arg>
-               <arg name="locargs"> --block $COBALT_PARTNAME $LOCARGS</arg>
-               <arg name="bg_threadlayout"> --envs BG_THREADLAYOUT=1</arg>
-	       <arg name="xl_bg_spreadlayout"> --envs XL_BG_SPREADLAYOUT=YES</arg>
-               <arg name="omp_stacksize"> --envs OMP_STACKSIZE=64M</arg>
-               <arg name="thread_count"> --envs OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</arg>
+               <arg name="label">--label short</arg>
+               <arg name="tasks_per_node">--ranks-per-node $PES_PER_NODE</arg>
+               <arg name="num_tasks">--np $TOTALPES</arg>
+               <arg name="locargs">--block $COBALT_PARTNAME $LOCARGS</arg>
+               <arg name="bgq_smp_vars">$ENV{BGQ_SMP_VARS}</arg>
              </arguments>
          </mpirun>
     <module_system type="soft">
@@ -1108,8 +1250,10 @@
     </module_system>
     <environment_variables>
       <env name="MPI_TYPE_MAX">10000</env>
-      <env name="OMP_DYNAMIC">FALSE</env>
-      <env name="OMP_STACKSIZE">64M</env>
+      <env name="BGQ_SMP_VARS"></env>
+    </environment_variables>
+    <environment_variables SMP_PRESENT="TRUE">
+      <env name="BGQ_SMP_VARS">--envs BG_THREADLAYOUT=1 XL_BG_SPREADLAYOUT=YES OMP_DYNAMIC=FALSE OMP_STACKSIZE=64M OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</env>
     </environment_variables>
 </machine>
 
@@ -1133,7 +1277,6 @@
          <MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
 	 <PES_PER_NODE>16</PES_PER_NODE>
 	 <BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
-	 <SAVE_TIMING_DIR>/usr/gdata/climdat/timing_performance</SAVE_TIMING_DIR>
 	 <mpirun mpilib="mpi-serial">
 	   <executable></executable>
 	 </mpirun>
@@ -1190,7 +1333,6 @@
          <MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
 	 <PES_PER_NODE>16</PES_PER_NODE>
 	 <BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
-	 <SAVE_TIMING_DIR>/usr/gdata/climdat/timing_performance</SAVE_TIMING_DIR>
 	 <mpirun mpilib="mpi-serial">
 	   <executable></executable>
 	 </mpirun>
@@ -1227,8 +1369,65 @@
 	 </environment_variables>
 </machine>
 
+   <!-- All users must setup the appropriate environment on quartz before they can compile the code,
+        Issue the following command:
+            . /usr/workspace/wsa/climdat/spack/share/spack/setup-env.sh
+        note there is 1-space between . and / in the beginning.  This should mount all the needed modules.
+        In order to have access you must be a member of the 'climdat' group.  -->
+<machine MACH="quartz">
+         <DESC>LLNL Linux Cluster, Linux (pgi), 36 pes/node, batch system is Slurm</DESC>
+         <COMPILERS>intel</COMPILERS>
+         <MPILIBS>mpich,mpi-serial</MPILIBS>
+         <RUNDIR>/p/lscratchh/$CCSMUSER/ACME/$CASE/run</RUNDIR>
+         <EXEROOT>/p/lscratchh/$CCSMUSER/$CASE/bld</EXEROOT>
+         <CIME_OUTPUT_ROOT>/p/lscratchh/$USER</CIME_OUTPUT_ROOT>
+         <DIN_LOC_ROOT>/usr/gdata/climdat/ccsm3data/inputdata</DIN_LOC_ROOT>
+         <DIN_LOC_ROOT_CLMFORC>/usr/gdata/climdat/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+         <DOUT_S_ROOT>/p/lscratchh/$CCSMUSER/archive/$CASE</DOUT_S_ROOT>
+         <DOUT_L_HTAR>FALSE</DOUT_L_HTAR>
+         <DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
+         <BASELINE_ROOT>/p/lscratchh/$CCSMUSER/ccsm_baselines</BASELINE_ROOT>
+         <CCSM_CPRNC>/p/lscratchd/ma21/ccsm3data/tools/cprnc/cprnc</CCSM_CPRNC>
+         <OS>LINUX</OS>
+         <SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
+         <GMAKE_J>8</GMAKE_J>
+         <MAX_TASKS_PER_NODE>36</MAX_TASKS_PER_NODE>
+	 <PES_PER_NODE>36</PES_PER_NODE>
+	 <BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
+	 <mpirun mpilib="mpi-serial">
+	   <executable></executable>
+	 </mpirun>
+         <mpirun mpilib="default">
+           <executable>srun</executable>
+         </mpirun>
+	 <module_system type="module_lmod">
+	      <init_path lang="python">/usr/share/lmod/lmod/init/env_modules_python.py</init_path> 
+ 	      <init_path lang="perl">/usr/share/lmod/lmod/init/perl</init_path> 
+	      <init_path lang="sh">/usr/share/lmod/lmod/init/sh</init_path>
+	      <init_path lang="csh">/usr/share/lmod/lmod/init/csh</init_path>
+	      <cmd_path lang="csh">module</cmd_path>
+	      <cmd_path lang="sh">module</cmd_path>
+	      <cmd_path lang="python">/usr/share/lmod/lmod/libexec/lmod python</cmd_path> 
+ 	      <cmd_path lang="perl">/usr/share/lmod/lmod/libexec/lmod perl</cmd_path> 
+	   <modules compiler="intel">
+             <command name="unload">mvapich2</command>
+             <command name="unload">intel</command>
+	     <command name="load">python/3.5.1</command>
+	     <command name="load">git/2.8.3</command>
+	     <command name="load">intel/17.0.0</command>
+	     <command name="load">mvapich2/2.2</command>
+	     <command name="load">netcdf-fortran-4.4.4-intel-17.0.0-4naprkr</command> 
+	     <command name="load">parallel-netcdf-1.8.0-intel-17.0.0-gy2hic6</command>
+	   </modules>
+	 </module_system>
+	 <environment_variables compiler="intel">
+	   <env name="NETCDFROOT">/usr/workspace/wsa/climdat/spack/opt/spack/linux-rhel7-x86_64/intel-17.0.0/netcdf-fortran-4.4.4-4naprkre2m7kriadyxwboauil7nc3jtc/</env> 
+           <env name="PNETCDFROOT" mpilib="!mpi-serial">/usr/workspace/wsa/climdat/spack/opt/spack/linux-rhel7-x86_64/intel-17.0.0/parallel-netcdf-1.8.0-gy2hic6n3hkygcczpumkcqmzw5sam7hn/</env>
+	 </environment_variables> 
+</machine>
+
 <machine MACH="mira">
-         <DESC>ANL IBM BG/Q, os is BGP, 16 cores/node, batch system is cobalt</DESC>
+         <DESC>ANL IBM BG/Q, os is BGQ, 16 cores/node, batch system is cobalt</DESC>
 	 <NODENAME_REGEX>mira.*</NODENAME_REGEX>
          <TESTS>acme_developer</TESTS>
          <COMPILERS>ibm</COMPILERS>
@@ -1250,21 +1449,16 @@
          <PES_PER_NODE>4</PES_PER_NODE>
          <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
          <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
-	 <PROJECT>HiRes_EarthSys_2</PROJECT>
+         <PROJECT>ClimateEnergy_2</PROJECT>
          <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
          <mpirun mpilib="default">
            <executable>/usr/bin/runjob</executable>
              <arguments>
-               <arg name="label"> --label short</arg>
-               <!-- Ranks per node!! -->
-               <arg name="tasks_per_node"> --ranks-per-node $PES_PER_NODE</arg>
-               <!-- Total MPI Tasks -->
-               <arg name="num_tasks"> --np $TOTALPES</arg>
-               <arg name="locargs"> --block $COBALT_PARTNAME $LOCARGS</arg>
-               <arg name="bg_threadlayout"> --envs BG_THREADLAYOUT=1</arg>
-	       <arg name="xl_bg_spreadlayout"> --envs XL_BG_SPREADLAYOUT=YES</arg>
-               <arg name="omp_stacksize"> --envs OMP_STACKSIZE=64M</arg>
-               <arg name="thread_count"> --envs OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</arg>
+               <arg name="label">--label short</arg>
+               <arg name="tasks_per_node">--ranks-per-node $PES_PER_NODE</arg>
+               <arg name="num_tasks">--np $TOTALPES</arg>
+               <arg name="locargs">--block $COBALT_PARTNAME $LOCARGS</arg>
+               <arg name="bgq_smp_vars">$ENV{BGQ_SMP_VARS}</arg>
              </arguments>
          </mpirun>
     <module_system type="soft">
@@ -1281,8 +1475,10 @@
     </module_system>
     <environment_variables>
       <env name="MPI_TYPE_MAX">10000</env>
-      <env name="OMP_DYNAMIC">FALSE</env>
-      <env name="OMP_STACKSIZE">64M</env>
+      <env name="BGQ_SMP_VARS"></env>
+    </environment_variables>
+    <environment_variables SMP_PRESENT="TRUE">
+      <env name="BGQ_SMP_VARS">--envs BG_THREADLAYOUT=1 XL_BG_SPREADLAYOUT=YES OMP_DYNAMIC=FALSE OMP_STACKSIZE=64M OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</env>
     </environment_variables>
 </machine>
 
@@ -1292,21 +1488,20 @@
     <TESTS>acme_developer</TESTS>
     <COMPILERS>intel,gnu,cray</COMPILERS>
     <MPILIBS>mpt</MPILIBS>
-    <CIME_OUTPUT_ROOT>/projects/EarlyPerf_theta/acme/scratch/$USER</CIME_OUTPUT_ROOT>
-    <DIN_LOC_ROOT>/projects/EarlyPerf_theta/acme/inputdata</DIN_LOC_ROOT>
-    <DIN_LOC_ROOT_CLMFORC>/projects/EarlyPerf_theta/acme/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+    <CIME_OUTPUT_ROOT>/projects/$PROJECT/$USER</CIME_OUTPUT_ROOT>
+    <DIN_LOC_ROOT>/projects/$PROJECT/acme/inputdata</DIN_LOC_ROOT>
+    <DIN_LOC_ROOT_CLMFORC>/projects/$PROJECT/acme/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
-    <DOUT_L_MSROOT>/projects/EarlyPerf_theta/acme/csm/$CASE</DOUT_L_MSROOT>
-    <CCSM_BASELINE>/projects/EarlyPerf_theta/acme/baselines</CCSM_BASELINE>
-    <CCSM_CPRNC>/projects/EarlyPerf_theta/acme/tools/cprnc</CCSM_CPRNC>
-    <SAVE_TIMING_DIR>/projects/EarlyPerf_theta/acme</SAVE_TIMING_DIR>
+    <DOUT_L_MSROOT>$CIME_OUTPUT_ROOT/csm/$CASE</DOUT_L_MSROOT>
+    <CCSM_BASELINE>/projects/$PROJECT/acme/baselines</CCSM_BASELINE>
+    <CCSM_CPRNC>/projects/$PROJECT/acme/tools/cprnc/cprnc</CCSM_CPRNC>
     <OS>CNL</OS>
     <BATCH_SYSTEM>cobalt_theta</BATCH_SYSTEM>
     <SUPPORTED_BY>acme</SUPPORTED_BY>
     <GMAKE_J>8</GMAKE_J>
     <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
     <PES_PER_NODE>64</PES_PER_NODE>
-    <PROJECT>Theta_ESP</PROJECT>
+    <PROJECT>OceanClimate</PROJECT>
     <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
     <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
     <mpirun mpilib="default">
@@ -1329,47 +1524,47 @@
       <cmd_path lang="sh">module</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
       <modules>
+        <command name="rm">craype-mic-knl</command>
         <command name="rm">PrgEnv-intel</command>
         <command name="rm">PrgEnv-cray</command>
         <command name="rm">PrgEnv-gnu</command>
         <command name="rm">intel</command>
         <command name="rm">cce</command>
+        <command name="rm">cray-mpich</command>
         <command name="rm">cray-parallel-netcdf</command>
         <command name="rm">cray-hdf5-parallel</command>
-        <command name="rm">pmi</command>
-        <command name="rm">cray-libsci</command>
-        <command name="rm">cray-mpich</command>
-        <command name="rm">cray-netcdf</command>
         <command name="rm">cray-hdf5</command>
+        <command name="rm">cray-netcdf</command>
         <command name="rm">cray-netcdf-hdf5parallel</command>
+        <command name="rm">cray-libsci</command>
         <command name="rm">craype</command>
       </modules>
+      <modules>
+        <command name="load">craype/2.5.11</command>
+      </modules>
       <modules compiler="intel">
-        <command name="load">PrgEnv-intel/6.0.3</command>
-        <command name="switch">intel intel/17.0.2.174</command>
-        <command name="rm">cray-libsci</command>
+        <command name="load">PrgEnv-intel/6.0.4</command>
+        <command name="load">intel/17.0.4.196</command>
       </modules>
       <modules compiler="cray">
-        <command name="load">PrgEnv-cray/6.0.3</command>
-        <command name="switch">cce cce/8.5.4</command>
+        <command name="load">PrgEnv-cray/6.0.4</command>
+        <command name="load">cce/8.6.0</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">PrgEnv-gnu/6.0.3</command>
-        <command name="switch">gcc gcc/6.2.0</command>
-      </modules>
-      <modules>
-        <command name="swap">craype craype/2.5.9</command>
+        <command name="load">PrgEnv-gnu/6.0.4</command>
+        <command name="load">gcc/6.3.0</command>
       </modules>
       <modules compiler="!intel">
-        <command name="switch">cray-libsci/16.09.1</command>
+        <command name="switch">cray-libsci/17.06.1</command>
       </modules>
       <modules>
-        <command name="load">cray-mpich/7.5.3</command>
+        <command name="load">craype-mic-knl</command>
+        <command name="load">cray-mpich/7.6.0</command>
       </modules>
       <modules mpilib="mpt">
-        <command name="load">cray-netcdf-hdf5parallel/4.4.1.1</command>
-        <command name="load">cray-hdf5-parallel/1.10.0.1</command>
-        <command name="load">cray-parallel-netcdf/1.8.0</command>
+        <command name="load">cray-netcdf-hdf5parallel/4.4.1.1.3</command>
+        <command name="load">cray-hdf5-parallel/1.10.0.3</command>
+        <command name="load">cray-parallel-netcdf/1.8.1.3</command>
       </modules>
     </module_system>
     <environment_variables>
@@ -1397,7 +1592,6 @@
     <DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
     <BASELINE_ROOT>/lustre/climate/acme_baselines</BASELINE_ROOT>
     <CCSM_CPRNC>/lustre/climate/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
-    <SAVE_TIMING_DIR>/lustre/climate/timing_acme</SAVE_TIMING_DIR>
     <GMAKE_J>8</GMAKE_J>
     <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
     <SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
@@ -1471,7 +1665,6 @@
     <DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
     <CCSM_BASELINE>/dtemp/sing201/acme/acme_baselines</CCSM_BASELINE>
     <CCSM_CPRNC>/dtemp/sing201/acme/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
-    <SAVE_TIMING_DIR>/dtemp/sing201/acme/timing_acme</SAVE_TIMING_DIR>
     <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
     <SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
     <GMAKE_J>8</GMAKE_J>
@@ -1523,7 +1716,7 @@
       <env name="COMPILER">intel</env>
     </environment_variables>
   </machine>
-
+  
 <machine MACH="constance">
          <DESC>PNL Haswell cluster, OS is Linux, batch system is SLURM</DESC>
          <OS>LINUX</OS>
@@ -1539,7 +1732,6 @@
          <DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
          <BASELINE_ROOT>/pic/projects/climate/acme_baselines</BASELINE_ROOT>
          <CCSM_CPRNC>/pic/projects/climate/acme_baselines/cprnc/cprnc</CCSM_CPRNC>
-	 <SAVE_TIMING_DIR>/pic/projects/climate/csmdata/</SAVE_TIMING_DIR>
 	 <BATCH_SYSTEM>slurm</BATCH_SYSTEM>
          <SUPPORTED_BY>balwinder.singh -at- pnnl.gov</SUPPORTED_BY>
          <GMAKE_J>8</GMAKE_J>
@@ -1795,7 +1987,7 @@
     <PROJECT>cli115</PROJECT>
     <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
     <mpirun mpilib="default">
-      <executable args="default">aprun</executable>
+      <executable>aprun</executable>
       <arguments>
 	<!-- <arg name="hyperthreading" default="2"> -j {{ hyperthreading }}</arg>
         <arg name="tasks_per_numa" > -S {{ tasks_per_numa }}</arg>
@@ -1838,7 +2030,7 @@
         <command name="rm">PrgEnv-intel</command>
         <command name="rm">PrgEnv-pathscale</command>
         <command name="load">PrgEnv-pgi</command>
-        <command name="switch">pgi pgi/15.9.lustre</command>
+        <command name="switch">pgi 17.5.lustre</command>
         <command name="rm">cray-mpich</command>
         <command name="rm">cray-libsci</command>
         <command name="rm">atp</command>
@@ -1851,12 +2043,13 @@
         <command name="load">cudatoolkit</command>
       </modules>
       <modules compiler="pgi">
+        <command name="use">/ccs/home/norton/.modules</command>
         <command name="rm">PrgEnv-cray</command>
         <command name="rm">PrgEnv-gnu</command>
         <command name="rm">PrgEnv-intel</command>
         <command name="rm">PrgEnv-pathscale</command>
         <command name="load">PrgEnv-pgi</command>
-        <command name="switch">pgi pgi/15.7.0</command>
+        <command name="switch">pgi pgi/17.5.lustre</command>
         <command name="rm">cray-mpich</command>
         <command name="rm">cray-libsci</command>
         <command name="rm">atp</command>
@@ -1900,58 +2093,56 @@
         <command name="load">cray-netcdf-hdf5parallel/4.4.1.1</command>
         <command name="load">cray-parallel-netcdf/1.7.0</command>
       </modules>
+    </module_system>
+    <!-- Default -->
+    <environment_variables>
+      <env name="COMPILER">$COMPILER</env>
+      <env name="MPILIB">$MPILIB</env>
+      <env name="MPICH_ENV_DISPLAY">1</env>
+      <env name="MPICH_VERSION_DISPLAY">1</env>
+      <env name="MPICH_CPUMASK_DISPLAY">1</env>
+      <env name="MPSTKZ">128M</env>
+      <env name="OMP_STACKSIZE">128M</env>
+    </environment_variables>
 
-      <!-- Default -->
-      <environment_variables>
-        <env name="COMPILER">$COMPILER</env>
-        <env name="MPILIB">$MPILIB</env>
-        <env name="MPICH_ENV_DISPLAY">1</env>
-        <env name="MPICH_VERSION_DISPLAY">1</env>
-        <env name="MPICH_CPUMASK_DISPLAY">1</env>
-        <env name="MPSTKZ">128M</env>
-        <env name="OMP_STACKSIZE">128M</env>
-      </environment_variables>
-
-      <!-- Set if compiler and mpilib  -->
-      <environment_variables compiler="pgiacc">
-        <!-- NOTE(wjs, 2015-03-12) The following line is needed for bit-for-bit reproducibility -->
-        <env name="CRAY_CPU_TARGET">istanbul</env>
-        <env name="CRAY_CUDA_MPS">1</env>
-	<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/PGI/15.3/</env>
-      </environment_variables>
-
-      <environment_variables compiler="pgiacc" mpilib="!mpi-serial">
-	<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/PGI/15.3</env>
-      </environment_variables>
+    <!-- Set if compiler and mpilib  -->
+    <environment_variables compiler="pgiacc">
+      <!-- NOTE(wjs, 2015-03-12) The following line is needed for bit-for-bit reproducibility -->
+      <env name="CRAY_CPU_TARGET">istanbul</env>
+      <env name="CRAY_CUDA_MPS">1</env>
+<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/PGI/15.3/</env>
+    </environment_variables>
 
-      <environment_variables compiler="pgi" >
-        <!-- NOTE(wjs, 2015-03-12) The following line is needed for bit-for-bit reproducibility -->
-        <env name="CRAY_CPU_TARGET">istanbul</env>
-	<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/PGI/15.3/</env>
-      </environment_variables>
+    <environment_variables compiler="pgiacc" mpilib="!mpi-serial">
+<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/PGI/15.3</env>
+    </environment_variables>
 
-      <environment_variables compiler="pgi" mpilib="!mpi-serial">
-	<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/PGI/15.3</env>
-      </environment_variables>
+    <environment_variables compiler="pgi" >
+      <!-- NOTE(wjs, 2015-03-12) The following line is needed for bit-for-bit reproducibility -->
+      <env name="CRAY_CPU_TARGET">istanbul</env>
+<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/PGI/15.3/</env>
+    </environment_variables>
 
-      <environment_variables compiler="intel">
-        <env name="CRAYPE_LINK_TYPE">dynamic</env>
-	<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/INTEL/15.0/</env>
-      </environment_variables>
+    <environment_variables compiler="pgi" mpilib="!mpi-serial">
+<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/PGI/15.3</env>
+    </environment_variables>
 
-      <environment_variables compiler="intel" mpilib="!mpi-serial">
-	<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/INTEL/15.0</env>
-      </environment_variables>
+    <environment_variables compiler="intel">
+      <env name="CRAYPE_LINK_TYPE">dynamic</env>
+<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/INTEL/15.0/</env>
+    </environment_variables>
 
-      <environment_variables compiler="cray">
-	<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/CRAY/8.3/</env>
-      </environment_variables>
+    <environment_variables compiler="intel" mpilib="!mpi-serial">
+<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/INTEL/15.0</env>
+    </environment_variables>
 
-      <environment_variables compiler="cray" mpilib="!mpi-serial">
-	<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/CRAY/8.3</env>
-      </environment_variables>
+    <environment_variables compiler="cray">
+<env name="NETCDFROOT">/opt/cray/netcdf-hdf5parallel/4.4.1.1/CRAY/8.3/</env>
+    </environment_variables>
 
-    </module_system>
+    <environment_variables compiler="cray" mpilib="!mpi-serial">
+<env name="PNETCDFROOT">/opt/cray/parallel-netcdf/1.7.0/CRAY/8.3</env>
+    </environment_variables>
 </machine>
 
 <machine MACH="eos">
@@ -2047,7 +2238,7 @@
 </machine>
 
 <machine MACH="grizzly">
-	<DESC>LANL Linux Cluster, 36 pes/node, batch system Moab</DESC>
+	<DESC>LANL Linux Cluster, 36 pes/node, batch system slurm</DESC>
         <NODENAME_REGEX>gr-fe.*.lanl.gov</NODENAME_REGEX>
         <TESTS>acme_developer</TESTS>
         <COMPILERS>gnu,intel</COMPILERS>
@@ -2061,7 +2252,6 @@
 	<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
 	<BASELINE_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/ccsm_baselines</BASELINE_ROOT>
 	<CIME_OUTPUT_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/scratch</CIME_OUTPUT_ROOT>
-	<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
 	<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
 	<module_system type="module">
 		<init_path lang="perl">/usr/share/Modules/init/perl.pm</init_path>
@@ -2101,7 +2291,7 @@
 		<env name="PNETCDF_HINTS">romio_ds_write=disable;romio_ds_read=disable;romio_cb_write=enable;romio_cb_read=enable</env>
 	</environment_variables>
 
-	<BATCH_SYSTEM>moab</BATCH_SYSTEM>
+	<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
 	<mpirun mpilib="default">
 		<executable>mpirun</executable>
 		<arguments>
@@ -2132,7 +2322,7 @@
 </machine>
 
 <machine MACH="wolf">
-    <DESC>LANL Linux Cluster, 16 pes/node, batch system Moab</DESC>
+    <DESC>LANL Linux Cluster, 16 pes/node, batch system slurm</DESC>
     <NODENAME_REGEX>wf-fe.*.lanl.gov</NODENAME_REGEX>
     <TESTS>acme_developer</TESTS>
 	<COMPILERS>intel,gnu</COMPILERS>
@@ -2143,7 +2333,7 @@
 	<DOUT_S_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/archive/$CASE</DOUT_S_ROOT>
 	<DOUT_L_MSROOT>UNSET</DOUT_L_MSROOT>
 	<OS>LINUX</OS>
-	<BATCH_SYSTEM>moab</BATCH_SYSTEM>
+	<BATCH_SYSTEM>slurm</BATCH_SYSTEM>
 	<SUPPORTED_BY>jonbob -at- lanl.gov</SUPPORTED_BY>
 	<GMAKE_J>4</GMAKE_J>
 	<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
@@ -2154,7 +2344,6 @@
 	<DIN_LOC_ROOT_CLMFORC>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/atm/datm7</DIN_LOC_ROOT_CLMFORC>
 	<BASELINE_ROOT>/lustre/scratch3/turquoise/$ENV{USER}/ACME/input_data/ccsm_baselines</BASELINE_ROOT>
 	<CCSM_CPRNC>/turquoise/usr/projects/climate/SHARED_CLIMATE/software/wolf/cprnc/v0.40/cprnc</CCSM_CPRNC>
-	<SAVE_TIMING_DIR>$CASEROOT/timings</SAVE_TIMING_DIR>
 	<mpirun mpilib="default">
 		<executable>mpirun</executable>
 		<arguments>
@@ -2414,7 +2603,6 @@
   <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>
@@ -2478,7 +2666,6 @@
   <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>
@@ -2553,6 +2740,111 @@
   <module_system type="none"/>
 </machine>
 
+<machine MACH="summitdev">
+	 <DESC>ORNL pre-Summit testbed. Node: 2x POWER8 + 4x Tesla P100, 20 cores/node, 8 HW threads/core.</DESC>
+	 <NODENAME_REGEX>summitdev-*</NODENAME_REGEX>
+	 <NODE_FAIL_REGEX>Received node event ec_node</NODE_FAIL_REGEX>
+	 <TESTS>acme_developer</TESTS>
+	 <COMPILERS>ibm,pgi</COMPILERS>
+	 <MPILIBS>openmpi,mpi_serial</MPILIBS>
+	 <CIME_OUTPUT_ROOT>$ENV{HOME}/acme_scratch/$PROJECT</CIME_OUTPUT_ROOT>
+	 <RUNDIR>/lustre/atlas/scratch/$ENV{USER}/$PROJECT/$CASE/run</RUNDIR>
+	 <EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
+	 <DIN_LOC_ROOT>/lustre/atlas1/cli900/world-shared/cesm/inputdata</DIN_LOC_ROOT>
+	 <DIN_LOC_ROOT_CLMFORC>/lustre/atlas1/cli900/world-shared/cesm/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
+	 <DOUT_S_ROOT>/lustre/atlas/scratch/$ENV{USER}/$PROJECT/archive/$CASE</DOUT_S_ROOT>
+	 <DOUT_L_MSROOT>csm/$CASE</DOUT_L_MSROOT>
+	 <BASELINE_ROOT>/lustre/atlas1/cli900/world-shared/cesm/baselines</BASELINE_ROOT>
+	 <CCSM_CPRNC>/lustre/atlas1/cli900/world-shared/cesm/tools/cprnc/cprnc</CCSM_CPRNC>
+	 <SAVE_TIMING_DIR>/lustre/atlas/proj-shared/$PROJECT</SAVE_TIMING_DIR>
+	 <OS>LINUX</OS>
+	 <BATCH_SYSTEM>lsf</BATCH_SYSTEM>
+	 <SUPPORTED_BY>acme</SUPPORTED_BY>
+	 <GMAKE_J>32</GMAKE_J>
+	 <PES_PER_NODE>20</PES_PER_NODE>
+	 <MAX_TASKS_PER_NODE>160</MAX_TASKS_PER_NODE>
+	 <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
+	 <PROJECT>csc249</PROJECT>
+	 <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
+
+	 <mpirun mpilib="openmpi">
+	 <executable args="default">mpirun</executable>
+	 <arguments>
+		 <arg name="num_tasks" > -np $TOTALPES</arg>
+		 <arg name="binding_core"> --map-by core:PE=$ENV{OMP_NUM_THREADS} --bind-to core </arg>
+		 <arg name="thread_count"> -x OMP_NUM_THREADS=$ENV{OMP_NUM_THREADS}</arg>
+		 <arg name="show-binding"> --report-bindings </arg>
+		 <arg name="show-processmap"> --display-map </arg>
+		 <!--
+		 <arg name="tasks_per_node"> map-by ppr:$PES_PER_NODE:node</arg>
+		 -->
+	 </arguments>  
+	 </mpirun>
+
+    <module_system type="module_lmod">
+      <!-- list of init_path elements, one per supported language e.g. sh, perl, python-->
+      <init_path lang="sh">/sw/summitdev/lmod/7.4.0/rhel7.2_gnu4.8.5/lmod/7.4/init/sh</init_path>
+      <init_path lang="csh">/sw/summitdev/lmod/7.4.0/rhel7.2_gnu4.8.5/lmod/7.4/init/csh</init_path>
+      <init_path lang="python">/sw/summitdev/lmod/7.4.0/rhel7.2_gnu4.8.5/lmod/7.4/init/env_modules_python.py</init_path>
+      <init_path lang="perl">/sw/summitdev/lmod/7.4.0/rhel7.2_gnu4.8.5/lmod/7.4/init/perl</init_path>
+      <!-- list of cmd_path elements, one for every supported language, e.g. sh, perl, python -->
+      <cmd_path lang="perl">module</cmd_path>
+      <cmd_path lang="python">module</cmd_path>
+      <cmd_path lang="sh">module</cmd_path>
+      <cmd_path lang="csh">module</cmd_path>
+ 
+      <!-- Always execute -->
+      <modules>
+		<command name="ls"/>
+		<command name="purge"/>
+		<command name="ls"/>
+		<command name="load">DefApps</command>
+		<command name="load">python/3.5.2</command>
+		<command name="load">subversion/1.9.3</command>
+		<command name="load">git/2.13.0</command>
+		<command name="load">cmake/3.6.1</command>
+		<command name="load">essl/5.5.0-20161110</command>
+		<command name="load">netlib-lapack/3.6.1</command>
+      </modules>
+      <!-- List of modules elements, executing commands if compiler and mpilib condition applies -->
+      <modules compiler="pgi">
+        <command name="rm">xl</command>
+        <command name="load">pgi/17.4</command>
+        <command name="ls"/>
+      </modules>
+      <modules compiler="ibm">
+        <command name="rm">pgi</command>
+        <command name="load">xl/20161123</command>
+        <command name="ls"/>
+      </modules>
+
+      <!-- mpi lib settings -->
+      <modules mpilib="mpi-serial">
+        <command name="load">netcdf/4.4.1</command>
+        <command name="load">netcdf-fortran/4.4.4</command>
+      </modules>
+      <modules mpilib="!mpi-serial">
+        <command name="load">spectrum_mpi/10.1.0.2-20161221</command>
+        <command name="load">netcdf/4.4.1</command>
+        <command name="load">netcdf-fortran/4.4.4</command>
+        <command name="load">parallel-netcdf/1.7.0</command>
+        <command name="load">hdf5/1.10.0-patch1-parallel</command>
+      </modules>
+      <!-- Default -->
+      <environment_variables>
+	<env name="COMPILER">$COMPILER</env>
+	<env name="MPILIB">$MPILIB</env>
+	<env name="OMP_STACKSIZE">128M</env>
+	<env name="NETCDF_C_PATH">$ENV{OLCF_NETCDF_ROOT}</env>
+	<env name="NETCDF_FORTRAN_PATH">$ENV{OLCF_NETCDF_FORTRAN_ROOT}</env>
+	<env name="HDF5_PATH">$ENV{OLCF_HDF5_ROOT}</env>
+	<env name="ESSL_PATH">$ENV{OLCF_ESSL_ROOT}</env>
+      </environment_variables>
+      <environment_variables mpilib="!mpi-serial">
+	<env name="PNETCDF_PATH">$ENV{OLCF_PARALLEL_NETCDF_ROOT}</env>
+      </environment_variables>
+    </module_system>
+</machine>
 
 <default_run_suffix>
   <default_run_exe>${EXEROOT}/acme.exe </default_run_exe>
diff --git a/config/xml_schemas/env_mach_specific.xsd b/config/xml_schemas/env_mach_specific.xsd
index 45a4ddfc6564..a8a35b581813 100644
--- a/config/xml_schemas/env_mach_specific.xsd
+++ b/config/xml_schemas/env_mach_specific.xsd
@@ -7,6 +7,7 @@
 <xs:attribute name="compiler" type="xs:string"/>
 <xs:attribute name="debug" type="xs:boolean"/>
 <xs:attribute name="mpilib" type="xs:string"/>
+<xs:attribute name="SMP_PRESENT" type="xs:string"/>
 <xs:attribute name="value" type="xs:string"/>
 <xs:attribute name="unit_testing" type="xs:boolean"/>
 
@@ -80,6 +81,7 @@
       <xs:attribute ref="mpilib"/>
       <xs:attribute ref="compiler"/>
       <xs:attribute ref="unit_testing"/>
+      <xs:attribute ref="SMP_PRESENT"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="env">