diff --git a/Singularity.esm4 b/Singularity.esm4
deleted file mode 100644
index 3c43994..0000000
--- a/Singularity.esm4
+++ /dev/null
@@ -1,75 +0,0 @@
-Bootstrap: docker
-From: spack/centos7:0.16.0
-Stage: build
-
-%post
-  # Update, install and cleanup of system packages needed at build-time
-  yum update -y && yum install -y epel-release && yum update -y
-  yum install -y git make
-  rm -rf /var/cache/yum  && yum clean all
-
-  # Create the manifest file for the installation in /opt/spack-environment
-  mkdir /opt/spack-environment && cd /opt/spack-environment
-  cat << EOF > spack.yaml
-spack:
-  config:
-    install_missing_compilers: true
-    install_tree: /opt/software
-  specs:
-  - mpich@3.3.2%gcc@10.2.0 target=x86_64
-  - hdf5@1.12.0~mpi+fortran %gcc@10.2.0 target=x86_64
-  - netcdf-c@4.7.4~mpi %gcc@10.2.0 target=x86_64
-  - netcdf-fortran@4.5.3 %gcc@10.2.0 target=x86_64 ^netcdf-c@4.7.4~mpi %gcc@10.2.0 target=x86_64 ^hdf5@1.12.0~mpi+fortran %gcc@10.2.0 target=x86_64
-  concretization: together
-  view: /opt/view
-EOF
-
-  # Install all the required software
-  . /opt/spack/share/spack/setup-env.sh
-  spack env activate .
-  spack install --fail-fast
-  spack gc -y
-  # Install ESM4
-  git clone --recursive https://github.com/NOAA-GFDL/ESM4.git && cd ESM4/exec
-  make gcc=on OPENMP=on SH=sh CLUBB=off
-  mkdir -p /opt/ESM4
-  cp esm4.1.x /opt/ESM4
-  cd ../../
-  #Finish the spack environment set up
-  spack env deactivate
-  spack env activate --sh -d . >> /opt/spack-environment/environment_modifications.sh
-
-  # Strip the binaries to reduce the size of the image
-  find -L /opt/view/* -type f -exec readlink -f '{}' \; | \
-    xargs file -i | \
-    grep 'charset=binary' | \
-    grep 'x-executable\|x-archive\|x-sharedlib' | \
-    awk -F: '{print $1}' | xargs strip -s
-
-
-Bootstrap: docker
-From: centos:7
-Stage: final
-
-%files from build
-  /opt/spack-environment /opt
-  /opt/software /opt
-  /opt/view /opt
-  /opt/spack-environment/environment_modifications.sh /opt/spack-environment/environment_modifications.sh
-  /opt/ESM4
-
-%post
-  # Update, install and cleanup of system packages needed at run-time
-  yum update -y && yum install -y epel-release && yum update -y
-  yum install -y make which git
-  rm -rf /var/cache/yum  && yum clean all
-  # Modify the environment without relying on sourcing shell specific files at startup
-  cat /opt/spack-environment/environment_modifications.sh >> $SINGULARITY_ENVIRONMENT
-
-%environment
-  export PATH=/opt/ESM4:$PATH
-
-%runscript
-  ulimit -s unlimited
-  /opt/ESM4/esm4.1.x
-
diff --git a/containers/Dockerfile b/containers/Dockerfile
new file mode 100644
index 0000000..87800f9
--- /dev/null
+++ b/containers/Dockerfile
@@ -0,0 +1,18 @@
+FROM thomasrobinson/centos7-netcdff:4.5.3-c4.7.4-gcc-mpich-slurm
+## Dockerfile used to create ESM4
+
+## Set up spack
+RUN . /opt/spack/share/spack/setup-env.sh
+## Make the ESM4 directory
+RUN mkdir -p /opt/ESM4
+## Build the ESM4 from github
+RUN git clone --recursive https://github.com/NOAA-GFDL/ESM4.git -b 2021.02 \
+    && cd ESM4/exec \ 
+    && make gcc=on HDF_INCLUDE=-I/opt/hdf5/include SH=sh CLUBB=off \
+    && cp esm4.1.x /opt/ESM4 \
+    && make clean_all
+## Add the ESM4 executable to the path
+ENV PATH=/opt/ESM4/:${PATH}
+## Add permissions to the ESM4
+RUN chmod 777 /opt/ESM4/esm4.1.x
+
diff --git a/containers/Dockerfile.gnu b/containers/Dockerfile.gnu
new file mode 100644
index 0000000..87800f9
--- /dev/null
+++ b/containers/Dockerfile.gnu
@@ -0,0 +1,18 @@
+FROM thomasrobinson/centos7-netcdff:4.5.3-c4.7.4-gcc-mpich-slurm
+## Dockerfile used to create ESM4
+
+## Set up spack
+RUN . /opt/spack/share/spack/setup-env.sh
+## Make the ESM4 directory
+RUN mkdir -p /opt/ESM4
+## Build the ESM4 from github
+RUN git clone --recursive https://github.com/NOAA-GFDL/ESM4.git -b 2021.02 \
+    && cd ESM4/exec \ 
+    && make gcc=on HDF_INCLUDE=-I/opt/hdf5/include SH=sh CLUBB=off \
+    && cp esm4.1.x /opt/ESM4 \
+    && make clean_all
+## Add the ESM4 executable to the path
+ENV PATH=/opt/ESM4/:${PATH}
+## Add permissions to the ESM4
+RUN chmod 777 /opt/ESM4/esm4.1.x
+
diff --git a/containers/Dockerfile.intel_sources b/containers/Dockerfile.intel_sources
new file mode 100644
index 0000000..d41192b
--- /dev/null
+++ b/containers/Dockerfile.intel_sources
@@ -0,0 +1,123 @@
+FROM intel/oneapi-hpckit:2021.2-devel-centos8 as builder
+LABEL maintainer "Tom Robinson"
+
+#-------------------------------------------------------------
+## Set up packages needed
+RUN yum update -y 
+RUN yum install -y git
+RUN yum install -y patch
+RUN yum install -y zlib
+RUN yum install -y wget
+RUN yum install -y curl 
+RUN yum install -y m4
+
+## Set compilers
+ENV FC=ifort
+ENV CC=icc
+ENV build=/opt
+ENV IO_LIBS=${build}/io_libs
+## Build zlib and szip and curl
+RUN cd $build \
+&& zlib="zlib-1.2.11" \
+&& rm -rf zlib* \
+&& wget http://www.zlib.net/zlib-1.2.11.tar.gz \
+&& tar xzf zlib-1.2.11.tar.gz \
+&& cd $zlib \
+&& ./configure --prefix=${IO_LIBS} \
+&& make \
+&& make -j 20 install
+ENV CC "icc -fPIC"
+RUN cd $build \
+&& szip="szip-2.1.1" \
+&& rm -rf szip* \
+&& wget https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz \
+&& tar xzf szip-2.1.1.tar.gz \
+&& cd $szip \
+&& ./configure FC=ifort CC=icc --prefix=${IO_LIBS} CPPDEFS="-fPIC" \
+&& make \
+&& make -j 20 install
+RUN cd $build \
+&& curl="curl-7.74.0" \
+&& rm -rf curl* \
+&& wget https://curl.haxx.se/download/${curl}.tar.gz \
+&& tar xzf ${curl}.tar.gz \
+&& cd $curl \
+&& ./configure FC=ifort CC=icc --prefix=${IO_LIBS} \
+&& make \
+&& make -j 20 install
+
+ENV LD_LIBRARY_PATH=${IO_LIBS}/lib:${LD_LIBRARY_PATH}:/opt/io_libs/lib
+
+## Set compilers
+ENV FC=ifort
+ENV CC=icc
+## Install HDF5
+RUN cd /opt \
+&& hdf5="hdf5-1.12.0"  \
+&& wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/${hdf5}/src/${hdf5}.tar.gz \
+&& tar xzf ${hdf5}.tar.gz \
+&& cd $hdf5 \
+&& hdf5_opts="FC=ifort CC=icc --prefix=/opt/hdf5 --enable-fortran --enable-hl" \
+&& ./configure $hdf5_opts \
+&& make -j 20 install \
+&& echo "HDF5 finished building"
+
+#*********************
+## Install NetCDF-C
+#*********************
+ENV LD_LIBRARY_PATH=/opt/hdf5/lib:${LD_LIBRARY_PATH}
+RUN cd /opt \
+&& version="4.7.4" \
+&& netcdfc="netcdf-c-"${version} \
+&& rm -rf netcdf \
+&& wget -O ${netcdfc}.tar.gz https://github.com/Unidata/netcdf-c/archive/v${version}.tar.gz \
+&& tar xzf ${netcdfc}.tar.gz \
+&& cd $netcdfc \
+&& ./configure --prefix=/opt/netcdf-c CPPFLAGS='-I/opt/hdf5/include -I${IO_LIBS}/include' LDFLAGS='-L/opt/hdf5/lib -L${IO_LIBS}/lib' --disable-dap \ 
+&& make \
+&& make -j 20 install \
+&& echo " NetCDF-C finished building"
+
+ENV LD_LIBRARY_PATH=/opt/netcdf-c/lib:${LD_LIBRARY_PATH}
+ENV PATH=/opt/netcdf-c/bin:${PATH}
+
+## Install netcdf fortran
+ENV LDFLAGS="-L/opt/netcdf-c/lib -lnetcdf"
+RUN cd /opt \
+&& nfversion=4.5.3 \
+&& netcdff="netcdf-fortran-${nfversion}" \
+&& rm -rf $netcdff \
+&& wget -O ${netcdff}.tar.gz https://github.com/Unidata/netcdf-fortran/archive/v${nfversion}.tar.gz \
+&& tar xzf ${netcdff}.tar.gz \
+&& cd $netcdff \
+&& ./configure CPPFLAGS="-I/opt/netcdf-c/include -I/opt/hdf5/include/" --prefix=/opt/netcdf-fortran \
+&& make \
+&& make -j20 install
+
+ENV PATH=/opt/netcdf-fortran/bin:${PATH}
+
+ENV LD_LIBRARY_PATH=/opt/netcdf-c/lib:/opt/hdf5/lib:/opt/netcdf-fortran/lib:${LD_LIBRARY_PATH}
+ENV LIBRARY_PATH=${LD_LIBRARY_PATH}
+
+## Build the model
+RUN mkdir -p /opt/ESM4
+RUN git clone --recursive https://github.com/NOAA-GFDL/ESM4.git -b 2021.02 \
+ && cd ESM4/exec \
+ && make HDF_INCLUDE=-I/opt/hdf5/include \
+ && cp esm4.1.x /opt/ESM4 \
+ && make clean_all
+
+##############################################################################################################
+# Stage 2 with the minimum
+FROM intel/oneapi-runtime:centos8
+RUN ls
+COPY --from=builder /opt/netcdf-c /opt/netcdf-c
+COPY --from=builder /opt/netcdf-fortran /opt/netcdf-fortran
+COPY --from=builder /opt/hdf5 /opt/hdf5
+COPY --from=builder /opt/ESM4 /opt/ESM4
+ENV PATH=/opt/ESM4:/opt/netcdf-fortran/bin:/opt/netcdf-c/bin:${PATH}
+ENV LD_LIBRARY_PATH=/opt/netcdf-c/lib:/opt/hdf5/lib:/opt/netcdf-fortran/lib:/opt/io_libs/lib${LD_LIBRARY_PATH}
+ENV LIBRARY_PATH=${LD_LIBRARY_PATH}
+## Add permissions to the ESM4
+RUN chmod 777 /opt/ESM4/esm4.1.x
+
diff --git a/containers/README.md b/containers/README.md
new file mode 100644
index 0000000..936b032
--- /dev/null
+++ b/containers/README.md
@@ -0,0 +1,39 @@
+# ESM4 containers
+This is a very basic *0.1* version of a README for these containers.  Please feel free to
+add to it or open a GitHub issue if there is something missing.
+ 
+## Building with Docker
+The Dockerfiles are set up to build an ESM4 run using Docker.  There are two Dockerfiles, 
+one to build with intel oneAPI 2021.2 and one to build with GCC 10.2.0
+
+## Building with Singularity
+The Singularity definition files are included to build using intel oneAPI 2021.2 compilers.
+You can build using the singularity_build.sh script
+```bash
+./singularity_build.sh
+```
+
+## Running using singularity
+The containers are all using mpich-compatible MPI, so if you run using singularity bind 
+or hybrid methods, make sure you are using some flavor of mpich and not openmpi.
+
+## Disclaimer
+
+The United States Department of Commerce (DOC) GitHub project code is
+provided on an 'as is' basis and the user assumes responsibility for
+its use.  DOC has relinquished control of the information and no
+longer has responsibility to protect the integrity, confidentiality,
+or availability of the information.  Any claims against the Department
+of Commerce stemming from the use of its GitHub project will be
+governed by all applicable Federal law.  Any reference to specific
+commercial products, processes, or services by service mark,
+trademark, manufacturer, or otherwise, does not constitute or imply
+their endorsement, recommendation or favoring by the Department of
+Commerce.  The Department of Commerce seal and logo, or the seal and
+logo of a DOC bureau, shall not be used in any manner to imply
+endorsement of any commercial product or activity by DOC or the United
+States Government.
+
+This project code is made available through GitHub but is managed by
+NOAA-GFDL at https://gitlab.gfdl.noaa.gov.
+
diff --git a/containers/Singularity.esm4 b/containers/Singularity.esm4
new file mode 100644
index 0000000..6daaf3f
--- /dev/null
+++ b/containers/Singularity.esm4
@@ -0,0 +1,21 @@
+Bootstrap: docker
+From: thomasrobinson/centos7-netcdff:4.5.3-c4.7.4-gcc-mpich
+
+Stage: build
+
+%post
+  # Install all the required software
+  . /opt/spack/share/spack/setup-env.sh
+  # Install ESM4
+  git clone --recursive -b 2021.02 https://github.com/NOAA-GFDL/ESM4.git && cd ESM4/exec
+  make gcc=on OPENMP=on SH=sh CLUBB=off
+  mkdir -p /opt/ESM4
+  cp esm4.1.x /opt/ESM4
+
+%environment
+  export PATH=/opt/ESM4:$PATH
+
+%runscript
+  ulimit -s unlimited
+  /opt/ESM4/esm4.1.x
+
diff --git a/containers/Singularity.intel_esm4 b/containers/Singularity.intel_esm4
new file mode 100644
index 0000000..7a56b62
--- /dev/null
+++ b/containers/Singularity.intel_esm4
@@ -0,0 +1,39 @@
+Bootstrap: localimage
+From: intel_netcdf_ubuntu.sif
+Stage: build
+## Singularity def file used to create ESM4
+
+%post
+ cd /opt
+## Build the ESM4 from github
+ git clone --recursive https://github.com/NOAA-GFDL/ESM4.git -b 2021.02 
+     cd ESM4/exec 
+     make -j 20 HDF_INCLUDE=-I/opt/hdf5/include HDF_LIBS="-L/opt/hdf5/lib -lhdf5 -lhdf5_fortran -lhdf5_hl -lhdf5hl_fortran" SH=sh
+     cp esm4.1.x /opt/ESM4 
+     make clean_all
+ chmod 777 /opt/ESM4/esm4.1.x
+
+
+Bootstrap: docker
+From: intel/oneapi-runtime:ubuntu18.04
+Stage: final
+
+%files from build
+/opt/hdf5
+/opt/netcdf-c
+/opt/netcdf-fortran
+/opt/ESM4/esm4.1.x
+## Add the ESM4 executable to the path
+%environment
+PATH=/opt/ESM4:/opt/netcdf-c/bin:/opt/netcdf-fortran/bin:${PATH}
+LD_LIBRARY_PATH=/opt/netcdf-c/lib:/opt/netcdf-fortran/lib:/opt/hdf5/lib:/opt/intel/oneapi/lib:/opt/intel/oneapi/lib/intel64/:/opt/intel/oneapi/lib/intel64/lib:/opt/intel/oneapi/lib/intel64/libfabric:${LD_LIBRARY_PATH}
+export LIBRARY_PATH=/opt/netcdf-c/lib:/opt/netcdf-fortran/lib:/opt/hdf5/lib:/opt/intel/oneapi/lib:/opt/intel/oneapi/lib/intel64/:/opt/intel/oneapi/lib/intel64/lib:/opt/intel/oneapi/lib/intel64/libfabric
+export KMP_STACKSIZE=512m
+export NC_BLKSZ=1M
+export F_UFMTENDIAN=big
+
+## Run ESM4
+%runscript
+ ulimit -s unlimited
+ /opt/ESM4/esm4.1.x
+
diff --git a/containers/Singularity.intel_netcdf b/containers/Singularity.intel_netcdf
new file mode 100644
index 0000000..d53038f
--- /dev/null
+++ b/containers/Singularity.intel_netcdf
@@ -0,0 +1,113 @@
+Bootstrap: docker
+From: intel/oneapi-hpckit:devel-ubuntu18.04 
+Stage: build
+
+%post
+## Set up oneAPI
+  apt-get -yqq update  
+  apt-get -yqq upgrade
+  apt-get -yqq install git make
+  apt-get -yqq install wget
+  apt-get -yqq install m4
+# use wget to fetch the Intel repository public key
+# cd /tmp
+# wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+## add to your apt sources keyring so that archives signed with this key will be trusted.
+# apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+## remove the public key
+# rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+# echo "deb https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list
+# apt update -y
+# apt install -y intel-basekit intel-hpckit
+##
+ FC=ifort 
+ CC=icc
+
+ build=/opt
+ IO_LIBS=${build}/io_libs
+## Build zlib and szip and curl
+ cd $build 
+ zlib="zlib-1.2.11" 
+ rm -rf zlib* 
+ wget http://www.zlib.net/zlib-1.2.11.tar.gz 
+ tar xzf zlib-1.2.11.tar.gz 
+ cd $zlib 
+ ./configure --prefix=${IO_LIBS} 
+ make 
+ make -j 20 install
+# CC "icc -fPIC"
+ cd $build 
+ szip="szip-2.1.1" 
+ rm -rf szip* 
+ wget https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz 
+ tar xzf szip-2.1.1.tar.gz 
+ cd $szip 
+ ./configure FC=ifort CC=icc --prefix=${IO_LIBS} CPPDEFS="-fPIC" 
+ make 
+ make -j 20 install
+ cd $build 
+ curl="curl-7.74.0" 
+ rm -rf curl* 
+ wget https://curl.haxx.se/download/${curl}.tar.gz 
+ tar xzf ${curl}.tar.gz 
+ cd $curl 
+ ./configure FC=ifort CC=icc --prefix=${IO_LIBS} 
+ make 
+ make -j 20 install
+
+ LD_LIBRARY_PATH=${IO_LIBS}/lib:${LD_LIBRARY_PATH}:/opt/io_libs/lib
+#*********************
+## Install hdf5 with fortran
+#*********************
+ cd /opt 
+ hdf5="hdf5-1.12.0"  
+ wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/${hdf5}/src/${hdf5}.tar.gz 
+ tar xzf ${hdf5}.tar.gz 
+ cd $hdf5 
+ hdf5_opts="FC=ifort CC=icc LDFLAGS=-L/opt/io_libs/lib --prefix=/opt/hdf5 --enable-fortran --enable-hl --with-zlib=/opt/io_libs/lib"
+ ./configure FC=ifort CC=icc LDFLAGS='-L/opt/io_libs/lib -lz' --prefix=/opt/hdf5 --enable-fortran --enable-hl --with-zlib=/opt/io_libs --with-szib=/opt/io_libs 
+ make -j 20 install 
+ echo "HDF5 finished building"
+
+#*********************
+## Install NetCDF-C
+#*********************
+ LD_LIBRARY_PATH=/opt/hdf5/lib:${LD_LIBRARY_PATH}
+ cd /opt 
+ version="4.7.4" 
+ netcdfc="netcdf-c-"${version} 
+ rm -rf netcdf 
+ wget -O ${netcdfc}.tar.gz https://github.com/Unidata/netcdf-c/archive/v${version}.tar.gz 
+ tar xzf ${netcdfc}.tar.gz 
+ cd $netcdfc 
+ ./configure --prefix=/opt/netcdf-c CPPFLAGS='-I/opt/hdf5/include -I${IO_LIBS}/include' LDFLAGS='-L/opt/hdf5/lib -L/opt/io_libs/lib -lz' --disable-dap 
+ make 
+ make -j 20 install 
+ echo " NetCDF-C finished building"
+
+ LD_LIBRARY_PATH=/opt/netcdf-c/lib:${LD_LIBRARY_PATH}
+ PATH=/opt/netcdf-c/bin:${PATH}
+
+## Install netcdf fortran
+ LDFLAGS="-L/opt/netcdf-c/lib -lnetcdf"
+ LIBS="-L/opt/netcdf-c/lib -lnetcdf"
+ cd /opt 
+ nfversion=4.5.3 
+ netcdff="netcdf-fortran-${nfversion}" 
+ rm -rf $netcdff 
+ wget -O ${netcdff}.tar.gz https://github.com/Unidata/netcdf-fortran/archive/v${nfversion}.tar.gz 
+ tar xzf ${netcdff}.tar.gz 
+ cd $netcdff 
+ ./configure CPPFLAGS="-I/opt/netcdf-c/include -I/opt/hdf5/include/" LDFLAGS="-L/opt/netcdf-c/lib -lnetcdf" --prefix=/opt/netcdf-fortran 
+ make 
+ make -j20 install
+
+ PATH=/opt/netcdf-fortran/bin:${PATH}
+
+ LD_LIBRARY_PATH=/opt/netcdf-c/lib:/opt/hdf5/lib:/opt/netcdf-fortran/lib:${LD_LIBRARY_PATH}
+ LIBRARY_PATH=${LD_LIBRARY_PATH}
+
+
+%environment
+PATH=/opt/netcdf-fortran/bin:/opt/netcdf-c/bin:/opt/intel/oneapi/mpi/latest/bin:/opt/intel/oneapi/compiler/latest/linux/bin/intel64:${PATH}
+LD_LIBRARY_PATH=/opt/netcdf-c/lib:/opt/hdf5/lib:/opt/netcdf-fortran/lib:/opt/io_libs/lib:${LD_LIBRARY_PATH}
diff --git a/containers/singularity_build.sh b/containers/singularity_build.sh
new file mode 100755
index 0000000..89f5ff3
--- /dev/null
+++ b/containers/singularity_build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+singularity build -f intel_netcdf_ubuntu.sif Singularity.intel_netcdf
+singularity build -f esm4_2021.02_ubuntu_intel.sif Singularity.intel_esm4
diff --git a/exec/atmos_cubed_sphere/Makefile b/exec/atmos_cubed_sphere/Makefile
index 52b3667..2e26975 100644
--- a/exec/atmos_cubed_sphere/Makefile
+++ b/exec/atmos_cubed_sphere/Makefile
@@ -1,21 +1,30 @@
 # Makefile created by mkmf 19.3.1
 
-CPPDEFS = -DINTERNAL_FILE_NML -g -DCLIMATE_NUDGE -DSPMD 
+CPPDEFS = -DINTERNAL_FILE_NML -DSPMD -DCLIMATE_NUDGE
 
-OTHERFLAGS = -I$(BUILDROOT)atmos_phys -I$(BUILDROOT)fms -I$(SRCROOT)FMS/include
+OTHERFLAGS = -I$(BUILDROOT)atmos_phys -I$(BUILDROOT)fms
 
 include $(MK_TEMPLATE)
 
+
 .DEFAULT:
 	-echo $@ does not exist.
 all: libatmos_cubed_sphere.a
 a2b_edge.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 fv_grid_utils.o fv_arrays.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90
-atmosphere.o: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h fv_arrays.o fv_control.o fv_eta.o fv_io.o fv_dynamics.o fv_nesting.o fv_diagnostics.o fv_cmip_diag.o fv_restart.o fv_timing.o fv_mp_mod.o fv_sg.o fv_update_phys.o fv_climate_nudge.o fv_ada_nudge.o fv_nudge.o boundary.o
+atmosphere.o: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h fv_arrays.o fv_control.o fv_eta.o fv_dynamics.o fv_nesting.o fv_diagnostics.o fv_cmip_diag.o fv_restart.o fv_timing.o fv_mp_mod.o fv_sg.o fv_update_phys.o fv_io.o fv_regional_bc.o fv_climate_nudge.o fv_ada_nudge.o fv_nudge.o gfdl_mp.o cloud_diagnosis.o coarse_graining.o coarse_grained_diagnostics.o coarse_grained_restart_files.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90
 boundary.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 fv_mp_mod.o fv_arrays.o fv_timing.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90
-dyn_core.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 fv_mp_mod.o sw_core.o a2b_edge.o nh_core.o tp_core.o fv_timing.o fv_diagnostics.o fv_update_phys.o fv_ada_nudge.o fv_nudge.o fv_arrays.o boundary.o fv_regional_bc.o test_cases.o
+cloud_diagnosis.o: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90
+coarse_grained_diagnostics.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90 fv_arrays.o fv_diagnostics.o fv_mapz.o coarse_graining.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90
+coarse_grained_restart_files.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90 coarse_graining.o fv_arrays.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90
+coarse_graining.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90 fv_mapz.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90
+dyn_core.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 fv_mp_mod.o sw_core.o a2b_edge.o nh_core.o tp_core.o fv_timing.o fv_diagnostics.o fv_diag_column.o fv_update_phys.o fv_ada_nudge.o fv_nudge.o fv_arrays.o boundary.o fv_regional_bc.o test_cases.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90
 external_ic.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 $(SRCROOT)FMS/include/file_version.h external_sst.o fv_arrays.o fv_diagnostics.o fv_grid_utils.o fv_io.o fv_mapz.o fv_regional_bc.o fv_mp_mod.o fv_surf_map.o fv_timing.o init_hydro.o fv_fill.o fv_eta.o sim_nc_mod.o fv_nudge.o test_cases.o boundary.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90
@@ -29,12 +38,14 @@ fv_climate_nudge.o: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudg
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90
 fv_cmip_diag.o: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 $(SRCROOT)FMS/include/file_version.h fv_mapz.o fv_arrays.o fv_diagnostics.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90
-fv_cmp.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 fv_mp_mod.o fv_arrays.o
+fv_cmp.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 fv_arrays.o gfdl_cloud_microphys.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90
-fv_control.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)FMS/include/file_version.h fv_io.o fv_restart.o fv_arrays.o fv_grid_utils.o fv_eta.o fv_grid_tools.o fv_mp_mod.o fv_timing.o fv_diagnostics.o
+fv_control.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)FMS/include/file_version.h fv_io.o fv_restart.o fv_arrays.o fv_grid_utils.o fv_eta.o fv_grid_tools.o fv_mp_mod.o test_cases.o fv_timing.o fv_diagnostics.o coarse_grained_restart_files.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90
-fv_diagnostics.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)FMS/include/file_version.h fv_arrays.o fv_mapz.o fv_mp_mod.o fv_eta.o fv_grid_utils.o a2b_edge.o fv_surf_map.o fv_sg.o
-	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90
+fv_diag_column.o: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90 $(SRCROOT)FMS/include/file_version.h fv_arrays.o fv_grid_utils.o fv_sg.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90
+fv_diagnostics.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)FMS/include/file_version.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.h fv_arrays.o fv_mapz.o fv_mp_mod.o fv_eta.o fv_grid_utils.o a2b_edge.o fv_surf_map.o fv_sg.o gfdl_mp.o fv_diag_column.o gfdl_cloud_microphys.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include -I$(SRCROOT)GFDL_atmos_cubed_sphere/tools	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90
 fv_dynamics.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 dyn_core.o fv_mapz.o fv_tracer2d.o fv_grid_utils.o fv_fill.o fv_mp_mod.o fv_timing.o fv_diagnostics.o fv_sg.o fv_nesting.o fv_regional_bc.o boundary.o fv_arrays.o fv_nudge.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90
 fv_eta.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h fv_mp_mod.o
@@ -59,9 +70,9 @@ fv_nudge.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 $(SRCROOT)FMS/i
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90
 fv_regional_bc.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 fv_arrays.o fv_diagnostics.o fv_grid_utils.o fv_mapz.o fv_mp_mod.o fv_fill.o fv_eta.o boundary.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90
-fv_restart.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 fv_arrays.o fv_io.o fv_grid_utils.o fv_diagnostics.o init_hydro.o test_cases.o fv_mp_mod.o fv_surf_map.o external_ic.o fv_eta.o boundary.o fv_timing.o fv_treat_da_inc.o
+fv_restart.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 fv_arrays.o fv_io.o fv_grid_utils.o fv_diagnostics.o init_hydro.o test_cases.o fv_mp_mod.o fv_surf_map.o external_ic.o fv_eta.o boundary.o fv_timing.o fv_treat_da_inc.o coarse_grained_restart_files.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90
-fv_sg.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 fv_mp_mod.o
+fv_sg.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 gfdl_cloud_microphys.o fv_mp_mod.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90
 fv_surf_map.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 fv_grid_utils.o fv_mp_mod.o fv_timing.o fv_arrays.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90
@@ -73,6 +84,10 @@ fv_treat_da_inc.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 f
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90
 fv_update_phys.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 fv_mp_mod.o fv_arrays.o boundary.o fv_eta.o fv_timing.o fv_diagnostics.o fv_mapz.o fv_climate_nudge.o fv_ada_nudge.o fv_nudge.o fv_grid_utils.o fv_nesting.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90
+gfdl_cloud_microphys.o: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90
+gfdl_mp.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90 fv_arrays.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90
 init_hydro.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 fv_grid_utils.o fv_mp_mod.o fv_arrays.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90
 nh_core.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 tp_core.o nh_utils.o
@@ -87,103 +102,119 @@ sorted_index.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 fv_arra
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90
 sw_core.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 tp_core.o fv_mp_mod.o fv_arrays.o a2b_edge.o test_cases.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90
-test_cases.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)FMS/include/file_version.h init_hydro.o fv_mp_mod.o fv_grid_utils.o fv_surf_map.o fv_grid_tools.o fv_eta.o fv_sg.o fv_diagnostics.o fv_arrays.o
+test_cases.o: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)FMS/include/file_version.h init_hydro.o fv_mp_mod.o fv_grid_utils.o fv_surf_map.o fv_grid_tools.o fv_eta.o fv_sg.o fv_diagnostics.o fv_arrays.o gfdl_cloud_microphys.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90
 tp_core.o: $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 fv_grid_utils.o fv_arrays.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90
-./tp_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 .
-./fv_eta.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 .
-./fv_diagnostics.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 .
-./fv_surf_map.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 .
+./fv_fill.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 .
+./external_ic.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 .
+./boundary.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 .
+./gfdl_mp.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90 .
+./fv_grid_utils.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 .
+./fv_cmp.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 .
 ./fv_regional_bc.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 .
-./fv_tracer2d.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 .
+./cloud_diagnosis.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90 .
+./dyn_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 .
+./fv_treat_da_inc.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 .
+./fv_ada_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 .
+./sim_nc_mod.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 .
+./fv_grid_tools.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 .
+./fv_cmip_diag.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 .
 ./fv_restart.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 .
+./fv_diag_column.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90 .
+./fv_tracer2d.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 .
+./file_version.h: $(SRCROOT)FMS/include/file_version.h
+	cp $(SRCROOT)FMS/include/file_version.h .
 ./external_sst.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90 .
 ./a2b_edge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 .
-./fv_nesting.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 .
-./fv_dynamics.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 .
-./read_climate_nudge_data.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 .
-./test_cases.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 .
-./fv_io.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 .
-./fv_fill.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 .
-./sim_nc_mod.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 .
-./fms_platform.h: $(SRCROOT)FMS/include/fms_platform.h
-	cp $(SRCROOT)FMS/include/fms_platform.h .
-./fv_treat_da_inc.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 .
-./external_ic.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 .
-./file_version.h: $(SRCROOT)FMS/include/file_version.h
-	cp $(SRCROOT)FMS/include/file_version.h .
-./fv_eta.h: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h .
-./nh_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 .
-./fv_update_phys.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 .
-./fv_arrays.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90 .
-./dyn_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 .
 ./fv_control.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 .
-./fv_timing.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 .
-./fv_cmp.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 .
+./fv_eta.h: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h .
+./sw_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 .
 ./fv_sg.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 .
-./init_hydro.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 .
+./fv_climate_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90 .
+./fms_platform.h: $(SRCROOT)FMS/include/fms_platform.h
+	cp $(SRCROOT)FMS/include/fms_platform.h .
+./fv_update_phys.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 .
+./sorted_index.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 .
+./fv_diagnostics.h: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.h
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.h .
+./read_climate_nudge_data.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 .
+./nh_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 .
 ./fv_mapz.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90 .
+./init_hydro.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 .
+./tp_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 .
+./fv_mp_mod.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 .
+./fv_surf_map.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 .
 ./fv_nggps_diag.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90 .
-./fv_ada_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 .
-./fv_grid_tools.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 .
-./fv_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 .
 ./atmosphere.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 .
-./fv_mp_mod.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 .
-./sw_core.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 .
-./sorted_index.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 .
-./fv_cmip_diag.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 .
-./boundary.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 .
-./fv_grid_utils.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 .
+./coarse_grained_restart_files.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90 .
+./fv_eta.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 .
+./test_cases.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 .
+./fv_dynamics.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 .
+./fv_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 .
+./fv_nesting.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 .
+./coarse_graining.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90 .
+./gfdl_cloud_microphys.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90 .
+./fv_timing.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 .
+./fv_io.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 .
+./coarse_grained_diagnostics.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90 .
 ./nh_utils.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90
 	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90 .
-./fv_climate_nudge.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90
-	cp $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90 .
-SRC = $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h
-OBJ = fv_fill.o tp_core.o fv_mp_mod.o read_climate_nudge_data.o fv_io.o init_hydro.o fv_control.o fv_treat_da_inc.o fv_climate_nudge.o sw_core.o nh_core.o fv_tracer2d.o fv_grid_utils.o fv_ada_nudge.o fv_timing.o fv_mapz.o dyn_core.o fv_update_phys.o test_cases.o fv_sg.o fv_nesting.o fv_cmp.o fv_surf_map.o fv_cmip_diag.o fv_dynamics.o fv_diagnostics.o fv_regional_bc.o fv_nudge.o nh_utils.o external_sst.o fv_restart.o fv_grid_tools.o fv_eta.o sim_nc_mod.o sorted_index.o atmosphere.o fv_nggps_diag.o external_ic.o a2b_edge.o boundary.o fv_arrays.o
-OFF = $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 $(SRCROOT)FMS/include/file_version.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90
+./fv_diagnostics.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 .
+./fv_arrays.F90: $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90
+	cp $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90 .
+SRC = $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h $(SRCROOT)FMS/include/fms_platform.h
+OBJ = external_sst.o fv_update_phys.o fv_control.o fv_diagnostics.o fv_tracer2d.o fv_mapz.o fv_ada_nudge.o fv_regional_bc.o cloud_diagnosis.o fv_nesting.o coarse_graining.o sim_nc_mod.o fv_fill.o fv_surf_map.o external_ic.o test_cases.o nh_core.o fv_io.o fv_cmip_diag.o fv_treat_da_inc.o fv_dynamics.o fv_nudge.o a2b_edge.o boundary.o dyn_core.o fv_restart.o sw_core.o fv_diag_column.o gfdl_mp.o tp_core.o gfdl_cloud_microphys.o fv_climate_nudge.o fv_mp_mod.o atmosphere.o fv_timing.o read_climate_nudge_data.o fv_nggps_diag.o fv_eta.o init_hydro.o fv_arrays.o fv_grid_utils.o coarse_grained_diagnostics.o sorted_index.o nh_utils.o fv_sg.o coarse_grained_restart_files.o fv_cmp.o fv_grid_tools.o
+OFF = $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_fill.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_ic.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/boundary.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/gfdl_mp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_grid_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_cmp.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_regional_bc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/cloud_diagnosis.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/dyn_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_treat_da_inc.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_ada_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sim_nc_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_grid_tools.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_cmip_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_restart.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_diag_column.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_tracer2d.F90 $(SRCROOT)FMS/include/file_version.h $(SRCROOT)GFDL_atmos_cubed_sphere/tools/external_sst.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/a2b_edge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_control.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.h $(SRCROOT)GFDL_atmos_cubed_sphere/model/sw_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_sg.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/fv_climate_nudge.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_update_phys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/sorted_index.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.h $(SRCROOT)GFDL_atmos_cubed_sphere/GFDL_tools/read_climate_nudge_data.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_mapz.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/init_hydro.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/tp_core.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_mp_mod.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_surf_map.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nggps_diag.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/GFDL/atmosphere.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_restart_files.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_eta.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/test_cases.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_dynamics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_nudge.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_nesting.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_graining.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/driver/SHiELD/gfdl_cloud_microphys.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_timing.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_io.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/nh_utils.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/tools/fv_diagnostics.F90 $(SRCROOT)GFDL_atmos_cubed_sphere/model/fv_arrays.F90
 clean: neat
-	-rm -f .libatmos_cubed_sphere.a.cppdefs libatmos_cubed_sphere.a *.o *.mod
+	-rm -f .libatmos_cubed_sphere.a.cppdefs $(OBJ) libatmos_cubed_sphere.a
 
 neat:
 	-rm -f $(TMPFILES)
diff --git a/exec/fms/Makefile b/exec/fms/Makefile
index d043e8e..9f900e0 100644
--- a/exec/fms/Makefile
+++ b/exec/fms/Makefile
@@ -31,11 +31,11 @@ column_diagnostics.o: $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 $(
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90
 constants.o: $(SRCROOT)FMS/constants/constants.F90 $(SRCROOT)FMS/include/file_version.h platform.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/constants/constants.F90
-coupler_types.o: $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/include/file_version.h fms.o fms_io.o time_manager.o diag_manager.o data_override.o mpp_domains.o mpp.o
+coupler_types.o: $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/include/file_version.h fms.o fms2_io.o fms_io.o time_manager.o diag_manager.o data_override.o mpp_domains.o mpp.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/coupler/coupler_types.F90
 create_xgrid.o: $(SRCROOT)FMS/mosaic/create_xgrid.c $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/mosaic/create_xgrid.h $(SRCROOT)FMS/mosaic/constant.h
 	$(CC) $(CPPDEFS) $(CPPFLAGS) $(CFLAGS) $(OTHERFLAGS) $(OTHER_CFLAGS) -c -I$(SRCROOT)FMS/mosaic	$(SRCROOT)FMS/mosaic/create_xgrid.c
-data_override.o: $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/include/file_version.h constants.o mpp_io.o mpp.o horiz_interp.o time_interp_external.o time_interp_external2.o fms.o fms_io.o axis_utils.o axis_utils2.o mpp_domains.o time_manager.o fms2_io.o get_grid_version_mpp.o get_grid_version_fms2io.o
+data_override.o: $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/include/file_version.h constants.o mpp_io.o mpp.o horiz_interp.o time_interp_external.o time_interp_external2.o fms.o axis_utils.o axis_utils2.o fms_io.o mpp_domains.o time_manager.o fms2_io.o get_grid_version_mpp.o get_grid_version_fms2io.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/data_override/data_override.F90
 diag_axis.o: $(SRCROOT)FMS/diag_manager/diag_axis.F90 $(SRCROOT)FMS/include/file_version.h platform.o mpp_domains.o fms.o diag_data.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/diag_manager/diag_axis.F90
@@ -51,7 +51,7 @@ diag_output.o: $(SRCROOT)FMS/diag_manager/diag_output.F90 platform.o mpp_io.o mp
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/diag_manager/diag_output.F90
 diag_table.o: $(SRCROOT)FMS/diag_manager/diag_table.F90 mpp_io.o mpp.o fms.o time_manager.o constants.o diag_data.o diag_util.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/diag_manager/diag_table.F90
-diag_util.o: $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/include/file_version.h platform.o diag_data.o diag_axis.o diag_output.o diag_grid.o fms.o fms_io.o mpp_domains.o time_manager.o mpp_io.o mpp.o constants.o fms2_io.o
+diag_util.o: $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/include/file_version.h platform.o diag_data.o diag_axis.o diag_output.o diag_grid.o fms.o fms_io.o fms2_io.o mpp_domains.o time_manager.o mpp_io.o mpp.o constants.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/diag_manager/diag_util.F90
 drifters.o: $(SRCROOT)FMS/drifters/drifters.F90 $(SRCROOT)FMS/drifters/fms_switches.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/drifters/drifters_push.h $(SRCROOT)FMS/drifters/drifters_set_field.h $(SRCROOT)FMS/drifters/drifters_compute_k.h mpp.o mpp_domains.o drifters_core.o drifters_input.o drifters_io.o drifters_comm.o cloud_interpolator.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/drifters -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/drifters/drifters.F90
@@ -63,13 +63,13 @@ drifters_input.o: $(SRCROOT)FMS/drifters/drifters_input.F90 $(SRCROOT)FMS/includ
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/drifters/drifters_input.F90
 drifters_io.o: $(SRCROOT)FMS/drifters/drifters_io.F90 $(SRCROOT)FMS/include/file_version.h
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/drifters/drifters_io.F90
-ensemble_manager.o: $(SRCROOT)FMS/coupler/ensemble_manager.F90 fms.o mpp.o fms_io.o
+ensemble_manager.o: $(SRCROOT)FMS/coupler/ensemble_manager.F90 fms.o mpp.o fms2_io.o fms_io.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/coupler/ensemble_manager.F90
 field_manager.o: $(SRCROOT)FMS/field_manager/field_manager.F90 $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/field_manager/parse.inc mpp.o mpp_io.o fms.o fms2_io.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include -I$(SRCROOT)FMS/field_manager	$(SRCROOT)FMS/field_manager/field_manager.F90
 fm_util.o: $(SRCROOT)FMS/field_manager/fm_util.F90 $(SRCROOT)FMS/include/file_version.h field_manager.o fms.o mpp.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/field_manager/fm_util.F90
-fms.o: $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/include/file_version.h mpp.o mpp_domains.o mpp_io.o fms_io.o fms2_io.o memutils.o constants.o
+fms.o: $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/include/file_version.h mpp.o mpp_domains.o mpp_io.o fms_io.o fms2_io.o memutils.o grid2.o constants.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/fms/fms.F90
 fms2_io.o: $(SRCROOT)FMS/fms2_io/fms2_io.F90 fms_io_utils.o netcdf_io.o fms_netcdf_domain_io.o fms_netcdf_unstructured_domain_io.o blackboxio.o mpp.o mpp_domains.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/fms2_io/fms2_io.F90
@@ -77,12 +77,14 @@ fms_affinity.o: $(SRCROOT)FMS/affinity/fms_affinity.F90 $(SRCROOT)FMS/include/fi
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/affinity/fms_affinity.F90
 fms_io.o: $(SRCROOT)FMS/fms/fms_io.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/fms/read_data_2d.inc $(SRCROOT)FMS/fms/read_data_3d.inc $(SRCROOT)FMS/fms/read_data_4d.inc $(SRCROOT)FMS/fms/write_data.inc $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc mpp_io.o mpp_domains.o mpp.o platform.o mpp_parameter.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include -I$(SRCROOT)FMS/fms	$(SRCROOT)FMS/fms/fms_io.F90
-fms_io_utils.o: $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/fms2_io/include/get_checksum.inc mpp.o platform.o
+fms_io_utils.o: $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/fms2_io/include/get_checksum.inc mpp.o mpp_domains.o platform.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/fms2_io/include	$(SRCROOT)FMS/fms2_io/fms_io_utils.F90
 fms_netcdf_domain_io.o: $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/domain_read.inc $(SRCROOT)FMS/fms2_io/include/domain_write.inc $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc mpp.o mpp_domains.o fms_io_utils.o netcdf_io.o platform.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/fms2_io/include	$(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90
 fms_netcdf_unstructured_domain_io.o: $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc mpp_domains.o fms_io_utils.o netcdf_io.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/fms2_io/include	$(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90
+fmsconstants.o: $(SRCROOT)FMS/constants/fmsconstants.F90 constants.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/constants/fmsconstants.F90
 gaussian_topog.o: $(SRCROOT)FMS/topography/gaussian_topog.F90 $(SRCROOT)FMS/include/file_version.h fms.o constants.o mpp.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/topography/gaussian_topog.F90
 get_cal_time.o: $(SRCROOT)FMS/time_manager/get_cal_time.F90 $(SRCROOT)FMS/include/file_version.h fms.o time_manager.o mpp.o
@@ -95,15 +97,17 @@ gradient.o: $(SRCROOT)FMS/mosaic/gradient.F90 $(SRCROOT)FMS/include/file_version
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic/gradient.F90
 gradient_c2l.o: $(SRCROOT)FMS/mosaic/gradient_c2l.c $(SRCROOT)FMS/mosaic/constant.h $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/mosaic/gradient_c2l.h
 	$(CC) $(CPPDEFS) $(CPPFLAGS) $(CFLAGS) $(OTHERFLAGS) $(OTHER_CFLAGS) -c -I$(SRCROOT)FMS/mosaic	$(SRCROOT)FMS/mosaic/gradient_c2l.c
-grid.o: $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/include/file_version.h mpp.o constants.o fms.o fms_io.o mosaic.o mpp_domains.o
+grid.o: $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/include/file_version.h mpp.o constants.o fms_io.o mosaic.o mpp_domains.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic/grid.F90
+grid2.o: $(SRCROOT)FMS/mosaic2/grid2.F90 $(SRCROOT)FMS/include/file_version.h mpp.o constants.o fms2_io.o mosaic2.o mpp_domains.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic2/grid2.F90
 horiz_interp.o: $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 $(SRCROOT)FMS/include/file_version.h fms.o mpp.o constants.o horiz_interp_type.o horiz_interp_conserve.o horiz_interp_bilinear.o horiz_interp_bicubic.o horiz_interp_spherical.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/horiz_interp/horiz_interp.F90
 horiz_interp_bicubic.o: $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 $(SRCROOT)FMS/include/file_version.h mpp.o fms.o horiz_interp_type.o constants.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90
 horiz_interp_bilinear.o: $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 $(SRCROOT)FMS/include/file_version.h mpp.o fms.o constants.o horiz_interp_type.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90
-horiz_interp_conserve.o: $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h mpp.o fms.o fms_io.o constants.o horiz_interp_type.o
+horiz_interp_conserve.o: $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h mpp.o fms.o grid2.o constants.o horiz_interp_type.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90
 horiz_interp_spherical.o: $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 $(SRCROOT)FMS/include/file_version.h mpp.o fms.o constants.o horiz_interp_type.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90
@@ -113,6 +117,8 @@ interp.o: $(SRCROOT)FMS/mosaic/interp.c $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRC
 	$(CC) $(CPPDEFS) $(CPPFLAGS) $(CFLAGS) $(OTHERFLAGS) $(OTHER_CFLAGS) -c -I$(SRCROOT)FMS/mosaic	$(SRCROOT)FMS/mosaic/interp.c
 interpolator.o: $(SRCROOT)FMS/interpolator/interpolator.F90 $(SRCROOT)FMS/include/file_version.h mpp.o mpp_io.o mpp_domains.o diag_manager.o fms.o fms2_io.o horiz_interp.o time_manager.o time_interp.o constants.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/interpolator/interpolator.F90
+libFMS.o: $(SRCROOT)FMS/libFMS.F90 $(SRCROOT)FMS/include/file_version.h fms_affinity.o amip_interp.o astronomy.o axis_utils2.o block_control.o column_diagnostics.o coupler_types.o ensemble_manager.o atmos_ocean_fluxes.o data_override.o diag_integral.o diag_manager.o xgrid.o stock_constants.o field_manager.o fm_util.o fms2_io.o fms.o horiz_interp.o horiz_interp_type.o interpolator.o memutils.o monin_obukhov.o monin_obukhov_inter.o mosaic2.o grid2.o gradient.o mpp.o mpp_parameter.o mpp_data.o mpp_utilities.o mpp_memutils.o mpp_efp.o mpp_domains.o platform.o random_numbers.o sat_vapor_pres.o time_interp.o time_interp_external2.o time_manager.o get_cal_time.o gaussian_topog.o topography.o tracer_manager.o tridiagonal.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/libFMS.F90
 memutils.o: $(SRCROOT)FMS/memutils/memutils.F90 mpp.o mpp_memutils.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/memutils/memutils.F90
 mersennetwister.o: $(SRCROOT)FMS/random_numbers/mersennetwister.F90
@@ -121,10 +127,10 @@ monin_obukhov.o: $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 $(SRCROOT)FMS/inc
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90
 monin_obukhov_inter.o: $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90
-mosaic.o: $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/include/file_version.h fms.o mpp.o mpp_io.o fms_io.o constants.o
+mosaic.o: $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/include/file_version.h mpp.o mpp_io.o fms_io.o constants.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic/mosaic.F90
-mosaic2.o: $(SRCROOT)FMS/mosaic/mosaic2.F90 $(SRCROOT)FMS/include/file_version.h fms.o mpp.o mpp_domains.o constants.o fms2_io.o
-	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic/mosaic2.F90
+mosaic2.o: $(SRCROOT)FMS/mosaic2/mosaic2.F90 $(SRCROOT)FMS/include/file_version.h mpp.o mpp_domains.o constants.o fms2_io.o
+	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mosaic2/mosaic2.F90
 mosaic_util.o: $(SRCROOT)FMS/mosaic/mosaic_util.c $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/mosaic/constant.h
 	$(CC) $(CPPDEFS) $(CPPFLAGS) $(CFLAGS) $(OTHERFLAGS) $(OTHER_CFLAGS) -c -I$(SRCROOT)FMS/mosaic	$(SRCROOT)FMS/mosaic/mosaic_util.c
 mpp.o: $(SRCROOT)FMS/mpp/mpp.F90 $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/mpp/include/system_clock.h $(SRCROOT)FMS/mpp/include/mpp_util.inc $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h $(SRCROOT)FMS/mpp/include/mpp_comm.inc $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h $(SRCROOT)FMS/mpp/include/mpp_transmit.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h $(SRCROOT)FMS/mpp/include/mpp_sum.inc $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h $(SRCROOT)FMS/mpp/include/mpp_chksum.h $(SRCROOT)FMS/mpp/include/mpp_gather.h $(SRCROOT)FMS/mpp/include/mpp_scatter.h mpp_parameter.o mpp_data.o platform.o
@@ -145,7 +151,7 @@ mpp_parameter.o: $(SRCROOT)FMS/mpp/mpp_parameter.F90 $(SRCROOT)FMS/include/file_
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mpp/mpp_parameter.F90
 mpp_utilities.o: $(SRCROOT)FMS/mpp/mpp_utilities.F90 $(SRCROOT)FMS/include/file_version.h mpp.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/mpp/mpp_utilities.F90
-netcdf_io.o: $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/fms2_io/include/compressed_read.inc mpp.o fms_io_utils.o platform.o
+netcdf_io.o: $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/fms2_io/include/compressed_read.inc $(SRCROOT)FMS/fms2_io/include/scatter_data_bc.inc $(SRCROOT)FMS/fms2_io/include/gather_data_bc.inc mpp.o fms_io_utils.o platform.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/fms2_io/include	$(SRCROOT)FMS/fms2_io/netcdf_io.F90
 platform.o: $(SRCROOT)FMS/platform/platform.F90 $(SRCROOT)FMS/include/fms_platform.h
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/platform/platform.F90
@@ -177,445 +183,455 @@ tridiagonal.o: $(SRCROOT)FMS/tridiagonal/tridiagonal.F90
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c	$(SRCROOT)FMS/tridiagonal/tridiagonal.F90
 xgrid.o: $(SRCROOT)FMS/exchange/xgrid.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/include/file_version.h fms.o mpp.o mpp_domains.o constants.o mosaic2.o stock_constants.o gradient.o fms2_io.o mpp_io.o fms_io.o mosaic.o time_manager.o diag_manager.o
 	$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) $(OTHERFLAGS) $(OTHER_FFLAGS) -c -I$(SRCROOT)FMS/include	$(SRCROOT)FMS/exchange/xgrid.F90
-./gradient_c2l.h: $(SRCROOT)FMS/mosaic/gradient_c2l.h
-	cp $(SRCROOT)FMS/mosaic/gradient_c2l.h .
-./fms_switches.h: $(SRCROOT)FMS/drifters/fms_switches.h
-	cp $(SRCROOT)FMS/drifters/fms_switches.h .
-./compressed_read.inc: $(SRCROOT)FMS/fms2_io/include/compressed_read.inc
-	cp $(SRCROOT)FMS/fms2_io/include/compressed_read.inc .
-./diag_output.F90: $(SRCROOT)FMS/diag_manager/diag_output.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_output.F90 .
-./mpp_util_mpi.inc: $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc .
-./diag_data.F90: $(SRCROOT)FMS/diag_manager/diag_data.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_data.F90 .
-./mpp_transmit.inc: $(SRCROOT)FMS/mpp/include/mpp_transmit.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_transmit.inc .
-./get_data_type_string.inc: $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc
-	cp $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc .
-./fms_io_unstructured_get_file_name.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc .
-./mpp_do_updateV_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h .
-./mpp_get_boundary_ad.h: $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h .
-./mpp_global_field_ad.h: $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h .
-./diag_util.F90: $(SRCROOT)FMS/diag_manager/diag_util.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_util.F90 .
-./mpp_unstruct_pass_data.h: $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h .
-./data_override.F90: $(SRCROOT)FMS/data_override/data_override.F90
-	cp $(SRCROOT)FMS/data_override/data_override.F90 .
-./mpp_error_a_s.h: $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h .
-./mpp_alltoall_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h .
-./fms_affinity.F90: $(SRCROOT)FMS/affinity/fms_affinity.F90
-	cp $(SRCROOT)FMS/affinity/fms_affinity.F90 .
-./mpp_chksum_int.h: $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h .
-./mpp_write.h: $(SRCROOT)FMS/mpp/include/mpp_write.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_write.h .
-./read_data_4d.inc: $(SRCROOT)FMS/fms/read_data_4d.inc
-	cp $(SRCROOT)FMS/fms/read_data_4d.inc .
-./read_mosaic.c: $(SRCROOT)FMS/mosaic/read_mosaic.c
-	cp $(SRCROOT)FMS/mosaic/read_mosaic.c .
-./tracer_manager.F90: $(SRCROOT)FMS/tracer_manager/tracer_manager.F90
-	cp $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 .
-./mpp_io_misc.inc: $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc .
-./mpp_sum_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h .
-./sat_vapor_pres.F90: $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90
-	cp $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 .
-./mpp_do_updateV.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h .
-./mpp_group_update.h: $(SRCROOT)FMS/mpp/include/mpp_group_update.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_group_update.h .
-./mpp_write_2Ddecomp.h: $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h .
-./mpp_do_check.h: $(SRCROOT)FMS/mpp/include/mpp_do_check.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_check.h .
-./read_data_3d.inc: $(SRCROOT)FMS/fms/read_data_3d.inc
-	cp $(SRCROOT)FMS/fms/read_data_3d.inc .
-./ensemble_manager.F90: $(SRCROOT)FMS/coupler/ensemble_manager.F90
-	cp $(SRCROOT)FMS/coupler/ensemble_manager.F90 .
-./drifters_comm.F90: $(SRCROOT)FMS/drifters/drifters_comm.F90
-	cp $(SRCROOT)FMS/drifters/drifters_comm.F90 .
-./write_data.inc: $(SRCROOT)FMS/fms/write_data.inc
-	cp $(SRCROOT)FMS/fms/write_data.inc .
-./mosaic2.F90: $(SRCROOT)FMS/mosaic/mosaic2.F90
-	cp $(SRCROOT)FMS/mosaic/mosaic2.F90 .
-./mpp_do_updateV_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h .
-./mersennetwister.F90: $(SRCROOT)FMS/random_numbers/mersennetwister.F90
-	cp $(SRCROOT)FMS/random_numbers/mersennetwister.F90 .
-./mpp_io_connect.inc: $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc .
-./astronomy.F90: $(SRCROOT)FMS/astronomy/astronomy.F90
-	cp $(SRCROOT)FMS/astronomy/astronomy.F90 .
-./horiz_interp_spherical.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 .
+./block_control.F90: $(SRCROOT)FMS/block_control/block_control.F90
+	cp $(SRCROOT)FMS/block_control/block_control.F90 .
+./group_update_unpack.inc: $(SRCROOT)FMS/mpp/include/group_update_unpack.inc
+	cp $(SRCROOT)FMS/mpp/include/group_update_unpack.inc .
+./memutils.F90: $(SRCROOT)FMS/memutils/memutils.F90
+	cp $(SRCROOT)FMS/memutils/memutils.F90 .
 ./mosaic.F90: $(SRCROOT)FMS/mosaic/mosaic.F90
 	cp $(SRCROOT)FMS/mosaic/mosaic.F90 .
-./cloud_interpolator.F90: $(SRCROOT)FMS/drifters/cloud_interpolator.F90
-	cp $(SRCROOT)FMS/drifters/cloud_interpolator.F90 .
+./mpp_get_boundary_ad.h: $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h .
 ./mpp_sum_mpi_ad.h: $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h .
-./mpp_domains_comm.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc .
-./mpp_error_s_a.h: $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h .
-./axis_utils2.F90: $(SRCROOT)FMS/axis_utils/axis_utils2.F90
-	cp $(SRCROOT)FMS/axis_utils/axis_utils2.F90 .
-./drifters_compute_k.h: $(SRCROOT)FMS/drifters/drifters_compute_k.h
-	cp $(SRCROOT)FMS/drifters/drifters_compute_k.h .
+./fms_affinity.F90: $(SRCROOT)FMS/affinity/fms_affinity.F90
+	cp $(SRCROOT)FMS/affinity/fms_affinity.F90 .
+./mpp_comm.inc: $(SRCROOT)FMS/mpp/include/mpp_comm.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_comm.inc .
+./xgrid.F90: $(SRCROOT)FMS/exchange/xgrid.F90
+	cp $(SRCROOT)FMS/exchange/xgrid.F90 .
+./mpp_alltoall_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h .
 ./mpp_update_domains2D_ad.h: $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h .
-./monin_obukhov.F90: $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90
-	cp $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 .
-./fms_io_unstructured_save_restart.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc .
-./horiz_interp_bicubic.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 .
-./topography.F90: $(SRCROOT)FMS/topography/topography.F90
-	cp $(SRCROOT)FMS/topography/topography.F90 .
-./netcdf_io.F90: $(SRCROOT)FMS/fms2_io/netcdf_io.F90
-	cp $(SRCROOT)FMS/fms2_io/netcdf_io.F90 .
+./mpp_io_unstructured_read.inc: $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc .
+./mpp_io_read.inc: $(SRCROOT)FMS/mpp/include/mpp_io_read.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_read.inc .
+./mpp_data_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc .
+./monin_obukhov_inter.F90: $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90
+	cp $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 .
 ./unstructured_domain_read.inc: $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc
 	cp $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc .
-./register_domain_restart_variable.inc: $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc
-	cp $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc .
-./fms_io_unstructured_read.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc .
-./horiz_interp_conserve.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 .
-./mpp_chksum.h: $(SRCROOT)FMS/mpp/include/mpp_chksum.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_chksum.h .
-./mpp_io_unstructured_write.inc: $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc .
+./astronomy.F90: $(SRCROOT)FMS/astronomy/astronomy.F90
+	cp $(SRCROOT)FMS/astronomy/astronomy.F90 .
+./affinity.c: $(SRCROOT)FMS/affinity/affinity.c
+	cp $(SRCROOT)FMS/affinity/affinity.c .
+./fms_io.F90: $(SRCROOT)FMS/fms/fms_io.F90
+	cp $(SRCROOT)FMS/fms/fms_io.F90 .
 ./amip_interp.F90: $(SRCROOT)FMS/amip_interp/amip_interp.F90
 	cp $(SRCROOT)FMS/amip_interp/amip_interp.F90 .
-./mpp_read_compressed.h: $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h .
-./drifters_input.F90: $(SRCROOT)FMS/drifters/drifters_input.F90
-	cp $(SRCROOT)FMS/drifters/drifters_input.F90 .
+./mpp_read_distributed_ascii.inc: $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc .
+./mpp_global_sum.h: $(SRCROOT)FMS/mpp/include/mpp_global_sum.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_global_sum.h .
+./diag_manager.F90: $(SRCROOT)FMS/diag_manager/diag_manager.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_manager.F90 .
+./mpp_do_update_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h .
+./mpp_write.h: $(SRCROOT)FMS/mpp/include/mpp_write.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_write.h .
+./mpp_sum_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h .
+./mpp_io_util.inc: $(SRCROOT)FMS/mpp/include/mpp_io_util.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_util.inc .
+./mpp_transmit_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h .
 ./netcdf_read_data.inc: $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc
 	cp $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc .
-./mpp_scatter.h: $(SRCROOT)FMS/mpp/include/mpp_scatter.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_scatter.h .
-./mpp_data_mpi.inc: $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc .
+./drifters_comm.F90: $(SRCROOT)FMS/drifters/drifters_comm.F90
+	cp $(SRCROOT)FMS/drifters/drifters_comm.F90 .
+./diag_output.F90: $(SRCROOT)FMS/diag_manager/diag_output.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_output.F90 .
+./mpp_write_2Ddecomp.h: $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h .
+./mpp_chksum.h: $(SRCROOT)FMS/mpp/include/mpp_chksum.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_chksum.h .
+./fmsconstants.F90: $(SRCROOT)FMS/constants/fmsconstants.F90
+	cp $(SRCROOT)FMS/constants/fmsconstants.F90 .
+./quicksort.F90: $(SRCROOT)FMS/drifters/quicksort.F90
+	cp $(SRCROOT)FMS/drifters/quicksort.F90 .
+./fm_util.F90: $(SRCROOT)FMS/field_manager/fm_util.F90
+	cp $(SRCROOT)FMS/field_manager/fm_util.F90 .
+./mpp_util.inc: $(SRCROOT)FMS/mpp/include/mpp_util.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_util.inc .
+./horiz_interp_bilinear.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 .
+./mpp_group_update.h: $(SRCROOT)FMS/mpp/include/mpp_group_update.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_group_update.h .
+./time_manager.F90: $(SRCROOT)FMS/time_manager/time_manager.F90
+	cp $(SRCROOT)FMS/time_manager/time_manager.F90 .
+./fms_io_unstructured_field_exist.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc .
 ./gaussian_topog.F90: $(SRCROOT)FMS/topography/gaussian_topog.F90
 	cp $(SRCROOT)FMS/topography/gaussian_topog.F90 .
-./get_variable_attribute.inc: $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc
-	cp $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc .
-./fms_io_unstructured_file_unit.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc .
-./mpp_do_update_nest.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h .
-./get_global_attribute.inc: $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc
-	cp $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc .
-./mpp_util_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc .
-./mpp_reduce_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h .
-./create_xgrid.c: $(SRCROOT)FMS/mosaic/create_xgrid.c
-	cp $(SRCROOT)FMS/mosaic/create_xgrid.c .
-./mpp_utilities.F90: $(SRCROOT)FMS/mpp/mpp_utilities.F90
-	cp $(SRCROOT)FMS/mpp/mpp_utilities.F90 .
-./fms_io_utils.F90: $(SRCROOT)FMS/fms2_io/fms_io_utils.F90
-	cp $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 .
-./group_update_unpack.inc: $(SRCROOT)FMS/mpp/include/group_update_unpack.inc
-	cp $(SRCROOT)FMS/mpp/include/group_update_unpack.inc .
-./mpp_do_checkV.h: $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h .
-./drifters_push.h: $(SRCROOT)FMS/drifters/drifters_push.h
-	cp $(SRCROOT)FMS/drifters/drifters_push.h .
-./fms_io_unstructured_register_restart_axis.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc .
-./mpp_sum_ad.inc: $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc .
-./mpp_data.F90: $(SRCROOT)FMS/mpp/mpp_data.F90
-	cp $(SRCROOT)FMS/mpp/mpp_data.F90 .
-./fms_io_unstructured_get_field_size.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc .
-./get_cal_time.F90: $(SRCROOT)FMS/time_manager/get_cal_time.F90
-	cp $(SRCROOT)FMS/time_manager/get_cal_time.F90 .
-./mpp_domains.F90: $(SRCROOT)FMS/mpp/mpp_domains.F90
-	cp $(SRCROOT)FMS/mpp/mpp_domains.F90 .
-./mpp_do_update_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h .
-./column_diagnostics.F90: $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90
-	cp $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 .
-./mpp_update_domains2D_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h .
+./write_data.inc: $(SRCROOT)FMS/fms/write_data.inc
+	cp $(SRCROOT)FMS/fms/write_data.inc .
+./stock_constants.F90: $(SRCROOT)FMS/exchange/stock_constants.F90
+	cp $(SRCROOT)FMS/exchange/stock_constants.F90 .
+./mpp_read_distributed_ascii.h: $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h .
+./coupler_types.F90: $(SRCROOT)FMS/coupler/coupler_types.F90
+	cp $(SRCROOT)FMS/coupler/coupler_types.F90 .
+./fms_netcdf_unstructured_domain_io.F90: $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90
+	cp $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 .
+./parse.inc: $(SRCROOT)FMS/field_manager/parse.inc
+	cp $(SRCROOT)FMS/field_manager/parse.inc .
+./mersennetwister.F90: $(SRCROOT)FMS/random_numbers/mersennetwister.F90
+	cp $(SRCROOT)FMS/random_numbers/mersennetwister.F90 .
 ./mpp_comm_mpi.inc: $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc
 	cp $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc .
-./constants.F90: $(SRCROOT)FMS/constants/constants.F90
-	cp $(SRCROOT)FMS/constants/constants.F90 .
-./mpp_sum.inc: $(SRCROOT)FMS/mpp/include/mpp_sum.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_sum.inc .
-./register_variable_attribute.inc: $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc
-	cp $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc .
-./mpp_io_unstructured_read.inc: $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc .
-./mpp_do_global_field.h: $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h .
-./mpp_gather.h: $(SRCROOT)FMS/mpp/include/mpp_gather.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_gather.h .
-./system_clock.h: $(SRCROOT)FMS/mpp/include/system_clock.h
-	cp $(SRCROOT)FMS/mpp/include/system_clock.h .
 ./mpp_get_boundary.h: $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h .
-./time_interp_external.F90: $(SRCROOT)FMS/time_interp/time_interp_external.F90
-	cp $(SRCROOT)FMS/time_interp/time_interp_external.F90 .
+./mpp_sum_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h .
+./mpp_do_updateV.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h .
+./constants.F90: $(SRCROOT)FMS/constants/constants.F90
+	cp $(SRCROOT)FMS/constants/constants.F90 .
+./create_xgrid.h: $(SRCROOT)FMS/mosaic/create_xgrid.h
+	cp $(SRCROOT)FMS/mosaic/create_xgrid.h .
 ./mpp_read_2Ddecomp.h: $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h .
-./mpp_read_distributed_ascii.inc: $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc .
-./get_grid_version_mpp.F90: $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90
-	cp $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 .
-./array_utils_char.inc: $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc
-	cp $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc .
-./fm_util.F90: $(SRCROOT)FMS/field_manager/fm_util.F90
-	cp $(SRCROOT)FMS/field_manager/fm_util.F90 .
+./array_utils.inc: $(SRCROOT)FMS/fms2_io/include/array_utils.inc
+	cp $(SRCROOT)FMS/fms2_io/include/array_utils.inc .
+./mpp_transmit.inc: $(SRCROOT)FMS/mpp/include/mpp_transmit.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_transmit.inc .
+./horiz_interp_spherical.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 .
+./mpp_domains_util.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc .
+./mpp_do_updateV_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h .
+./mpp_do_redistribute.h: $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h .
+./mpp_error_a_s.h: $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h .
+./compute_global_checksum.inc: $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc
+	cp $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc .
+./mpp_data.F90: $(SRCROOT)FMS/mpp/mpp_data.F90
+	cp $(SRCROOT)FMS/mpp/mpp_data.F90 .
+./mpp_scatter.h: $(SRCROOT)FMS/mpp/include/mpp_scatter.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_scatter.h .
+./tracer_manager.F90: $(SRCROOT)FMS/tracer_manager/tracer_manager.F90
+	cp $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 .
 ./mpp_io_write.inc: $(SRCROOT)FMS/mpp/include/mpp_io_write.inc
 	cp $(SRCROOT)FMS/mpp/include/mpp_io_write.inc .
-./netcdf_write_data.inc: $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc
-	cp $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc .
-./compressed_write.inc: $(SRCROOT)FMS/fms2_io/include/compressed_write.inc
-	cp $(SRCROOT)FMS/fms2_io/include/compressed_write.inc .
-./mpp_io.F90: $(SRCROOT)FMS/mpp/mpp_io.F90
-	cp $(SRCROOT)FMS/mpp/mpp_io.F90 .
-./create_xgrid.h: $(SRCROOT)FMS/mosaic/create_xgrid.h
-	cp $(SRCROOT)FMS/mosaic/create_xgrid.h .
-./mpp_read_distributed_ascii.h: $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h .
-./axis_utils.F90: $(SRCROOT)FMS/axis_utils/axis_utils.F90
-	cp $(SRCROOT)FMS/axis_utils/axis_utils.F90 .
-./mpp_io_util.inc: $(SRCROOT)FMS/mpp/include/mpp_io_util.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_util.inc .
-./gradient_c2l.c: $(SRCROOT)FMS/mosaic/gradient_c2l.c
-	cp $(SRCROOT)FMS/mosaic/gradient_c2l.c .
-./interp.c: $(SRCROOT)FMS/mosaic/interp.c
-	cp $(SRCROOT)FMS/mosaic/interp.c .
-./horiz_interp_type.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 .
+./mpp_util_mpi.inc: $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc .
 ./platform.F90: $(SRCROOT)FMS/platform/platform.F90
 	cp $(SRCROOT)FMS/platform/platform.F90 .
-./mpp_global_sum.h: $(SRCROOT)FMS/mpp/include/mpp_global_sum.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_global_sum.h .
-./unstructured_domain_write.inc: $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc
-	cp $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc .
-./tridiagonal.F90: $(SRCROOT)FMS/tridiagonal/tridiagonal.F90
-	cp $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 .
-./mpp_io_read.inc: $(SRCROOT)FMS/mpp/include/mpp_io_read.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_io_read.inc .
-./diag_axis.F90: $(SRCROOT)FMS/diag_manager/diag_axis.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_axis.F90 .
-./mpp_do_update_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h .
-./domain_read.inc: $(SRCROOT)FMS/fms2_io/include/domain_read.inc
-	cp $(SRCROOT)FMS/fms2_io/include/domain_read.inc .
-./quicksort.F90: $(SRCROOT)FMS/drifters/quicksort.F90
-	cp $(SRCROOT)FMS/drifters/quicksort.F90 .
-./mpp_comm.inc: $(SRCROOT)FMS/mpp/include/mpp_comm.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_comm.inc .
-./time_interp_external2.F90: $(SRCROOT)FMS/time_interp/time_interp_external2.F90
-	cp $(SRCROOT)FMS/time_interp/time_interp_external2.F90 .
-./fms_platform.h: $(SRCROOT)FMS/include/fms_platform.h
-	cp $(SRCROOT)FMS/include/fms_platform.h .
-./grid.F90: $(SRCROOT)FMS/mosaic/grid.F90
-	cp $(SRCROOT)FMS/mosaic/grid.F90 .
-./mpp_update_nest_domains.h: $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h .
-./drifters_core.F90: $(SRCROOT)FMS/drifters/drifters_core.F90
-	cp $(SRCROOT)FMS/drifters/drifters_core.F90 .
+./mpp_utilities.F90: $(SRCROOT)FMS/mpp/mpp_utilities.F90
+	cp $(SRCROOT)FMS/mpp/mpp_utilities.F90 .
+./cloud_interpolator.F90: $(SRCROOT)FMS/drifters/cloud_interpolator.F90
+	cp $(SRCROOT)FMS/drifters/cloud_interpolator.F90 .
 ./mpp_chksum_scalar.h: $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h .
-./memutils.F90: $(SRCROOT)FMS/memutils/memutils.F90
-	cp $(SRCROOT)FMS/memutils/memutils.F90 .
-./mpp_transmit_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h .
-./mpp_do_get_boundary.h: $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h .
-./drifters.F90: $(SRCROOT)FMS/drifters/drifters.F90
-	cp $(SRCROOT)FMS/drifters/drifters.F90 .
-./diag_integral.F90: $(SRCROOT)FMS/diag_integral/diag_integral.F90
-	cp $(SRCROOT)FMS/diag_integral/diag_integral.F90 .
+./gradient_c2l.c: $(SRCROOT)FMS/mosaic/gradient_c2l.c
+	cp $(SRCROOT)FMS/mosaic/gradient_c2l.c .
+./fms_io_unstructured_register_restart_field.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc .
+./mpp_domains.F90: $(SRCROOT)FMS/mpp/mpp_domains.F90
+	cp $(SRCROOT)FMS/mpp/mpp_domains.F90 .
+./domain_write.inc: $(SRCROOT)FMS/fms2_io/include/domain_write.inc
+	cp $(SRCROOT)FMS/fms2_io/include/domain_write.inc .
+./mpp_global_reduce.h: $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h .
+./mpp_do_global_field.h: $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h .
+./data_override.F90: $(SRCROOT)FMS/data_override/data_override.F90
+	cp $(SRCROOT)FMS/data_override/data_override.F90 .
+./fms_platform.h: $(SRCROOT)FMS/include/fms_platform.h
+	cp $(SRCROOT)FMS/include/fms_platform.h .
 ./register_unstructured_domain_restart_variable.inc: $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc
 	cp $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc .
+./diag_util.F90: $(SRCROOT)FMS/diag_manager/diag_util.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_util.F90 .
+./mpp_write_unlimited_axis.h: $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h .
 ./mpp_error_a_a.h: $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h .
-./atmos_ocean_fluxes.F90: $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90
-	cp $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 .
-./fms_io_unstructured_get_file_unit.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc .
-./horiz_interp.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 .
-./interp.h: $(SRCROOT)FMS/mosaic/interp.h
-	cp $(SRCROOT)FMS/mosaic/interp.h .
-./diag_manager.F90: $(SRCROOT)FMS/diag_manager/diag_manager.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_manager.F90 .
+./get_data_type_string.inc: $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc
+	cp $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc .
+./read_data_4d.inc: $(SRCROOT)FMS/fms/read_data_4d.inc
+	cp $(SRCROOT)FMS/fms/read_data_4d.inc .
+./diag_data.F90: $(SRCROOT)FMS/diag_manager/diag_data.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_data.F90 .
+./mpp_type_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h .
 ./time_interp.F90: $(SRCROOT)FMS/time_interp/time_interp.F90
 	cp $(SRCROOT)FMS/time_interp/time_interp.F90 .
-./read_mosaic.h: $(SRCROOT)FMS/mosaic/read_mosaic.h
-	cp $(SRCROOT)FMS/mosaic/read_mosaic.h .
-./mpp_unstruct_domain.inc: $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc .
-./read_data_2d.inc: $(SRCROOT)FMS/fms/read_data_2d.inc
-	cp $(SRCROOT)FMS/fms/read_data_2d.inc .
-./mpp_sum_nocomm_ad.h: $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h .
-./file_version.h: $(SRCROOT)FMS/include/file_version.h
-	cp $(SRCROOT)FMS/include/file_version.h .
+./mpp_do_update.h: $(SRCROOT)FMS/mpp/include/mpp_do_update.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_update.h .
+./netcdf_io.F90: $(SRCROOT)FMS/fms2_io/netcdf_io.F90
+	cp $(SRCROOT)FMS/fms2_io/netcdf_io.F90 .
 ./sat_vapor_pres_k.F90: $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90
 	cp $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90 .
-./diag_table.F90: $(SRCROOT)FMS/diag_manager/diag_table.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_table.F90 .
-./mpp.F90: $(SRCROOT)FMS/mpp/mpp.F90
-	cp $(SRCROOT)FMS/mpp/mpp.F90 .
-./fms_io_unstructured_field_exist.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc .
-./array_utils.inc: $(SRCROOT)FMS/fms2_io/include/array_utils.inc
-	cp $(SRCROOT)FMS/fms2_io/include/array_utils.inc .
-./fms_netcdf_domain_io.F90: $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90
-	cp $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 .
-./get_grid_version_fms2io.F90: $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90
-	cp $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 .
-./interpolator.F90: $(SRCROOT)FMS/interpolator/interpolator.F90
-	cp $(SRCROOT)FMS/interpolator/interpolator.F90 .
+./axis_utils2.F90: $(SRCROOT)FMS/axis_utils/axis_utils2.F90
+	cp $(SRCROOT)FMS/axis_utils/axis_utils2.F90 .
+./mpp_domains_define.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc .
+./mpp_memutils.F90: $(SRCROOT)FMS/mpp/mpp_memutils.F90
+	cp $(SRCROOT)FMS/mpp/mpp_memutils.F90 .
+./read_data_3d.inc: $(SRCROOT)FMS/fms/read_data_3d.inc
+	cp $(SRCROOT)FMS/fms/read_data_3d.inc .
 ./field_manager.F90: $(SRCROOT)FMS/field_manager/field_manager.F90
 	cp $(SRCROOT)FMS/field_manager/field_manager.F90 .
-./fms_io_unstructured_register_restart_field.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc .
+./gradient.F90: $(SRCROOT)FMS/mosaic/gradient.F90
+	cp $(SRCROOT)FMS/mosaic/gradient.F90 .
+./mpp_define_nest_domains.inc: $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc .
+./mpp_alltoall_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h .
+./mpp_sum_ad.inc: $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc .
+./get_grid_version_fms2io.F90: $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90
+	cp $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 .
+./constant.h: $(SRCROOT)FMS/mosaic/constant.h
+	cp $(SRCROOT)FMS/mosaic/constant.h .
+./compressed_read.inc: $(SRCROOT)FMS/fms2_io/include/compressed_read.inc
+	cp $(SRCROOT)FMS/fms2_io/include/compressed_read.inc .
+./diag_grid.F90: $(SRCROOT)FMS/diag_manager/diag_grid.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_grid.F90 .
+./group_update_pack.inc: $(SRCROOT)FMS/mpp/include/group_update_pack.inc
+	cp $(SRCROOT)FMS/mpp/include/group_update_pack.inc .
+./mpp_do_checkV.h: $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h .
+./interp.h: $(SRCROOT)FMS/mosaic/interp.h
+	cp $(SRCROOT)FMS/mosaic/interp.h .
+./mpp_write_compressed.h: $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h .
+./read_mosaic.h: $(SRCROOT)FMS/mosaic/read_mosaic.h
+	cp $(SRCROOT)FMS/mosaic/read_mosaic.h .
+./time_interp_external.F90: $(SRCROOT)FMS/time_interp/time_interp_external.F90
+	cp $(SRCROOT)FMS/time_interp/time_interp_external.F90 .
+./fms_io_utils.F90: $(SRCROOT)FMS/fms2_io/fms_io_utils.F90
+	cp $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 .
+./register_variable_attribute.inc: $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc
+	cp $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc .
+./mpp_unstruct_pass_data.h: $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h .
+./mpp_update_domains2D.h: $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h .
+./mpp_global_field_ug.h: $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h .
 ./fms.F90: $(SRCROOT)FMS/fms/fms.F90
 	cp $(SRCROOT)FMS/fms/fms.F90 .
-./fms_io.F90: $(SRCROOT)FMS/fms/fms_io.F90
-	cp $(SRCROOT)FMS/fms/fms_io.F90 .
-./fms_io_unstructured_setup_one_field.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc
-	cp $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc .
+./read_mosaic.c: $(SRCROOT)FMS/mosaic/read_mosaic.c
+	cp $(SRCROOT)FMS/mosaic/read_mosaic.c .
+./register_domain_restart_variable.inc: $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc
+	cp $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc .
+./mpp_domains_reduce.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc .
+./diag_axis.F90: $(SRCROOT)FMS/diag_manager/diag_axis.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_axis.F90 .
+./netcdf_write_data.inc: $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc
+	cp $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc .
+./compressed_write.inc: $(SRCROOT)FMS/fms2_io/include/compressed_write.inc
+	cp $(SRCROOT)FMS/fms2_io/include/compressed_write.inc .
+./mpp_global_field.h: $(SRCROOT)FMS/mpp/include/mpp_global_field.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_global_field.h .
+./mpp_sum.inc: $(SRCROOT)FMS/mpp/include/mpp_sum.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_sum.inc .
+./ensemble_manager.F90: $(SRCROOT)FMS/coupler/ensemble_manager.F90
+	cp $(SRCROOT)FMS/coupler/ensemble_manager.F90 .
+./blackboxio.F90: $(SRCROOT)FMS/fms2_io/blackboxio.F90
+	cp $(SRCROOT)FMS/fms2_io/blackboxio.F90 .
+./fms_io_unstructured_get_file_name.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc .
+./fms_io_unstructured_file_unit.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc .
+./mpp_reduce_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h .
+./get_checksum.inc: $(SRCROOT)FMS/fms2_io/include/get_checksum.inc
+	cp $(SRCROOT)FMS/fms2_io/include/get_checksum.inc .
+./diag_integral.F90: $(SRCROOT)FMS/diag_integral/diag_integral.F90
+	cp $(SRCROOT)FMS/diag_integral/diag_integral.F90 .
+./get_variable_attribute.inc: $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc
+	cp $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc .
+./drifters_core.F90: $(SRCROOT)FMS/drifters/drifters_core.F90
+	cp $(SRCROOT)FMS/drifters/drifters_core.F90 .
 ./mpp_error_s_s.h: $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h .
-./mpp_domains_define.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc .
-./gradient.F90: $(SRCROOT)FMS/mosaic/gradient.F90
-	cp $(SRCROOT)FMS/mosaic/gradient.F90 .
-./mpp_domains_reduce.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc .
+./time_interp_external2.F90: $(SRCROOT)FMS/time_interp/time_interp_external2.F90
+	cp $(SRCROOT)FMS/time_interp/time_interp_external2.F90 .
 ./fms2_io.F90: $(SRCROOT)FMS/fms2_io/fms2_io.F90
 	cp $(SRCROOT)FMS/fms2_io/fms2_io.F90 .
-./fms_netcdf_unstructured_domain_io.F90: $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90
-	cp $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 .
-./drifters_io.F90: $(SRCROOT)FMS/drifters/drifters_io.F90
-	cp $(SRCROOT)FMS/drifters/drifters_io.F90 .
-./mpp_domains_misc.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc .
-./mpp_sum_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h .
-./mosaic_util.c: $(SRCROOT)FMS/mosaic/mosaic_util.c
-	cp $(SRCROOT)FMS/mosaic/mosaic_util.c .
-./group_update_pack.inc: $(SRCROOT)FMS/mpp/include/group_update_pack.inc
-	cp $(SRCROOT)FMS/mpp/include/group_update_pack.inc .
-./mpp_reduce_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h .
-./random_numbers.F90: $(SRCROOT)FMS/random_numbers/random_numbers.F90
-	cp $(SRCROOT)FMS/random_numbers/random_numbers.F90 .
-./mpp_do_redistribute.h: $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h .
-./monin_obukhov_inter.F90: $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90
-	cp $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 .
-./mpp_global_field.h: $(SRCROOT)FMS/mpp/include/mpp_global_field.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_global_field.h .
-./mpp_transmit_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h .
-./mpp_global_field_ug.h: $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h .
-./coupler_types.F90: $(SRCROOT)FMS/coupler/coupler_types.F90
-	cp $(SRCROOT)FMS/coupler/coupler_types.F90 .
-./mpp_type_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h .
-./register_global_attribute.inc: $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc
-	cp $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc .
-./mpp_memutils.F90: $(SRCROOT)FMS/mpp/mpp_memutils.F90
-	cp $(SRCROOT)FMS/mpp/mpp_memutils.F90 .
+./atmos_ocean_fluxes.F90: $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90
+	cp $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 .
+./drifters_push.h: $(SRCROOT)FMS/drifters/drifters_push.h
+	cp $(SRCROOT)FMS/drifters/drifters_push.h .
+./topography.F90: $(SRCROOT)FMS/topography/topography.F90
+	cp $(SRCROOT)FMS/topography/topography.F90 .
+./mpp_io_connect.inc: $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc .
+./sat_vapor_pres.F90: $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90
+	cp $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 .
+./mpp_reduce_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h .
+./fms_netcdf_domain_io.F90: $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90
+	cp $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 .
+./read_data_2d.inc: $(SRCROOT)FMS/fms/read_data_2d.inc
+	cp $(SRCROOT)FMS/fms/read_data_2d.inc .
+./mpp_global_field_ad.h: $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h .
+./mpp_do_get_boundary.h: $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h .
+./mpp_do_update_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h .
+./monin_obukhov.F90: $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90
+	cp $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 .
+./interp.c: $(SRCROOT)FMS/mosaic/interp.c
+	cp $(SRCROOT)FMS/mosaic/interp.c .
+./mpp_parameter.F90: $(SRCROOT)FMS/mpp/mpp_parameter.F90
+	cp $(SRCROOT)FMS/mpp/mpp_parameter.F90 .
 ./mpp_do_get_boundary_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h .
-./constant.h: $(SRCROOT)FMS/mosaic/constant.h
-	cp $(SRCROOT)FMS/mosaic/constant.h .
+./mpp_efp.F90: $(SRCROOT)FMS/mpp/mpp_efp.F90
+	cp $(SRCROOT)FMS/mpp/mpp_efp.F90 .
+./mpp_sum_nocomm_ad.h: $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h .
+./mpp_gather.h: $(SRCROOT)FMS/mpp/include/mpp_gather.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_gather.h .
 ./mpp_do_global_field_ad.h: $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h .
-./domain_write.inc: $(SRCROOT)FMS/fms2_io/include/domain_write.inc
-	cp $(SRCROOT)FMS/fms2_io/include/domain_write.inc .
-./mpp_data_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc .
-./stock_constants.F90: $(SRCROOT)FMS/exchange/stock_constants.F90
-	cp $(SRCROOT)FMS/exchange/stock_constants.F90 .
-./parse.inc: $(SRCROOT)FMS/field_manager/parse.inc
-	cp $(SRCROOT)FMS/field_manager/parse.inc .
-./mpp_parameter.F90: $(SRCROOT)FMS/mpp/mpp_parameter.F90
-	cp $(SRCROOT)FMS/mpp/mpp_parameter.F90 .
+./fms_io_unstructured_get_file_unit.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc .
+./get_global_attribute.inc: $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc
+	cp $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc .
+./mpp_domains_comm.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc .
 ./netcdf_add_restart_variable.inc: $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc
 	cp $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc .
-./block_control.F90: $(SRCROOT)FMS/block_control/block_control.F90
-	cp $(SRCROOT)FMS/block_control/block_control.F90 .
-./mpp_type_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h .
-./mpp_comm_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc .
+./fms_switches.h: $(SRCROOT)FMS/drifters/fms_switches.h
+	cp $(SRCROOT)FMS/drifters/fms_switches.h .
+./mpp_unstruct_domain.inc: $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc .
+./mpp_data_mpi.inc: $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc .
+./interpolator.F90: $(SRCROOT)FMS/interpolator/interpolator.F90
+	cp $(SRCROOT)FMS/interpolator/interpolator.F90 .
+./fms_io_unstructured_get_field_size.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc .
+./fms_io_unstructured_setup_one_field.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc .
+./horiz_interp_bicubic.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 .
+./unstructured_domain_write.inc: $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc
+	cp $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc .
+./file_version.h: $(SRCROOT)FMS/include/file_version.h
+	cp $(SRCROOT)FMS/include/file_version.h .
+./horiz_interp_conserve.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 .
 ./drifters_set_field.h: $(SRCROOT)FMS/drifters/drifters_set_field.h
 	cp $(SRCROOT)FMS/drifters/drifters_set_field.h .
-./mpp_define_nest_domains.inc: $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc .
-./mpp_write_unlimited_axis.h: $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h .
-./get_checksum.inc: $(SRCROOT)FMS/fms2_io/include/get_checksum.inc
-	cp $(SRCROOT)FMS/fms2_io/include/get_checksum.inc .
-./diag_grid.F90: $(SRCROOT)FMS/diag_manager/diag_grid.F90
-	cp $(SRCROOT)FMS/diag_manager/diag_grid.F90 .
-./xgrid.F90: $(SRCROOT)FMS/exchange/xgrid.F90
-	cp $(SRCROOT)FMS/exchange/xgrid.F90 .
-./time_manager.F90: $(SRCROOT)FMS/time_manager/time_manager.F90
-	cp $(SRCROOT)FMS/time_manager/time_manager.F90 .
-./compute_global_checksum.inc: $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc
-	cp $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc .
-./mpp_domains_util.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc .
-./affinity.c: $(SRCROOT)FMS/affinity/affinity.c
-	cp $(SRCROOT)FMS/affinity/affinity.c .
-./blackboxio.F90: $(SRCROOT)FMS/fms2_io/blackboxio.F90
-	cp $(SRCROOT)FMS/fms2_io/blackboxio.F90 .
-./mpp_alltoall_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h .
-./mpp_do_update.h: $(SRCROOT)FMS/mpp/include/mpp_do_update.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_do_update.h .
-./mpp_update_domains2D.h: $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h .
-./mpp_memuse.c: $(SRCROOT)FMS/mpp/mpp_memuse.c
-	cp $(SRCROOT)FMS/mpp/mpp_memuse.c .
-./mpp_util.inc: $(SRCROOT)FMS/mpp/include/mpp_util.inc
-	cp $(SRCROOT)FMS/mpp/include/mpp_util.inc .
-./mpp_efp.F90: $(SRCROOT)FMS/mpp/mpp_efp.F90
-	cp $(SRCROOT)FMS/mpp/mpp_efp.F90 .
+./drifters_compute_k.h: $(SRCROOT)FMS/drifters/drifters_compute_k.h
+	cp $(SRCROOT)FMS/drifters/drifters_compute_k.h .
+./mpp_update_nest_domains.h: $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h .
+./drifters.F90: $(SRCROOT)FMS/drifters/drifters.F90
+	cp $(SRCROOT)FMS/drifters/drifters.F90 .
+./mpp_io.F90: $(SRCROOT)FMS/mpp/mpp_io.F90
+	cp $(SRCROOT)FMS/mpp/mpp_io.F90 .
+./mpp_do_updateV_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h .
+./grid2.F90: $(SRCROOT)FMS/mosaic2/grid2.F90
+	cp $(SRCROOT)FMS/mosaic2/grid2.F90 .
+./mpp_read_compressed.h: $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h .
+./domain_read.inc: $(SRCROOT)FMS/fms2_io/include/domain_read.inc
+	cp $(SRCROOT)FMS/fms2_io/include/domain_read.inc .
+./get_grid_version_mpp.F90: $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90
+	cp $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 .
+./mpp_transmit_mpi.h: $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h .
+./mpp_util_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc .
 ./mpp_global_sum_tl.h: $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h .
+./grid.F90: $(SRCROOT)FMS/mosaic/grid.F90
+	cp $(SRCROOT)FMS/mosaic/grid.F90 .
+./mpp_comm_nocomm.inc: $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc .
+./mosaic_util.c: $(SRCROOT)FMS/mosaic/mosaic_util.c
+	cp $(SRCROOT)FMS/mosaic/mosaic_util.c .
+./drifters_input.F90: $(SRCROOT)FMS/drifters/drifters_input.F90
+	cp $(SRCROOT)FMS/drifters/drifters_input.F90 .
+./gather_data_bc.inc: $(SRCROOT)FMS/fms2_io/include/gather_data_bc.inc
+	cp $(SRCROOT)FMS/fms2_io/include/gather_data_bc.inc .
+./fms_io_unstructured_read.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc .
 ./mosaic_util.h: $(SRCROOT)FMS/mosaic/mosaic_util.h
 	cp $(SRCROOT)FMS/mosaic/mosaic_util.h .
-./mpp_global_reduce.h: $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h .
-./mpp_write_compressed.h: $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h
-	cp $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h .
-./horiz_interp_bilinear.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90
-	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 .
+./horiz_interp.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 .
+./horiz_interp_type.F90: $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90
+	cp $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 .
+./mpp.F90: $(SRCROOT)FMS/mpp/mpp.F90
+	cp $(SRCROOT)FMS/mpp/mpp.F90 .
+./libFMS.F90: $(SRCROOT)FMS/libFMS.F90
+	cp $(SRCROOT)FMS/libFMS.F90 .
+./mpp_memuse.c: $(SRCROOT)FMS/mpp/mpp_memuse.c
+	cp $(SRCROOT)FMS/mpp/mpp_memuse.c .
+./mpp_do_check.h: $(SRCROOT)FMS/mpp/include/mpp_do_check.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_check.h .
+./array_utils_char.inc: $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc
+	cp $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc .
+./fms_io_unstructured_register_restart_axis.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc .
+./mpp_do_update_nest.h: $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h .
+./tridiagonal.F90: $(SRCROOT)FMS/tridiagonal/tridiagonal.F90
+	cp $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 .
+./mpp_update_domains2D_nonblock.h: $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h .
+./mpp_io_misc.inc: $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc .
+./mpp_chksum_int.h: $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h .
+./mpp_domains_misc.inc: $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc .
+./scatter_data_bc.inc: $(SRCROOT)FMS/fms2_io/include/scatter_data_bc.inc
+	cp $(SRCROOT)FMS/fms2_io/include/scatter_data_bc.inc .
+./get_cal_time.F90: $(SRCROOT)FMS/time_manager/get_cal_time.F90
+	cp $(SRCROOT)FMS/time_manager/get_cal_time.F90 .
+./create_xgrid.c: $(SRCROOT)FMS/mosaic/create_xgrid.c
+	cp $(SRCROOT)FMS/mosaic/create_xgrid.c .
+./mpp_error_s_a.h: $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h .
 ./mpp_global_sum_ad.h: $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h
 	cp $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h .
-SRC = $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 $(SRCROOT)FMS/mpp/mpp_data.F90 $(SRCROOT)FMS/mosaic/mosaic2.F90 $(SRCROOT)FMS/diag_manager/diag_axis.F90 $(SRCROOT)FMS/fms2_io/fms2_io.F90 $(SRCROOT)FMS/amip_interp/amip_interp.F90 $(SRCROOT)FMS/axis_utils/axis_utils.F90 $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 $(SRCROOT)FMS/platform/platform.F90 $(SRCROOT)FMS/mosaic/mosaic_util.c $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 $(SRCROOT)FMS/exchange/xgrid.F90 $(SRCROOT)FMS/diag_manager/diag_manager.F90 $(SRCROOT)FMS/constants/constants.F90 $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/mpp/mpp_memuse.c $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 $(SRCROOT)FMS/field_manager/field_manager.F90 $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 $(SRCROOT)FMS/diag_manager/diag_grid.F90 $(SRCROOT)FMS/time_manager/get_cal_time.F90 $(SRCROOT)FMS/coupler/ensemble_manager.F90 $(SRCROOT)FMS/drifters/drifters_input.F90 $(SRCROOT)FMS/fms2_io/blackboxio.F90 $(SRCROOT)FMS/random_numbers/random_numbers.F90 $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/mpp/mpp_utilities.F90 $(SRCROOT)FMS/block_control/block_control.F90 $(SRCROOT)FMS/diag_manager/diag_output.F90 $(SRCROOT)FMS/time_manager/time_manager.F90 $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 $(SRCROOT)FMS/random_numbers/mersennetwister.F90 $(SRCROOT)FMS/mosaic/read_mosaic.c $(SRCROOT)FMS/drifters/drifters_core.F90 $(SRCROOT)FMS/drifters/quicksort.F90 $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/diag_integral/diag_integral.F90 $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/astronomy/astronomy.F90 $(SRCROOT)FMS/mosaic/gradient.F90 $(SRCROOT)FMS/mpp/mpp_memutils.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 $(SRCROOT)FMS/affinity/fms_affinity.F90 $(SRCROOT)FMS/mosaic/create_xgrid.c $(SRCROOT)FMS/drifters/drifters_io.F90 $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 $(SRCROOT)FMS/diag_manager/diag_data.F90 $(SRCROOT)FMS/field_manager/fm_util.F90 $(SRCROOT)FMS/exchange/stock_constants.F90 $(SRCROOT)FMS/fms/fms_io.F90 $(SRCROOT)FMS/drifters/drifters.F90 $(SRCROOT)FMS/mosaic/interp.c $(SRCROOT)FMS/topography/gaussian_topog.F90 $(SRCROOT)FMS/mosaic/gradient_c2l.c $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 $(SRCROOT)FMS/time_interp/time_interp_external.F90 $(SRCROOT)FMS/mpp/mpp_domains.F90 $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 $(SRCROOT)FMS/axis_utils/axis_utils2.F90 $(SRCROOT)FMS/time_interp/time_interp_external2.F90 $(SRCROOT)FMS/mpp/mpp_parameter.F90 $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 $(SRCROOT)FMS/mpp/mpp_efp.F90 $(SRCROOT)FMS/mpp/mpp.F90 $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 $(SRCROOT)FMS/drifters/drifters_comm.F90 $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90 $(SRCROOT)FMS/memutils/memutils.F90 $(SRCROOT)FMS/diag_manager/diag_table.F90 $(SRCROOT)FMS/topography/topography.F90 $(SRCROOT)FMS/interpolator/interpolator.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/mpp/mpp_io.F90 $(SRCROOT)FMS/time_interp/time_interp.F90 $(SRCROOT)FMS/drifters/cloud_interpolator.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/affinity/affinity.c $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 $(SRCROOT)FMS/mpp/include/mpp_gather.h $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h $(SRCROOT)FMS/mpp/include/system_clock.h $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_util.inc $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_do_update.h $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h $(SRCROOT)FMS/mpp/include/mpp_sum.inc $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc $(SRCROOT)FMS/fms2_io/include/get_checksum.inc $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc $(SRCROOT)FMS/drifters/drifters_push.h $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h $(SRCROOT)FMS/mpp/include/group_update_unpack.inc $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h $(SRCROOT)FMS/drifters/drifters_set_field.h $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc $(SRCROOT)FMS/field_manager/parse.inc $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc $(SRCROOT)FMS/mosaic/constant.h $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h $(SRCROOT)FMS/mpp/include/mpp_scatter.h $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h $(SRCROOT)FMS/fms2_io/include/domain_write.inc $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h $(SRCROOT)FMS/mpp/include/mpp_global_field.h $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h $(SRCROOT)FMS/mpp/include/group_update_pack.inc $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc $(SRCROOT)FMS/mpp/include/mpp_chksum.h $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc $(SRCROOT)FMS/drifters/drifters_compute_k.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h $(SRCROOT)FMS/fms/read_data_2d.inc $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/mosaic/read_mosaic.h $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc $(SRCROOT)FMS/fms/write_data.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc $(SRCROOT)FMS/fms/read_data_3d.inc $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h $(SRCROOT)FMS/mosaic/interp.h $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h $(SRCROOT)FMS/mpp/include/mpp_group_update.h $(SRCROOT)FMS/mpp/include/mpp_do_check.h $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h $(SRCROOT)FMS/mpp/include/mpp_comm.inc $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h $(SRCROOT)FMS/fms/read_data_4d.inc $(SRCROOT)FMS/mpp/include/mpp_io_read.inc $(SRCROOT)FMS/mpp/include/mpp_write.h $(SRCROOT)FMS/fms2_io/include/domain_read.inc $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_global_sum.h $(SRCROOT)FMS/mpp/include/mpp_io_util.inc $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/mpp/include/mpp_io_write.inc $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h $(SRCROOT)FMS/mosaic/create_xgrid.h $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_transmit.inc $(SRCROOT)FMS/mosaic/gradient_c2l.h $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h $(SRCROOT)FMS/fms2_io/include/compressed_read.inc $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/drifters/fms_switches.h
-OBJ = horiz_interp_spherical.o mpp_data.o mosaic2.o diag_axis.o fms2_io.o amip_interp.o axis_utils.o column_diagnostics.o platform.o mosaic_util.o get_grid_version_fms2io.o fms_netcdf_domain_io.o xgrid.o diag_manager.o constants.o diag_util.o mpp_memuse.o horiz_interp_bilinear.o field_manager.o get_grid_version_mpp.o diag_grid.o get_cal_time.o ensemble_manager.o drifters_input.o blackboxio.o random_numbers.o fms_io_utils.o mpp_utilities.o block_control.o diag_output.o time_manager.o tridiagonal.o mersennetwister.o read_mosaic.o drifters_core.o quicksort.o netcdf_io.o diag_integral.o fms.o astronomy.o gradient.o mpp_memutils.o horiz_interp_bicubic.o fms_affinity.o create_xgrid.o drifters_io.o monin_obukhov.o fms_netcdf_unstructured_domain_io.o diag_data.o fm_util.o stock_constants.o fms_io.o drifters.o interp.o gaussian_topog.o gradient_c2l.o mosaic.o horiz_interp.o time_interp_external.o mpp_domains.o data_override.o coupler_types.o sat_vapor_pres.o axis_utils2.o time_interp_external2.o mpp_parameter.o monin_obukhov_inter.o mpp_efp.o mpp.o tracer_manager.o drifters_comm.o sat_vapor_pres_k.o memutils.o diag_table.o topography.o interpolator.o horiz_interp_type.o grid.o mpp_io.o time_interp.o cloud_interpolator.o horiz_interp_conserve.o affinity.o atmos_ocean_fluxes.o
-OFF = $(SRCROOT)FMS/mosaic/gradient_c2l.h $(SRCROOT)FMS/drifters/fms_switches.h $(SRCROOT)FMS/fms2_io/include/compressed_read.inc $(SRCROOT)FMS/diag_manager/diag_output.F90 $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc $(SRCROOT)FMS/diag_manager/diag_data.F90 $(SRCROOT)FMS/mpp/include/mpp_transmit.inc $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h $(SRCROOT)FMS/affinity/fms_affinity.F90 $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h $(SRCROOT)FMS/mpp/include/mpp_write.h $(SRCROOT)FMS/fms/read_data_4d.inc $(SRCROOT)FMS/mosaic/read_mosaic.c $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h $(SRCROOT)FMS/mpp/include/mpp_group_update.h $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h $(SRCROOT)FMS/mpp/include/mpp_do_check.h $(SRCROOT)FMS/fms/read_data_3d.inc $(SRCROOT)FMS/coupler/ensemble_manager.F90 $(SRCROOT)FMS/drifters/drifters_comm.F90 $(SRCROOT)FMS/fms/write_data.inc $(SRCROOT)FMS/mosaic/mosaic2.F90 $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h $(SRCROOT)FMS/random_numbers/mersennetwister.F90 $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc $(SRCROOT)FMS/astronomy/astronomy.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/drifters/cloud_interpolator.F90 $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h $(SRCROOT)FMS/axis_utils/axis_utils2.F90 $(SRCROOT)FMS/drifters/drifters_compute_k.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 $(SRCROOT)FMS/topography/topography.F90 $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/mpp/include/mpp_chksum.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc $(SRCROOT)FMS/amip_interp/amip_interp.F90 $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h $(SRCROOT)FMS/drifters/drifters_input.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/mpp/include/mpp_scatter.h $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc $(SRCROOT)FMS/topography/gaussian_topog.F90 $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h $(SRCROOT)FMS/mosaic/create_xgrid.c $(SRCROOT)FMS/mpp/mpp_utilities.F90 $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/mpp/include/group_update_unpack.inc $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h $(SRCROOT)FMS/drifters/drifters_push.h $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc $(SRCROOT)FMS/mpp/mpp_data.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc $(SRCROOT)FMS/time_manager/get_cal_time.F90 $(SRCROOT)FMS/mpp/mpp_domains.F90 $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc $(SRCROOT)FMS/constants/constants.F90 $(SRCROOT)FMS/mpp/include/mpp_sum.inc $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h $(SRCROOT)FMS/mpp/include/mpp_gather.h $(SRCROOT)FMS/mpp/include/system_clock.h $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h $(SRCROOT)FMS/time_interp/time_interp_external.F90 $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/field_manager/fm_util.F90 $(SRCROOT)FMS/mpp/include/mpp_io_write.inc $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/mpp/mpp_io.F90 $(SRCROOT)FMS/mosaic/create_xgrid.h $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h $(SRCROOT)FMS/axis_utils/axis_utils.F90 $(SRCROOT)FMS/mpp/include/mpp_io_util.inc $(SRCROOT)FMS/mosaic/gradient_c2l.c $(SRCROOT)FMS/mosaic/interp.c $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 $(SRCROOT)FMS/platform/platform.F90 $(SRCROOT)FMS/mpp/include/mpp_global_sum.h $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 $(SRCROOT)FMS/mpp/include/mpp_io_read.inc $(SRCROOT)FMS/diag_manager/diag_axis.F90 $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h $(SRCROOT)FMS/fms2_io/include/domain_read.inc $(SRCROOT)FMS/drifters/quicksort.F90 $(SRCROOT)FMS/mpp/include/mpp_comm.inc $(SRCROOT)FMS/time_interp/time_interp_external2.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h $(SRCROOT)FMS/drifters/drifters_core.F90 $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h $(SRCROOT)FMS/memutils/memutils.F90 $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h $(SRCROOT)FMS/drifters/drifters.F90 $(SRCROOT)FMS/diag_integral/diag_integral.F90 $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 $(SRCROOT)FMS/mosaic/interp.h $(SRCROOT)FMS/diag_manager/diag_manager.F90 $(SRCROOT)FMS/time_interp/time_interp.F90 $(SRCROOT)FMS/mosaic/read_mosaic.h $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc $(SRCROOT)FMS/fms/read_data_2d.inc $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90 $(SRCROOT)FMS/diag_manager/diag_table.F90 $(SRCROOT)FMS/mpp/mpp.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 $(SRCROOT)FMS/interpolator/interpolator.F90 $(SRCROOT)FMS/field_manager/field_manager.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/fms/fms_io.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc $(SRCROOT)FMS/mosaic/gradient.F90 $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc $(SRCROOT)FMS/fms2_io/fms2_io.F90 $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 $(SRCROOT)FMS/drifters/drifters_io.F90 $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h $(SRCROOT)FMS/mosaic/mosaic_util.c $(SRCROOT)FMS/mpp/include/group_update_pack.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h $(SRCROOT)FMS/random_numbers/random_numbers.F90 $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 $(SRCROOT)FMS/mpp/include/mpp_global_field.h $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/mpp/mpp_memutils.F90 $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h $(SRCROOT)FMS/mosaic/constant.h $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h $(SRCROOT)FMS/fms2_io/include/domain_write.inc $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc $(SRCROOT)FMS/exchange/stock_constants.F90 $(SRCROOT)FMS/field_manager/parse.inc $(SRCROOT)FMS/mpp/mpp_parameter.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/block_control/block_control.F90 $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc $(SRCROOT)FMS/drifters/drifters_set_field.h $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h $(SRCROOT)FMS/fms2_io/include/get_checksum.inc $(SRCROOT)FMS/diag_manager/diag_grid.F90 $(SRCROOT)FMS/exchange/xgrid.F90 $(SRCROOT)FMS/time_manager/time_manager.F90 $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc $(SRCROOT)FMS/affinity/affinity.c $(SRCROOT)FMS/fms2_io/blackboxio.F90 $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h $(SRCROOT)FMS/mpp/include/mpp_do_update.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h $(SRCROOT)FMS/mpp/mpp_memuse.c $(SRCROOT)FMS/mpp/include/mpp_util.inc $(SRCROOT)FMS/mpp/mpp_efp.F90 $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h
+./drifters_io.F90: $(SRCROOT)FMS/drifters/drifters_io.F90
+	cp $(SRCROOT)FMS/drifters/drifters_io.F90 .
+./fms_io_unstructured_save_restart.inc: $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc
+	cp $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc .
+./register_global_attribute.inc: $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc
+	cp $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc .
+./system_clock.h: $(SRCROOT)FMS/mpp/include/system_clock.h
+	cp $(SRCROOT)FMS/mpp/include/system_clock.h .
+./gradient_c2l.h: $(SRCROOT)FMS/mosaic/gradient_c2l.h
+	cp $(SRCROOT)FMS/mosaic/gradient_c2l.h .
+./axis_utils.F90: $(SRCROOT)FMS/axis_utils/axis_utils.F90
+	cp $(SRCROOT)FMS/axis_utils/axis_utils.F90 .
+./mosaic2.F90: $(SRCROOT)FMS/mosaic2/mosaic2.F90
+	cp $(SRCROOT)FMS/mosaic2/mosaic2.F90 .
+./random_numbers.F90: $(SRCROOT)FMS/random_numbers/random_numbers.F90
+	cp $(SRCROOT)FMS/random_numbers/random_numbers.F90 .
+./diag_table.F90: $(SRCROOT)FMS/diag_manager/diag_table.F90
+	cp $(SRCROOT)FMS/diag_manager/diag_table.F90 .
+./mpp_type_nocomm.h: $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h
+	cp $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h .
+./mpp_io_unstructured_write.inc: $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc
+	cp $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc .
+./column_diagnostics.F90: $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90
+	cp $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 .
+SRC = $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 $(SRCROOT)FMS/mosaic/mosaic_util.c $(SRCROOT)FMS/astronomy/astronomy.F90 $(SRCROOT)FMS/mpp/mpp_utilities.F90 $(SRCROOT)FMS/axis_utils/axis_utils2.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 $(SRCROOT)FMS/mosaic2/mosaic2.F90 $(SRCROOT)FMS/drifters/drifters.F90 $(SRCROOT)FMS/drifters/drifters_io.F90 $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 $(SRCROOT)FMS/mpp/mpp_memutils.F90 $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/constants/constants.F90 $(SRCROOT)FMS/random_numbers/mersennetwister.F90 $(SRCROOT)FMS/exchange/xgrid.F90 $(SRCROOT)FMS/mpp/mpp.F90 $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 $(SRCROOT)FMS/drifters/drifters_core.F90 $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90 $(SRCROOT)FMS/libFMS.F90 $(SRCROOT)FMS/mpp/mpp_memuse.c $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 $(SRCROOT)FMS/field_manager/field_manager.F90 $(SRCROOT)FMS/fms2_io/fms2_io.F90 $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 $(SRCROOT)FMS/memutils/memutils.F90 $(SRCROOT)FMS/coupler/ensemble_manager.F90 $(SRCROOT)FMS/time_interp/time_interp.F90 $(SRCROOT)FMS/drifters/drifters_input.F90 $(SRCROOT)FMS/affinity/fms_affinity.F90 $(SRCROOT)FMS/topography/topography.F90 $(SRCROOT)FMS/block_control/block_control.F90 $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/diag_manager/diag_output.F90 $(SRCROOT)FMS/mosaic2/grid2.F90 $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/random_numbers/random_numbers.F90 $(SRCROOT)FMS/mosaic/interp.c $(SRCROOT)FMS/affinity/affinity.c $(SRCROOT)FMS/time_interp/time_interp_external2.F90 $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/time_manager/get_cal_time.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/mpp/mpp_domains.F90 $(SRCROOT)FMS/mpp/mpp_io.F90 $(SRCROOT)FMS/axis_utils/axis_utils.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 $(SRCROOT)FMS/platform/platform.F90 $(SRCROOT)FMS/mosaic/create_xgrid.c $(SRCROOT)FMS/interpolator/interpolator.F90 $(SRCROOT)FMS/mosaic/gradient_c2l.c $(SRCROOT)FMS/field_manager/fm_util.F90 $(SRCROOT)FMS/time_interp/time_interp_external.F90 $(SRCROOT)FMS/exchange/stock_constants.F90 $(SRCROOT)FMS/diag_manager/diag_axis.F90 $(SRCROOT)FMS/diag_manager/diag_data.F90 $(SRCROOT)FMS/drifters/cloud_interpolator.F90 $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 $(SRCROOT)FMS/mpp/mpp_efp.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 $(SRCROOT)FMS/mpp/mpp_parameter.F90 $(SRCROOT)FMS/fms2_io/blackboxio.F90 $(SRCROOT)FMS/time_manager/time_manager.F90 $(SRCROOT)FMS/mosaic/gradient.F90 $(SRCROOT)FMS/diag_integral/diag_integral.F90 $(SRCROOT)FMS/mosaic/read_mosaic.c $(SRCROOT)FMS/topography/gaussian_topog.F90 $(SRCROOT)FMS/mpp/mpp_data.F90 $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/fms/fms_io.F90 $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 $(SRCROOT)FMS/diag_manager/diag_manager.F90 $(SRCROOT)FMS/diag_manager/diag_grid.F90 $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/drifters/quicksort.F90 $(SRCROOT)FMS/constants/fmsconstants.F90 $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90 $(SRCROOT)FMS/diag_manager/diag_table.F90 $(SRCROOT)FMS/drifters/drifters_comm.F90 $(SRCROOT)FMS/amip_interp/amip_interp.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc $(SRCROOT)FMS/drifters/fms_switches.h $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h $(SRCROOT)FMS/mpp/include/mpp_util.inc $(SRCROOT)FMS/mpp/include/mpp_gather.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h $(SRCROOT)FMS/mpp/include/mpp_chksum.h $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc $(SRCROOT)FMS/fms/write_data.inc $(SRCROOT)FMS/mpp/include/mpp_group_update.h $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h $(SRCROOT)FMS/mpp/include/mpp_io_util.inc $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h $(SRCROOT)FMS/fms/read_data_2d.inc $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc $(SRCROOT)FMS/mpp/include/mpp_write.h $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_global_sum.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h $(SRCROOT)FMS/fms2_io/include/get_checksum.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc $(SRCROOT)FMS/drifters/drifters_push.h $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_io_read.inc $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_comm.inc $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_global_field.h $(SRCROOT)FMS/mpp/include/mpp_sum.inc $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h $(SRCROOT)FMS/mosaic/read_mosaic.h $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/mpp/include/group_update_pack.inc $(SRCROOT)FMS/mpp/include/group_update_unpack.inc $(SRCROOT)FMS/fms2_io/include/compressed_read.inc $(SRCROOT)FMS/mosaic/interp.h $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc $(SRCROOT)FMS/mosaic/constant.h $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc $(SRCROOT)FMS/mosaic/gradient_c2l.h $(SRCROOT)FMS/mpp/include/system_clock.h $(SRCROOT)FMS/fms/read_data_3d.inc $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h $(SRCROOT)FMS/fms/read_data_4d.inc $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc $(SRCROOT)FMS/mpp/include/mpp_do_update.h $(SRCROOT)FMS/fms2_io/include/scatter_data_bc.inc $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h $(SRCROOT)FMS/fms2_io/include/domain_write.inc $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/mpp/include/mpp_do_check.h $(SRCROOT)FMS/fms2_io/include/gather_data_bc.inc $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_io_write.inc $(SRCROOT)FMS/mpp/include/mpp_scatter.h $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_transmit.inc $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h $(SRCROOT)FMS/drifters/drifters_compute_k.h $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h $(SRCROOT)FMS/fms2_io/include/domain_read.inc $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc $(SRCROOT)FMS/field_manager/parse.inc $(SRCROOT)FMS/drifters/drifters_set_field.h $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc $(SRCROOT)FMS/mosaic/create_xgrid.h $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h
+OBJ = fms_netcdf_domain_io.o horiz_interp.o mosaic_util.o astronomy.o mpp_utilities.o axis_utils2.o horiz_interp_spherical.o mosaic2.o drifters.o drifters_io.o tracer_manager.o mpp_memutils.o tridiagonal.o fms_io_utils.o constants.o mersennetwister.o xgrid.o mpp.o get_grid_version_mpp.o drifters_core.o column_diagnostics.o libFMS.o mpp_memuse.o get_grid_version_fms2io.o horiz_interp_bicubic.o sat_vapor_pres.o field_manager.o fms2_io.o fms_netcdf_unstructured_domain_io.o memutils.o ensemble_manager.o time_interp.o drifters_input.o fms_affinity.o topography.o block_control.o data_override.o fms.o diag_output.o grid2.o grid.o random_numbers.o interp.o affinity.o time_interp_external2.o diag_util.o get_cal_time.o horiz_interp_conserve.o mpp_domains.o mpp_io.o axis_utils.o horiz_interp_bilinear.o platform.o create_xgrid.o interpolator.o gradient_c2l.o fm_util.o time_interp_external.o stock_constants.o diag_axis.o diag_data.o cloud_interpolator.o monin_obukhov_inter.o atmos_ocean_fluxes.o mpp_efp.o horiz_interp_type.o mpp_parameter.o blackboxio.o time_manager.o gradient.o diag_integral.o read_mosaic.o gaussian_topog.o mpp_data.o coupler_types.o fms_io.o monin_obukhov.o diag_manager.o diag_grid.o netcdf_io.o mosaic.o quicksort.o fmsconstants.o sat_vapor_pres_k.o diag_table.o drifters_comm.o amip_interp.o
+OFF = $(SRCROOT)FMS/block_control/block_control.F90 $(SRCROOT)FMS/mpp/include/group_update_unpack.inc $(SRCROOT)FMS/memutils/memutils.F90 $(SRCROOT)FMS/mosaic/mosaic.F90 $(SRCROOT)FMS/mpp/include/mpp_get_boundary_ad.h $(SRCROOT)FMS/mpp/include/mpp_sum_mpi_ad.h $(SRCROOT)FMS/affinity/fms_affinity.F90 $(SRCROOT)FMS/mpp/include/mpp_comm.inc $(SRCROOT)FMS/exchange/xgrid.F90 $(SRCROOT)FMS/mpp/include/mpp_alltoall_mpi.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_ad.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_read.inc $(SRCROOT)FMS/mpp/include/mpp_io_read.inc $(SRCROOT)FMS/mpp/include/mpp_data_nocomm.inc $(SRCROOT)FMS/monin_obukhov/monin_obukhov_inter.F90 $(SRCROOT)FMS/fms2_io/include/unstructured_domain_read.inc $(SRCROOT)FMS/astronomy/astronomy.F90 $(SRCROOT)FMS/affinity/affinity.c $(SRCROOT)FMS/fms/fms_io.F90 $(SRCROOT)FMS/amip_interp/amip_interp.F90 $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.inc $(SRCROOT)FMS/mpp/include/mpp_global_sum.h $(SRCROOT)FMS/diag_manager/diag_manager.F90 $(SRCROOT)FMS/mpp/include/mpp_do_update_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_write.h $(SRCROOT)FMS/mpp/include/mpp_sum_mpi.h $(SRCROOT)FMS/mpp/include/mpp_io_util.inc $(SRCROOT)FMS/mpp/include/mpp_transmit_nocomm.h $(SRCROOT)FMS/fms2_io/include/netcdf_read_data.inc $(SRCROOT)FMS/drifters/drifters_comm.F90 $(SRCROOT)FMS/diag_manager/diag_output.F90 $(SRCROOT)FMS/mpp/include/mpp_write_2Ddecomp.h $(SRCROOT)FMS/mpp/include/mpp_chksum.h $(SRCROOT)FMS/constants/fmsconstants.F90 $(SRCROOT)FMS/drifters/quicksort.F90 $(SRCROOT)FMS/field_manager/fm_util.F90 $(SRCROOT)FMS/mpp/include/mpp_util.inc $(SRCROOT)FMS/horiz_interp/horiz_interp_bilinear.F90 $(SRCROOT)FMS/mpp/include/mpp_group_update.h $(SRCROOT)FMS/time_manager/time_manager.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_field_exist.inc $(SRCROOT)FMS/topography/gaussian_topog.F90 $(SRCROOT)FMS/fms/write_data.inc $(SRCROOT)FMS/exchange/stock_constants.F90 $(SRCROOT)FMS/mpp/include/mpp_read_distributed_ascii.h $(SRCROOT)FMS/coupler/coupler_types.F90 $(SRCROOT)FMS/fms2_io/fms_netcdf_unstructured_domain_io.F90 $(SRCROOT)FMS/field_manager/parse.inc $(SRCROOT)FMS/random_numbers/mersennetwister.F90 $(SRCROOT)FMS/mpp/include/mpp_comm_mpi.inc $(SRCROOT)FMS/mpp/include/mpp_get_boundary.h $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_do_updateV.h $(SRCROOT)FMS/constants/constants.F90 $(SRCROOT)FMS/mosaic/create_xgrid.h $(SRCROOT)FMS/mpp/include/mpp_read_2Ddecomp.h $(SRCROOT)FMS/fms2_io/include/array_utils.inc $(SRCROOT)FMS/mpp/include/mpp_transmit.inc $(SRCROOT)FMS/horiz_interp/horiz_interp_spherical.F90 $(SRCROOT)FMS/mpp/include/mpp_domains_util.inc $(SRCROOT)FMS/mpp/include/mpp_do_updateV_ad.h $(SRCROOT)FMS/mpp/include/mpp_do_redistribute.h $(SRCROOT)FMS/mpp/include/mpp_error_a_s.h $(SRCROOT)FMS/fms2_io/include/compute_global_checksum.inc $(SRCROOT)FMS/mpp/mpp_data.F90 $(SRCROOT)FMS/mpp/include/mpp_scatter.h $(SRCROOT)FMS/tracer_manager/tracer_manager.F90 $(SRCROOT)FMS/mpp/include/mpp_io_write.inc $(SRCROOT)FMS/mpp/include/mpp_util_mpi.inc $(SRCROOT)FMS/platform/platform.F90 $(SRCROOT)FMS/mpp/mpp_utilities.F90 $(SRCROOT)FMS/drifters/cloud_interpolator.F90 $(SRCROOT)FMS/mpp/include/mpp_chksum_scalar.h $(SRCROOT)FMS/mosaic/gradient_c2l.c $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_field.inc $(SRCROOT)FMS/mpp/mpp_domains.F90 $(SRCROOT)FMS/fms2_io/include/domain_write.inc $(SRCROOT)FMS/mpp/include/mpp_global_reduce.h $(SRCROOT)FMS/mpp/include/mpp_do_global_field.h $(SRCROOT)FMS/data_override/data_override.F90 $(SRCROOT)FMS/include/fms_platform.h $(SRCROOT)FMS/fms2_io/include/register_unstructured_domain_restart_variable.inc $(SRCROOT)FMS/diag_manager/diag_util.F90 $(SRCROOT)FMS/mpp/include/mpp_write_unlimited_axis.h $(SRCROOT)FMS/mpp/include/mpp_error_a_a.h $(SRCROOT)FMS/fms2_io/include/get_data_type_string.inc $(SRCROOT)FMS/fms/read_data_4d.inc $(SRCROOT)FMS/diag_manager/diag_data.F90 $(SRCROOT)FMS/mpp/include/mpp_type_mpi.h $(SRCROOT)FMS/time_interp/time_interp.F90 $(SRCROOT)FMS/mpp/include/mpp_do_update.h $(SRCROOT)FMS/fms2_io/netcdf_io.F90 $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres_k.F90 $(SRCROOT)FMS/axis_utils/axis_utils2.F90 $(SRCROOT)FMS/mpp/include/mpp_domains_define.inc $(SRCROOT)FMS/mpp/mpp_memutils.F90 $(SRCROOT)FMS/fms/read_data_3d.inc $(SRCROOT)FMS/field_manager/field_manager.F90 $(SRCROOT)FMS/mosaic/gradient.F90 $(SRCROOT)FMS/mpp/include/mpp_define_nest_domains.inc $(SRCROOT)FMS/mpp/include/mpp_alltoall_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_sum_ad.inc $(SRCROOT)FMS/data_override/get_grid_version_fms2io.F90 $(SRCROOT)FMS/mosaic/constant.h $(SRCROOT)FMS/fms2_io/include/compressed_read.inc $(SRCROOT)FMS/diag_manager/diag_grid.F90 $(SRCROOT)FMS/mpp/include/group_update_pack.inc $(SRCROOT)FMS/mpp/include/mpp_do_checkV.h $(SRCROOT)FMS/mosaic/interp.h $(SRCROOT)FMS/mpp/include/mpp_write_compressed.h $(SRCROOT)FMS/mosaic/read_mosaic.h $(SRCROOT)FMS/time_interp/time_interp_external.F90 $(SRCROOT)FMS/fms2_io/fms_io_utils.F90 $(SRCROOT)FMS/fms2_io/include/register_variable_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_unstruct_pass_data.h $(SRCROOT)FMS/mpp/include/mpp_update_domains2D.h $(SRCROOT)FMS/mpp/include/mpp_global_field_ug.h $(SRCROOT)FMS/fms/fms.F90 $(SRCROOT)FMS/mosaic/read_mosaic.c $(SRCROOT)FMS/fms2_io/include/register_domain_restart_variable.inc $(SRCROOT)FMS/mpp/include/mpp_domains_reduce.inc $(SRCROOT)FMS/diag_manager/diag_axis.F90 $(SRCROOT)FMS/fms2_io/include/netcdf_write_data.inc $(SRCROOT)FMS/fms2_io/include/compressed_write.inc $(SRCROOT)FMS/mpp/include/mpp_global_field.h $(SRCROOT)FMS/mpp/include/mpp_sum.inc $(SRCROOT)FMS/coupler/ensemble_manager.F90 $(SRCROOT)FMS/fms2_io/blackboxio.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_name.inc $(SRCROOT)FMS/fms/fms_io_unstructured_file_unit.inc $(SRCROOT)FMS/mpp/include/mpp_reduce_mpi.h $(SRCROOT)FMS/fms2_io/include/get_checksum.inc $(SRCROOT)FMS/diag_integral/diag_integral.F90 $(SRCROOT)FMS/fms2_io/include/get_variable_attribute.inc $(SRCROOT)FMS/drifters/drifters_core.F90 $(SRCROOT)FMS/mpp/include/mpp_error_s_s.h $(SRCROOT)FMS/time_interp/time_interp_external2.F90 $(SRCROOT)FMS/fms2_io/fms2_io.F90 $(SRCROOT)FMS/coupler/atmos_ocean_fluxes.F90 $(SRCROOT)FMS/drifters/drifters_push.h $(SRCROOT)FMS/topography/topography.F90 $(SRCROOT)FMS/mpp/include/mpp_io_connect.inc $(SRCROOT)FMS/sat_vapor_pres/sat_vapor_pres.F90 $(SRCROOT)FMS/mpp/include/mpp_reduce_nocomm.h $(SRCROOT)FMS/fms2_io/fms_netcdf_domain_io.F90 $(SRCROOT)FMS/fms/read_data_2d.inc $(SRCROOT)FMS/mpp/include/mpp_global_field_ad.h $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary.h $(SRCROOT)FMS/mpp/include/mpp_do_update_ad.h $(SRCROOT)FMS/monin_obukhov/monin_obukhov.F90 $(SRCROOT)FMS/mosaic/interp.c $(SRCROOT)FMS/mpp/mpp_parameter.F90 $(SRCROOT)FMS/mpp/include/mpp_do_get_boundary_ad.h $(SRCROOT)FMS/mpp/mpp_efp.F90 $(SRCROOT)FMS/mpp/include/mpp_sum_nocomm_ad.h $(SRCROOT)FMS/mpp/include/mpp_gather.h $(SRCROOT)FMS/mpp/include/mpp_do_global_field_ad.h $(SRCROOT)FMS/fms/fms_io_unstructured_get_file_unit.inc $(SRCROOT)FMS/fms2_io/include/get_global_attribute.inc $(SRCROOT)FMS/mpp/include/mpp_domains_comm.inc $(SRCROOT)FMS/fms2_io/include/netcdf_add_restart_variable.inc $(SRCROOT)FMS/drifters/fms_switches.h $(SRCROOT)FMS/mpp/include/mpp_unstruct_domain.inc $(SRCROOT)FMS/mpp/include/mpp_data_mpi.inc $(SRCROOT)FMS/interpolator/interpolator.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_get_field_size.inc $(SRCROOT)FMS/fms/fms_io_unstructured_setup_one_field.inc $(SRCROOT)FMS/horiz_interp/horiz_interp_bicubic.F90 $(SRCROOT)FMS/fms2_io/include/unstructured_domain_write.inc $(SRCROOT)FMS/include/file_version.h $(SRCROOT)FMS/horiz_interp/horiz_interp_conserve.F90 $(SRCROOT)FMS/drifters/drifters_set_field.h $(SRCROOT)FMS/drifters/drifters_compute_k.h $(SRCROOT)FMS/mpp/include/mpp_update_nest_domains.h $(SRCROOT)FMS/drifters/drifters.F90 $(SRCROOT)FMS/mpp/mpp_io.F90 $(SRCROOT)FMS/mpp/include/mpp_do_updateV_nonblock.h $(SRCROOT)FMS/mosaic2/grid2.F90 $(SRCROOT)FMS/mpp/include/mpp_read_compressed.h $(SRCROOT)FMS/fms2_io/include/domain_read.inc $(SRCROOT)FMS/data_override/get_grid_version_mpp.F90 $(SRCROOT)FMS/mpp/include/mpp_transmit_mpi.h $(SRCROOT)FMS/mpp/include/mpp_util_nocomm.inc $(SRCROOT)FMS/mpp/include/mpp_global_sum_tl.h $(SRCROOT)FMS/mosaic/grid.F90 $(SRCROOT)FMS/mpp/include/mpp_comm_nocomm.inc $(SRCROOT)FMS/mosaic/mosaic_util.c $(SRCROOT)FMS/drifters/drifters_input.F90 $(SRCROOT)FMS/fms2_io/include/gather_data_bc.inc $(SRCROOT)FMS/fms/fms_io_unstructured_read.inc $(SRCROOT)FMS/mosaic/mosaic_util.h $(SRCROOT)FMS/horiz_interp/horiz_interp.F90 $(SRCROOT)FMS/horiz_interp/horiz_interp_type.F90 $(SRCROOT)FMS/mpp/mpp.F90 $(SRCROOT)FMS/libFMS.F90 $(SRCROOT)FMS/mpp/mpp_memuse.c $(SRCROOT)FMS/mpp/include/mpp_do_check.h $(SRCROOT)FMS/fms2_io/include/array_utils_char.inc $(SRCROOT)FMS/fms/fms_io_unstructured_register_restart_axis.inc $(SRCROOT)FMS/mpp/include/mpp_do_update_nest.h $(SRCROOT)FMS/tridiagonal/tridiagonal.F90 $(SRCROOT)FMS/mpp/include/mpp_update_domains2D_nonblock.h $(SRCROOT)FMS/mpp/include/mpp_io_misc.inc $(SRCROOT)FMS/mpp/include/mpp_chksum_int.h $(SRCROOT)FMS/mpp/include/mpp_domains_misc.inc $(SRCROOT)FMS/fms2_io/include/scatter_data_bc.inc $(SRCROOT)FMS/time_manager/get_cal_time.F90 $(SRCROOT)FMS/mosaic/create_xgrid.c $(SRCROOT)FMS/mpp/include/mpp_error_s_a.h $(SRCROOT)FMS/mpp/include/mpp_global_sum_ad.h $(SRCROOT)FMS/drifters/drifters_io.F90 $(SRCROOT)FMS/fms/fms_io_unstructured_save_restart.inc $(SRCROOT)FMS/fms2_io/include/register_global_attribute.inc $(SRCROOT)FMS/mpp/include/system_clock.h $(SRCROOT)FMS/mosaic/gradient_c2l.h $(SRCROOT)FMS/axis_utils/axis_utils.F90 $(SRCROOT)FMS/mosaic2/mosaic2.F90 $(SRCROOT)FMS/random_numbers/random_numbers.F90 $(SRCROOT)FMS/diag_manager/diag_table.F90 $(SRCROOT)FMS/mpp/include/mpp_type_nocomm.h $(SRCROOT)FMS/mpp/include/mpp_io_unstructured_write.inc $(SRCROOT)FMS/column_diagnostics/column_diagnostics.F90
 clean: neat
-	-rm -f .libfms.a.cppdefs $(OBJ) *.mod libfms.a 
+	-rm -f .libfms.a.cppdefs $(OBJ) libfms.a
 
 neat:
 	-rm -f $(TMPFILES)
@@ -632,4 +648,3 @@ tags: $(SRC)
 libfms.a: $(OBJ)
 	$(AR) $(ARFLAGS) libfms.a $(OBJ)
 
-
diff --git a/src/FMS b/src/FMS
index 7dfa1c8..b9fc651 160000
--- a/src/FMS
+++ b/src/FMS
@@ -1 +1 @@
-Subproject commit 7dfa1c81fdaef47fcc2f387154f21977d484906b
+Subproject commit b9fc6515c7e729909e59a0f9a1efc6eb1d3e44d1
diff --git a/src/GFDL_atmos_cubed_sphere b/src/GFDL_atmos_cubed_sphere
index d621b82..fa9ee63 160000
--- a/src/GFDL_atmos_cubed_sphere
+++ b/src/GFDL_atmos_cubed_sphere
@@ -1 +1 @@
-Subproject commit d621b822c1905430d88726b23080218b5724f74e
+Subproject commit fa9ee63636e8fc4af47b197ee473c82565691fa4
diff --git a/src/coupler b/src/coupler
index 4b89b87..abe2d09 160000
--- a/src/coupler
+++ b/src/coupler
@@ -1 +1 @@
-Subproject commit 4b89b8724d22bcde57caed97dbdf6192c59fb898
+Subproject commit abe2d09a4052a2e78a57a059d7421d823b883466