--- MITgcm/tools/adjoint_options/adjoint_diva_mpi	2005/07/28 19:54:06	1.3
+++ MITgcm/tools/adjoint_options/adjoint_diva_mpi	2006/03/06 17:16:24	1.6
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/Attic/adjoint_diva_mpi,v 1.3 2005/07/28 19:54:06 heimbach Exp $
+#  $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/adjoint_options/Attic/adjoint_diva_mpi,v 1.6 2006/03/06 17:16:24 heimbach Exp $
 #  $Name:  $
 #
 
@@ -12,15 +12,17 @@
 # TAF=~fastopt/bin/taf
 # STAF=staf
 
+DIVA='true'
 TAF=taf
 TAMC=tamc
 
+
 AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
-AD_TAF_FLAGS="-pure -mpi -include './mpi_headers/mpif_parameters.h ./mpi_headers/mpif.h ./mpi_headers/mpiof.h' -I./mpi_headers/ -reverse -admark ad -i4 -r4 -l taf_ad.log -flow taf_ad_flow.log -nonew_arg"
+AD_TAF_FLAGS="-z -pure -mpi -include '$MPI_HEADER_FILES_INC' -I./mpi_headers/ -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'
+FTL_TAF_FLAGS='-z -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'
+SVD_TAF_FLAGS='-z -reverse -forward -pure -i4 -r4 -l taf_svd.log -flow taf_flow.log -nonew_arg'
 
 DIFF_FLAGS="-toplevel 'the_main_loop'    \
             -input 'xx_theta_dummy       \
@@ -34,6 +36,7 @@
                     xx_aqh_dummy         \
                     xx_precip_dummy      \
                     xx_swflux_dummy      \
+                    xx_swdown_dummy      \
                     xx_uwind_dummy       \
                     xx_vwind_dummy       \
                     xx_obcsn_dummy       \