--- MITgcm/tools/adjoint_options/adjoint_default	2012/07/27 18:25:39	1.29
+++ MITgcm/tools/adjoint_options/adjoint_default	2013/08/08 17:49:55	1.33
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/adjoint_default,v 1.29 2012/07/27 18:25:39 heimbach Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/adjoint_default,v 1.33 2013/08/08 17:49:55 jmc Exp $
 #  $Name:  $
 
 #  This AD option-file contains the default settings for the adjoint and
@@ -15,11 +15,18 @@
 TAMC=tamc
 
 AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
-AD_TAF_FLAGS="-v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
 FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
-FTL_TAF_FLAGS="-v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
-SVD_TAF_FLAGS="-v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
+
+AD_TAF_FLAGS="-reverse -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
+FTL_TAF_FLAGS="-forward -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
+SVD_TAF_FLAGS="-reverse -forward -pure -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
+
+if test "x$MPI" != x ; then
+  AD_TAF_FLAGS="$AD_TAF_FLAGS"' -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
+  FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
+  SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
+fi
 
 DIFF_FLAGS="-toplevel 'the_main_loop'    \
             -input 'xx_theta_dummy       \
@@ -64,6 +71,7 @@
                     xx_gen3d_dummy       \
                     xx_genarr2d_dummy    \
                     xx_genarr3d_dummy    \
+                    xx_gentim2d_dummy    \
                     xx_siarea_dummy      \
                     xx_siheff_dummy      \
                     xx_sihsnow_dummy     \