/[MITgcm]/MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch
ViewVC logotype

Contents of /MITgcm/tools/adjoint_options/MITgcm-c64l-TAFv2.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Fri Aug 16 14:53:31 2013 UTC (10 years, 8 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint64y, checkpoint64x, checkpoint64z, checkpoint64o, checkpoint64q, checkpoint64p, checkpoint64s, checkpoint64r, checkpoint64u, checkpoint64t, checkpoint64w, checkpoint64v, checkpoint66g, checkpoint66f, checkpoint66e, checkpoint66d, checkpoint66c, checkpoint66b, checkpoint66a, checkpoint64n, checkpoint66o, checkpoint66n, checkpoint66m, checkpoint66l, checkpoint66k, checkpoint66j, checkpoint66i, checkpoint66h, checkpoint65z, checkpoint65x, checkpoint65y, checkpoint65r, checkpoint65s, checkpoint65p, checkpoint65q, checkpoint65v, checkpoint65w, checkpoint65t, checkpoint65u, checkpoint65j, checkpoint65k, checkpoint65h, checkpoint65i, checkpoint65n, checkpoint65o, checkpoint65l, checkpoint65m, checkpoint65b, checkpoint65c, checkpoint65a, checkpoint65f, checkpoint65g, checkpoint65d, checkpoint65e, checkpoint65, HEAD 
(Re-)commit tested TAF-v2 patch file and update README.
1 diff -Naur -x Entries -IHeader MITgcm-c64l/eesupp/src/exch1_ad.flow MITgcm-c64l-v2-patch-final/eesupp/src/exch1_ad.flow
2 --- MITgcm-c64l/eesupp/src/exch1_ad.flow 2010-10-16 19:01:04.000000000 +0200
3 +++ MITgcm-c64l-v2-patch-final/eesupp/src/exch1_ad.flow 2013-08-16 00:56:22.000000000 +0200
4 @@ -1,5 +1,27 @@
5 -C $Header: /u/gcmpack/MITgcm/eesupp/src/exch1_ad.flow,v 1.2 2010/10/16 17:01:04 jmc Exp $
6 -C $Name: checkpoint64l $
7 +C $Header: /u/gcmpack/MITgcm/eesupp/src/exch1_ad.flow,v 1.3 2013/08/06 22:29:40 jmc Exp $
8 +C $Name: $
9 +
10 +C------------------------------------------
11 +C directives to specify the adjoint names
12 +C of routines called in the original code
13 +C------------------------------------------
14 +c$taf SUBROUTINE exch_3d_rl ADNAME = adexch_3d_rl
15 +c$taf SUBROUTINE exch_3d_rs ADNAME = adexch_3d_rs
16 +c$taf SUBROUTINE exch_uv_3d_rl ADNAME = adexch_uv_3d_rl
17 +c$taf SUBROUTINE exch_uv_3d_rs ADNAME = adexch_uv_3d_rs
18 +c$taf SUBROUTINE exch_uv_xy_rl ADNAME = adexch_uv_xy_rl
19 +c$taf SUBROUTINE exch_uv_xy_rs ADNAME = adexch_uv_xy_rs
20 +c$taf SUBROUTINE exch_uv_xyz_rl ADNAME = adexch_uv_xyz_rl
21 +c$taf SUBROUTINE exch_uv_xyz_rs ADNAME = adexch_uv_xyz_rs
22 +c$taf SUBROUTINE exch_xy_rl ADNAME = adexch_xy_rl
23 +c$taf SUBROUTINE exch_xy_rs ADNAME = adexch_xy_rs
24 +c$taf SUBROUTINE exch_xyz_rl ADNAME = adexch_xyz_rl
25 +c$taf SUBROUTINE exch_xyz_rs ADNAME = adexch_xyz_rs
26 +c$taf SUBROUTINE exch_uv_agrid_3d_rl ADNAME = adexch_uv_agrid_3d_rl
27 +c$taf SUBROUTINE exch_uv_bgrid_3d_rl ADNAME = adexch_uv_agrid_3d_rl
28 +c$taf SUBROUTINE exch_uv_dgrid_3d_rl ADNAME = adexch_uv_dgrid_3d_rl
29 +c$taf SUBROUTINE exch_sm_3d_rl ADNAME = adexch_sm_3d_rl
30 +c$taf SUBROUTINE exch_z_3d_rl ADNAME = adexch_z_3d_rl
31
32 C------------------------------------------
33 C TAF flow directives for exch1_RX
34 diff -Naur -x Entries -IHeader MITgcm-c64l/model/src/port_rand.F MITgcm-c64l-v2-patch-final/model/src/port_rand.F
35 --- MITgcm-c64l/model/src/port_rand.F 2009-12-08 22:50:35.000000000 +0100
36 +++ MITgcm-c64l-v2-patch-final/model/src/port_rand.F 2013-08-16 00:56:32.000000000 +0200
37 @@ -1,5 +1,5 @@
38 -C $Header: /u/gcmpack/MITgcm/model/src/port_rand.F,v 1.7 2009/12/08 21:50:35 jmc Exp $
39 -C $Name: checkpoint64l $
40 +C $Header: /u/gcmpack/MITgcm/model/src/port_rand.F,v 1.8 2013/08/09 15:00:46 jmc Exp $
41 +C $Name: $
42
43 #undef _USE_INTEGERS
44
45 @@ -162,19 +162,16 @@
46 c seed=1618033.0d0
47
48 C first generate 2 equally distributed random numbers (-1,1)
49 - DO WHILE (1 .EQ. 1)
50 + xs = 0.0
51 + DO WHILE ( xs.GE.1.0 .OR. xs.EQ.0.0 )
52 x1=2.0*port_rand(seed)-1.0
53 x2=2.0*port_rand(seed)-1.0
54 xs=x1**2+x2**2
55 - IF (xs .LT. 1.0 .AND. xs .NE. 0.0) THEN
56 - GOTO 100
57 - ENDIF
58 ENDDO
59 - 100 CONTINUE
60
61 t = SQRT(-2.0*LOG(xs)/xs)
62 port_rand_norm = t*x1
63 -C
64 +
65 C also t*x2 would be a gaussian random number and could be returned
66
67 RETURN
68 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/autodiff_whtapeio_sync.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/autodiff_whtapeio_sync.flow
69 --- MITgcm-c64l/pkg/autodiff/autodiff_whtapeio_sync.flow 2011-10-30 23:48:10.000000000 +0100
70 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/autodiff_whtapeio_sync.flow 2013-08-16 00:56:47.000000000 +0200
71 @@ -1,5 +1,5 @@
72 -C $Header: /u/gcmpack/MITgcm/pkg/autodiff/autodiff_whtapeio_sync.flow,v 1.2 2011/10/30 22:48:10 heimbach Exp $
73 -C $Name: checkpoint64l $
74 +C $Header: /u/gcmpack/MITgcm/pkg/autodiff/autodiff_whtapeio_sync.flow,v 1.3 2013/08/06 22:28:20 jmc Exp $
75 +C $Name: $
76
77 C /==========================================================\
78 C | SUBROUTINE autodiff_whtapeio_sync |
79 @@ -11,3 +11,4 @@
80 cadj SUBROUTINE autodiff_whtapeio_sync REQUIRED
81 cadj SUBROUTINE autodiff_whtapeio_sync INFLUENCED
82 cadj SUBROUTINE autodiff_whtapeio_sync FTLNAME = autodiff_whtapeio_sync
83 +c$taf SUBROUTINE autodiff_whtapeio_sync ADNAME=adautodiff_whtapeio_sync
84 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/common.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/common.flow
85 --- MITgcm-c64l/pkg/autodiff/common.flow 1970-01-01 01:00:00.000000000 +0100
86 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/common.flow 2013-08-16 00:57:03.000000000 +0200
87 @@ -0,0 +1,104 @@
88 +c$taf COMMON dynvars_r ADNAME = addynvars_r
89 +c$taf COMMON dynvars_r FTLNAME = g_dynvars_r
90 +
91 +c$taf COMMON dynvars_r2 ADNAME = addynvars_r2
92 +c$taf COMMON dynvars_r2 FTLNAME = g_dynvars_r2
93 +
94 +c$taf COMMON dynvars_diag ADNAME = addynvars_diag
95 +c$taf COMMON dynvars_diag FTLNAME = g_dynvars_diag
96 +
97 +c$taf COMMON dynvars_cd ADNAME = addynvars_cd
98 +c$taf COMMON dynvars_cd FTLNAME = g_dynvars_cd
99 +
100 +c$taf COMMON ffields_fu ADNAME = adffields_fu
101 +c$taf COMMON ffields_fu FTLNAME = g_ffields_fu
102 +
103 +c$taf COMMON ffields_fv ADNAME = adffields_fv
104 +c$taf COMMON ffields_fv FTLNAME = g_ffields_fv
105 +
106 +c$taf COMMON ffields_Qnet ADNAME = adffields_Qnet
107 +c$taf COMMON ffields_Qnet FTLNAME = g_ffields_Qnet
108 +
109 +c$taf COMMON ffields_Qsw ADNAME = adffields_Qsw
110 +c$taf COMMON ffields_Qsw FTLNAME = g_ffields_Qsw
111 +
112 +c$taf COMMON ffields_dQdT ADNAME = adffields_dQdT
113 +c$taf COMMON ffields_dQdT FTLNAME = g_ffields_dQdT
114 +
115 +c$taf COMMON ffields_EmPmR ADNAME = adffields_EmPmR
116 +c$taf COMMON ffields_EmPmR FTLNAME = g_ffields_EmPmR
117 +
118 +c$taf COMMON ffields_saltFlux ADNAME = adffields_saltFlux
119 +c$taf COMMON ffields_saltFlux FTLNAME = g_ffields_saltFlux
120 +
121 +c$taf COMMON ffields_SST ADNAME = adffields_SST
122 +c$taf COMMON ffields_SST FTLNAME = g_ffields_SST
123 +
124 +c$taf COMMON ffields_SSS ADNAME = adffields_SSS
125 +c$taf COMMON ffields_SSS FTLNAME = g_ffields_SSS
126 +
127 +c$taf COMMON ffields_lambdaThetaClimRelax ADNAME = adffields_lambdaThetaClimRelax
128 +c$taf COMMON ffields_lambdaThetaClimRelax FTLNAME = g_ffields_lambdaThetaClimRelax
129 +
130 +c$taf COMMON ffields_lambdaSaltClimRelax ADNAME = adffields_lambdaSaltClimRelax
131 +c$taf COMMON ffields_lambdaSaltClimRelax FTLNAME = g_ffields_lambdaSaltClimRelax
132 +
133 +c$taf COMMON DYNVARS_DIFFKR ADNAME = adDYNVARS_DIFFKR
134 +c$taf COMMON DYNVARS_DIFFKR FTLNAME = g_DYNVARS_DIFFKR
135 +
136 +c$taf COMMON DYNVARS_KAPGM ADNAME = adDYNVARS_KAPGM
137 +c$taf COMMON DYNVARS_KAPGM FTLNAME = g_DYNVARS_KAPGM
138 +
139 +c$taf COMMON DYNVARS_KAPREDI ADNAME = adDYNVARS_KAPREDI
140 +c$taf COMMON DYNVARS_KAPREDI FTLNAME = g_DYNVARS_KAPREDI
141 +
142 +c$taf COMMON DYNVARS_BOTTOMDRAG ADNAME = adDYNVARS_BOTTOMDRAG
143 +c$taf COMMON DYNVARS_BOTTOMDRAG FTLNAME = g_DYNVARS_BOTTOMDRAG
144 +
145 +c$taf COMMON eddypsiffield ADNAME = adeddypsiffield
146 +c$taf COMMON eddypsiffield FTLNAME = g_eddypsiffield
147 +
148 +c$taf COMMON exf_hsflux_r ADNAME = adexf_hsflux_r
149 +c$taf COMMON exf_hsflux_r FTLNAME = g_exf_hsflux_r
150 +
151 +c$taf COMMON exf_stress_r ADNAME = adexf_stress_r
152 +c$taf COMMON exf_stress_r FTLNAME = g_exf_stress_r
153 +
154 +c$taf COMMON exf_wspeed_r ADNAME = adexf_wspeed_r
155 +c$taf COMMON exf_wspeed_r FTLNAME = g_exf_wspeed_r
156 +
157 +c$taf COMMON exf_atm_temp_r ADNAME = adexf_atm_temp_r
158 +c$taf COMMON exf_atm_temp_r FTLNAME = g_exf_atm_temp_r
159 +
160 +c$taf COMMON exf_swflux_r ADNAME = adexf_swflux_r
161 +c$taf COMMON exf_swflux_r FTLNAME = g_exf_swflux_r
162 +
163 +c$taf COMMON exf_atm_wind_r ADNAME = adexf_atm_wind_r
164 +c$taf COMMON exf_atm_wind_r FTLNAME = g_exf_atm_wind_r
165 +
166 +c$taf COMMON exf_rad_down_r ADNAME = adexf_rad_down_r
167 +c$taf COMMON exf_rad_down_r FTLNAME = g_exf_rad_down_r
168 +
169 +c$taf COMMON exf_clim_sst_r ADNAME = adexf_clim_sst_r
170 +c$taf COMMON exf_clim_sst_r FTLNAME = g_exf_clim_sst_r
171 +
172 +c$taf COMMON exf_clim_sss_r ADNAME = adexf_clim_sss_r
173 +c$taf COMMON exf_clim_sss_r FTLNAME = g_exf_clim_sss_r
174 +
175 +c$taf COMMON seaice_dynvars_1 ADNAME = adseaice_dynvars_1
176 +c$taf COMMON seaice_dynvars_1 FTLNAME = g_seaice_dynvars_1
177 +
178 +c$taf COMMON ggl90_fields ADNAME = adggl90_fields
179 +c$taf COMMON ggl90_fields FTLNAME = g_ggl90_fields
180 +
181 +c$taf COMMON grid_r ADNAME = adgrid_r
182 +c$taf COMMON grid_r FTLNAME = g_grid_r
183 +
184 +c$taf COMMON grid_r_c ADNAME = adgrid_r_c
185 +c$taf COMMON grid_r_c FTLNAME = g_grid_r_c
186 +
187 +c$taf COMMON grid_r_s ADNAME = adgrid_r_s
188 +c$taf COMMON grid_r_s FTLNAME = g_grid_r_s
189 +
190 +c$taf COMMON grid_r_w ADNAME = adgrid_r_w
191 +c$taf COMMON grid_r_w FTLNAME = g_grid_r_w
192 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/model_ad.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/model_ad.flow
193 --- MITgcm-c64l/pkg/autodiff/model_ad.flow 2010-12-20 21:04:28.000000000 +0100
194 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/model_ad.flow 2013-08-16 00:58:59.000000000 +0200
195 @@ -1,11 +1,12 @@
196 -C $Header: /u/gcmpack/MITgcm/pkg/autodiff/model_ad.flow,v 1.8 2010/12/20 20:04:28 jmc Exp $
197 -C $Name: checkpoint64l $
198 +C $Header: /u/gcmpack/MITgcm/pkg/autodiff/model_ad.flow,v 1.9 2013/08/07 15:35:29 jmc Exp $
199 +C $Name: $
200
201 C----------------------------------------
202 C subroutine the_main_loop
203 C----------------------------------------
204 CADJ SUBROUTINE the_main_loop ADNAME = adthe_main_loop
205 CADJ SUBROUTINE the_main_loop FTLNAME = g_the_main_loop
206 +CADJ SUBROUTINE the_main_loop MODNAME = mdthe_main_loop
207
208 C----------------------------------------
209 C subroutine calc_oce_mxlayer
210 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/autodiff/system.flow MITgcm-c64l-v2-patch-final/pkg/autodiff/system.flow
211 --- MITgcm-c64l/pkg/autodiff/system.flow 1970-01-01 01:00:00.000000000 +0100
212 +++ MITgcm-c64l-v2-patch-final/pkg/autodiff/system.flow 2013-08-16 01:01:04.000000000 +0200
213 @@ -0,0 +1,5 @@
214 +c$taf subroutine cloc input =
215 +
216 +c$taf subroutine csystemtime input =
217 +
218 +c$taf subroutine cusertime input =
219 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/cost/cost_ad.flow MITgcm-c64l-v2-patch-final/pkg/cost/cost_ad.flow
220 --- MITgcm-c64l/pkg/cost/cost_ad.flow 1970-01-01 01:00:00.000000000 +0100
221 +++ MITgcm-c64l-v2-patch-final/pkg/cost/cost_ad.flow 2013-08-16 01:01:13.000000000 +0200
222 @@ -0,0 +1,12 @@
223 +C------------------------------------------
224 +C directives to specify the adjoint names
225 +C of COMMON blocks used in the original code
226 +C------------------------------------------
227 +C$TAF COMMON cost_r FTLNAME = g_cost_r
228 +C$TAF COMMON cost_r ADNAME = adcost_r
229 +C$TAF COMMON cost_state_final_r FTLNAME = g_cost_state_final_r
230 +C$TAF COMMON cost_state_final_r ADNAME = adcost_state_final_r
231 +C$TAF COMMON cost_vector_r FTLNAME = g_cost_vector_r
232 +C$TAF COMMON cost_vector_r ADNAME = adcost_vector_r
233 +C$TAF COMMON cost_dic_cost_ctrl FTLNAME = g_cost_dic_cost_ctrl
234 +C$TAF COMMON cost_dic_cost_ctrl ADNAME = adcost_dic_cost_ctrl
235 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/profiles/profiles.flow MITgcm-c64l-v2-patch-final/pkg/profiles/profiles.flow
236 --- MITgcm-c64l/pkg/profiles/profiles.flow 2007-10-09 02:07:59.000000000 +0200
237 +++ MITgcm-c64l-v2-patch-final/pkg/profiles/profiles.flow 2013-08-16 01:01:26.000000000 +0200
238 @@ -1,5 +1,5 @@
239 -C $Header: /u/gcmpack/MITgcm/pkg/profiles/profiles.flow,v 1.3 2007/10/09 00:07:59 jmc Exp $
240 -C $Name: checkpoint64l $
241 +C $Header: /u/gcmpack/MITgcm/pkg/profiles/profiles.flow,v 1.4 2013/08/08 14:31:34 heimbach Exp $
242 +C $Name: $
243
244 C----------------------------------------
245 C subroutine profiles_readvector
246 @@ -7,3 +7,6 @@
247 CADJ SUBROUTINE profiles_readvector INPUT = 1,2,3,4,6,7,8
248 CADJ SUBROUTINE profiles_readvector DEPEND = 1,2,3,4,6,7
249 CADJ SUBROUTINE profiles_readvector OUTPUT = 5
250 +
251 +CADJ SUBROUTINE NF_OPEN INPUT =
252 +CADJ SUBROUTINE NF_CLOSE INPUT =
253 diff -Naur -x Entries -IHeader MITgcm-c64l/pkg/seaice/seaice.flow MITgcm-c64l-v2-patch-final/pkg/seaice/seaice.flow
254 --- MITgcm-c64l/pkg/seaice/seaice.flow 1970-01-01 01:00:00.000000000 +0100
255 +++ MITgcm-c64l-v2-patch-final/pkg/seaice/seaice.flow 2013-08-16 01:01:41.000000000 +0200
256 @@ -0,0 +1,9 @@
257 +C $Header: /u/gcmpack/MITgcm/pkg/seaice/seaice.flow,v 1.1 2013/08/09 01:22:32 jmc Exp $
258 +C $Name: $
259 +
260 +C----------------------------------------
261 +C FUNCTION SEAICE_DIAG_SUFX
262 +C----------------------------------------
263 +CADJ FUNCTION SEAICE_DIAG_SUFX INPUT = 1,2
264 +CADJ FUNCTION SEAICE_DIAG_SUFX OUTPUT =
265 +
266 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_default MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_default
267 --- MITgcm-c64l/tools/adjoint_options/adjoint_default 2013-04-04 01:10:54.000000000 +0200
268 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_default 2013-08-16 01:02:41.000000000 +0200
269 @@ -1,10 +1,10 @@
270 #!/bin/bash
271 #
272 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_default,v 1.31 2013/04/03 23:10:54 heimbach Exp $
273 -# $Name: checkpoint64l $
274 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_default,v 1.36 2013/08/09 18:28:36 jmc Exp $
275 +# $Name: $
276
277 -# This AD option-file contains the default settings for the adjoint and
278 -# tangent-linear compilers. If you need to change these settings,
279 +# This AD option-file contains the default settings for the adjoint
280 +# and tangent-linear compilers. If you need to change these settings,
281 # please make a separate (local) copy of this file.
282
283 # TAMC=/data43/ralf/tamc/tamc
284 @@ -15,11 +15,19 @@
285 TAMC=tamc
286
287 AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
288 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
289 FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
290 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
291 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
292 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
293 +
294 +AD_TAF_FLAGS="-reverse -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
295 +FTL_TAF_FLAGS="-forward -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
296 +SVD_TAF_FLAGS="-reverse -forward -pure -server fastopt.net -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
297 +
298 +#- in case we need to show some MPI code to TAF:
299 +#if test "x$MPI" != x ; then
300 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
301 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
302 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
303 +#fi
304
305 DIFF_FLAGS="-toplevel 'the_main_loop' \
306 -input 'xx_theta_dummy \
307 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_diva MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_diva
308 --- MITgcm-c64l/tools/adjoint_options/adjoint_diva 2013-04-04 01:10:54.000000000 +0200
309 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_diva 2013-08-16 01:02:41.000000000 +0200
310 @@ -1,11 +1,11 @@
311 #!/bin/bash
312 #
313 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_diva,v 1.11 2013/04/03 23:10:54 heimbach Exp $
314 -# $Name: checkpoint64l $
315 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_diva,v 1.16 2013/08/09 18:28:36 jmc Exp $
316 +# $Name: $
317 #
318
319 -# This file contains the default settings for the adjoint and
320 -# tangent-linear compilers. If you need to change these settings,
321 +# This AD option-file contains the default settings for the divided adjoint (DIVA)
322 +# and tangent-linear compilers. If you need to change these settings,
323 # please make a separate (local) copy of this file.
324
325 # TAMC=/data43/ralf/tamc/tamc
326 @@ -16,13 +16,20 @@
327 TAF=staf
328 TAMC=tamc
329
330 -
331 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
332 -AD_TAF_FLAGS="-version 2.3.8 -v1 -pure -reverse -admark ad -i4 -r4 -l taf_ad.log"
333 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
334 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
335 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
336 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
337 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
338 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
339 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
340 +
341 +AD_TAF_FLAGS="-pure -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
342 +FTL_TAF_FLAGS="-forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
343 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
344 +
345 +#- using DIVA, we need to show some MPI code to TAF:
346 +if test "x$MPI" != x ; then
347 + AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
348 + FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
349 + SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
350 +fi
351
352 DIFF_FLAGS="-toplevel 'the_main_loop' \
353 -input 'xx_theta_dummy \
354 @@ -51,24 +58,27 @@
355 xx_obcse_dummy \
356 xx_sst_dummy \
357 xx_sss_dummy \
358 + xx_depth_dummy \
359 xx_diffkr_dummy \
360 xx_kapgm_dummy \
361 - xx_edtaux_dummy \
362 - xx_edtauy_dummy \
363 - xx_kapredi_dummy \
364 + xx_kapredi_dummy \
365 xx_bottomdrag_dummy \
366 xx_efluxy_dummy \
367 xx_efluxp_dummy \
368 + xx_edtaux_dummy \
369 + xx_edtauy_dummy \
370 xx_uvel_dummy \
371 xx_vvel_dummy \
372 xx_etan_dummy \
373 - xx_gen2d_dummy \
374 - xx_gen3d_dummy \
375 + xx_gen2d_dummy \
376 + xx_gen3d_dummy \
377 xx_genarr2d_dummy \
378 xx_genarr3d_dummy \
379 - xx_siarea_dummy \
380 - xx_siheff_dummy \
381 - xx_sihsnow_dummy \
382 + xx_gentim2d_dummy \
383 + xx_siarea_dummy \
384 + xx_siheff_dummy \
385 + xx_sihsnow_dummy \
386 + xx_shifwflx_dummy \
387 xx_relaxsst_dummy \
388 xx_relaxsss_dummy \
389 xx_atemp_mean_dummy \
390 @@ -76,7 +86,7 @@
391 xx_precip_mean_dummy \
392 xx_swdown_mean_dummy \
393 xx_uwind_mean_dummy \
394 - xx_vwind_mean_dummy' \
395 + xx_vwind_mean_dummy' \
396 -output 'fc'"
397
398 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
399 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_f95 MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_f95
400 --- MITgcm-c64l/tools/adjoint_options/adjoint_f95 2013-04-04 01:10:55.000000000 +0200
401 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_f95 2013-08-16 01:02:41.000000000 +0200
402 @@ -1,11 +1,10 @@
403 #!/bin/bash
404 #
405 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_f95,v 1.13 2013/04/03 23:10:55 heimbach Exp $
406 -# $Name: checkpoint64l $
407 -#
408 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_f95,v 1.17 2013/08/09 18:28:36 jmc Exp $
409 +# $Name: $
410
411 -# This file contains the default settings for the adjoint and
412 -# tangent-linear compilers. If you need to change these settings,
413 +# This file contains the default F95 settings for the adjoint
414 +# and tangent-linear compilers. If you need to change these settings,
415 # please make a separate (local) copy of this file.
416
417 # TAMC=/data43/ralf/tamc/tamc
418 @@ -15,12 +14,20 @@
419 TAF=staf
420 TAMC=tamc
421
422 -AD_TAMC_FLAGS='-f95 -reverse -admark ad -i4 -r4 -l tamc_ad.log'
423 -AD_TAF_FLAGS='-version 2.3.8 -v1 -f95 -reverse -admark ad -i4 -r4 -l taf_ad.log'
424 -FTL_TAMC_FLAGS='-f95 -forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
425 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -f95 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
426 -SVD_TAMC_FLAGS='-f95 -reverse -forward -pure -i4 -r4 -l tamc_svd.log'
427 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -f95 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
428 +AD_TAMC_FLAGS="-f95 -reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
429 +FTL_TAMC_FLAGS="-f95 -forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
430 +SVD_TAMC_FLAGS="-f95 -reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
431 +
432 +AD_TAF_FLAGS="-f95 -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
433 +FTL_TAF_FLAGS="-f95 -forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
434 +SVD_TAF_FLAGS="-f95 -reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
435 +
436 +#- in case we need to show some MPI code to TAF:
437 +#if test "x$MPI" != x ; then
438 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
439 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
440 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
441 +#fi
442
443 DIFF_FLAGS="-toplevel 'the_main_loop' \
444 -input 'xx_theta_dummy \
445 @@ -49,9 +56,10 @@
446 xx_obcse_dummy \
447 xx_sst_dummy \
448 xx_sss_dummy \
449 + xx_depth_dummy \
450 xx_diffkr_dummy \
451 xx_kapgm_dummy \
452 - xx_kapredi_dummy \
453 + xx_kapredi_dummy \
454 xx_bottomdrag_dummy \
455 xx_efluxy_dummy \
456 xx_efluxp_dummy \
457 @@ -60,14 +68,15 @@
458 xx_uvel_dummy \
459 xx_vvel_dummy \
460 xx_etan_dummy \
461 - xx_gen2d_dummy \
462 - xx_gen3d_dummy \
463 + xx_gen2d_dummy \
464 + xx_gen3d_dummy \
465 xx_genarr2d_dummy \
466 xx_genarr3d_dummy \
467 xx_gentim2d_dummy \
468 - xx_siarea_dummy \
469 - xx_siheff_dummy \
470 - xx_sihsnow_dummy \
471 + xx_siarea_dummy \
472 + xx_siheff_dummy \
473 + xx_sihsnow_dummy \
474 + xx_shifwflx_dummy \
475 xx_relaxsst_dummy \
476 xx_relaxsss_dummy \
477 xx_atemp_mean_dummy \
478 @@ -75,7 +84,7 @@
479 xx_precip_mean_dummy \
480 xx_swdown_mean_dummy \
481 xx_uwind_mean_dummy \
482 - xx_vwind_mean_dummy' \
483 + xx_vwind_mean_dummy' \
484 -output 'fc'"
485
486 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
487 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_oad MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_oad
488 --- MITgcm-c64l/tools/adjoint_options/adjoint_oad 2013-07-07 03:19:22.000000000 +0200
489 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_oad 2013-08-16 01:02:41.000000000 +0200
490 @@ -1,7 +1,7 @@
491 #!/bin/bash
492 #
493 # $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_oad,v 1.4 2013/07/07 01:19:22 jmc Exp $
494 -# $Name: checkpoint64l $
495 +# $Name: $
496 #
497
498 # This file contains settings for OpenAD
499 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_state_final MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_state_final
500 --- MITgcm-c64l/tools/adjoint_options/adjoint_state_final 2013-04-04 01:10:55.000000000 +0200
501 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_state_final 2013-08-16 01:02:41.000000000 +0200
502 @@ -1,8 +1,7 @@
503 #!/bin/bash
504 #
505 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_state_final,v 1.15 2013/04/03 23:10:55 heimbach Exp $
506 -# $Name: checkpoint64l $
507 -#
508 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_state_final,v 1.17 2013/08/09 18:28:36 jmc Exp $
509 +# $Name: $
510
511 # This file is a template for SVD-type calculations
512 # where a vector-valued cost function (-dependent) is used,
513 @@ -14,16 +13,24 @@
514 # TAF=~fastopt/bin/taf
515 # STAF=staf
516
517 -TAF=taf
518 +TAF=staf
519 TAMC=tamc
520 LIBS="${LIBS} -larpack"
521
522 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
523 -AD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log'
524 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
525 -FTL_TAF_FLAGS='-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
526 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
527 -SVD_TAF_FLAGS='-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log'
528 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
529 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
530 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
531 +
532 +AD_TAF_FLAGS="-reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
533 +FTL_TAF_FLAGS="-forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
534 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
535 +
536 +#- in case we need to show some MPI code to TAF:
537 +#if test "x$MPI" != x ; then
538 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
539 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
540 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
541 +#fi
542
543 DIFF_FLAGS="-toplevel 'the_main_loop' \
544 -input 'xx_theta_dummy \
545 @@ -52,9 +59,10 @@
546 xx_obcse_dummy \
547 xx_sst_dummy \
548 xx_sss_dummy \
549 + xx_depth_dummy \
550 xx_diffkr_dummy \
551 xx_kapgm_dummy \
552 - xx_kapredi_dummy \
553 + xx_kapredi_dummy \
554 xx_bottomdrag_dummy \
555 xx_efluxy_dummy \
556 xx_efluxp_dummy \
557 @@ -63,10 +71,15 @@
558 xx_uvel_dummy \
559 xx_vvel_dummy \
560 xx_etan_dummy \
561 - xx_gen2d_dummy \
562 - xx_gen3d_dummy \
563 + xx_gen2d_dummy \
564 + xx_gen3d_dummy \
565 xx_genarr2d_dummy \
566 xx_genarr3d_dummy \
567 + xx_gentim2d_dummy \
568 + xx_siarea_dummy \
569 + xx_siheff_dummy \
570 + xx_sihsnow_dummy \
571 + xx_shifwflx_dummy \
572 xx_relaxsst_dummy \
573 xx_relaxsss_dummy \
574 xx_atemp_mean_dummy \
575 @@ -74,7 +87,7 @@
576 xx_precip_mean_dummy \
577 xx_swdown_mean_dummy \
578 xx_uwind_mean_dummy \
579 - xx_vwind_mean_dummy' \
580 + xx_vwind_mean_dummy' \
581 -output 'objf_state_final'"
582
583 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
584 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/adjoint_options/adjoint_tamc_compatibility MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_tamc_compatibility
585 --- MITgcm-c64l/tools/adjoint_options/adjoint_tamc_compatibility 2012-07-27 20:25:39.000000000 +0200
586 +++ MITgcm-c64l-v2-patch-final/tools/adjoint_options/adjoint_tamc_compatibility 2013-08-16 01:02:41.000000000 +0200
587 @@ -1,11 +1,10 @@
588 #!/bin/bash
589 #
590 -# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_tamc_compatibility,v 1.6 2012/07/27 18:25:39 heimbach Exp $
591 -# $Name: checkpoint64l $
592 -#
593 +# $Header: /u/gcmpack/MITgcm/tools/adjoint_options/adjoint_tamc_compatibility,v 1.8 2013/08/09 18:28:36 jmc Exp $
594 +# $Name: $
595
596 -# This file contains the default settings for the adjoint and
597 -# tangent-linear compilers. If you need to change these settings,
598 +# This file contains the TAMC-like settings for the adjoint
599 +# and tangent-linear compilers. If you need to change these settings,
600 # please make a separate (local) copy of this file.
601
602 # TAMC=/data43/ralf/tamc/tamc
603 @@ -15,13 +14,20 @@
604 TAF=staf
605 TAMC=tamc
606
607 -AD_TAMC_FLAGS='-reverse -admark ad -i4 -r4 -l tamc_ad.log'
608 -#AD_TAF_FLAGS=' -reverse -admark ad -i4 -r4 -l taf_ad.log'
609 -AD_TAF_FLAGS="-v1 -nonew_arg -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
610 -FTL_TAMC_FLAGS='-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log'
611 -FTL_TAF_FLAGS='-v1 -nonew_arg -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log'
612 -SVD_TAMC_FLAGS='-reverse -forward -pure -i4 -r4 -l tamc_svd.log'
613 -SVD_TAF_FLAGS='-v1 -nonew_arg -reverse -forward -pure -i4 -r4 -l taf_svd.log'
614 +AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
615 +FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
616 +SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
617 +
618 +AD_TAF_FLAGS="-v1 -nonew_arg -reverse -i4 -r4 -intrinsic system,flush -l taf_ad.log $AD_TAF_FLAGS"
619 +FTL_TAF_FLAGS="-v1 -nonew_arg -forward -i4 -r4 -intrinsic system,flush -l taf_ftl.log $FTL_TAF_FLAGS"
620 +SVD_TAF_FLAGS="-v1 -nonew_arg -reverse -forward -pure -i4 -r4 -intrinsic system,flush -l taf_svd.log $SVD_TAF_FLAGS"
621 +
622 +#- in case we need to show some MPI code to TAF:
623 +#if test "x$MPI" != x ; then
624 +# AD_TAF_FLAGS="$AD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
625 +# FLT_TAF_FLAGS="$FLT_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
626 +# SVD_TAF_FLAGS="$SVD_TAF_FLAGS"' -mpi -include $(LOCAL_MPI_HEADERS) -I./mpi_headers/'
627 +#fi
628
629 DIFF_FLAGS="-toplevel 'the_main_loop' \
630 -input 'xx_theta_dummy \
631 @@ -53,7 +59,7 @@
632 xx_depth_dummy \
633 xx_diffkr_dummy \
634 xx_kapgm_dummy \
635 - xx_kapredi_dummy \
636 + xx_kapredi_dummy \
637 xx_bottomdrag_dummy \
638 xx_efluxy_dummy \
639 xx_efluxp_dummy \
640 @@ -62,11 +68,15 @@
641 xx_uvel_dummy \
642 xx_vvel_dummy \
643 xx_etan_dummy \
644 + xx_gen2d_dummy \
645 + xx_gen3d_dummy \
646 xx_genarr2d_dummy \
647 xx_genarr3d_dummy \
648 - xx_siarea_dummy \
649 - xx_siheff_dummy \
650 - xx_sihsnow_dummy \
651 + xx_gentim2d_dummy \
652 + xx_siarea_dummy \
653 + xx_siheff_dummy \
654 + xx_sihsnow_dummy \
655 + xx_shifwflx_dummy \
656 xx_relaxsst_dummy \
657 xx_relaxsss_dummy \
658 xx_atemp_mean_dummy \
659 @@ -74,7 +84,7 @@
660 xx_precip_mean_dummy \
661 xx_swdown_mean_dummy \
662 xx_uwind_mean_dummy \
663 - xx_vwind_mean_dummy' \
664 + xx_vwind_mean_dummy' \
665 -output 'fc'"
666
667 AD_TAMC_FLAGS="$AD_TAMC_FLAGS $DIFF_FLAGS"
668 diff -Naur -x Entries -IHeader MITgcm-c64l/tools/genmake2 MITgcm-c64l-v2-patch-final/tools/genmake2
669 --- MITgcm-c64l/tools/genmake2 2013-07-24 02:33:53.000000000 +0200
670 +++ MITgcm-c64l-v2-patch-final/tools/genmake2 2013-08-16 01:02:09.000000000 +0200
671 @@ -1,7 +1,7 @@
672 #! /usr/bin/env bash
673 #
674 -# $Header: /u/gcmpack/MITgcm/tools/genmake2,v 1.253 2013/07/24 00:33:53 jmc Exp $
675 -# $Name: checkpoint64l $
676 +# $Header: /u/gcmpack/MITgcm/tools/genmake2,v 1.257 2013/08/11 05:01:47 jmc Exp $
677 +# $Name: $
678 #
679 # Makefile generator for MITgcm UV codes
680 # created by cnh 03/98
681 @@ -2703,7 +2703,14 @@
682 F)
683 echo " \\" >> F77srclist.tmp
684 printf " $sf" >> F77srclist.tmp
685 - if test "x$OPENAD" != x ; then
686 + if test "x$OPENAD" = x ; then
687 + basename=${sf%%.F}
688 + isAD=`egrep ^$basename.f'[ ]*' adSrcFiles.tmp`
689 + if test -z "$isAD" ; then
690 + echo " \\" >> nonADF77srclist.tmp
691 + printf " $sf" >> nonADF77srclist.tmp
692 + fi
693 + else #- OpenAD case:
694 basename=${sf%%.F}
695 isAD=`egrep ^$basename.f'[ ]*' adSrcFiles.tmp`
696 if test -z "$isAD" ; then
697 @@ -3136,8 +3143,8 @@
698 ls -l ad_input_code_ad.$FS
699 cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
700
701 -\$(EXE_AD): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ad_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
702 - \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_taf_output.o \$(LIBS)
703 +\$(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)
704 + \$(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)
705
706 ad_tamc_output.$FS: ad_input_code.$FS
707 \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
708 @@ -3176,16 +3183,16 @@
709
710 ftl_taf_output.$FS: ftl_input_code.$FS
711 \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
712 - ls -l ftl_input_code_ftl.$FS
713 - cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
714 + ls -l ftl_input_code_tl.$FS
715 + cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
716
717 ftltafonly:
718 \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
719 - ls -l ftl_input_code_ftl.$FS
720 - cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
721 + ls -l ftl_input_code_tl.$FS
722 + cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
723
724 -\$(EXE_FTL): \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) ftl_taf_output.o \$(OBJFILES) \$(EMBEDDED_FILES)
725 - \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
726 +\$(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)
727 + \$(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)
728
729 ftl_tamc_output.$FS: ftl_input_code.$FS
730 \$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
731 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
732 --- MITgcm-c64l/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
733 +++ MITgcm-c64l-v2-patch-final/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local 2013-08-16 01:02:56.000000000 +0200
734 @@ -1,7 +1,7 @@
735 #!/bin/bash
736 #
737 -# $Header: /u/gcmpack/MITgcm/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local,v 1.2 2013/04/04 12:29:28 heimbach Exp $
738 -# $Name: checkpoint64l $
739 +# $Header: /u/gcmpack/MITgcm/verification/bottom_ctrl_5x5/code_ad/ad_optfile.local,v 1.3 2013/08/07 16:23:32 heimbach Exp $
740 +# $Name: $
741
742 # This AD option-file contains the settings for the adjoint and
743 # tangent-linear compilers to use for this particular setup.
744 @@ -16,12 +16,12 @@
745 TAF=staf
746 TAMC=tamc
747
748 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
749 -AD_TAF_FLAGS="-version 2.3.8 -v1 -e -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
750 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
751 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -e -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
752 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
753 +AD_TAF_FLAGS="-e -reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
754 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
755 +FTL_TAF_FLAGS="-e -forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
756 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
757 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
758 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
759
760 DIFF_FLAGS="-toplevel 'the_main_loop' \
761 -input 'xx_theta_dummy \
762 diff -Naur -x Entries -IHeader MITgcm-c64l/verification/lab_sea/build/genmake_local MITgcm-c64l-v2-patch-final/verification/lab_sea/build/genmake_local
763 --- MITgcm-c64l/verification/lab_sea/build/genmake_local 2013-07-19 22:44:58.000000000 +0200
764 +++ MITgcm-c64l-v2-patch-final/verification/lab_sea/build/genmake_local 2013-08-16 01:03:06.000000000 +0200
765 @@ -4,8 +4,4 @@
766
767 #-- This is the local options file for the "new" version of genmake
768
769 -if test "x$MPI" = x ; then
770 - AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva'
771 -else
772 - AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva_mpi'
773 -fi
774 +AD_OPTFILE='../../../tools/adjoint_options/adjoint_diva'
775 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
776 --- MITgcm-c64l/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
777 +++ MITgcm-c64l-v2-patch-final/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local 2013-08-16 01:03:16.000000000 +0200
778 @@ -1,7 +1,7 @@
779 #!/bin/bash
780 #
781 -# $Header: /u/gcmpack/MITgcm/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local,v 1.2 2013/04/04 12:29:28 heimbach Exp $
782 -# $Name: checkpoint64l $
783 +# $Header: /u/gcmpack/MITgcm/verification/tutorial_dic_adjoffline/code_ad/ad_optfile.local,v 1.3 2013/08/07 16:23:32 heimbach Exp $
784 +# $Name: $
785
786 # This AD option-file contains the settings for the adjoint and
787 # tangent-linear compilers to use for this particular setup.
788 @@ -15,12 +15,12 @@
789 TAF=staf
790 TAMC=tamc
791
792 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
793 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
794 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
795 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
796 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
797 +AD_TAF_FLAGS="-reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
798 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
799 +FTL_TAF_FLAGS="-forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
800 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
801 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
802 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
803
804 DIFF_FLAGS="-toplevel 'the_main_loop' \
805 -input 'xx_dic \
806 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
807 --- MITgcm-c64l/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local 2013-04-04 14:29:28.000000000 +0200
808 +++ MITgcm-c64l-v2-patch-final/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local 2013-08-16 01:03:34.000000000 +0200
809 @@ -1,7 +1,7 @@
810 #!/bin/bash
811 #
812 -# $Header: /u/gcmpack/MITgcm/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local,v 1.2 2013/04/04 12:29:28 heimbach Exp $
813 -# $Name: checkpoint64l $
814 +# $Header: /u/gcmpack/MITgcm/verification/tutorial_global_oce_optim/code_ad/ad_optfile.local,v 1.3 2013/08/07 16:23:32 heimbach Exp $
815 +# $Name: $
816
817 # This AD option-file contains the settings for the adjoint and
818 # tangent-linear compilers to use for this particular setup.
819 @@ -15,12 +15,12 @@
820 TAF=staf
821 TAMC=tamc
822
823 -AD_TAMC_FLAGS="-reverse -admark ad -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
824 -AD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -admark ad -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
825 -FTL_TAMC_FLAGS="-forward -ftlmark g_ -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
826 -FTL_TAF_FLAGS="-version 2.3.8 -v1 -forward -ftlmark g_ -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
827 +AD_TAMC_FLAGS="-reverse -i4 -r4 -l tamc_ad.log $AD_TAMC_FLAGS"
828 +AD_TAF_FLAGS="-reverse -i4 -r4 -l taf_ad.log $AD_TAF_FLAGS"
829 +FTL_TAMC_FLAGS="-forward -i4 -r4 -l tamc_ftl.log $FTL_TAMC_FLAGS"
830 +FTL_TAF_FLAGS="-forward -i4 -r4 -l taf_ftl.log $FTL_TAF_FLAGS"
831 SVD_TAMC_FLAGS="-reverse -forward -pure -i4 -r4 -l tamc_svd.log $SVD_TAMC_FLAGS"
832 -SVD_TAF_FLAGS="-version 2.3.8 -v1 -reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
833 +SVD_TAF_FLAGS="-reverse -forward -pure -i4 -r4 -l taf_svd.log $SVD_TAF_FLAGS"
834
835 DIFF_FLAGS="-toplevel 'the_main_loop' \
836 -input 'xx_theta_dummy \
  ViewVC Help
Powered by ViewVC 1.1.22