--- MITgcm/tools/adjoint_options/adjoint_default	2003/10/21 22:12:37	1.5
+++ MITgcm/tools/adjoint_options/adjoint_default	2009/01/24 17:54:36	1.20
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/adjoint_default,v 1.5 2003/10/21 22:12:37 edhill Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/adjoint_default,v 1.20 2009/01/24 17:54:36 jmc Exp $
 #  $Name:  $
 #
 
@@ -12,15 +12,15 @@
 # TAF=~fastopt/bin/taf
 # STAF=staf
 
-TAF=taf
+TAF=staf
 TAMC=tamc
 
-AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
-AD_TAF_FLAGS='-reverse -admark ad -i4 -r4 -l taf_ad.log -flow taf_ad_flow.log -nonew_arg'
-FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
-FTL_TAF_FLAGS='-forward -ftlmark g_ -i4 -r4 -l taf_ftl.log -flow taf_ftl_flow.log -nonew_arg'
-SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
-SVD_TAF_FLAGS='-reverse -forward -pure -i4 -r4 -l taf_svd.log -flow taf_flow.log -nonew_arg'
+AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
+AD_TAF_FLAGS="-z -reverse -admark ad -i4 -r4 -l taf_ad.log -flow taf_ad_flow.log $AD_TAF_FLAGS"
+FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
+FTL_TAF_FLAGS="-z -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log -flow taf_ftl_flow.log$FTL_TAF_FLAGS"
+SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
+SVD_TAF_FLAGS="-z -reverse -forward -pure -i4 -r4 -l taf_svd.log -flow taf_flow.log $SVD_TAF_FLAGS"
 
 DIFF_FLAGS="-toplevel 'the_main_loop'    \
             -input 'xx_theta_dummy       \
@@ -30,12 +30,42 @@
                     xx_sflux_dummy       \
                     xx_tauu_dummy        \
                     xx_tauv_dummy        \
+                    xx_atemp_dummy       \
+                    xx_aqh_dummy         \
+                    xx_precip_dummy      \
+                    xx_swflux_dummy      \
+                    xx_swdown_dummy      \
+                    xx_lwflux_dummy      \
+                    xx_lwdown_dummy      \
+                    xx_evap_dummy        \
+                    xx_snowprecip_dummy  \
+                    xx_apressure_dummy   \
+                    xx_runoff_dummy      \
+                    xx_uwind_dummy       \
+                    xx_vwind_dummy       \
+                    xx_obcsn_dummy       \
+                    xx_obcss_dummy       \
+                    xx_obcsw_dummy       \
+                    xx_obcse_dummy       \
                     xx_sst_dummy         \
                     xx_sss_dummy         \
+                    xx_depth_dummy       \
                     xx_diffkr_dummy      \
                     xx_kapgm_dummy       \
+                    xx_kapredi_dummy       \
+                    xx_bottomdrag_dummy  \
                     xx_efluxy_dummy      \
-                    xx_efluxp_dummy'     \
+                    xx_efluxp_dummy      \
+                    xx_edtaux_dummy      \
+                    xx_edtauy_dummy      \
+                    xx_uvel_dummy        \
+                    xx_vvel_dummy        \
+                    xx_etan_dummy        \
+                    xx_siarea_dummy        \
+                    xx_siheff_dummy        \
+                    xx_sihsnow_dummy        \
+                    xx_relaxsst_dummy    \
+                    xx_relaxsss_dummy'   \
             -output 'fc'"
 
 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"