Warning, /tools/adjoint_options/MITgcm-c64l-TAFv2.patch is written in an unsupported language. File is not indexed.
view on githubraw file Latest commit b87e112d on 2013-08-16 14:53:31 UTC
b87e112d91 Patr*0001 diff -Naur -x Entries -IHeader MITgcm-c64l/eesupp/src/exch1_ad.flow MITgcm-c64l-v2-patch-final/eesupp/src/exch1_ad.flow
0002 --- MITgcm-c64l/eesupp/src/exch1_ad.flow 2010-10-16 19:01:04.000000000 +0200
0003 +++ MITgcm-c64l-v2-patch-final/eesupp/src/exch1_ad.flow 2013-08-16 00:56:22.000000000 +0200
0004 @@ -1,5 +1,27 @@
0005 -C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0006 -C $Name: $
0007 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0008 +C $Name: $
0009 +
0010 +C------------------------------------------
0011 +C directives to specify the adjoint names
0012 +C of routines called in the original code
0013 +C------------------------------------------
0014 +c$taf SUBROUTINE exch_3d_rl ADNAME = adexch_3d_rl
0015 +c$taf SUBROUTINE exch_3d_rs ADNAME = adexch_3d_rs
0016 +c$taf SUBROUTINE exch_uv_3d_rl ADNAME = adexch_uv_3d_rl
0017 +c$taf SUBROUTINE exch_uv_3d_rs ADNAME = adexch_uv_3d_rs
0018 +c$taf SUBROUTINE exch_uv_xy_rl ADNAME = adexch_uv_xy_rl
0019 +c$taf SUBROUTINE exch_uv_xy_rs ADNAME = adexch_uv_xy_rs
0020 +c$taf SUBROUTINE exch_uv_xyz_rl ADNAME = adexch_uv_xyz_rl
0021 +c$taf SUBROUTINE exch_uv_xyz_rs ADNAME = adexch_uv_xyz_rs
0022 +c$taf SUBROUTINE exch_xy_rl ADNAME = adexch_xy_rl
0023 +c$taf SUBROUTINE exch_xy_rs ADNAME = adexch_xy_rs
0024 +c$taf SUBROUTINE exch_xyz_rl ADNAME = adexch_xyz_rl
0025 +c$taf SUBROUTINE exch_xyz_rs ADNAME = adexch_xyz_rs
0026 +c$taf SUBROUTINE exch_uv_agrid_3d_rl ADNAME = adexch_uv_agrid_3d_rl
0027 +c$taf SUBROUTINE exch_uv_bgrid_3d_rl ADNAME = adexch_uv_agrid_3d_rl
0028 +c$taf SUBROUTINE exch_uv_dgrid_3d_rl ADNAME = adexch_uv_dgrid_3d_rl
0029 +c$taf SUBROUTINE exch_sm_3d_rl ADNAME = adexch_sm_3d_rl
0030 +c$taf SUBROUTINE exch_z_3d_rl ADNAME = adexch_z_3d_rl
0031
0032 C------------------------------------------
0033 C TAF flow directives for exch1_RX
0034 diff -Naur -x Entries -IHeader MITgcm-c64l/model/src/port_rand.F MITgcm-c64l-v2-patch-final/model/src/port_rand.F
0035 --- MITgcm-c64l/model/src/port_rand.F 2009-12-08 22:50:35.000000000 +0100
0036 +++ MITgcm-c64l-v2-patch-final/model/src/port_rand.F 2013-08-16 00:56:32.000000000 +0200
0037 @@ -1,5 +1,5 @@
0038 -C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0039 -C $Name: $
0040 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0041 +C $Name: $
0042
0043 #undef _USE_INTEGERS
0044
0045 @@ -162,19 +162,16 @@
0046 c seed=1618033.0d0
0047
0048 C first generate 2 equally distributed random numbers (-1,1)
0049 - DO WHILE (1 .EQ. 1)
0050 + xs = 0.0
0051 + DO WHILE ( xs.GE.1.0 .OR. xs.EQ.0.0 )
0052 x1=2.0*port_rand(seed)-1.0
0053 x2=2.0*port_rand(seed)-1.0
0054 xs=x1**2+x2**2
0055 - IF (xs .LT. 1.0 .AND. xs .NE. 0.0) THEN
0056 - GOTO 100
0057 - ENDIF
0058 ENDDO
0059 - 100 CONTINUE
0060
0061 t = SQRT(-2.0*LOG(xs)/xs)
0062 port_rand_norm = t*x1
0063 -C
0064 +
0065 C also t*x2 would be a gaussian random number and could be returned
0066
0067 RETURN
0068 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/autodiff_whtapeio_sync.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/autodiff_whtapeio_sync.flow
0069 --- MITgcm-c64l/pkg/autodiff/autodiff_whtapeio_sync.flow 2011-10-30 23:48:10.000000000 +0100
0070 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/autodiff_whtapeio_sync.flow 2013-08-16 00:56:47.000000000 +0200
0071 @@ -1,5 +1,5 @@
0072 -C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0073 -C $Name: $
0074 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0075 +C $Name: $
0076
0077 C /==========================================================\
0078 C | SUBROUTINE autodiff_whtapeio_sync |
0079 @@ -11,3 +11,4 @@
0080 cadj SUBROUTINE autodiff_whtapeio_sync REQUIRED
0081 cadj SUBROUTINE autodiff_whtapeio_sync INFLUENCED
0082 cadj SUBROUTINE autodiff_whtapeio_sync FTLNAME = autodiff_whtapeio_sync
0083 +c$taf SUBROUTINE autodiff_whtapeio_sync ADNAME=adautodiff_whtapeio_sync
0084 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/common.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/common.flow
0085 --- MITgcm-c64l/pkg/autodiff/common.flow 1970-01-01 01:00:00.000000000 +0100
0086 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/common.flow 2013-08-16 00:57:03.000000000 +0200
0087 @@ -0,0 +1,104 @@
0088 +c$taf COMMON dynvars_r ADNAME = addynvars_r
0089 +c$taf COMMON dynvars_r FTLNAME = g_dynvars_r
0090 +
0091 +c$taf COMMON dynvars_r2 ADNAME = addynvars_r2
0092 +c$taf COMMON dynvars_r2 FTLNAME = g_dynvars_r2
0093 +
0094 +c$taf COMMON dynvars_diag ADNAME = addynvars_diag
0095 +c$taf COMMON dynvars_diag FTLNAME = g_dynvars_diag
0096 +
0097 +c$taf COMMON dynvars_cd ADNAME = addynvars_cd
0098 +c$taf COMMON dynvars_cd FTLNAME = g_dynvars_cd
0099 +
0100 +c$taf COMMON ffields_fu ADNAME = adffields_fu
0101 +c$taf COMMON ffields_fu FTLNAME = g_ffields_fu
0102 +
0103 +c$taf COMMON ffields_fv ADNAME = adffields_fv
0104 +c$taf COMMON ffields_fv FTLNAME = g_ffields_fv
0105 +
0106 +c$taf COMMON ffields_Qnet ADNAME = adffields_Qnet
0107 +c$taf COMMON ffields_Qnet FTLNAME = g_ffields_Qnet
0108 +
0109 +c$taf COMMON ffields_Qsw ADNAME = adffields_Qsw
0110 +c$taf COMMON ffields_Qsw FTLNAME = g_ffields_Qsw
0111 +
0112 +c$taf COMMON ffields_dQdT ADNAME = adffields_dQdT
0113 +c$taf COMMON ffields_dQdT FTLNAME = g_ffields_dQdT
0114 +
0115 +c$taf COMMON ffields_EmPmR ADNAME = adffields_EmPmR
0116 +c$taf COMMON ffields_EmPmR FTLNAME = g_ffields_EmPmR
0117 +
0118 +c$taf COMMON ffields_saltFlux ADNAME = adffields_saltFlux
0119 +c$taf COMMON ffields_saltFlux FTLNAME = g_ffields_saltFlux
0120 +
0121 +c$taf COMMON ffields_SST ADNAME = adffields_SST
0122 +c$taf COMMON ffields_SST FTLNAME = g_ffields_SST
0123 +
0124 +c$taf COMMON ffields_SSS ADNAME = adffields_SSS
0125 +c$taf COMMON ffields_SSS FTLNAME = g_ffields_SSS
0126 +
0127 +c$taf COMMON ffields_lambdaThetaClimRelax ADNAME = adffields_lambdaThetaClimRelax
0128 +c$taf COMMON ffields_lambdaThetaClimRelax FTLNAME = g_ffields_lambdaThetaClimRelax
0129 +
0130 +c$taf COMMON ffields_lambdaSaltClimRelax ADNAME = adffields_lambdaSaltClimRelax
0131 +c$taf COMMON ffields_lambdaSaltClimRelax FTLNAME = g_ffields_lambdaSaltClimRelax
0132 +
0133 +c$taf COMMON DYNVARS_DIFFKR ADNAME = adDYNVARS_DIFFKR
0134 +c$taf COMMON DYNVARS_DIFFKR FTLNAME = g_DYNVARS_DIFFKR
0135 +
0136 +c$taf COMMON DYNVARS_KAPGM ADNAME = adDYNVARS_KAPGM
0137 +c$taf COMMON DYNVARS_KAPGM FTLNAME = g_DYNVARS_KAPGM
0138 +
0139 +c$taf COMMON DYNVARS_KAPREDI ADNAME = adDYNVARS_KAPREDI
0140 +c$taf COMMON DYNVARS_KAPREDI FTLNAME = g_DYNVARS_KAPREDI
0141 +
0142 +c$taf COMMON DYNVARS_BOTTOMDRAG ADNAME = adDYNVARS_BOTTOMDRAG
0143 +c$taf COMMON DYNVARS_BOTTOMDRAG FTLNAME = g_DYNVARS_BOTTOMDRAG
0144 +
0145 +c$taf COMMON eddypsiffield ADNAME = adeddypsiffield
0146 +c$taf COMMON eddypsiffield FTLNAME = g_eddypsiffield
0147 +
0148 +c$taf COMMON exf_hsflux_r ADNAME = adexf_hsflux_r
0149 +c$taf COMMON exf_hsflux_r FTLNAME = g_exf_hsflux_r
0150 +
0151 +c$taf COMMON exf_stress_r ADNAME = adexf_stress_r
0152 +c$taf COMMON exf_stress_r FTLNAME = g_exf_stress_r
0153 +
0154 +c$taf COMMON exf_wspeed_r ADNAME = adexf_wspeed_r
0155 +c$taf COMMON exf_wspeed_r FTLNAME = g_exf_wspeed_r
0156 +
0157 +c$taf COMMON exf_atm_temp_r ADNAME = adexf_atm_temp_r
0158 +c$taf COMMON exf_atm_temp_r FTLNAME = g_exf_atm_temp_r
0159 +
0160 +c$taf COMMON exf_swflux_r ADNAME = adexf_swflux_r
0161 +c$taf COMMON exf_swflux_r FTLNAME = g_exf_swflux_r
0162 +
0163 +c$taf COMMON exf_atm_wind_r ADNAME = adexf_atm_wind_r
0164 +c$taf COMMON exf_atm_wind_r FTLNAME = g_exf_atm_wind_r
0165 +
0166 +c$taf COMMON exf_rad_down_r ADNAME = adexf_rad_down_r
0167 +c$taf COMMON exf_rad_down_r FTLNAME = g_exf_rad_down_r
0168 +
0169 +c$taf COMMON exf_clim_sst_r ADNAME = adexf_clim_sst_r
0170 +c$taf COMMON exf_clim_sst_r FTLNAME = g_exf_clim_sst_r
0171 +
0172 +c$taf COMMON exf_clim_sss_r ADNAME = adexf_clim_sss_r
0173 +c$taf COMMON exf_clim_sss_r FTLNAME = g_exf_clim_sss_r
0174 +
0175 +c$taf COMMON seaice_dynvars_1 ADNAME = adseaice_dynvars_1
0176 +c$taf COMMON seaice_dynvars_1 FTLNAME = g_seaice_dynvars_1
0177 +
0178 +c$taf COMMON ggl90_fields ADNAME = adggl90_fields
0179 +c$taf COMMON ggl90_fields FTLNAME = g_ggl90_fields
0180 +
0181 +c$taf COMMON grid_r ADNAME = adgrid_r
0182 +c$taf COMMON grid_r FTLNAME = g_grid_r
0183 +
0184 +c$taf COMMON grid_r_c ADNAME = adgrid_r_c
0185 +c$taf COMMON grid_r_c FTLNAME = g_grid_r_c
0186 +
0187 +c$taf COMMON grid_r_s ADNAME = adgrid_r_s
0188 +c$taf COMMON grid_r_s FTLNAME = g_grid_r_s
0189 +
0190 +c$taf COMMON grid_r_w ADNAME = adgrid_r_w
0191 +c$taf COMMON grid_r_w FTLNAME = g_grid_r_w
0192 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/model_ad.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/model_ad.flow
0193 --- MITgcm-c64l/pkg/autodiff/model_ad.flow 2010-12-20 21:04:28.000000000 +0100
0194 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/model_ad.flow 2013-08-16 00:58:59.000000000 +0200
0195 @@ -1,11 +1,12 @@
0196 -C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0197 -C $Name: $
0198 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0199 +C $Name: $
0200
0201 C----------------------------------------
0202 C subroutine the_main_loop
0203 C----------------------------------------
0204 CADJ SUBROUTINE the_main_loop ADNAME = adthe_main_loop
0205 CADJ SUBROUTINE the_main_loop FTLNAME = g_the_main_loop
0206 +CADJ SUBROUTINE the_main_loop MODNAME = mdthe_main_loop
0207
0208 C----------------------------------------
0209 C subroutine calc_oce_mxlayer
0210 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/system.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/system.flow
0211 --- MITgcm-c64l/pkg/autodiff/system.flow 1970-01-01 01:00:00.000000000 +0100
0212 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/system.flow 2013-08-16 01:01:04.000000000 +0200
0213 @@ -0,0 +1,5 @@
0214 +c$taf subroutine cloc input =
0215 +
0216 +c$taf subroutine csystemtime input =
0217 +
0218 +c$taf subroutine cusertime input =
0219 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/cost/cost_ad.flow MITgcm-c64l-v2-patch-final/pkg/cost/cost_ad.flow
0220 --- MITgcm-c64l/pkg/cost/cost_ad.flow 1970-01-01 01:00:00.000000000 +0100
0221 +++ MITgcm-c64l-v2-patch-final/pkg/cost/cost_ad.flow 2013-08-16 01:01:13.000000000 +0200
0222 @@ -0,0 +1,12 @@
0223 +C------------------------------------------
0224 +C directives to specify the adjoint names
0225 +C of COMMON blocks used in the original code
0226 +C------------------------------------------
0227 +C$TAF COMMON cost_r FTLNAME = g_cost_r
0228 +C$TAF COMMON cost_r ADNAME = adcost_r
0229 +C$TAF COMMON cost_state_final_r FTLNAME = g_cost_state_final_r
0230 +C$TAF COMMON cost_state_final_r ADNAME = adcost_state_final_r
0231 +C$TAF COMMON cost_vector_r FTLNAME = g_cost_vector_r
0232 +C$TAF COMMON cost_vector_r ADNAME = adcost_vector_r
0233 +C$TAF COMMON cost_dic_cost_ctrl FTLNAME = g_cost_dic_cost_ctrl
0234 +C$TAF COMMON cost_dic_cost_ctrl ADNAME = adcost_dic_cost_ctrl
0235 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/profiles/profiles.flow MITgcm-c64l-v2-patch-final/pkg/profiles/profiles.flow
0236 --- MITgcm-c64l/pkg/profiles/profiles.flow 2007-10-09 02:07:59.000000000 +0200
0237 +++ MITgcm-c64l-v2-patch-final/pkg/profiles/profiles.flow 2013-08-16 01:01:26.000000000 +0200
0238 @@ -1,5 +1,5 @@
0239 -C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0240 -C $Name: $
0241 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0242 +C $Name: $
0243
0244 C----------------------------------------
0245 C subroutine profiles_readvector
0246 @@ -7,3 +7,6 @@
0247 CADJ SUBROUTINE profiles_readvector INPUT = 1,2,3,4,6,7,8
0248 CADJ SUBROUTINE profiles_readvector DEPEND = 1,2,3,4,6,7
0249 CADJ SUBROUTINE profiles_readvector OUTPUT = 5
0250 +
0251 +CADJ SUBROUTINE NF_OPEN INPUT =
0252 +CADJ SUBROUTINE NF_CLOSE INPUT =
0253 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/seaice/seaice.flow MITgcm-c64l-v2-patch-final/pkg/seaice/seaice.flow
0254 --- MITgcm-c64l/pkg/seaice/seaice.flow 1970-01-01 01:00:00.000000000 +0100
0255 +++ MITgcm-c64l-v2-patch-final/pkg/seaice/seaice.flow 2013-08-16 01:01:41.000000000 +0200
0256 @@ -0,0 +1,9 @@
0257 +C $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0258 +C $Name: $
0259 +
0260 +C----------------------------------------
0261 +C FUNCTION SEAICE_DIAG_SUFX
0262 +C----------------------------------------
0263 +CADJ FUNCTION SEAICE_DIAG_SUFX INPUT = 1,2
0264 +CADJ FUNCTION SEAICE_DIAG_SUFX OUTPUT =
0265 +
0266 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_default MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_default
0267 --- MITgcm-c64l/tools/adjoint_options/adjoint_default 2013-04-04 01:10:54.000000000 +0200
0268 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_default 2013-08-16 01:02:41.000000000 +0200
0269 @@ -1,10 +1,10 @@
0270 #!/bin/bash
0271 #
0272 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0273 -# $Name: $
0274 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0275 +# $Name: $
0276
0277 -# This AD option-file contains the default settings for the adjoint and
0278 -# tangent-linear compilers. If you need to change these settings,
0279 +# This AD option-file contains the default settings for the adjoint
0280 +# and tangent-linear compilers. If you need to change these settings,
0281 # please make a separate (local) copy of this file.
0282
0283 # TAMC=/data43/ralf/tamc/tamc
0284 @@ -15,11 +15,19 @@
0285 TAMC=tamc
0286
0287 AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0288 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0289 FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0290 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0291 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0292 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0293 +
0294 +AD_TAF_FLAGS="-reverse -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
0295 +FTL_TAF_FLAGS="-forward -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
0296 +SVD_TAF_FLAGS="-reverse -forward -pure -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
0297 +
0298 +#- in case we need to show some MPI code to TAF:
0299 +#if test "x$MPI" != x ; then
0300 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0301 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0302 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0303 +#fi
0304
0305 DIFF_FLAGS="-toplevel 'the_main_loop' \
0306 -input 'xx_theta_dummy \
0307 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_diva MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_diva
0308 --- MITgcm-c64l/tools/adjoint_options/adjoint_diva 2013-04-04 01:10:54.000000000 +0200
0309 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_diva 2013-08-16 01:02:41.000000000 +0200
0310 @@ -1,11 +1,11 @@
0311 #!/bin/bash
0312 #
0313 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0314 -# $Name: $
0315 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0316 +# $Name: $
0317 #
0318
0319 -# This file contains the default settings for the adjoint and
0320 -# tangent-linear compilers. If you need to change these settings,
0321 +# This AD option-file contains the default settings for the divided adjoint (DIVA)
0322 +# and tangent-linear compilers. If you need to change these settings,
0323 # please make a separate (local) copy of this file.
0324
0325 # TAMC=/data43/ralf/tamc/tamc
0326 @@ -16,13 +16,20 @@
0327 TAF=staf
0328 TAMC=tamc
0329
0330 -
0331 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
0332 -AD_TAF_FLAGS="-version 2.3.8 -v1 -pure -reverse -admark ad -i4 -r4 -l taf_ad.log"
0333 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
0334 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
0335 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
0336 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
0337 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0338 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0339 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0340 +
0341 +AD_TAF_FLAGS="-pure -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
0342 +FTL_TAF_FLAGS="-forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
0343 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
0344 +
0345 +#- using DIVA, we need to show some MPI code to TAF:
0346 +if test "x$MPI" != x ; then
0347 + AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0348 + FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0349 + SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0350 +fi
0351
0352 DIFF_FLAGS="-toplevel 'the_main_loop' \
0353 -input 'xx_theta_dummy \
0354 @@ -51,24 +58,27 @@
0355 xx_obcse_dummy \
0356 xx_sst_dummy \
0357 xx_sss_dummy \
0358 + xx_depth_dummy \
0359 xx_diffkr_dummy \
0360 xx_kapgm_dummy \
0361 - xx_edtaux_dummy \
0362 - xx_edtauy_dummy \
0363 - xx_kapredi_dummy \
0364 + xx_kapredi_dummy \
0365 xx_bottomdrag_dummy \
0366 xx_efluxy_dummy \
0367 xx_efluxp_dummy \
0368 + xx_edtaux_dummy \
0369 + xx_edtauy_dummy \
0370 xx_uvel_dummy \
0371 xx_vvel_dummy \
0372 xx_etan_dummy \
0373 - xx_gen2d_dummy \
0374 - xx_gen3d_dummy \
0375 + xx_gen2d_dummy \
0376 + xx_gen3d_dummy \
0377 xx_genarr2d_dummy \
0378 xx_genarr3d_dummy \
0379 - xx_siarea_dummy \
0380 - xx_siheff_dummy \
0381 - xx_sihsnow_dummy \
0382 + xx_gentim2d_dummy \
0383 + xx_siarea_dummy \
0384 + xx_siheff_dummy \
0385 + xx_sihsnow_dummy \
0386 + xx_shifwflx_dummy \
0387 xx_relaxsst_dummy \
0388 xx_relaxsss_dummy \
0389 xx_atemp_mean_dummy \
0390 @@ -76,7 +86,7 @@
0391 xx_precip_mean_dummy \
0392 xx_swdown_mean_dummy \
0393 xx_uwind_mean_dummy \
0394 - xx_vwind_mean_dummy' \
0395 + xx_vwind_mean_dummy' \
0396 -output 'fc'"
0397
0398 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
0399 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_f95 MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_f95
0400 --- MITgcm-c64l/tools/adjoint_options/adjoint_f95 2013-04-04 01:10:55.000000000 +0200
0401 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_f95 2013-08-16 01:02:41.000000000 +0200
0402 @@ -1,11 +1,10 @@
0403 #!/bin/bash
0404 #
0405 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0406 -# $Name: $
0407 -#
0408 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0409 +# $Name: $
0410
0411 -# This file contains the default settings for the adjoint and
0412 -# tangent-linear compilers. If you need to change these settings,
0413 +# This file contains the default F95 settings for the adjoint
0414 +# and tangent-linear compilers. If you need to change these settings,
0415 # please make a separate (local) copy of this file.
0416
0417 # TAMC=/data43/ralf/tamc/tamc
0418 @@ -15,12 +14,20 @@
0419 TAF=staf
0420 TAMC=tamc
0421
0422 -AD_TAMC_FLAGS='-f95 -reverse -admark ad -i4 -r4 -l tamc_ad.log'
0423 -AD_TAF_FLAGS='-version 2.3.8 -v1 -f95 -reverse -admark ad -i4 -r4 -l taf_ad.log'
0424 -FTL_TAMC_FLAGS='-f95 -forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
0425 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -f95 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
0426 -SVD_TAMC_FLAGS='-f95 -reverse -forward -pure -i4 -r4 -l tamc_svd.log'
0427 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -f95 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
0428 +AD_TAMC_FLAGS="-f95 -reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0429 +FTL_TAMC_FLAGS="-f95 -forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0430 +SVD_TAMC_FLAGS="-f95 -reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0431 +
0432 +AD_TAF_FLAGS="-f95 -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
0433 +FTL_TAF_FLAGS="-f95 -forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
0434 +SVD_TAF_FLAGS="-f95 -reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
0435 +
0436 +#- in case we need to show some MPI code to TAF:
0437 +#if test "x$MPI" != x ; then
0438 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0439 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0440 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0441 +#fi
0442
0443 DIFF_FLAGS="-toplevel 'the_main_loop' \
0444 -input 'xx_theta_dummy \
0445 @@ -49,9 +56,10 @@
0446 xx_obcse_dummy \
0447 xx_sst_dummy \
0448 xx_sss_dummy \
0449 + xx_depth_dummy \
0450 xx_diffkr_dummy \
0451 xx_kapgm_dummy \
0452 - xx_kapredi_dummy \
0453 + xx_kapredi_dummy \
0454 xx_bottomdrag_dummy \
0455 xx_efluxy_dummy \
0456 xx_efluxp_dummy \
0457 @@ -60,14 +68,15 @@
0458 xx_uvel_dummy \
0459 xx_vvel_dummy \
0460 xx_etan_dummy \
0461 - xx_gen2d_dummy \
0462 - xx_gen3d_dummy \
0463 + xx_gen2d_dummy \
0464 + xx_gen3d_dummy \
0465 xx_genarr2d_dummy \
0466 xx_genarr3d_dummy \
0467 xx_gentim2d_dummy \
0468 - xx_siarea_dummy \
0469 - xx_siheff_dummy \
0470 - xx_sihsnow_dummy \
0471 + xx_siarea_dummy \
0472 + xx_siheff_dummy \
0473 + xx_sihsnow_dummy \
0474 + xx_shifwflx_dummy \
0475 xx_relaxsst_dummy \
0476 xx_relaxsss_dummy \
0477 xx_atemp_mean_dummy \
0478 @@ -75,7 +84,7 @@
0479 xx_precip_mean_dummy \
0480 xx_swdown_mean_dummy \
0481 xx_uwind_mean_dummy \
0482 - xx_vwind_mean_dummy' \
0483 + xx_vwind_mean_dummy' \
0484 -output 'fc'"
0485
0486 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
0487 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_oad MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_oad
0488 --- MITgcm-c64l/tools/adjoint_options/adjoint_oad 2013-07-07 03:19:22.000000000 +0200
0489 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_oad 2013-08-16 01:02:41.000000000 +0200
0490 @@ -1,7 +1,7 @@
0491 #!/bin/bash
0492 #
0493 # $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0494 -# $Name: $
0495 +# $Name: $
0496 #
0497
0498 # This file contains settings for OpenAD
0499 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_state_final MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_state_final
0500 --- MITgcm-c64l/tools/adjoint_options/adjoint_state_final 2013-04-04 01:10:55.000000000 +0200
0501 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_state_final 2013-08-16 01:02:41.000000000 +0200
0502 @@ -1,8 +1,7 @@
0503 #!/bin/bash
0504 #
0505 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0506 -# $Name: $
0507 -#
0508 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0509 +# $Name: $
0510
0511 # This file is a template for SVD-type calculations
0512 # where a vector-valued cost function (-dependent) is used,
0513 @@ -14,16 +13,24 @@
0514 # TAF=~fastopt/bin/taf
0515 # STAF=staf
0516
0517 -TAF=taf
0518 +TAF=staf
0519 TAMC=tamc
0520 LIBS="${LIBS} -larpack"
0521
0522 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
0523 -AD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log'
0524 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
0525 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
0526 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
0527 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
0528 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0529 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0530 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0531 +
0532 +AD_TAF_FLAGS="-reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
0533 +FTL_TAF_FLAGS="-forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
0534 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
0535 +
0536 +#- in case we need to show some MPI code to TAF:
0537 +#if test "x$MPI" != x ; then
0538 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0539 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0540 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0541 +#fi
0542
0543 DIFF_FLAGS="-toplevel 'the_main_loop' \
0544 -input 'xx_theta_dummy \
0545 @@ -52,9 +59,10 @@
0546 xx_obcse_dummy \
0547 xx_sst_dummy \
0548 xx_sss_dummy \
0549 + xx_depth_dummy \
0550 xx_diffkr_dummy \
0551 xx_kapgm_dummy \
0552 - xx_kapredi_dummy \
0553 + xx_kapredi_dummy \
0554 xx_bottomdrag_dummy \
0555 xx_efluxy_dummy \
0556 xx_efluxp_dummy \
0557 @@ -63,10 +71,15 @@
0558 xx_uvel_dummy \
0559 xx_vvel_dummy \
0560 xx_etan_dummy \
0561 - xx_gen2d_dummy \
0562 - xx_gen3d_dummy \
0563 + xx_gen2d_dummy \
0564 + xx_gen3d_dummy \
0565 xx_genarr2d_dummy \
0566 xx_genarr3d_dummy \
0567 + xx_gentim2d_dummy \
0568 + xx_siarea_dummy \
0569 + xx_siheff_dummy \
0570 + xx_sihsnow_dummy \
0571 + xx_shifwflx_dummy \
0572 xx_relaxsst_dummy \
0573 xx_relaxsss_dummy \
0574 xx_atemp_mean_dummy \
0575 @@ -74,7 +87,7 @@
0576 xx_precip_mean_dummy \
0577 xx_swdown_mean_dummy \
0578 xx_uwind_mean_dummy \
0579 - xx_vwind_mean_dummy' \
0580 + xx_vwind_mean_dummy' \
0581 -output 'objf_state_final'"
0582
0583 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
0584 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_tamc_compatibility MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_tamc_compatibility
0585 --- MITgcm-c64l/tools/adjoint_options/adjoint_tamc_compatibility 2012-07-27 20:25:39.000000000 +0200
0586 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_tamc_compatibility 2013-08-16 01:02:41.000000000 +0200
0587 @@ -1,11 +1,10 @@
0588 #!/bin/bash
0589 #
0590 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0591 -# $Name: $
0592 -#
0593 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0594 +# $Name: $
0595
0596 -# This file contains the default settings for the adjoint and
0597 -# tangent-linear compilers. If you need to change these settings,
0598 +# This file contains the TAMC-like settings for the adjoint
0599 +# and tangent-linear compilers. If you need to change these settings,
0600 # please make a separate (local) copy of this file.
0601
0602 # TAMC=/data43/ralf/tamc/tamc
0603 @@ -15,13 +14,20 @@
0604 TAF=staf
0605 TAMC=tamc
0606
0607 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
0608 -#AD_TAF_FLAGS=' -reverse -admark ad -i4 -r4 -l taf_ad.log'
0609 -AD_TAF_FLAGS="-v1 -nonew_arg -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0610 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
0611 -FTL_TAF_FLAGS='-v1 -nonew_arg -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
0612 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
0613 -SVD_TAF_FLAGS='-v1 -nonew_arg -reverse -forward -pure -i4 -r4 -l taf_svd.log'
0614 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0615 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0616 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0617 +
0618 +AD_TAF_FLAGS="-v1 -nonew_arg -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
0619 +FTL_TAF_FLAGS="-v1 -nonew_arg -forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
0620 +SVD_TAF_FLAGS="-v1 -nonew_arg -reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
0621 +
0622 +#- in case we need to show some MPI code to TAF:
0623 +#if test "x$MPI" != x ; then
0624 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0625 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0626 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
0627 +#fi
0628
0629 DIFF_FLAGS="-toplevel 'the_main_loop' \
0630 -input 'xx_theta_dummy \
0631 @@ -53,7 +59,7 @@
0632 xx_depth_dummy \
0633 xx_diffkr_dummy \
0634 xx_kapgm_dummy \
0635 - xx_kapredi_dummy \
0636 + xx_kapredi_dummy \
0637 xx_bottomdrag_dummy \
0638 xx_efluxy_dummy \
0639 xx_efluxp_dummy \
0640 @@ -62,11 +68,15 @@
0641 xx_uvel_dummy \
0642 xx_vvel_dummy \
0643 xx_etan_dummy \
0644 + xx_gen2d_dummy \
0645 + xx_gen3d_dummy \
0646 xx_genarr2d_dummy \
0647 xx_genarr3d_dummy \
0648 - xx_siarea_dummy \
0649 - xx_siheff_dummy \
0650 - xx_sihsnow_dummy \
0651 + xx_gentim2d_dummy \
0652 + xx_siarea_dummy \
0653 + xx_siheff_dummy \
0654 + xx_sihsnow_dummy \
0655 + xx_shifwflx_dummy \
0656 xx_relaxsst_dummy \
0657 xx_relaxsss_dummy \
0658 xx_atemp_mean_dummy \
0659 @@ -74,7 +84,7 @@
0660 xx_precip_mean_dummy \
0661 xx_swdown_mean_dummy \
0662 xx_uwind_mean_dummy \
0663 - xx_vwind_mean_dummy' \
0664 + xx_vwind_mean_dummy' \
0665 -output 'fc'"
0666
0667 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
0668 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/genmake2 MITgcm-c64l-v2-patch-final/tools/genmake2
0669 --- MITgcm-c64l/tools/genmake2 2013-07-24 02:33:53.000000000 +0200
0670 +++ MITgcm-c64l-v2-patch-final/tools/genmake2 2013-08-16 01:02:09.000000000 +0200
0671 @@ -1,7 +1,7 @@
0672 #! /usr/bin/env bash
0673 #
0674 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0675 -# $Name: $
0676 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0677 +# $Name: $
0678 #
0679 # Makefile generator for MITgcm UV codes
0680 # created by cnh 03/98
0681 @@ -2703,7 +2703,14 @@
0682 F)
0683 echo " \\" >> F77srclist.tmp
0684 printf " $sf" >> F77srclist.tmp
0685 - if test "x$OPENAD" != x ; then
0686 + if test "x$OPENAD" = x ; then
0687 + basename=${sf%%.F}
0688 + isAD=`egrep ^$basename.f'[ ]*' adSrcFiles.tmp`
0689 + if test -z "$isAD" ; then
0690 + echo " \\" >> nonADF77srclist.tmp
0691 + printf " $sf" >> nonADF77srclist.tmp
0692 + fi
0693 + else #- OpenAD case:
0694 basename=${sf%%.F}
0695 isAD=`egrep ^$basename.f'[ ]*' adSrcFiles.tmp`
0696 if test -z "$isAD" ; then
0697 @@ -3136,8 +3143,8 @@
0698 ls -l ad_input_code_ad.$FS
0699 cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
0700
0701 -\$(EXE_AD): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ad_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
0702 - \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)
0703 +\$(EXE_AD): \$(SPECIAL_FILES) \$(H_SRC_FILES) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
0704 + \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
0705
0706 ad_tamc_output.$FS: ad_input_code.$FS
0707 \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
0708 @@ -3176,16 +3183,16 @@
0709
0710 ftl_taf_output.$FS: ftl_input_code.$FS
0711 \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
0712 - ls -l ftl_input_code_ftl.$FS
0713 - cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
0714 + ls -l ftl_input_code_tl.$FS
0715 + cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
0716
0717 ftltafonly:
0718 \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
0719 - ls -l ftl_input_code_ftl.$FS
0720 - cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
0721 + ls -l ftl_input_code_tl.$FS
0722 + cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
0723
0724 -\$(EXE_FTL): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ftl_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
0725 - \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
0726 +\$(EXE_FTL): \$(SPECIAL_FILES) \$(H_SRC_FILES) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
0727 + \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
0728
0729 ftl_tamc_output.$FS: ftl_input_code.$FS
0730 \$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
0731 diff -Naur -x Entries -IHeader MITgcm-c64l/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local MITgcm-c64l-v2-patch-final/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local
0732 --- MITgcm-c64l/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
0733 +++ MITgcm-c64l-v2-patch-final/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local 2013-08-16 01:02:56.000000000 +0200
0734 @@ -1,7 +1,7 @@
0735 #!/bin/bash
0736 #
0737 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0738 -# $Name: $
0739 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0740 +# $Name: $
0741
0742 # This AD option-file contains the settings for the adjoint and
0743 # tangent-linear compilers to use for this particular setup.
0744 @@ -16,12 +16,12 @@
0745 TAF=staf
0746 TAMC=tamc
0747
0748 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0749 -AD_TAF_FLAGS="-version 2.3.8 -v1 -e -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0750 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0751 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -e -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0752 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0753 +AD_TAF_FLAGS="-e -reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0754 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0755 +FTL_TAF_FLAGS="-e -forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0756 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0757 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0758 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0759
0760 DIFF_FLAGS="-toplevel 'the_main_loop' \
0761 -input 'xx_theta_dummy \
0762 diff -Naur -x Entries -IHeader MITgcm-c64l/verification/lab_sea/build/genmake_local MITgcm-c64l-v2-patch-final/verification/lab_sea/build/genmake_local
0763 --- MITgcm-c64l/verification/lab_sea/build/genmake_local 2013-07-19 22:44:58.000000000 +0200
0764 +++ MITgcm-c64l-v2-patch-final/verification/lab_sea/build/genmake_local 2013-08-16 01:03:06.000000000 +0200
0765 @@ -4,8 +4,4 @@
0766
0767 #-- This is the local options file for the "new" version of genmake
0768
0769 -if test "x$MPI" = x ; then
0770 - AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva'
0771 -else
0772 - AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva_mpi'
0773 -fi
0774 +AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva'
0775 diff -Naur -x Entries -IHeader MITgcm-c64l/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local MITgcm-c64l-v2-patch-final/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local
0776 --- MITgcm-c64l/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
0777 +++ MITgcm-c64l-v2-patch-final/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local 2013-08-16 01:03:16.000000000 +0200
0778 @@ -1,7 +1,7 @@
0779 #!/bin/bash
0780 #
0781 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0782 -# $Name: $
0783 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0784 +# $Name: $
0785
0786 # This AD option-file contains the settings for the adjoint and
0787 # tangent-linear compilers to use for this particular setup.
0788 @@ -15,12 +15,12 @@
0789 TAF=staf
0790 TAMC=tamc
0791
0792 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0793 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0794 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0795 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0796 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0797 +AD_TAF_FLAGS="-reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0798 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0799 +FTL_TAF_FLAGS="-forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0800 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0801 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0802 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0803
0804 DIFF_FLAGS="-toplevel 'the_main_loop' \
0805 -input 'xx_dic \
0806 diff -Naur -x Entries -IHeader MITgcm-c64l/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local MITgcm-c64l-v2-patch-final/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local
0807 --- MITgcm-c64l/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
0808 +++ MITgcm-c64l-v2-patch-final/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local 2013-08-16 01:03:34.000000000 +0200
0809 @@ -1,7 +1,7 @@
0810 #!/bin/bash
0811 #
0812 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0813 -# $Name: $
0814 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch,v 1.1 2013/08/16 14:53:31 heimbach Exp $
0815 +# $Name: $
0816
0817 # This AD option-file contains the settings for the adjoint and
0818 # tangent-linear compilers to use for this particular setup.
0819 @@ -15,12 +15,12 @@
0820 TAF=staf
0821 TAMC=tamc
0822
0823 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0824 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0825 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0826 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0827 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
0828 +AD_TAF_FLAGS="-reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
0829 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
0830 +FTL_TAF_FLAGS="-forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
0831 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
0832 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0833 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
0834
0835 DIFF_FLAGS="-toplevel 'the_main_loop' \
0836 -input 'xx_theta_dummy \
