diff --git a/cime_config/acme/config_files.xml b/cime_config/acme/config_files.xml
index 139fef06fb0..932deb21c7e 100644
--- a/cime_config/acme/config_files.xml
+++ b/cime_config/acme/config_files.xml
@@ -38,6 +38,7 @@
     <group>case_last</group>
     <file>env_case.xml</file>
     <desc>file containing compiler specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
+    <schema>$CIMEROOT/cime_config/xml_schemas/config_compilers_v2.xsd</schema>
   </entry>
 
   <entry id="MACHINES_SPEC_FILE">
@@ -48,14 +49,6 @@
     <desc>file containing machine specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
   </entry>
 
-  <entry id="BUILD_SPEC_FILE">
-    <type>char</type>
-    <default_value>$CIMEROOT/cime_config/$MODEL/machines/config_build.xml</default_value>
-    <group>case_last</group>
-    <file>env_case.xml</file>
-    <desc>file containing build specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
-  </entry>
-
   <entry id="PIO_SPEC_FILE">
     <type>char</type>
     <default_value>$CIMEROOT/cime_config/$MODEL/machines/config_pio.xml</default_value>
diff --git a/cime_config/acme/machines/Makefile b/cime_config/acme/machines/Makefile
index 00072733330..ea496356ae9 100644
--- a/cime_config/acme/machines/Makefile
+++ b/cime_config/acme/machines/Makefile
@@ -137,7 +137,7 @@ ifeq (,$(SHAREDPATH))
   INSTALL_SHAREDPATH = $(EXEROOT)/$(SHAREDPATH)
 endif
 
-include $(CASEROOT)/Macros
+include $(CASEROOT)/Macros.make
 # Decide whether to use a C++ or Fortran linker, based on whether we
 # are using any C++ code and the compiler-dependent CXX_LINKER variable
 ifeq ($(USE_CXX), true)
@@ -399,7 +399,7 @@ INCLDIR +=	-I$(INSTALL_SHAREDPATH)/include -I$(CIMEROOT)/share/csm_share/shr \
 CFLAGS+=$(CPPDEFS)
 CXXFLAGS := $(CFLAGS)
 
-CONFIG_ARGS +=  CC="$(SCC)" FC="$(SFC)" MPICC="$(MPICC)" \
+CONFIG_ARGS +=  CC="$(CC)" FC="$(FC)" MPICC="$(MPICC)" \
                 MPIFC="$(MPIFC)" FCFLAGS="$(FFLAGS) $(FREEFLAGS) $(INCLDIR)" \
                 CPPDEFS="$(CPPDEFS)" CFLAGS="$(CFLAGS) -I.. $(INCLDIR)" \
                 NETCDF_PATH=$(NETCDF_PATH) LDFLAGS="$(LDFLAGS)"
diff --git a/cime_config/acme/machines/config_build.xml b/cime_config/acme/machines/config_build.xml
deleted file mode 100644
index d48e46f2db9..00000000000
--- a/cime_config/acme/machines/config_build.xml
+++ /dev/null
@@ -1,1625 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config_build>
-<!--
-===========================
-This file defines compiler flags for building CIME.  General flags are listed first
-followed by flags specific to particular operating systems, followed by particular machines.
-
-More general flags are replaced by more specific flags.
-Flags of the sort ADD_FLAG indicate that the field should be appended to an already existing FLAG definition.
-
-Attributes indicate that an if clause should be added to the Macros so that these flags are added
-only under the conditions described by the attribute(s).
-
-The env_mach_specific file may set environment variables or load modules which set environment variables
-which are then  used in the Makefile.   For example the NETCDF_PATH on many machines is set by a module.
-
-Do not use variables CPPDEFS and SLIBS here, instead use ADD_CPPDEFS and ADD_SLIBS
-
-========================================================================
- Serial/MPI compiler specification
-========================================================================
-
-SCC   and  SFC specifies the serial compiler
-MPICC and  MPICC specifies the mpi compiler
-
-if $MPILIB is set to mpi-serial then
-   CC = $SCC
-   FC = $SFC
-   MPICC = $SCC
-   MPIFC = $SFC
-   INC_MPI = $(CIMEROOT)/externals/mct/mpi-serial
-
-========================================================================
- Options for including C++ code in the build
-========================================================================
-
-SUPPORTS_CXX (TRUE/FALSE): Whether we have defined all the necessary
-settings for including C++ code in the build for this compiler (or
-this compiler/machine combination). See below for a description of the
-necessary settings.
-
-The following are required for a compiler to support the inclusion of
-C++ code:
-
-SCXX: serial C++ compiler
-
-MPICXX: mpi C++ compiler
-
-CXX_LINKER (CXX/FORTRAN): When C++ code is included in the build, do
-we use a C++ or Fortran linker?
-
-In addition, some compilers require additional libraries or link-time
-flags, specified via CXX_LIBS or CXX_LDFLAGS, as in the following
-examples:
-
-<CXX_LIBS> -L/path/to/directory -lfoo </CXX_LIBS>
-
-or
-
-<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
-
-Note that these libraries or LDFLAGS will be added on the link line,
-regardless of whether we are using a C++ or Fortran linker. For
-example, if CXX_LINKER=CXX, then the above CXX_LIBS line should
-specify extra libraries needed when linking C++ and fortran code using
-a C++ linker. If CXX_LINKER=FORTRAN, then the above CXX_LDFLAGS line
-should specify extra LDFLAGS needed when linking C++ and fortran code
-using a fortran linker.
-
-These should NOT be specified via <ADD_SLIBS USE_CXX="true"> or
-<ADD_LDFLAGS USE_CXX="true">, because those mess up the configure step
-for mct, etc.
-
-
-===========================
--->
-<!-- Define default values that can be overridden by specific
-     compilers -->
-<compiler>
-  <CPPDEFS>
-    <append MODEL="pop"> -D_USE_FLOW_CONTROL </append>
-  </CPPDEFS>
-  <SUPPORTS_CXX>FALSE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="cray">
-  <CFLAGS>
-    <append compile_threaded="false"> -h noomp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append MODEL="pop"> -DDIR=NOOP </append>
-    <append MODEL="moby"> -DDIR=NOOP </append>
-  </CPPDEFS>
-  <FC_AUTO_R8>
-    <base> -s real64 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -O2  -f free -N 255  -h byteswapio -em </base>
-    <append compile_threaded="false"> -h noomp </append>
-    <append DEBUG="TRUE"> -g -trapuv  -Wuninitialized </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-    <append compile_threaded="false"> -h noomp </append>
-  </FFLAGS_NOOPT>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -Wl,--allow-multiple-definition -h byteswapio </base>
-    <append compile_threaded="false"> -h noomp </append>
-  </LDFLAGS>
-</compiler>
-
-<compiler COMPILER="gnu">
-  <CFLAGS>
-    <base> -mcmodel=medium </base>
-    <append compile_threaded="true"> -fopenmp </append>
-    <append DEBUG="TRUE"> -g -Wall </append>
-    <append DEBUG="FALSE"> -O </append>
-  </CFLAGS>
-  <CMAKE_OPTS>
-    <append MODEL="cism"> -D CISM_GNU=ON </append>
-  </CMAKE_OPTS>
-  <CPPDEFS>
-    <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-  </CPPDEFS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -fdefault-real-8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
-       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
-    <base> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
-    <append compile_threaded="true"> -fopenmp </append>
-    <append DEBUG="TRUE"> -g -Wall </append>
-    <append DEBUG="FALSE"> -O </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base>  -ffixed-form </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -ffree-form </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -fopenmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <SCXX> g++ </SCXX>
-  <SFC> gfortran </SFC>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="ibm">
-  <CFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 </base>
-    <append DEBUG="FALSE"> -O3  </append>
-    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
- Notes:  (see xlf user's guide for the details)
-  -lmass          => IBM-tuned intrinsic lib
-  -qsmp=noauto    => enable SMP directives, but don't add any
-  -qsmp=omp       => enable SMP directives, strict omp
-  -qstrict        => don't turn divides into multiplies, etc
-  -qhot           => higher-order-transformations (eg. loop padding)
-  -qalias=noaryovrlp => assume no array overlap wrt equivalance, etc
-  -qmaxmem=-1     => memory available to compiler during optimization
-  -qipa=level=2   => InterProcedure Analysis (eg. inlining) => slow compiles
-  -p -pg          => enable profiling (use in both FFLAGS and LDFLAGS)
-  -qreport        => for smp/omp only
-  -g              => always leave it on because overhead is minimal
-  -qflttrap=...   => enable default sigtrap (core dump)
-  -C              => runtime array bounds checking (runs slow)
-  -qinitauto=...  => initializes automatic variables
-  -->
-    <append> -DFORTRAN_SAME </append>
-  </CPPDEFS>
-  <CPRE>-WF,-D</CPRE>
-  <FC_AUTO_R8>
-    <base> -qrealsize=8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 </base>
-    <append DEBUG="FALSE"> -O2 -qstrict -Q </append>
-    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </append>
-    <append DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </append>
-    <append DEBUG="TRUE" MODEL="pop"> -C </append>
-  </FFLAGS>
-  <FIXEDFLAGS>
-    <base>  -qsuffix=f=f -qfixed=132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -qsuffix=f=f90:cpp=F90  </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-<compiler COMPILER="intel">
-  <CFLAGS>
-    <base> -O2 -fp-model precise -std=gnu99 </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="FALSE"> -O2 -debug minimal </append>
-    <append DEBUG="TRUE"> -O0 -g </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base>  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source </base>
-    <append compile_threaded="true"> -openmp </append>
-    <!-- WJS (8-11-14): For some reason, yellowstone-intel has starting giving lots of
-       messages about array temporaries, leading to a ton of standard output, and
-       sometimes causing runs to die. Adding '-check noarg_temp_created' to suppress these
-       diagnostics. This is a band-aid fix, which should really be addressed at the
-       system-level. (Note: I could not add this in the yellowstone-specific section,
-       beacuse apparently that overrides rather than adds to this ADD_FFLAGS list.) -->
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </append>
-    <append DEBUG="FALSE"> -O2 -debug minimal </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-    <append compile_threaded="true"> -openmp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intel14">
-  <CFLAGS>
-    <base> -O2 -fp-model precise </base>
-    <append compile_threaded="true"> -openmp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append> -DCPRINTEL </append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intelmic">
-  <CFLAGS>
-    <base> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </base>
-    <append compile_threaded="true"> -openmp </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append> -DCPRINTEL </append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -mmic </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-    <append> -mmic </append>
-  </LDFLAGS>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <MPIFC> mpiifort</MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intelmic14">
-  <CFLAGS>
-    <base> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </base>
-    <append compile_threaded="true"> -openmp </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append> -DCPRINTEL </append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -mmic </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-    <append> -mmic </append>
-  </LDFLAGS>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <MPIFC> mpiifort</MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="nag">
-  <CFLAGS>
-    <append DEBUG="TRUE"> -g </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <append> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH </append>
-  </CPPDEFS>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <!-- Yes, you really do need this huge -wmismatch flag for NAG to work.    -->
-    <!-- More specifically, it exempts MPI functions without explicit          -->
-    <!-- interfaces from certain argument checks. Should not be necessary in   -->
-    <!-- libraries that only use the F90 module interface. mpibcast and        -->
-    <!-- mpiscatterv are actually CAM wrappers for MPI.                        -->
-    <base> -wmismatch=mpi_send,mpi_recv,mpi_bcast,mpi_allreduce,mpi_reduce,mpi_isend,mpi_irecv,mpi_irsend,mpi_rsend,mpi_gatherv,mpi_gather,mpi_scatterv,mpi_allgather,mpi_alltoallv,mpi_file_read_all,mpi_file_write_all,mpibcast,mpiscatterv,mpi_alltoallw,nfmpi_get_vara_all,NFMPI_IPUT_VARA,NFMPI_GET_VAR_ALL,NFMPI_PUT_VARA,NFMPI_PUT_ATT_REAL,NFMPI_PUT_ATT_DOUBLE,NFMPI_PUT_ATT_INT,NFMPI_GET_ATT_REAL,NFMPI_GET_ATT_INT,NFMPI_GET_ATT_DOUBLE,NFMPI_PUT_VARA_DOUBLE_ALL,NFMPI_PUT_VARA_REAL_ALL,NFMPI_PUT_VARA_INT_ALL    -convert=BIG_ENDIAN </base>
-    <!-- DEBUG vs. non-DEBUG runs.                                             -->
-    <append DEBUG="FALSE"> -ieee=full -O2 </append>
-    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
-    <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
-    <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
-    <append DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </append>
-    <append DEBUG="TRUE" compile_threaded="false"> -gline </append>
-    <append compile_threaded="true"> -openmp </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> <var>FFLAGS</var> </base>
-    <append DEBUG="FALSE"> -ieee=full     </append>
-    <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
-    <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
-    <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
-    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
-    <append DEBUG="TRUE" compile_threaded="false"> -gline        </append>
-    <append compile_threaded="true"> -openmp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <SFC> nagfor </SFC>
-</compiler>
-
-<compiler COMPILER="pathscale">
-  <CFLAGS>
-    <append compile_threaded="true"> -mp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://www.pathscale.com/node/70 -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16 -DCPRPATHSCALE </append>
-  </CPPDEFS>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -O -extend_source -ftpp -fno-second-underscore -funderscoring -byteswapio  </base>
-    <append compile_threaded="true"> -mp </append>
-    <append DEBUG="TRUE"> -g -trapuv -Wuninitialized </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-  </FFLAGS_NOOPT>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -mp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPIFC> mpif90 </MPIFC>
-</compiler>
-
-<compiler COMPILER="pgi">
-  <CFLAGS>
-    <base> -gopt -Mlist  -time </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-    <!-- Notes:  (see pgi man page & user's guide for the details) -->
-    <!--  -Mextend        => Allow 132-column source lines -->
-    <!--  -Mfixed         => Assume fixed-format source -->
-    <!--  -Mfree          => Assume free-format source -->
-    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-    <!--  -fast           => Chooses generally optimal flags for the target platform -->
-    <!--  -Mnovect        => Disables automatic vector pipelining -->
-    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-    <!-- -->
-    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-    <!--  -Mbounds        => Add array bounds checking  -->
-    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-    <!--                     * inv: invalid operands         -->
-    <!--                     * divz divide by zero           -->
-    <!--                     * ovf: floating point overflow   -->
-    <!--  -Mlist          => Create a listing file             -->
-    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-    <!--  -time           => Print execution time for each compiler step  -->
-    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </append>
-  </CPPDEFS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
-    <append MODEL="datm"> -Mnovect </append>
-    <append MODEL="dlnd"> -Mnovect </append>
-    <append MODEL="drof"> -Mnovect </append>
-    <append MODEL="dwav"> -Mnovect </append>
-    <append MODEL="dice"> -Mnovect </append>
-    <append MODEL="docn"> -Mnovect </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -Mfixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -Mfree </base>
-  </FREEFLAGS>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -time -Wl,--allow-multiple-definition </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> pgcc </SCC>
-  <SCXX> pgc++ </SCXX>
-  <SFC> pgf95 </SFC>
-</compiler>
-
-<compiler COMPILER="pgiacc">
-  <CFLAGS>
-    <base> -Mlist -time </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-    <!-- Notes:  (see pgi man page & user's guide for the details) -->
-    <!--  -Mextend        => Allow 132-column source lines -->
-    <!--  -Mfixed         => Assume fixed-format source -->
-    <!--  -Mfree          => Assume free-format source -->
-    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-    <!--  -fast           => Chooses generally optimal flags for the target platform -->
-    <!--  -Mnovect        => Disables automatic vector pipelining -->
-    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-    <!-- -->
-    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-    <!--  -Mbounds        => Add array bounds checking  -->
-    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-    <!--                     * inv: invalid operands         -->
-    <!--                     * divz divide by zero           -->
-    <!--                     * ovf: floating point overflow   -->
-    <!--  -Mlist          => Create a listing file             -->
-    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-    <!--  -time           => Print execution time for each compiler step  -->
-    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DUSE_CUDA_FORTRAN -DCPRPGI </append>
-  </CPPDEFS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base>  -i4 -Mlist  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-    <append MODEL="cam"> -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo -Minfo=accel -DUSE_OPENACC=1 </append>
-    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
-    <append MODEL="datm"> -Mnovect </append>
-    <append MODEL="dlnd"> -Mnovect </append>
-    <append MODEL="drof"> -Mnovect </append>
-    <append MODEL="dwav"> -Mnovect </append>
-    <append MODEL="dice"> -Mnovect </append>
-    <append MODEL="docn"> -Mnovect </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -Mfixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -Mfree </base>
-  </FREEFLAGS>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -time -Wl,--allow-multiple-definition -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo </base>
-    <append compile_threaded="false"> </append>
-    <append compile_threaded="true"> -mp </append>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> pgcc </SCC>
-  <SCXX> pgc++ </SCXX>
-  <SFC> pgf95 </SFC>
-</compiler>
-
-<compiler OS="AIX" COMPILER="ibm">
-  <CFLAGS>
-    <append> -qarch=auto -qtune=auto -qcache=auto </append>
-  </CFLAGS>
-  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
-  <FFLAGS>
-    <append> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </append>
-    <append MODEL="cam"> -qspill=6000 </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append DEBUG="TRUE"> -qsigtrap=xl__trcedump </append>
-    <append> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </append>
-  </LDFLAGS>
-  <MPICC> mpcc_r </MPICC>
-  <MPIFC> mpxlf2003_r </MPIFC>
-  <SCC> cc_r </SCC>
-  <SFC> xlf2003_r </SFC>
-  <SLIBS>
-    <append> -lmassv -lessl </append>
-    <append DEBUG="FALSE"> -lmass </append>
-  </SLIBS>
-</compiler>
-
-<compiler OS="BGL" COMPILER="ibm">
-  <CFLAGS>
-    <base> -O3 -qstrict </base>
-    <append> -qtune=440 -qarch=440d </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX -DnoI8 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append> -qtune=440 -qarch=440d </append>
-    <append DEBUG="FALSE"> -O3 -qstrict -Q </append>
-    <append DEBUG="TRUE"> -qinitauto=FF911299 -qflttrap=ov:zero:inv:en </append>
-    <append> -qextname=flush </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-  <MLIBS>
-    <base> -L/bgl/BlueLight/ppcfloor/bglsys/lib -lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts </base>
-  </MLIBS>
-  <MPICC> blrts_xlc </MPICC>
-  <MPIFC> blrts_xlf2003 </MPIFC>
-  <MPI_LIB_NAME> mpich.rts </MPI_LIB_NAME>
-  <MPI_PATH> /bgl/BlueLight/ppcfloor/bglsys</MPI_PATH>
-  <SCC> blrts_xlc </SCC>
-  <SFC> blrts_xlf2003 </SFC>
-</compiler>
-
-<compiler OS="BGP" COMPILER="ibm">
-  <CFLAGS>
-    <append> -qtune=450 -qarch=450 -I/bgsys/drivers/ppcfloor/arch/include/</append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX -DnoI8 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append>-qspillsize=2500 -qtune=450 -qarch=450 </append>
-    <append> -qextname=flush </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="BGQ" COMPILER="ibm">
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX  </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </base>
-    <append DEBUG="FALSE"> -O3 -qstrict -Q </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="CNL">
-  <CMAKE_OPTS>
-    <base> -DCMAKE_SYSTEM_NAME=Catamount</base>
-  </CMAKE_OPTS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </append>
-  </CPPDEFS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <MPI_LIB_NAME> mpich </MPI_LIB_NAME>
-  <MPI_PATH> <env>MPICH_DIR</env></MPI_PATH>
-  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PARALLEL_NETCDF_DIR</env></PNETCDF_PATH>
-  <SCC> cc </SCC>
-  <SCXX> CC </SCXX>
-  <SFC> ftn </SFC>
-</compiler>
-
-<compiler OS="Darwin">
-  <CPPDEFS>
-    <append> -DSYSDARWIN </append>
-  </CPPDEFS>
-  <LDFLAGS>
-    <append MODEL="driver"> -all_load </append>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="Darwin" COMPILER="intel">
-  <FFLAGS>
-    <append compile_threaded="false"> -heap-arrays </append>
-  </FFLAGS>
-  <SLIBS>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler OS="Linux" COMPILER="intel">
-  <FFLAGS>
-    <append> -mcmodel medium -shared-intel </append>
-  </FFLAGS>
-</compiler>
-
-<compiler MACH="anlworkstation" COMPILER="gnu">
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base>-lstdc++ -lmpi_cxx</base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="blues" COMPILER="gnu">
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/gnu-5.2/</MPI_PATH>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="blues" COMPILER="intel">
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/intel-15.0</MPI_PATH>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas </append>
-    <append> -Wl,-rpath -Wl,<env>NETCDFROOT</env>/lib </append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="blues" COMPILER="intel13">
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
-  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/intel-13.1</MPI_PATH>
-  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-intel-13.1</MPI_PATH>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="blues" COMPILER="nag">
-  <MPI_LIB_NAME MPILIB="mpich"> mpi </MPI_LIB_NAME>
-  <MPI_PATH MPILIB="mpich">/home/robl/soft/mpich-3.1.4-nag-6.0</MPI_PATH>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="blues" COMPILER="pgi">
-  <MPI_LIB_NAME MPILIB="mvapich"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
-  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/pgi-13.9</MPI_PATH>
-  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-pgi-13.9/</MPI_PATH>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
-    <append> -rpath <env>NETCDFROOT</env>/lib </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="caldera">
-  <CPPDEFS>
-    <!-- these flags enable nano timers -->
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <NETCDF_PATH><env>NETCDF</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDF</env></PNETCDF_PATH>
-</compiler>
-
-<compiler MACH="cascade" COMPILER="intel">
-  <CONFIG_ARGS>
-    <base> --host=Linux --enable-filesystem-hints=lustre</base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt </base>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="cascade" COMPILER="nag">
-  <CPPDEFS>
-    <append> -DnoI8 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <!--  -C=Undefined flag doesn't work as it requires MPI and NETCDF to be
-      compiled with this flag, which is not available now. NAG has the following debug flags
-      <ADD_FFLAGS DEBUG="TRUE">  -gline  -C=all  -g  -C=undefined -C=recursion -nan -O0 -v  </ADD_FFLAGS>
-      "-nan" is an important flag. currently, it doesn't work for pio, it is only used for "cam" model.
- -->
-    <append DEBUG="TRUE">  -gline  -C=all  -g  -O0 -v  </append>
-    <append DEBUG="TRUE" MODEL="cam">  -gline  -C=all  -g  -nan -O0 -v  </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append compile_threaded="true">  </append>
-  </LDFLAGS>
-  <MPI_PATH MPILIB="mvapich2"> <env>MPI_LIB</env></MPI_PATH>
-  <NETCDF_PATH><env>NETCDF_ROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> -L<env>NETCDF_ROOT</env>/lib -lnetcdf -lnetcdff -L<env>MKL_PATH</env> -lmkl_rt</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="cetus" COMPILER="ibm">
-  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CPPDEFS>
-    <append> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </append>
-  </CPPDEFS>
-  <CXX_LIBS>
-    <base> -llapack -lblas -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </base>
-  </CXX_LIBS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <LDFLAGS>
-    <append>-L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl </append>
-  </LDFLAGS>
-  <MPICC> mpixlc_r </MPICC>
-  <MPICXX> /soft/compilers/bgclang/mpi/bgclang/bin/mpic++11 </MPICXX>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
-  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
-  <SCC> mpixlc_r </SCC>
-  <SFC> mpixlf2003_r </SFC>
-  <SLIBS>
-    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
-    <append compile_threaded="true"> -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="constance" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt</base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="constance" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append DEBUG="TRUE">-C -Mbounds -traceback -Mchkfpstk -Mchkstk -Mdalign  -Mdepchk  -Mextend -Miomutex -Mrecursive  -Ktrap=fp -O0 -g -byteswapio -Meh_frame</append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MPI_LIB</env> -lmpich</base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="cori-haswell" COMPILER="intel">
-  <CFLAGS>
-    <append> -xCORE-AVX2 </append>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DHAVE_SLASHPROC </append>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append> -xCORE-AVX2 </append>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
-  <SLIBS>
-    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
-    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="cori-knl" COMPILER="intel">
-  <CFLAGS>
-    <append> -xMIC-AVX512 </append>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DHAVE_SLASHPROC </append>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append> -xMIC-AVX512 </append>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
-  <SLIBS>
-    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
-    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="eastwind" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="edison" COMPILER="intel">
-  <ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_09232015/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
-  <SLIBS>
-    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
-    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="eos" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <SLIBS>
-    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
-    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="gnu">
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="intel">
-  <ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-  <ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CXX_LIBS>
-    <base> -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="lawrencium-lr2" COMPILER="intel">
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <SLIBS>
-    <append> -lnetcdff -lnetcdf -mkl</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="lawrencium-lr3" COMPILER="intel">
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <SLIBS>
-    <append> -lnetcdff -lnetcdf -mkl</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="linux-generic" COMPILER="gnu">
-  <NETCDF_PATH> <env>NETCDF_PATH</env></NETCDF_PATH>
-  <PNETCDF_PATH> <env>PNETCDF_PATH</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="mac" COMPILER="gnu">
-  <LDFLAGS>
-    <append>-framework Accelerate</append>
-  </LDFLAGS>
-  <NETCDF_PATH> <env>NETCDF_PATH</env></NETCDF_PATH>
-  <SLIBS>
-    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="melvin" COMPILER="gnu">
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base>-lstdc++ -lmpi_cxx</base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="mira" COMPILER="ibm">
-  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CPPDEFS>
-    <append> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </append>
-  </CPPDEFS>
-  <CXX_LIBS>
-    <base> -llapack -lblas -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </base>
-  </CXX_LIBS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <HDF5_PATH>/soft/libraries/hdf5/1.8.14/cnk-xl/current/ </HDF5_PATH>
-  <!-- This LD is a workaround for darshan initialization on mira (Darshan does -->
-  <!-- not run if f90 or higher is used for linking -->
-  <LD> mpixlf77_r </LD>
-  <MPICC> mpixlc_r </MPICC>
-  <MPICXX> /soft/compilers/bgclang/mpi/bgclang/bin/mpic++11 </MPICXX>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
-  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.0/cnk-xl/current/</PNETCDF_PATH>
-  <SCC> mpixlc_r </SCC>
-  <SFC> mpixlf2003_r </SFC>
-  <SLIBS>
-    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.14/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
-    <append compile_threaded="true"> -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="gnu">
-  <ALBANY_PATH><env>ALBANY_PATH</env></ALBANY_PATH>
-  <CXX_LIBS>
-    <base>-lstdc++ -lmpi_cxx</base>
-  </CXX_LIBS>
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>gcc</SCC>
-  <SCXX>g++</SCXX>
-  <SFC>gfortran</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="intel">
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>icc</SCC>
-  <SCXX>icpc</SCXX>
-  <SFC>ifort</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="pgi">
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>pgcc</SCC>
-  <SCXX>pgc++</SCXX>
-  <SFC>pgfortran</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="oic2" COMPILER="gnu">
-  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
-  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
-  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
-  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
-  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
-  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
-  <SLIBS>
-    <append>-L/user/lib64 -llapack -lblas -lnetcdff </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="oic2" COMPILER="pgi">
-  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
-</compiler>
-
-<compiler MACH="oic5" COMPILER="gnu">
-  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
-  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
-  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
-  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
-  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
-  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
-  <SLIBS>
-    <append>-L/user/lib64 -llapack -lblas -lnetcdff </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="oic5" COMPILER="pgi">
-  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
-</compiler>
-
-<compiler MACH="olympus" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="olympus" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="redsky" COMPILER="intel">
-  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="skybridge" COMPILER="intel">
-  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="sooty" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lpmi </base>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="sooty" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="titan" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> </append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="titan" COMPILER="pgi">
-  <ALBANY_PATH>/ccs/proj/cli106/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base> -lfmpich -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o /opt/gcc/default/snos/lib64/libstdc++.a  </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <MPICC> cc </MPICC>
-  <MPICXX> /opt/cray/craype/2.4.0/bin/CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <append> <shell>nf-config --flibs</shell> </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <TRILINOS_PATH>/lustre/atlas/world-shared/cli900/cesm/software/Trilinos/Trilinos-11.10.2_gptl/titan-pgi-ci-nophal/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="titan" COMPILER="pgiacc">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base> -lfmpich -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="userdefined">
-  <CONFIG_ARGS>
-    <base/>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append/>
-  </CPPDEFS>
-  <ESMF_LIBDIR/>
-  <MPI_LIB_NAME/>
-  <MPI_PATH/>
-  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
-  <PNETCDF_PATH/>
-  <SLIBS>
-    <append># USERDEFINED <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="wolf" COMPILER="gnu">
-  <ALBANY_PATH><env>ALBANY_PATH</env></ALBANY_PATH>
-  <CXX_LIBS>
-    <base>-lstdc++ -lmpi_cxx</base>
-  </CXX_LIBS>
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>gcc</SCC>
-  <SCXX>g++</SCXX>
-  <SFC>gfortran</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="wolf" COMPILER="intel">
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>icc</SCC>
-  <SCXX>icpc</SCXX>
-  <SFC>ifort</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="wolf" COMPILER="pgi">
-  <MPICC>mpicc</MPICC>
-  <MPICXX>mpic++</MPICXX>
-  <MPIFC>mpif90</MPIFC>
-  <SCC>pgcc</SCC>
-  <SCXX>pgc++</SCXX>
-  <SFC>pgfortran</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-</config_build>
diff --git a/cime_config/acme/machines/config_compilers.xml b/cime_config/acme/machines/config_compilers.xml
index d649fe2a9cd..d48e46f2db9 100644
--- a/cime_config/acme/machines/config_compilers.xml
+++ b/cime_config/acme/machines/config_compilers.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0"?>
-<config_compilers>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<config_build>
 <!--
 ===========================
 This file defines compiler flags for building CIME.  General flags are listed first
@@ -78,12 +77,98 @@ for mct, etc.
 <!-- Define default values that can be overridden by specific
      compilers -->
 <compiler>
+  <CPPDEFS>
+    <append MODEL="pop"> -D_USE_FLOW_CONTROL </append>
+  </CPPDEFS>
   <SUPPORTS_CXX>FALSE</SUPPORTS_CXX>
-  <ADD_CPPDEFS MODEL="pop"> -D_USE_FLOW_CONTROL </ADD_CPPDEFS>
+</compiler>
+
+<compiler COMPILER="cray">
+  <CFLAGS>
+    <append compile_threaded="false"> -h noomp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+    <append MODEL="pop"> -DDIR=NOOP </append>
+    <append MODEL="moby"> -DDIR=NOOP </append>
+  </CPPDEFS>
+  <FC_AUTO_R8>
+    <base> -s real64 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -O2  -f free -N 255  -h byteswapio -em </base>
+    <append compile_threaded="false"> -h noomp </append>
+    <append DEBUG="TRUE"> -g -trapuv  -Wuninitialized </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+    <append compile_threaded="false"> -h noomp </append>
+  </FFLAGS_NOOPT>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <base> -Wl,--allow-multiple-definition -h byteswapio </base>
+    <append compile_threaded="false"> -h noomp </append>
+  </LDFLAGS>
+</compiler>
+
+<compiler COMPILER="gnu">
+  <CFLAGS>
+    <base> -mcmodel=medium </base>
+    <append compile_threaded="true"> -fopenmp </append>
+    <append DEBUG="TRUE"> -g -Wall </append>
+    <append DEBUG="FALSE"> -O </append>
+  </CFLAGS>
+  <CMAKE_OPTS>
+    <append MODEL="cism"> -D CISM_GNU=ON </append>
+  </CMAKE_OPTS>
+  <CPPDEFS>
+    <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+  </CPPDEFS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -fdefault-real-8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
+       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
+    <base> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
+    <append compile_threaded="true"> -fopenmp </append>
+    <append DEBUG="TRUE"> -g -Wall </append>
+    <append DEBUG="FALSE"> -O </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base>  -ffixed-form </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -ffree-form </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -fopenmp </append>
+  </LDFLAGS>
+  <MPICC> mpicc  </MPICC>
+  <MPICXX> mpicxx </MPICXX>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> gcc </SCC>
+  <SCXX> g++ </SCXX>
+  <SFC> gfortran </SFC>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
 <compiler COMPILER="ibm">
-  <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
+  <CFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 </base>
+    <append DEBUG="FALSE"> -O3  </append>
+    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
  Notes:  (see xlf user's guide for the details)
   -lmass          => IBM-tuned intrinsic lib
   -qsmp=noauto    => enable SMP directives, but don't add any
@@ -100,1203 +185,1441 @@ for mct, etc.
   -C              => runtime array bounds checking (runs slow)
   -qinitauto=...  => initializes automatic variables
   -->
-  <ADD_CPPDEFS> -DFORTRAN_SAME </ADD_CPPDEFS>
+    <append> -DFORTRAN_SAME </append>
+  </CPPDEFS>
   <CPRE>-WF,-D</CPRE>
-  <CFLAGS> -g -qfullpath -qmaxmem=-1 </CFLAGS>
-  <FIXEDFLAGS>  -qsuffix=f=f -qfixed=132 </FIXEDFLAGS>
-  <FREEFLAGS> -qsuffix=f=f90:cpp=F90  </FREEFLAGS>
-  <FFLAGS> -g -qfullpath -qmaxmem=-1 </FFLAGS>
-  <FC_AUTO_R8> -qrealsize=8 </FC_AUTO_R8>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -qstrict -Q </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O3  </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"  compile_threaded="true"> -qsmp=omp:nested_par:noopt </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"  compile_threaded="true"> -qsmp=omp:nested_par:noopt </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE" MODEL="pop"> -C </ADD_FFLAGS>
+  <FC_AUTO_R8>
+    <base> -qrealsize=8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 </base>
+    <append DEBUG="FALSE"> -O2 -qstrict -Q </append>
+    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp:nested_par </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:nested_par:noopt </append>
+    <append DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </append>
+    <append DEBUG="TRUE" MODEL="pop"> -C </append>
+  </FFLAGS>
+  <FIXEDFLAGS>
+    <base>  -qsuffix=f=f -qfixed=132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -qsuffix=f=f90:cpp=F90  </base>
+  </FREEFLAGS>
   <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-
-</compiler>
-
-<compiler COMPILER="pgi">
-  <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-  <!-- Notes:  (see pgi man page & user's guide for the details) -->
-  <!--  -Mextend        => Allow 132-column source lines -->
-  <!--  -Mfixed         => Assume fixed-format source -->
-  <!--  -Mfree          => Assume free-format source -->
-
-  <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-
-  <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-  <!--  -fast           => Chooses generally optimal flags for the target platform -->
-  <!--  -Mnovect        => Disables automatic vector pipelining -->
-  <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-  <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-  <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-  <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-  <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-  <!-- -->
-  <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-  <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-  <!--  -Mbounds        => Add array bounds checking  -->
-  <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-  <!--                     * inv: invalid operands         -->
-  <!--                     * divz divide by zero           -->
-  <!--                     * ovf: floating point overflow   -->
-  <!--  -Mlist          => Create a listing file             -->
-  <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-  <!--  -time           => Print execution time for each compiler step  -->
-
-
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </ADD_CPPDEFS>
-  <CFLAGS> -gopt -Mlist  -time </CFLAGS>
-
-  <ADD_CFLAGS compile_threaded="false"> </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="false"> </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="false"> </ADD_LDFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -mp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -mp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -mp </ADD_LDFLAGS>
-
-  <FIXEDFLAGS> -Mfixed </FIXEDFLAGS>
-  <FREEFLAGS> -Mfree </FREEFLAGS>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-
-  <FFLAGS>  -i4 -gopt  -time -Mstack_arrays  -Mextend -byteswapio -Mflushz -Kieee  </FFLAGS>
-  <FFLAGS_NOOPT> -O0 -g -Ktrap=fp -Mbounds -Kieee  </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="false"> </ADD_FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -mp </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="datm"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dlnd"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="drof"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dwav"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dice"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="docn"> -Mnovect </ADD_FFLAGS>
-  <LDFLAGS> -time -Wl,--allow-multiple-definition </LDFLAGS>
-  <SCC> pgcc </SCC>
-  <SFC> pgf95 </SFC>
-  <SCXX> pgc++ </SCXX>
-  <MPICC> mpicc </MPICC>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICXX> mpicxx </MPICXX>
-
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-<compiler COMPILER="pgiacc">
-  <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-  <!-- Notes:  (see pgi man page & user's guide for the details) -->
-  <!--  -Mextend        => Allow 132-column source lines -->
-  <!--  -Mfixed         => Assume fixed-format source -->
-  <!--  -Mfree          => Assume free-format source -->
-
-  <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-
-  <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-  <!--  -fast           => Chooses generally optimal flags for the target platform -->
-  <!--  -Mnovect        => Disables automatic vector pipelining -->
-  <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-  <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-  <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-  <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-  <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-  <!-- -->
-  <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-  <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-  <!--  -Mbounds        => Add array bounds checking  -->
-  <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-  <!--                     * inv: invalid operands         -->
-  <!--                     * divz divide by zero           -->
-  <!--                     * ovf: floating point overflow   -->
-  <!--  -Mlist          => Create a listing file             -->
-  <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-  <!--  -time           => Print execution time for each compiler step  -->
-
-
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DUSE_CUDA_FORTRAN -DCPRPGI </ADD_CPPDEFS>
-  <CFLAGS> -Mlist -time </CFLAGS>
-
-  <ADD_CFLAGS compile_threaded="false"> </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="false"> </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="false"> </ADD_LDFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -mp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -mp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -mp </ADD_LDFLAGS>
-
-  <FIXEDFLAGS> -Mfixed </FIXEDFLAGS>
-  <FREEFLAGS> -Mfree </FREEFLAGS>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-
-  <FFLAGS>  -i4 -Mlist  -time -Mstack_arrays -Mextend -byteswapio -Mflushz -Kieee  </FFLAGS>
-  <ADD_FFLAGS MODEL="cam"> -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo -Minfo=accel -DUSE_OPENACC=1 </ADD_FFLAGS>
-  <FFLAGS_NOOPT> -O0 -g -Ktrap=fp -Mbounds -Kieee  </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="false"> </ADD_FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -mp </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="datm"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dlnd"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="drof"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dwav"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dice"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="docn"> -Mnovect </ADD_FFLAGS>
-  <LDFLAGS> -time -Wl,--allow-multiple-definition -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo </LDFLAGS>
-  <SCC> pgcc </SCC>
-  <SFC> pgf95 </SFC>
-  <SCXX> pgc++ </SCXX>
-  <MPICC> mpicc </MPICC>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICXX> mpicxx </MPICXX>
-
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
 </compiler>
 
 <compiler COMPILER="intel">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <!-- WJS (8-11-14): For some reason, yellowstone-intel has starting giving lots of
+  <CFLAGS>
+    <base> -O2 -fp-model precise -std=gnu99 </base>
+    <append compile_threaded="true"> -openmp </append>
+    <append DEBUG="FALSE"> -O2 -debug minimal </append>
+    <append DEBUG="TRUE"> -O0 -g </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+  </CPPDEFS>
+  <CXX_LDFLAGS>
+    <base> -cxxlib </base>
+  </CXX_LDFLAGS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base>  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source </base>
+    <append compile_threaded="true"> -openmp </append>
+    <!-- WJS (8-11-14): For some reason, yellowstone-intel has starting giving lots of
        messages about array temporaries, leading to a ton of standard output, and
        sometimes causing runs to die. Adding '-check noarg_temp_created' to suppress these
        diagnostics. This is a band-aid fix, which should really be addressed at the
        system-level. (Note: I could not add this in the yellowstone-specific section,
        beacuse apparently that overrides rather than adds to this ADD_FFLAGS list.) -->
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_CFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -O0 -g </ADD_CFLAGS>
-  <FFLAGS>  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source </FFLAGS>
-  <CFLAGS> -O2 -fp-model precise -std=gnu99 </CFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -openmp </ADD_FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpif90 </MPIFC>
+    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </append>
+    <append DEBUG="FALSE"> -O2 -debug minimal </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+    <append compile_threaded="true"> -openmp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed -132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+  </LDFLAGS>
   <MPICC> mpicc  </MPICC>
   <MPICXX> mpicxx </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <SFC> ifort </SFC>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-
-</compiler>
-
-<compiler COMPILER="intel" OS="Linux">
-  <ADD_FFLAGS> -mcmodel medium -shared-intel </ADD_FFLAGS>
 </compiler>
 
 <compiler COMPILER="intel14">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <FFLAGS> -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </FFLAGS>
-  <CFLAGS> -O2 -fp-model precise </CFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpif90 </MPIFC>
+  <CFLAGS>
+    <base> -O2 -fp-model precise </base>
+    <append compile_threaded="true"> -openmp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+    <append> -DCPRINTEL </append>
+  </CPPDEFS>
+  <CXX_LDFLAGS>
+    <base> -cxxlib </base>
+  </CXX_LDFLAGS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
+    <append compile_threaded="true"> -openmp </append>
+    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed -132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+  </LDFLAGS>
   <MPICC> mpicc  </MPICC>
   <MPICXX> mpicxx </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
-  <ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <SFC> ifort </SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
+  </SLIBS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
 </compiler>
 
 <compiler COMPILER="intelmic">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <FFLAGS> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </FFLAGS>
-  <CFLAGS> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </CFLAGS>
-  <CONFIG_ARGS>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</CONFIG_ARGS>
-  <FFLAGS_NOOPT> -O0 -mmic </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpiifort</MPIFC>
+  <CFLAGS>
+    <base> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </base>
+    <append compile_threaded="true"> -openmp </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+    <append> -DCPRINTEL </append>
+  </CPPDEFS>
+  <CXX_LDFLAGS>
+    <base> -cxxlib </base>
+  </CXX_LDFLAGS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
+    <append compile_threaded="true"> -openmp </append>
+    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 -mmic </base>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed -132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+    <append> -mmic </append>
+  </LDFLAGS>
   <MPICC> mpiicc  </MPICC>
   <MPICXX> mpiicpc </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
+  <MPIFC> mpiifort</MPIFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <SFC> ifort </SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
+  </SLIBS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
-  <ADD_LDFLAGS> -mmic </ADD_LDFLAGS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
 </compiler>
 
 <compiler COMPILER="intelmic14">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <FFLAGS> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </FFLAGS>
-  <CFLAGS> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </CFLAGS>
-  <CONFIG_ARGS>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</CONFIG_ARGS>
-  <FFLAGS_NOOPT> -O0 -mmic </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpiifort</MPIFC>
+  <CFLAGS>
+    <base> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </base>
+    <append compile_threaded="true"> -openmp </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+    <append> -DCPRINTEL </append>
+  </CPPDEFS>
+  <CXX_LDFLAGS>
+    <base> -cxxlib </base>
+  </CXX_LDFLAGS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
+    <append compile_threaded="true"> -openmp </append>
+    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 -mmic </base>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed -132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+    <append> -mmic </append>
+  </LDFLAGS>
   <MPICC> mpiicc  </MPICC>
   <MPICXX> mpiicpc </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
+  <MPIFC> mpiifort</MPIFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <SFC> ifort </SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
+  </SLIBS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
-  <ADD_LDFLAGS> -mmic </ADD_LDFLAGS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
 </compiler>
 
-<compiler COMPILER="gnu">
-  <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -fopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -fopenmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -fopenmp </ADD_LDFLAGS>
-  <ADD_CMAKE_OPTS MODEL="cism"> -D CISM_GNU=ON </ADD_CMAKE_OPTS>
-  <FIXEDFLAGS>  -ffixed-form </FIXEDFLAGS>
-  <FREEFLAGS> -ffree-form </FREEFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -Wall </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -g -Wall </ADD_CFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O </ADD_CFLAGS>
-  <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
-       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
-  <FFLAGS> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </FFLAGS>
-  <CFLAGS> -mcmodel=medium </CFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -fdefault-real-8 </FC_AUTO_R8>
-  <SFC> gfortran </SFC>
-  <SCC> gcc </SCC>
-  <SCXX> g++ </SCXX>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+<compiler COMPILER="nag">
+  <CFLAGS>
+    <append DEBUG="TRUE"> -g </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <append> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH </append>
+  </CPPDEFS>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <!-- Yes, you really do need this huge -wmismatch flag for NAG to work.    -->
+    <!-- More specifically, it exempts MPI functions without explicit          -->
+    <!-- interfaces from certain argument checks. Should not be necessary in   -->
+    <!-- libraries that only use the F90 module interface. mpibcast and        -->
+    <!-- mpiscatterv are actually CAM wrappers for MPI.                        -->
+    <base> -wmismatch=mpi_send,mpi_recv,mpi_bcast,mpi_allreduce,mpi_reduce,mpi_isend,mpi_irecv,mpi_irsend,mpi_rsend,mpi_gatherv,mpi_gather,mpi_scatterv,mpi_allgather,mpi_alltoallv,mpi_file_read_all,mpi_file_write_all,mpibcast,mpiscatterv,mpi_alltoallw,nfmpi_get_vara_all,NFMPI_IPUT_VARA,NFMPI_GET_VAR_ALL,NFMPI_PUT_VARA,NFMPI_PUT_ATT_REAL,NFMPI_PUT_ATT_DOUBLE,NFMPI_PUT_ATT_INT,NFMPI_GET_ATT_REAL,NFMPI_GET_ATT_INT,NFMPI_GET_ATT_DOUBLE,NFMPI_PUT_VARA_DOUBLE_ALL,NFMPI_PUT_VARA_REAL_ALL,NFMPI_PUT_VARA_INT_ALL    -convert=BIG_ENDIAN </base>
+    <!-- DEBUG vs. non-DEBUG runs.                                             -->
+    <append DEBUG="FALSE"> -ieee=full -O2 </append>
+    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
+    <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
+    <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
+    <append DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </append>
+    <append DEBUG="TRUE" compile_threaded="false"> -gline </append>
+    <append compile_threaded="true"> -openmp </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> <var>FFLAGS</var> </base>
+    <append DEBUG="FALSE"> -ieee=full     </append>
+    <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
+    <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
+    <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
+    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
+    <append DEBUG="TRUE" compile_threaded="false"> -gline        </append>
+    <append compile_threaded="true"> -openmp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+  </LDFLAGS>
+  <MPICC> mpicc </MPICC>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> gcc </SCC>
+  <SFC> nagfor </SFC>
 </compiler>
 
 <compiler COMPILER="pathscale">
-  <!-- http://www.pathscale.com/node/70 -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16 -DCPRPATHSCALE </ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -mp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -mp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -mp </ADD_LDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -trapuv -Wuninitialized </ADD_FFLAGS>
-  <FFLAGS> -O -extend_source -ftpp -fno-second-underscore -funderscoring -byteswapio  </FFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICC> mpicc  </MPICC>
+  <CFLAGS>
+    <append compile_threaded="true"> -mp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://www.pathscale.com/node/70 -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16 -DCPRPATHSCALE </append>
+  </CPPDEFS>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -O -extend_source -ftpp -fno-second-underscore -funderscoring -byteswapio  </base>
+    <append compile_threaded="true"> -mp </append>
+    <append DEBUG="TRUE"> -g -trapuv -Wuninitialized </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+  </FFLAGS_NOOPT>
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-<compiler COMPILER="cray">
-  <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CPPDEFS MODEL="pop"> -DDIR=NOOP </ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="false"> -h noomp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="false"> -h noomp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="false"> -h noomp </ADD_LDFLAGS>
-  <ADD_CPPDEFS MODEL="moby"> -DDIR=NOOP </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -trapuv  -Wuninitialized </ADD_FFLAGS>
-  <FFLAGS> -O2  -f free -N 255  -h byteswapio -em </FFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="false"> -h noomp </ADD_FFLAGS_NOOPT>
-  <FC_AUTO_R8> -s real64 </FC_AUTO_R8>
-  <LDFLAGS> -Wl,--allow-multiple-definition -h byteswapio </LDFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-
-<compiler COMPILER="nag">
-
-  <SFC> nagfor </SFC>
+  <LDFLAGS>
+    <append compile_threaded="true"> -mp </append>
+  </LDFLAGS>
+  <MPICC> mpicc  </MPICC>
   <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <MPICC> mpicc </MPICC>
+</compiler>
 
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH </ADD_CPPDEFS>
-
-  <!-- Yes, you really do need this huge -wmismatch flag for NAG to work.    -->
-  <!-- More specifically, it exempts MPI functions without explicit          -->
-  <!-- interfaces from certain argument checks. Should not be necessary in   -->
-  <!-- libraries that only use the F90 module interface. mpibcast and        -->
-  <!-- mpiscatterv are actually CAM wrappers for MPI.                        -->
-  <FFLAGS      > -wmismatch=mpi_send,mpi_recv,mpi_bcast,mpi_allreduce,mpi_reduce,mpi_isend,mpi_irecv,mpi_irsend,mpi_rsend,mpi_gatherv,mpi_gather,mpi_scatterv,mpi_allgather,mpi_alltoallv,mpi_file_read_all,mpi_file_write_all,mpibcast,mpiscatterv,mpi_alltoallw,nfmpi_get_vara_all,NFMPI_IPUT_VARA,NFMPI_GET_VAR_ALL,NFMPI_PUT_VARA,NFMPI_PUT_ATT_REAL,NFMPI_PUT_ATT_DOUBLE,NFMPI_PUT_ATT_INT,NFMPI_GET_ATT_REAL,NFMPI_GET_ATT_INT,NFMPI_GET_ATT_DOUBLE,NFMPI_PUT_VARA_DOUBLE_ALL,NFMPI_PUT_VARA_REAL_ALL,NFMPI_PUT_VARA_INT_ALL    -convert=BIG_ENDIAN </FFLAGS>
-  <FFLAGS_NOOPT> $(FFLAGS) </FFLAGS_NOOPT>
-
-  <!-- DEBUG vs. non-DEBUG runs.                                             -->
-  <ADD_FFLAGS       DEBUG="FALSE"> -ieee=full -O2 </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT DEBUG="FALSE"> -ieee=full     </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS       DEBUG="TRUE"> -g -time -f2003 -ieee=stop </ADD_FFLAGS>
-  <ADD_CFLAGS       DEBUG="TRUE"> -g </ADD_CFLAGS>
-
-  <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
-  <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
-  <ADD_FFLAGS       DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </ADD_FFLAGS>
-  <ADD_FFLAGS       DEBUG="TRUE" compile_threaded="false"> -gline </ADD_FFLAGS>
-  <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
-  <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
-  <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
-  <ADD_FFLAGS_NOOPT DEBUG="TRUE"> -g -time -f2003 -ieee=stop </ADD_FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT DEBUG="TRUE" compile_threaded="false"> -gline        </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -openmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <FIXEDFLAGS> -fixed </FIXEDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
+<compiler COMPILER="pgi">
+  <CFLAGS>
+    <base> -gopt -Mlist  -time </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
+    <!-- Notes:  (see pgi man page & user's guide for the details) -->
+    <!--  -Mextend        => Allow 132-column source lines -->
+    <!--  -Mfixed         => Assume fixed-format source -->
+    <!--  -Mfree          => Assume free-format source -->
+    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
+    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
+    <!--  -fast           => Chooses generally optimal flags for the target platform -->
+    <!--  -Mnovect        => Disables automatic vector pipelining -->
+    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
+    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
+    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
+    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
+    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
+    <!-- -->
+    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
+    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
+    <!--  -Mbounds        => Add array bounds checking  -->
+    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
+    <!--                     * inv: invalid operands         -->
+    <!--                     * divz divide by zero           -->
+    <!--                     * ovf: floating point overflow   -->
+    <!--  -Mlist          => Create a listing file             -->
+    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
+    <!--  -time           => Print execution time for each compiler step  -->
+    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </append>
+  </CPPDEFS>
+  <CXX_LINKER>CXX</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
+    <append MODEL="datm"> -Mnovect </append>
+    <append MODEL="dlnd"> -Mnovect </append>
+    <append MODEL="drof"> -Mnovect </append>
+    <append MODEL="dwav"> -Mnovect </append>
+    <append MODEL="dice"> -Mnovect </append>
+    <append MODEL="docn"> -Mnovect </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -Mfixed </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -Mfree </base>
+  </FREEFLAGS>
+  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
+       need some machine-specific libraries - see hopper pgi for an
+       example -->
+  <!-- Technically, PGI does recognize this keyword during parsing,
+       but support is either buggy or incomplete, notably in that
+       the "contiguous" attribute is incompatible with "intent".-->
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <base> -time -Wl,--allow-multiple-definition </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </LDFLAGS>
+  <MPICC> mpicc </MPICC>
+  <MPICXX> mpicxx </MPICXX>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> pgcc </SCC>
+  <SCXX> pgc++ </SCXX>
+  <SFC> pgf95 </SFC>
 </compiler>
 
-<compiler OS="Darwin">
-   <ADD_CPPDEFS> -DSYSDARWIN </ADD_CPPDEFS>
-   <ADD_LDFLAGS MODEL="driver"> -all_load </ADD_LDFLAGS>
+<compiler COMPILER="pgiacc">
+  <CFLAGS>
+    <base> -Mlist -time </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
+    <!-- Notes:  (see pgi man page & user's guide for the details) -->
+    <!--  -Mextend        => Allow 132-column source lines -->
+    <!--  -Mfixed         => Assume fixed-format source -->
+    <!--  -Mfree          => Assume free-format source -->
+    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
+    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
+    <!--  -fast           => Chooses generally optimal flags for the target platform -->
+    <!--  -Mnovect        => Disables automatic vector pipelining -->
+    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
+    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
+    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
+    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
+    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
+    <!-- -->
+    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
+    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
+    <!--  -Mbounds        => Add array bounds checking  -->
+    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
+    <!--                     * inv: invalid operands         -->
+    <!--                     * divz divide by zero           -->
+    <!--                     * ovf: floating point overflow   -->
+    <!--  -Mlist          => Create a listing file             -->
+    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
+    <!--  -time           => Print execution time for each compiler step  -->
+    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DUSE_CUDA_FORTRAN -DCPRPGI </append>
+  </CPPDEFS>
+  <CXX_LINKER>CXX</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base>  -i4 -Mlist  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+    <append MODEL="cam"> -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo -Minfo=accel -DUSE_OPENACC=1 </append>
+    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
+    <append MODEL="datm"> -Mnovect </append>
+    <append MODEL="dlnd"> -Mnovect </append>
+    <append MODEL="drof"> -Mnovect </append>
+    <append MODEL="dwav"> -Mnovect </append>
+    <append MODEL="dice"> -Mnovect </append>
+    <append MODEL="docn"> -Mnovect </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -Mfixed </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -Mfree </base>
+  </FREEFLAGS>
+  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
+       need some machine-specific libraries - see hopper pgi for an
+       example -->
+  <!-- Technically, PGI does recognize this keyword during parsing,
+       but support is either buggy or incomplete, notably in that
+       the "contiguous" attribute is incompatible with "intent".-->
+  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <base> -time -Wl,--allow-multiple-definition -acc -ta=tesla,pin,cuda7.0,cc35,ptxinfo </base>
+    <append compile_threaded="false"> </append>
+    <append compile_threaded="true"> -mp </append>
+  </LDFLAGS>
+  <MPICC> mpicc </MPICC>
+  <MPICXX> mpicxx </MPICXX>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> pgcc </SCC>
+  <SCXX> pgc++ </SCXX>
+  <SFC> pgf95 </SFC>
 </compiler>
 
-<compiler COMPILER="intel" OS="Darwin" >
-  <ADD_FFLAGS compile_threaded="false"> -heap-arrays </ADD_FFLAGS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
+<compiler OS="AIX" COMPILER="ibm">
+  <CFLAGS>
+    <append> -qarch=auto -qtune=auto -qcache=auto </append>
+  </CFLAGS>
+  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
+  <FFLAGS>
+    <append> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </append>
+    <append MODEL="cam"> -qspill=6000 </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append DEBUG="TRUE"> -qsigtrap=xl__trcedump </append>
+    <append> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </append>
+  </LDFLAGS>
+  <MPICC> mpcc_r </MPICC>
+  <MPIFC> mpxlf2003_r </MPIFC>
+  <SCC> cc_r </SCC>
+  <SFC> xlf2003_r </SFC>
+  <SLIBS>
+    <append> -lmassv -lessl </append>
+    <append DEBUG="FALSE"> -lmass </append>
+  </SLIBS>
+</compiler>
+
+<compiler OS="BGL" COMPILER="ibm">
+  <CFLAGS>
+    <base> -O3 -qstrict </base>
+    <append> -qtune=440 -qarch=440d </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX -DnoI8 </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append> -qtune=440 -qarch=440d </append>
+    <append DEBUG="FALSE"> -O3 -qstrict -Q </append>
+    <append DEBUG="TRUE"> -qinitauto=FF911299 -qflttrap=ov:zero:inv:en </append>
+    <append> -qextname=flush </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
+  </LDFLAGS>
+  <MLIBS>
+    <base> -L/bgl/BlueLight/ppcfloor/bglsys/lib -lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts </base>
+  </MLIBS>
+  <MPICC> blrts_xlc </MPICC>
+  <MPIFC> blrts_xlf2003 </MPIFC>
+  <MPI_LIB_NAME> mpich.rts </MPI_LIB_NAME>
+  <MPI_PATH> /bgl/BlueLight/ppcfloor/bglsys</MPI_PATH>
+  <SCC> blrts_xlc </SCC>
+  <SFC> blrts_xlf2003 </SFC>
 </compiler>
 
-<compiler MACH="userdefined">
-  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
-  <PNETCDF_PATH></PNETCDF_PATH>
-  <ADD_SLIBS># USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_CPPDEFS></ADD_CPPDEFS>
-  <CONFIG_ARGS></CONFIG_ARGS>
-  <ESMF_LIBDIR></ESMF_LIBDIR>
-  <MPI_LIB_NAME></MPI_LIB_NAME>
-  <MPI_PATH></MPI_PATH>
+<compiler OS="BGP" COMPILER="ibm">
+  <CFLAGS>
+    <append> -qtune=450 -qarch=450 -I/bgsys/drivers/ppcfloor/arch/include/</append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX -DnoI8 </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append>-qspillsize=2500 -qtune=450 -qarch=450 </append>
+    <append> -qextname=flush </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
+  </LDFLAGS>
+</compiler>
+
+<compiler OS="BGQ" COMPILER="ibm">
+  <CONFIG_ARGS>
+    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX  </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </base>
+    <append DEBUG="FALSE"> -O3 -qstrict -Q </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
+  </LDFLAGS>
 </compiler>
 
 <compiler OS="CNL">
-  <SFC> ftn </SFC>
-  <SCC> cc </SCC>
-  <SCXX> CC </SCXX>
-  <MPIFC> ftn </MPIFC>
+  <CMAKE_OPTS>
+    <base> -DCMAKE_SYSTEM_NAME=Catamount</base>
+  </CMAKE_OPTS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </append>
+  </CPPDEFS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
+  <MPIFC> ftn </MPIFC>
   <MPI_LIB_NAME> mpich </MPI_LIB_NAME>
-  <MPI_PATH> $(MPICH_DIR)</MPI_PATH>
-  <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PARALLEL_NETCDF_DIR)</PNETCDF_PATH>
+  <MPI_PATH> <env>MPICH_DIR</env></MPI_PATH>
+  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </GPTL_CPPDEFS>
-  <CMAKE_OPTS> -DCMAKE_SYSTEM_NAME=Catamount</CMAKE_OPTS>
+  <PNETCDF_PATH><env>PARALLEL_NETCDF_DIR</env></PNETCDF_PATH>
+  <SCC> cc </SCC>
+  <SCXX> CC </SCXX>
+  <SFC> ftn </SFC>
 </compiler>
 
+<compiler OS="Darwin">
+  <CPPDEFS>
+    <append> -DSYSDARWIN </append>
+  </CPPDEFS>
+  <LDFLAGS>
+    <append MODEL="driver"> -all_load </append>
+  </LDFLAGS>
+</compiler>
+
+<compiler OS="Darwin" COMPILER="intel">
+  <FFLAGS>
+    <append compile_threaded="false"> -heap-arrays </append>
+  </FFLAGS>
+  <SLIBS>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler OS="Linux" COMPILER="intel">
+  <FFLAGS>
+    <append> -mcmodel medium -shared-intel </append>
+  </FFLAGS>
+</compiler>
+
+<compiler MACH="anlworkstation" COMPILER="gnu">
+  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CXX_LIBS>
+    <base>-lstdc++ -lmpi_cxx</base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="blues" COMPILER="gnu">
+  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
+  <MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/gnu-5.2/</MPI_PATH>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
+</compiler>
 
-<compiler COMPILER="intel" MACH="edison">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
-  <ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
-  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
-  <MPIFC> ftn </MPIFC>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
-  <ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_09232015/Albany/build/install</ALBANY_PATH>
+<compiler MACH="blues" COMPILER="intel">
+  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
+  <MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/intel-15.0</MPI_PATH>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas </append>
+    <append> -Wl,-rpath -Wl,<env>NETCDFROOT</env>/lib </append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="blues" COMPILER="intel13">
+  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
+  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
+  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/intel-13.1</MPI_PATH>
+  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-intel-13.1</MPI_PATH>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="blues" COMPILER="nag">
+  <MPI_LIB_NAME MPILIB="mpich"> mpi </MPI_LIB_NAME>
+  <MPI_PATH MPILIB="mpich">/home/robl/soft/mpich-3.1.4-nag-6.0</MPI_PATH>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="intel" MACH="cori-haswell">
-  <ADD_FFLAGS> -xCORE-AVX2 </ADD_FFLAGS>
-  <ADD_CFLAGS> -xCORE-AVX2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -qno-opt-dynamic-align </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
-  <ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
-  <!--ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS-->
-  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
-  <ADD_CPPDEFS> -DHAVE_SLASHPROC </ADD_CPPDEFS>
-  <MPIFC> ftn </MPIFC>
+<compiler MACH="blues" COMPILER="pgi">
+  <MPI_LIB_NAME MPILIB="mvapich"> mpi</MPI_LIB_NAME>
+  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
+  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
+  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/pgi-13.9</MPI_PATH>
+  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-pgi-13.9/</MPI_PATH>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> -llapack -lblas</append>
+    <append> -rpath <env>NETCDFROOT</env>/lib </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="caldera">
+  <CPPDEFS>
+    <!-- these flags enable nano timers -->
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+  <NETCDF_PATH><env>NETCDF</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDF</env></PNETCDF_PATH>
+</compiler>
+
+<compiler MACH="cascade" COMPILER="intel">
+  <CONFIG_ARGS>
+    <base> --host=Linux --enable-filesystem-hints=lustre</base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt </base>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="cascade" COMPILER="nag">
+  <CPPDEFS>
+    <append> -DnoI8 </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <!--  -C=Undefined flag doesn't work as it requires MPI and NETCDF to be
+      compiled with this flag, which is not available now. NAG has the following debug flags
+      <ADD_FFLAGS DEBUG="TRUE">  -gline  -C=all  -g  -C=undefined -C=recursion -nan -O0 -v  </ADD_FFLAGS>
+      "-nan" is an important flag. currently, it doesn't work for pio, it is only used for "cam" model.
+ -->
+    <append DEBUG="TRUE">  -gline  -C=all  -g  -O0 -v  </append>
+    <append DEBUG="TRUE" MODEL="cam">  -gline  -C=all  -g  -nan -O0 -v  </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append compile_threaded="true">  </append>
+  </LDFLAGS>
+  <MPI_PATH MPILIB="mvapich2"> <env>MPI_LIB</env></MPI_PATH>
+  <NETCDF_PATH><env>NETCDF_ROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> -L<env>NETCDF_ROOT</env>/lib -lnetcdf -lnetcdff -L<env>MKL_PATH</env> -lmkl_rt</append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="cetus" COMPILER="ibm">
+  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CPPDEFS>
+    <append> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </append>
+  </CPPDEFS>
+  <CXX_LIBS>
+    <base> -llapack -lblas -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </base>
+  </CXX_LIBS>
+  <CXX_LINKER>CXX</CXX_LINKER>
+  <LDFLAGS>
+    <append>-L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl </append>
+  </LDFLAGS>
+  <MPICC> mpixlc_r </MPICC>
+  <MPICXX> /soft/compilers/bgclang/mpi/bgclang/bin/mpic++11 </MPICXX>
+  <MPIFC> mpixlf2003_r </MPIFC>
+  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
+  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
+  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
+  <SCC> mpixlc_r </SCC>
+  <SFC> mpixlf2003_r </SFC>
+  <SLIBS>
+    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
+    <append compile_threaded="true"> -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </append>
+  </SLIBS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+</compiler>
+
+<compiler MACH="constance" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt</base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="constance" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append DEBUG="TRUE">-C -Mbounds -traceback -Mchkfpstk -Mchkstk -Mdalign  -Mdepchk  -Mextend -Miomutex -Mrecursive  -Ktrap=fp -O0 -g -byteswapio -Meh_frame</append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MPI_LIB</env> -lmpich</base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="cori-haswell" COMPILER="intel">
+  <CFLAGS>
+    <append> -xCORE-AVX2 </append>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DHAVE_SLASHPROC </append>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append> -xCORE-AVX2 </append>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
-</compiler>
-
-<compiler COMPILER="intel" MACH="cori-knl">
-  <ADD_FFLAGS> -xMIC-AVX512 </ADD_FFLAGS>
-  <ADD_CFLAGS> -xMIC-AVX512 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -qno-opt-dynamic-align</ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
-  <ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
-  <!--ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS-->
-
-  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
-  <ADD_CPPDEFS>  -DHAVE_SLASHPROC </ADD_CPPDEFS>
-  <!--ADD_CPPDEFS>  -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </ADD_CPPDEFS> -->
   <MPIFC> ftn </MPIFC>
+  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
+  <SLIBS>
+    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
+    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="cori-knl" COMPILER="intel">
+  <CFLAGS>
+    <append> -xMIC-AVX512 </append>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DHAVE_SLASHPROC </append>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append> -xMIC-AVX512 </append>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <PETSC_PATH>$(PETSC_DIR)</PETSC_PATH>
+  <MPIFC> ftn </MPIFC>
+  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
+  <SLIBS>
+    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
+    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="eastwind" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="intel" MACH="eos">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
-  <ADD_SLIBS> ${MKLROOT}/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_sequential.a -Wl,--end-group ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </ADD_SLIBS>
-  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
-  <MPIFC> ftn </MPIFC>
+<compiler MACH="edison" COMPILER="intel">
+  <ALBANY_PATH>/global/project/projectdirs/acme/software/AlbanyTrilinos_09232015/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
-</compiler>
-
-<compiler COMPILER="intel" MACH="theta">
   <MPIFC> ftn </MPIFC>
+  <PETSC_PATH><env>PETSC_DIR</env></PETSC_PATH>
+  <SLIBS>
+    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
+    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="eos" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_CFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib </ADD_SLIBS>
-  <ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS>
-  <ADD_CPPFLAGS> -DHAVE_COMM_F2C </ADD_CPPFLAGS>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="mac">
-  <NETCDF_PATH> $(NETCDF_PATH)</NETCDF_PATH>
-  <ADD_LDFLAGS>-framework Accelerate</ADD_LDFLAGS>
-  <ADD_SLIBS>-L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="linux-generic">
-  <NETCDF_PATH> $(NETCDF_PATH)</NETCDF_PATH>
-  <PNETCDF_PATH> $(PNETCDF_PATH)</PNETCDF_PATH>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nc-config --flibs) </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="melvin">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -lblas -llapack</ADD_SLIBS>
-  <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="sandia-srn-sems">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/usr/lib64 -L/usr/lib64/atlas -lblas -llapack</ADD_SLIBS>
-  <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="anlworkstation">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -lblas -llapack</ADD_SLIBS>
-  <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</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>
-  <MPI_PATH MPILIB="openmpi">/opt/openmpi-1.8-intel</MPI_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>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="intel" MACH="redsky">
-  <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>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="sierra">
-  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
-  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
-  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <ADD_CPPDEFS> -DNO_SHR_VMATH -DCNL </ADD_CPPDEFS>
-  <ADD_SLIBS>$(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_LDFLAGS> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib -llapack -lblas</ADD_LDFLAGS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="sierra">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH>/usr/local/tools/netcdf-intel-4.1.3</NETCDF_PATH>
-  <PNETCDF_PATH>/usr/local/tools/parallel-netcdf-intel-1.6.1</PNETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <MPI_PATH>/usr/local/tools/mvapich2-intel-2.1/</MPI_PATH>
-  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <ADD_CPPDEFS> -DNO_SHR_VMATH -DCNL </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
-  <ADD_SLIBS>$(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_LDFLAGS> -llapack -lblas</ADD_LDFLAGS>
-</compiler>
-<compiler>
-  <ADD_CPPDEFS MODEL="pop"> -D_USE_FLOW_CONTROL </ADD_CPPDEFS>
-</compiler>
-
-<compiler MACH="oic2" COMPILER="gnu">
-  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
-  <ADD_SLIBS>-L/user/lib64 -llapack -lblas -lnetcdff </ADD_SLIBS>
-  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
-  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
-  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
-  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
-  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
-</compiler>
-
-<compiler MACH="oic2" COMPILER="pgi">
-  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
-</compiler>
-
-<compiler MACH="oic5" COMPILER="gnu">
-  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
-  <ADD_SLIBS>-L/user/lib64 -llapack -lblas -lnetcdff </ADD_SLIBS>
-  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
-  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
-  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
-  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
-  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
+  <MPIFC> ftn </MPIFC>
+  <SLIBS>
+    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
+    <append> <env>MKLROOT</env>/lib/intel64/libmkl_scalapack_lp64.a -Wl,--start-group <env>MKLROOT</env>/lib/intel64/libmkl_intel_lp64.a <env>MKLROOT</env>/lib/intel64/libmkl_core.a <env>MKLROOT</env>/lib/intel64/libmkl_sequential.a -Wl,--end-group <env>MKLROOT</env>/lib/intel64/libmkl_blacs_intelmpi_lp64.a -lpthread -lm </append>
+  </SLIBS>
 </compiler>
 
-<compiler MACH="oic5" COMPILER="pgi">
-  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
+<compiler MACH="hopper" COMPILER="gnu">
+  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="gnu" MACH="cades">
-      <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-      <ADD_CFLAGS compile_threaded="true"> -fopenmp </ADD_CFLAGS>
-      <ADD_FFLAGS compile_threaded="true"> -fopenmp </ADD_FFLAGS>
-      <ADD_LDFLAGS compile_threaded="true"> -L$(GCC_ROOT)/lib64/gcc/x86_64-unknown-linux-gnu/5.3.0 -fopenmp </ADD_LDFLAGS>
-      <ADD_CMAKE_OPTS MODEL="cism"> -D CISM_GNU=ON </ADD_CMAKE_OPTS>
-      <FIXEDFLAGS>  -ffixed-form </FIXEDFLAGS>
-      <FREEFLAGS> -ffree-form </FREEFLAGS>
-      <ADD_FFLAGS DEBUG="TRUE"> -g -Wall </ADD_FFLAGS>
-      <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS 
-                                 so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
-      <FFLAGS> -O -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -fno-range-check</FFLAGS>
-      <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-      <FC_AUTO_R8> -fdefault-real-8 </FC_AUTO_R8>
-      <!-- user install gcc -->
-      <SFC>/software/tools/spack/opt/spack/linux-x86_64/gcc-4.8.5/gcc-5.3.0-5hy3c4b3xqemygnfwyl5dsc753gbvzrc/bin/gfortran</SFC>
-      <SCC>/software/tools/spack/opt/spack/linux-x86_64/gcc-4.8.5/gcc-5.3.0-5hy3c4b3xqemygnfwyl5dsc753gbvzrc/bin/gcc</SCC>
-      <SCXX>/software/tools/spack/opt/spack/linux-x86_64/gcc-4.8.5/gcc-5.3.0-5hy3c4b3xqemygnfwyl5dsc753gbvzrc/bin/gcpp</SCXX>
-      <MPIFC>/software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/openmpi-1.10.2-w26llp27jmybo7wlgoqxjrtptltmripg/bin/mpif90</MPIFC>
-      <MPICC>/software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/openmpi-1.10.2-w26llp27jmybo7wlgoqxjrtptltmripg/bin/mpicc</MPICC>
-      <MPICXX>/software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/openmpi-1.10.2-w26llp27jmybo7wlgoqxjrtptltmripg/bin/mpic++</MPICXX>
-      <CXX_LINKER>FORTRAN</CXX_LINKER>
-      <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-      <!-- user installed/loaded NETCDF/HDF5/LAPACK libraries, install directories MUST be specified in 'env_mach_specific.cades -->
-      <NETCDF_PATH>/software/user_tools/current/cades-ccsi/netcdf4/4.4.0/openmpi-1.10.2-gcc-5.3</NETCDF_PATH>
-      <HDF5_ROOT>/software/user_tools/current/cades-ccsi/hdf5/1.8.16/openmpi-1.10.2-gcc-5.3</HDF5_ROOT>
-      <LAPACK_LIBDIR>/software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/netlib-lapack-3.5.0-ktb3cldqesiba6ndoiifvr3irojqhdhc/lib/</LAPACK_LIBDIR>
-      <BLAS_LIBDIR>/software/tools/spack/opt/spack/linux-x86_64/gcc-5.3.0/netlib-blas-3.5.0-cxsdr3okwvgr6u7kusa5ee5vhsyqxwgg/lib/</BLAS_LIBDIR>
-      <ADD_LDFLAGS MODEL="driver" > -L$(NETCDF_PATH)/lib -Wl,-rpath=$(NETCDF_PATH)/lib -lnetcdff -lnetcdf \
-              -L$(HDF5_ROOT)/lib -Wl,-rpath=$(HDF5_ROOT)/lib -lhdf5_hl -lhdf5 \
-              -L$(LAPACK_LIBDIR) -Wl,-rpath=$(LAPACK_LIBDIR) \
-              -L$(BLAS_LIBDIR) -Wl,-rpath=$(BLAS_LIBDIR)
-      </ADD_LDFLAGS>
-      <PFUNIT_PATH></PFUNIT_PATH>
-</compiler>
-
-<compiler COMPILER="intel" MACH="titan">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) </ADD_SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="titan">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS> $(shell nf-config --flibs) </ADD_SLIBS>
-  <TRILINOS_PATH>/lustre/atlas/world-shared/cli900/cesm/software/Trilinos/Trilinos-11.10.2_gptl/titan-pgi-ci-nophal/install</TRILINOS_PATH>
-  <CXX_LIBS> -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o /opt/gcc/default/snos/lib64/libstdc++.a  </CXX_LIBS>
+<compiler MACH="hopper" COMPILER="intel">
+  <ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
+  <ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="hopper" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CXX_LIBS>
+    <base> -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <MPIFC> ftn </MPIFC>
-  <MPICC> cc </MPICC>
-  <MPICXX> /opt/cray/craype/2.4.0/bin/CC </MPICXX>
-  <ALBANY_PATH>/ccs/proj/cli106/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="pgiacc" MACH="titan">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) </ADD_SLIBS>
-  <CXX_LIBS> -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+<compiler MACH="lawrencium-lr2" COMPILER="intel">
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+  <SLIBS>
+    <append> -lnetcdff -lnetcdf -mkl</append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="ibm" OS="AIX">
-  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
-  <SFC> xlf2003_r </SFC>
-  <MPIFC> mpxlf2003_r </MPIFC>
-  <SCC> cc_r </SCC>
-  <MPICC> mpcc_r </MPICC>
-  <ADD_CFLAGS> -qarch=auto -qtune=auto -qcache=auto </ADD_CFLAGS>
-  <ADD_FFLAGS> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </ADD_FFLAGS>
-  <ADD_LDFLAGS DEBUG="TRUE"> -qsigtrap=xl__trcedump </ADD_LDFLAGS>
-  <ADD_FFLAGS MODEL="cam"> -qspill=6000 </ADD_FFLAGS>
-  <ADD_LDFLAGS> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </ADD_LDFLAGS>
-  <ADD_SLIBS> -lmassv -lessl </ADD_SLIBS>
-  <ADD_SLIBS DEBUG="FALSE"> -lmass </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="ibm" OS="BGL">
-  <ADD_CFLAGS> -qtune=440 -qarch=440d </ADD_CFLAGS>
-  <ADD_FFLAGS> -qtune=440 -qarch=440d </ADD_FFLAGS>
-  <MPI_PATH> /bgl/BlueLight/ppcfloor/bglsys</MPI_PATH>
-  <MPI_LIB_NAME> mpich.rts </MPI_LIB_NAME>
-  <SFC> blrts_xlf2003 </SFC>
-  <MPIFC> blrts_xlf2003 </MPIFC>
-  <SCC> blrts_xlc </SCC>
-  <MPICC> blrts_xlc </MPICC>
-  <CFLAGS> -O3 -qstrict </CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O3 -qstrict -Q </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -qinitauto=FF911299 -qflttrap=ov:zero:inv:en </ADD_FFLAGS>
-  <MLIBS> -L/bgl/BlueLight/ppcfloor/bglsys/lib -lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts </MLIBS>
-  <ADD_CPPDEFS> -DLINUX -DnoI8 </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
-  <ADD_FFLAGS> -qextname=flush </ADD_FFLAGS>
+<compiler MACH="lawrencium-lr3" COMPILER="intel">
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+  <SLIBS>
+    <append> -lnetcdff -lnetcdf -mkl</append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="ibm" OS="BGP">
-  <ADD_CFLAGS> -qtune=450 -qarch=450 -I/bgsys/drivers/ppcfloor/arch/include/</ADD_CFLAGS>
-  <ADD_FFLAGS>-qspillsize=2500 -qtune=450 -qarch=450 </ADD_FFLAGS>
-  <ADD_CPPDEFS> -DLINUX -DnoI8 </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
-  <ADD_FFLAGS> -qextname=flush </ADD_FFLAGS>
+<compiler MACH="linux-generic" COMPILER="gnu">
+  <NETCDF_PATH> <env>NETCDF_PATH</env></NETCDF_PATH>
+  <PNETCDF_PATH> <env>PNETCDF_PATH</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell> </append>
+  </SLIBS>
 </compiler>
 
-
-<compiler COMPILER="ibm" OS="BGQ">
-  <FFLAGS> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O3 -qstrict -Q </ADD_FFLAGS>
-  <ADD_CPPDEFS> -DLINUX  </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
+<compiler MACH="mac" COMPILER="gnu">
+  <LDFLAGS>
+    <append>-framework Accelerate</append>
+  </LDFLAGS>
+  <NETCDF_PATH> <env>NETCDF_PATH</env></NETCDF_PATH>
+  <SLIBS>
+    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf</append>
+  </SLIBS>
 </compiler>
 
-
-<compiler COMPILER="ibm" MACH="mira">
-  <SFC> mpixlf2003_r </SFC>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <SCC> mpixlc_r </SCC>
-  <MPICC> mpixlc_r </MPICC>
+<compiler MACH="melvin" COMPILER="gnu">
+  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CXX_LIBS>
+    <base>-lstdc++ -lmpi_cxx</base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="mira" COMPILER="ibm">
+  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CPPDEFS>
+    <append> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </append>
+  </CPPDEFS>
+  <CXX_LIBS>
+    <base> -llapack -lblas -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </base>
+  </CXX_LIBS>
+  <CXX_LINKER>CXX</CXX_LINKER>
+  <HDF5_PATH>/soft/libraries/hdf5/1.8.14/cnk-xl/current/ </HDF5_PATH>
   <!-- This LD is a workaround for darshan initialization on mira (Darshan does -->
   <!-- not run if f90 or higher is used for linking -->
   <LD> mpixlf77_r </LD>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.0/cnk-xl/current/</PNETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <HDF5_PATH>/soft/libraries/hdf5/1.8.14/cnk-xl/current/ </HDF5_PATH>
-  <ADD_SLIBS>-L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.14/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </ADD_SLIBS>
-  <ADD_SLIBS compile_threaded="true"> -L$(IBM_MAIN_DIR)/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L$(IBM_MAIN_DIR)/xlsmp/bg/3.1/bglib64 -lxlsmp </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <CXX_LIBS> -llapack -lblas -L$(IBM_MAIN_DIR)/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L$(IBM_MAIN_DIR)/xlsmp/bg/3.1/bglib64 -lxlsmp </CXX_LIBS>
-  <ADD_CPPDEFS> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </ADD_CPPDEFS>
+  <MPICC> mpixlc_r </MPICC>
   <MPICXX> /soft/compilers/bgclang/mpi/bgclang/bin/mpic++11 </MPICXX>
-  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-
-<compiler COMPILER="ibm" MACH="cetus">
-  <SFC> mpixlf2003_r </SFC>
   <MPIFC> mpixlf2003_r </MPIFC>
-  <SCC> mpixlc_r </SCC>
-  <MPICC> mpixlc_r </MPICC>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
+  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
+  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
   <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <ADD_LDFLAGS>-L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl </ADD_LDFLAGS>
-   <ADD_SLIBS>-L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5 -lhdf5_hl -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </ADD_SLIBS>
-  <ADD_SLIBS compile_threaded="true"> -L$(IBM_MAIN_DIR)/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L$(IBM_MAIN_DIR)/xlsmp/bg/3.1/bglib64 -lxlsmp </ADD_SLIBS>
   <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PETSC_PATH>/soft/libraries/petsc/3.5.3.1</PETSC_PATH>
+  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.0/cnk-xl/current/</PNETCDF_PATH>
+  <SCC> mpixlc_r </SCC>
+  <SFC> mpixlf2003_r </SFC>
+  <SLIBS>
+    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.14/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
+    <append compile_threaded="true"> -L<env>IBM_MAIN_DIR</env>/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L<env>IBM_MAIN_DIR</env>/xlsmp/bg/3.1/bglib64 -lxlsmp </append>
+  </SLIBS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <CXX_LIBS> -llapack -lblas -L$(IBM_MAIN_DIR)/xlf/bg/14.1/bglib64 -lxlfmath -lxlf90_r -lxlopt -lxl -L$(IBM_MAIN_DIR)/xlsmp/bg/3.1/bglib64 -lxlsmp </CXX_LIBS>
-  <ADD_CPPDEFS> -DMPASLI_EXTERNAL_INTERFACE_DISABLE_MANGLING </ADD_CPPDEFS>
-  <MPICXX> /soft/compilers/bgclang/mpi/bgclang/bin/mpic++11 </MPICXX>
-  <ALBANY_PATH>/projects/ccsm/libs/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="blues">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/pgi-13.9</MPI_PATH>
-  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-pgi-13.9/</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <ADD_SLIBS> -rpath $(NETCDFROOT)/lib </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
 </compiler>
 
-<compiler COMPILER="intel13" MACH="blues">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="openmpi">/soft/openmpi/1.8.2/intel-13.1</MPI_PATH>
-  <MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-intel-13.1</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="blues">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/intel-15.0</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas </ADD_SLIBS>
-  <ADD_SLIBS> -Wl,-rpath -Wl,$(NETCDFROOT)/lib </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="mustang" COMPILER="gnu">
+  <ALBANY_PATH><env>ALBANY_PATH</env></ALBANY_PATH>
+  <CXX_LIBS>
+    <base>-lstdc++ -lmpi_cxx</base>
+  </CXX_LIBS>
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>gcc</SCC>
+  <SCXX>g++</SCXX>
+  <SFC>gfortran</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="gnu" MACH="blues">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mvapich">/blues/gpfs/home/software/spack/opt/spack/linux-x86_64/gcc-5.3.0/mvapich2-2.2b-sdh7nhddicl4sh5mgxjyzxtxox3ajqey</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY</GPTL_CPPDEFS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="mustang" COMPILER="intel">
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>icc</SCC>
+  <SCXX>icpc</SCXX>
+  <SFC>ifort</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="nag" MACH="blues">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mpich">/home/robl/soft/mpich-3.1.4-nag-6.0</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mpich"> mpi </MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="mustang" COMPILER="pgi">
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>pgcc</SCC>
+  <SCXX>pgc++</SCXX>
+  <SFC>pgfortran</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="intel" MACH="anvil">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mvapich">/blues/gpfs/home/software/spack-0.9.1/opt/spack/linux-centos6-x86_64/intel-16.0.3/mvapich2-2.2b-ow5ikyjehwemgdr4h6k7ii7da6hs6lfz</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas </ADD_SLIBS>
-  <ADD_SLIBS> -Wl,-rpath -Wl,$(NETCDFROOT)/lib </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="oic2" COMPILER="gnu">
+  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
+  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
+  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
+  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
+  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
+  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
+  <SLIBS>
+    <append>-L/user/lib64 -llapack -lblas -lnetcdff </append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="gnu" MACH="anvil">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mvapich">/soft/spack/opt/spack/linux-x86_64/gcc-4.4.7/gcc-5.3.0-fygfl7rvyuiteto27dlhmilp5cstw2o2</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY</GPTL_CPPDEFS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="oic2" COMPILER="pgi">
+  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="anvil">
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <MPI_PATH MPILIB="mvapich">soft/spack/opt/spack/linux-x86_64/pgi-16.3-0/mvapich2-2.2b-2t45yukj4ij6ek24fwimzydo2dg6i3n2</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mvapich"> mpi</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
-  <ADD_SLIBS> -rpath $(NETCDFROOT)/lib </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+<compiler MACH="oic5" COMPILER="gnu">
+  <MPICC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpicc</MPICC>
+  <MPIFC>/projects/cesm/devtools/mpich-3.0.4-gcc4.8.1/bin/mpif90</MPIFC>
+  <NETCDF_PATH>/projects/cesm/devtools/netcdf-4.1.3-gcc4.8.1-mpich3.0.4/</NETCDF_PATH>
+  <SCC>/projects/cesm/devtools/gcc-4.8.1/bin/gcc</SCC>
+  <SCXX>/projects/cesm/devtools/gcc-4.8.1/bin/g++</SCXX>
+  <SFC>/projects/cesm/devtools/gcc-4.8.1/bin/gfortran</SFC>
+  <SLIBS>
+    <append>-L/user/lib64 -llapack -lblas -lnetcdff </append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="eastwind">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
+<compiler MACH="oic5" COMPILER="pgi">
+  <NETCDF_PATH>/home/zdr/opt/netcdf-4.1.3_pgf95</NETCDF_PATH>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="olympus">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/..</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="olympus" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="olympus">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/..</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="olympus" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="intel" MACH="sooty">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="redsky" COMPILER="intel">
+  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="skybridge" COMPILER="intel">
+  <ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="sooty" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF</env></NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lpmi </SLIBS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="sooty">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/..</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lpmi </base>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="sooty" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="cascade">
-  <NETCDF_PATH> $(NETCDF_LIB)/..</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="titan" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <CONFIG_ARGS> --host=Linux --enable-filesystem-hints=lustre</CONFIG_ARGS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi -L$(MKL_PATH) -lmkl_rt </SLIBS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="nag" MACH="cascade">
- <NETCDF_PATH>$(NETCDF_ROOT)</NETCDF_PATH >
- <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
- <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
- <MPI_PATH MPILIB="mvapich2"> $(MPI_LIB)</MPI_PATH >
- <ADD_CPPDEFS> -DnoI8 </ADD_CPPDEFS>
- <ADD_LDFLAGS compile_threaded="true">  </ADD_LDFLAGS>
- <!--  -C=Undefined flag doesn't work as it requires MPI and NETCDF to be
-      compiled with this flag, which is not available now. NAG has the following debug flags
-      <ADD_FFLAGS DEBUG="TRUE">  -gline  -C=all  -g  -C=undefined -C=recursion -nan -O0 -v  </ADD_FFLAGS>
-      "-nan" is an important flag. currently, it doesn't work for pio, it is only used for "cam" model.
- -->
- <ADD_FFLAGS DEBUG="TRUE" >  -gline  -C=all  -g  -O0 -v  </ADD_FFLAGS>
- <ADD_FFLAGS DEBUG="TRUE" MODEL="cam">  -gline  -C=all  -g  -nan -O0 -v  </ADD_FFLAGS>
- <ADD_SLIBS> -L$(NETCDF_ROOT)/lib -lnetcdf -lnetcdff -L$(MKL_PATH) -lmkl_rt</ADD_SLIBS>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> </append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="constance">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/../</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="titan" COMPILER="pgi">
+  <ALBANY_PATH>/ccs/proj/cli106/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CXX_LIBS>
+    <base> -lfmpich -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o /opt/gcc/default/snos/lib64/libstdc++.a  </base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <MPICC> cc </MPICC>
+  <MPICXX> /opt/cray/craype/2.4.0/bin/CC </MPICXX>
+  <MPIFC> ftn </MPIFC>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE">-C -Mbounds -traceback -Mchkfpstk -Mchkstk -Mdalign  -Mdepchk  -Mextend -Miomutex -Mrecursive  -Ktrap=fp -O0 -g -byteswapio -Meh_frame</ADD_FFLAGS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi -L$(MPI_LIB) -lmpich</SLIBS>
+  <SLIBS>
+    <append> <shell>nf-config --flibs</shell> </append>
+  </SLIBS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
+  <TRILINOS_PATH>/lustre/atlas/world-shared/cli900/cesm/software/Trilinos/Trilinos-11.10.2_gptl/titan-pgi-ci-nophal/install</TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="intel" MACH="constance">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/../</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="titan" COMPILER="pgiacc">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CXX_LIBS>
+    <base> -lfmpich -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -traceback  -O0 -fpe0 -check  all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi -L$(MKL_LIB) -lmkl_rt</SLIBS>
-</compiler>
-
-
-<compiler COMPILER="pgi" MACH="hopper">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
- <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
- <CXX_LIBS> -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
- <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intel" MACH="hopper">
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
-  <ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
- <ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="hopper">
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="pgi">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>pgfortran</SFC>
-	<SCC>pgcc</SCC>
-	<SCXX>pgc++</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="intel">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>ifort</SFC>
-	<SCC>icc</SCC>
-	<SCXX>icpc</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler MACH="mustang" COMPILER="gnu">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>gfortran</SFC>
-	<SCC>gcc</SCC>
-	<SCXX>g++</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-        <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-	<ALBANY_PATH>$(ALBANY_PATH)</ALBANY_PATH>
-</compiler>
-
-<compiler MACH="wolf" COMPILER="pgi">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>pgfortran</SFC>
-	<SCC>pgcc</SCC>
-	<SCXX>pgc++</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> </append>
+  </SLIBS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
-<compiler MACH="wolf" COMPILER="intel">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>ifort</SFC>
-	<SCC>icc</SCC>
-	<SCXX>icpc</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-	<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-	<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
+<compiler MACH="userdefined">
+  <CONFIG_ARGS>
+    <base/>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append/>
+  </CPPDEFS>
+  <ESMF_LIBDIR/>
+  <MPI_LIB_NAME/>
+  <MPI_PATH/>
+  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
+  <PNETCDF_PATH/>
+  <SLIBS>
+    <append># USERDEFINED <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell></append>
+  </SLIBS>
 </compiler>
 
 <compiler MACH="wolf" COMPILER="gnu">
-	<MPICC>mpicc</MPICC>
-	<MPIFC>mpif90</MPIFC>
-	<MPICXX>mpic++</MPICXX>
-	<SFC>gfortran</SFC>
-	<SCC>gcc</SCC>
-	<SCXX>g++</SCXX>
-	<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
-        <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-	<TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-	<ALBANY_PATH>$(ALBANY_PATH)</ALBANY_PATH>
-</compiler>
-
-<compiler MACH="caldera">
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF)</PNETCDF_PATH>
-  <!-- these flags enable nano timers -->
- <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
+  <ALBANY_PATH><env>ALBANY_PATH</env></ALBANY_PATH>
+  <CXX_LIBS>
+    <base>-lstdc++ -lmpi_cxx</base>
+  </CXX_LIBS>
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>gcc</SCC>
+  <SCXX>g++</SCXX>
+  <SFC>gfortran</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-<compiler COMPILER="intel" MACH="lawrencium-lr2">
-	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
-	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="lawrencium-lr3">
-	<ADD_SLIBS> -lnetcdff -lnetcdf -mkl</ADD_SLIBS>
-	<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
-</compiler>
-
-<compiler COMPILER="gnu">
-	<ADD_CFLAGS MODEL="csm_share"> -std=c99 </ADD_CFLAGS>
+<compiler MACH="wolf" COMPILER="intel">
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>icc</SCC>
+  <SCXX>icpc</SCXX>
+  <SFC>ifort</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-</config_compilers>
+<compiler MACH="wolf" COMPILER="pgi">
+  <MPICC>mpicc</MPICC>
+  <MPICXX>mpic++</MPICXX>
+  <MPIFC>mpif90</MPIFC>
+  <SCC>pgcc</SCC>
+  <SCXX>pgc++</SCXX>
+  <SFC>pgfortran</SFC>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -llapack -lblas</append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
+</compiler>
+
+</config_build>
diff --git a/cime_config/buildlib.gptl b/cime_config/buildlib.gptl
index 42dc281db9d..1269c3fd4cc 100755
--- a/cime_config/buildlib.gptl
+++ b/cime_config/buildlib.gptl
@@ -18,6 +18,6 @@ setenv SHAREDPATH  $2
 
 cd $GPTL_LIBDIR
 
-$GMAKE  -f $GPTL_DIR/Makefile install  MACFILE=$CASEROOT/Macros MODEL=gptl || exit 1
+$GMAKE  -f $GPTL_DIR/Makefile install  MACFILE=$CASEROOT/Macros.make MODEL=gptl || exit 1
 
 exit 0
diff --git a/cime_config/cesm/allactive/config_pes.xml b/cime_config/cesm/allactive/config_pes.xml
index 31252ebd1a1..23f446bcbad 100644
--- a/cime_config/cesm/allactive/config_pes.xml
+++ b/cime_config/cesm/allactive/config_pes.xml
@@ -77,7 +77,7 @@
     </mach>
   </grid>
   <grid name="a%1.9x2.5.+l%1.9x2.5.+oi%gx1">
-    <mach name="corip1">
+    <mach name="cori-haswell">
       <pes pesize="any" compset="any">
 	<comment>none</comment>
 	<ntasks>
@@ -1109,7 +1109,7 @@
     </mach>
   </grid>
   <grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
-    <mach name='corip1'>
+    <mach name='cori-haswell'>
       <pes pesize="any" compset="any">
 	<comment>none</comment>
 	<ntasks>
diff --git a/cime_config/cesm/config_files.xml b/cime_config/cesm/config_files.xml
index 42d126bc870..d3e9920a80a 100644
--- a/cime_config/cesm/config_files.xml
+++ b/cime_config/cesm/config_files.xml
@@ -47,14 +47,7 @@
     <group>case_last</group>
     <file>env_case.xml</file>
     <desc>file containing compiler specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
-  </entry>
-
-  <entry id="BUILD_SPEC_FILE">
-    <type>char</type>
-    <default_value>$CIMEROOT/cime_config/$MODEL/machines/config_build.xml</default_value>
-    <group>case_last</group>
-    <file>env_case.xml</file>
-    <desc>file containing build specifications for target model primary component (for documentation only - DO NOT EDIT)</desc>
+    <schema>$CIMEROOT/cime_config/xml_schemas/config_compilers_v2.xsd</schema>
   </entry>
 
   <entry id="PIO_SPEC_FILE">
@@ -332,4 +325,3 @@
   </entry>
 
 </entry_id>
-
diff --git a/cime_config/cesm/machines/Makefile b/cime_config/cesm/machines/Makefile
index 3cbf9943965..85835206f31 100644
--- a/cime_config/cesm/machines/Makefile
+++ b/cime_config/cesm/machines/Makefile
@@ -137,7 +137,7 @@ ifeq (,$(SHAREDPATH))
 endif
 INSTALL_SHAREDPATH = $(EXEROOT)/$(SHAREDPATH)
 
-include $(CASEROOT)/Macros
+include $(CASEROOT)/Macros.make
 # Decide whether to use a C++ or Fortran linker, based on whether we
 # are using any C++ code and the compiler-dependent CXX_LINKER variable
 ifeq ($(USE_CXX), true)
@@ -360,7 +360,7 @@ INCLDIR +=	-I$(INSTALL_SHAREDPATH)/include -I$(CIMEROOT)/share/csm_share/shr \
 CFLAGS+=$(CPPDEFS)
 CXXFLAGS := $(CFLAGS)
 
-CONFIG_ARGS +=  CC="$(SCC)" FC="$(SFC)" MPICC="$(MPICC)" \
+CONFIG_ARGS +=  CC="$(CC)" FC="$(FC)" MPICC="$(MPICC)" \
 		MPIFC="$(MPIFC)" FCFLAGS="$(FFLAGS) $(FREEFLAGS) $(INCLDIR)" \
 		CPPDEFS="$(CPPDEFS)" CFLAGS="$(CFLAGS) -I.. $(INCLDIR)" \
 		NETCDF_PATH=$(NETCDF_PATH) LDFLAGS="$(LDFLAGS)"
diff --git a/cime_config/cesm/machines/config_batch.xml b/cime_config/cesm/machines/config_batch.xml
index a214a2e4cb2..d3c76ca9b0c 100644
--- a/cime_config/cesm/machines/config_batch.xml
+++ b/cime_config/cesm/machines/config_batch.xml
@@ -10,7 +10,7 @@
      batch_redirect:   Whether a redirect character is needed to submit jobs.
      batch_directive:  The string that prepends a batch directive for the batch system.
      jobid_pattern:    A perl regular expression used to filter out the returned job id from a
-                       queue submission.
+		       queue submission.
      depend_pattern:
 
  ===============================================================
@@ -180,7 +180,7 @@
       <directive default="/bin/bash" > -S {{ shell }} </directive>
     </directives>
       <queues>
-        <queue walltimemax="24:00:00" default="true">regular</queue>
+	<queue walltimemax="24:00:00" default="true">regular</queue>
 	<queue walltimemax="00:30:00" jobmin="1" jobmax="512">debug</queue>
       </queues>
    </batch_system>
@@ -361,7 +361,7 @@
      </queues>
    </batch_system>
 
-   <batch_system MACH="corip1" type="slurm" version="x.y">
+   <batch_system MACH="cori-haswell" type="slurm" version="x.y">
      <batch_submit>sbatch</batch_submit>
      <directives>
        <directive>-C haswell </directive>
@@ -372,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="02: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>
@@ -446,4 +457,3 @@
 
 
 </config_batch>
-
diff --git a/cime_config/cesm/machines/config_build.xml b/cime_config/cesm/machines/config_build.xml
deleted file mode 100644
index dd0f2f12ef1..00000000000
--- a/cime_config/cesm/machines/config_build.xml
+++ /dev/null
@@ -1,1370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config_build>
-<!--
-========================================================================
-This file defines compiler flags for building CESM.  General flags are listed first
-followed by flags specific to particular operating systems, followed by particular machines.
-
-More general flags are replaced by more specific flags.
-Flags of the sort ADD_FLAG indicate that the field should be appended to an already existing FLAG definition.
-
-Attributes indicate that an if clause should be added to the Macros so that these flags are added
-only under the conditions described by the attribute(s).
-
-The env_mach_specific file may set environment variables or load modules which set environment variables
-which are then  used in the Makefile.   For example the NETCDF_PATH on many machines is set by a module.
-
-Do not use variables CPPDEFS and SLIBS here, instead use ADD_CPPDEFS and ADD_SLIBS
-
-========================================================================
-Serial/MPI compiler specification
-========================================================================
-
-SCC   and  SFC specifies the serial compiler
-MPICC and  MPICC specifies the mpi compiler
-
-if $MPILIB is set to mpi-serial then
-CC = $SCC
-FC = $SFC
-MPICC = $SCC
-MPIFC = $SFC
-INC_MPI = $(CIMEROOT)/externals/mct/mpi-serial
-
-========================================================================
-Options for including C++ code in the build
-========================================================================
-
-SUPPORTS_CXX (TRUE/FALSE): Whether we have defined all the necessary
-settings for including C++ code in the build for this compiler (or
-this compiler/machine combination). See below for a description of the
-necessary settings.
-
-The following are required for a compiler to support the inclusion of
-C++ code:
-
-SCXX: serial C++ compiler
-
-MPICXX: mpi C++ compiler
-
-CXX_LINKER (CXX/FORTRAN): When C++ code is included in the build, do
-we use a C++ or Fortran linker?
-
-In addition, some compilers require additional libraries or link-time
-flags, specified via CXX_LIBS or CXX_LDFLAGS, as in the following
-examples:
-
-<CXX_LIBS> -L/path/to/directory -lfoo </CXX_LIBS>
-
-or
-
-<CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
-
-Note that these libraries or LDFLAGS will be added on the link line,
-regardless of whether we are using a C++ or Fortran linker. For
-example, if CXX_LINKER=CXX, then the above CXX_LIBS line should
-specify extra libraries needed when linking C++ and fortran code using
-a C++ linker. If CXX_LINKER=FORTRAN, then the above CXX_LDFLAGS line
-should specify extra LDFLAGS needed when linking C++ and fortran code
-using a fortran linker.
-
-These should NOT be specified via <ADD_SLIBS USE_CXX="true"> or
-<ADD_LDFLAGS USE_CXX="true">, because those mess up the configure step
-for mct, etc.
-
-
-===========================
--->
-<!-- Define default values that can be overridden by specific
-     compilers -->
-<compiler>
-  <CPPDEFS>
-    <append MODEL="pop"> -D_USE_FLOW_CONTROL </append>
-  </CPPDEFS>
-  <SUPPORTS_CXX>FALSE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="cray">
-  <CFLAGS>
-    <append compile_threaded="false"> -h noomp </append>
-    <append DEBUG="TRUE"> -g -O0 </append>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append MODEL="pop"> -DDIR=NOOP </append>
-    <append MODEL="moby"> -DDIR=NOOP </append>
-  </CPPDEFS>
-  <FC_AUTO_R8>
-    <base> -s real64 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -f free -N 255  -h byteswapio -x dir </base>
-    <append compile_threaded="false"> -h noomp </append>
-    <append DEBUG="TRUE"> -g -O0 -K trap=fp  -m1 </append>
-    <append DEBUG="FALSE"> -O2,ipa2 -em </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O1,fp2,ipa0,scalar0,vector0 </base>
-  </FFLAGS_NOOPT>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -Wl,--allow-multiple-definition -h byteswapio </base>
-  </LDFLAGS>
-</compiler>
-
-<compiler COMPILER="gnu">
-  <CFLAGS>
-    <base> -mcmodel=medium -std=gnu99 </base>
-    <append compile_threaded="true"> -fopenmp </append>
-    <append DEBUG="TRUE"> -g -Wall </append>
-    <append DEBUG="FALSE"> -O </append>
-  </CFLAGS>
-  <CMAKE_OPTS>
-    <append MODEL="cism"> -D CISM_GNU=ON </append>
-  </CMAKE_OPTS>
-  <CPPDEFS>
-    <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-  </CPPDEFS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -fdefault-real-8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
-       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
-    <base> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
-    <append compile_threaded="true"> -fopenmp </append>
-    <append DEBUG="TRUE"> -g -Wall </append>
-    <append DEBUG="FALSE"> -O </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base>  -ffixed-form </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -ffree-form </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -fopenmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <SCXX> g++ </SCXX>
-  <SFC> gfortran </SFC>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="ibm">
-  <CFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 </base>
-    <append DEBUG="FALSE"> -O3  </append>
-    <append compile_threaded="true"> -qsmp=omp </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
- Notes:  (see xlf user's guide for the details)
-  -lmass          => IBM-tuned intrinsic lib
-  -qsmp=noauto    => enable SMP directives, but don't add any
-  -qsmp=omp       => enable SMP directives, strict omp
-  -qstrict        => don't turn divides into multiplies, etc
-  -qhot           => higher-order-transformations (eg. loop padding)
-  -qalias=noaryovrlp => assume no array overlap wrt equivalance, etc
-  -qmaxmem=-1     => memory available to compiler during optimization
-  -qipa=level=2   => InterProcedure Analysis (eg. inlining) => slow compiles
-  -p -pg          => enable profiling (use in both FFLAGS and LDFLAGS)
-  -qreport        => for smp/omp only
-  -g              => always leave it on because overhead is minimal
-  -qflttrap=...   => enable default sigtrap (core dump)
-  -C              => runtime array bounds checking (runs slow)
-  -qinitauto=...  => initializes automatic variables
-  -->
-    <append> -DFORTRAN_SAME </append>
-  </CPPDEFS>
-  <CPRE>-WF,-D</CPRE>
-  <FC_AUTO_R8>
-    <base> -qrealsize=8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 </base>
-    <append DEBUG="FALSE"> -O2 -qstrict -qinline=auto </append>
-    <append compile_threaded="true"> -qsmp=omp </append>
-    <append DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
-    <append DEBUG="TRUE" MODEL="pop"> -C </append>
-  </FFLAGS>
-  <FIXEDFLAGS>
-    <base>  -qsuffix=f=f -qfixed=132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -qsuffix=f=f90:cpp=F90  </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -qsmp=omp </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
-  </LDFLAGS>
-</compiler>
-
-<compiler COMPILER="intel">
-  <CFLAGS>
-    <base>  -no-opt-dynamic-align -fp-model precise -std=gnu99 </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="FALSE"> -O2 -debug minimal </append>
-    <append DEBUG="TRUE"> -O0 -g </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -no-opt-dynamic-align  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source  </base>
-    <append compile_threaded="true"> -openmp </append>
-    <!-- WJS (8-11-14): For some reason, yellowstone-intel has starting giving lots of
-       messages about array temporaries, leading to a ton of standard output, and
-       sometimes causing runs to die. Adding '-check noarg_temp_created' to suppress these
-       diagnostics. This is a band-aid fix, which should really be addressed at the
-       system-level. (Note: I could not add this in the yellowstone-specific section,
-       beacuse apparently that overrides rather than adds to this ADD_FFLAGS list.) -->
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </append>
-    <append DEBUG="FALSE"> -O2 -debug minimal </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 </base>
-    <append compile_threaded="true"> -openmp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append MPILIB="mpich"> -mkl=cluster </append>
-    <append MPILIB="mpich2"> -mkl=cluster </append>
-    <append MPILIB="mvapich"> -mkl=cluster </append>
-    <append MPILIB="mvapich2"> -mkl=cluster </append>
-    <append MPILIB="mpt"> -mkl=cluster </append>
-    <append MPILIB="openmpi"> -mkl=cluster </append>
-    <append MPILIB="impi"> -mkl=cluster </append>
-    <append MPILIB="mpi-serial"> -mkl </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intelmic">
-  <CFLAGS>
-    <base> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </base>
-    <append compile_threaded="true"> -openmp </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
-    <append> -DCPRINTEL </append>
-  </CPPDEFS>
-  <CXX_LDFLAGS>
-    <base> -cxxlib </base>
-  </CXX_LDFLAGS>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </base>
-    <append compile_threaded="true"> -openmp </append>
-    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </append>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -mmic </base>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed -132 </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-    <append> -mmic </append>
-  </LDFLAGS>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <MPIFC> mpiifort</MPIFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="nag">
-  <CFLAGS>
-    <base> -std=gnu99 </base>
-    <append DEBUG="TRUE"> -g </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <append> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH </append>
-  </CPPDEFS>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <!-- The indirect flag below is to deal with MPI functions that violate    -->
-    <!-- the Fortran standard, by adding a large set of arguments from a file. -->
-    <base>-Wp,-macro=no_com -convert=BIG_ENDIAN -indirect <env>CIMEROOT</env>/cime_config/cesm/machines/nag_mpi_argument.txt</base>
-    <!-- DEBUG vs. non-DEBUG runs.                                             -->
-    <append DEBUG="FALSE"> -ieee=full -O2 </append>
-    <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
-    <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
-    <append DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </append>
-    <append DEBUG="TRUE" compile_threaded="false"> -gline </append>
-    <append compile_threaded="true"> -openmp </append>
-    <!-- The SLAP library (which is part of the CISM build) has many instances of
-       arguments being passed to different types. So disable argument type
-       checking when building CISM. This can be removed once we remove SLAP from
-       CISM. -->
-    <append MODEL="cism"> -mismatch_all </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> <var>FFLAGS</var> </base>
-    <append DEBUG="FALSE"> -ieee=full     </append>
-    <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
-    <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
-    <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
-    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
-    <append DEBUG="TRUE" compile_threaded="false"> -gline        </append>
-    <append compile_threaded="true"> -openmp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -fixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -free </base>
-  </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <SFC> nagfor </SFC>
-</compiler>
-
-<compiler COMPILER="pgi">
-  <CFLAGS>
-    <base> -gopt  -time </base>
-    <append compile_threaded="true"> -mp </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-    <!-- Notes:  (see pgi man page & user's guide for the details) -->
-    <!--  -Mextend        => Allow 132-column source lines -->
-    <!--  -Mfixed         => Assume fixed-format source -->
-    <!--  -Mfree          => Assume free-format source -->
-    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-    <!--  -fast           => Chooses generally optimal flags for the target platform -->
-    <!--  -Mnovect        => Disables automatic vector pipelining -->
-    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-    <!-- -->
-    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-    <!--  -Mbounds        => Add array bounds checking  -->
-    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-    <!--                     * inv: invalid operands         -->
-    <!--                     * divz divide by zero           -->
-    <!--                     * ovf: floating point overflow   -->
-    <!--  -Mlist          => Create a listing file             -->
-    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-    <!--  -time           => Print execution time for each compiler step  -->
-    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </append>
-  </CPPDEFS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
-    <append compile_threaded="true"> -mp </append>
-    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
-    <append MODEL="datm"> -Mnovect </append>
-    <append MODEL="dlnd"> -Mnovect </append>
-    <append MODEL="drof"> -Mnovect </append>
-    <append MODEL="dwav"> -Mnovect </append>
-    <append MODEL="dice"> -Mnovect </append>
-    <append MODEL="docn"> -Mnovect </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
-    <append compile_threaded="true"> -mp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -Mfixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -Mfree </base>
-  </FREEFLAGS>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -time -Wl,--allow-multiple-definition </base>
-    <append compile_threaded="true"> -mp </append>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> pgcc </SCC>
-  <SCXX> pgc++ </SCXX>
-  <SFC> pgf95 </SFC>
-</compiler>
-
-<compiler COMPILER="pgicuda">
-  <CFLAGS>
-    <base> -gopt -time </base>
-  </CFLAGS>
-  <CPPDEFS>
-    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-    <!-- Notes:  (see pgi man page & user's guide for the details) -->
-    <!--  -Mextend        => Allow 132-column source lines -->
-    <!--  -Mfixed         => Assume fixed-format source -->
-    <!--  -Mfree          => Assume free-format source -->
-    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-    <!--  -fast           => Chooses generally optimal flags for the target platform -->
-    <!--  -Mnovect        => Disables automatic vector pipelining -->
-    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-    <!-- -->
-    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-    <!--  -Mbounds        => Add array bounds checking  -->
-    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-    <!--                     * inv: invalid operands         -->
-    <!--                     * divz divide by zero           -->
-    <!--                     * ovf: floating point overflow   -->
-    <!--  -Mlist          => Create a listing file             -->
-    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-    <!--  -time           => Print execution time for each compiler step  -->
-    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DUSE_CUDA_FORTRAN -DCPRPGI </append>
-  </CPPDEFS>
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <FC_AUTO_R8>
-    <base> -r8 </base>
-  </FC_AUTO_R8>
-  <FFLAGS>
-    <base>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
-    <append MODEL="cam"> -ta=nvidia -Mcuda=5.5,cc35  </append>
-    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
-    <append MODEL="datm"> -Mnovect </append>
-    <append MODEL="dlnd"> -Mnovect </append>
-    <append MODEL="drof"> -Mnovect </append>
-    <append MODEL="dwav"> -Mnovect </append>
-    <append MODEL="dice"> -Mnovect </append>
-    <append MODEL="docn"> -Mnovect </append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
-    <append compile_threaded="true"> -mp </append>
-  </FFLAGS_NOOPT>
-  <FIXEDFLAGS>
-    <base> -Mfixed </base>
-  </FIXEDFLAGS>
-  <FREEFLAGS>
-    <base> -Mfree </base>
-  </FREEFLAGS>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <base> -time -Wl,--allow-multiple-definition -ta=nvidia -Mcuda=5.0,cc35 </base>
-  </LDFLAGS>
-  <MPICC> mpicc </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <MPIFC> mpif90 </MPIFC>
-  <SCC> pgcc </SCC>
-  <SCXX> pgc++ </SCXX>
-  <SFC> pgf95 </SFC>
-</compiler>
-
-<compiler OS="AIX" COMPILER="ibm">
-  <CFLAGS>
-    <append> -qarch=auto -qtune=auto -qcache=auto </append>
-  </CFLAGS>
-  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
-  <FFLAGS>
-    <append> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </append>
-    <append MODEL="cam"> -qspill=6000 </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append DEBUG="TRUE"> -qsigtrap=xl__trcedump </append>
-    <append> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </append>
-  </LDFLAGS>
-  <MPICC> mpcc_r </MPICC>
-  <MPIFC> mpxlf2003_r </MPIFC>
-  <SCC> cc_r </SCC>
-  <SFC> xlf2003_r </SFC>
-  <SLIBS>
-    <append> -lmassv -lessl </append>
-    <append DEBUG="FALSE"> -lmass </append>
-  </SLIBS>
-</compiler>
-
-<compiler OS="BGL" COMPILER="ibm">
-  <CFLAGS>
-    <base> -O3 -qstrict </base>
-    <append> -qtune=440 -qarch=440d </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX -DnoI8 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append> -qtune=440 -qarch=440d </append>
-    <append DEBUG="FALSE"> -O3 -qstrict -qinline=auto </append>
-    <append DEBUG="TRUE"> -qinitauto=FF911299 -qflttrap=ov:zero:inv:en </append>
-    <append> -qextname=flush </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-  <MLIBS>
-    <base> -L/bgl/BlueLight/ppcfloor/bglsys/lib -lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts </base>
-  </MLIBS>
-  <MPICC> blrts_xlc </MPICC>
-  <MPIFC> blrts_xlf2003 </MPIFC>
-  <MPI_LIB_NAME> mpich.rts </MPI_LIB_NAME>
-  <MPI_PATH> /bgl/BlueLight/ppcfloor/bglsys</MPI_PATH>
-  <SCC> blrts_xlc </SCC>
-  <SFC> blrts_xlf2003 </SFC>
-</compiler>
-
-<compiler OS="BGP" COMPILER="ibm">
-  <CFLAGS>
-    <append> -qtune=450 -qarch=450 -I/bgsys/drivers/ppcfloor/arch/include/</append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX -DnoI8 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append>-qspillsize=2500 -qtune=450 -qarch=450 </append>
-    <append> -qextname=flush </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="BGQ" COMPILER="ibm">
-  <CONFIG_ARGS>
-    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX  </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <base> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </base>
-    <append DEBUG="FALSE"> -O3 -qstrict -qinline=auto </append>
-    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp </append>
-    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="CNL">
-  <CMAKE_OPTS>
-    <base> -DCMAKE_SYSTEM_NAME=Catamount</base>
-  </CMAKE_OPTS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </append>
-  </CPPDEFS>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <MPIFC> ftn </MPIFC>
-  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PARALLEL_NETCDF_DIR</env></PNETCDF_PATH>
-  <SCC> cc </SCC>
-  <SCXX> CC </SCXX>
-  <SFC> ftn </SFC>
-</compiler>
-
-<compiler OS="Darwin">
-  <CPPDEFS>
-    <append> -DSYSDARWIN </append>
-  </CPPDEFS>
-  <LDFLAGS>
-    <append MODEL="driver"> -all_load </append>
-  </LDFLAGS>
-</compiler>
-
-<compiler OS="Darwin" COMPILER="intel">
-  <FFLAGS>
-    <append compile_threaded="false"> -heap-arrays </append>
-  </FFLAGS>
-</compiler>
-
-<compiler MACH="babbage">
-  <CFLAGS>
-    <append> -xHost -no-save-temps</append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DHAVE_NANOTIME -DCPRINTEL</append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append> -xHost -no-save-temps</append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append> <env>NETCDF</env> </append>
-  </LDFLAGS>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <MPIFC> mpiifort </MPIFC>
-  <!-- PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS -->
-  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
-  <PNETCDF_PATH><env>PNETCDF_DIR</env></PNETCDF_PATH>
-  <SCC> icc </SCC>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append> <env>NETCDf</env> <env>MKL</env></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="babbageKnc">
-  <CFLAGS>
-    <append> -mmic -O3 -fp-model precise -DFORTRANUNDERSCORE -no-save-temps</append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DHAVE_NANOTIME -DCPRINTELMIC -DCPRINTEL</append>
-  </CPPDEFS>
-  <FFLAGS>
-    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-    <append DEBUG="TRUE"> -O0 -g -check all -check noarg_temp_created</append>
-    <append DEBUG="FALSE"> -O3 -mP2OPT_hpo_matrix_opt_framework=0 </append>
-    <append> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -no-save-temps -no-opt-dynamic-align</append>
-  </FFLAGS>
-  <FFLAGS_NOOPT>
-    <base> -O0 -mmic </base>
-  </FFLAGS_NOOPT>
-  <LDFLAGS>
-    <append> <env>NETCDF</env> -mmic </append>
-  </LDFLAGS>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <MPIFC> mpiifort </MPIFC>
-  <!-- PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS -->
-  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
-  <PNETCDF_PATH><env>PNETCDF_DIR</env></PNETCDF_PATH>
-  <SCC> icc </SCC>
-  <SFC> ifort </SFC>
-  <SLIBS>
-    <append> <env>NETCDF</env> <env>MKL</env></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="bluewaters">
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-</compiler>
-
-<compiler MACH="bluewaters" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append> -nofma </append>
-  </CFLAGS>
-  <CXX_LIBS>
-    <base> -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append> -nofma </append>
-  </FFLAGS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="brutus">
-  <CONFIG_ARGS>
-    <base> --host=LINUX </base>
-  </CONFIG_ARGS>
-  <MPI_LIB_NAME MPILIB="mpich"> mpich </MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi </MPI_LIB_NAME>
-  <MPI_PATH> <env>MPI_ROOT</env></MPI_PATH>
-  <NETCDF_PATH> <env>NETCDF</env></NETCDF_PATH>
-</compiler>
-
-<compiler MACH="constance" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt</base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="constance" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="eastwind" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="eastwind" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append compile_threaded="false"> -nomp </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-    <append compile_threaded="false"> -nomp </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append compile_threaded="false"> -nomp </append>
-  </LDFLAGS>
-  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="edison" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_PAPI </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <SLIBS>
-    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="erebus">
-  <CPPDEFS>
-    <!--The following flag is required due to a bug in mpich2 v1208 -->
-    <append MODEL="cam" MPILIB="mpich2"> -DNO_MPI2 </append>
-  </CPPDEFS>
-  <NETCDF_PATH><env>NETCDF</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDF</env></PNETCDF_PATH>
-  <SCC>mpicc</SCC>
-  <SFC>mpif90</SFC>
-</compiler>
-
-<compiler MACH="goldbach">
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="goldbach" COMPILER="intel">
-  <LDFLAGS>
-    <append> -Wl,-rpath,<var>NETCDF_PATH</var>/lib </append>
-    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/lib/intel64 </append>
-    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/mkl/lib/intel64 </append>
-  </LDFLAGS>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
-</compiler>
-
-<compiler MACH="goldbach" COMPILER="nag">
-  <CPPDEFS>
-    <append> -DNO_C_SIZEOF </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <!-- needed for nag pio build.. -->
-    <append> -kind=byte </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <!-- Experimental wrapper for OpenMP. -->
-    <append compile_threaded="true"> -L/home/santos/lib/fake_omp -lfake_omp -Wl,-Wl,,--rpath=/home/santos/lib/fake_omp </append>
-  </LDFLAGS>
-  <MPI_PATH MPILIB="openmpi"> /usr/local/openmpi-gcc-nag</MPI_PATH>
-  <NETCDF_PATH> /usr/local/netcdf-gcc-nag</NETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_NAG_3_0</PFUNIT_PATH>
-</compiler>
-
-<compiler MACH="goldbach" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O0 </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O0 </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append> -lgomp </append>
-    <append> -Wl,-R<var>NETCDF_PATH</var>/lib</append>
-    <append> -Wl,-R<env>COMPILER_PATH</env>/lib</append>
-    <append> -Wl,-R<env>COMPILER_PATH</env>/libso</append>
-  </LDFLAGS>
-</compiler>
-
-<compiler MACH="hera" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</append>
-  </LDFLAGS>
-  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
-  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
-  <SLIBS>
-    <append><shell>/usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hobart">
-  <CPPDEFS>
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
-  <MPI_LIB_NAME MPILIB="mvapich2"> mpich</MPI_LIB_NAME>
-  <NETCDF_PATH><env>NETCDF_PATH</env></NETCDF_PATH>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hobart" COMPILER="intel">
-  <CFLAGS>
-    <append> -lifcore</append>
-  </CFLAGS>
-  <FFLAGS>
-    <append> -lifcore</append>
-    <append MPILIB="mpi-serial"> -mcmodel medium </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append> -lquadmath </append>
-    <append> -Wl,-rpath,<var>NETCDF_PATH</var>/lib </append>
-    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/lib/intel64 </append>
-    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/mkl/lib/intel64 </append>
-    <append> -Wl,-rpath,<env>MPI_PATH</env>/lib</append>
-    <append> -lifcore</append>
-  </LDFLAGS>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
-  <SLIBS>
-    <append MPILIB="mvapich2"> -mkl=cluster </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hobart" COMPILER="nag">
-  <CPPDEFS>
-    <!-- needed for nag pio build.. -->
-    <append> -DNO_C_SIZEOF </append>
-  </CPPDEFS>
-  <LDFLAGS>
-    <append> -lpthread</append>
-  </LDFLAGS>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_NAG_3_0</PFUNIT_PATH>
-</compiler>
-
-<compiler MACH="hobart" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O0 </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O0 </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append> -lgomp </append>
-    <append> -Wl,-R<var>NETCDF_PATH</var>/lib</append>
-    <append> -Wl,-R<env>COMPILER_PATH</env>/lib</append>
-    <append> -Wl,-R<env>COMPILER_PATH</env>/libso</append>
-  </LDFLAGS>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="gnu">
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="intel">
-  <ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-  <ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="hopper" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CXX_LIBS>
-    <base> -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="juqueen" COMPILER="ibm">
-  <MPICC> mpixlc_r </MPICC>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <NETCDF_PATH> /bgsys/local/netcdf/</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH> /bgsys/local/parallel-netcdf/v1.3.1</PNETCDF_PATH>
-  <SCC> mpixlc_r </SCC>
-  <SFC> mpixlf2003_r </SFC>
-  <SLIBS>
-    <append>-L/bgsys/local/netcdf/lib -lnetcdf -L/bgsys/drivers/ppcfloor/comm/lib </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="melvin" COMPILER="gnu">
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base>-lstdc++ -lmpi_cxx</base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="mira" COMPILER="ibm">
-  <CFLAGS>
-    <append>-qfloat=nomaf</append>
-  </CFLAGS>
-  <FFLAGS>
-    <append>-qfloat=nomaf</append>
-  </FFLAGS>
-  <HDF5_PATH><env>HDF5</env></HDF5_PATH>
-  <!-- This LD is a workaround for darshan initialization on mira (Darshan does -->
-  <!-- not run if f90 or higher is used for linking -->
-  <LD> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf77_r </LD>
-  <MPICC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </MPICC>
-  <MPIFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </MPIFC>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.1/cnk-xl/current/</PNETCDF_PATH>
-  <SCC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </SCC>
-  <SFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </SFC>
-  <SLIBS>
-    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L<env>HDF5</env>/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="olympus" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append> -DLINUX </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="pleiades-has">
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 -aCORE-AVX2 -align array32byte </append>
-  </FFLAGS>
-  <MPICC>icc</MPICC>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
-  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <SLIBS>
-    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="pleiades-ivy">
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 -xAVX </append>
-  </FFLAGS>
-  <MPICC>icc</MPICC>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
-  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <SLIBS>
-    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="pleiades-san">
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 -xAVX </append>
-  </FFLAGS>
-  <MPICC>icc</MPICC>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
-  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <SLIBS>
-    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="pleiades-wes">
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 -xSSE4.2 </append>
-  </FFLAGS>
-  <MPICC>icc</MPICC>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
-  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <SLIBS>
-    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="pronghorn" COMPILER="intel">
-  <CFLAGS>
-    <append> -xHost </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append> -xHost </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append>-L<env>TACC_HDF5_LIB</env> -lhdf5</append>
-  </LDFLAGS>
-  <MPICC>mpiicc</MPICC>
-  <MPICXX>mpicpc</MPICXX>
-  <MPIFC>mpiifort</MPIFC>
-  <SCC>icc</SCC>
-  <SCXX>icpc</SCXX>
-  <SFC>ifort</SFC>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L<env>TACC_HDF5_LIB</env> -lhdf5</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="sierra">
-  <LDFLAGS>
-    <append> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</append>
-  </LDFLAGS>
-  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
-  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
-  <SLIBS>
-    <append><shell>/usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="skybridge" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2  </append>
-  </FFLAGS>
-  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="stampede">
-  <CPPDEFS>
-    <append> -DHAVE_NANOTIME </append>
-  </CPPDEFS>
-  <NETCDF_PATH><env>TACC_NETCDF_DIR</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>TACC_PNETCDF_DIR</env></PNETCDF_PATH>
-</compiler>
-
-<compiler MACH="stampede" COMPILER="intel">
-  <CFLAGS>
-    <append> -xHost </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append> -xHost </append>
-    <append MPILIB="mpi-serial"> -mcmodel medium </append>
-  </FFLAGS>
-  <LDFLAGS>
-    <append>-L<env>TACC_HDF5_LIB</env> -lhdf5</append>
-  </LDFLAGS>
-  <SLIBS>
-    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L<env>TACC_HDF5_LIB</env> -lhdf5</append>
-  </SLIBS>
-  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="titan" COMPILER="intel">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler MACH="titan" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </CFLAGS>
-  <CONFIG_ARGS>
-    <base> --host=Linux </base>
-  </CONFIG_ARGS>
-  <CXX_LIBS>
-    <base> -lfmpich -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
-  </CXX_LIBS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O2 </append>
-  </FFLAGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <SLIBS>
-    <append> <shell>nf-config --flibs</shell> </append>
-  </SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <TRILINOS_PATH>/lustre/atlas1/cli900/world-shared/cesm/software/Trilinos/Trilinos-11.12.1/titan-pgi-cesm/install</TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="tukey" COMPILER="ibm">
-  <HDF5_PATH>/soft/libraries/hdf5/1.8.10/cnk-xl/current/ </HDF5_PATH>
-  <!-- This LD is a workaround for darshan initialization on tukey?? (Darshan does -->
-  <!-- not run if f90 or higher is used for linking -->
-  <LD> mpixlf77_r </LD>
-  <MPICC> mpixlc_r </MPICC>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
-  <SCC> mpixlc_r </SCC>
-  <SFC> mpixlf2003_r </SFC>
-  <SLIBS>
-    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="userdefined">
-  <CONFIG_ARGS>
-    <base/>
-  </CONFIG_ARGS>
-  <CPPDEFS>
-    <append/>
-  </CPPDEFS>
-  <ESMF_LIBDIR/>
-  <MPI_LIB_NAME/>
-  <MPI_PATH/>
-  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
-  <PNETCDF_PATH/>
-  <SLIBS>
-    <append># USERDEFINED <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell></append>
-  </SLIBS>
-</compiler>
-
-<compiler MACH="yellowstone">
-  <CPPDEFS>
-    <!-- these flags enable nano timers -->
-    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
-  </CPPDEFS>
-  <NETCDF_PATH><env>NETCDF</env></NETCDF_PATH>
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH><env>PNETCDF</env></PNETCDF_PATH>
-</compiler>
-
-<compiler MACH="yellowstone" COMPILER="gnu">
-  <LAPACK_LIBDIR> /glade/apps/opt/lib </LAPACK_LIBDIR>
-</compiler>
-
-<compiler MACH="yellowstone" COMPILER="intel">
-  <CFLAGS>
-    <append MPILIB="mpich2">  -xHost </append>
-  </CFLAGS>
-  <CPPDEFS>
-    <append MPILIB="mpich2"> -DINTEL_MKL -DHAVE_SSE2 </append>
-  </CPPDEFS>
-  <FFLAGS>
-    <append MPILIB="mpich2">  -xHost </append>
-  </FFLAGS>
-  <MPICXX MPILIB="mpich2">mpiicpc</MPICXX>
-  <PAPI_INC MPILIB="mpich2"> /glade/apps/opt/papi/5.3.0/intel/12.1.5/include/</PAPI_INC>
-  <PAPI_LIB MPILIB="mpich2">/glade/apps/opt/papi/5.3.0/intel/12.1.5/lib64 </PAPI_LIB>
-  <PFUNIT_PATH><env>CESMDATAROOT</env>/tools/pFUnit/pFUnit3.1_Intel15.0.1_MPI</PFUNIT_PATH>
-  <!-- Needed due to the way that netcdf is loaded on yellowstone -->
-  <SCC MPILIB="mpi-serial">icc</SCC>
-  <SFC MPILIB="mpi-serial">ifort</SFC>
-  <SCC MPILIB="mpich2"><var>MPICC</var></SCC>
-  <SFC MPILIB="mpich2"><var>MPIFC</var></SFC>
-  <SLIBS>
-    <append MPILIB="mpich2"> -Wl,-rpath <var>PAPI_LIB</var> -L<var>PAPI_LIB</var> -lpapi</append>
-  </SLIBS>
-  <TRILINOS_PATH MPILIB="mpich2"><env>TRILINOS_PATH</env></TRILINOS_PATH>
-</compiler>
-
-<compiler MACH="yellowstone" COMPILER="pathscale">
-  <CPPDEFS>
-    <append> -DNO_MPIMOD </append>
-  </CPPDEFS>
-  <SCC>pathcc</SCC>
-  <SFC>pathf95</SFC>
-</compiler>
-
-<compiler MACH="yellowstone" COMPILER="pgi">
-  <CFLAGS>
-    <append DEBUG="FALSE"> -O </append>
-  </CFLAGS>
-  <FFLAGS>
-    <append DEBUG="FALSE"> -O </append>
-  </FFLAGS>
-  <SLIBS>
-    <append> -llapack -lblas </append>
-  </SLIBS>
-</compiler>
-
-</config_build>
diff --git a/cime_config/cesm/machines/config_compilers.xml b/cime_config/cesm/machines/config_compilers.xml
index 2779a9ea5a5..473a844d19b 100644
--- a/cime_config/cesm/machines/config_compilers.xml
+++ b/cime_config/cesm/machines/config_compilers.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
-<config_compilers>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<config_compilers version="2.0">
 <!--
 ========================================================================
 This file defines compiler flags for building CESM.  General flags are listed first
 followed by flags specific to particular operating systems, followed by particular machines.
 
 More general flags are replaced by more specific flags.
-Flags of the sort ADD_FLAG indicate that the field should be appended to an already existing FLAG definition.
 
 Attributes indicate that an if clause should be added to the Macros so that these flags are added
 only under the conditions described by the attribute(s).
@@ -15,8 +13,6 @@ only under the conditions described by the attribute(s).
 The env_mach_specific file may set environment variables or load modules which set environment variables
 which are then  used in the Makefile.   For example the NETCDF_PATH on many machines is set by a module.
 
-Do not use variables CPPDEFS and SLIBS here, instead use ADD_CPPDEFS and ADD_SLIBS
-
 ========================================================================
 Serial/MPI compiler specification
 ========================================================================
@@ -68,22 +64,103 @@ a C++ linker. If CXX_LINKER=FORTRAN, then the above CXX_LDFLAGS line
 should specify extra LDFLAGS needed when linking C++ and fortran code
 using a fortran linker.
 
-These should NOT be specified via <ADD_SLIBS USE_CXX="true"> or
-<ADD_LDFLAGS USE_CXX="true">, because those mess up the configure step
-for mct, etc.
-
-
-===========================
 -->
 <!-- Define default values that can be overridden by specific
      compilers -->
 <compiler>
+  <CPPDEFS>
+    <append MODEL="pop"> -D_USE_FLOW_CONTROL </append>
+  </CPPDEFS>
   <SUPPORTS_CXX>FALSE</SUPPORTS_CXX>
-  <ADD_CPPDEFS MODEL="pop"> -D_USE_FLOW_CONTROL </ADD_CPPDEFS>
+</compiler>
+
+<compiler COMPILER="cray">
+  <CFLAGS>
+    <append compile_threaded="false"> -h noomp </append>
+    <append DEBUG="TRUE"> -g -O0 </append>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+    <append MODEL="pop"> -DDIR=NOOP </append>
+    <append MODEL="moby"> -DDIR=NOOP </append>
+  </CPPDEFS>
+  <FC_AUTO_R8>
+    <base> -s real64 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -f free -N 255  -h byteswapio -x dir </base>
+    <append compile_threaded="false"> -h noomp </append>
+    <append DEBUG="TRUE"> -g -O0 -K trap=fp  -m1 </append>
+    <append DEBUG="FALSE"> -O2,ipa2 -em </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O1,fp2,ipa0,scalar0,vector0 </base>
+  </FFLAGS_NOOPT>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <base> -Wl,--allow-multiple-definition -h byteswapio </base>
+  </LDFLAGS>
+</compiler>
+
+<compiler COMPILER="gnu">
+  <CFLAGS>
+    <base> -mcmodel=medium -std=gnu99 </base>
+    <append compile_threaded="true"> -fopenmp </append>
+    <append DEBUG="TRUE"> -g -Wall </append>
+    <append DEBUG="FALSE"> -O </append>
+  </CFLAGS>
+  <CMAKE_OPTS>
+    <append MODEL="cism"> -D CISM_GNU=ON </append>
+  </CMAKE_OPTS>
+  <CPPDEFS>
+    <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+  </CPPDEFS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -fdefault-real-8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
+       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
+    <base> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </base>
+    <append compile_threaded="true"> -fopenmp </append>
+    <append DEBUG="TRUE"> -g -Wall </append>
+    <append DEBUG="FALSE"> -O </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base>  -ffixed-form </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -ffree-form </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -fopenmp </append>
+  </LDFLAGS>
+  <MPICC> mpicc  </MPICC>
+  <MPICXX> mpicxx </MPICXX>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> gcc </SCC>
+  <SCXX> g++ </SCXX>
+  <SFC> gfortran </SFC>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
 <compiler COMPILER="ibm">
-  <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
+  <CFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 </base>
+    <append DEBUG="FALSE"> -O3  </append>
+    <append compile_threaded="true"> -qsmp=omp </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://publib.boulder.ibm.com/infocenter/comphelp/v7v91/index.jsp
  Notes:  (see xlf user's guide for the details)
   -lmass          => IBM-tuned intrinsic lib
   -qsmp=noauto    => enable SMP directives, but don't add any
@@ -100,157 +177,202 @@ for mct, etc.
   -C              => runtime array bounds checking (runs slow)
   -qinitauto=...  => initializes automatic variables
   -->
-  <ADD_CPPDEFS> -DFORTRAN_SAME </ADD_CPPDEFS>
+    <append> -DFORTRAN_SAME </append>
+  </CPPDEFS>
   <CPRE>-WF,-D</CPRE>
-  <CFLAGS> -g -qfullpath -qmaxmem=-1 </CFLAGS>
-  <FIXEDFLAGS>  -qsuffix=f=f -qfixed=132 </FIXEDFLAGS>
-  <FREEFLAGS> -qsuffix=f=f90:cpp=F90  </FREEFLAGS>
-  <FFLAGS> -g -qfullpath -qmaxmem=-1 </FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -qstrict -qinline=auto </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O3  </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -qsmp=omp </ADD_FFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -qsmp=omp </ADD_CFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -qsmp=omp </ADD_LDFLAGS>
-  <FC_AUTO_R8> -qrealsize=8 </FC_AUTO_R8>
-  <ADD_FFLAGS DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </ADD_CFLAGS>
-  <ADD_LDFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </ADD_LDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE" MODEL="pop"> -C </ADD_FFLAGS>
+  <FC_AUTO_R8>
+    <base> -qrealsize=8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 </base>
+    <append DEBUG="FALSE"> -O2 -qstrict -qinline=auto </append>
+    <append compile_threaded="true"> -qsmp=omp </append>
+    <append DEBUG="TRUE"> -qinitauto=7FF7FFFF -qflttrap=ov:zero:inv:en </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
+    <append DEBUG="TRUE" MODEL="pop"> -C </append>
+  </FFLAGS>
+  <FIXEDFLAGS>
+    <base>  -qsuffix=f=f -qfixed=132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -qsuffix=f=f90:cpp=F90  </base>
+  </FREEFLAGS>
   <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-
+  <LDFLAGS>
+    <append compile_threaded="true"> -qsmp=omp </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
+  </LDFLAGS>
 </compiler>
 
-<compiler COMPILER="pgi">
-  <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-  <!-- Notes:  (see pgi man page & user's guide for the details) -->
-  <!--  -Mextend        => Allow 132-column source lines -->
-  <!--  -Mfixed         => Assume fixed-format source -->
-  <!--  -Mfree          => Assume free-format source -->
-
-  <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-
-  <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-  <!--  -fast           => Chooses generally optimal flags for the target platform -->
-  <!--  -Mnovect        => Disables automatic vector pipelining -->
-  <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-  <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-  <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-  <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-  <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-  <!-- -->
-  <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-  <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-  <!--  -Mbounds        => Add array bounds checking  -->
-  <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-  <!--                     * inv: invalid operands         -->
-  <!--                     * divz divide by zero           -->
-  <!--                     * ovf: floating point overflow   -->
-  <!--  -Mlist          => Create a listing file             -->
-  <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-  <!--  -time           => Print execution time for each compiler step  -->
-
-
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </ADD_CPPDEFS>
-  <CFLAGS> -gopt  -time </CFLAGS>
-
-  <ADD_CFLAGS compile_threaded="true"> -mp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -mp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -mp </ADD_LDFLAGS>
-
-  <FIXEDFLAGS> -Mfixed </FIXEDFLAGS>
-  <FREEFLAGS> -Mfree </FREEFLAGS>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-
-  <FFLAGS>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </FFLAGS>
-  <FFLAGS_NOOPT> -O0 -g -Ktrap=fp -Mbounds -Kieee  </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -mp </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="datm"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dlnd"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="drof"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dwav"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dice"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="docn"> -Mnovect </ADD_FFLAGS>
-  <LDFLAGS> -time -Wl,--allow-multiple-definition </LDFLAGS>
-  <SCC> pgcc </SCC>
-  <SFC> pgf95 </SFC>
-  <SCXX> pgc++ </SCXX>
-  <MPICC> mpicc </MPICC>
-  <MPIFC> mpif90 </MPIFC>
+<compiler COMPILER="intel">
+  <CFLAGS>
+    <base>  -qno-opt-dynamic-align -fp-model precise -std=gnu99 </base>
+    <append compile_threaded="true"> -qopenmp </append>
+    <append DEBUG="FALSE"> -O2 -debug minimal </append>
+    <append DEBUG="TRUE"> -O0 -g </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
+    <append> -DFORTRANUNDERSCORE -DNO_R16</append>
+  </CPPDEFS>
+  <CXX_LDFLAGS>
+    <base> -cxxlib </base>
+  </CXX_LDFLAGS>
+  <CXX_LINKER>FORTRAN</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base> -qno-opt-dynamic-align  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source  </base>
+    <append compile_threaded="true"> -qopenmp </append>
+    <append DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </append>
+    <append DEBUG="FALSE"> -O2 -debug minimal </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 </base>
+    <append compile_threaded="true"> -qopenmp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed -132 </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -qopenmp </append>
+  </LDFLAGS>
+  <MPICC> mpicc  </MPICC>
   <MPICXX> mpicxx </MPICXX>
-
-  <CXX_LINKER>CXX</CXX_LINKER>
-  <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
-       need some machine-specific libraries - see hopper pgi for an
-       example -->
-
-  <!-- Technically, PGI does recognize this keyword during parsing,
-       but support is either buggy or incomplete, notably in that
-       the "contiguous" attribute is incompatible with "intent".-->
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <MPIFC> mpif90 </MPIFC>
+  <SCC> icc </SCC>
+  <SCXX> icpc </SCXX>
+  <SFC> ifort </SFC>
+  <SLIBS>
+    <append MPILIB="mpich"> -mkl=cluster </append>
+    <append MPILIB="mpich2"> -mkl=cluster </append>
+    <append MPILIB="mvapich"> -mkl=cluster </append>
+    <append MPILIB="mvapich2"> -mkl=cluster </append>
+    <append MPILIB="mpt"> -mkl=cluster </append>
+    <append MPILIB="openmpi"> -mkl=cluster </append>
+    <append MPILIB="impi"> -mkl=cluster </append>
+    <append MPILIB="mpi-serial"> -mkl </append>
+  </SLIBS>
+  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
-<compiler COMPILER="pgicuda">
-  <!-- http://www.pgroup.com/resources/docs.htm                                              -->
-  <!-- Notes:  (see pgi man page & user's guide for the details) -->
-  <!--  -Mextend        => Allow 132-column source lines -->
-  <!--  -Mfixed         => Assume fixed-format source -->
-  <!--  -Mfree          => Assume free-format source -->
-
-  <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
-
-  <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
-  <!--  -fast           => Chooses generally optimal flags for the target platform -->
-  <!--  -Mnovect        => Disables automatic vector pipelining -->
-  <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
-  <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
-  <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
-  <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
-  <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
-  <!-- -->
-  <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
-  <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
-  <!--  -Mbounds        => Add array bounds checking  -->
-  <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
-  <!--                     * inv: invalid operands         -->
-  <!--                     * divz divide by zero           -->
-  <!--                     * ovf: floating point overflow   -->
-  <!--  -Mlist          => Create a listing file             -->
-  <!--  -F              => leaves file.f for each preprocessed file.F file  -->
-  <!--  -time           => Print execution time for each compiler step  -->
-
-
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16 -DUSE_CUDA_FORTRAN -DCPRPGI </ADD_CPPDEFS>
-  <CFLAGS> -gopt -time </CFLAGS>
-
-
-  <FIXEDFLAGS> -Mfixed </FIXEDFLAGS>
-  <FREEFLAGS> -Mfree </FREEFLAGS>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-
-  <FFLAGS>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </FFLAGS>
-  <ADD_FFLAGS MODEL="cam"> -ta=nvidia -Mcuda=5.5,cc35  </ADD_FFLAGS>
-  <FFLAGS_NOOPT> -O0 -g -Ktrap=fp -Mbounds -Kieee  </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -mp </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="datm"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dlnd"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="drof"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dwav"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="dice"> -Mnovect </ADD_FFLAGS>
-  <ADD_FFLAGS MODEL="docn"> -Mnovect </ADD_FFLAGS>
-  <LDFLAGS> -time -Wl,--allow-multiple-definition -ta=nvidia -Mcuda=5.0,cc35 </LDFLAGS>
-  <SCC> pgcc </SCC>
-  <SFC> pgf95 </SFC>
-  <SCXX> pgc++ </SCXX>
+<compiler COMPILER="nag">
+  <CFLAGS>
+    <base> -std=gnu99 </base>
+    <append DEBUG="TRUE"> -g </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <append> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG </append>
+  </CPPDEFS>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <!-- The indirect flag below is to deal with MPI functions that violate    -->
+    <!-- the Fortran standard, by adding a large set of arguments from a file. -->
+    <base>-Wp,-macro=no_com -convert=BIG_ENDIAN -indirect <env>CIMEROOT</env>/cime_config/cesm/machines/nag_mpi_argument.txt</base>
+    <!-- DEBUG vs. non-DEBUG runs.                                             -->
+    <append DEBUG="FALSE"> -ieee=full -O2 </append>
+    <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
+    <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
+    <append DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </append>
+    <append DEBUG="TRUE" compile_threaded="false"> -gline </append>
+    <append compile_threaded="true"> -openmp </append>
+    <!-- The SLAP library (which is part of the CISM build) has many instances of
+       arguments being passed to different types. So disable argument type
+       checking when building CISM. This can be removed once we remove SLAP from
+       CISM. -->
+    <append MODEL="cism"> -mismatch_all </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> <var>FFLAGS</var> </base>
+    <append DEBUG="FALSE"> -ieee=full     </append>
+    <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
+    <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
+    <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
+    <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
+    <append DEBUG="TRUE" compile_threaded="false"> -gline        </append>
+    <append compile_threaded="true"> -openmp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -fixed </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -free </base>
+  </FREEFLAGS>
+  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
+  <LDFLAGS>
+    <append compile_threaded="true"> -openmp </append>
+  </LDFLAGS>
   <MPICC> mpicc </MPICC>
   <MPIFC> mpif90 </MPIFC>
-  <MPICXX> mpicxx </MPICXX>
+  <SCC> gcc </SCC>
+  <SFC> nagfor </SFC>
+</compiler>
 
+<compiler COMPILER="pgi">
+  <CFLAGS>
+    <base> -gopt  -time </base>
+    <append compile_threaded="true"> -mp </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <!-- http://www.pgroup.com/resources/docs.htm                                              -->
+    <!-- Notes:  (see pgi man page & user's guide for the details) -->
+    <!--  -Mextend        => Allow 132-column source lines -->
+    <!--  -Mfixed         => Assume fixed-format source -->
+    <!--  -Mfree          => Assume free-format source -->
+    <!--  -byteswapio     => Swap byte-order for unformatted i/o (big/little-endian) -->
+    <!--  -target=linux   => Specifies the target architecture to Compute Node Linux (CNL only) -->
+    <!--  -fast           => Chooses generally optimal flags for the target platform -->
+    <!--  -Mnovect        => Disables automatic vector pipelining -->
+    <!--  -Mvect=nosse    => Don't generate SSE, SSE2, 3Dnow, and prefetch instructions in loops    -->
+    <!--  -Mflushz        => Set SSE to flush-to-zero mode (underflow) loops where possible  -->
+    <!--  -Kieee          => Perform fp ops in strict conformance with the IEEE 754 standard.  -->
+    <!--                     Some optimizations disabled, slightly slower, more accurate math.  -->
+    <!--  -mp=nonuma      => Don't use thread/processors affinity (for NUMA architectures)  -->
+    <!-- -->
+    <!--  -g              => Generate symbolic debug information. Turns off optimization.   -->
+    <!--  -gopt           => Generate information for debugger without disabling optimizations  -->
+    <!--  -Mbounds        => Add array bounds checking  -->
+    <!--  -Ktrap=fp       => Determine IEEE Trap conditions fp => inv,divz,ovf   -->
+    <!--                     * inv: invalid operands         -->
+    <!--                     * divz divide by zero           -->
+    <!--                     * ovf: floating point overflow   -->
+    <!--  -Mlist          => Create a listing file             -->
+    <!--  -F              => leaves file.f for each preprocessed file.F file  -->
+    <!--  -time           => Print execution time for each compiler step  -->
+    <append> -DFORTRANUNDERSCORE -DNO_SHR_VMATH -DNO_R16  </append>
+  </CPPDEFS>
   <CXX_LINKER>CXX</CXX_LINKER>
+  <FC_AUTO_R8>
+    <base> -r8 </base>
+  </FC_AUTO_R8>
+  <FFLAGS>
+    <base>  -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee  </base>
+    <append compile_threaded="true"> -mp </append>
+    <append DEBUG="TRUE"> -O0 -g -Ktrap=fp -Mbounds -Kieee </append>
+    <append MODEL="datm"> -Mnovect </append>
+    <append MODEL="dlnd"> -Mnovect </append>
+    <append MODEL="drof"> -Mnovect </append>
+    <append MODEL="dwav"> -Mnovect </append>
+    <append MODEL="dice"> -Mnovect </append>
+    <append MODEL="docn"> -Mnovect </append>
+  </FFLAGS>
+  <FFLAGS_NOOPT>
+    <base> -O0 -g -Ktrap=fp -Mbounds -Kieee  </base>
+    <append compile_threaded="true"> -mp </append>
+  </FFLAGS_NOOPT>
+  <FIXEDFLAGS>
+    <base> -Mfixed </base>
+  </FIXEDFLAGS>
+  <FREEFLAGS>
+    <base> -Mfree </base>
+  </FREEFLAGS>
   <!-- Note that SUPPORTS_CXX is false for pgi in general, because we
        need some machine-specific libraries - see hopper pgi for an
        example -->
@@ -258,738 +380,625 @@ for mct, etc.
        but support is either buggy or incomplete, notably in that
        the "contiguous" attribute is incompatible with "intent".-->
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-<compiler COMPILER="intel">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <!-- WJS (8-11-14): For some reason, yellowstone-intel has starting giving lots of
-       messages about array temporaries, leading to a ton of standard output, and
-       sometimes causing runs to die. Adding '-check noarg_temp_created' to suppress these
-       diagnostics. This is a band-aid fix, which should really be addressed at the
-       system-level. (Note: I could not add this in the yellowstone-specific section,
-       beacuse apparently that overrides rather than adds to this ADD_FFLAGS list.) -->
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 -debug minimal </ADD_CFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -O0 -g </ADD_CFLAGS>
-  <FFLAGS> -no-opt-dynamic-align  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source  </FFLAGS>
-  <CFLAGS>  -no-opt-dynamic-align -fp-model precise -std=gnu99 </CFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -openmp </ADD_FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICC> mpicc  </MPICC>
-  <MPICXX> mpicxx </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mvapich2"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
-  <ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="intelmic">
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -openmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <FIXEDFLAGS> -fixed -132 </FIXEDFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check uninit -check bounds -check pointers -fpe0 </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <FFLAGS> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs </FFLAGS>
-  <CFLAGS> -mmic -O2 -fp-model precise -DFORTRANUNDERSCOR </CFLAGS>
-  <CONFIG_ARGS>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</CONFIG_ARGS>
-  <FFLAGS_NOOPT> -O0 -mmic </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <SCXX> icpc </SCXX>
-  <MPIFC> mpiifort</MPIFC>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <CXX_LDFLAGS> -cxxlib </CXX_LDFLAGS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-  <ADD_CPPDEFS> -DCPRINTEL </ADD_CPPDEFS>
-  <ADD_LDFLAGS> -mmic </ADD_LDFLAGS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
-</compiler>
-
-
-<compiler COMPILER="gnu">
-  <!-- http://gcc.gnu.org/onlinedocs/gfortran/ -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="true"> -fopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -fopenmp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="true"> -fopenmp </ADD_LDFLAGS>
-  <ADD_CMAKE_OPTS MODEL="cism"> -D CISM_GNU=ON </ADD_CMAKE_OPTS>
-  <FIXEDFLAGS>  -ffixed-form </FIXEDFLAGS>
-  <FREEFLAGS> -ffree-form </FREEFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -Wall </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -g -Wall </ADD_CFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O </ADD_CFLAGS>
-  <!-- -ffree-line-length-none and -ffixed-line-length-none need to be in FFLAGS rather than in FIXEDFLAGS/FREEFLAGS
-       so that these are passed to cmake builds (cmake builds don't use FIXEDFLAGS and FREEFLAGS). -->
-  <FFLAGS> -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none </FFLAGS>
-  <CFLAGS> -mcmodel=medium -std=gnu99 </CFLAGS>
-  <FFLAGS_NOOPT> -O0 </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -fdefault-real-8 </FC_AUTO_R8>
-  <SFC> gfortran </SFC>
-  <SCC> gcc </SCC>
-  <SCXX> g++ </SCXX>
-  <MPIFC> mpif90 </MPIFC>
-  <MPICC> mpicc  </MPICC>
+  <LDFLAGS>
+    <base> -time -Wl,--allow-multiple-definition </base>
+    <append compile_threaded="true"> -mp </append>
+  </LDFLAGS>
+  <MPICC> mpicc </MPICC>
   <MPICXX> mpicxx </MPICXX>
-  <CXX_LINKER>FORTRAN</CXX_LINKER>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-
-<compiler COMPILER="cray">
-  <!--http://docs.cray.com/cgi-bin/craydoc.cgi?mode=View;id=S-3901-83;idx=books_search;this_sort=;q=;type=books;title=Cray%20Fortran%20Reference%20Manual -->
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_R16</ADD_CPPDEFS>
-  <ADD_CPPDEFS MODEL="pop"> -DDIR=NOOP </ADD_CPPDEFS>
-  <ADD_CFLAGS compile_threaded="false"> -h noomp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="false"> -h noomp </ADD_FFLAGS>
-  <ADD_CPPDEFS MODEL="moby"> -DDIR=NOOP </ADD_CPPDEFS>
-  <ADD_FFLAGS DEBUG="TRUE"> -g -O0 -K trap=fp  -m1 </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2,ipa2 -em </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -g -O0 </ADD_CFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <FFLAGS> -f free -N 255  -h byteswapio -x dir </FFLAGS>
-  <FFLAGS_NOOPT> -O1,fp2,ipa0,scalar0,vector0 </FFLAGS_NOOPT>
-  <FC_AUTO_R8> -s real64 </FC_AUTO_R8>
-  <LDFLAGS> -Wl,--allow-multiple-definition -h byteswapio </LDFLAGS>
-  <HAS_F2008_CONTIGUOUS>TRUE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-
-<compiler COMPILER="nag">
-
-  <SFC> nagfor </SFC>
   <MPIFC> mpif90 </MPIFC>
-  <SCC> gcc </SCC>
-  <MPICC> mpicc </MPICC>
-
-  <ADD_CPPDEFS> -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH </ADD_CPPDEFS>
-
-  <!-- The indirect flag below is to deal with MPI functions that violate    -->
-  <!-- the Fortran standard, by adding a large set of arguments from a file. -->
-  <FFLAGS>-Wp,-macro=no_com -convert=BIG_ENDIAN -indirect $(CIMEROOT)/cime_config/cesm/machines/nag_mpi_argument.txt</FFLAGS>
-  <FFLAGS_NOOPT> $(FFLAGS) </FFLAGS_NOOPT>
-  <CFLAGS> -std=gnu99 </CFLAGS>
-
-  <!-- DEBUG vs. non-DEBUG runs.                                             -->
-  <ADD_FFLAGS       DEBUG="FALSE"> -ieee=full -O2 </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT DEBUG="FALSE"> -ieee=full     </ADD_FFLAGS_NOOPT>
-
-  <ADD_CFLAGS       DEBUG="TRUE"> -g </ADD_CFLAGS>
-
-  <!-- The "-gline" option is nice, but it doesn't work with OpenMP.         -->
-  <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
-  <ADD_FFLAGS       DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </ADD_FFLAGS>
-  <ADD_FFLAGS       DEBUG="TRUE" compile_threaded="false"> -gline </ADD_FFLAGS>
-  <!-- Hack! If DEBUG="TRUE", put runtime checks in FFLAGS, but not into     -->
-  <!-- FFLAGS_NOOPT, allowing strict checks to be removed from files by      -->
-  <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
-  <ADD_FFLAGS_NOOPT DEBUG="TRUE"> -g -time -f2003 -ieee=stop </ADD_FFLAGS_NOOPT>
-  <ADD_FFLAGS_NOOPT DEBUG="TRUE" compile_threaded="false"> -gline        </ADD_FFLAGS_NOOPT>
-
-  <ADD_FFLAGS compile_threaded="true"> -openmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -openmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -openmp </ADD_LDFLAGS>
-
-  <!-- The SLAP library (which is part of the CISM build) has many instances of
-       arguments being passed to different types. So disable argument type
-       checking when building CISM. This can be removed once we remove SLAP from
-       CISM. -->
-  <ADD_FFLAGS MODEL="cism"> -mismatch_all </ADD_FFLAGS>
-
-  <FC_AUTO_R8> -r8 </FC_AUTO_R8>
-  <FIXEDFLAGS> -fixed </FIXEDFLAGS>
-  <FREEFLAGS> -free </FREEFLAGS>
-  <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-</compiler>
-
-<compiler OS="Darwin">
-   <ADD_CPPDEFS> -DSYSDARWIN </ADD_CPPDEFS>
-   <ADD_LDFLAGS MODEL="driver"> -all_load </ADD_LDFLAGS>
-</compiler>
-
-<compiler COMPILER="intel" OS="Darwin" >
-  <ADD_FFLAGS compile_threaded="false"> -heap-arrays </ADD_FFLAGS>
+  <SCC> pgcc </SCC>
+  <SCXX> pgc++ </SCXX>
+  <SFC> pgf95 </SFC>
 </compiler>
 
-<compiler MACH="userdefined">
-  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
-  <PNETCDF_PATH></PNETCDF_PATH>
-  <ADD_SLIBS># USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_CPPDEFS></ADD_CPPDEFS>
-  <CONFIG_ARGS></CONFIG_ARGS>
-  <ESMF_LIBDIR></ESMF_LIBDIR>
-  <MPI_LIB_NAME></MPI_LIB_NAME>
-  <MPI_PATH></MPI_PATH>
+<compiler OS="AIX" COMPILER="ibm">
+  <CFLAGS>
+    <append> -qarch=auto -qtune=auto -qcache=auto </append>
+  </CFLAGS>
+  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
+  <FFLAGS>
+    <append> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </append>
+    <append MODEL="cam"> -qspill=6000 </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append DEBUG="TRUE"> -qsigtrap=xl__trcedump </append>
+    <append> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </append>
+  </LDFLAGS>
+  <MPICC> mpcc_r </MPICC>
+  <MPIFC> mpxlf2003_r </MPIFC>
+  <SCC> cc_r </SCC>
+  <SFC> xlf2003_r </SFC>
+  <SLIBS>
+    <append> -lmassv -lessl </append>
+    <append DEBUG="FALSE"> -lmass </append>
+  </SLIBS>
+</compiler>
+
+<compiler OS="BGQ" COMPILER="ibm">
+  <CONFIG_ARGS>
+    <base> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX  </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <base> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </base>
+    <append DEBUG="FALSE"> -O3 -qstrict -qinline=auto </append>
+    <append DEBUG="FALSE" compile_threaded="true"> -qsmp=omp </append>
+    <append DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <base>  -Wl,--relax -Wl,--allow-multiple-definition </base>
+  </LDFLAGS>
 </compiler>
 
 <compiler OS="CNL">
-  <SFC> ftn </SFC>
-  <SCC> cc </SCC>
-  <SCXX> CC </SCXX>
-  <MPIFC> ftn </MPIFC>
+  <CMAKE_OPTS>
+    <base> -DCMAKE_SYSTEM_NAME=Catamount</base>
+  </CMAKE_OPTS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </append>
+  </CPPDEFS>
   <MPICC> cc </MPICC>
   <MPICXX> CC </MPICXX>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <PNETCDF_PATH>$(PARALLEL_NETCDF_DIR)</PNETCDF_PATH>
-  <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY  </GPTL_CPPDEFS>
-  <CMAKE_OPTS> -DCMAKE_SYSTEM_NAME=Catamount</CMAKE_OPTS> -->
-</compiler>
-
-
-<compiler COMPILER="intel" MACH="edison">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </ADD_SLIBS>
-  <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>
-  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="theta">
   <MPIFC> ftn </MPIFC>
-  <MPICC> cc </MPICC>
-  <MPICXX> CC </MPICXX>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 -xMIC-AVX512 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="TRUE"> -O0 -g -xMIC-AVX512 </ADD_CFLAGS>
-  <ADD_CFLAGS compile_threaded="true"> -qopenmp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="true"> -qopenmp </ADD_FFLAGS>
-  <ADD_FFLAGS_NOOPT compile_threaded="true"> -qopenmp </ADD_FFLAGS_NOOPT>
-  <ADD_LDFLAGS compile_threaded="true"> -qopenmp </ADD_LDFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> -L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib </ADD_SLIBS>
-  <ADD_SLIBS> -mkl -lpthread -lm </ADD_SLIBS>
-  <ADD_CPPFLAGS> -DHAVE_COMM_F2C </ADD_CPPFLAGS>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="melvin">
-  <ADD_FFLAGS DEBUG="FALSE"> -O2  </ADD_FFLAGS>
-  <ADD_CFLAGS DEBUG="FALSE"> -O2  </ADD_CFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -lblas -llapack</ADD_SLIBS>
-  <CXX_LIBS>-lstdc++ -lmpi_cxx</CXX_LIBS>
-  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="yellowstone">
-  <LAPACK_LIBDIR> /glade/apps/opt/lib </LAPACK_LIBDIR>
-</compiler>
-
-<compiler MACH="yellowstone">
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF)</PNETCDF_PATH>
-  <!-- these flags enable nano timers -->
- <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
-</compiler>
-
-<compiler MACH="laramie">
-  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF)</PNETCDF_PATH>
-  <!-- these flags enable nano timers -->
- <GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
-</compiler>
-
-
-
-<compiler MACH="yellowstone" COMPILER="intel" MPILIB="mpich2">
-  <!-- Needed due to the way that netcdf is loaded on yellowstone -->
-  <SCC>$(MPICC)</SCC>
-  <SFC>$(MPIFC)</SFC>
-  <MPICXX>mpiicpc</MPICXX>
-  <ADD_FFLAGS>  -xHost </ADD_FFLAGS>
-  <ADD_CFLAGS>  -xHost </ADD_CFLAGS>
-  <ADD_CPPDEFS> -DINTEL_MKL -DHAVE_SSE2 </ADD_CPPDEFS>
-  <TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-  <PAPI_INC> /glade/apps/opt/papi/5.3.0/intel/12.1.5/include/</PAPI_INC>
-  <PAPI_LIB>/glade/apps/opt/papi/5.3.0/intel/12.1.5/lib64 </PAPI_LIB>
-  <ADD_SLIBS> -Wl,-rpath ${PAPI_LIB} -L${PAPI_LIB} -lpapi</ADD_SLIBS>
-  <ADD_FFLAGS MPILIB="mpi-serial"> -mcmodel medium </ADD_FFLAGS>
-</compiler>
-
-
-
-<compiler MACH="yellowstone" COMPILER="intel">
-  <PFUNIT_PATH>$ENV{CESMDATAROOT}/tools/pFUnit/pFUnit3.1_Intel15.0.1_MPI</PFUNIT_PATH>
-</compiler>
-
-<compiler MACH="yellowstone" COMPILER="pgi">
-  <ADD_CFLAGS DEBUG="FALSE"> -O </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O </ADD_FFLAGS>
-  <ADD_SLIBS> -llapack -lblas </ADD_SLIBS>
+  <NETCDF_PATH><env>NETCDF_DIR</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PARALLEL_NETCDF_DIR</env></PNETCDF_PATH>
+  <SCC> cc </SCC>
+  <SCXX> CC </SCXX>
+  <SFC> ftn </SFC>
 </compiler>
 
-<compiler MACH="yellowstone" COMPILER="pathscale">
-  <ADD_CPPDEFS> -DNO_MPIMOD </ADD_CPPDEFS>
-  <SCC>pathcc</SCC>
-  <SFC>pathf95</SFC>
+<compiler OS="Darwin">
+  <CPPDEFS>
+    <append> -DSYSDARWIN </append>
+  </CPPDEFS>
+  <LDFLAGS>
+    <append MODEL="driver"> -all_load </append>
+  </LDFLAGS>
 </compiler>
 
-
-<compiler MACH="erebus">
-<PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
-  <NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF)</PNETCDF_PATH>
-  <!--The following flag is required due to a bug in mpich2 v1208 -->
-  <ADD_CPPDEFS MODEL="cam" MPILIB="mpich2"> -DNO_MPI2 </ADD_CPPDEFS>
-  <SCC>mpicc</SCC>
-  <SFC>mpif90</SFC>
+<compiler OS="Darwin" COMPILER="intel">
+  <FFLAGS>
+    <append compile_threaded="false"> -heap-arrays </append>
+  </FFLAGS>
 </compiler>
 
-<compiler COMPILER="intel" MACH="titan">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="bluewaters">
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) </ADD_SLIBS>
-  <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="titan">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_SLIBS> $(shell nf-config --flibs) </ADD_SLIBS>
-  <TRILINOS_PATH>/lustre/atlas1/cli900/world-shared/cesm/software/Trilinos/Trilinos-11.12.1/titan-pgi-cesm/install</TRILINOS_PATH>
-  <CXX_LIBS> -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
+<compiler MACH="bluewaters" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append> -nofma </append>
+  </CFLAGS>
+  <CXX_LIBS>
+    <base> -lmpichf90_pgi <env>PGI_PATH</env>/linux86-64/<env>PGI_VERSION</env>/lib/f90main.o </base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append> -nofma </append>
+  </FFLAGS>
   <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
 </compiler>
 
-<compiler  MACH="bluewaters" COMPILER="pgi">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <ADD_FFLAGS> -nofma </ADD_FFLAGS>
-  <ADD_CFLAGS> -nofma </ADD_CFLAGS>
- <CXX_LIBS> -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
- <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler  MACH="bluewaters">
+<compiler MACH="constance" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_GPTL_CPPDEFS> -DHAVE_PAPI </ADD_GPTL_CPPDEFS>
-</compiler>
-
-
-<compiler COMPILER="ibm" OS="AIX">
-  <CONFIG_SHELL> /usr/bin/bash </CONFIG_SHELL>
-  <SFC> xlf2003_r </SFC>
-  <MPIFC> mpxlf2003_r </MPIFC>
-  <SCC> cc_r </SCC>
-  <MPICC> mpcc_r </MPICC>
-  <ADD_CFLAGS> -qarch=auto -qtune=auto -qcache=auto </ADD_CFLAGS>
-  <ADD_FFLAGS> -qarch=auto -qtune=auto -qcache=auto -qsclk=micro </ADD_FFLAGS>
-  <ADD_LDFLAGS DEBUG="TRUE"> -qsigtrap=xl__trcedump </ADD_LDFLAGS>
-  <ADD_FFLAGS MODEL="cam"> -qspill=6000 </ADD_FFLAGS>
-  <ADD_LDFLAGS> -bdatapsize:64K -bstackpsize:64K -btextpsize:32K </ADD_LDFLAGS>
-  <ADD_SLIBS> -lmassv -lessl </ADD_SLIBS>
-  <ADD_SLIBS DEBUG="FALSE"> -lmass </ADD_SLIBS>
-</compiler>
-
-<compiler COMPILER="ibm" OS="BGL">
-  <ADD_CFLAGS> -qtune=440 -qarch=440d </ADD_CFLAGS>
-  <ADD_FFLAGS> -qtune=440 -qarch=440d </ADD_FFLAGS>
-  <MPI_PATH> /bgl/BlueLight/ppcfloor/bglsys</MPI_PATH>
-  <MPI_LIB_NAME> mpich.rts </MPI_LIB_NAME>
-  <SFC> blrts_xlf2003 </SFC>
-  <MPIFC> blrts_xlf2003 </MPIFC>
-  <SCC> blrts_xlc </SCC>
-  <MPICC> blrts_xlc </MPICC>
-  <CFLAGS> -O3 -qstrict </CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O3 -qstrict -qinline=auto </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE"> -qinitauto=FF911299 -qflttrap=ov:zero:inv:en </ADD_FFLAGS>
-  <MLIBS> -L/bgl/BlueLight/ppcfloor/bglsys/lib -lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts </MLIBS>
-  <ADD_CPPDEFS> -DLINUX -DnoI8 </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
-  <ADD_FFLAGS> -qextname=flush </ADD_FFLAGS>
-</compiler>
-
-<compiler COMPILER="ibm" OS="BGP">
-  <ADD_CFLAGS> -qtune=450 -qarch=450 -I/bgsys/drivers/ppcfloor/arch/include/</ADD_CFLAGS>
-  <ADD_FFLAGS>-qspillsize=2500 -qtune=450 -qarch=450 </ADD_FFLAGS>
-  <ADD_CPPDEFS> -DLINUX -DnoI8 </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
-  <ADD_FFLAGS> -qextname=flush </ADD_FFLAGS>
-</compiler>
-
-
-<compiler COMPILER="ibm" OS="BGQ">
-  <FFLAGS> -g -qfullpath -qmaxmem=-1 -qspillsize=2500 -qextname=flush </FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O3 -qstrict -qinline=auto </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE" compile_threaded="true"> -qsmp=omp </ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="TRUE" compile_threaded="true"> -qsmp=omp:noopt </ADD_FFLAGS>
-  <ADD_CPPDEFS> -DLINUX  </ADD_CPPDEFS>
-  <CONFIG_ARGS> --build=powerpc-bgp-linux --host=powerpc64-suse-linux </CONFIG_ARGS>
-  <LDFLAGS>  -Wl,--relax -Wl,--allow-multiple-definition </LDFLAGS>
-</compiler>
-
-
-<compiler COMPILER="ibm" MACH="mira">
-  <SFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </SFC>
-  <MPIFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </MPIFC>
-  <SCC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </SCC>
-  <MPICC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </MPICC>
-  <!-- This LD is a workaround for darshan initialization on mira (Darshan does -->
-  <!-- not run if f90 or higher is used for linking -->
-   <LD> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf77_r </LD>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.1/cnk-xl/current/</PNETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <HDF5_PATH>$(HDF5)</HDF5_PATH>
-   <ADD_SLIBS>-L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf -L$(HDF5)/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-  <ADD_FFLAGS>-qfloat=nomaf</ADD_FFLAGS>
-  <ADD_CFLAGS>-qfloat=nomaf</ADD_CFLAGS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi -L<env>MKL_PATH</env> -lmkl_rt</base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="constance" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="cori-haswell" COMPILER="intel">
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CFLAGS>
+    <append> -xCORE-AVX2 </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -xCORE-AVX2 </append>
+  </FFLAGS>
+  <SLIBS>
+    <append> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf -mkl -lpthread -lm </append>
+  </SLIBS>
+    <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI -DHAVE_SLASHPROC </append>
+  </CPPDEFS>
+
+</compiler>
+
+
+<compiler MACH="cori-knl" COMPILER="intel">
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CFLAGS>
+    <append> -xMIC-AVX512 </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -xMIC-AVX512 </append>
+  </FFLAGS>
+  <SLIBS>
+    <append> -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf </append>
+  </SLIBS>
+    <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI -DHAVE_SLASHPROC</append>
+  </CPPDEFS>
+  <LDFLAGS>
+    <append>-mkl -lmemkind -ljemalloc -zmuldefs</append>
+  </LDFLAGS>
+</compiler>
+
+
+<compiler MACH="eastwind" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="eastwind" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append compile_threaded="false"> -nomp </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+    <append compile_threaded="false"> -nomp </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append compile_threaded="false"> -nomp </append>
+  </LDFLAGS>
+  <NETCDF_PATH> <env>NETCDF_HOME</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="edison" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_PAPI </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <SLIBS>
+    <append> -L<env>NETCDF_DIR</env> -lnetcdff -Wl,--as-needed,-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="hera" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</append>
+  </LDFLAGS>
+  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
+  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
+  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
+  <SLIBS>
+    <append><shell>/usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs</shell></append>
+  </SLIBS>
 </compiler>
 
-
-<compiler COMPILER="ibm" MACH="tukey">
-  <SFC> mpixlf2003_r </SFC>
-  <MPIFC> mpixlf2003_r </MPIFC>
-  <SCC> mpixlc_r </SCC>
+<compiler MACH="hobart">
+  <CPPDEFS>
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+  <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
+  <MPI_LIB_NAME MPILIB="mvapich2"> mpich</MPI_LIB_NAME>
+  <NETCDF_PATH><env>NETCDF_PATH</env></NETCDF_PATH>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell></append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="hobart" COMPILER="intel">
+  <CFLAGS>
+    <append> -lifcore</append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -lifcore</append>
+    <append MPILIB="mpi-serial"> -mcmodel medium </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append> -lquadmath </append>
+    <append> -Wl,-rpath,<var>NETCDF_PATH</var>/lib </append>
+    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/lib/intel64 </append>
+    <append> -Wl,-rpath,<env>COMPILER_PATH</env>/mkl/lib/intel64 </append>
+    <append> -Wl,-rpath,<env>MPI_PATH</env>/lib</append>
+    <append> -lifcore</append>
+  </LDFLAGS>
+  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
+  <SLIBS>
+    <append MPILIB="mvapich2"> -mkl=cluster </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="hobart" COMPILER="nag">
+  <CPPDEFS>
+    <!-- needed for nag pio build.. -->
+    <append> -DNO_C_SIZEOF </append>
+  </CPPDEFS>
+  <LDFLAGS>
+    <append> -lpthread</append>
+  </LDFLAGS>
+  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_NAG_3_0</PFUNIT_PATH>
+</compiler>
+
+<compiler MACH="hobart" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O0 </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O0 </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append> -lgomp </append>
+    <append> -Wl,-R<var>NETCDF_PATH</var>/lib</append>
+    <append> -Wl,-R<env>COMPILER_PATH</env>/lib</append>
+    <append> -Wl,-R<env>COMPILER_PATH</env>/libso</append>
+  </LDFLAGS>
+</compiler>
+
+<compiler MACH="juqueen" COMPILER="ibm">
   <MPICC> mpixlc_r </MPICC>
-  <!-- This LD is a workaround for darshan initialization on tukey?? (Darshan does -->
-  <!-- not run if f90 or higher is used for linking -->
-   <LD> mpixlf77_r </LD>
-  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
-  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
-  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
-  <HDF5_PATH>/soft/libraries/hdf5/1.8.10/cnk-xl/current/ </HDF5_PATH>
-   <ADD_SLIBS>-L$(NETCDF_PATH)/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </ADD_SLIBS>
-  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
-</compiler>
-
-<compiler COMPILER="ibm" MACH="juqueen">
-  <SFC> mpixlf2003_r </SFC>
   <MPIFC> mpixlf2003_r </MPIFC>
-  <SCC> mpixlc_r </SCC>
-  <MPICC> mpixlc_r </MPICC>
   <NETCDF_PATH> /bgsys/local/netcdf/</NETCDF_PATH>
-  <PNETCDF_PATH> /bgsys/local/parallel-netcdf/v1.3.1</PNETCDF_PATH>
-  <ADD_SLIBS>-L/bgsys/local/netcdf/lib -lnetcdf -L/bgsys/drivers/ppcfloor/comm/lib </ADD_SLIBS>
   <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH> /bgsys/local/parallel-netcdf/v1.3.1</PNETCDF_PATH>
+  <SCC> mpixlc_r </SCC>
+  <SFC> mpixlf2003_r </SFC>
+  <SLIBS>
+    <append>-L/bgsys/local/netcdf/lib -lnetcdf -L/bgsys/drivers/ppcfloor/comm/lib </append>
+  </SLIBS>
 </compiler>
 
-<compiler MACH="brutus">
-  <NETCDF_PATH> $(NETCDF)</NETCDF_PATH>
-  <MPI_PATH> $(MPI_ROOT)</MPI_PATH>
-  <MPI_LIB_NAME MPILIB="mpich"> mpich </MPI_LIB_NAME>
-  <MPI_LIB_NAME MPILIB="openmpi"> mpi </MPI_LIB_NAME>
-  <CONFIG_ARGS> --host=LINUX </CONFIG_ARGS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="eastwind">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <ADD_CFLAGS compile_threaded="false"> -nomp </ADD_CFLAGS>
-  <ADD_FFLAGS compile_threaded="false"> -nomp </ADD_FFLAGS>
-  <ADD_LDFLAGS compile_threaded="false"> -nomp </ADD_LDFLAGS>
-  <NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="eastwind">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="constance">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="constance">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_HOME)</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi -L$(MKL_PATH) -lmkl_rt</SLIBS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="olympus">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH> $(NETCDF_LIB)/..</NETCDF_PATH>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
+<compiler MACH="melvin" COMPILER="gnu">
+  <ALBANY_PATH>/projects/install/rhel6-x86_64/ACME/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CXX_LIBS>
+    <base>-lstdc++ -lmpi_cxx</base>
+  </CXX_LIBS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -lblas -llapack</append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="mira" COMPILER="ibm">
+  <CFLAGS>
+    <append>-qfloat=nomaf</append>
+  </CFLAGS>
+  <FFLAGS>
+    <append>-qfloat=nomaf</append>
+  </FFLAGS>
+  <HDF5_PATH><env>HDF5</env></HDF5_PATH>
+  <!-- This LD is a workaround for darshan initialization on mira (Darshan does -->
+  <!-- not run if f90 or higher is used for linking -->
+  <LD> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf77_r </LD>
+  <MPICC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </MPICC>
+  <MPIFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </MPIFC>
+  <NETCDF_PATH>/soft/libraries/netcdf/4.3.3-f4.4.1/cnk-xl/current/</NETCDF_PATH>
+  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.6.1/cnk-xl/current/</PNETCDF_PATH>
+  <SCC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlc_r </SCC>
+  <SFC> /home/pkcoff/mpich-sandboxes/master/install-production/bin/mpixlf2003_r </SFC>
+  <SLIBS>
+    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L<env>HDF5</env>/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="olympus" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append> -DLINUX </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 </append>
+  </FFLAGS>
+  <NETCDF_PATH> <env>NETCDF_LIB</env>/..</NETCDF_PATH>
   <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <ADD_CPPDEFS> -DLINUX </ADD_CPPDEFS>
-  <SLIBS> -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi </SLIBS>
+  <SLIBS>
+    <base> -L<var>NETCDF_PATH</var>/lib -lnetcdf -lnetcdff -lpmi </base>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="hera">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
-  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
-  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
-  <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_LDFLAGS> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</ADD_LDFLAGS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="hopper">
-  <ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
- <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-pgi/install</TRILINOS_PATH>
- <CXX_LIBS> -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o </CXX_LIBS>
- <SUPPORTS_CXX>TRUE</SUPPORTS_CXX>
-</compiler>
-
-<compiler COMPILER="intel" MACH="hopper">
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
-  <ESMF_LIBDIR DEBUG="FALSE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libO/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
- <ESMF_LIBDIR DEBUG="TRUE">/project/projectdirs/ccsm1/esmf/ESMF_5_3_0_intel12.1.5/lib/libg/Unicos.intel.64.mpi.default/</ESMF_LIBDIR>
-</compiler>
-
-<compiler COMPILER="gnu" MACH="hopper">
-  <TRILINOS_PATH>/project/projectdirs/ccsm1/Trilinos/trilinos-10.12.2/hopper-gnu/install</TRILINOS_PATH>
+<compiler MACH="pleiades-has">
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 -aCORE-AVX2 -align array32byte </append>
+  </FFLAGS>
+  <MPICC>icc</MPICC>
+  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
+  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
+  <SLIBS>
+    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
+  </SLIBS>
 </compiler>
 
-<compiler MACH="pleiades-wes">
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <MPI_PATH>$(MPI_ROOT)</MPI_PATH>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+<compiler MACH="pleiades-ivy">
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 -xAVX </append>
+  </FFLAGS>
   <MPICC>icc</MPICC>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -xSSE4.2 </ADD_FFLAGS>
-  <ADD_SLIBS>-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
+  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
+  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
+  <SLIBS>
+    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
+  </SLIBS>
 </compiler>
 
 <compiler MACH="pleiades-san">
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <MPI_PATH>$(MPI_ROOT)</MPI_PATH>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 -xAVX </append>
+  </FFLAGS>
   <MPICC>icc</MPICC>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -xAVX </ADD_FFLAGS>
-  <ADD_SLIBS>-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
-</compiler>
-
-<compiler MACH="pleiades-ivy">
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <MPI_PATH>$(MPI_ROOT)</MPI_PATH>
   <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
-  <MPICC>icc</MPICC>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -xAVX </ADD_FFLAGS>
-  <ADD_SLIBS>-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
+  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
+  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
+  <SLIBS>
+    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
+  </SLIBS>
 </compiler>
 
-<compiler MACH="pleiades-has">
-  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
-  <MPI_PATH>$(MPI_ROOT)</MPI_PATH>
-  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+<compiler MACH="pleiades-wes">
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2 -xSSE4.2 </append>
+  </FFLAGS>
   <MPICC>icc</MPICC>
-  <ADD_FFLAGS DEBUG="FALSE"> -O2 -aCORE-AVX2 -align array32byte </ADD_FFLAGS>
-  <ADD_SLIBS>-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf</ADD_SLIBS>
+  <MPI_LIB_NAME>mpi</MPI_LIB_NAME>
+  <MPI_PATH><env>MPI_ROOT</env></MPI_PATH>
+  <NETCDF_PATH>/nasa/netcdf/4.1.3/intel/mpt</NETCDF_PATH>
+  <SLIBS>
+    <append>-L<env>NETCDF_DIR</env>/lib -lnetcdff -lnetcdf</append>
+  </SLIBS>
 </compiler>
 
 <compiler MACH="sierra">
-  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
-  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
+  <LDFLAGS>
+    <append> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</append>
+  </LDFLAGS>
   <MPI_LIB_NAME> mpich</MPI_LIB_NAME>
-  <ADD_SLIBS>$(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
-  <ADD_LDFLAGS> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib</ADD_LDFLAGS>
+  <MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
+  <NETCDF_PATH>/usr/local/tools/netcdf-pgi-4.1.3</NETCDF_PATH>
+  <SLIBS>
+    <append><shell>/usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs</shell></append>
+  </SLIBS>
+</compiler>
+
+<compiler MACH="skybridge" COMPILER="intel">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </CFLAGS>
+  <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O2  </append>
+  </FFLAGS>
+  <NETCDF_PATH><env>NETCDFROOT</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDFROOT</env></PNETCDF_PATH>
+  <SLIBS>
+    <append> <shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L/projects/ccsm/BLAS-intel -lblas_LINUX</append>
+  </SLIBS>
 </compiler>
 
+<compiler MACH="stampede">
+  <CPPDEFS>
+    <append> -DHAVE_NANOTIME </append>
+  </CPPDEFS>
+  <NETCDF_PATH><env>TACC_NETCDF_DIR</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>TACC_PNETCDF_DIR</env></PNETCDF_PATH>
+</compiler>
 
-<compiler MACH="goldbach">
- <MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
- <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
- <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
-<GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
+<compiler MACH="stampede" COMPILER="intel">
+  <CFLAGS>
+    <append> -xHost </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -xHost </append>
+    <append MPILIB="mpi-serial"> -mcmodel medium </append>
+  </FFLAGS>
+  <LDFLAGS>
+    <append>-L<env>TACC_HDF5_LIB</env> -lhdf5</append>
+  </LDFLAGS>
+  <SLIBS>
+    <append><shell><var>NETCDF_PATH</var>/bin/nf-config --flibs</shell> -L<env>TACC_HDF5_LIB</env> -lhdf5</append>
+  </SLIBS>
+  <TRILINOS_PATH><env>TRILINOS_PATH</env></TRILINOS_PATH>
+</compiler>
+
+<compiler MACH="theta">
+  <CFLAGS>
+    <append> -xMIC-AVX512 </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append> -xMIC-AVX512 </append>
+  </FFLAGS>
+    <CONFIG_ARGS>
+    <base> --host=Linux </base>
+  </CONFIG_ARGS>
+  <SLIBS>
+    <append>-L$(NETCDF_DIR)/lib -lnetcdff -L$(NETCDF_DIR)/lib -lnetcdf -Wl,-rpath -Wl,$(NETCDF_DIR)/lib </append>
+  </SLIBS>
+</compiler>
+
+
+<compiler MACH="tukey" COMPILER="ibm">
+  <HDF5_PATH>/soft/libraries/hdf5/1.8.10/cnk-xl/current/ </HDF5_PATH>
+  <!-- This LD is a workaround for darshan initialization on tukey?? (Darshan does -->
+  <!-- not run if f90 or higher is used for linking -->
+  <LD> mpixlf77_r </LD>
+  <MPICC> mpixlc_r </MPICC>
+  <MPIFC> mpixlf2003_r </MPIFC>
+  <NETCDF_PATH>/soft/libraries/netcdf/4.3.0-f4.2/cnk-xl/V1R2M0-20131211/</NETCDF_PATH>
+  <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_IBM</PFUNIT_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH>/soft/libraries/pnetcdf/1.3.1/cnk-xl/current/</PNETCDF_PATH>
+  <SCC> mpixlc_r </SCC>
+  <SFC> mpixlf2003_r </SFC>
+  <SLIBS>
+    <append>-L<var>NETCDF_PATH</var>/lib -lnetcdff -lnetcdf -L/soft/libraries/hdf5/1.8.10/cnk-xl/current/lib -lhdf5_hl -lhdf5 -L/soft/libraries/alcf/current/xl/ZLIB/lib -lz -L/soft/libraries/alcf/current/xl/LAPACK/lib -llapack -L/soft/libraries/alcf/current/xl/BLAS/lib -lblas -L/bgsys/drivers/ppcfloor/comm/sys/lib </append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="intel" MACH="goldbach">
- <ADD_LDFLAGS> -Wl,-rpath,$(NETCDF_PATH)/lib </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(COMPILER_PATH)/lib/intel64 </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(COMPILER_PATH)/mkl/lib/intel64 </ADD_LDFLAGS>
- <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
+<compiler MACH="userdefined">
+  <CONFIG_ARGS>
+    <base/>
+  </CONFIG_ARGS>
+  <CPPDEFS>
+    <append/>
+  </CPPDEFS>
+  <ESMF_LIBDIR/>
+  <MPI_LIB_NAME/>
+  <MPI_PATH/>
+  <NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
+  <PNETCDF_PATH/>
+  <SLIBS>
+    <append># USERDEFINED <shell><var>NETCDF_PATH</var>/bin/nc-config --flibs</shell></append>
+  </SLIBS>
 </compiler>
 
-<compiler COMPILER="pgi" MACH="goldbach">
- <ADD_CFLAGS DEBUG="FALSE"> -O0 </ADD_CFLAGS>
- <ADD_FFLAGS DEBUG="FALSE"> -O0 </ADD_FFLAGS>
- <ADD_LDFLAGS> -lgomp </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(NETCDF_PATH)/lib</ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(COMPILER_PATH)/lib</ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(COMPILER_PATH)/libso</ADD_LDFLAGS>
+<compiler MACH="yellowstone">
+  <CPPDEFS>
+    <!-- these flags enable nano timers -->
+    <append MODEL="gptl"> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </append>
+  </CPPDEFS>
+  <NETCDF_PATH><env>NETCDF</env></NETCDF_PATH>
+  <PIO_FILESYSTEM_HINTS>gpfs</PIO_FILESYSTEM_HINTS>
+  <PNETCDF_PATH><env>PNETCDF</env></PNETCDF_PATH>
 </compiler>
 
-<compiler MACH="hobart">
- <MPI_LIB_NAME MPILIB="mvapich2"> mpich</MPI_LIB_NAME>
- <LAPACK_LIBDIR> /usr/lib64 </LAPACK_LIBDIR>
- <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
-<GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_VPRINTF -DHAVE_BACKTRACE -DHAVE_SLASHPROC -DHAVE_COMM_F2C -DHAVE_TIMES -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
-</compiler>
-
-<compiler COMPILER="intel" MACH="hobart">
- <ADD_LDFLAGS> -lquadmath </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(NETCDF_PATH)/lib </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(COMPILER_PATH)/lib/intel64 </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(COMPILER_PATH)/mkl/lib/intel64 </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-rpath,$(MPI_PATH)/lib</ADD_LDFLAGS>
- <ADD_SLIBS MPILIB="mvapich2"> -mkl=cluster </ADD_SLIBS>
- <ADD_LDFLAGS> -lifcore</ADD_LDFLAGS>
- <ADD_CFLAGS> -lifcore</ADD_CFLAGS>
- <ADD_FFLAGS> -lifcore</ADD_FFLAGS>
- <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_Intel_3_0</PFUNIT_PATH>
-  <ADD_FFLAGS MPILIB="mpi-serial"> -mcmodel medium </ADD_FFLAGS>
-</compiler>
-
-<compiler COMPILER="pgi" MACH="hobart">
- <ADD_CFLAGS DEBUG="FALSE"> -O0 </ADD_CFLAGS>
- <ADD_FFLAGS DEBUG="FALSE"> -O0 </ADD_FFLAGS>
- <ADD_LDFLAGS> -lgomp </ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(NETCDF_PATH)/lib</ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(COMPILER_PATH)/lib</ADD_LDFLAGS>
- <ADD_LDFLAGS> -Wl,-R$(COMPILER_PATH)/libso</ADD_LDFLAGS>
-</compiler>
-
-<compiler COMPILER="nag" MACH="hobart">
- <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_NAG_3_0</PFUNIT_PATH>
- <!-- needed for nag pio build.. -->
- <ADD_CPPDEFS> -DNO_C_SIZEOF </ADD_CPPDEFS>
- <ADD_LDFLAGS> -lpthread</ADD_LDFLAGS>
- <!-- Experimental wrapper for OpenMP. -->
- <!-- <ADD_LDFLAGS compile_threaded="true"> -L/home/santos/lib/fake_omp -lfake_omp -Wl,-Wl,,rpath=/home/santos/lib/fake_omp  -->
-</compiler>
-
-<compiler COMPILER="nag" MACH="goldbach">
- <NETCDF_PATH> /usr/local/netcdf-gcc-nag</NETCDF_PATH>
- <MPI_PATH MPILIB="openmpi"> /usr/local/openmpi-gcc-nag</MPI_PATH>
- <PFUNIT_PATH>/home/santos/pFUnit/pFUnit_NAG_3_0</PFUNIT_PATH>
- <!-- needed for nag pio build.. -->
- <ADD_FFLAGS> -kind=byte </ADD_FFLAGS>
- <ADD_CPPDEFS> -DNO_C_SIZEOF </ADD_CPPDEFS>
- <!-- Experimental wrapper for OpenMP. -->
- <ADD_LDFLAGS compile_threaded="true"> -L/home/santos/lib/fake_omp -lfake_omp -Wl,-Wl,,--rpath=/home/santos/lib/fake_omp </ADD_LDFLAGS>
+<compiler MACH="yellowstone" COMPILER="gnu">
+  <LAPACK_LIBDIR> /glade/apps/opt/lib </LAPACK_LIBDIR>
 </compiler>
 
-<compiler MACH="stampede">
-  <PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS>
-  <NETCDF_PATH>$(TACC_NETCDF_DIR)</NETCDF_PATH>
-  <PNETCDF_PATH>$(TACC_PNETCDF_DIR)</PNETCDF_PATH>
-  <ADD_CPPDEFS> -DHAVE_NANOTIME </ADD_CPPDEFS>
+<compiler MACH="yellowstone" COMPILER="intel">
+  <CFLAGS>
+    <append MPILIB="mpich2">  -xHost </append>
+  </CFLAGS>
+  <CPPDEFS>
+    <append MPILIB="mpich2"> -DINTEL_MKL -DHAVE_SSE2 </append>
+  </CPPDEFS>
+  <FFLAGS>
+    <append MPILIB="mpich2">  -xHost </append>
+  </FFLAGS>
+  <MPICXX MPILIB="mpich2">mpiicpc</MPICXX>
+  <PAPI_INC MPILIB="mpich2"> /glade/apps/opt/papi/5.3.0/intel/12.1.5/include/</PAPI_INC>
+  <PAPI_LIB MPILIB="mpich2">/glade/apps/opt/papi/5.3.0/intel/12.1.5/lib64 </PAPI_LIB>
+  <PFUNIT_PATH><env>CESMDATAROOT</env>/tools/pFUnit/pFUnit3.1_Intel15.0.1_MPI</PFUNIT_PATH>
+  <!-- Needed due to the way that netcdf is loaded on yellowstone -->
+  <SCC MPILIB="mpi-serial">icc</SCC>
+  <SFC MPILIB="mpi-serial">ifort</SFC>
+  <SCC MPILIB="mpich2"><var>MPICC</var></SCC>
+  <SFC MPILIB="mpich2"><var>MPIFC</var></SFC>
+  <SLIBS>
+    <append MPILIB="mpich2"> -Wl,-rpath <var>PAPI_LIB</var> -L<var>PAPI_LIB</var> -lpapi</append>
+  </SLIBS>
+  <TRILINOS_PATH MPILIB="mpich2"><env>TRILINOS_PATH</env></TRILINOS_PATH>
 </compiler>
 
-<compiler MACH="stampede" COMPILER="intel">
-  <ADD_FFLAGS> -xHost </ADD_FFLAGS>
-  <ADD_CFLAGS> -xHost </ADD_CFLAGS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L$(TACC_HDF5_LIB) -lhdf5</ADD_SLIBS>
-  <ADD_LDFLAGS>-L$(TACC_HDF5_LIB) -lhdf5</ADD_LDFLAGS>
-  <TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
-  <ADD_FFLAGS MPILIB="mpi-serial"> -mcmodel medium </ADD_FFLAGS>
-</compiler>
-
-<compiler MACH="babbage">
-  <MPIFC> mpiifort </MPIFC>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <ADD_FFLAGS> -xHost -no-save-temps</ADD_FFLAGS>
-  <ADD_CFLAGS> -xHost -no-save-temps</ADD_CFLAGS>
-  <!-- PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS -->
-  <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF_DIR)</PNETCDF_PATH>
-  <ADD_CPPDEFS> -DHAVE_NANOTIME -DCPRINTEL</ADD_CPPDEFS>
-  <CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
-  <ADD_SLIBS> $(NETCDf) $(MKL)</ADD_SLIBS>
-  <ADD_LDFLAGS> $(NETCDF) </ADD_LDFLAGS>
-</compiler>
-
-<compiler MACH="babbageKnc">
-  <MPIFC> mpiifort </MPIFC>
-  <MPICC> mpiicc  </MPICC>
-  <MPICXX> mpiicpc </MPICXX>
-  <SFC> ifort </SFC>
-  <SCC> icc </SCC>
-  <!-- PIO_FILESYSTEM_HINTS>lustre</PIO_FILESYSTEM_HINTS -->
-  <NETCDF_PATH>$(NETCDF_DIR)</NETCDF_PATH>
-  <PNETCDF_PATH>$(PNETCDF_DIR)</PNETCDF_PATH>
-  <ADD_CPPDEFS> -DHAVE_NANOTIME -DCPRINTELMIC -DCPRINTEL</ADD_CPPDEFS>
-  <ADD_SLIBS> $(NETCDF) $(MKL)</ADD_SLIBS>
-  <ADD_LDFLAGS> $(NETCDF) -mmic </ADD_LDFLAGS>
-  <!-- http://software.intel.com/en-us/articles/intel-composer-xe/ -->
-  <ADD_FFLAGS DEBUG="TRUE"> -O0 -g -check all -check noarg_temp_created</ADD_FFLAGS>
-  <ADD_FFLAGS DEBUG="FALSE"> -O3 -mP2OPT_hpo_matrix_opt_framework=0 </ADD_FFLAGS>
-  <ADD_FFLAGS> -mmic -fp-model source -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -no-save-temps -no-opt-dynamic-align</ADD_FFLAGS>
-  <ADD_CFLAGS> -mmic -O3 -fp-model precise -DFORTRANUNDERSCORE -no-save-temps</ADD_CFLAGS>
-  <CONFIG_ARGS>--host=x86_64-k1om-linux --build=x86_64-unknown-linux</CONFIG_ARGS>
-  <FFLAGS_NOOPT> -O0 -mmic </FFLAGS_NOOPT>
-</compiler>
-
-<compiler MACH="pronghorn" COMPILER="intel">
-  <MPICC>mpiicc</MPICC>
-  <MPIFC>mpiifort</MPIFC>
-  <MPICXX>mpicpc</MPICXX>
-  <SFC>ifort</SFC>
-  <SCC>icc</SCC>
-  <SCXX>icpc</SCXX>
-  <ADD_FFLAGS> -xHost </ADD_FFLAGS>
-  <ADD_CFLAGS> -xHost </ADD_CFLAGS>
-  <ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L$(TACC_HDF5_LIB) -lhdf5</ADD_SLIBS>
-  <ADD_LDFLAGS>-L$(TACC_HDF5_LIB) -lhdf5</ADD_LDFLAGS>
-  <TRILINOS_PATH>$(TRILINOS_PATH)</TRILINOS_PATH>
+<compiler MACH="yellowstone" COMPILER="pgi">
+  <CFLAGS>
+    <append DEBUG="FALSE"> -O </append>
+  </CFLAGS>
+  <FFLAGS>
+    <append DEBUG="FALSE"> -O </append>
+  </FFLAGS>
+  <SLIBS>
+    <append> -llapack -lblas </append>
+  </SLIBS>
 </compiler>
 
 </config_compilers>
diff --git a/cime_config/cesm/machines/config_machines.xml b/cime_config/cesm/machines/config_machines.xml
index 1d009cc6ef1..16ff1d13eff 100644
--- a/cime_config/cesm/machines/config_machines.xml
+++ b/cime_config/cesm/machines/config_machines.xml
@@ -39,7 +39,7 @@
  The attributes used to choose the mpirun command are:
 
  mpilib: can either be 'default' the name of an mpi library, or a compiler name so one can choose the mpirun
-         based on the mpi library in use.
+	 based on the mpi library in use.
 
    the 'executable' tag must have arguments required for the chosen mpirun, as well as the executable name.
 
@@ -120,8 +120,8 @@
       <modules>
 	<command name="load">cmake/3.1.3</command>
 	<command name="rm">darshan</command>
-        <command name="use">/sw/modulefiles/CESM</command>
-        <command name="load">CESM-ENV</command>
+	<command name="use">/sw/modulefiles/CESM</command>
+	<command name="load">CESM-ENV</command>
       </modules>
     </module_system>
     <environment_variables>
@@ -218,18 +218,18 @@
     <mpirun mpilib="mvapich2">
       <executable>srun</executable>
       <arguments>
-        <arg name="mpi">--mpi=none</arg>
-        <arg name="num_tasks">--ntasks=$TOTALPES</arg>
-        <arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
-        <arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
+	<arg name="mpi">--mpi=none</arg>
+	<arg name="num_tasks">--ntasks=$TOTALPES</arg>
+	<arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
+	<arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
       </arguments>
     </mpirun>
     <mpirun mpilib="mvapich">
       <executable>srun</executable>
       <arguments>
-        <arg name="num_tasks">--ntasks=$TOTALPES</arg>
-        <arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
-        <arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
+	<arg name="num_tasks">--ntasks=$TOTALPES</arg>
+	<arg name="cpu_bind">--cpu_bind=sockets --cpu_bind=verbose</arg>
+	<arg name="kill-on-bad-exit">--kill-on-bad-exit</arg>
       </arguments>
     </mpirun>
     <mpirun mpilib="intelmpi">
@@ -292,9 +292,11 @@
     </environment_variables>
   </machine>
 
-  <machine MACH="corip1">
-    <DESC>NERSC XC40 Haswell, os is CNL, 32 pes/node, batch system is Slurm</DESC>
+  <machine MACH="cori-haswell">
+    <!-- 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>
@@ -357,12 +359,12 @@
 	<command name="load">esmf/6.3.0rp1-defio-intel2016-mpi-O</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" >
-        <command name="load">esmf/6.3.0rp1-defio-intel2016-mpiuni-O</command>
+	<command name="load">esmf/6.3.0rp1-defio-intel2016-mpiuni-O</command>
       </modules>
 
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.1</command>
+	<command name="switch">cce cce/8.5.4</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
@@ -379,11 +381,11 @@
 	<command name="load">cray-mpich/7.4.1</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.8.16</command>
-	<command name="load">cray-netcdf/4.4.0</command>
+	<command name="load">cray-hdf5/1.10.0</command>
+	<command name="load">cray-netcdf/4.4.1</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
 	<command name="load">cray-hdf5-parallel/1.8.16</command>
 	<command name="load">cray-parallel-netcdf/1.7.0</command>
       </modules>
@@ -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>
@@ -430,6 +435,8 @@
       <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">craype-haswell</command>
 	<command name="rm">PrgEnv-intel</command>
 	<command name="rm">PrgEnv-cray</command>
 	<command name="rm">PrgEnv-gnu</command>
@@ -444,32 +451,31 @@
 	<command name="rm">cray-netcdf</command>
 	<command name="rm">cray-hdf5</command>
 	<command name="rm">cray-netcdf-hdf5parallel</command>
-	<command name="rm">craype-sandybridge</command>
-	<command name="rm">craype-ivybridge</command>
-	<command name="rm">craype</command>
       </modules>
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
 	<command name="switch">intel intel/17.0.0.098</command>
 	<command name="rm">cray-libsci</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/cori</command>
+	<command name="load">memkind</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" >
 	<command name="load">esmf/6.3.0rp1-defio-intel2016-mpi-O</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" >
-        <command name="load">esmf/6.3.0rp1-defio-intel2016-mpiuni-O</command>
+	<command name="load">esmf/6.3.0rp1-defio-intel2016-mpiuni-O</command>
       </modules>
 
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.1</command>
+	<command name="switch">cce cce/8.5.4</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
 	<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>
@@ -480,11 +486,11 @@
 	<command name="load">cray-mpich/7.4.1</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.8.16</command>
-	<command name="load">cray-netcdf/4.4.0</command>
+	<command name="load">cray-hdf5/1.10.0</command>
+	<command name="load">cray-netcdf/4.4.1</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
 	<command name="load">cray-hdf5-parallel/1.8.16</command>
 	<command name="load">cray-parallel-netcdf/1.7.0</command>
       </modules>
@@ -509,7 +515,7 @@
     <DOUT_S_ROOT>$CIME_OUTPUT_ROOT/archive/$CASE</DOUT_S_ROOT>
     <DOUT_L_MSROOT>/projects/EarlyPerf_theta/cesm/csm/$CASE</DOUT_L_MSROOT>
     <BASELINE_ROOT>/projects/EarlyPerf_theta/cesm/baselines</BASELINE_ROOT>
-    <CCSM_CPRNC>/projects/EarlyPerf_theta/cesm/tools/cprnc</CCSM_CPRNC>
+    <CCSM_CPRNC>/projects/EarlyPerf_theta/cesm/tools/cprnc/cprnc</CCSM_CPRNC>
     <SAVE_TIMING_DIR>/projects/EarlyPerf_theta/cesm</SAVE_TIMING_DIR>
     <OS>CNL</OS>
     <BATCH_SYSTEM>cobalt_theta</BATCH_SYSTEM>
@@ -523,11 +529,11 @@
     <mpirun mpilib="default">
       <executable>aprun</executable>
       <arguments>
-        <arg name="num_tasks" >-n $TOTALPES</arg>
-        <arg name="tasks_per_node" >-N $PES_PER_NODE</arg>
-        <arg name="thread_count">--cc depth -d $OMP_NUM_THREADS</arg>
-        <arg name="env_omp_stacksize">-e OMP_STACKSIZE=64M</arg>
-        <arg name="env_thread_count">-e OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
+	<arg name="num_tasks" >-n $TOTALPES</arg>
+	<arg name="tasks_per_node" >-N $PES_PER_NODE</arg>
+	<arg name="thread_count">--cc depth -d $OMP_NUM_THREADS</arg>
+	<arg name="env_omp_stacksize">-e OMP_STACKSIZE=64M</arg>
+	<arg name="env_thread_count">-e OMP_NUM_THREADS=$OMP_NUM_THREADS</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -540,51 +546,51 @@
       <cmd_path lang="sh">module</cmd_path>
       <cmd_path lang="csh">module</cmd_path>
       <modules>
-        <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-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-hdf5parallel</command>
-        <command name="rm">craype-mic-knl</command>
-        <command name="rm">craype</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-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-hdf5parallel</command>
+	<command name="rm">craype-mic-knl</command>
+	<command name="rm">craype</command>
       </modules>
 
       <modules compiler="intel">
-        <command name="load">PrgEnv-intel/6.0.3</command>
-        <command name="switch">intel intel/17.0.0.098</command>
-        <command name="rm">cray-libsci</command>
+	<command name="load">PrgEnv-intel/6.0.3</command>
+	<command name="switch">intel intel/17.0.0.098</command>
+	<command name="rm">cray-libsci</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.3</command>
+	<command name="switch">cce cce/8.5.4</command>
       </modules>
       <modules compiler="gnu">
-        <command name="load">PrgEnv-gnu/6.0.3</command>
-        <command name="switch">gcc gcc/6.2.0</command>
+	<command name="load">PrgEnv-gnu/6.0.3</command>
+	<command name="switch">gcc gcc/6.2.0</command>
       </modules>
       <modules>
-        <command name="load">papi/5.4.3.3</command>
-        <command name="swap">craype craype/2.5.7</command>
+	<command name="load">papi/5.4.3.3</command>
+	<command name="swap">craype craype/2.5.7</command>
       </modules>
       <modules compiler="!intel">
-        <command name="switch">cray-libsci/16.09.1</command>
+	<command name="switch">cray-libsci/16.09.1</command>
       </modules>
       <modules>
-        <command name="load">cray-mpich/7.4.4</command>
+	<command name="load">cray-mpich/7.4.4</command>
       </modules>
       <modules mpilib="mpt">
-        <command name="load">cray-netcdf-hdf5parallel/4.4.1</command>
-        <command name="load">cray-hdf5-parallel/1.10.0</command>
-        <command name="load">cray-parallel-netcdf/1.7.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.4.1</command>
+	<command name="load">cray-hdf5-parallel/1.10.0</command>
+	<command name="load">cray-parallel-netcdf/1.7.0</command>
       </modules>
     </module_system>
   </machine>
@@ -634,9 +640,9 @@
       <cmd_path lang="csh">module</cmd_path>
       <modules>
 	<command name="purge"/>
-        <command name="load">perl/5.20.7</command>
-        <command name="load">cmake/3.0.0</command>
-        <command name="load">pgi/15.5</command>
+	<command name="load">perl/5.20.7</command>
+	<command name="load">cmake/3.0.0</command>
+	<command name="load">pgi/15.5</command>
 	<command name="load">mpi/mvapich2/1.5.1p1/pgi11.3</command>
 	<command name="load">netcdf/4.1.2/pgi</command>
       </modules>
@@ -711,7 +717,7 @@
 	<command name="load">esmf/6.3.0rp1-defio-intel15.0-mpi-O</command>
       </modules>
       <modules compiler="intel" mpilib="mpi-serial" >
-        <command name="load">esmf/6.3.0rp1-defio-intel15.0-mpiuni-O</command>
+	<command name="load">esmf/6.3.0rp1-defio-intel15.0-mpiuni-O</command>
       </modules>
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
@@ -941,7 +947,7 @@
 	<command name="load">netcdf/4.4.1</command>
       </modules>
       <modules mpilib="mpt">
-	<command name="load">netcdf-mpi/4.4.1</command> 
+	<command name="load">netcdf-mpi/4.4.1</command>
 <!--	<command name="load">pnetcdf/1.7.0</command> -->
       </modules>
     </module_system>
@@ -978,7 +984,7 @@
     <mpirun mpilib="default">
       <executable>mpirun</executable>
       <arguments>
-        <arg name="num_tasks"> -np $TOTALPES</arg>
+	<arg name="num_tasks"> -np $TOTALPES</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -1128,7 +1134,7 @@
     <mpirun mpilib="default">
       <executable>mpiexec_mpt</executable>
       <arguments>
-        <arg name="num_tasks">-n $TOTALPES</arg>
+	<arg name="num_tasks">-n $TOTALPES</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -1231,7 +1237,7 @@
     <mpirun mpilib="default">
       <executable>mpiexec_mpt</executable>
       <arguments>
-        <arg name="num_tasks">-n $TOTALPES</arg>
+	<arg name="num_tasks">-n $TOTALPES</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -1283,7 +1289,7 @@
     <mpirun mpilib="default">
       <executable>mpiexec_mpt</executable>
       <arguments>
-        <arg name="num_tasks">-n $TOTALPES</arg>
+	<arg name="num_tasks">-n $TOTALPES</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -1331,9 +1337,9 @@
     <mpirun mpilib="default">
       <executable>aprun</executable>
       <arguments>
-        <arg name="num_tasks"> -n $TOTALPES</arg>
-        <arg name="tasks_per_node"> -N $PES_PER_NODE</arg>
-        <arg name="thread_count"> -d $ENV{OMP_NUM_THREADS}</arg>
+	<arg name="num_tasks"> -n $TOTALPES</arg>
+	<arg name="tasks_per_node"> -N $PES_PER_NODE</arg>
+	<arg name="thread_count"> -d $ENV{OMP_NUM_THREADS}</arg>
       </arguments>
     </mpirun>
     <module_system type="module">
@@ -1374,8 +1380,8 @@
     <mpirun mpilib="default">
       <executable>mpirun</executable>
       <arguments>
-        <arg name="num_tasks"> -np $TOTALPES</arg>
-        <arg name="tasks_per_node"> -npernode $PES_PER_NODE</arg>
+	<arg name="num_tasks"> -np $TOTALPES</arg>
+	<arg name="tasks_per_node"> -npernode $PES_PER_NODE</arg>
       </arguments>
     </mpirun>
   </machine>
@@ -1542,7 +1548,6 @@
       <env name="MP_INFOLEVEL">2</env>
       <env name="MP_SHARED_MEMORY">yes</env>
       <env name="MP_EUILIB">us</env>
-      <env name="MP_MPILIB">$MPILIB</env>
       <env name="MP_STDOUTMODE">unordered</env>
       <env name="MP_RC_USE_LMC">yes</env>
     </environment_variables>
diff --git a/cime_config/xml_schemas/config_build.xsd b/cime_config/xml_schemas/config_compilers_v2.xsd
similarity index 80%
rename from cime_config/xml_schemas/config_build.xsd
rename to cime_config/xml_schemas/config_compilers_v2.xsd
index 3e26ffb0665..5f51849d242 100644
--- a/cime_config/xml_schemas/config_build.xsd
+++ b/cime_config/xml_schemas/config_compilers_v2.xsd
@@ -3,32 +3,17 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified">
 
-  <!-- Root element and its type; config_build is just a list of "compiler"
-       elements. -->
-  <xs:element name="config_build">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="compiler" type="compilerType" maxOccurs="unbounded">
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-
-  <!-- A "compiler" element is a list of one or more variables to be passed to
-       the build system, which can be specified in any order. The three
-       attributes on this element, if present, specify which compiler/system
-       combinations these settings are relevant for. Non-matches are typically
-       not passed to the build system at all. (For instance, they are not
-       written to a "Macros" file by the SetupTools module.) -->
-  <xs:complexType name="compilerType">
-    <xs:sequence>
-      <xs:group ref="compilerVars" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="COMPILER" type="xs:token"/>
-    <xs:attribute name="OS" type="xs:token"/>
-    <xs:attribute name="MACH" type="xs:token"/>
-  </xs:complexType>
+  <!-- attributes -->
+  <xs:attribute name="version" type="xs:decimal"/>
+  <xs:attribute name="COMPILER" type="xs:token"/>
+  <xs:attribute name="OS" type="xs:token"/>
+  <xs:attribute name="MACH" type="xs:token"/>
+  <xs:attribute name="compile_threaded" type="xs:boolean"/>
+  <xs:attribute name="DEBUG" type="upperBoolean"/>
+  <xs:attribute name="MODEL" type="xs:token"/>
+  <xs:attribute name="MPILIB" type="xs:token"/>
 
+  <!--  simple types -->
   <!-- For historical and user-interface reasons, we have uppercase TRUE and
        FALSE all over the place. This means we have to define an enumeration
        instead of using "xs:boolean". -->
@@ -39,12 +24,21 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <!-- Block containing a list of conditional flag settings. -->
-  <xs:complexType name="flagsVar">
+
+  <!-- complex types -->
+  <!-- A "compiler" element is a list of one or more variables to be passed to
+       the build system, which can be specified in any order. The three
+       attributes on this element, if present, specify which compiler/system
+       combinations these settings are relevant for. Non-matches are typically
+       not passed to the build system at all. (For instance, they are not
+       written to a "Macros" file by the SetupTools module.) -->
+  <xs:complexType name="compilerType">
     <xs:sequence>
-      <xs:element name="base" type="flags" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="append" type="flags" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:group ref="compilerVars" maxOccurs="unbounded"/>
     </xs:sequence>
+    <xs:attribute ref="COMPILER" />
+    <xs:attribute ref="OS" />
+    <xs:attribute ref="MACH" />
   </xs:complexType>
 
   <!-- For variables that represent command-line flags. The text inside these
@@ -54,21 +48,22 @@
     <xs:sequence>
       <xs:group ref="envTags" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="compile_threaded" type="xs:boolean"/>
-    <xs:attribute name="DEBUG" type="upperBoolean"/>
+    <xs:attribute ref="compile_threaded"/>
+    <xs:attribute ref="DEBUG"/>
     <!-- We could try enumerating all the valid names for models, but that could
-         complicate the process of adding new models. -->
-    <xs:attribute name="MODEL" type="xs:token"/>
-    <xs:attribute name="MPILIB" type="xs:token"/>
+	 complicate the process of adding new models. -->
+    <xs:attribute ref="MODEL"/>
+    <xs:attribute ref="MPILIB"/>
   </xs:complexType>
 
-  <xs:group name="envTags">
-    <xs:choice>
-      <xs:element name="shell" type="shellCommand"/>
-      <xs:element name="env" type="xs:token"/>
-      <xs:element name="var" type="xs:token"/>
-    </xs:choice>
-  </xs:group>
+
+  <!-- Block containing a list of conditional flag settings. -->
+  <xs:complexType name="flagsVar">
+    <xs:sequence>
+      <xs:element ref="base" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="append" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
 
   <!-- We want to allow env tags in a shell command, but it's not clear if we
        want (or really need) to allow nested shell commands. For now, just
@@ -79,13 +74,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:group name="shellTags">
-    <xs:choice>
-      <xs:element name="env" type="xs:token"/>
-      <xs:element name="var" type="xs:token"/>
-    </xs:choice>
-  </xs:group>
-
   <!-- Since both C++ and Fortran can have somewhat complex linking
        requirements, normally handled by the compiler, we have to specify which
        compiler to link with. -->
@@ -105,11 +93,48 @@
     <xs:sequence>
       <xs:group ref="envTags" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="compile_threaded" type="xs:boolean"/>
-    <xs:attribute name="DEBUG" type="upperBoolean"/>
-    <xs:attribute name="MPILIB" type="xs:token"/>
+    <xs:attribute ref="compile_threaded"/>
+    <xs:attribute ref="DEBUG" />
+    <xs:attribute ref="MPILIB" />
   </xs:complexType>
 
+  <!-- simple elements -->
+  <xs:element name="compiler" type="compilerType"/>
+  <xs:element name="base" type="flags"/>
+  <xs:element name="append" type="flags"/>
+
+
+  <!-- complex elements -->
+
+
+  <!-- Root element and its type; config_compilers is just a list of "compiler"
+       elements. -->
+  <xs:element name="config_compilers">
+    <xs:complexType>
+      <xs:sequence>
+	<xs:element ref="compiler" maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute ref="version" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- groups -->
+  <xs:group name="envTags">
+    <xs:choice>
+      <xs:element name="shell" type="shellCommand"/>
+      <xs:element name="env" type="xs:token"/>
+      <xs:element name="var" type="xs:token"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="shellTags">
+    <xs:choice>
+      <xs:element name="env" type="xs:token"/>
+      <xs:element name="var" type="xs:token"/>
+    </xs:choice>
+  </xs:group>
+
+
   <!-- All the variables that can be defined for a compiler/system
        combination. -->
   <xs:group name="compilerVars">
diff --git a/driver_cpl/cime_config/config_component.xml b/driver_cpl/cime_config/config_component.xml
index b867b3813db..985f3596477 100644
--- a/driver_cpl/cime_config/config_component.xml
+++ b/driver_cpl/cime_config/config_component.xml
@@ -3503,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>
diff --git a/scripts/Tools/code_checker b/scripts/Tools/code_checker
index 2d83c2b50b9..c98b1e5b3a2 100755
--- a/scripts/Tools/code_checker
+++ b/scripts/Tools/code_checker
@@ -74,7 +74,7 @@ def run_pylint(on_file):
          os.path.join(cimeroot,"scripts","Tools"))
 
     cmd = "%s %s %s" % (pylint, cmd_options, on_file)
-
+    logger.debug("pylint command is %s"%cmd)
     stat, out, err = run_cmd(cmd, verbose=False, from_dir=cimeroot)
     if stat != 0:
         logger.info("File %s has pylint problems, please fix\n    Use command: %s" % (on_file, cmd))
@@ -102,11 +102,15 @@ def check_code(dir_to_check, num_procs, files):
     Returns True if all files had no problems
     """
     # Get list of files to check
-    files_to_check = run_cmd_no_fail('git ls-files --full-name %s' % dir_to_check, verbose=False).splitlines()
-    if files:
-        files_to_check = [item for item in files_to_check if matches(item, files)]
+    if '/' in files:
+        files_to_check = files
     else:
-        files_to_check = [item for item in files_to_check if item.endswith(".py")]
+        files_to_check = run_cmd_no_fail('git ls-files --full-name %s' % dir_to_check, verbose=False).splitlines()
+        if files:
+            files_to_check = [item for item in files_to_check if matches(item, files)]
+        else:
+            files_to_check = [item for item in files_to_check if item.endswith(".py")]
+
 
     pool = ThreadPool(num_procs)
     results = pool.map(run_pylint, files_to_check)
diff --git a/share/timing/Makefile b/share/timing/Makefile
index 85e456d209e..e2bc675d0c4 100644
--- a/share/timing/Makefile
+++ b/share/timing/Makefile
@@ -19,7 +19,7 @@ endif
 
 
 ifeq ($(strip $(MACFILE)),)
-   MACFILE  := Macros
+   MACFILE  := Macros.make
 endif
 
 # Machine specific macros file
diff --git a/tools/configure b/tools/configure
index c5140d40e6f..b731460fe5b 100755
--- a/tools/configure
+++ b/tools/configure
@@ -16,16 +16,15 @@ COMPILER, MPILIB, and DEBUG, respectively.
 """
 
 import os
-import shutil
 import sys
 
 _CIMEROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
 sys.path.append(os.path.join(_CIMEROOT, "scripts", "Tools"))
+sys.path.append(os.path.join(_CIMEROOT, "scripts", "utils", "python"))
 
 from standard_script_setup import *
 from CIME.utils import expect
-from CIME.XML.build import Build
-from CIME.XML.env_mach_specific import EnvMachSpecific
+from CIME.BuildTools.configure import configure
 from CIME.XML.machines import Machines
 
 logger = logging.getLogger(__name__)
@@ -117,59 +116,6 @@ def parse_command_line(args):
 
     return opts
 
-def configure(machobj, output_dir, macros_format, compiler, mpilib, debug, sysos):
-    """Add Macros, Depends, and env_mach_specific files to a directory.
-
-    Arguments:
-    machobj - Machines argument for this machine.
-    output_dir - Directory in which to place output.
-    macros_format - Container containing the string 'Makefile' to produce
-                    Makefile Macros output, and/or 'CMake' for CMake output.
-    compiler - String containing the compiler vendor to configure for.
-    mpilib - String containing the MPI implementation to configure for.
-    debug - Boolean specifying whether debugging options are enabled.
-    """
-    # Macros generation.
-    suffixes = {'Makefile': '.make', 'CMake': '.cmake'}
-    macro_maker = Build(machobj)
-    build_file_name = os.path.join(machobj.machines_dir, "config_build.xml")
-    for form in macros_format:
-        out_file_name = os.path.join(output_dir,
-                                     "Macros"+suffixes[form])
-        with open(out_file_name, "w") as macros_file:
-            macro_maker.write_macros(form, build_file_name, macros_file)
-
-    # Depends file copy.
-    mach_depends = os.path.join(machobj.machines_dir,
-                                "Depends."+machobj.get_machine_name())
-    if os.path.isfile(mach_depends):
-        shutil.copy(mach_depends, output_dir)
-    compiler_depends = os.path.join(machobj.machines_dir, "Depends."+compiler)
-    if os.path.isfile(compiler_depends):
-        shutil.copy(compiler_depends, output_dir)
-
-    # env_mach_specific generation.
-    ems_path = os.path.join(output_dir, "env_mach_specific.xml")
-    if os.path.exists(ems_path):
-        os.remove(ems_path)
-    ems_file = EnvMachSpecific(output_dir)
-    ems_file.populate(machobj)
-    ems_file.write()
-    for shell in ('sh', 'csh'):
-        ems_file.make_env_mach_specific_file(compiler, debug, mpilib, shell)
-        shell_path = os.path.join(output_dir, ".env_mach_specific." + shell)
-        with open(shell_path, 'a') as shell_file:
-            if shell == 'sh':
-                shell_file.write("\nexport COMPILER=%s\n" % compiler)
-                shell_file.write("export MPILIB=%s\n" % mpilib)
-                shell_file.write("export DEBUG=%s\n" % repr(debug).upper())
-                shell_file.write("export OS=%s\n" % sysos)
-            else:
-                shell_file.write("\nsetenv COMPILER %s\n" % compiler)
-                shell_file.write("setenv MPILIB %s\n" % mpilib)
-                shell_file.write("setenv DEBUG %s\n" % repr(debug).upper())
-                shell_file.write("setenv OS %s\n" % sysos)
-
 def _main():
     opts = parse_command_line(sys.argv)
     configure(opts['machobj'], opts['output_dir'], opts['macros_format'],
diff --git a/utils/python/CIME/BuildTools/__init__.py b/utils/python/CIME/BuildTools/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/utils/python/CIME/BuildTools/cmakemacroswriter.py b/utils/python/CIME/BuildTools/cmakemacroswriter.py
new file mode 100644
index 00000000000..59681ac57f7
--- /dev/null
+++ b/utils/python/CIME/BuildTools/cmakemacroswriter.py
@@ -0,0 +1,119 @@
+"""Classes used to write build system files.
+
+The classes here are used to write out settings for use by Makefile and CMake
+build systems. The two relevant classes are CMakeMacroWriter and
+MakeMacroWriter, which encapsulate the information necessary to write CMake and
+Makefile formatted text, respectively. See the docstrings for those classes for
+more.
+"""
+
+# This is not the most useful check.
+# pylint: disable=invalid-name
+
+from CIME.BuildTools.macrowriterbase import MacroWriterBase
+from CIME.XML.standard_module_setup import *
+logger = logging.getLogger(__name__)
+
+
+class CMakeMacroWriter(MacroWriterBase):
+
+    """Macro writer for the CMake format.
+
+    For details on the provided methods, see MacroWriterBase, which this
+    class inherits from.
+    """
+
+    def __init__(self, output):
+        """Initialize a CMake macro writer.
+
+        Arguments:
+        output - File-like object (probably an io.TextIOWrapper), which
+                 will be written to.
+        """
+        super(CMakeMacroWriter, self).__init__(output)
+        # This counter is for avoiding name conflicts in temporary
+        # variables used for shell commands.
+        self._var_num = 0
+
+    def environment_variable_string(self, name):
+        """Return an environment variable reference.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> CMakeMacroWriter(s).environment_variable_string("foo")
+        '$ENV{foo}'
+        """
+        return "$ENV{" + name + "}"
+
+    def shell_command_strings(self, command):
+        # pylint: disable=line-too-long
+        """Return strings used to get the output of a shell command.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> set_up, inline, tear_down = CMakeMacroWriter(s).shell_command_strings("echo bar")
+        >>> set_up
+        'execute_process(COMMAND echo bar OUTPUT_VARIABLE CIME_TEMP_SHELL0 OUTPUT_STRIP_TRAILING_WHITESPACE)'
+        >>> inline
+        '${CIME_TEMP_SHELL0}'
+        >>> tear_down
+        'unset(CIME_TEMP_SHELL0)'
+        """
+        # pylint: enable=line-too-long
+        # Create a unique variable name, then increment variable number
+        # counter so that we get a different value next time.
+        var_name = "CIME_TEMP_SHELL" + str(self._var_num)
+        self._var_num += 1
+        set_up = "execute_process(COMMAND " + command + \
+                 " OUTPUT_VARIABLE " + var_name + \
+                 " OUTPUT_STRIP_TRAILING_WHITESPACE)"
+        tear_down = "unset(" + var_name + ")"
+        return (set_up, "${" + var_name + "}", tear_down)
+
+    def variable_string(self, name):
+        """Return a string to refer to a variable with the given name.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> CMakeMacroWriter(s).variable_string("foo")
+        '${CIME_foo}'
+        """
+        return "${CIME_" + name + "}"
+
+    def set_variable(self, name, value):
+        """Write out a statement setting a variable to some value.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> CMakeMacroWriter(s).set_variable("foo", "bar")
+        >>> s.getvalue()
+        u'set(CIME_foo "bar")\\n'
+        """
+        self.write_line("set(CIME_" + name + ' "' + value + '")')
+
+    def start_ifeq(self, left, right):
+        """Write out a statement to start a conditional block.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> CMakeMacroWriter(s).start_ifeq("foo", "bar")
+        >>> s.getvalue()
+        u'if("foo" STREQUAL "bar")\\n'
+        """
+        self.write_line('if("' + left + '" STREQUAL "' + right + '")')
+        self.indent_right()
+
+    def end_ifeq(self):
+        """Write out a statement to end a block started with start_ifeq.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> writer = CMakeMacroWriter(s)
+        >>> writer.start_ifeq("foo", "bar")
+        >>> writer.set_variable("foo2", "bar2")
+        >>> writer.end_ifeq()
+        >>> s.getvalue()
+        u'if("foo" STREQUAL "bar")\\n  set(CIME_foo2 "bar2")\\nendif()\\n'
+        """
+        self.indent_left()
+        self.write_line("endif()")
diff --git a/utils/python/CIME/BuildTools/configure.py b/utils/python/CIME/BuildTools/configure.py
new file mode 100644
index 00000000000..359df7cda12
--- /dev/null
+++ b/utils/python/CIME/BuildTools/configure.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+
+"""This script writes CIME build information to a directory.
+
+The pieces of information that will be written include:
+
+1. Machine-specific build settings (i.e. the "Macros" file).
+2. File-specific build settings (i.e. "Depends" files).
+3. Environment variable loads (i.e. the env_mach_specific files).
+
+The .env_mach_specific.sh and .env_mach_specific.csh files are specific to a
+given compiler, MPI library, and DEBUG setting. By default, these will be the
+machine's default compiler, the machine's default MPI library, and FALSE,
+respectively. These can be changed by setting the environment variables
+COMPILER, MPILIB, and DEBUG, respectively.
+"""
+
+import shutil
+from CIME.XML.standard_module_setup import *
+from CIME.utils import expect
+from CIME.XML.compilers import Compilers
+from CIME.XML.env_mach_specific import EnvMachSpecific
+
+logger = logging.getLogger(__name__)
+
+def configure(machobj, output_dir, macros_format, compiler, mpilib, debug, sysos):
+    """Add Macros, Depends, and env_mach_specific files to a directory.
+
+    Arguments:
+    machobj - Machines argument for this machine.
+    output_dir - Directory in which to place output.
+    macros_format - Container containing the string 'Makefile' to produce
+                    Makefile Macros output, and/or 'CMake' for CMake output.
+    compiler - String containing the compiler vendor to configure for.
+    mpilib - String containing the MPI implementation to configure for.
+    debug - Boolean specifying whether debugging options are enabled.
+    """
+    # Macros generation.
+    suffixes = {'Makefile': 'make', 'CMake': 'cmake'}
+    macro_maker = Compilers(machobj)
+    for form in macros_format:
+        out_file_name = os.path.join(output_dir,"Macros."+suffixes[form])
+        macro_maker.write_macros_file(macros_file=out_file_name, output_format=suffixes[form])
+
+    _copy_depends_files(machobj.get_machine_name(), machobj.machines_dir, output_dir, compiler)
+    _generate_env_mach_specific(output_dir, machobj, compiler, mpilib,
+                                debug, sysos)
+
+def _copy_depends_files(machine_name, machines_dir, output_dir, compiler):
+    """
+    Copy any system or compiler Depends files if they do not exist in the output directory
+    """
+    for dep in (machine_name, compiler):
+        dfile = os.path.join(machines_dir, "Depends.%s"%dep)
+        outputdfile = os.path.join(output_dir, "Depends.%s"%dep)
+        if os.path.isfile(dfile) and not os.path.isfile(outputdfile):
+            shutil.copyfile(dfile, outputdfile)
+    dfile = os.path.join(machines_dir, "Depends.%s.%s"%(machine_name,compiler))
+    outputdfile = os.path.join(output_dir, "Depends.%s.%s"%(machine_name,compiler))
+    if os.path.isfile(dfile) and not os.path.isfile(outputdfile):
+        shutil.copyfile(dfile, outputdfile)
+
+def _generate_env_mach_specific(output_dir, machobj, compiler, mpilib, debug, sysos):
+    """
+    env_mach_specific generation.
+    """
+    ems_path = os.path.join(output_dir, "env_mach_specific.xml")
+    if os.path.exists(ems_path):
+        logger.warn("%s already exists, delete to replace"%ems_path)
+        return
+    ems_file = EnvMachSpecific(output_dir)
+    ems_file.populate(machobj)
+    ems_file.write()
+    for shell in ('sh', 'csh'):
+        ems_file.make_env_mach_specific_file(compiler, debug, mpilib, shell)
+        shell_path = os.path.join(output_dir, ".env_mach_specific." + shell)
+        with open(shell_path, 'a') as shell_file:
+            if shell == 'sh':
+                shell_file.write("\nexport COMPILER=%s\n" % compiler)
+                shell_file.write("export MPILIB=%s\n" % mpilib)
+                shell_file.write("export DEBUG=%s\n" % repr(debug).upper())
+                shell_file.write("export OS=%s\n" % sysos)
+            else:
+                shell_file.write("\nsetenv COMPILER %s\n" % compiler)
+                shell_file.write("setenv MPILIB %s\n" % mpilib)
+                shell_file.write("setenv DEBUG %s\n" % repr(debug).upper())
+                shell_file.write("setenv OS %s\n" % sysos)
diff --git a/utils/python/CIME/BuildTools/macroconditiontree.py b/utils/python/CIME/BuildTools/macroconditiontree.py
new file mode 100644
index 00000000000..4172f2621f5
--- /dev/null
+++ b/utils/python/CIME/BuildTools/macroconditiontree.py
@@ -0,0 +1,170 @@
+from CIME.XML.standard_module_setup import *
+logger = logging.getLogger(__name__)
+
+class MacroConditionTree(object): # pylint: disable=too-many-instance-attributes
+
+    """Tree containing the various possible settings of a specific macro.
+
+    Unlike the PossibleValues class, this class assumes that we have
+    finished determining which settings could apply on a given machine. It
+    also sorts the settings based on the conditions under which they take
+    effect, in preparation for writing out the Macros file itself.
+
+    Public methods:
+    merge
+    write_out
+    """
+
+    def __init__(self, name, settings):
+        """Create a MacroConditionTree recursively.
+
+        Arguments:
+        name - Name of the variable.
+        settings - A list of all settings for this variable.
+        """
+        # Search for any conditions controlling the number of settings.
+        condition = None
+        # Prefer the COMPILER attribute as the top level attribute, for
+        # readability of the merged file.
+        if any("COMPILER" in setting.conditions for setting in settings):
+            condition = "COMPILER"
+        else:
+            # To make merging more effective, sort the conditions.
+            all_conditions = []
+            for setting in settings:
+                all_conditions += setting.conditions.keys()
+            if all_conditions:
+                condition = sorted(all_conditions)[0]
+        if condition is None:
+            # If there are no conditions, we have reached a leaf.
+            # We combine whatever settings are left; there should be at
+            # most one non-appending setting, or an arbitrary number of
+            # appending settings.
+            self._is_leaf = True
+            self._assignments = []
+            self._set_up = []
+            self._tear_down = []
+            self._do_append = True
+            for setting in settings:
+                if not setting.do_append:
+                    self._do_append = False
+                    assert len(settings) == 1, \
+                        "Internal error in macros: An ambiguity was " \
+                        "found after the ambiguity check was complete, " \
+                        "or there is a mixture of appending and initial " \
+                        "settings in the condition tree."
+                self._assignments.append((name, setting.value))
+                self._set_up += setting.set_up
+                self._tear_down += setting.tear_down
+        else:
+            # If a condition was found, partition the settings depending on
+            # how they use it, and recursively create a tree for each
+            # partition.
+            self._is_leaf = False
+            self._condition = condition
+            partition = dict()
+            for setting in settings:
+                # If some of the settings don't use a condition, we use
+                # None to represent that.
+                cond_val = setting.conditions.pop(condition, None)
+                if cond_val in partition:
+                    partition[cond_val].append(setting)
+                else:
+                    partition[cond_val] = [setting]
+            branches = dict()
+            for cond_val in partition:
+                branches[cond_val] = \
+                            MacroConditionTree(name, partition[cond_val])
+            self._branches = branches
+
+    # pylint shouldn't concern itself with the way that we access other, since
+    # it's actually a member of the same class.
+    # pylint:disable=protected-access
+    def merge(self, other):
+        """Merge another tree with this one.
+
+        This should be considered destructive to both trees. The only valid
+        value is the one that's returned.
+        """
+        if self._is_leaf:
+            if other._is_leaf:
+                assert self._do_append == other._do_append, \
+                    "Internal error in macros: Tried to merge an " \
+                    "appending tree with a tree containing initial "\
+                    "settings."
+                # If both are leaves, just merge the values.
+                self._assignments += other._assignments
+                self._set_up += other._set_up
+                self._tear_down += other._tear_down
+                return self
+            else:
+                # If other is not a leaf, swap the arguments so that self
+                # is the one that's not a leaf, handled below.
+                return other.merge(self)
+        else:
+            # If self is not a leaf but other is, it should go in
+            # self._branches[None]. The same goes for the case where the
+            # conditions don't match, and self._condition is last
+            # alphabetically.
+            if other._is_leaf or self._condition > other._condition:
+                if None in self._branches:
+                    self._branches[None] = self._branches[None].merge(other)
+                else:
+                    self._branches[None] = other
+                return self
+            else:
+                # If the other condition comes last alphabetically, swap
+                # the order.
+                if self._condition < other._condition:
+                    return other.merge(self)
+                # If neither is a leaf and their conditions match, merge
+                # their sets of branches.
+                for (cond_val, other_branch) in other._branches.items():
+                    if cond_val in self._branches:
+                        self._branches[cond_val] = \
+                            self._branches[cond_val].merge(other_branch)
+                    else:
+                        self._branches[cond_val] = other_branch
+                return self
+    # pylint:enable=protected-access
+
+    def write_out(self, writer):
+        """Write tree to file.
+
+        The writer argument is an object inheriting from MacroWriterBase.
+        This function first writes out all the initial settings with
+        appropriate conditionals, then the appending settings.
+        """
+        if self._is_leaf:
+            for line in self._set_up:
+                writer.write_line(line)
+            for (name, value) in self._assignments:
+                if self._do_append:
+                    writer.append_variable(name, value)
+                else:
+                    writer.set_variable(name, value)
+            for line in self._tear_down:
+                writer.write_line(line)
+        else:
+            condition = self._condition
+            # Take care of the settings that don't use this condition.
+            if None in self._branches:
+                self._branches[None].write_out(writer)
+            # Now all the if statements.
+            for cond_val in self._branches:
+                if cond_val is None:
+                    continue
+                env_ref = writer.environment_variable_string(condition)
+                writer.start_ifeq(env_ref, cond_val)
+                self._branches[cond_val].write_out(writer)
+                writer.end_ifeq()
+
+def merge_optional_trees(tree, big_tree):
+    """Merge two MacroConditionTrees when one or both objects may be `None`."""
+    if tree is not None:
+        if big_tree is None:
+            return tree
+        else:
+            return big_tree.merge(tree)
+    else:
+        return big_tree
diff --git a/utils/python/CIME/BuildTools/macrowriterbase.py b/utils/python/CIME/BuildTools/macrowriterbase.py
new file mode 100644
index 00000000000..117c101e093
--- /dev/null
+++ b/utils/python/CIME/BuildTools/macrowriterbase.py
@@ -0,0 +1,254 @@
+"""Classes used to write build system files.
+
+The classes here are used to write out settings for use by Makefile and CMake
+build systems. The two relevant classes are CMakeMacroWriter and
+MakeMacroWriter, which encapsulate the information necessary to write CMake and
+Makefile formatted text, respectively. See the docstrings for those classes for
+more.
+"""
+
+# This is not the most useful check.
+# pylint: disable=invalid-name
+
+import os
+from abc import ABCMeta, abstractmethod
+from CIME.XML.standard_module_setup import *
+logger = logging.getLogger(__name__)
+
+class MacroWriterBase(object):
+
+    """Abstract base class for macro file writers.
+
+    The methods here come in three flavors:
+    1. indent_left/indent_right change the level of indent used internally by
+       the class.
+    2. The various methods ending in "_string" return strings relevant to the
+       build system.
+    3. The other methods write information to the file handle associated with
+       an individual writer instance.
+
+    Public attributes:
+    indent_increment - Number of spaces to indent if blocks (does not apply
+                       to format-specific indentation, e.g. cases where
+                       Makefiles must use tabs).
+    output - File-like object that output is written to.
+
+    Public methods:
+    indent_string
+    indent_left
+    indent_right
+    write_line
+    environment_variable_string
+    shell_command_string
+    variable_string
+    set_variable
+    append_variable
+    start_ifeq
+    end_ifeq
+    """
+
+    __metaclass__ = ABCMeta
+
+    indent_increment = 2
+
+    def __init__(self, output):
+        """Initialize a macro writer.
+
+        Arguments:
+        output - File-like object (probably an io.TextIOWrapper), which
+                 will be written to.
+        """
+        self.output = output
+        self._indent_num = 0
+
+    def indent_string(self):
+        """Return an appropriate number of spaces for the indent."""
+        return ' ' * self._indent_num
+
+    def indent_left(self):
+        """Decrease the amount of line indent."""
+        self._indent_num -= 2
+
+    def indent_right(self):
+        """Increase the amount of line indent."""
+        self._indent_num += 2
+
+    def write_line(self, line):
+        """Write a single line of output, appropriately indented.
+
+        A trailing newline is added, whether or not the input has one.
+        """
+        self.output.write(unicode(self.indent_string() + line + "\n"))
+
+    @abstractmethod
+    def environment_variable_string(self, name):
+        """Return an environment variable reference."""
+        pass
+
+    @abstractmethod
+    def shell_command_strings(self, command):
+        """Return strings used to get the output of a shell command.
+
+        Implementations should return a tuple of three strings:
+        1. A line that is needed to get the output of the command (or None,
+           if a command can be run inline).
+        2. A string that can be used within a line to refer to the output.
+        3. A line that does any cleanup of temporary variables (or None, if
+           no cleanup is necessary).
+
+        Example usage:
+
+        # Get strings and write initial command.
+        (pre, var, post) = writer.shell_command_strings(command)
+        if pre is not None:
+            writer.write(pre)
+
+        # Use the variable to write an if block.
+        writer.start_ifeq(var, "TRUE")
+        writer.set_variable("foo", "bar")
+        writer.end_ifeq()
+
+        # Cleanup
+        if post is not None:
+            writer.write(post)
+        """
+        pass
+
+    @abstractmethod
+    def variable_string(self, name):
+        """Return a string to refer to a variable with the given name."""
+        pass
+
+    @abstractmethod
+    def set_variable(self, name, value):
+        """Write out a statement setting a variable to some value."""
+        pass
+
+    def append_variable(self, name, value):
+        """Write out a statement appending a value to a string variable."""
+        var_string = self.variable_string(name)
+        self.set_variable(name, var_string + " " + value)
+
+    @abstractmethod
+    def start_ifeq(self, left, right):
+        """Write out a statement to start a conditional block.
+
+        The arguments to this method are compared, and the block is entered
+        only if they are equal.
+        """
+        pass
+
+    @abstractmethod
+    def end_ifeq(self):
+        """Write out a statement to end a block started with start_ifeq."""
+        pass
+
+# None class based method for version 1.0
+
+def write_macros_file_v1(macros, compiler, os_, machine, macros_file="Macros", output_format="make"):
+    """
+    Parse the config_compiler.xml file into a Macros file for the
+    given machine and compiler.
+    """
+    # A few things can be used from environ if not in XML
+    for item in ["MPI_PATH", "NETCDF_PATH"]:
+        if not item in macros and item in os.environ:
+            logger.warn("Setting %s from Environment" % item)
+            macros[item] = os.environ[item]
+
+    with open(macros_file, "w") as fd:
+        fd.write(
+"""#
+# COMPILER=%s
+# OS=%s
+# MACH=%s
+""" % (compiler, os_, machine)
+)
+        if output_format == "make":
+            fd.write("#\n# Makefile Macros \n")
+
+            # print the settings out to the Macros file
+            for key, value in sorted(macros.iteritems()):
+                if key == "_COND_":
+                    pass
+                elif key.startswith("ADD_"):
+                    fd.write("%s+=%s\n\n" % (key[4:], value))
+                else:
+                    fd.write("%s:=%s\n\n" % (key, value))
+
+        elif output_format == "cmake":
+            fd.write(
+'''#
+# cmake Macros generated from $compiler_file
+#
+include(Compilers)
+set(CMAKE_C_FLAGS_RELEASE "" CACHE STRING "Flags used by c compiler." FORCE)
+set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Flags used by c compiler." FORCE)
+set(CMAKE_Fortran_FLAGS_RELEASE "" CACHE STRING "Flags used by Fortran compiler." FORCE)
+set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Flags used by Fortran compiler." FORCE)
+set(all_build_types "None Debug Release RelWithDebInfo MinSizeRel")
+set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Choose the type of build, options are: ${all_build_types}." FORCE)
+''')
+
+            # print the settings out to the Macros file, do it in
+            # two passes so that path values appear first in the
+            # file.
+            for key, value in sorted(macros.iteritems()):
+                if key == "_COND_":
+                    pass
+                else:
+                    value = value.replace("(", "{").replace(")", "}")
+                    if key.endswith("_PATH"):
+                        fd.write("set(%s %s)\n" % (key, value))
+                        fd.write("list(APPEND CMAKE_PREFIX_PATH %s)\n\n" % value)
+
+            for key, value in sorted(macros.iteritems()):
+                if key == "_COND_":
+                    pass
+                else:
+                    value = value.replace("(", "{").replace(")", "}")
+                    if "CFLAGS" in key:
+                        fd.write("add_flags(CMAKE_C_FLAGS %s)\n\n" % value)
+                    elif "FFLAGS" in key:
+                        fd.write("add_flags(CMAKE_Fortran_FLAGS %s)\n\n" % value)
+                    elif "CPPDEFS" in key:
+                        fd.write("list(APPEND COMPILE_DEFINITIONS %s)\n\n" % value)
+                    elif "SLIBS" in key or "LDFLAGS" in key:
+                        fd.write("add_flags(CMAKE_EXE_LINKER_FLAGS %s)\n\n" % value)
+
+        # Recursively print the conditionals, combining tests to avoid repetition
+        _parse_hash(macros["_COND_"], fd, 0, output_format)
+
+
+def _parse_hash(macros, fd, depth, output_format, cmakedebug=""):
+    width = 2 * depth
+    for key, value in macros.iteritems():
+        if type(value) is dict:
+            if output_format == "make" or "DEBUG" in key:
+                for key2, value2 in value.iteritems():
+                    if output_format == "make":
+                        fd.write("%sifeq ($(%s), %s) \n" % (" " * width, key, key2))
+
+                    _parse_hash(value2, fd, depth + 1, output_format, key2)
+        else:
+            if output_format == "make":
+                if key.startswith("ADD_"):
+                    fd.write("%s %s += %s\n" % (" " * width, key[4:], value))
+                else:
+                    fd.write("%s %s += %s\n" % (" " * width, key, value))
+
+            else:
+                value = value.replace("(", "{").replace(")", "}")
+                release = "DEBUG" if "TRUE" in cmakedebug else "RELEASE"
+                if "CFLAGS" in key:
+                    fd.write("add_flags(CMAKE_C_FLAGS_%s %s)\n\n" % (release, value))
+                elif "FFLAGS" in key:
+                    fd.write("add_flags(CMAKE_Fortran_FLAGS_%s %s)\n\n" % (release, value))
+                elif "CPPDEF" in key:
+                    fd.write("add_config_definitions(%s %s)\n\n" % (release, value))
+                elif "SLIBS" in key or "LDFLAGS" in key:
+                    fd.write("add_flags(CMAKE_EXE_LINKER_FLAGS_%s %s)\n\n" % (release, value))
+
+    width -= 2
+    if output_format == "make" and depth > 0:
+        fd.write("%sendif\n\n" % (" " * width))
diff --git a/utils/python/CIME/BuildTools/makemacroswriter.py b/utils/python/CIME/BuildTools/makemacroswriter.py
new file mode 100644
index 00000000000..83322e0b1f6
--- /dev/null
+++ b/utils/python/CIME/BuildTools/makemacroswriter.py
@@ -0,0 +1,93 @@
+"""Classes used to write build system files.
+
+The classes here are used to write out settings for use by Makefile and CMake
+build systems. The two relevant classes are CMakeMacroWriter and
+MakeMacroWriter, which encapsulate the information necessary to write CMake and
+Makefile formatted text, respectively. See the docstrings for those classes for
+more.
+"""
+
+from CIME.BuildTools.macrowriterbase import MacroWriterBase
+from CIME.XML.standard_module_setup import *
+logger = logging.getLogger(__name__)
+
+# This is not the most useful check.
+# pylint: disable=invalid-name
+
+class MakeMacroWriter(MacroWriterBase):
+
+    """Macro writer for the Makefile format.
+
+    For details on the provided methods, see MacroWriterBase, which this
+    class inherits from.
+    """
+
+    def environment_variable_string(self, name):
+        """Return an environment variable reference.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> MakeMacroWriter(s).environment_variable_string("foo")
+        '$(foo)'
+        """
+        return "$(" + name + ")"
+
+    def shell_command_strings(self, command):
+        """Return strings used to get the output of a shell command.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> MakeMacroWriter(s).shell_command_strings("echo bar")
+        (None, '$(shell echo bar)', None)
+        """
+        return (None, "$(shell " + command + ")", None)
+
+    def variable_string(self, name):
+        """Return a string to refer to a variable with the given name.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> MakeMacroWriter(s).variable_string("foo")
+        '$(foo)'
+        """
+        return "$(" + name + ")"
+
+    def set_variable(self, name, value):
+        """Write out a statement setting a variable to some value.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> MakeMacroWriter(s).set_variable("foo", "bar")
+        >>> s.getvalue()
+        u'foo := bar\\n'
+        """
+        # Note that ":=" is used so that we can control the behavior for
+        # both Makefile and CMake variables similarly.
+        self.write_line(name + " := " + value)
+
+    def start_ifeq(self, left, right):
+        """Write out a statement to start a conditional block.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> MakeMacroWriter(s).start_ifeq("foo", "bar")
+        >>> s.getvalue()
+        u'ifeq (foo,bar)\\n'
+        """
+        self.write_line("ifeq (" + left + "," + right + ")")
+        self.indent_right()
+
+    def end_ifeq(self):
+        """Write out a statement to end a block started with start_ifeq.
+
+        >>> import io
+        >>> s = io.StringIO()
+        >>> writer = MakeMacroWriter(s)
+        >>> writer.start_ifeq("foo", "bar")
+        >>> writer.set_variable("foo2", "bar2")
+        >>> writer.end_ifeq()
+        >>> s.getvalue()
+        u'ifeq (foo,bar)\\n  foo2 := bar2\\nendif\\n'
+        """
+        self.indent_left()
+        self.write_line("endif")
diff --git a/utils/python/CIME/BuildTools/possiblevalues.py b/utils/python/CIME/BuildTools/possiblevalues.py
new file mode 100644
index 00000000000..a4073922fee
--- /dev/null
+++ b/utils/python/CIME/BuildTools/possiblevalues.py
@@ -0,0 +1,139 @@
+from CIME.XML.standard_module_setup import *
+from CIME.BuildTools.macroconditiontree import MacroConditionTree
+
+logger = logging.getLogger(__name__)
+
+class PossibleValues(object):
+
+    """Holds a list of settings for a single "Macros" variable.
+
+    This helper class takes in variable settings and, for each one, decides
+    whether to throw it out, add it to the list of values, or replace the
+    existing list of values with the new, more specific setting.
+
+    This class also performs ambiguity checking; if it is possible at build
+    time for more than one setting to match the same variable, this is
+    considered an error.
+
+    Public attributes:
+    name - The name of the variable.
+    settings - The current list of possible initial settings for the
+               variable.
+    append_settings - A dictionary of lists of possible appending settings
+                      for the variable, with the specificity of each list
+                      as the associated dictionary key.
+    depends - The current list of variables that this variable depends on
+              to get its value.
+
+    Public methods:
+    add_setting
+    ambiguity_check
+    to_cond_trees
+    """
+
+    def __init__(self, name, setting, specificity, depends):
+        """Construct a PossibleValues object.
+
+        The name argument refers to the name of the variable. The other
+        arguments are the same as for append_match.
+        """
+        self.name = name
+        self.depends = depends
+        # If this is an appending setting, its specificity can't cause it
+        # to overwrite other settings, but we want to keep track of it.
+        if setting.do_append:
+            self.settings = []
+            self.append_settings = {specificity: [setting]}
+            self._specificity = 0
+        else:
+            self.settings = [setting]
+            self.append_settings = {}
+            self._specificity = specificity
+
+    def add_setting(self, setting, specificity, depends):
+        """Add a possible value for a variable.
+
+        Arguments:
+        setting - A ValueSetting to start the list.
+        specificity - An integer representing how specific the setting is.
+                      Only the initial settings with the highest
+                      specificity and appending settings with at least that
+                      specificity will actually be kept in the list. The
+                      lowest allowed specificity is 0.
+        depends - A set of variable names, specifying the variables that
+                  have to be set before this setting can be used (e.g. if
+                  SLIBS refers to NETCDF_PATH, then NETCDF_PATH has to be
+                  set first).
+
+        >>> a = ValueSetting('foo', False, dict(), [], [])
+        >>> b = ValueSetting('bar', False, dict(), [], [])
+        >>> vals = PossibleValues('var', a, 0, {'dep1'})
+        >>> vals.add_setting(b, 1, {'dep2'})
+        >>> a not in vals.settings and b in vals.settings
+        True
+        >>> 'dep1' not in vals.depends and 'dep2' in vals.depends
+        True
+        >>> vals.add_setting(a, 1, {'dep1'})
+        >>> a in vals.settings and b in vals.settings
+        True
+        >>> 'dep1' in vals.depends and 'dep2' in vals.depends
+        True
+        """
+        if setting.do_append:
+            # Appending settings with at least the current level of
+            # specificity should be kept.
+            if specificity >= self._specificity:
+                if specificity not in self.append_settings:
+                    self.append_settings[specificity] = []
+                self.append_settings[specificity].append(setting)
+                self.depends |= depends
+        else:
+            # Add equally specific settings to the list.
+            if specificity == self._specificity:
+                self.settings.append(setting)
+                self.depends |= depends
+            # Replace the list if the setting is more specific.
+            elif specificity > self._specificity:
+                self.settings = [setting]
+                self._specificity = specificity
+                self.depends = depends
+        # Do nothing if the setting is less specific.
+
+    def ambiguity_check(self):
+        """Check the current list of settings for ambiguity.
+
+        This function raises an error if an ambiguity is found.
+        """
+        for i in range(len(self.settings)-1):
+            for other in self.settings[i+1:]:
+                expect(not self.settings[i].is_ambiguous_with(other),
+                       "Variable "+self.name+" is set ambiguously in "
+                       "config_build.xml. Check the file for these "
+                       "conflicting settings: \n1: {}\n2: {}".format(
+                           self.settings[i].conditions, other.conditions))
+
+    def to_cond_trees(self):
+        """Convert this object to a pair of MacroConditionTree objects.
+
+        This represents the step where the list of possible values is
+        frozen and we're ready to convert it into an actual text file. This
+        object is checked for ambiguities before conversion.
+
+        The return value is a tuple of two trees. The first contains all
+        initial settings, and the second contains all appending settings.
+        If either would be empty, None is returned instead.
+        """
+        self.ambiguity_check()
+        if self.settings:
+            normal_tree = MacroConditionTree(self.name, self.settings)
+        else:
+            normal_tree = None
+        append_settings = []
+        for specificity in self.append_settings:
+            if specificity >= self._specificity:
+                append_settings += self.append_settings[specificity]
+        if append_settings:
+            append_tree = MacroConditionTree(self.name, append_settings)
+        else:
+            append_tree = None
+        return (normal_tree, append_tree)
diff --git a/utils/python/CIME/BuildTools/valuesetting.py b/utils/python/CIME/BuildTools/valuesetting.py
new file mode 100644
index 00000000000..13f8ce9318d
--- /dev/null
+++ b/utils/python/CIME/BuildTools/valuesetting.py
@@ -0,0 +1,107 @@
+from CIME.XML.standard_module_setup import *
+
+logger = logging.getLogger(__name__)
+
+class ValueSetting(object):
+
+    """Holds data about how a value can be assigned to a variable.
+
+    Note that this class doesn't know or care *which* variable might be
+    assigned in this way, only that there is a procedure to perform that
+    operation
+
+    Public attributes:
+    value - The actual value that will be set.
+    do_append - Boolean describing whether the value should be
+                appended to the existing value of the variable rather
+                than overwriting other settings.
+    conditions - Dictionary containing the set of values that different
+                 variables have to have to use this setting (e.g.
+                 DEBUG="TRUE" might be a condition on a debug flag).
+    set_up - List of any commands that have to be executed in the build
+             system before this setting can occur.
+    tear_down - List of any commands that should be executed to clean up
+                after setting the variable.
+
+    Public methods:
+    is_ambiguous_with
+    """
+
+    def __init__(self, value, do_append, conditions, set_up, tear_down): #  pylint: disable=too-many-arguments
+        """Create a ValueSetting object by specifying all its data."""
+        self.value = value
+        self.do_append = do_append
+        self.conditions = conditions
+        self.set_up = set_up
+        self.tear_down = tear_down
+
+    def is_ambiguous_with(self, other):
+        """Check to see if this setting conflicts with another one.
+
+        The purpose of this routine is to see if two settings can coexist
+        in the same Macros file, or if doing so would raise an ambiguity
+        about which one should be preferred over the other. Note that this
+        is a symmetric relation (this function returns the same value if
+        self and other are swapped).
+
+        The rules to determine this are as follows:
+
+        1) If one or both settings are appending to the value, there's no
+           ambiguity, because both can cooperate to set the value.
+
+        >>> a = ValueSetting('foo', True, dict(), [], [])
+        >>> b = ValueSetting('bar', False, dict(), [], [])
+        >>> a.is_ambiguous_with(b)
+        False
+        >>> b.is_ambiguous_with(a)
+        False
+
+        2) If the two settings have conflicting conditions, then there
+           is no ambiguity because they can't both apply to the same
+           build.
+
+        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
+        >>> b = ValueSetting('bar', False, {"DEBUG": "FALSE"}, [], [])
+        >>> a.is_ambiguous_with(b)
+        False
+
+        3) If one setting is strictly more specific than the other, then
+           there's no ambiguity, because we prefer the more specific
+           setting whenever both apply to a build.
+
+        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
+        >>> b = ValueSetting('bar', False, {"DEBUG": "TRUE", "MPILIB": "mpich2"}, [], [])
+        >>> a.is_ambiguous_with(b)
+        False
+        >>> b.is_ambiguous_with(a)
+        False
+
+        4) All other cases are considered ambiguous.
+
+        >>> a = ValueSetting('foo', False, dict(), [], [])
+        >>> b = ValueSetting('bar', False, dict(), [], [])
+        >>> a.is_ambiguous_with(b)
+        True
+        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
+        >>> b = ValueSetting('bar', False, {"MPILIB": "mpich2"}, [], [])
+        >>> a.is_ambiguous_with(b)
+        True
+        """
+        # Append check.
+        if self.do_append or other.do_append:
+            return False
+        # Consistency check.
+        for var_name in self.conditions:
+            if var_name not in other.conditions:
+                continue
+            if self.conditions[var_name] != other.conditions[var_name]:
+                return False
+        # Specificity check.
+        # One setting being more specific than the other is equivalent to
+        # its set of conditions being a proper superset of the others.
+        self_set = set(self.conditions.keys())
+        other_set = set(other.conditions.keys())
+        if self_set < other_set or self_set > other_set:
+            return False
+        # Any situation we couldn't resolve is ambiguous.
+        return True
diff --git a/utils/python/CIME/XML/build.py b/utils/python/CIME/XML/build.py
deleted file mode 100644
index 438440ef364..00000000000
--- a/utils/python/CIME/XML/build.py
+++ /dev/null
@@ -1,756 +0,0 @@
-"""
-Classes used to build the CIME Macros file.
-
-The main "public" class here is Build. It is initialized with machine-specific
-information, and its write_macros method is the driver for translating the
-config_build.xml file into a Makefile or CMake-format Macros file.
-
-For developers, here's the role of the other classes in the process:
-
-- A CompilerBlock is responsible for translating the XML code in a <compiler>
-  tag into Python data structures.
-
-- A PossibleValues object keeps track of all the settings that could affect a
-  particular variable, and is the main way that these settings are stored.
-
-- A MacroConditionTree is the structure that is responsible for writing out the
-  settings. While the PossibleValues objects are organized by variable name, the
-  MacroConditionTree is organized by conditional blocks, and thus roughly
-  plays the role of a syntax tree corresponding to the Makefile/CMake output.
-
-In more detail:
-
-- Build.write_macros immediately creates a MakeMacroWriter or CMakeMacroWriter
-  to translate strings for the build system.
-
-- It also creates value_lists, a dictionary of PossibleValues objects, with
-  variable names as the keys. Each variable has a single PossibleValues object
-  associated with it.
-
-- For each <compiler> element, Build.write_macros creates a CompilerBlock
-  instance. This object is responsible for translating the XML in its block, in
-  order to populate the PossibleValues instances. This includes handling the
-  <var>/<env>/<shell> tags, and keeping track of dependencies induced by one
-  variable referencing another's value.
-
-- The PossibleValues object holds the information about how one variable can be
-  set, based on various build options. It has two main roles:
-   1. As we iterate through the XML input file, each setting is added to the
-      relevant PossibleValues object. The PossibleValues object contains lists
-      of settings sorted by how machine-specific those settings are.
-   2. The PossibleValues object iterates through the list of settings to check
-      for ambiguities. E.g. if there is a setting for DEBUG=TRUE, and another
-      setting for MPILIB=mpi-serial, it is ambiguous in the case where both
-      conditions hold.
-
-- A ValueSetting object is a simple struct that a setting from the XML file is
-  translated to. The lists in the PossibleValues class contain these objects.
-
-- Once the XML has all been read in and the PossibleValues objects are
-  populated, the dependencies among variables are checked in Build.write_macros.
-  For each variable, if all its dependencies have been handled, it is converted
-  to a MacroConditionTree merged with all other trees for variables that are
-  ready, and written out. Then we loop through the variable list again to check
-  for variables whose dependencies are all handled.
-
-- The MacroConditionTree acts as a primitive syntax tree. Its __init__ method
-  reorganizes the data into conditional blocks, and its write_out method writes
-  uses the MakeMacroWriter/CMakeMacroWrite object to write to the Macros file.
-  MacroConditionTree objects can be merged to reduce the length of the output.
-"""
-
-# These don't seem to be particularly useful checks.
-# pylint: disable=invalid-name,too-few-public-methods,unused-wildcard-import
-# pylint: disable=wildcard-import
-
-from CIME.macros_writers import *
-from CIME.utils import get_cime_root
-from CIME.XML.machines import Machines # pylint: disable=unused-import
-from CIME.XML.standard_module_setup import *
-
-__all__ = ["Build"]
-
-logger = logging.getLogger(__name__)
-
-class ValueSetting(object):
-
-    """Holds data about how a value can be assigned to a variable.
-
-    Note that this class doesn't know or care *which* variable might be
-    assigned in this way, only that there is a procedure to perform that
-    operation
-
-    Public attributes:
-    value - The actual value that will be set.
-    do_append - Boolean describing whether the value should be
-                appended to the existing value of the variable rather
-                than overwriting other settings.
-    conditions - Dictionary containing the set of values that different
-                 variables have to have to use this setting (e.g.
-                 DEBUG="TRUE" might be a condition on a debug flag).
-    set_up - List of any commands that have to be executed in the build
-             system before this setting can occur.
-    tear_down - List of any commands that should be executed to clean up
-                after setting the variable.
-
-    Public methods:
-    is_ambiguous_with
-    """
-
-    def __init__(self, value, do_append, conditions, set_up, tear_down): #  pylint: disable=too-many-arguments
-        """Create a ValueSetting object by specifying all its data."""
-        self.value = value
-        self.do_append = do_append
-        self.conditions = conditions
-        self.set_up = set_up
-        self.tear_down = tear_down
-
-    def is_ambiguous_with(self, other):
-        """Check to see if this setting conflicts with another one.
-
-        The purpose of this routine is to see if two settings can coexist
-        in the same Macros file, or if doing so would raise an ambiguity
-        about which one should be preferred over the other. Note that this
-        is a symmetric relation (this function returns the same value if
-        self and other are swapped).
-
-        The rules to determine this are as follows:
-
-        1) If one or both settings are appending to the value, there's no
-           ambiguity, because both can cooperate to set the value.
-
-        >>> a = ValueSetting('foo', True, dict(), [], [])
-        >>> b = ValueSetting('bar', False, dict(), [], [])
-        >>> a.is_ambiguous_with(b)
-        False
-        >>> b.is_ambiguous_with(a)
-        False
-
-        2) If the two settings have conflicting conditions, then there
-           is no ambiguity because they can't both apply to the same
-           build.
-
-        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
-        >>> b = ValueSetting('bar', False, {"DEBUG": "FALSE"}, [], [])
-        >>> a.is_ambiguous_with(b)
-        False
-
-        3) If one setting is strictly more specific than the other, then
-           there's no ambiguity, because we prefer the more specific
-           setting whenever both apply to a build.
-
-        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
-        >>> b = ValueSetting('bar', False, {"DEBUG": "TRUE", "MPILIB": "mpich2"}, [], [])
-        >>> a.is_ambiguous_with(b)
-        False
-        >>> b.is_ambiguous_with(a)
-        False
-
-        4) All other cases are considered ambiguous.
-
-        >>> a = ValueSetting('foo', False, dict(), [], [])
-        >>> b = ValueSetting('bar', False, dict(), [], [])
-        >>> a.is_ambiguous_with(b)
-        True
-        >>> a = ValueSetting('foo', False, {"DEBUG": "TRUE"}, [], [])
-        >>> b = ValueSetting('bar', False, {"MPILIB": "mpich2"}, [], [])
-        >>> a.is_ambiguous_with(b)
-        True
-        """
-        # Append check.
-        if self.do_append or other.do_append:
-            return False
-        # Consistency check.
-        for var_name in self.conditions:
-            if var_name not in other.conditions:
-                continue
-            if self.conditions[var_name] != other.conditions[var_name]:
-                return False
-        # Specificity check.
-        # One setting being more specific than the other is equivalent to
-        # its set of conditions being a proper superset of the others.
-        self_set = set(self.conditions.keys())
-        other_set = set(other.conditions.keys())
-        if self_set < other_set or self_set > other_set:
-            return False
-        # Any situation we couldn't resolve is ambiguous.
-        return True
-
-
-class PossibleValues(object):
-
-    """Holds a list of settings for a single "Macros" variable.
-
-    This helper class takes in variable settings and, for each one, decides
-    whether to throw it out, add it to the list of values, or replace the
-    existing list of values with the new, more specific setting.
-
-    This class also performs ambiguity checking; if it is possible at build
-    time for more than one setting to match the same variable, this is
-    considered an error.
-
-    Public attributes:
-    name - The name of the variable.
-    settings - The current list of possible initial settings for the
-               variable.
-    append_settings - A dictionary of lists of possible appending settings
-                      for the variable, with the specificity of each list
-                      as the associated dictionary key.
-    depends - The current list of variables that this variable depends on
-              to get its value.
-
-    Public methods:
-    add_setting
-    ambiguity_check
-    to_cond_trees
-    """
-
-    def __init__(self, name, setting, specificity, depends):
-        """Construct a PossibleValues object.
-
-        The name argument refers to the name of the variable. The other
-        arguments are the same as for append_match.
-        """
-        self.name = name
-        self.depends = depends
-        # If this is an appending setting, its specificity can't cause it
-        # to overwrite other settings, but we want to keep track of it.
-        if setting.do_append:
-            self.settings = []
-            self.append_settings = {specificity: [setting]}
-            self._specificity = 0
-        else:
-            self.settings = [setting]
-            self.append_settings = {}
-            self._specificity = specificity
-
-    def add_setting(self, setting, specificity, depends):
-        """Add a possible value for a variable.
-
-        Arguments:
-        setting - A ValueSetting to start the list.
-        specificity - An integer representing how specific the setting is.
-                      Only the initial settings with the highest
-                      specificity and appending settings with at least that
-                      specificity will actually be kept in the list. The
-                      lowest allowed specificity is 0.
-        depends - A set of variable names, specifying the variables that
-                  have to be set before this setting can be used (e.g. if
-                  SLIBS refers to NETCDF_PATH, then NETCDF_PATH has to be
-                  set first).
-
-        >>> a = ValueSetting('foo', False, dict(), [], [])
-        >>> b = ValueSetting('bar', False, dict(), [], [])
-        >>> vals = PossibleValues('var', a, 0, {'dep1'})
-        >>> vals.add_setting(b, 1, {'dep2'})
-        >>> a not in vals.settings and b in vals.settings
-        True
-        >>> 'dep1' not in vals.depends and 'dep2' in vals.depends
-        True
-        >>> vals.add_setting(a, 1, {'dep1'})
-        >>> a in vals.settings and b in vals.settings
-        True
-        >>> 'dep1' in vals.depends and 'dep2' in vals.depends
-        True
-        """
-        if setting.do_append:
-            # Appending settings with at least the current level of
-            # specificity should be kept.
-            if specificity >= self._specificity:
-                if specificity not in self.append_settings:
-                    self.append_settings[specificity] = []
-                self.append_settings[specificity].append(setting)
-                self.depends |= depends
-        else:
-            # Add equally specific settings to the list.
-            if specificity == self._specificity:
-                self.settings.append(setting)
-                self.depends |= depends
-            # Replace the list if the setting is more specific.
-            elif specificity > self._specificity:
-                self.settings = [setting]
-                self._specificity = specificity
-                self.depends = depends
-        # Do nothing if the setting is less specific.
-
-    def ambiguity_check(self):
-        """Check the current list of settings for ambiguity.
-
-        This function raises an error if an ambiguity is found.
-        """
-        for i in range(len(self.settings)-1):
-            for other in self.settings[i+1:]:
-                expect(not self.settings[i].is_ambiguous_with(other),
-                       "Variable "+self.name+" is set ambiguously in "
-                       "config_build.xml. Check the file for these "
-                       "conflicting settings: \n1: {}\n2: {}".format(
-                           self.settings[i].conditions, other.conditions))
-
-    def to_cond_trees(self):
-        """Convert this object to a pair of MacroConditionTree objects.
-
-        This represents the step where the list of possible values is
-        frozen and we're ready to convert it into an actual text file. This
-        object is checked for ambiguities before conversion.
-
-        The return value is a tuple of two trees. The first contains all
-        initial settings, and the second contains all appending settings.
-        If either would be empty, None is returned instead.
-        """
-        self.ambiguity_check()
-        if self.settings:
-            normal_tree = MacroConditionTree(self.name, self.settings)
-        else:
-            normal_tree = None
-        append_settings = []
-        for specificity in self.append_settings:
-            if specificity >= self._specificity:
-                append_settings += self.append_settings[specificity]
-        if append_settings:
-            append_tree = MacroConditionTree(self.name, append_settings)
-        else:
-            append_tree = None
-        return (normal_tree, append_tree)
-
-
-class MacroConditionTree(object): # pylint: disable=too-many-instance-attributes
-
-    """Tree containing the various possible settings of a specific macro.
-
-    Unlike the PossibleValues class, this class assumes that we have
-    finished determining which settings could apply on a given machine. It
-    also sorts the settings based on the conditions under which they take
-    effect, in preparation for writing out the Macros file itself.
-
-    Public methods:
-    merge
-    write_out
-    """
-
-    def __init__(self, name, settings):
-        """Create a MacroConditionTree recursively.
-
-        Arguments:
-        name - Name of the variable.
-        settings - A list of all settings for this variable.
-        """
-        # Search for any conditions controlling the number of settings.
-        condition = None
-        # Prefer the COMPILER attribute as the top level attribute, for
-        # readability of the merged file.
-        if any("COMPILER" in setting.conditions for setting in settings):
-            condition = "COMPILER"
-        else:
-            # To make merging more effective, sort the conditions.
-            all_conditions = []
-            for setting in settings:
-                all_conditions += setting.conditions.keys()
-            if all_conditions:
-                condition = sorted(all_conditions)[0]
-        if condition is None:
-            # If there are no conditions, we have reached a leaf.
-            # We combine whatever settings are left; there should be at
-            # most one non-appending setting, or an arbitrary number of
-            # appending settings.
-            self._is_leaf = True
-            self._assignments = []
-            self._set_up = []
-            self._tear_down = []
-            self._do_append = True
-            for setting in settings:
-                if not setting.do_append:
-                    self._do_append = False
-                    assert len(settings) == 1, \
-                        "Internal error in macros: An ambiguity was " \
-                        "found after the ambiguity check was complete, " \
-                        "or there is a mixture of appending and initial " \
-                        "settings in the condition tree."
-                self._assignments.append((name, setting.value))
-                self._set_up += setting.set_up
-                self._tear_down += setting.tear_down
-        else:
-            # If a condition was found, partition the settings depending on
-            # how they use it, and recursively create a tree for each
-            # partition.
-            self._is_leaf = False
-            self._condition = condition
-            partition = dict()
-            for setting in settings:
-                # If some of the settings don't use a condition, we use
-                # None to represent that.
-                cond_val = setting.conditions.pop(condition, None)
-                if cond_val in partition:
-                    partition[cond_val].append(setting)
-                else:
-                    partition[cond_val] = [setting]
-            branches = dict()
-            for cond_val in partition:
-                branches[cond_val] = \
-                            MacroConditionTree(name, partition[cond_val])
-            self._branches = branches
-
-    # pylint shouldn't concern itself with the way that we access other, since
-    # it's actually a member of the same class.
-    # pylint:disable=protected-access
-    def merge(self, other):
-        """Merge another tree with this one.
-
-        This should be considered destructive to both trees. The only valid
-        value is the one that's returned.
-        """
-        if self._is_leaf:
-            if other._is_leaf:
-                assert self._do_append == other._do_append, \
-                    "Internal error in macros: Tried to merge an " \
-                    "appending tree with a tree containing initial "\
-                    "settings."
-                # If both are leaves, just merge the values.
-                self._assignments += other._assignments
-                self._set_up += other._set_up
-                self._tear_down += other._tear_down
-                return self
-            else:
-                # If other is not a leaf, swap the arguments so that self
-                # is the one that's not a leaf, handled below.
-                return other.merge(self)
-        else:
-            # If self is not a leaf but other is, it should go in
-            # self._branches[None]. The same goes for the case where the
-            # conditions don't match, and self._condition is last
-            # alphabetically.
-            if other._is_leaf or self._condition > other._condition:
-                if None in self._branches:
-                    self._branches[None] = self._branches[None].merge(other)
-                else:
-                    self._branches[None] = other
-                return self
-            else:
-                # If the other condition comes last alphabetically, swap
-                # the order.
-                if self._condition < other._condition:
-                    return other.merge(self)
-                # If neither is a leaf and their conditions match, merge
-                # their sets of branches.
-                for (cond_val, other_branch) in other._branches.items():
-                    if cond_val in self._branches:
-                        self._branches[cond_val] = \
-                            self._branches[cond_val].merge(other_branch)
-                    else:
-                        self._branches[cond_val] = other_branch
-                return self
-    # pylint:enable=protected-access
-
-    def write_out(self, writer):
-        """Write tree to file.
-
-        The writer argument is an object inheriting from MacroWriterBase.
-        This function first writes out all the initial settings with
-        appropriate conditionals, then the appending settings.
-        """
-        if self._is_leaf:
-            for line in self._set_up:
-                writer.write_line(line)
-            for (name, value) in self._assignments:
-                if self._do_append:
-                    writer.append_variable(name, value)
-                else:
-                    writer.set_variable(name, value)
-            for line in self._tear_down:
-                writer.write_line(line)
-        else:
-            condition = self._condition
-            # Take care of the settings that don't use this condition.
-            if None in self._branches:
-                self._branches[None].write_out(writer)
-            # Now all the if statements.
-            for cond_val in self._branches:
-                if cond_val is None:
-                    continue
-                env_ref = writer.environment_variable_string(condition)
-                writer.start_ifeq(env_ref, cond_val)
-                self._branches[cond_val].write_out(writer)
-                writer.end_ifeq()
-
-
-def _merge_optional_trees(tree, big_tree):
-    """Merge two MacroConditionTrees when one or both objects may be `None`."""
-    if tree is not None:
-        if big_tree is None:
-            return tree
-        else:
-            return big_tree.merge(tree)
-    else:
-        return big_tree
-
-
-class CompilerBlock(object):
-
-    """Data used to translate a single <compiler> element.
-
-    This is used during write_macros to traverse the XML and create a list
-    of settings specified in the element.
-
-    Public methods:
-    add_settings_to_lists
-    matches_machine
-    """
-
-    def __init__(self, writer, compiler_elem, machobj):
-        """Construct a CompilerBlock.
-
-        Arguments:
-        writer - The Makefile/CMake writer object.
-        compiler_elem - An xml.ElementTree.Element corresponding to this
-                        <compiler> element.
-        machobj - Machines object for this machine.
-        """
-        self._writer = writer
-        self._compiler_elem = compiler_elem
-        self._machobj = machobj
-        # If there's no COMPILER attribute, self._compiler is None.
-        self._compiler = compiler_elem.get("COMPILER")
-        self._specificity = 0
-
-    def _handle_references(self, elem, set_up, tear_down, depends):
-        """Expand markup used internally.
-
-        This function is responsible for expanding <env>, <var>, and
-        <shell> tags into Makefile/CMake syntax.
-
-        Arguments:
-        elem - An ElementTree.Element containing text to expand.
-        set_up - A list to add any preparation commands to.
-        tear_down - A list to add any cleanup commands to.
-        depends - A set of variables that need to be set before this one.
-
-        Note that while the return value of this function is the expanded
-        text, the set_up, tear_down, and depends variables are also
-        modified and thus serve as additional outputs.
-        """
-        writer = self._writer
-        output = elem.text
-        if output is None:
-            output = ""
-        for child in elem:
-            if child.tag == "env":
-                # <env> tags just need to be expanded by the writer.
-                output += writer.environment_variable_string(child.text)
-            elif child.tag == "shell":
-                # <shell> tags can contain other tags, so handle those.
-                command = self._handle_references(child, set_up, tear_down,
-                                                  depends)
-                new_set_up, inline, new_tear_down = \
-                                    writer.shell_command_strings(command)
-                output += inline
-                if new_set_up is not None:
-                    set_up.append(new_set_up)
-                if new_tear_down is not None:
-                    tear_down.append(new_tear_down)
-            elif child.tag == "var":
-                # <var> commands also need expansion by the writer, and can
-                # add dependencies.
-                var_name = child.text
-                output += writer.variable_string(var_name)
-                depends.add(var_name)
-            else:
-                expect(False,
-                       "Unexpected tag "+child.tag+" encountered in "
-                       "config_build.xml. Check that the file is valid "
-                       "according to the schema.")
-            if child.tail is not None:
-                output += child.tail
-        return output
-
-    def _elem_to_setting(self, elem):
-        """Take an element and convert it to a ValueSetting.
-
-        Arguments:
-        elem - An ElementTree.Element with data to add.
-
-        This function returns a tuple containing a ValueSetting
-        corresponding to the element, along with a set of names of
-        variables that this setting depends on.
-        """
-        # Attributes on an element are the conditions on that element.
-        conditions = dict(elem.items())
-        if self._compiler is not None:
-            conditions["COMPILER"] = self._compiler
-        # Deal with internal markup.
-        set_up = []
-        tear_down = []
-        depends = set()
-        value_text = self._handle_references(elem, set_up,
-                                             tear_down, depends)
-        # Create the setting object.
-        setting = ValueSetting(value_text, elem.tag == "append",
-                               conditions, set_up, tear_down)
-        return (setting, depends)
-
-    def _add_elem_to_lists(self, name, elem, value_lists):
-        """Add an element's data to an appropriate list of value settings.
-
-        Arguments:
-        name - The name of the variable being set by this element.
-        elem - The element to translate into a ValueSetting.
-        value_lists - A dictionary of PossibleValues, containing the lists
-                      of all settings for each variable.
-        """
-        # Skip this if the element's MPILIB is not valid.
-        if "MPILIB" in elem.keys() and \
-           not self._machobj.is_valid_MPIlib(elem.get("MPILIB")):
-            return
-        setting, depends = self._elem_to_setting(elem)
-        if name not in value_lists:
-            value_lists[name] = PossibleValues(name, setting,
-                                               self._specificity, depends)
-        else:
-            value_lists[name].add_setting(setting, self._specificity,
-                                          depends)
-
-    def add_settings_to_lists(self, flag_vars, value_lists):
-        """Add all data in the <compiler> element to lists of settings.
-
-        Arguments:
-        flag_vars - A set of variables containing "flag-like" data.
-        value_lists - A dictionary of PossibleValues, containing the lists
-                      of all settings for each variable.
-        """
-        for elem in self._compiler_elem:
-            # Deal with "flag"-type variables.
-            if elem.tag in flag_vars:
-                for child in elem:
-                    self._add_elem_to_lists(elem.tag, child, value_lists)
-            else:
-                self._add_elem_to_lists(elem.tag, elem, value_lists)
-
-    def matches_machine(self):
-        """Check whether this block matches a machine/os.
-
-        This also sets the specificity of the block, so this must be called
-        before add_settings_to_lists if machine-specific output is needed.
-        """
-        self._specificity = 0
-        if "MACH" in self._compiler_elem.keys():
-            if self._machobj.get_machine_name() == \
-               self._compiler_elem.get("MACH"):
-                self._specificity += 2
-            else:
-                return False
-        if "OS" in self._compiler_elem.keys():
-            if self._machobj.get_value("OS") == self._compiler_elem.get("OS"):
-                self._specificity += 1
-            else:
-                return False
-        # Check if the compiler is valid on this machine.
-        if self._compiler is not None:
-            return self._machobj.is_valid_compiler(self._compiler)
-        else:
-            return True
-
-
-class Build(object):
-
-    """Class to convert config_build.xml input into a macros file.
-
-    Public attributes:
-    os - Operating system used in config_build lookup and ranking.
-    machobj - Machines object used in config_build lookup.
-    flag_vars - A set of all variables in config_build that contain "flag-
-                like" data (i.e. a space-separated list of arguments).
-
-    Public methods:
-    write_macros
-    """
-
-    def __init__(self, machobj, schema_path=None):
-        """Construct a Build given machine-specific information.
-
-        In the process some information about possible variables is read in
-        from the schema file.
-
-        Arguments:
-        machobj - A Machines object for this machine.
-        schema_path (optional) - Path to config_build.xsd within CIME.
-
-        >>> "CFLAGS" in Build('MyMach').flag_vars
-        True
-        >>> "MPICC" in Build('MyMach').flag_vars
-        False
-        """
-        self.machobj = machobj
-
-        # The schema is used to figure out which variables contain
-        # command-line arguments (e.g. compiler flags), since these are
-        # processed in a more complex manner than other variables.
-        if schema_path is None:
-            schema_path = os.path.join(get_cime_root(), "cime_config",
-                                       "xml_schemas", "config_build.xsd")
-
-        # Run an XPath query to extract the list of flag variable names.
-        ns = {"xs": "http://www.w3.org/2001/XMLSchema"}
-        flag_xpath = ".//xs:group[@name='compilerVars']/xs:choice/xs:element[@type='flagsVar']"
-        flag_elems = ET.parse(schema_path).getroot().findall(flag_xpath, ns)
-        self.flag_vars = set(elem.get('name') for elem in flag_elems)
-
-    def write_macros(self, build_system, xml_file, output):
-        """Write a Macros file for this machine.
-
-        Arguments:
-        build_system - Format of the file to be written. Currently the only
-                       valid values are "Makefile" and "CMake".
-        xml_file - File name or file object containing the config_build
-                   specification of machine-specific settings.
-        output - Text I/O object (inheriting from io.TextIOBase) that
-                 output should be written to. Typically, this will be the
-                 Macros file, opened for writing.
-        """
-        # Set up writer for this build system.
-        if build_system == "Makefile":
-            writer = MakeMacroWriter(output)
-        elif build_system == "CMake":
-            writer = CMakeMacroWriter(output)
-        else:
-            expect(False,
-                   "Unrecognized build system provided to write_macros: " +
-                   build_system)
-
-        # Start processing the file.
-        value_lists = dict()
-        for compiler_elem in ET.parse(xml_file).findall("compiler"):
-            block = CompilerBlock(writer, compiler_elem, self.machobj)
-            # If this block matches machine settings, use it.
-            if block.matches_machine():
-                block.add_settings_to_lists(self.flag_vars, value_lists)
-
-        # Now that we've scanned through the input, output the variable
-        # settings.
-        vars_written = set()
-        while value_lists:
-            # Variables that are ready to be written.
-            ready_variables = [
-                var_name for var_name in value_lists.keys()
-                if value_lists[var_name].depends <= vars_written
-            ]
-            expect(len(ready_variables) > 0,
-                   "The config_build XML has bad <var> references. "
-                   "Check for circular references or variables that "
-                   "are in a <var> tag but not actually defined.")
-            big_normal_tree = None
-            big_append_tree = None
-            for var_name in ready_variables:
-                # Note that we're writing this variable.
-                vars_written.add(var_name)
-                # Make the conditional trees and write them out.
-                normal_tree, append_tree = \
-                    value_lists[var_name].to_cond_trees()
-                big_normal_tree = _merge_optional_trees(normal_tree,
-                                                        big_normal_tree)
-                big_append_tree = _merge_optional_trees(append_tree,
-                                                        big_append_tree)
-                # Remove this variable from the list of variables to handle
-                # next iteration.
-                del value_lists[var_name]
-            if big_normal_tree is not None:
-                big_normal_tree.write_out(writer)
-            if big_append_tree is not None:
-                big_append_tree.write_out(writer)
diff --git a/utils/python/CIME/XML/compilerblock.py b/utils/python/CIME/XML/compilerblock.py
new file mode 100644
index 00000000000..ee27a154f75
--- /dev/null
+++ b/utils/python/CIME/XML/compilerblock.py
@@ -0,0 +1,232 @@
+"""
+Classes used to build the CIME Macros file.
+
+The main "public" class here is Build. It is initialized with machine-specific
+information, and its write_macros method is the driver for translating the
+config_build.xml file into a Makefile or CMake-format Macros file.
+
+For developers, here's the role of the other classes in the process:
+
+- A CompilerBlock is responsible for translating the XML code in a <compiler>
+  tag into Python data structures.
+
+- A PossibleValues object keeps track of all the settings that could affect a
+  particular variable, and is the main way that these settings are stored.
+
+- A MacroConditionTree is the structure that is responsible for writing out the
+  settings. While the PossibleValues objects are organized by variable name, the
+  MacroConditionTree is organized by conditional blocks, and thus roughly
+  plays the role of a syntax tree corresponding to the Makefile/CMake output.
+
+In more detail:
+
+- Build.write_macros immediately creates a MakeMacroWriter or CMakeMacroWriter
+  to translate strings for the build system.
+
+- It also creates value_lists, a dictionary of PossibleValues objects, with
+  variable names as the keys. Each variable has a single PossibleValues object
+  associated with it.
+
+- For each <compiler> element, Build.write_macros creates a CompilerBlock
+  instance. This object is responsible for translating the XML in its block, in
+  order to populate the PossibleValues instances. This includes handling the
+  <var>/<env>/<shell> tags, and keeping track of dependencies induced by one
+  variable referencing another's value.
+
+- The PossibleValues object holds the information about how one variable can be
+  set, based on various build options. It has two main roles:
+   1. As we iterate through the XML input file, each setting is added to the
+      relevant PossibleValues object. The PossibleValues object contains lists
+      of settings sorted by how machine-specific those settings are.
+   2. The PossibleValues object iterates through the list of settings to check
+      for ambiguities. E.g. if there is a setting for DEBUG=TRUE, and another
+      setting for MPILIB=mpi-serial, it is ambiguous in the case where both
+      conditions hold.
+
+- A ValueSetting object is a simple struct that a setting from the XML file is
+  translated to. The lists in the PossibleValues class contain these objects.
+
+- Once the XML has all been read in and the PossibleValues objects are
+  populated, the dependencies among variables are checked in Build.write_macros.
+  For each variable, if all its dependencies have been handled, it is converted
+  to a MacroConditionTree merged with all other trees for variables that are
+  ready, and written out. Then we loop through the variable list again to check
+  for variables whose dependencies are all handled.
+
+- The MacroConditionTree acts as a primitive syntax tree. Its __init__ method
+  reorganizes the data into conditional blocks, and its write_out method writes
+  uses the MakeMacroWriter/CMakeMacroWrite object to write to the Macros file.
+  MacroConditionTree objects can be merged to reduce the length of the output.
+"""
+
+# These don't seem to be particularly useful checks.
+# pylint: disable=invalid-name,too-few-public-methods,unused-wildcard-import
+# pylint: disable=wildcard-import
+
+from CIME.XML.standard_module_setup import *
+from CIME.BuildTools.valuesetting import ValueSetting
+from CIME.BuildTools.possiblevalues import PossibleValues
+
+class CompilerBlock(object):
+
+    """Data used to translate a single <compiler> element.
+
+    This is used during write_macros to traverse the XML and create a list
+    of settings specified in the element.
+
+    Public methods:
+    add_settings_to_lists
+    matches_machine
+    """
+
+    def __init__(self, writer, compiler_elem, machobj):
+        """Construct a CompilerBlock.
+
+        Arguments:
+        writer - The Makefile/CMake writer object.
+        compiler_elem - An xml.ElementTree.Element corresponding to this
+                        <compiler> element.
+        machobj - Machines object for this machine.
+        """
+        self._writer = writer
+        self._compiler_elem = compiler_elem
+        self._machobj = machobj
+        # If there's no COMPILER attribute, self._compiler is None.
+        self._compiler = compiler_elem.get("COMPILER")
+        self._specificity = 0
+
+    def _handle_references(self, elem, set_up, tear_down, depends):
+        """Expand markup used internally.
+
+        This function is responsible for expanding <env>, <var>, and
+        <shell> tags into Makefile/CMake syntax.
+
+        Arguments:
+        elem - An ElementTree.Element containing text to expand.
+        set_up - A list to add any preparation commands to.
+        tear_down - A list to add any cleanup commands to.
+        depends - A set of variables that need to be set before this one.
+
+        Note that while the return value of this function is the expanded
+        text, the set_up, tear_down, and depends variables are also
+        modified and thus serve as additional outputs.
+        """
+        writer = self._writer
+        output = elem.text
+        if output is None:
+            output = ""
+        for child in elem:
+            if child.tag == "env":
+                # <env> tags just need to be expanded by the writer.
+                output += writer.environment_variable_string(child.text)
+            elif child.tag == "shell":
+                # <shell> tags can contain other tags, so handle those.
+                command = self._handle_references(child, set_up, tear_down,
+                                                  depends)
+                new_set_up, inline, new_tear_down = \
+                                    writer.shell_command_strings(command)
+                output += inline
+                if new_set_up is not None:
+                    set_up.append(new_set_up)
+                if new_tear_down is not None:
+                    tear_down.append(new_tear_down)
+            elif child.tag == "var":
+                # <var> commands also need expansion by the writer, and can
+                # add dependencies.
+                var_name = child.text
+                output += writer.variable_string(var_name)
+                depends.add(var_name)
+            else:
+                expect(False,
+                       "Unexpected tag "+child.tag+" encountered in "
+                       "config_build.xml. Check that the file is valid "
+                       "according to the schema.")
+            if child.tail is not None:
+                output += child.tail
+        return output
+
+    def _elem_to_setting(self, elem):
+        """Take an element and convert it to a ValueSetting.
+
+        Arguments:
+        elem - An ElementTree.Element with data to add.
+
+        This function returns a tuple containing a ValueSetting
+        corresponding to the element, along with a set of names of
+        variables that this setting depends on.
+        """
+        # Attributes on an element are the conditions on that element.
+        conditions = dict(elem.items())
+        if self._compiler is not None:
+            conditions["COMPILER"] = self._compiler
+        # Deal with internal markup.
+        set_up = []
+        tear_down = []
+        depends = set()
+        value_text = self._handle_references(elem, set_up,
+                                             tear_down, depends)
+        # Create the setting object.
+        setting = ValueSetting(value_text, elem.tag == "append",
+                               conditions, set_up, tear_down)
+        return (setting, depends)
+
+    def _add_elem_to_lists(self, name, elem, value_lists):
+        """Add an element's data to an appropriate list of value settings.
+
+        Arguments:
+        name - The name of the variable being set by this element.
+        elem - The element to translate into a ValueSetting.
+        value_lists - A dictionary of PossibleValues, containing the lists
+                      of all settings for each variable.
+        """
+        # Skip this if the element's MPILIB is not valid.
+        if "MPILIB" in elem.keys() and \
+           not self._machobj.is_valid_MPIlib(elem.get("MPILIB")):
+            return
+        setting, depends = self._elem_to_setting(elem)
+        if name not in value_lists:
+            value_lists[name] = PossibleValues(name, setting,
+                                               self._specificity, depends)
+        else:
+            value_lists[name].add_setting(setting, self._specificity,
+                                          depends)
+
+    def add_settings_to_lists(self, flag_vars, value_lists):
+        """Add all data in the <compiler> element to lists of settings.
+
+        Arguments:
+        flag_vars - A set of variables containing "flag-like" data.
+        value_lists - A dictionary of PossibleValues, containing the lists
+                      of all settings for each variable.
+        """
+        for elem in self._compiler_elem:
+            # Deal with "flag"-type variables.
+            if elem.tag in flag_vars:
+                for child in elem:
+                    self._add_elem_to_lists(elem.tag, child, value_lists)
+            else:
+                self._add_elem_to_lists(elem.tag, elem, value_lists)
+
+    def matches_machine(self):
+        """Check whether this block matches a machine/os.
+
+        This also sets the specificity of the block, so this must be called
+        before add_settings_to_lists if machine-specific output is needed.
+        """
+        self._specificity = 0
+        if "MACH" in self._compiler_elem.keys():
+            if self._machobj.get_machine_name() == \
+               self._compiler_elem.get("MACH"):
+                self._specificity += 2
+            else:
+                return False
+        if "OS" in self._compiler_elem.keys():
+            if self._machobj.get_value("OS") == self._compiler_elem.get("OS"):
+                self._specificity += 1
+            else:
+                return False
+        # Check if the compiler is valid on this machine.
+        if self._compiler is not None:
+            return self._machobj.is_valid_compiler(self._compiler)
+        else:
+            return True
diff --git a/utils/python/CIME/XML/compilers.py b/utils/python/CIME/XML/compilers.py
index 68bd76f531d..19a603b1dd9 100644
--- a/utils/python/CIME/XML/compilers.py
+++ b/utils/python/CIME/XML/compilers.py
@@ -5,12 +5,17 @@
 from CIME.XML.standard_module_setup import *
 from CIME.XML.generic_xml import GenericXML
 from CIME.XML.files import Files
+from CIME.XML.compilerblock import CompilerBlock
+from CIME.BuildTools.macrowriterbase import write_macros_file_v1
+from CIME.BuildTools.makemacroswriter import MakeMacroWriter
+from CIME.BuildTools.cmakemacroswriter import CMakeMacroWriter
+from CIME.BuildTools.macroconditiontree import merge_optional_trees
 
 logger = logging.getLogger(__name__)
 
 class Compilers(GenericXML):
 
-    def __init__(self, compiler=None, machine=None, os_= None, mpilib=None, infile=None, files=None):
+    def __init__(self, machobj, infile=None, compiler=None, mpilib=None, files=None):
         """
         initialize an object
         """
@@ -18,14 +23,22 @@ def __init__(self, compiler=None, machine=None, os_= None, mpilib=None, infile=N
             if files is None:
                 files = Files()
             infile = files.get_value("COMPILERS_SPEC_FILE")
+            schema = files.get_schema("COMPILERS_SPEC_FILE")
+
+        GenericXML.__init__(self, infile, schema)
+        self._machobj = machobj
+        self._version = self.get_version()
+
+        self.machine  = machobj.get_machine_name()
+        self.os = machobj.get_value("OS")
+        if mpilib is None:
+            mpilib = machobj.get_default_MPIlib()
+        self.mpilib = mpilib
+        if compiler is None:
+            compiler = machobj.get_default_compiler()
+        self.compiler       = compiler
 
-        GenericXML.__init__(self, infile)
-
-        self.machine        = machine
-        self.os             = os_
-        self.mpilib         = mpilib
         self.compiler_nodes = None # Listed from last to first
-        self.compiler       = compiler
         #Append the contents of $HOME/.cime/config_compilers.xml if it exists
         #This could cause problems if node matchs are repeated when only one is expected
         infile = os.path.join(os.environ.get("HOME"),".cime","config_compilers.xml")
@@ -35,6 +48,14 @@ def __init__(self, compiler=None, machine=None, os_= None, mpilib=None, infile=N
         if self.compiler is not None:
             self.set_compiler(compiler)
 
+        if self._version != "1.0":
+            # Run an XPath query to extract the list of flag variable names.
+            ns = {"xs": "http://www.w3.org/2001/XMLSchema"}
+            flag_xpath = ".//xs:group[@name='compilerVars']/xs:choice/xs:element[@type='flagsVar']"
+            flag_elems = ET.parse(schema).getroot().findall(flag_xpath, ns)
+            self.flag_vars = set(elem.get('name') for elem in flag_elems)
+
+
 
     def get_compiler(self):
         """
@@ -64,10 +85,10 @@ def _is_compatible(self, compiler_node, compiler, machine, os_, mpilib):
     def set_compiler(self, compiler, machine=None, os_=None, mpilib=None):
         """
         Sets the compiler block in the Compilers object
-
-        >>> machobj = Compilers(machine="melvin")
-        >>> machobj.set_compiler("gnu")
-        >>> machobj.get_compiler()
+        >>> from CIME.XML.machines import Machines
+        >>> compobj = Compilers(Machines(machine="melvin"))
+        >>> compobj.set_compiler("gnu")
+        >>> compobj.get_compiler()
         'gnu'
         """
         machine = machine if machine else self.machine
@@ -112,123 +133,100 @@ def get_value(self, name, attribute=None, resolved=True, subgroup=None):
 
         return value
 
-    def write_macros_file(self, macros_file="Macros", output_format="make"):
-        """
-        Parse the config_compiler.xml file into a Macros file for the
-        given machine and compiler.
-        """
-
-        # Parse the xml settings into the $macros hash structure
-        # put conditional settings in the _COND_ portion of the hash
-        # and handle them seperately
-        macros = {"_COND_" : {}}
-
-        # Do worst matches first
-        for compiler_node in reversed(self.compiler_nodes):
-            _add_to_macros(compiler_node, macros)
-
-        # A few things can be used from environ if not in XML
-        for item in ["MPI_PATH", "NETCDF_PATH"]:
-            if not item in macros and item in os.environ:
-                logger.warn("Setting %s from Environment" % item)
-                macros[item] = os.environ[item]
-
-        with open(macros_file, "w") as fd:
-            fd.write(
-"""#
-# COMPILER=%s
-# OS=%s
-# MACH=%s
-""" % (self.compiler, self.os, self.machine)
-)
+    def write_macros_file(self, macros_file="Macros", output_format="make", xml=None):
+        if self._version == "1.0":
+            # Parse the xml settings into the $macros hash structure
+            # put conditional settings in the _COND_ portion of the hash
+            # and handle them seperately
+            macros = {"_COND_" : {}}
+
+            # Do worst matches first
+            for compiler_node in reversed(self.compiler_nodes):
+                _add_to_macros(compiler_node, macros)
+            write_macros_file_v1(macros, self.compiler, self.os,
+                                        self.machine, macros_file,
+                                        output_format)
+        else:
             if output_format == "make":
-                fd.write("#\n# Makefile Macros generated from %s \n#\n" % self.filename)
+                format_ = "Makefile"
+            elif output_format == "cmake":
+                format_ = "CMake"
+            else:
+                format_ = output_format
+            
+            if isinstance(macros_file, basestring):
+                with open(macros_file, "w") as macros:
+                    self._write_macros_file_v2(format_, macros)
+            else:
+                self._write_macros_file_v2(format_, macros_file, xml)
 
-                # print the settings out to the Macros file
-                for key, value in sorted(macros.iteritems()):
-                    if key == "_COND_":
-                        pass
-                    elif key.startswith("ADD_"):
-                        fd.write("%s+=%s\n\n" % (key[4:], value))
-                    else:
-                        fd.write("%s:=%s\n\n" % (key, value))
+    def _write_macros_file_v2(self, build_system, output, xml=None):
+        """Write a Macros file for this machine.
 
-            elif output_format == "cmake":
-                fd.write(
-'''#
-# cmake Macros generated from $compiler_file
-#
-include(Compilers)
-set(CMAKE_C_FLAGS_RELEASE "" CACHE STRING "Flags used by c compiler." FORCE)
-set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Flags used by c compiler." FORCE)
-set(CMAKE_Fortran_FLAGS_RELEASE "" CACHE STRING "Flags used by Fortran compiler." FORCE)
-set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Flags used by Fortran compiler." FORCE)
-set(all_build_types "None Debug Release RelWithDebInfo MinSizeRel")
-set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "Choose the type of build, options are: ${all_build_types}." FORCE)
-''')
-
-            # print the settings out to the Macros file, do it in
-            # two passes so that path values appear first in the
-            # file.
-                for key, value in sorted(macros.iteritems()):
-                    if key == "_COND_":
-                        pass
-                    else:
-                        value = value.replace("(", "{").replace(")", "}")
-                        if key.endswith("_PATH"):
-                            fd.write("set(%s %s)\n" % (key, value))
-                            fd.write("list(APPEND CMAKE_PREFIX_PATH %s)\n\n" % value)
-
-                for key, value in sorted(macros.iteritems()):
-                    if key == "_COND_":
-                        pass
-                    else:
-                        value = value.replace("(", "{").replace(")", "}")
-                        if "CFLAGS" in key:
-                            fd.write("add_flags(CMAKE_C_FLAGS %s)\n\n" % value)
-                        elif "FFLAGS" in key:
-                            fd.write("add_flags(CMAKE_Fortran_FLAGS %s)\n\n" % value)
-                        elif "CPPDEFS" in key:
-                            fd.write("list(APPEND COMPILE_DEFINITIONS %s)\n\n" % value)
-                        elif "SLIBS" in key or "LDFLAGS" in key:
-                            fd.write("add_flags(CMAKE_EXE_LINKER_FLAGS %s)\n\n" % value)
-
-            # Recursively print the conditionals, combining tests to avoid repetition
-            _parse_hash(macros["_COND_"], fd, 0, output_format)
-
-
-def _parse_hash(macros, fd, depth, output_format, cmakedebug=""):
-    width = 2 * depth
-    for key, value in macros.iteritems():
-        if type(value) is dict:
-            if output_format == "make" or "DEBUG" in key:
-                for key2, value2 in value.iteritems():
-                    if output_format == "make":
-                        fd.write("%sifeq ($(%s), %s) \n" % (" " * width, key, key2))
-
-                    _parse_hash(value2, fd, depth + 1, output_format, key2)
+        Arguments:
+        build_system - Format of the file to be written. Currently the only
+                       valid values are "Makefile" and "CMake".
+        output - Text I/O object (inheriting from io.TextIOBase) that
+                 output should be written to. Typically, this will be the
+                 Macros file, opened for writing.
+        """
+        # Set up writer for this build system.
+        if build_system == "Makefile":
+            writer = MakeMacroWriter(output)
+        elif build_system == "CMake":
+            writer = CMakeMacroWriter(output)
         else:
-            if output_format == "make":
-                if key.startswith("ADD_"):
-                    fd.write("%s %s += %s\n" % (" " * width, key[4:], value))
-                else:
-                    fd.write("%s %s += %s\n" % (" " * width, key, value))
+            expect(False,
+                   "Unrecognized build system provided to write_macros: " +
+                   build_system)
+
+        # Start processing the file.
+        value_lists = dict()
+        node_list = []
+        if xml is None:
+            node_list = self.get_nodes("compiler")
+        else:
+            node_list = ET.parse(xml).findall("compiler")
+
+        for compiler_elem in node_list:
+            block = CompilerBlock(writer, compiler_elem, self._machobj)
+            # If this block matches machine settings, use it.
+            if block.matches_machine():
+                block.add_settings_to_lists(self.flag_vars, value_lists)
+        # Now that we've scanned through the input, output the variable
+        # settings.
+        vars_written = set()
+        while value_lists:
+            # Variables that are ready to be written.
+            ready_variables = [
+                var_name for var_name in value_lists.keys()
+                if value_lists[var_name].depends <= vars_written
+            ]
+            expect(len(ready_variables) > 0,
+                   "The config_build XML has bad <var> references. "
+                   "Check for circular references or variables that "
+                   "are in a <var> tag but not actually defined.")
+            big_normal_tree = None
+            big_append_tree = None
+            for var_name in ready_variables:
+                # Note that we're writing this variable.
+                vars_written.add(var_name)
+                # Make the conditional trees and write them out.
+                normal_tree, append_tree = \
+                    value_lists[var_name].to_cond_trees()
+                big_normal_tree = merge_optional_trees(normal_tree,
+                                                        big_normal_tree)
+                big_append_tree = merge_optional_trees(append_tree,
+                                                        big_append_tree)
+                # Remove this variable from the list of variables to handle
+                # next iteration.
+                del value_lists[var_name]
+            if big_normal_tree is not None:
+                big_normal_tree.write_out(writer)
+            if big_append_tree is not None:
+                big_append_tree.write_out(writer)
+
 
-            else:
-                value = value.replace("(", "{").replace(")", "}")
-                release = "DEBUG" if "TRUE" in cmakedebug else "RELEASE"
-                if "CFLAGS" in key:
-                    fd.write("add_flags(CMAKE_C_FLAGS_%s %s)\n\n" % (release, value))
-                elif "FFLAGS" in key:
-                    fd.write("add_flags(CMAKE_Fortran_FLAGS_%s %s)\n\n" % (release, value))
-                elif "CPPDEF" in key:
-                    fd.write("add_config_definitions(%s %s)\n\n" % (release, value))
-                elif "SLIBS" in key or "LDFLAGS" in key:
-                    fd.write("add_flags(CMAKE_EXE_LINKER_FLAGS_%s %s)\n\n" % (release, value))
-
-    width -= 2
-    if output_format == "make" and depth > 0:
-        fd.write("%sendif\n\n" % (" " * width))
 
 def _add_to_macros(node, macros):
     for child in node:
diff --git a/utils/python/CIME/XML/env_mach_specific.py b/utils/python/CIME/XML/env_mach_specific.py
index 0504447eeea..03b71a07bab 100644
--- a/utils/python/CIME/XML/env_mach_specific.py
+++ b/utils/python/CIME/XML/env_mach_specific.py
@@ -158,7 +158,6 @@ def list_modules(self):
     def make_env_mach_specific_file(self, compiler, debug, mpilib, shell):
         modules_to_load = self._get_modules_for_case(compiler, debug, mpilib)
         envs_to_set = self._get_envs_for_case(compiler, debug, mpilib)
-
         filename = ".env_mach_specific.%s" % shell
         lines = []
         if modules_to_load is not None:
@@ -245,7 +244,7 @@ def _load_module_modules(self, modules_to_load):
         for cmd in self._get_module_commands(modules_to_load, "python"):
             logger.debug("module command is %s"%cmd)
             stat, py_module_code, errout = run_cmd(cmd)
-            expect(stat==0 and len(errout) == 0, 
+            expect(stat==0 and len(errout) == 0,
                    "module command %s failed with message:\n%s"%(cmd,errout))
             exec(py_module_code)
 
@@ -416,4 +415,3 @@ def get_mpirun(self, case, attribs, check_members=None, job="case.run"):
         executable = exec_node.text
 
         return executable, args
-
diff --git a/utils/python/CIME/case.py b/utils/python/CIME/case.py
index e45fc10c21f..4dde1f94901 100644
--- a/utils/python/CIME/case.py
+++ b/utils/python/CIME/case.py
@@ -11,7 +11,6 @@
 from CIME.utils                     import expect, get_cime_root, append_status
 from CIME.utils                     import convert_to_type, get_model, get_project
 from CIME.utils                     import get_build_threaded, get_current_commit
-from CIME.XML.build                 import Build
 from CIME.XML.machines              import Machines
 from CIME.XML.pes                   import Pes
 from CIME.XML.files                 import Files
@@ -812,42 +811,6 @@ def _create_caseroot_tools(self):
             except Exception as e:
                 logger.warning("FAILED to set up toolfiles: %s %s %s" % (str(e), toolfile, destfile))
 
-        # Create Macros file.
-        machine = self.get_value("MACH")
-        files = Files()
-        # Use config_build if the environment variable is set, or if there is no
-        # config_compilers file.
-        if os.getenv("CIME_USE_CONFIG_BUILD") == "TRUE" or \
-           files.get_value("COMPILERS_SPEC_FILE") is None:
-            build_file = files.get_value("BUILD_SPEC_FILE")
-            machobj = Machines(machine=machine, files=files)
-            macro_maker = Build(machobj)
-            macros_path = os.path.join(self._caseroot, "Macros")
-            with open(macros_path, "w") as macros_file:
-                macro_maker.write_macros('Makefile', build_file, macros_file)
-
-        # Copy any system or compiler Depends files to the case.
-        compiler = self.get_value("COMPILER")
-        for dep in (machine, compiler):
-            dfile = "Depends.%s"%dep
-            if os.path.isfile(os.path.join(machines_dir,dfile)):
-                shutil.copyfile(os.path.join(machines_dir,dfile), os.path.join(self._caseroot,dfile))
-        dfile = "Depends.%s.%s"%(machine,compiler)
-        if os.path.isfile(os.path.join(machines_dir,dfile)):
-            shutil.copyfile(os.path.join(machines_dir,dfile), os.path.join(self._caseroot, dfile))
-            # set up infon files
-            # infofiles = os.path.join(os.path.join(toolsdir, README.post_process")
-            #FIXME - the following does not work
-            # print "DEBUG: infofiles are ",infofiles
-            #    try:
-            #        for infofile in infofiles:
-            #            print "DEBUG: infofile is %s, %s"  %(infofile, os.path.basename(infofile))
-            #            dst_file = caseroot + "/" + os.path.basename(infofile)
-            #            shutil.copyfile(infofile, dst_file)
-            #            os.chmod(dst_file, os.stat(dst_file).st_mode | stat.S_IXUSR | stat.S_IXGRP)
-            #    except Exception as e:
-            #        logger.warning("FAILED to set up infofiles: %s" % str(e))
-
     def _create_caseroot_sourcemods(self):
         components = self.get_compset_components()
         for component in components:
diff --git a/utils/python/CIME/case_setup.py b/utils/python/CIME/case_setup.py
index 57b3aa8fb5b..d5bab5e6b50 100644
--- a/utils/python/CIME/case_setup.py
+++ b/utils/python/CIME/case_setup.py
@@ -7,7 +7,8 @@
 from CIME.check_lockedfiles import check_lockedfiles
 from CIME.preview_namelists import create_dirs, create_namelists
 from CIME.XML.env_mach_pes  import EnvMachPes
-from CIME.XML.compilers     import Compilers
+from CIME.XML.machines      import Machines
+from CIME.BuildTools.configure import configure
 from CIME.utils             import append_status, get_cime_root
 from CIME.test_status       import *
 
@@ -145,18 +146,17 @@ def _case_setup_impl(case, caseroot, clean=False, test_mode=False, reset=False):
         case.load_env()
 
         models = case.get_values("COMP_CLASSES")
-
-        mach, compiler, debug, mpilib = \
-            case.get_value("MACH"), case.get_value("COMPILER"), case.get_value("DEBUG"), case.get_value("MPILIB")
+        mach = case.get_value("MACH")
+        compiler = case.get_value("COMPILER")
+        debug = case.get_value("DEBUG")
+        mpilib = case.get_value("MPILIB")
+        sysos = case.get_value("OS")
         expect(mach is not None, "xml variable MACH is not set")
 
-        # Create Macros file only if it does not exist
-        if not os.path.exists("Macros"):
-            logger.debug("Creating Macros file for %s" % mach)
-            compilers = Compilers(compiler=compiler, machine=mach, os_=case.get_value("OS"), mpilib=mpilib)
-            compilers.write_macros_file()
-        else:
-            logger.debug("Macros script already created ...skipping")
+        # creates the Macros.make, Depends.compiler, Depends.machine, Depends.machine.compiler
+        # and env_mach_specific.xml if they don't already exist.
+        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":
diff --git a/utils/python/CIME/macros_writers.py b/utils/python/CIME/macros_writers.py
deleted file mode 100644
index 78cc2f03a69..00000000000
--- a/utils/python/CIME/macros_writers.py
+++ /dev/null
@@ -1,326 +0,0 @@
-"""Classes used to write build system files.
-
-The classes here are used to write out settings for use by Makefile and CMake
-build systems. The two relevant classes are CMakeMacroWriter and
-MakeMacroWriter, which encapsulate the information necessary to write CMake and
-Makefile formatted text, respectively. See the docstrings for those classes for
-more.
-"""
-
-# This is not the most useful check.
-# pylint: disable=invalid-name
-
-from abc import ABCMeta, abstractmethod
-
-__all__ = ["CMakeMacroWriter", "MakeMacroWriter"]
-
-class MacroWriterBase(object):
-
-    """Abstract base class for macro file writers.
-
-    The methods here come in three flavors:
-    1. indent_left/indent_right change the level of indent used internally by
-       the class.
-    2. The various methods ending in "_string" return strings relevant to the
-       build system.
-    3. The other methods write information to the file handle associated with
-       an individual writer instance.
-
-    Public attributes:
-    indent_increment - Number of spaces to indent if blocks (does not apply
-                       to format-specific indentation, e.g. cases where
-                       Makefiles must use tabs).
-    output - File-like object that output is written to.
-
-    Public methods:
-    indent_string
-    indent_left
-    indent_right
-    write_line
-    environment_variable_string
-    shell_command_string
-    variable_string
-    set_variable
-    append_variable
-    start_ifeq
-    end_ifeq
-    """
-
-    __metaclass__ = ABCMeta
-
-    indent_increment = 2
-
-    def __init__(self, output):
-        """Initialize a macro writer.
-
-        Arguments:
-        output - File-like object (probably an io.TextIOWrapper), which
-                 will be written to.
-        """
-        self.output = output
-        self._indent_num = 0
-
-    def indent_string(self):
-        """Return an appropriate number of spaces for the indent."""
-        return ' ' * self._indent_num
-
-    def indent_left(self):
-        """Decrease the amount of line indent."""
-        self._indent_num -= 2
-
-    def indent_right(self):
-        """Increase the amount of line indent."""
-        self._indent_num += 2
-
-    def write_line(self, line):
-        """Write a single line of output, appropriately indented.
-
-        A trailing newline is added, whether or not the input has one.
-        """
-        self.output.write(unicode(self.indent_string() + line + "\n"))
-
-    @abstractmethod
-    def environment_variable_string(self, name):
-        """Return an environment variable reference."""
-        pass
-
-    @abstractmethod
-    def shell_command_strings(self, command):
-        """Return strings used to get the output of a shell command.
-
-        Implementations should return a tuple of three strings:
-        1. A line that is needed to get the output of the command (or None,
-           if a command can be run inline).
-        2. A string that can be used within a line to refer to the output.
-        3. A line that does any cleanup of temporary variables (or None, if
-           no cleanup is necessary).
-
-        Example usage:
-
-        # Get strings and write initial command.
-        (pre, var, post) = writer.shell_command_strings(command)
-        if pre is not None:
-            writer.write(pre)
-
-        # Use the variable to write an if block.
-        writer.start_ifeq(var, "TRUE")
-        writer.set_variable("foo", "bar")
-        writer.end_ifeq()
-
-        # Cleanup
-        if post is not None:
-            writer.write(post)
-        """
-        pass
-
-    @abstractmethod
-    def variable_string(self, name):
-        """Return a string to refer to a variable with the given name."""
-        pass
-
-    @abstractmethod
-    def set_variable(self, name, value):
-        """Write out a statement setting a variable to some value."""
-        pass
-
-    def append_variable(self, name, value):
-        """Write out a statement appending a value to a string variable."""
-        var_string = self.variable_string(name)
-        self.set_variable(name, var_string + " " + value)
-
-    @abstractmethod
-    def start_ifeq(self, left, right):
-        """Write out a statement to start a conditional block.
-
-        The arguments to this method are compared, and the block is entered
-        only if they are equal.
-        """
-        pass
-
-    @abstractmethod
-    def end_ifeq(self):
-        """Write out a statement to end a block started with start_ifeq."""
-        pass
-
-
-class MakeMacroWriter(MacroWriterBase):
-
-    """Macro writer for the Makefile format.
-
-    For details on the provided methods, see MacroWriterBase, which this
-    class inherits from.
-    """
-
-    def environment_variable_string(self, name):
-        """Return an environment variable reference.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> MakeMacroWriter(s).environment_variable_string("foo")
-        '$(foo)'
-        """
-        return "$(" + name + ")"
-
-    def shell_command_strings(self, command):
-        """Return strings used to get the output of a shell command.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> MakeMacroWriter(s).shell_command_strings("echo bar")
-        (None, '$(shell echo bar)', None)
-        """
-        return (None, "$(shell " + command + ")", None)
-
-    def variable_string(self, name):
-        """Return a string to refer to a variable with the given name.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> MakeMacroWriter(s).variable_string("foo")
-        '$(foo)'
-        """
-        return "$(" + name + ")"
-
-    def set_variable(self, name, value):
-        """Write out a statement setting a variable to some value.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> MakeMacroWriter(s).set_variable("foo", "bar")
-        >>> s.getvalue()
-        u'foo := bar\\n'
-        """
-        # Note that ":=" is used so that we can control the behavior for
-        # both Makefile and CMake variables similarly.
-        self.write_line(name + " := " + value)
-
-    def start_ifeq(self, left, right):
-        """Write out a statement to start a conditional block.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> MakeMacroWriter(s).start_ifeq("foo", "bar")
-        >>> s.getvalue()
-        u'ifeq (foo,bar)\\n'
-        """
-        self.write_line("ifeq (" + left + "," + right + ")")
-        self.indent_right()
-
-    def end_ifeq(self):
-        """Write out a statement to end a block started with start_ifeq.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> writer = MakeMacroWriter(s)
-        >>> writer.start_ifeq("foo", "bar")
-        >>> writer.set_variable("foo2", "bar2")
-        >>> writer.end_ifeq()
-        >>> s.getvalue()
-        u'ifeq (foo,bar)\\n  foo2 := bar2\\nendif\\n'
-        """
-        self.indent_left()
-        self.write_line("endif")
-
-
-class CMakeMacroWriter(MacroWriterBase):
-
-    """Macro writer for the CMake format.
-
-    For details on the provided methods, see MacroWriterBase, which this
-    class inherits from.
-    """
-
-    def __init__(self, output):
-        """Initialize a CMake macro writer.
-
-        Arguments:
-        output - File-like object (probably an io.TextIOWrapper), which
-                 will be written to.
-        """
-        super(CMakeMacroWriter, self).__init__(output)
-        # This counter is for avoiding name conflicts in temporary
-        # variables used for shell commands.
-        self._var_num = 0
-
-    def environment_variable_string(self, name):
-        """Return an environment variable reference.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> CMakeMacroWriter(s).environment_variable_string("foo")
-        '$ENV{foo}'
-        """
-        return "$ENV{" + name + "}"
-
-    def shell_command_strings(self, command):
-        # pylint: disable=line-too-long
-        """Return strings used to get the output of a shell command.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> set_up, inline, tear_down = CMakeMacroWriter(s).shell_command_strings("echo bar")
-        >>> set_up
-        'execute_process(COMMAND echo bar OUTPUT_VARIABLE CIME_TEMP_SHELL0 OUTPUT_STRIP_TRAILING_WHITESPACE)'
-        >>> inline
-        '${CIME_TEMP_SHELL0}'
-        >>> tear_down
-        'unset(CIME_TEMP_SHELL0)'
-        """
-        # pylint: enable=line-too-long
-        # Create a unique variable name, then increment variable number
-        # counter so that we get a different value next time.
-        var_name = "CIME_TEMP_SHELL" + str(self._var_num)
-        self._var_num += 1
-        set_up = "execute_process(COMMAND " + command + \
-                 " OUTPUT_VARIABLE " + var_name + \
-                 " OUTPUT_STRIP_TRAILING_WHITESPACE)"
-        tear_down = "unset(" + var_name + ")"
-        return (set_up, "${" + var_name + "}", tear_down)
-
-    def variable_string(self, name):
-        """Return a string to refer to a variable with the given name.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> CMakeMacroWriter(s).variable_string("foo")
-        '${CIME_foo}'
-        """
-        return "${CIME_" + name + "}"
-
-    def set_variable(self, name, value):
-        """Write out a statement setting a variable to some value.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> CMakeMacroWriter(s).set_variable("foo", "bar")
-        >>> s.getvalue()
-        u'set(CIME_foo "bar")\\n'
-        """
-        self.write_line("set(CIME_" + name + ' "' + value + '")')
-
-    def start_ifeq(self, left, right):
-        """Write out a statement to start a conditional block.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> CMakeMacroWriter(s).start_ifeq("foo", "bar")
-        >>> s.getvalue()
-        u'if("foo" STREQUAL "bar")\\n'
-        """
-        self.write_line('if("' + left + '" STREQUAL "' + right + '")')
-        self.indent_right()
-
-    def end_ifeq(self):
-        """Write out a statement to end a block started with start_ifeq.
-
-        >>> import io
-        >>> s = io.StringIO()
-        >>> writer = CMakeMacroWriter(s)
-        >>> writer.start_ifeq("foo", "bar")
-        >>> writer.set_variable("foo2", "bar2")
-        >>> writer.end_ifeq()
-        >>> s.getvalue()
-        u'if("foo" STREQUAL "bar")\\n  set(CIME_foo2 "bar2")\\nendif()\\n'
-        """
-        self.indent_left()
-        self.write_line("endif()")
diff --git a/utils/python/CIME/provenance.py b/utils/python/CIME/provenance.py
index 26db6093b10..eb419c257df 100644
--- a/utils/python/CIME/provenance.py
+++ b/utils/python/CIME/provenance.py
@@ -18,7 +18,7 @@ def _get_batch_job_id_for_syslog(case):
     mach = case.get_value("MACH")
     if mach == 'titan':
         return os.environ["PBS_JOBID"]
-    elif mach in ['edison', 'corip1', 'cori-haswell', 'cori-knl']:
+    elif mach in ['edison', 'cori-haswell', 'cori-knl']:
         return os.environ["SLURM_JOB_ID"]
     elif mach == 'mira':
         return os.environ["COBALT_JOBID"]
@@ -118,7 +118,7 @@ def save_prerun_provenance_acme(case, lid=None):
             filename = "%s.%s" % (filename, lid)
             run_cmd_no_fail("%s > %s" % (cmd, filename), from_dir=full_timing_dir)
             gzip_existing_file(os.path.join(full_timing_dir, filename))
-    elif mach in ["edison", "corip1", "cori-haswell", "cori-knl"]:
+    elif mach in ["edison", "cori-haswell", "cori-knl"]:
         for cmd, filename in [("sqs -f", "sqsf"), ("sqs -w -a", "sqsw"), ("sqs -f %s" % job_id, "sqsf_jobid"), ("squeue", "squeuef")]:
             filename = "%s.%s" % (filename, lid)
             run_cmd_no_fail("%s > %s" % (cmd, filename), from_dir=full_timing_dir)
@@ -248,7 +248,7 @@ def save_postrun_provenance_acme(case, lid):
     elif mach == "mira":
         globs_to_copy.append("%s*output" % job_id)
         globs_to_copy.append("%s*cobaltlog" % job_id)
-    elif mach in ["edison", "corip1", "cori-haswell", "cori-knl"]:
+    elif mach in ["edison", "cori-haswell", "cori-knl"]:
         globs_to_copy.append("%s" % case.get_value("CASE"))
 
     globs_to_copy.append("logs/acme.log.%s.gz" % lid)
diff --git a/utils/python/tests/scripts_regression_tests.py b/utils/python/tests/scripts_regression_tests.py
index 1e59da5a9f7..6938b844ab7 100755
--- a/utils/python/tests/scripts_regression_tests.py
+++ b/utils/python/tests/scripts_regression_tests.py
@@ -15,7 +15,7 @@
 import update_acme_tests
 import CIME.test_scheduler, CIME.wait_for_tests
 from  CIME.test_scheduler import TestScheduler
-from  CIME.XML.build import Build
+from  CIME.XML.compilers import Compilers
 from  CIME.XML.machines import Machines
 from  CIME.XML.files import Files
 from  CIME.case import Case
@@ -1252,6 +1252,12 @@ def is_valid_MPIlib(self, _):
         """Assume all MPILIB settings are valid."""
         return True
 
+    def get_default_MPIlib(self):
+        return "mpich2"
+
+    def get_default_compiler(self):
+        return "intel"
+
 
 def get_macros(macro_maker, build_xml, build_system):
     """Generate build system ("Macros" file) output from config_build XML.
@@ -1267,7 +1273,16 @@ def get_macros(macro_maker, build_xml, build_system):
     # we need to wrap the strings in StringIO objects.
     xml = io.StringIO(unicode(build_xml))
     output = io.StringIO()
-    macro_maker.write_macros(build_system, xml, output)
+    output_format = None
+    if build_system == "Makefile":
+        output_format = "make"
+    elif build_system == "CMake":
+        output_format = "cmake"
+    else:
+        output_format = build_system
+
+    macro_maker.write_macros_file(macros_file=output,
+                                  output_format=output_format, xml=xml)
     return str(output.getvalue())
 
 
@@ -1488,19 +1503,19 @@ class G_TestMacrosBasic(unittest.TestCase):
     def test_script_is_callable(self):
         """The test script can be called on valid output without dying."""
         # This is really more a smoke test of this script than anything else.
-        maker = Build(MockMachines("mymachine", "SomeOS"))
+        maker = Compilers(MockMachines("mymachine", "SomeOS"))
         test_xml = _wrap_config_build_xml("<compiler><SUPPORTS_CXX>FALSE</SUPPORTS_CXX></compiler>")
         get_macros(maker, test_xml, "Makefile")
 
     def test_script_rejects_bad_xml(self):
         """The macro writer rejects input that's not valid XML."""
-        maker = Build(MockMachines("mymachine", "SomeOS"))
+        maker = Compilers(MockMachines("mymachine", "SomeOS"))
         with self.assertRaises(ParseError):
             get_macros(maker, "This is not valid XML.", "Makefile")
 
     def test_script_rejects_bad_build_system(self):
         """The macro writer rejects a bad build system string."""
-        maker = Build(MockMachines("mymachine", "SomeOS"))
+        maker = Compilers(MockMachines("mymachine", "SomeOS"))
         bad_string = "argle-bargle."
         with self.assertRaisesRegexp(
                 SystemExit,
@@ -1524,7 +1539,7 @@ class H_TestMakeMacros(unittest.TestCase):
     test_machine = "mymachine"
 
     def setUp(self):
-        self._maker = Build(MockMachines(self.test_machine, self.test_os))
+        self._maker = Compilers(MockMachines(self.test_machine, self.test_os))
 
     def xml_to_tester(self, xml_string):
         """Helper that directly converts an XML string to a MakefileTester."""