/[MITgcm]/MITgcm/doc/tag-index
ViewVC logotype

Contents of /MITgcm/doc/tag-index

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


Revision 1.1657 - (show annotations) (download)
Fri Apr 27 16:33:12 2012 UTC (12 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63m
Changes since 1.1656: +2 -1 lines
tag checkpoint63m

1 $Header: /u/gcmpack/MITgcm/doc/tag-index,v 1.1656 2012/04/26 13:49:29 jmc Exp $
2 $Name: $
3
4 Notes on tags used in MITgcmUV
5 ==============================
6
7 checkpoint63m (2012/04/27)
8 o pkg/shelfice:
9 - account for partical cells in surface level below ice-shelf for hydrostatic
10 pressure calculion (set uniformFreeSurfLev to F); update isomip experiments.
11 o ad test experiments:
12 - update and rename to "ad_optfile.local" local AD-optfile specific to a
13 particular adjoint verification experiment (in verification/*/code_ad/)
14 o pkg/seaice & pkg/exf:
15 - Part two of ECCO-CLIVAR code merges.
16 Completes merge of seaice area relax. code.
17 Requires unified CPP option EXF_ALLOW_SEAICE_RELAX
18 to be set in EXF_OPTIONS.h since this pkg controls its I/O
19 (and avoids second CPP option in SEAICE_OPTIONS.h)
20 - change default value of costIceStart & costIceEnd to a valid date.
21 - add snowPrecip to HSNOW in seaice_growth
22 o pkg/ptracers:
23 - move ptracers summary and setup check into separated S/R ; add a check for
24 valid PTRACERS_Iter0 value (error+stop or just warning).
25 o pkg/cal (+ pkg/ecco):
26 - avoid calling a S/R with 2 times the same arg (FWD: unless both are only used
27 as input; and for AD, unless both are not differentiable (e.g., k index)).
28 o model/src:
29 - define internal flag "uniformFreeSurfLev" (=T when free-surface level-index
30 is everywhere k=1) to speed-up some calculations (by pass kSurf reference);
31 temporary set to usingZCoords value (to be changed to F when using shelfice).
32 - hydrostatic pressure: implement partial cell near the surface also for
33 Z-coordinates (for the case where uniformFreeSurfLev=F); replace test on
34 usingZCoords with test on uniformFreeSurfLev where needed (in NonHyd code).
35 o pkg/ctrl/ctrl_init.F:
36 - add a formal parameter to s/r ctrl_init_rec to print
37 xx_$(ctrl_valiable)_file for easier debugging
38 - move call of cal_* routines into the if-block where they are really
39 needed so that xx_$(ctrl_variable)_period can be 0 or -12 without having
40 to specify a startdate
41 o pkg/seaice:
42 - update comments in SEAICE_OPTIONS.h (+ similar update of lab_sea/code and
43 global_ocean.cs32x15/code versions).
44 - turn on seaice Multi-category (in data.seaice, SEAICE_multDim=7) for
45 verification experiment global_ocean.cs32x15.seaice and update results.
46 o pkg/exf:
47 - new S/R EXF_GETFIELD_START to return starting-time of a forcing field
48 (according to useExfYearlyFields).
49 o pkg/cal:
50 - move calendar setting & summary (previously in cal_readparams.F) into new
51 S/R CAL_INIT_FIXED to be called later in the initialisation process, once
52 length of the simulation is set (after SET_PARMS call); This is an attempt
53 to fix Pb when, e.g.: pkg/longstep, modifies the length of the run.
54 - For safety: keep a record of pkg/cal parameter settings status
55 to allow to STOP if one pkg/cal S/R is called too early.
56 - add a stop in all basic pkg/cal subroutines if called before setting is done.
57 - modify cal_getdate.F: stop when nothing was returned;
58 if called with myIter=-1, simply retrun modelBaseDate (1,2 = startDate_1,_2);
59 this allows to remove "cal.h" from seaice_read_parms.F & init_mnc_vars.F.
60
61 checkpoint63l (2012/04/04)
62 o pkg/bbl:
63 - fix call to FIND_RHO_2D in bbl_calc_rho.F (case multi-tiles per proc);
64 update global_with_exf output.yearly.txt file.
65 o pkg/cal:
66 - start to clean-up cal_set.F ; fix for the case where baseTime is non-zero.
67 - remove 2 unsused and very short (1 line only) functions ;
68 - remove unsused subroutines from AD-Diff list.
69 o model/src:
70 - start to implement clean wait to stop in initialization S/R (config_check.F,
71 packages_check.F, ini_parms.F and pkg/obcs/obcs_check.F + pkg/mypackage)
72 o folowing PRINT_MESSAGE changes:
73 - remove reminder multiple print to the same file (STDOUT) when multi-threads.
74 o pkg/bbl:
75 - modification so it can work with z*
76 - replace deltaT with dTtracerLev(k) for asynchronous time stepping
77 - global_with_exf/input.yearly verification; changes output.yearly.txt
78 o eesupp/src:
79 - PRINT_MESSAGE: use OpenMP critical instruction (similar to PRINT_ERROR);
80 writing to unit 0 (if unit=errorMessageUnit) extended to the case myThid=1
81 - CHECK_THREADS: specific code if using OpenMP threading: improve checking of
82 # of threads across processors (e.g., different env OMP_NUM_THREADS setting)
83 - improve special preliminary call to EESET_PARMS (if eedata is read 2 times).
84 - when using MPI, always set usingMPI=T ; set default accordingly and stop
85 if not consistent.
86 - ALL_PROC_DIE: add a BARRIER after MPI_FINALIZE call ; skip this when thread
87 argument is zero (in case called within single-thread section).
88 o pkg/fizhi:
89 clean-up turbulence cold-start switch: decided in fizhi_init_vars.F, stored
90 in common bloc (fizhi_coms.h) and then passed as argument up to S/R TURBIO.
91 o pkg/exch2:
92 - add argument "updateCorners" to S/R exch2_get_uv_bounds (enable to
93 activate EXCH_IGNORE_CORNERS in vector EXCH S/R).
94 - switch 1rst EXCH call to IGNORE_CORNERS (instead of UPDATE_CORNERS)
95 but keep the 2nd with UPDATE_CORNERS: this prevents overwriting good data
96 with bad ones coming from a not-yet-updated halo.
97 This should fix the problem when sNx <> sNy and GCD(sNx,sNy) < 2*Olx.
98 o pkg/frazil:
99 move FrzForcT diag from frazil_diagnostics_state.F to frazil_calc_rhs.F
100 http://mitgcm.org/pipermail/mitgcm-devel/2012-March/005384.html
101 o model/src/config_check.F: add a check for OLx>sNx/OLy>sNy
102 o verification/lab_sea
103 * #undef SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING
104 * #define ALLOW_SST_CONTROL & ALLOW_SST_CONTROL
105 * nTimeSteps 3 -> 4
106 * changed reference output accordingly
107 o pkg/ctrl:
108 * fix ctrl_get_gen for xx_sst, xx_sss
109 o pkg/fizhi:
110 - fix 2 calls to S/R GRD2MSC (argument igrd) in update_earth_exports.F
111 update results of exp. fizhi-cs-32x32x40 (fail with only 6 digits for cg2d)
112 - by default, use new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE);
113 fix few out-of-bounds indices in referencing vars (initialise igrd to 1);
114 clean-up fizhi_turb.F (remove unused & uninitialised qdiaglsm array).
115 o pkg/gmredi:
116 - add diagnostic of Redi (main diagnonal) vertical diffusive flux of Temp
117 o pkg/fizhi:
118 - fix few initialisation and multi-tile Pb: aqualev & gridalt now pass the
119 (old)aces open64 tuv test.
120 o pkg/icefront: fix bug and reorder loop in icefront_init_varia.F
121 o pkg/mom_vecinv:
122 - fix 1 loop range in mom_vecinv.F to be like all the other loops which
123 set/update gu,gv/Diss (fix Pb of uninitialised fVerUkp in admom_vecinv
124 with non-lin free-surf).
125 o model/src: move k-loop outside of i/j-loops when (re-)computing R_low
126 in ini/update_masks_etc.F in order to avoid -O3 optimization problems with
127 some compilers (gfortran 4.6.0 on MacOS)
128 o momentum:
129 - separate fVer?(:,:,kUp) & fVer?(:,:,kDown) in argument list of MOM_FLUXFORM
130 & MOM_VECINV subroutines (to help TAF). This fixes Pb of uninitialised
131 fVer?(kUp) in admom_fluxform with non-lin free-surf or bottom control.
132
133 checkpoint63k (2012/03/17)
134 o model/src:
135 - selectAddFluid (ALLOW_ADDFLUID): add missing term in horizontal momentum
136 flux-form (mom_fluxform.F) and vertical momentum (calc_gw.F) equations.
137 - SOLVE_DIAGONAL: switch default to use adjoinable & vectorized version
138 (#undef SOLVE_DIAGONAL_LOWMEMORY); update output of exp. front_relax.bvp.
139 o model/src: solve_*diagonal.F
140 - replace division with multiplication by inverse (similar to original version)
141 update output of AD exp. global_ocean.90x40x15.
142 - fix pkg/gmredi/gmredi_calc_psi_bvp.F & pkg/ggl90/ggl90_calc.F
143 to enable the use of the vectorized & differentiable solve_tridiagonal.F
144 - test exp. global_ocean.90x40x15/input_ad: switch to advection scheme 20 for
145 vertical advection (to get solve_tridiagonal tested in AD mode).
146 o pkg/seaice: ECCO-CLIVAR merge:
147 1. seaice AREA relaxation
148 * CPP option: SEAICE_ALLOW_AREA_RELAXATION
149 * runtime flag: SEAICE_tauAreaObsRelax
150 2. modified global mean cost imbalance code: CPP option
151 ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION
152 o another iteration on solve_*diagonal.F
153 Make choices independent of AUTODIFF
154 Default will be the adjoinable vectorized version.
155 Alternative choices are:
156 * non-adjoinable original version with low memory footprint:
157 #define SOLVE_DIAGONAL_LOWMEMORY
158 * still adjoinable but does not vectorize (k as inner-most loop):
159 #define SOLVE_DIAGONAL_KINNER (keeping SOLVE_DIAGONAL_LOWMEMORY undef)
160 o testreport
161 - add option to use a home made wrapper around "make"
162 - remove MITGCM_IEEE env. variable (no longer active)
163 o pkg/shelfice
164 - improve computation of friction velocity for velocity dependent
165 exchange coefficients: include velocities into SHELFICEBoundaryLayer
166 block to average velocities vertically
167 - add TAF store directives for SHI_ALLOW_GAMMAFRICT
168 o Modify diagonal solvers, now three versions (upon request):
169 #ifndef SOLVE_DIAGONAL_AUTODIFF
170 1. default version (dating back a while ago)
171 #else /* def SOLVE_DIAGONAL_AUTODIFF */
172 # ifdef SOLVE_DIAGONAL_KINNER
173 2. adjoinable version with k-innermost loop (G. Forget)
174 # else
175 3. adjoinable vectorized version of 2.
176 # endif
177 #endif /* SOLVE_DIAGONAL_AUTODIFF */
178 All flags are currently set within routines, but could/should be moved to CPP-options.
179 Array bounds for 1. are as before, for 2.,3. cover the entire domain
180 (could be changed for 1. too).
181 o verification/lab_sea (fwd):
182 - update the 4 fwd lab_sea test experiment: no longer SEAICE_GROWTH_LEGACY,
183 use 7 categories (except hb87), new solve4temp params (except salt_plume),
184 constant salinity (=4) or variable salinity (salt_plume) done through
185 SItracer.
186 o pkg/seaice:
187 - rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0;
188 - remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t,
189 SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz)
190 from SEAICE_PARMS.h ; still need to fix seaice_cost_sst.F (broken when
191 SEAICE_freeze got retired) but already better than previously with
192 SEAICE_freeze=123456.7 deg.C;
193 - move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS
194 (safer multi-threaded setting); always set SEAICEuseEVP;
195 - setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to
196 SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report);
197 stop if multiple specifications for the same coeff; make sure default
198 SEAICE_mcPheePiston is compatible with drF(1) & deltaT.
199 o pkg/obcs:
200 - allow to switch to upwind 1rst order advection scheme for the advective
201 flux computation at the open-boundary; disabled for adjoint built.
202 o pkg/ptracers:
203 - rename PTRACERS_RESTART.h -> PTRACERS_START.h
204 - rename ptracers_fields_blocking_exchanges.F -> ptracers_fields_blocking_exch.F
205 - add parameter to decide when to start a tracer; use internal flag to
206 know which tracer to step-forward; switch this internal flag at the top
207 of forward_step.F (new S/R PTRACERS_SWITCH_ONOFF); for now, not enabled
208 for adjoint built.
209 o pkg/seaice:
210 - add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ;
211 - move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ;
212 - keep experiment offline_exf_seaice truly single category (set MULTDIM=1).
213 o pkg/ecco:
214 - fix writing of output file DiagnosCost_ClimSalt/Theta
215 and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc).
216 o pkg/seaice:
217 - add missing initialisation of COR_ICE array in dynsolver.F
218 - merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is
219 compiled either way, and is tested in all exps (multidim was only tested
220 in lab_sea ad before).
221 - cosmetic change to prepare for future addition of ITD. no change to results.
222 no defaults change.
223 - added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise).
224 - by lack of adequate verification experiments, I further used custom versions
225 of global_ocean.cs32x15 to test multicat or not, with pickup or not. All
226 should be correct.
227 - avoid recomputations in ad.
228 o array initialisation in adjoint mode:
229 1) pkg/mom_common/mom_calc_ke.F:
230 add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC):
231 The S/R which calls MOM_CALC_KE initialises KE but in some recomputation
232 part this initialisation is gone, resulting in Floating Point Exception
233 (caught by open64 compiler with debug option).
234 2) model/src/convective_weights.F
235 set output convectCount over the full array range (instead of doing
236 an update): this fix a similar issue when called within recomputation (adjoint)
237 which could by-pass the initialisation (normally done in the caller S/R).
238 o pkg/seaice:
239 - final version of turbulent flux params, as agreed at MIT ice meet:
240 SEAICE_mcPheePiston (default is ~ 0.000875)
241 SEAICE_mcPheeTaper (default is 0.)
242 SEAICE_frazilFrac (defualt is 1.)
243 SEAICE_mcPheeStepFunc (default is false)
244 - changes results at trunction error level
245 - ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo
246 o added pkg/frazil:
247 - see frazil_description.tex for details
248 - verification experiment is global_with_exf/input.yearly; changes output.yearly.txt
249 o pkg/shelfice/shelfice_thermodynamics.F
250 - fix exponents for velocity dependent exchange coefficients: change
251 from 2/3(=0) to 0.66666666666666667
252 - move computation of velocity dependent exchange coefficients into
253 separate loop, so that it applies to both thermodynamics
254 - move some divisions by constants out of loops
255
256 checkpoint63j (2012/02/16)
257 o pkg/seaice:
258 - overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc.
259 - SItracer: added run time params, and allow coupling to ocn salinity.
260 o pkg/seaice: remove (almost) all divisions by constants within loops
261 in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d
262 results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only
263 those, caused by 1/QI -> recip_QI) -> update output.seaice.txt,
264 output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt
265 o pkg/seaice :
266 - simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula
267 = 1 or 2, using newly added run time parameter SEAICE_availHeatTaper.
268 - fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148.
269 - add permanent SItflux diag that corresponds to TFLUX but includes
270 ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget.
271 - allow activation/testing of a fix for suspected missing term in
272 ocn-ice heat budget (to be confirmed). To test this, you want to
273 undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param
274 SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic.
275 - no change in results, fwd or ad.
276 o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below:
277 - switch to variable freezing point.
278 Results change : cg2d -> 1 digits; ad -> 3-6-6 digits.
279 - bug fix : the sublimation term that was missing is now activated.
280 Results change : cg2d -> 2 digits; ad -> 8-6-6 digits.
281 - bug fix : flooding sign term for SIsal0.NE.0.
282 Result change : cg2d -> 8 digits; ad -> 11-12-9 digits.
283 o pkg/seaice:
284 - unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT
285 is now the default, and the old default constant freezing point is recovered
286 with SEAICE_tempFrz0 = -1.96,
287 SEAICE_dTempFrz_dS = 0.,
288 - retire SEAICE_freeze (= the old way of specifycing the constant freezing point)
289 - remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there.
290 - bug fix (thanks to M. Losch) : the sublimation term that was missing is now
291 activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM.
292 - bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211)
293 was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail).
294 - bug fix (thanks to O. Jahn) : area loss for melting got messed up in
295 seaice_growth r149 for legacy branch (no results change).
296 - introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code
297 from I. Fenty).
298 - results did not change except for global_ocean.cs32x15, mostly due to the
299 switch to variable freezing point (see above item for detail).
300 o pkg/thsice:
301 - fix and simplify interface to salt_plume pkg ; diagnose directly amount of
302 seawater freezing in thsice_calc_thickn (not used).
303 o pkg/seaice: turbulent flux term specification via run time params.
304 - replace CPP switches with run time switches to facilitate testing
305 - retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX,
306 GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
307 - added runtime parameter : SEAICEturbFluxFormula
308 - move Mcphee constants to SEAICE_PARAMS.h
309 - seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula;
310 SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply);
311 remove seaice_summary call (moved to seaice_init_fixed)
312 - seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on
313 SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms)
314 - seaice_summary.F : add missing report of read turbulent flux term set up
315 and SITRACER.
316 - seaice_check.F : check range; inform and stop if retired CPPs are used
317 (incl. SEAICE_AGE).
318 - seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without
319 CPP switch, same computation as before for the different options.
320 - change results at the truncation level.
321 o pkg/seaice:
322 - remove un-used parameters LAD & MAX_TICE ; add new run-time parameters:
323 useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and
324 SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY.
325 - update verification/*/input*/data.seaice:
326 to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY
327 code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ;
328 and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code,
329 set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0.
330 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY):
331 - remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same
332 algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0);
333 difference in results only due to machine truncation.
334 - remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using
335 MaykutPolySatVap; keep MIN_LWDOWN.
336 - adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation.
337 - update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87,
338 + 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits).
339 o pkg/salt_plume:
340 - isolate saltPlumeFlux array exch into a specific S/R called from
341 do_oceanic_phys.F
342 - add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice.
343 o verification:
344 - move untested set-up to MITgcm_contrib/verification_other.
345 o pkg/seaice:
346 - retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER.
347 o pkg/seaice:
348 - seaice_solve4temp.F (keeping results unchanged):
349 * add 2 future run-time params to select which saturation vapor pressure
350 formula is used and how post-iteration fluxes are set.
351 Temporary set these 2 params according to option SOLVE4TEMP_LEGACY;
352 * New piece of code (not used) to update surf. atmos. heat flux F_ia using
353 the linearized expression to stay consistent with tsurf finding.
354 - seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x
355 can be < 0.
356 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef):
357 - remove from F_ia (and from it's derivative dFiDTs1) the contribution of
358 conductive heat flux F_c , and add it explicitly when updating tsurf as
359 solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf
360 so that now F_ia has a consistent meaning through the entire routine.
361 This causes differences at truncation level: update output of fwd exp.
362 global_ocean.cs32x15.seaice.
363 o pkg/seaice:
364 - lots of editing/cleaning in seaice_solve4temp.F + better documentation
365 of arrays, sign/direction of fluxes; no effect on results.
366 - replace hard coded 273.16 (=previous value of celsius2K) by celsius2K
367 in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part);
368 note: this should have been done before changing celsius2K default.
369 - to keep results unchanged, add back old value of celsius2K in verification
370 exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs
371 - replace hard coded seawater freezing temp in seaice_solve4temp.F (part
372 SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default
373 value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater
374 freezing temp is consistent with value in seaice_growth.F ; this causes
375 differences at machine truncation level: update lab_sea AD output (3/4).
376 o pkg/seaice:
377 - mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask
378 and climsst/sss even when using seaice (to prevent calculation that might
379 use SST on land); does not affect any verification exp.
380 - apply mask to taux,tauy (in seaice_get_dynforcing.F); update output
381 of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix.
382 o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness
383 over land (non-legacy code)
384 o vectorize salt_plume package:
385 - add extra code to salt_plume_frac and salt_plume_tendency_apply_s
386 - this code computes plumebk everywhere (also over land), thus requires
387 code to avoid divisions by zero and catch the case of kLev=Nr.
388 - efficiency of salt_plume_frac is still sub-optimal
389 o tools (genmake2):
390 - fix makefile NAME specification (option: -makefile NAME) by adding
391 "-f $MAKEFILE" in few places where it was missing including makedepend
392 command (contribution from Paul).
393
394 checkpoint63i (2012/01/24)
395 o model/src:
396 - add factorized versions of some EOS code to find_rho.F,
397 define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX)
398 o model/src:
399 - add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h;
400 - change default celsius2K from 273.16 to 273.15
401 - to keep results unchanged, add back old value of celsius2K in verification
402 exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd),
403 global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm).
404 o model/src: add a little initialisation trick to find_rho.F and find_alpha.F
405 to make TAF generate vectorizable code
406 o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows.
407 Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers
408 have flags that do this more efficiently.
409 o pkg/diagnostics/diagstats_calc.F
410 - for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact
411 o pkg/obcs (with exch2):
412 - derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F)
413 and remove code (in obcs_readparms.F) which was based on EXCH of indices
414 (through buffer) and did not account for exch2 (e.g., CS-grid) topology.
415 o pkg/exf and seaice exp:
416 - change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0)
417 so that switching off area & heff advection flags does not affect results.
418 - change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h
419 - keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef
420 EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update
421 results of verification experiments: 1D_ocean_ice_column(fwd),
422 global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8)
423 and offline_exf_seaice (all 4).
424 o pkg/seaice:
425 - remove array YNEG, RIVER, TMIX (replaced by local var) from common block;
426 remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef.
427 - fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY)
428 but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and
429 not multi-dim advection;
430 - fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and
431 SHORTWAVE_HEATING #undef.
432 o optim: make Makefile more robust (?)
433 o pkg/obcs:
434 * fix treatment of obcs_read_pickup for TAF
435 o pkg/shelfice:
436 * add missing initialisation of num_shifwflx
437 * new adjoint verification exp. for isomip
438 * change Prandtl and Schmidt numbers from generic formulations
439 (in terms of model diffus. and visc.) to separate runtime
440 parameters, with Holland and Jenkins (1999) default values.
441 o pkg/exf (interpolation):
442 - extended input field (2 rows) near the N & S poles:
443 * fill in with the symetric value (when even Nb of data in longitude)
444 * add average value at the poles only for scalar quantities ; for vector
445 component interpolation, skip the averaging and keep duplicated values,
446 unless the 2 components have same location (uvInterp=T) in which case
447 interpolate the 2 components together using S/R EXF_INTERP_UV.
448 - new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field
449 together: this allows to account properly for local orientation when
450 averaging at N & S pole.
451 - add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding
452 exf-interpolation near N & S poles. Undef by default.
453 - add debug check/print on 1rst iter if debugLevel >=2.
454 o pkg/exf:
455 - change masking flags definition (no longer "parameter"), put them in
456 common block and set them in S/R EXF_INIT_FIXED.
457 - change recognized masking flag from s,u,v to c,w,s since the mask
458 to use (maskC,W,S) depends on position on model grid and has little to
459 do with scalar/vector difference; fix masking if using P-coordinates.
460 - fix masking of wind-stress (was wrong if interpolated or read on A-grid)
461 and update results of exp. global_with_exf (x2).
462 - fix setting of zenith-angle table when SHORTWAVE_HEATING is undef.
463 o pkg/obcs
464 - S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate)
465 o pkg/exf (interpolation):
466 - assume periodicity in X only if input field cover full longitude range.
467 - improve search for lat. index (supposed to be faster, in ~log2(ny) steps,
468 and should vectorise).
469 - fix input lat of the 2 added row (in case we provide N.pole data).
470
471 checkpoint63h (2011/12/30)
472 o pkg/seaice:
473 - change declaration of UVM from _RL to _RS in order to get B-grid
474 uIce,vIce monitor when _RS = real*4
475 o pkg/offline:
476 - new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags);
477 - compute vertical velocity if not read from file (switch on exactConserv
478 & staggerTimeStep);
479 - fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq.
480 o verification:
481 - update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input)
482 with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m":
483 fix Pb in yG definition @ 2 missing corners (previously yG was averaged);
484 - update output of exp. global_ocean.cs32x15.viscA4 after changing
485 grid-file angles (used here for coriolis-3d);
486 - remove (or gzip) few files not needed to run fizhi-cs experiments.
487 o pkg/exf (vector interpolation):
488 - rotate vector component toward local grid-axis orientation using grid-angles
489 (stored in GRID.h) instead of locally computed rotation angle; keep old code
490 available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default).
491 o pkg/seaice:
492 - allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION
493 undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined.
494 o pkg/PKG_OPTIONS.h files:
495 - move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h",
496 outside of the #ifdef ALLOW_THISPKG / #endif block.
497 - update verification/*/code/PKG_OPTIONS.h files.
498 o add a verification experiment (offline_exf_seaice/input.seaice) that test
499 the B-grid LSOR solver
500 o pkg/seaice: sort out emissivity and long wave radiation step 2:
501 - add emissivity for snow and ice as new run-time parameters
502 (unfortunately) that default to the corresponding exf values; this
503 changes results in most verification experiments so that for backward
504 compatibility these parameter have to be set explicitly to inconsistent
505 values (ugly);
506 - the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired
507 emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp
508 until we agree how to handle this bug properly
509 o pkg/exf (interpolation):
510 - add a set of run-time param ({inputfield}_interpMethod), one for
511 each interpolated input field, to select the interpolation method
512 with a value of zero switching off the interpolation;
513 - print interpolation parameters to standard output;
514 - refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined
515 (to use instead runoff_interpMethod=0 in data.exf).
516 - simplify default setting of interpolation parameters (for all fields,
517 set position to match model grid cell-center position, leading to trivial
518 interpolation in case of regular Lat-Lon grid) and fix for the case of
519 non-uniform delY.
520 o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for
521 within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1.
522 this factor is absolutely required, because the lw exitance (= out-going
523 long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown,
524 where the reflectivity rho = 1-emissivity for conservation reasons. Once
525 this is established, we can remove the CPP-Flag (if we want to).
526 o pkg/seaice:
527 - qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and
528 ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined
529 - sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity
530 what the name implies (and not emissivity*BoltzmannConstant), this means
531 the old default value of 5.5e-8 now means
532 5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in
533 S/R exf_readparms
534 - FV-discretization of the B-grid LSOR solver, turn on with
535 SEAICE_LSRBNEW. This new solver also involves a slight re-organization
536 of the calling routine dynsolver, so that B and C-grid code look a
537 little more alike.
538 - fix index bugs in ostres.F (B-grid code)
539 o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better
540 o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the
541 default for SEAICE_emissivity, if useEXF; requires setting a wrong
542 parameter value in global_ocean.cs32x15/input.seaice/data.seaice for
543 backward compatiblity
544 o model/src: use sigmaR in calc_ivdc
545
546 checkpoint63g (2011/12/16)
547 o pkg/seaice/seaice_growth.F:
548 fix heat conservation of the coupled ocean-seaice system.
549 when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of
550 solid vs liquid water treatment is resolved via QNET.
551 o pkg/seaice/seaice_growth.F:
552 add missing term for sublimation in saltFlux, which was breaking conservation.
553 o pkg/seaice/seaice_model.F:
554 Remove this patholigical case treatment in evolution branch,
555 where it is un-necessary and breaks conservation.
556 Update global_ocean.cs32x15/results accordingly for
557 output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt
558 o model/src:
559 useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in
560 external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE.
561 o pkg/obcs:
562 modify Stevens boundary conditions so that S/R obcs_calc_stevens computes
563 tendency for temperature and salinity that is then applied to update
564 theta and salt in S/R obcs_apply_ts; this requires proper masking of all
565 horizontal advection and diffusion contributions on the boundary (in
566 S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and
567 removing the mask in S/R timestep_tracer. The advantage of this approach is
568 that the updated tracer values include contributions from the surface
569 forcing and vertical diffusion.
570 This modification changes exp4.stevens because of vertical diffusion.
571 o model/src:
572 change non-curvilinear grid setting to also work with exch2 + blank tiles:
573 - move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst
574 face dimensions.
575 - new S/R INI_LOCAL_GRID to define model tile-local grid (using same units
576 as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID
577 and INI_SPHERICAL_POLAR_GRID.
578 change test-experiment global_ocean.90x40x15:
579 - split the domain in many more tiles (9x4 tiles of 10x10 each);
580 - switch to exch2 and remove 1 blank-tile (but only for MPI test).
581 - update results of both test (std & dwnslp).
582 o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in
583 tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation
584 o model/src:
585 - take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS
586 and fix initialisation when using sigma-coords.
587 o model/src:
588 - improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc.
589 to their current value at the beginning of forward_step.F": add a new run-time
590 switch "doResetHFactors" (default=false) and use it to do (or not) the resetting.
591 - set doResetHFactors=T in the following test exp:
592 global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS),
593 global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS)
594 and tutorial_global_oce_in_p (nonLinFS in p)
595 o pkg/ecco
596 - added IES cost term
597 o verification/advect_xz
598 - scale down the depth by 1/100 (from 200 km to just 2.km)
599 - add secondary test using divergent flow, r-star and implicit vertical advection.
600 - add note (check_conserve_TS.txt) and matlab script to check global
601 conservation of T & S with NonLin-FreeSurf and Adams-Bashforth.
602 o pkg/rbcs:
603 - add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F).
604 o pkg/obcs (Stevens BCs):
605 - fix various problems in the phase speed computations of the Stevens
606 boundary conditions:
607 - sign error for western and southern boundaries,
608 - time tendencies were underestimated by factor of dTracerLev and some just
609 zero (for multidim advection schemes) -> now estimate time tendencies
610 from difference between previous (n) time level and the one before (n-1);
611 this requires storing a field per tracer per boundary, also in the pickup
612 files.
613 - replace deltaTmom in cflMer/Zon computation with dTracerLev
614 - set default phase velocity to cflMer/Zon
615 - update verification experiment exp4.stevens
616 o pkg/generic_advdiff (implicit_r):
617 - fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf
618 (remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F);
619 - fix implicit vertical diffusion or advection with NonLin FreeSurf
620 (was using current recip_hFacC instead of future recip_hFacC): set future
621 recip_hFac in thermodynamics.F and pass & use it in all vertical implicit
622 solver S/R ;
623 - fill diagnostics of vertical advective fluxes (computed from tendency)
624 when using implicit vert. advection;
625 - update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion:
626 global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD),
627 tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD)
628 and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5.
629 o pkg/diagnostics:
630 - add diags for T & S tendency which goes through Adams-Bashforth.
631
632 checkpoint63f (2011/11/30)
633 o pkg/obcs/obcs_calc_stevens.F:
634 - join some loops to reduce number of if-statements
635 - fix a bug in code for northern and southern boundaries.
636 o pkg/seaice/seaice_init_varia.F
637 - undo resetting UVM=0 that has slipped in unnoticed in r1.49 and
638 caused zero ice-velocities for the B-grid code
639 o pkg/seaice/seaice_init_fixed.F
640 - fix a bug in the initialisation of the second metric terms
641 k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0.
642 - this affects all seaice configurations with useCurviLinearGrid = .true.
643 and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms
644 = .true. (default)
645 - the only verification experiment affected is global_ocean.cs32x15:
646 icedyn, seaice, and seaice_dynmix (AD)
647 o pkg/thsice/thsice_diagnostics_state.F
648 - only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does
649 not contain garbage that can lead to surprises in diagstats_calc.F
650 o model/src:
651 - move bi,bj loops inside INTEGR_CONTINUITY ;
652 - call INTEGR_CONTINUITY directly from forward_step.F
653 (previously called from momentum_correction_step.F)
654 - call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F,
655 forward_step.F and pkg/ecco/the_main_loop.F
656 o model/src/do_oceanic_phys.F:
657 - reset addMass to zero only if useICEFRONT ;
658 - separated k-loop for rhoInSitu calculation ;
659 - add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P)
660 and at constant T,S (= WdRHOdP);
661 NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport
662 of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical
663 transport of locally-referenced potential density);
664 to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP)
665 o gluemnc:
666 - replace ncrcat with ncks when adding variables to *.glob.nc
667 - change the way variables without record dimensions are handled so that
668 files that have variables with and without record variables can be glued:
669 add a record dimension with a new unique name to be able to differentiate
670 between variable with and without a-prior record dimensions. Remove
671 this record dimension before adding the variable to the *.glob.nc file.
672 This procedure automatically works also for grid.*.nc files that do not
673 have any record dimension.
674 o verification/cpl_aim+ocn:
675 - generate new reference output on baudelaire (gfortran, mpich2) (previously
676 from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script.
677 o pkg/obcs/obcs_calc_stevens.F:
678 - add code for northern and southern boundaries.
679 - reorder some loops to save some operations and so that drFBar can be scalar
680 o model/src:
681 - re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine
682 truncation) and add diagnostics for Adams-Bashforth tendency increment.
683 - update test-exp. AD output:
684 1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl;
685 and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20,
686 front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5),
687 global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4),
688 matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre,
689 tutorial_global_oce_in_p, tutorial_global_oce_latlon and
690 tutorial_plume_on_slope.
691 o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX
692 that vectorises. This code uses 3 extra 2D fields, F90 array assignments
693 and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX
694 does not even come with an F77 compiler anymore, this should not be
695 a limitation
696
697 checkpoint63e (2011/11/06)
698 o pkg/seaice adjoint of LSR:
699 - substantially rework STORE dirs.
700 - add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED
701 this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields
702 and only perform SOLV_MAX_FIXED adjoint iters.
703 If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration
704 always goes to same record, meaning that the last forward field will be
705 the one used in the adjoint - an approximation.
706 - now produces non-zero LSR-related gradients, and acceptable gradients for
707 An's zonal (x-z) test case (to be checked in)
708 - lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR
709 (but these are screwed up by the thermodynamics in the first place);
710 reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution;
711 output_adm.txt also reflects changes to seaice_lsr
712 - global_ocean.cs32x15:
713 * the "default" input_ad.seaice has been re-defined to always exclude dynamics
714 (output_adm.seaice.txt was updated)
715 * new input_ad.seaice_dynmix tests a forward LSR / backward free-drift
716 (output_adm.seaice_dynmix.txt)
717 o test-exp. exp4+stevens:
718 - switch off pTracers and nonHydrostatic (restart problems with NH); update output
719 o pkg/seaice (lsr solver):
720 - put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only);
721 update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15
722 - fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD)
723 - new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution
724 into initial guess for linearised solver; use weight ~ (1/err)^2,4.
725 - compute (with new S/R) and print initial (+ free-driff sol. if available)
726 and final residual of linearised system.
727 o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity
728 (requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F)
729 o pkg/obcs: Stevens BCs (still only for east and west)
730 - fix Stevens BCs by using intermediate velocities of previous
731 time step as "baroclinic" contribution rather velocity of one grid cell
732 inside the boundaries; more consistent but makes the entire treatment
733 more complicated, requires new pickup files and two new S/Rs:
734 obcs_copy_uv_n and obcs_save_uv_n
735 keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY
736 (undefined by default)
737 - silently move computation of some grid factors into separate loops to
738 save some recomputations
739 - add a hack for non-linear free surface
740 - add a verification experiment to exp4 that tests this code
741 o make gluemnc/xplodemnc work with (moron) non-GNU shell tools
742
743 checkpoint63d (2011/10/25)
744 o pkg/obcs + seaice-dynamics:
745 - new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before
746 solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB
747 values (consistent with an implicit method).
748 - add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to
749 return to older implementation (same results as before); note that none of
750 the "experimental" OBCS_SEAICE options are implemented in the new version.
751 - switch test exp. seaice_obcs to use new version (update output).
752 o pkg/seaice:
753 - add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS)
754 - add parenthesis in Water-Ice drag calculations (evp & lsr);
755 - in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1;
756 and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice)
757 - update output of test exp lab_sea that uses evp or lsr (fwd+ad)
758 and global_ocean.cs32x15 (icedyn & seaice fwd+ad).
759 o pkg/layers:
760 - Include potential density as new coordinate (Thanks to David Munday)
761 o pkg/dic:
762 - Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add
763 carbonate computation/output to CALC_PCO2_APPROX
764 o pkg/generic_advdiff
765 - make TAF generate code that vectorizes:
766 gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F
767 o model/src:
768 - improve vectorization also for adjoint code of
769 solve_tridiagonal and solve_pentadiagonal. As this requires up to
770 5 new 3D-fields, this code is only turned on for the combination of
771 ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message
772 for singular matrix check (only for TARGET_NEC_SX).
773 - remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to
774 ALLOW_AUTODIFF. This flag now needs to be set outside of
775 solve_tri/pentadiagonal.F
776 o pkg/exf:
777 - fix previous modif in exf_readparms.F (revision 1.66: treatment of
778 optional namelist EXF_NML_OBCS).
779 - add many debug-print (to trace down where pkg/cal error msg comes from)
780 o pkg/mom_vecinv/mom_vi_hdissip.F
781 - rearrange loops so that vectorization is improved and in particular
782 the adjoint routine vectorizes. The code is a little longer now, but I
783 think easier to read.
784 Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested.
785 o pkg/seaice:
786 - allow to specify initial seaice velocity from files (uIceFile,vIceFile)
787 o pkg/exch2:
788 - alternative code (without tile x tile matrix) for cumulated (global) sum;
789 used as default; keep using matrix version in adjustment.cs-32x32x1.
790 o tools/build_options:
791 - after merging some MPI and/or multi-threads specific optfiles so that
792 the modified default optfile support both built (using genmake2 -mpi
793 for the MPI built, using genmake2 -omp for OpenMP built),
794 move now obsolete optfiles to tools/build_options/unsupported/
795 (add copy of email sent to support list in doc/optfiles_changes.txt)
796
797 checkpoint63c (2011/09/28)
798 o pkg/ebm:
799 - fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of
800 test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d)
801 o pkg/seaice (SItracer pickup)
802 * Simple code for pickup of SItracer fields (#define ALLOW_SITRACER)
803 To be done:
804 - thorough testing of missing fields in S/R seaice_read_pickup
805 - thorough matching between generic tracers and specific fields used
806 (e.g. volume-weighted age, area-weighted age, salinity, ...)
807 o pkg/grdchk:
808 - all procs calculate and print finite-difference gradient (for testreport)
809 - change description output used by testreport;
810 - AD testing: also compare and report Finite-difference gradient;
811 => update all output_adm*.txt
812 o test exp. global_ocean_ebm:
813 - switch back useRealFreshWaterFlux (no problem anymore with run-off);
814 and turn on exactConserve; update (fwd) output.
815 o pkg/seaice (LSR):
816 - print to STDOUT number of solver iterations at SEAICE_monFreq interval.
817 - modify solver to deal cleanly with u/v switch at face edges (CS-grid):
818 * identical results with non-CS topology (but save up to half of EXCH calls)
819 * no much changes in cs-32 verification tests since no ice at face edges
820 (differences due to convergence criteria, since nb of iterations changed)
821 * expect some differences on lat-lon-cap grid.
822 update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice)
823 o pkg/exch2:
824 - add new CPP option to disable Cumul-Sum matrix (to save storage when using
825 many tiles); until alternative coding is added, just add a stop.
826 o pkg/kpp:
827 - move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F
828 to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list).
829 o optfiles:
830 - merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles
831 into corresponding standard one, which now support different build:
832 (when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built)
833 - add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael)
834 o pkg/obcs (seaice):
835 - add missing EXCH for uIce,vIce after applying OBCS;
836 - remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding
837 argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R
838 EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F;
839 - fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared)
840 - verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi
841 and eedata.mth for MPI and mutlti-threaded testing.
842 o pkg/flt:
843 - make FLT EXCH working with multi-threads (and MPI + multi-threads);
844 - use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h;
845 - fix pickup and trajectories + profiles output with multi-threads;
846 - add parameter to select group of fields to write along trajectory and
847 profile (default unchanged);
848 - only call PORT_RAND* function when flt_noise <> 0;
849 - add multi-threaded test for verification exp. flt_example.
850 o eesupp/src:
851 - fix S/R ALL_PROC_DIE for MPI+multi-threads.
852 - USE_OMP_THREADING: check that number of threads (from eedata) matches
853 actual number (from env.var. setting).
854 o pkg/ebm:
855 - fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file.
856 - add multi-threaded test for verification exp. global_ocean_ebm
857
858 checkpoint63b (2011/08/29)
859 o pkg/ebm:
860 - fix sign of runoff;
861 - update directly forcing fields (Qnet,EmPmR) to use standard
862 external_forcing_surf.F (remove ebm_forcing_surf.F);
863 - avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F);
864 - set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm)
865 and apply relaxation towards corresponding SST field (2-D map or ZonAver).
866 - update global_ocean_ebm parameters file data and update output (fwd+ad).
867 o verification/matrix_example:
868 - split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for
869 MPI and mutlti-threaded testing.
870 o pkg/matrix:
871 - change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ;
872 - fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter);
873 - fix for multi-threaded (remove DATA statement);
874 - use standard DIFFERENT_MULTIPLE function;
875 - add MATRIX_OPTIONS.h
876 o verification/matrix_example:
877 To allow to split the domain in several tiles, change the domain size
878 from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on
879 Western side) of land points.
880 o (*_)write_pickup:
881 - fix few bugs in mypackage_read/write_pickup.F
882 - in MDS_WR_METAFILES calls, replace "myTime" by a local copy into
883 array of length 1 (was caught by compiler syntax-check).
884 o pkg/diagnostics (velocity potential solver):
885 - fix initialisation of main diagonal matrix (for overlap values)
886 o tools/build_options:
887 - towards single optfile for MPI and non-MPI built: merge few +mpi optfile
888 into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11)
889 - linux_amd64_gfortran: merge +mpi_generic version into standard optfile:
890 * move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ;
891 * FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list;
892 and use "-devel" testreport option for standard testing on baudelaire.
893 o pkg/grdchk:
894 - Assume that all gradient-check position are within the same tile
895 corresponding to global indices (iGloTile,jGloTile) and that
896 positions (i,j indices or nbeg) are local to this tile;
897 - set tile local-indices and proc. number according to tile global-indices;
898 - remove grdchkwhichproc from namelist (retired param);
899 - send adjoint gradient to all procs so that all procs print it to STDOUT;
900 - switch on MPI test for global_ocean.90x40x15 AD test experiment.
901 o adding package bbl (Bottom Boundary Layer)
902 description in MITgcm/pkg/bbl/bbl_description.tex
903 example/test experiment in MITgcm_contrib/bbl
904 o adjoint verifications
905 - changed 5 experiments to multi-tiles
906 * global_ocean.90x40x15
907 * obcs_ctrl
908 * offline_exf_seaice
909 * tutorial_dic_adjoffline
910 * tutorial_tracer_adjsens
911 changed reference output for those that crossed tile boundaries
912 (changed choices of gradient check positions)
913 - with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi)
914 - temporary bug fix in grdchk_loc.F for obcs
915 o genmake2 & testreport
916 - add target "obj" (just for OBJFILES files) to Makefile;
917 - add option to specify FEXTRAFLAGS on command line.
918 o pkg/mypackage:
919 - remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS
920
921 checkpoint63a (2011/08/02)
922 o pkg/diagnostics (velocity potential):
923 - fix velocity-potential calculation when using OBCS: balance net inflow
924 at each level (new S/R OBCS_DIAG_BALANCE).
925 - fix some of the problems with OBCS in stream-function calculation.
926 o pkg/exf/exf_readparms.F
927 - make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF,
928 EXF_NML_OBCS) more consistent, so that you need not have these lists
929 in data.exf when they are not used.
930 o optim/optim_readdata.F:
931 - add some output about obcs variables that might help debugging
932 - add a check about nvarlength
933 o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec
934 o pkg/diagnostics (velocity potential):
935 - fix mask for OBCS (still problems in stream-function with OBCS);
936 - add specific parameter (default = main code CG2D params) for solver;
937 - in case of poor convergence, use solution corresponding to lowest residual.
938 o pkg/seaice/seaice_growth.F: small changes that permit vectorizable
939 adjoint code. In general statements like tmpscal=fld(i,j) are problematic
940 and should be avoided where possible.
941 o model/src (rStar):
942 - include r* effect on reference-state (PhiRef) in totPhiHyd
943 (so that it's really the potential anomaly at the cell center);
944 affect solution only if z* with full pressure in EOS.
945 - test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and
946 update output (because of z* in totPhiHyd and viscA4 changes);
947 - keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly
948 @ constant r) until interpolation at constant r is implemented.
949 o pkg/diagnostics
950 - fix RCENTER diagnostics in case cell center is not at interface middle
951 o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use
952 this eos with eosType = 'TEOS10', in data (PARM01). This eos implies
953 that THETA and SALT are "conservative temperature" and "absolute
954 salinity"
955 o pkg/ctrl
956 - fix computation of endrec in s/r ctrl_init_rec
957 - ctrl_pack/unpack_*: remove unused variables and some obsolete code
958 o pkg/seaice/seaice_growth.F
959 - fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code,
960 remove then obsolete STORE directives
961 - fix STORE directives for tice and tices, so that only the
962 appropriate part of the fields are stored (and not the entire
963 field); update global_ocean.cs32x15.seaice AD output.
964 - cosmetic changes: adjust CPP flags and indentation for better
965 legibilty
966 o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by
967 Chris Wilson)
968 o pkg/gmredi:
969 Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF),
970 and test it in verification exp. "front_relax.bvp" (update output.bvp.txt)
971
972 checkpoint63 (2011/07/11)
973 o pkg/exch2:
974 - rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h
975 - exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the
976 (2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y
977 increments, calculates Cumul-Sum @ tile origin and sends results to each tile.
978 o pkg/diagnostics:
979 - deal with pairs of post-processed diags which are computed together; in
980 particular, re-order list of diags within 1 file to save 2nd computation.
981 - add S/R to compute velocity stream-function (called after velocity-potential
982 calculation) from divergence free transport -> new diagnostics "PsiVEL".
983 - add parameter to select grid-point location where PsiVEL == 0.
984 o eesupp/src:
985 new S/R to calculate cumulated sum on tiled array, corner grid-cell location
986 (specific S/R needed with exch2 topology - for now, just print an error msg)
987 o pkg/shelfice
988 - Implement friction velocity-dependent transfer coefficients following
989 Holland and Jenkins, JPO, 1999
990 Original code by M. Losch with small modifs.
991 Enable with CPP option SHI_ALLOW_GAMMAFRICT
992 and runtime flag SHELFICEuseGammaFrict
993 o verification lab_sea & global_ocean.cs32x15:
994 - use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local):
995 does not miss some dependencies (but is slower) and also works with many files
996 (default makedepend limitation for AD built).
997 - use cyrus_makedepend in adjustment.128x64x1 (so that it still tested).
998 o pkg/diagnostics:
999 - add run-time parameter "useMissingValue" (def=False) to fill land-point
1000 (i.e., where mask=0) with MissingValue ; used only in MNC output file.
1001 This replaces CPP-option DIAGNOSTICS_MISSING_VALUE.
1002 - Extend the use of "missing_value" setting from data.diagnostics for the case
1003 of counter-diagnostics (where fraction-weight is zero). This applies both to
1004 MNC and MDS output files.
1005 o pkg/seaice/seaice_growth.F:
1006 - add 'a priori' cap of latent heat flux based on actual mass considerations
1007 when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the
1008 non-legacy seaice_solve4temp.
1009 - add diagnostic of the residual sublimation freshwater flux (the freshwater
1010 flux taken from the ocean if the total actual latent heat fluxes exceed
1011 the maximum)
1012 - remove the CPP switch around the *_FWbySublim unit change and move diagnostic
1013 fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F.
1014 - add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef
1015 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim).
1016 - bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET.
1017 - bug fix : missing part to Martin's r_FWbySublim pathological case fix.
1018 o verification 1D_ocean_ice_column:
1019 made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet
1020 update results
1021 o pkg/diagnostics:
1022 - Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P')
1023 which are not filled-up but computed from other diags ; In this case, the mate
1024 diag points to the primary (filled-up) diag to used for post processing.
1025 - Update Velocity-potential computation using post-processed diag framework.
1026 ==> Change the ordering of fields and time-periods in MDS output file
1027 when using periodic averaging: now writes one time record with the full set
1028 of fields for this time period, then the next time reccord (it used to be
1029 one field with the full set of time records then the next field).
1030 Note: this is now similar to NetCDF (MNC) output file. <==
1031
1032 checkpoint62z (2011/06/21)
1033 o adjoint monitor:
1034 - Add adjoint monitor output for packages exf, seaice
1035 and update relevant testreport output
1036 o pkg/seaice:
1037 - re-order diags inits so that they appear in order in available_diagnostics.log
1038 - added diags: hsnow thermo. rates of change, area preceeding ridiging process,
1039 area/heff/hsnow preceeding thermodynamic growth/melt.
1040 - modified diag: SIdA; output actual effect, as the description states.
1041 - modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW.
1042 - retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh.
1043 (SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO;
1044 and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO)
1045 - modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates.
1046 - added diagnostics for seaice generic tracers (SItr*).
1047 - added SItrUnit and SItrNameLong run time param (for SItr* diags).
1048 - in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'.
1049 I. Fenty: 18-Jun-2011:
1050 Minor changes to seaice package:
1051 1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and
1052 added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor)
1053 - Differentiated "regularization variables" from "floor variables"
1054 * areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor
1055 * hiceMin became SEAICE_hice_reg (old hiceMin)
1056 (with _reg meaning regularization variable)
1057 - SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion
1058 so as to ensure energy conservation when going between phases
1059 - A22 was not used anywhere
1060 2) Changed regularization procedure for heffActual and hsnowActual to ensure
1061 well-boundedness and smooth adjoint in seaice_growth.F
1062 3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells
1063 because the old regularization always set heffActual >= 0.05 cm
1064 4) Changed the model so that the default behavior is to put a small (10^-5) "floor"
1065 on AREA when HEFF > 0.
1066 - went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to
1067 requiring that DISABLE_AREA_FLOOR *not* be defined
1068 Affected verifications:
1069 - 1D_ocean_ice_column (output.txt output_adm.txt)
1070 - global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt)
1071 o pkg/diagnostics:
1072 - move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R).
1073 - rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument
1074 (was _RL, now integer) with option = 0 to retrieve all levels.
1075 - add pieces of code to compute velocity potential at each level (new diagnostics
1076 PhiVEL, works only when UVELMASS & VVELMASS are also turned on);
1077 for now, using same params as CG2D (target-resisual, max Nb of iter ...).
1078 - fix few issues with counter diagnostics in diagnostics_setdiag.F &
1079 diagstats_setdiag.F (if diagnostic counter is itself a counter diag)
1080 and in diagnostics_fract_fill.F (do not need a valid pointer for the
1081 diagnostics counter-mate); check that definition of counter-diagnostic
1082 includes a valid counter-mate (in diagnostics_set_levels.F).
1083 o model/src (rStar):
1084 - add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F);
1085 affect solution only if z* with full pressure in EOS;
1086 update output of test-exp global_ocean.90x40x15.
1087 o pkg/seaice:
1088 - introduce siEps=1e-5 parameter
1089 - use areaMax in AREA update (part 4), consistent with ridging step (part 2.5).
1090 - re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code.
1091 - introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer.
1092 For now it covers, and was tested for, ice salinity and age (attached to HEFF),
1093 as well as ice cover age and ridging index (attached to AREA).
1094 For now the run time parameters (in data.seaice/SEAICE_PARM03) are
1095 SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA').
1096 Up to SItrMaxNum=3 tracers can be used simultaneously.
1097 o pkg/salt_plume:
1098 -introduce SPsalFRAC run time parameter that sets the fraction of the
1099 salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically)
1100 that gets vertically redistributed (fluxed down) by pkg/salt_plume.
1101 o model debug options:
1102 - Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored
1103 in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h).
1104 - Refine debug-msg printing selection (3 new levels):
1105 debugMode : controls printing of debug messages (sequence of S/R calls).
1106 debugLevel : controls printing of algorithm-relevant auxiliary/debug messages
1107 debLevZero = 0 ; /* level of disabled aux. msg printing */
1108 debLevA = 1 ; /* level of minimum aux. msg printing */
1109 debLevB = 2 ; /* level of low aux. print (report read-file opening)*/
1110 debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */
1111 debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */
1112 debLevE = 5 ; /* level of extensive debug printing */
1113 New debugLevel default: with default debugMode value (=F),
1114 = 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.;
1115 and if debugMode=T, default debugLevel = 4 (debLevD).
1116 Relation with previous settings:
1117 debLevB (=2) corresponds to former debLevA (=1)
1118 debLevD (=4) corresponds to former debLevB (=2)
1119 Note:
1120 a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before);
1121 b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs);
1122 to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5)
1123 - Add new parameter (printResidualFreq, read from PARM02 namelist) to print
1124 detailed CG solvers convergence; off (=0) by default, except if debugLevel=5.
1125 o pkg/obcs:
1126 - change OBCSfixTopo default from True to False (should not change the results);
1127 keep OBCSfixTopo=T in verification-exp. seaice_obcs.
1128 o pkg/thsice:
1129 - fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in
1130 2nd layer seaice sublimation (unlikely to happen)
1131 - use Interior mask for OBCS in thsice_advection.F (similar to what is
1132 done in gad_advection & seaice_advection).
1133 o adjoint:
1134 bug fix spotted by Gael Forget:
1135 seaice_advection and thsice_advection still had
1136 legacy CPP options to avoid CS corner updates for adjoint
1137 o pkg/seaice:
1138 => Change some of the defaults (2011/05/29):
1139 - change SEAICEuseFluxForm default (from False to True)
1140 - change DIFF1 default (from 0.004 m/s to 0. m/s)
1141 And print warnings if DIFF1 is not set in data.seaice and centered
1142 avection scheme is used without any diffusion.
1143 also:
1144 - fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F;
1145 - set SEAICEdiffKh[] default in the same way as SEAICEadvSch[]
1146 - stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any
1147 other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with
1148 #undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE.
1149 update results of test exp.:
1150 lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20)
1151 output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200)
1152 output_adm.noseaicedyn (SEAICEuseFluxForm=T)
1153 offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T)
1154 seaice_obcs: output (SEAICEuseFluxForm=T)
1155 and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004)
1156 for standard fwd & AD lab_sea tests (to keep the same output).
1157 o pkg/seaice/seaice_growth.F:
1158 - use Ian Fenty's capping formulas for actual ice
1159 thickness thoughout EVOLUTION branch.
1160 - put treatment pathological case #2) in CPP brackets
1161 (ALLOW_AVOID_INFINITESIMAL_AREA, undef by default).
1162 - update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly.
1163 o pkg/seaice:
1164 - seaice_diffusion.F : remove the min(DX,DY) factor permanently;
1165 pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter;
1166 also pass fac as a param, which can be 1. (to update the tendency
1167 field) or the time step (to update the field itself).
1168 - seaice_advdiff.F: for multidim, call seaice_diffusion with
1169 e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call
1170 seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step.
1171 - SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F :
1172 hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc.
1173 o pkg/seaice:
1174 diffusion with centered advection scheme (diffus.F & advect.F):
1175 - simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside)
1176 to just compute the laplacian of input-field.
1177 - unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call.
1178 - fix flux-form version in diffus.F to conserve tracer.
1179 update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects
1180 machine truncation) and lab_sea.salt_plume (conservative flux-form modif)
1181
1182 checkpoint62y (2011/05/26)
1183 o pkg/seaice:
1184 - seaice_growth.F : in EVOLUTION branch, always include
1185 a_QSWbyATM_cover in qnet (as it should be).
1186 - verification/global_ocean.cs32x15 : update results accordingly
1187 (output.seaice.txt output_adm.seaice.txt).
1188 o pkg/seaice + obcs:
1189 - use maskInW & maskInS in multi-dim advection and biharmonic diffusion:
1190 equivalent of assuming no tracer gradient outside the OB region.
1191 update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion)
1192 - remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed
1193 after changes above);
1194 - obcs+seaice cleaning: apply seaice-tracer OB values to tracer field
1195 only at OB location (instead of over a band of OLx width).
1196 o pkg/seaice:
1197 - fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F
1198 (dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid)
1199 o pkg/obcs:
1200 - split header file "OBCS.h" into 4 separated files:
1201 OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h
1202 Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h
1203 (contain no conditional statement which depends on OBCS options).
1204 - move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h)
1205 to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h).
1206 o ctrl, cost, grdchk & autodiff pkgs:
1207 - make options file more standard (like other {PKG}_OPTIONS.h file but
1208 with AD_CONFIG.h); clean-up some of the included header files.
1209 o pkg/obcs:
1210 - do not mask tracer when applying OB (tracer == 0 could generate problems)
1211 - apply tracer OB values to tracer field only at OB location (instead of
1212 over a band of OLx width)
1213 - clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R)
1214 - remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove
1215 obcs_apply_tloc.F & obcs_apply_sloc.F
1216 o obcs in model/src:
1217 - call OBCS_APPLY_W only if NonHydrostatic.
1218 - call OBCS_APPLY_ETA only if NonLinFreeSurf.
1219 - reset dEtaHdt and wVel to zero outside OB interior region ;
1220 - leave tracer unchanged outside OB interior region: This has no effect
1221 on the solution but just to prevent unrealistic tracer value outside OB.
1222 - zero out velocity outside OB interior region: This has no effect on
1223 the solution but just to prevent unrealistic velocity outside OB.
1224 o obcs and non-lin free-surf:
1225 move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F
1226 and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F
1227 + add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR:
1228 this fixes missing EXCH + get consistent eta OB value (+ fix restart).
1229 update results of test-exp. exp4(nlfs).
1230 o exp4 (nlfs) test-exp:
1231 use OBC for Eta at Western & Eastern OB (to test prescribing Eta
1232 with NonLin-FreeSurf); update output.nlfs.txt
1233 o obcs and 2d/3d solver norm:
1234 use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB
1235 and outside OB interior region (will allow to place OB further inside the
1236 domain). Depending on the domain, can affects cg2d-Norm (previous
1237 cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl,
1238 and cg3d-Norm (previous Norm was computed before canceling OB terms),
1239 e.g. in tutorial_plume_on_slope.
1240 - update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope.
1241 o pkg rbcs:
1242 - split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h
1243 - add capability to apply relaxation to horizontal velocity uVel & vVel.
1244 o pkg/grdchk: add gradient check for control variable xx_shifwflx
1245 o pkg/shelfice/shelfice_init_fixed.F
1246 fix CPP-flag combinations
1247 o pkg/seaice: Merge iceage code of Pierre Rampal
1248 * update/change/correct ice age calculations
1249 * add age updates for pathological cases
1250 Probably needs more testing...
1251
1252 checkpoint62x (2011/05/13)
1253 o pkg/mom_vecinv:
1254 high-order vorticity scheme: use interior masks (maskInW & S)
1255 to zero-out (outside OB) gradient of vorticity.
1256 o verification exp.:
1257 turn on "useEnergyConservingCoriolis" (better discretisation) in exp.
1258 hs94.128x64x5 and seaice_obcs ; update results.
1259 o pkg/obcs:
1260 fix bug in OBeta for YZ sections in obcs_exf_load.F
1261 o pkg/ctrl, pkg/shelfice, and optim:
1262 - add new control variable xx_shifwflx (fresh water flux underneath ice
1263 shelves). This is almost as tedious as obcs-ctrl, because the
1264 variables needs its own mask.
1265 - add a cost function term that penalizes the deviation of xx_shifwflx
1266 from the first guess (zero) in analogy to other control variables
1267 o pkg/shelfice:
1268 - start basic adjoint
1269 o pkg/ctrl:
1270 - remove extra 2D field "for good measure" when initializing in
1271 ctrl_set_globfld_[xy/xz/yz].F
1272 - replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec
1273 - improve error messages in ctrl_set_unpack_*
1274 o OBC implementation in momentum:
1275 use interior masks (maskInC,W & S) in momentum S/R:
1276 - multiply divergence, tension and some del^i.u or del^j.v by maskInC
1277 - multiply del2u,del2v by maskInW/S (biharmonic viscosity)
1278 - multiply horiz. grad of vorticity by maskInW/S (in Leith scheme)
1279 - multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd)
1280 Motivation: fix/clean implementation of OBC with biharmonic-viscosity
1281 (and also with Leith/Smagorinsky harmonic-viscosity).
1282 Update output of experiment dome and exp4 (+nlfs).
1283 o exp4 test-exp:
1284 - turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F)
1285 and prescribe time-varying OB (without pkg/exf) for zonal-velocity
1286 at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe
1287 time-varying OB at Western-side for wVel (NonHyd); update output.
1288 - add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv
1289 and biharmonic-viscosity ; also use prescribed time varying OB.
1290 o pkg/obcs:
1291 fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F
1292 o model/src:
1293 - fix startTime setting when baseTime<>0 & nIter0=0 are specified ;
1294 - initialise startTime & nIter0 with unlikely values: allows to set one
1295 from the other without ambiguity.
1296 o seaice_obcs test-exp.:
1297 add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output.
1298 o pkg/obcs:
1299 - remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer:
1300 no longer needed with maskInC,W,S in pkg/generic_advdiff.
1301 o pkg/seaice:
1302 - retired SEAICE_SALINITY and SEAICE_salinity in favor of
1303 SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively.
1304 - fixed bug in the initialization of sea ice salinity variable HSALT
1305 in seaice_init_varia.F (removed dependence on ICE2WATR)
1306 o fizhi-cs test exp.:
1307 switch reference output convention for these 2 non-standard test-exp,
1308 from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5)
1309 to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11)
1310 reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran
1311 o model/inc:
1312 - change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4")
1313 of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS)
1314 o pkg/seaice:
1315 - fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY
1316 o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15
1317 - updated output*.txt files due to bug fixes in salt, saltPlumeFlux,
1318 and initial HSALT
1319
1320 checkpoint62w (2011/04/26)
1321 o pkg/mom_fluxform:
1322 - fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf.
1323 - use parameter "sideDragFactor" in no-slip BC side-drag part.
1324 - update output of exp. global_ocean.90x40x15
1325 o pkg/mom_vecinv:
1326 mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform)
1327 o update seaice exp.:
1328 use more consistent parameter values (remove "backward compatability only":
1329 ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh)
1330 related to thermodynamics seaice. Update output (fwd+AD) of exp.:
1331 1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs
1332 o update test-exp global_ocean.90x40x15:
1333 o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis).
1334 o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.)
1335 o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params)
1336 o turn on zStar & viscA4 in standard set-up (dir input/)
1337 and update output files: output.txt & output.dwnslp.txt
1338 o new AD-test experiment: obcs_ctrl
1339 (From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector.
1340 o pkg/dic:
1341 fix two bugs in handling water vapour pressure in carbonate chemistry
1342 and air-sea fluxes. Found by Val Bennington and Galen McKinley
1343 (add DIC Option = WATERVAP_BUG to recover old results)
1344 update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline
1345 o adding allowInteriorFreezing option to check for water below freezing point
1346 at depth and bring the negative heat anomaly to the surface level
1347 o pkgs _fields_load:
1348 - extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs)
1349 - use new S/R GET_PERIODIC_INTERVAL in pkgs:
1350 bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and
1351 rbcs to get interpolation weights and time reccord number.
1352 - fix multi-threading in aim_fields_load.F
1353 - apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F
1354 o external_fields_load:
1355 new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear
1356 interpolation weights) to use in a periodic time-series ; do not divide by
1357 time-step to convert to integer:
1358 - this fixes case where externForcingPeriod is not multiple of time-step
1359 (Thanks to Christopher L. Wolfe)
1360 - this fixes case where externForcingPeriod is an odd multiple of time-step
1361 (was wrong by half of time-step); update results of tutorial_global_oce_in_p.
1362 store index of time-record which is currently loaded:
1363 - works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ;
1364 - needed for the adjoint but not yet used because of extensive recomputations;
1365 (to be fixed soon)
1366
1367 checkpoint62v (2011/04/02)
1368 o verification/1D_ocean_ice_column added to test Ian Fenty's
1369 pkg/seaice_growth.F modifications for improving sea ice code differentiability
1370 o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope
1371 (new velocity statistics after changing maskInW & maskInS definition)
1372 o pkg/generic_advdiff with OBCS:
1373 use maksInW & maskInS in advective flux and in biharmonic diffusion calculation:
1374 equivalent to assumption of no tracer gradient outside the OB region.
1375 This will affect the results if using obcs+biharmonic diffusion.
1376 update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc)
1377 o pkg/obcs:
1378 change definition of maskInW & maskInS: leave OB edges inside (maskIn=1)
1379 (e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still
1380 in Interior region. No impact on solution but affects Velocity monitor stats.
1381 o pkg/ptracers (adjoint)
1382 New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate
1383 tape file for each tracer
1384 o model/inc/src and pkg/autodiff: add parameters that allow to turn
1385 of parts of the adjoint code at run time. For now, there are only
1386 useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These
1387 parameters are set in data.pkg.
1388 This is the lazy coward's version of doing this, but still useful for
1389 debugging. In order to do it right, everything needs to be moved to
1390 pkg/autodiff.
1391 o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at
1392 the end; this fixes the adjoint balancing code for open boundaries.
1393 o pkg/ctrl:
1394 - change behavior of xx_${varname}period to be analogous to exf-conventions:
1395 xx_${varname}period = 0., means time-independent control part
1396 xx_${varname}period = -12., means one-year-periodic monthly control part
1397 - introduce helper routine ctrl_init_rec (part of ctrl_init.F) to
1398 clean up ctrl_init a little, remove unused variables
1399 - ctrl_init: fixed the handling of the start/endrec for obcs-variables
1400 - move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec
1401
1402 checkpoint62u (2011/03/15)
1403 o model/src:
1404 - for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in
1405 h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ;
1406 - in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to
1407 INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF.
1408 o pkg/ctrl/obcs/ecco:
1409 - remove obsolete, unused, and partially broken code:
1410 ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within
1411 ALLOW_CTRL_OBCS_BALANCE
1412 - put a stop statement into ecco/cost_obcsvol.F, but also add
1413 cost_obcsvol to ecco_ad_diff.list
1414 o pkg/ecco: fix counting cost function contributions for obcs (code
1415 by Matt M.) and diffkr for diagnostics
1416 o pkg/ecco, pkg/ctrl, pkg/grdchk:
1417 add cost penalty terms for initial uvel, vvel, eta controls
1418 and I/O for prior error files
1419 o pkg/mdsio:
1420 move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option
1421 (new argument) to check for tiled file in mdsioLocalDir : this fix the
1422 restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir.
1423 o pkg/ctrl:
1424 - ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by
1425 ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove
1426 unused and superfluous variables
1427 - ctrl_get_gen_rec.F: catch the case of xx_genperiod=0.
1428 o pkg/ecco
1429 - enable adjoint of Stevens OB
1430 o pkg/ctrl/ecco/grdchk:
1431 - remove global declaration of tmpfldx/yz and tmpfldx/yz2.
1432 Fortunately, we do not have any tests for the numerous cpp-flagged
1433 option of "obcs as control parameters" so we will never know
1434 if this is an improvement (but at least now things compile).
1435 - remove an obsolete initialization from ecco_cost_init_barfiles.F
1436 - fix some problems within never used ifdefs to make the code compile
1437 o pkg/obcs:
1438 - Refine Interior mask definition to work with more complex OB (e.g.
1439 if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to
1440 read in Interior mask from file. Check if Interior mask is consistent
1441 with OB list of indices.
1442 o pkg/seaice
1443 - beginning code for a seaice tracer package,
1444 but currently only used for seaice age: SEAICE_AGE
1445 SEAICE_num = 4
1446 iTracer = 1: area-weighted ice age
1447 = 2: volume-weighted ice age
1448 = 3, 4: template for one-year vs. multi-year ice
1449 data.seaice has new namelist SEAICE_PARM03 for arrays related to
1450 SEAICE_num
1451
1452 checkpoint62t (2011/03/05)
1453 o pkg/obcs:
1454 - obcs_apply_uv.F: change to a 2 steps method, first tangential component;
1455 then normal component. This ensures that the normal component is set
1456 correctly even when it conficts with tangential setting from an other OB.
1457 Affects results of test-experiment seaice_obcs: update the output.txt
1458 o pkg/obcs:
1459 - add code to monitor statistics of dynamical fields at OB.
1460 - take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW :
1461 - fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection).
1462 - change default: balance the Net inflow through all OB (instead of balancing
1463 each OB separately); keep the old method if setting OBC_balanceFacX < 0.
1464 - switch on useOBCSbalance in dome experiment: only correct Western OB outflow
1465 to match Nortern OB inflow (OBCS_balanceFacN=0).
1466 o pkg/seaice:
1467 - redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL
1468 o pkg/seaice (seaice_growth v 1.113):
1469 - reverting seaice_growth to v 1.111 in order to have code with exact bit
1470 compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge
1471 CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced
1472 runtime flag SEAICEareaFormula is kept but is inactive
1473 o model/src:
1474 - add new param to scale curvilinear grid distance and area when using
1475 a different sphere radius from the grid-files.
1476 - test/check multi-threads EXCH applied to local variable (cg2d_x)
1477 o adjoint:
1478 - enable adjoint of Stevens OB
1479 - add dummy_in_dynamics to enable extraction of ADJrhoinsitu
1480 (a bit delicate because of potentially modified adj. common block structure;
1481 current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later)
1482
1483 checkpoint62s (2011/02/15)
1484 o pkg/seaice (seaice_growth v 1.112):
1485 - introduce SEAICEareaFormula run time parameter, which selects the recipe for
1486 computing the ice cover tendency from effective thickness tendencies. Include
1487 Ian Fenty's formula.
1488 - remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using
1489 SEAICEareaFormula.
1490 - simplify notations for the various d_HEFF/d_AREA terms.
1491 o pkg/gmredi:
1492 - add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code
1493 from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative;
1494 add a verification test-run (front_relax.bvp) to test GM_useBVP.
1495 o pkg/seaice (seaice_growth v 1.111):
1496 - for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's.
1497 - the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to
1498 also melt ice.
1499 o pkg/seaice:
1500 - McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty).
1501 - can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h
1502 o pkg/cheapaml:
1503 - from Nico Wienders: New version of this package.
1504 o pkg/flt:
1505 - add CPP options to prevent floats to re-enter the opposite side of
1506 a periodic domain (default: keep periodicity)
1507 o pkg/gmredi:
1508 - apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners
1509 (needed for multi-dim advection).
1510 - switch on GM Advective form in global_ocean.cs32x15 and update output.txt
1511 o model/src:
1512 - fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run.
1513 o tutorial_tracer_adjsens
1514 - extend to NLFS and replace maskC by hFacC
1515 (change reference output accordingly)
1516
1517 checkpoint62r (2011/01/24)
1518 o testreport:
1519 - add option -deloutp (-do) to remove output file after successful run
1520 - add option -mfile (-mf) for MPI machile-file and for each test-exp,
1521 extract exact list of procs from this file ; adjust COMMAND by
1522 replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs.
1523 o pkg/ecco: replace old ineffective way of penalizing deviations from
1524 first guess (of obcs) with code by Matt Mazloff
1525 o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without
1526 exf/cal
1527 - ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl
1528 and handle case of obcs?period == 0
1529 Not affected by these changes: There is still an inconsistency in
1530 the computation of start/endrec for the obcs variables for ALLOW_CAL
1531 defined (see comment by Menemenlis, 7-Mar-2003)
1532 - make S/R ctrl_get_gen_rec return something meaningful even if
1533 ALLOW_CAL is not defined
1534 - ctrl_getobcs?: simplify code so that it does not need to use
1535 S/R exf_swapfields
1536 o testreport:
1537 allow to test MPI with different number of processors for each experiment:
1538 create file "SIZE.h.mpi" in each build dir.
1539 Note: update of "-command" argument not yet implemented.
1540 o model/src, pkg/autodiff, pkg/ecco, pkg/seaice:
1541 alleviate the need for additional 3D tapes when using
1542 the non-inear free surface in the adjoint. This is done
1543 by adding an 'update' of hfacc etc. to their current
1544 value at the beginning of forward_step.F.
1545 o pkg/seaice
1546 seaice_lsr: move stress-divergence computations out of outer pseudo-
1547 timestepping loop
1548 o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD'
1549 up, so that the calls of the ctrl_* subroutines are really at the end
1550 of the routine.
1551 o pkg/gmredi:
1552 allow to specify a 2-D horizontal map and a 1-D vertical profil
1553 as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity.
1554 o pkg/seaice:
1555 move lsr iterations from seaice_dynsolver to seaice_lsr.
1556 o pkg/seaice:
1557 reduce memory footprint of seaice mutldim advection tapes,
1558 by using a 2D tape independent of the generic_advdiff ones,
1559 and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc.
1560
1561 checkpoint62q (2010/12/29)
1562 o model/src:
1563 - check horizontal grid-spacing for unset or zero/negative values.
1564 - change AD test hs94.1x64x5 to be truly a 2-D set-up.
1565 o pkg/flt:
1566 - use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR
1567 - precision of input and output files set according to readBinaryPrec
1568 and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits.
1569 - initial float position from tiled file was not converted to index space
1570 (looks like a bug): fixed to make it similar to initial pos. global file.
1571 o global_ocean.cs32x15:
1572 change SIZE.h of AD set-up to get same tiling as with MPI.
1573 Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11)
1574 o model/src:
1575 add flag to control printing of domain fields (bathymetry, hFac ...) in
1576 ini_mask_etc (call to plot_fieds_xy*).
1577 o pkg/thsice:
1578 if useEXF, some forcing fields are not valid in overlap: fixed by computing
1579 over the interior only + apply EXCH at the end (like with SEAICE advection).
1580 o pkg/mdsio:
1581 - add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer
1582 to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS.
1583 - change barrier call for safe multi-threads access to 3-D shared buffer.
1584 - MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones)
1585 - replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and
1586 remove the 4 S/R MDS_PASS_WH_R4/8toRL/S.
1587 o pkg/flt:
1588 - add fourth-order Runge-Kutta integration
1589 - add basic exch2 support (only 1 facet supported so far!)
1590 o pkg/mdsio+rw:
1591 new S/R to read local (or tile independent) vector (read counterpart of
1592 mds_writevec_loc, and front-end write_glvec_rl/rs).
1593 o global_ocean.cs32x15: additional input_ad.seaice experiment
1594 that uses pkg/seaice rather than pkg/thsice.
1595 (using multidim advection for seaice)
1596 o towards more F95 syntax for array specification in namelist:
1597 - change "data.diagnostics" (data.ptracers was changed before checkpoint62p)
1598 of all verification experiments.
1599 e.g.: line: fields(1,3)='ETAN ','ETANSQ ',
1600 was changed to: fields(1:2,3)='ETAN ','ETANSQ ',
1601 - finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles
1602 o global_ocean.cs32x15: additional input.seaice experiment
1603 that uses pkg/seaice rather than pkg/thsice.
1604
1605 checkpoint62p (2010/12/17)
1606 o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it
1607 to THSICE_SIZE.h to avoid conflict with pkg/seaice.
1608 o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint.
1609 allow for use of multim. advection in seaice adjoint.
1610 o pkg/seaice: add diagnostics for snow precipitation and sublimation flux
1611 - first attempt to close budgets by taking into account the freshwater
1612 flux implied by the sublimation of snow and ice. So far only the
1613 volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag
1614 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET
1615 o eesupp/src:
1616 new S/R with new option (NML_EXTENDED_F77) to change array specification
1617 from F95 standard to commonly accepted extended F77 form.
1618 This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5)
1619 and to revert back to the original syntax (with -DNML_EXTENDED_F77)
1620 for less tolerant f77 compiler (e.g., pgf77, g77).
1621 o globalFiles:
1622 commented out in parameter file "data" since it's not safe with MPI
1623 (e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much
1624 in this case); no longer commented out in restart test (tst_2+2).
1625 o add adTapeDir to specify a special directory where adjoint tapes are
1626 written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05
1627 and cannot be used together with mdsioLocalDir.
1628 o nesting pkgs:
1629 - packages_init_variables : put call to OBCS_INIT_VARIABLES in last position
1630 - update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
1631 - add parameter files + utils dir + output from short run on beagle.
1632 o pkg/seaice:
1633 fix seaice_growth.F store directives; update results of exp. lab_sea.ad
1634 o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid
1635 unnecessary copying in adjoint code, requires new parameter NMAX_ITER
1636
1637 checkpoint62o (2010/11/25)
1638 o pkg/exf:
1639 - change CPP option EXF_VERBOSE to run-time logical param exf_verbose.
1640 o pkg/seaice:
1641 - seaice_ocean_stress: split a loop for better vectorization of the
1642 adjoint code
1643 - seaice_growth.F: fix bug in conservation of freshwater connected to
1644 capping of heff, put contribution into d_HEFFbyNEG
1645 - replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat
1646 by something more sensible (parameters that are what their name implies)
1647 - change some defaults, so that by default exf-parameters are used for
1648 things like rhoAir, cpAir,latent/sensible heat parameters, in order
1649 to reproduce the old results, many data.seaice now contain funny values
1650 for cpAir and latent heat of sublimation
1651 o packages_readparms.F: move exf_readparms up in line so that
1652 exf-parameters are visible for other packages (e.g. seaice)
1653 o debugMode & debugLevel=2:
1654 - differentiate between debugMode & debugLevel=2:
1655 debugMode: controls printing of debug messages (sequence of S/R calls).
1656 debugLevel: controls printing of algorithm intermediate results and stats.
1657 - remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2";
1658 => allows to print debug-stats without all sequence of call messages.
1659 - switch control of debug print from debugLevel to debugMode in many S/R.
1660 o pkg/obcs (obcs-sponge):
1661 fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the
1662 call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge)
1663 o pkg/generic_advdiff:
1664 - record overlap minimum size for each advection scheme;
1665 - refine criteria on overlap minimum size;
1666 - check and stop (in gad_check) if overlap size is too small.
1667 o pkg/obcs:
1668 - with ptracers: remove multiple calls to obcs_apply_ptracer (only done
1669 once, in ptracers_implicit.F)
1670 - with seaice: remove test on empty file name in obcs_apply_seaice (always
1671 apply OB values when tile has OB)
1672 o model/src, coriolis setting:
1673 - integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical
1674 useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from
1675 files (selectCoriMap=3) with any grid.
1676 - add parameter "fPrime" for constant second Coriolis coeff (default=0).
1677 o pkg/seaice/seaice_growth.F:
1678 a few cosmetic changes that reduce the number of lines of code
1679 o pkg/obcs: add boundary conditions following Stevens (1990)
1680 - the code follows old MOM/NAOSIM code
1681 - so far it is only implemented for the eastern and western boundaries
1682 and NOT for pTracers
1683 o pkg/rbcs:
1684 - replace rbcsInIter by rbcsForcingOffset, the time in seconds at the
1685 beginning of the first rbcs forcing period.
1686 - add option rbcsSingleTimeFiles that makes rbcs read forcing data like the
1687 offline package, i.e., one file per time, labeled by iteration number;
1688 deltaTrbcs sets the timestep with which the data was generated;
1689 rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset.
1690 - rbcsForcingCycle=0 makes forcing non-cyclic.
1691 - make arithmetic safe for negative times and odd forcing periods.
1692
1693 checkpoint62n (2010/11/09)
1694 o pkg/seaice:
1695 fix masking in free-drift S/R ; update results of exp. lab_sea.fd
1696 o pkg/obcs:
1697 New S/R to copy tracer value from the OB location to narrow band region
1698 (width = same as overlap) beyond the OB: preserve OB value (needed for
1699 high-order scheme) which were overwritten by EXCH call if in overlap
1700 region. Applied to theta, salt, ptracer and advected seaice variables.
1701 With seaice: use maskInC in similar way as in gad_advection.F,
1702 in seaice_advection.F and advect.F.
1703 Update output of experiment seaice_obcs and change exp4 to test OBCS with
1704 4th order Adv.Scheme. for pasive salt and ptracer.
1705 o tools/genmake2:
1706 - when looking for an optfile (not specified), only search for Fortran compiler
1707 (remove sym-link test + setting of CPP + makedepend check + C-compiler check)
1708 - in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm
1709 (instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong)
1710 - set default for CPP to "cpp -traditional -P" (was the case without specifying
1711 an optfile, but otherwise default was just "cpp".
1712 - comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from)
1713 - when "CC" is not set in the optfile, look for possible C compiler
1714 (instead of just setting CC=cc)
1715 - put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes:
1716 => add a ".F" to ".o" rule for source files with no "#include" (such as
1717 port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS.
1718 - move gfortran before g77 in list of possible Fortran compiler (consistent
1719 with reference compiler switch from g77 to gfortran)
1720 o pkg/seaice:
1721 o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to
1722 seaice_check that stops the model, when the CPP flag is used.
1723 o seaice_growth.F: make capping of ice volume conserving by returning the
1724 capped ice as freshwater to EmPmR. This does not change the verification
1725 experiments but will change runs where the capping is acutally active
1726 o change reference platform+compiler from faulks+g77 to baudelaire+gfortran
1727 (except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5,
1728 global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD),
1729 lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd)
1730 o tools/genmake2:
1731 - merge genmake_warnings & genmake_errors into 1 log file: "genmake.log")
1732 - change DUMPSTATE default to false (can use "-ds" option to switch it to T)
1733 - clean previous genmake log files before anything else.
1734 - change Makefile to remove testreport log files (*.tr_log) and genmake log
1735 files only with "CLEAN" target (instead of "Clean");
1736 o pkg/generic_advdiff:
1737 Change OBCS in multiDim advection (gad_advection.F):
1738 Use maskInC to prevent intermediate update of tracer-field in OB regions,
1739 thus keeping current-time-step OB values; and remove the call to OBCS_APPLY
1740 which were applying future time-step OB values.
1741 This way, all explicit calculations use current-time-step OB values
1742 (simpler and more consistent).
1743 Affects results when set-up uses time-varying OBC and multi-dim advection;
1744 update output of experiment seaice_obcs.
1745 o pkg/seaice:
1746 move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h:
1747 this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH &
1748 SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY.
1749 Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY
1750 but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp
1751 unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h)
1752 o pkg aim (2010/10/26):
1753 - Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation
1754 formulation with obliquity, eccentricity, ... as run-time parameters,
1755 - Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and
1756 upward shortwave radition at the surface (all-sky and clear-sky).
1757 o pkg/obcs:
1758 - writing sections with globalFiles=T does not work: switch to tiled-files
1759 when writing sections for OBCS (change pkg/rw/write_rec.F accordingly).
1760 - fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F
1761 - apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs
1762
1763 checkpoint62m (2010/10/21)
1764 o pkg/seaice: vectorize seaice_solve4temp.F
1765 - move iterations loops outside of i/j-loops
1766 - requires 2D arrays for TB and effConduct
1767 - add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is
1768 modified in this routine
1769 - a little bit of clean up, adjusting indentation, etc.
1770 - replaced a few TEN**a by exp(a*log(10.)) in new code for better
1771 performance and '**TWO' by '**2' (because TWO is a float),
1772 replaced ONE, ZERO
1773 o eesupp/src:
1774 fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube
1775 o pkg/seaice/seaice_growth.F
1776 Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and
1777 merging process. The merged routine has two branches, and one activates the 'evolution'
1778 branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now).
1779 In summary, here is what the '10/10 revision' did consist of
1780 part 1: seaice_growth.F revisions 1.71 to 1.75
1781 - Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged.
1782 The emphasis here was on improving readability (e.g. by trying to use meaningful
1783 variable names) and modularity (e.g. by adding arrays to store heff etc. updates).
1784 part 1.5:
1785 - revising the lab_sea experiment to make it a more useful (i.e. stable
1786 and representative of an actual model run). This was done by generating a
1787 (winter) pickup to start from, switching back the main experiment dynamic
1788 solver from evp to lsr, having one of the experiments use the free drift solution.
1789 part 2: seaice_growth.F revisions 1.76 to 1.85
1790 - Sorting out hard-coded constants that prevented heat and fresh water conservation.
1791 - Sorting out the various fields units and sign (set early on and reset at the end)
1792 to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and
1793 fresh water stock is 'effective ice meters', and >0 implies more ice/snow.
1794 - Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks,
1795 and simplifying logical expressions to further improve readibility.
1796 part 3: seaice_growth.F revisions 1.86 to 1.89
1797 - Re-organize the blocks of code more logically.
1798 - Merging the '_if.F' pieces that add something new.
1799 o pkg/thsice:
1800 - vectorize thsice_solve4temp and thsice_get_exf.
1801 Problem: thsice_solve4temp has an unvectorizable statement that
1802 might also be problematic for TAF
1803 - thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This
1804 does not change the verifcation experiment, but will change all
1805 experiments that have this flag undefined (not tested in verification);
1806 a little reorganization to save a few 2D fields and recomputations
1807 - 1st step of revisiting thsice adjoint (major recomp. sorted out)
1808 - 2nd step: fix some store dirs
1809 o seems to work somewhat, i.e. using ifort but not g77
1810 o likely cause are incomplete init. or recomputation
1811 o start verification/global_ocean.cs32x15/input_ad.thsice
1812 o pkg/obcs: add support for exch2
1813 - the position of the boundary and prescribed values are specified using
1814 a global domain with exch2 facets stacked
1815 - in x for N,S boundaries (like W2_mapIO=-1)
1816 - in y for E,W boundaries (so E,W boundaries do not overlap)
1817 o pkg/mdsio: add support for writing global sections with exch2
1818 file layout is as for obcs described above:
1819 - for x-z sections, facets are stacked in x (like W2_mapIO=-1)
1820 - for y-z sections, facets are stacked in y
1821 o pkg/thsice:
1822 - change a few routines for better vectorization: thsice_albedo.F,
1823 thsice_step_temp.F, and in thsice_calc_thickn.F. Results are
1824 not affected, but in particular the latter routine has changed
1825 dramatically (not necessarily easier to read now).
1826 - re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops
1827 iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF.
1828 o verification/lab_sea:
1829 - overhaul of the forward model experiments. The main motivation
1830 for this revision is that lab_sea has proven quite fragile (when
1831 changing the sea-ice code, and switching platforms) to a point
1832 when failures were very hard to attribute to specific code problems.
1833 - the suspected reason for this fragility is noise amplification by evp so,
1834 to start with, we decided to replace evp with lsr in the main experiment.
1835 - the input.lsr experiment thus became obsolete and was removed.
1836 - it was replaced with the input.fd experiment that uses an
1837 analytical "free drift" solution as the ice velocity field.
1838 - Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp)
1839 will hopefully allow us to discriminate problems due to dynamic solvers
1840 from problems due to the thermodynamic code. input.salt_plume (lsr) allows
1841 us to test additional options, along with the salt plume package.
1842 - Finally a pickup was generated (at the end of a one year run) to
1843 make the tests more representative of an actual model run. Previously
1844 the tests starting point was a 1m thickness of ice everywhere.
1845 o pkg/seaice:
1846 - introducing S\R seaice_freedrift.F that compute the
1847 analytical solution to an approximate ice momentum
1848 equation (i.e. the simple stress/coriolis balance).
1849 - define SEAICE_ALLOW_FREEDRIFT to trigger the computation
1850 of the free drift velocity field, and enable its use.
1851 To actually use the free drift solution as the model ice
1852 velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice.
1853 o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata"
1854
1855 checkpoint62l (2010/10/04)
1856 o pkg/seaice:
1857 -fix the USE_ORIGINAL_SBI version (for variable freezing point);
1858 -use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new
1859 version (with USE_ORIGINAL_SBI undef);
1860 o add hooks for new packages OASIS, the package will follow
1861 (hooks exclude the seaice pkg for now)
1862 o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO
1863 Option to use mdsio_read_whalos.F/mdsio_write_whalos.F,
1864 rather than mdsio_readvector.F/mdsio_writevector.F, within
1865 adread_adwrite.F to read/write adjoint-related tapes to disk.
1866 o eesupp and pkg/mdsio: ALLOW_WHIO
1867 Option to write/read 2D fields to files including tiles halos.
1868 The main purpose is for adjoint related "tape I/O".
1869 The secondary purpose is for debugging phases.
1870 A word on those rather specifically intended purposes.
1871 The code was meant to be stripped down to the bare minimum.
1872 Typically, there is a unique and basic mapping to the global
1873 buffer (tile by tile, then proc by proc, then level by level), and
1874 byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not
1875 meant to generate user friendly outputs of various shapes and forms.
1876 Rather it is intended, for the knowledgeabale developers,
1877 to be largely independent of the many mdsio options, to allow
1878 outputs of tiles+halos in debugging phases and in adjoint runs,
1879 and to allow some flexibility in tuning (adoint) I/O depending on each
1880 file system behavior. With regard to tuning, most of the potential knobs
1881 (to leave files open, to allocate the I/O indep. of usesinglecpuio,
1882 to specify directories, to specify the typical size of I/O calls, etc.)
1883 are not yet included, and will be added if they prove useful.
1884 o pkg/seaice:
1885 fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F
1886 o pkg/seaice:
1887 new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty
1888 code (seaice_budget_ice_if.F) which enable to recover old standard
1889 code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined.
1890 temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F.
1891 o model/src (rStar):
1892 use simple average (not area weighted) of rStarFac at U,V point when using
1893 vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection)
1894 update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20.
1895
1896 checkpoint62k (2010/09/17)
1897 o adjoint
1898 * changed verification/global_ocean.cs32x15 ; adjoint now tests
1899 Adams-Bashforth 3 + NLFS + RSTAR
1900 * some more modifs required for ECCO-GODAE v4
1901 o pkg/seaice
1902 add SEAICE_AGE_VOL option to use volume instead of area for
1903 integrating SEAICE_AGE
1904 o model/src:
1905 first check-in of sigma & hybrid-sigma coordinate code ; also includes
1906 non-linear free-surface parts ; but pressure-gradient not yet coded.
1907 o pkg/ptracers:
1908 option for ptracer to convert Salt Relax into additional EmP.
1909 tested in exp. global_ocean.90x40x15.dwnslp (update output)
1910
1911 checkpoint62j (2010/08/25)
1912 o pkg/ggl90:
1913 other minor changes: remove 3-D temp array gTKE (+ add argument myIter)
1914 o pkg/dic: car_flux.F, phos_flux.F
1915 - reduce number of exp-calls in order to improve performance
1916 - clean up a little (replace fields by their macros, etc., fix
1917 typo in CPP-flag)
1918 o pkg/ggl90: minor changes
1919 - GGL90diffKrS was removed --> always use GGL90diffKr
1920 - GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV
1921 - hack of mxlMaxFlag=2 --> ensure mixing between first and second level
1922 (commented out for now)
1923 - change in max/min operations to ensure that smoothing is ok
1924 - smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr)
1925 - always use diffKrNrT as background profile (i.e. never use diffKr field)
1926 o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj)
1927 o pkg/dic:
1928 - model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better
1929 vectorization
1930 - small bug fix in insol for the unlikely case of a cartesian grid
1931 - towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F
1932 + now vectorize, which also removes adjoint recomputations;
1933 + replace integer maksp1 by _RL maskp1
1934 + replace a**x by exp(x*log(a)) in phos_flux.F for speed
1935
1936 checkpoint62i (2010/07/21)
1937 o pkg/flt:
1938 - with OBCS: stop floats which enter the OB region
1939 o model/src:
1940 - use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones)
1941 for implicit vertical advection.
1942 o pkg/seaice:
1943 - account for melting in seaice age evolution.
1944 - remove double counting of seaice ridging effect on seaice age.
1945
1946 checkpoint62h (2010/06/18)
1947 o pkg/exch2:
1948 - remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1).
1949 o tools/genmake2
1950 - remove "-pdefault" option: redundant with the use of "packages.conf";
1951 - remove file pkg/pkg_default : set the default as a pkg group
1952 ("default_pkg_list") defined in pkg/pkg_groups;
1953 - fix for case pkg/pkg_depend is missing (was hanging before);
1954 - add option "-pgroups" to specify a different pkg_groups than the default.
1955 o verification/adjustment.cs-32x32x1:
1956 add a "minimal" set-up test (code_min & input_min) which only compiles
1957 eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc.
1958 o tools/genmake2
1959 - extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg]))
1960 - fix details of checking for mnc & profile pkg when NetCDF is unavailable.
1961 o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these
1962 files are nearly the same anyway.
1963 Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04:
1964 - redefinition of tau(i,i) (by a factor of ustar)
1965 - 1./exf(Const/T) -> exf(-Const/T) (big change in the results)
1966 - replace rhonil by rhoConstFresh in computation of evap (bug fix)
1967 - replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results)
1968 - replace
1969 rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh )
1970 shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j)
1971 by
1972 shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh )
1973 (changes results)
1974 -> exf_bulkformulae v1.22,
1975 update verification experiments lab_sea, offline_exf_seaice, seaice_obcs
1976 (lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13,
1977 output.txt 1.63
1978 offline_exf_seaice: output.seaicetd.txt 1.7
1979 seaice_obcs: output.txt 1.10)
1980 Step 2: do the actual merge and remove exf_bulk_largeyeager04.F
1981 -> exf_bulkformulae v1.23,
1982 unfortunately requires updating lab_sea.salt_plume (6 matching digits),
1983 and global_ocean.cs32x15.icedyn (only 11 matching digits)
1984 Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice.
1985 o adjoint of exch-1:
1986 - pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list)
1987 (note: was already like this when using EXCH-2) and remove flow dir
1988 and hand-written AD version of high-level EXCH S/R (pkg/autodiff);
1989 - provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow);
1990 - update pkg/exch2 diff list.
1991
1992 checkpoint62g (2010/05/19)
1993 o eesupp/src (exch-1):
1994 - split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F)
1995 and remove argument "simulationMode"; same thing for all exch_*rx_cube.F
1996 (renamed to exch1_*rx_cube.F).
1997 - change accordingly exch_*_rx.template and AD version in pkg/autodiff
1998 to call new exch1 S/R ; update Makefile and .cvsignore.
1999 - replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove
2000 exch2_xy_rx later)
2001 Note: after updating your code, need to run "make clean" in eesupp/src
2002 o test experiment bottom_ctrl_5x5:
2003 new output_adm.txt with fewer grdchk & less monitor output.
2004 o model/src:
2005 remove the call to ini_cori in initialise_varia.F (just keep the usual one
2006 in initialise_fixed.F). More consistent with coriolis & horizontal grid
2007 beeing treated in the same way (ini_grid is not called a 2nd time).
2008 o pkg/exf:
2009 - rewrite exf_bulk_largeyeager04.F for better vectorization, changes
2010 global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated
2011 - fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now)
2012 - cosmetic changes to exf_bulkformulae.F to make it look more like
2013 exf_bulk_largeyeager04.F
2014 o eesupp/src (exch-1):
2015 - Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1).
2016 - Separate buffer filling and MPI sending: allow EXCH-1 to work for local
2017 array (non-shared) when using MPI+MTH. Also reduces number of BARRIER
2018 (even without using MPI).
2019 - Message mode: move RecvAck setting (indicator of buffer being ready)
2020 from send_put to recv_get S/R (was useless before, but not sure if
2021 it's much more useful now);
2022 - Switch the order of sync: MPI-proc 1rst and then threads;
2023 - take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead.
2024 - fix AD code for communication mode ='get' (but not used).
2025 o model/src:
2026 initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does
2027 not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp).
2028 o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API
2029 o pkg/ctrl: require a specific set of control variables and exf-flags for
2030 adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied)
2031 o model/src:
2032 a) 1rst version of a new driver S/R to turn-off output freq and flags after the
2033 1rst forward sweep, to avoid over-writing output files during recomputations
2034 recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?)
2035 b) 2nd version:
2036 - add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO);
2037 - switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast,
2038 writePickupAtEnd) + seaice & ptracers output;
2039 - do not switch off MNC flags (otherwise, won't get admonitor netcdf file)
2040 o model/src:
2041 - new S/R rotate_uv2en_rl (..._rs) that rotates vector fields.
2042 o pkg/exch2:
2043 - remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ;
2044 - add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch).
2045 o pkg/autodiff & exch2:
2046 process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF
2047 (for now, only if ALLOW_EXCH2 is defined).
2048 o pkg/autodiff:
2049 - include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F
2050 (not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly.
2051 + clean-up comments (_RS is not always real*4)
2052 - fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R)
2053 - add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2:
2054 was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs.
2055 o testreport (AD-tests):
2056 no longer link files from dir "../input" (1rst link files from
2057 "../input_ad.[xx]" if secondary test "xx" and then from "../input_ad")
2058
2059 checkpoint62f (2010/04/29)
2060 o model/src/the_main_loop.F:
2061 adjust store directives for seaice evp and multicategory according to
2062 pkg/ecco/the_main_loop.F
2063 o adjoint:
2064 global_sum_ad was incomplete (noted many times by many people ;)
2065 nice description by Jean U. as follows:
2066 * allreduce(var) in global_sum.F can be interpreted as
2067 reduce(sum) followed by broadcast of sum.
2068 * The adjoint of that is
2069 sum(adjoint) followed by broadcast(summed adjoint value)
2070 or in other words, allreduce(sum, adjoint vars)
2071 We were missing the sum(adjoint)!
2072 Benign, except(!) for "global" scalars appearing in tile loops (bi,bj)
2073 (noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset).
2074 The fix should produce 16-digit accuracy between
2075 single-CPU multi-tile (e.g. nSx=2, nPx=1) and
2076 multi-CPU single-tile (e.g. nSx=1, nPx-2)
2077 We'll probably change this yet again shortly
2078 o eesupp/src:
2079 - fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?)
2080 o pkg/icefront
2081 - ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving
2082 specification of addmass array based on a 2D field, which is added
2083 at bottommost wet level at each horizontal location.
2084 o model/src:
2085 horizontal grid initialisation (other than curvilinear): add code for Exch2 IO
2086 layout; (not always compatible with delX,delY setting; commented out for now).
2087 o pkg/exch2:
2088 change tile to processor setting (case nSy*nPy > 1): allows default model mapping
2089 (myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config.
2090
2091 checkpoint62e (2010/04/15)
2092 o pkg/obcs:
2093 - fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert).
2094 o pkg/dic:
2095 -fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up;
2096 (note: not presently tested in any forward verification exp.)
2097 update tutorial_global_oce_biogeo AD output file.
2098 o pkg/exf:
2099 - account for the variation of albedo as a function of zenith angle
2100 by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h
2101 o build_options:
2102 - rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas"
2103 o pkg/dic:
2104 change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart:
2105 - use binary pickup file for restart;
2106 - initialise atmos-CO2 box from dic_pCO2 parameter;
2107 - fix multi-threaded.
2108 o pkg/rbcs:
2109 - clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ;
2110 change (+ fix IO calls) type of array RBC_mask from _RL to _RS.
2111 - add RBCS to exp4 passive tracer 01 (rbcs was previously untested)
2112 and update output.txt
2113 o pkg/kpp:
2114 - add diagnostics for KPP non-local flux of Temp, Salinity and pTracers;
2115 - change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS
2116 (= ratio of KPP non-local (salt) flux relative to surface-flux) when
2117 using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat ');
2118 - change pkg/offline to read-in average KPPghat*KPPdiffKzS from file
2119 KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile).
2120 o pkg/offline:
2121 fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor
2122 (bug was added in version 1.10 on 2007-08-23).
2123 o pkg/offline:
2124 - no need to specify periodicExternalForcing, etc ... to use offline pack
2125 - offline input files no longer just single prec --> parameter offlineLoadPrec
2126 o verification/lab_sea:
2127 change AD test to multi-tile setup and update all 4 AD output.
2128 NOTE: while cost function values remain very similar,
2129 gradients are very different, although gradient checks are self-consistent
2130 Should try to get to the bottom of this (cost function summation order?)
2131 o pkg/dic:
2132 in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid
2133 a weakness of TAF that drops part of double precision in log10 derivative.
2134 <= changes removed since problem has been fixed in current TAF version 1.9.71
2135 update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo.
2136 o pkg/ecco:
2137 add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F
2138 update all 4 lab_sea AD output.
2139
2140 checkpoint62d (2010/03/22)
2141 o build_options:
2142 remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles.
2143 o remove unbalanced quote (single or double) in commented line of source code
2144 (may cause some warning with some preprocessor/makedepend versions).
2145 o pkg/seaice:
2146 fix seaice_model.F for adjoint (gael) and update AD results of experiments
2147 lab_sea (std + evp + noseaicedyn) and offline_exf_seaice.
2148 o testreport:
2149 add option '-runonly' (short: '-ro') to just do the run part (without make).
2150 o eesupp: remove JAM communication code (obsolete).
2151 o add option to genmake2 & testreport to switch "_RS" type to "real*4"
2152 (if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return
2153 to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1
2154 (update also the output).
2155
2156 checkpoint62c (2010/03/02)
2157 o tools/build_options :
2158 move (some) old optfiles from build_options/ to build_options/unsupported/
2159 o model/src and pkg/exf
2160 surface relaxation -- separating data and data.exf options
2161 The point is to ensure that we specify the surface relaxation
2162 either in data or in data.exf (but not half and half) and to
2163 avoid an accidental relaxation to 0 (which happened if a time
2164 scale was specified but the file name was left empty)
2165 o model/src model/inc and pkg/mom_common
2166 ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity
2167 => addition to the viscosity field as computed by others schemes
2168 o tools/build_options:
2169 - rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile)
2170 but keep the former optfile for few weeks for smooth transition
2171 o pkg/ecco
2172 - allow user defined cost function contributions
2173 CPP: ALLOW_USERCOST_CONTRIBUTION
2174 USAGE: compute contributions in cost_usercost_all.F
2175 - note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was.
2176 the two options are complementary.
2177 o pkg/smooth
2178 - migration from contrib to the main repository
2179
2180 checkpoint62b (2010/01/26)
2181 o pkg/monitor:
2182 - change back mon_printstats_rl.F & mon_stats_rl.F and add a stop
2183 (in case someone forgot to update customized pieces of code)
2184 o nonHydrostatic:
2185 - add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested);
2186 - add a simple 2-D experiment (short_surf_wave) to test it.
2187 o pkg/icefront:
2188 adding the shell of, and the hooks to, a new package that
2189 will model melting and freezing of vertical glacier ice fronts
2190 o momentum:
2191 add diagnostics of momentum tendency from Hydrostatic pressure gradient
2192 (without surf.pressure term: would need a 2nd filling since implicit term).
2193 o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace
2194 two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR
2195 cannot deal with the former
2196 o cleaning:
2197 - remove all (except OpenAD) old TLM output from results_ad dirs.
2198 - remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R)
2199 - comment out maskH definition (replaced by maskInC)
2200 o pkg/monitor:
2201 - change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl
2202 & mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs.
2203
2204 checkpoint62a (2010/01/15)
2205 o model/src:
2206 - bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4)
2207 o pkg/diagnostics:
2208 - add optional level number diagnostics (i.e., level number to be define
2209 explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X".
2210 - strictly check for valid parser-code(10) ;
2211 - check if adding diag to the list from the right place.
2212 o pkg/longstep:
2213 - change parameters and fix tracer conservation with rstar/nonlinear free surface
2214 o diagnostics:
2215 - in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer
2216 S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics.
2217 o pkg/diagnostics:
2218 - Add option for writing vertical integral (sum of selected levels) of an output
2219 field instead of writing output field levels. Activate this option on a per
2220 output-file basis, by setting the 2nd character of fileflag to 'I'.
2221 - Add field-specific information relative to level integral in 3rd postion
2222 of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate
2223 vertically (x level-thickness x hFac), "r"=same but without hFac.
2224 o do_the_model_io:
2225 - pass end-of-model-run flag as argument, from forward_step to diagnostics_write:
2226 in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before
2227 writing pickups and stopping.
2228 o pkg/diagnostics (for now, only with mdsio):
2229 - write time information to meta file (and modify accordingly rdmds.m) :
2230 time-averaged diagnostics output: write starting and ending time of the
2231 time-averaging interval ; snap-shot diagnostics output remains unchanged;
2232 o pkg/timeave:
2233 - S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously
2234 always Nr), now assumed to be equal to number of levels of averaged field;
2235 only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F
2236 o pkg/sbo:
2237 - fix ocean bottom pressure global-average & 2-D time-ave output (was
2238 neither initialised nor filled).
2239 - add starting iteration in suffix of global-average output file
2240 (to avoid over-writing the file after a restart)
2241 - use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb).
2242 o time-average:
2243 - use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj)
2244 (pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf,
2245 ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice)
2246 this fix DIC_COST cumulative-time array (previously: bi,bj,k)
2247 - fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice)
2248 - fix missing accumulation for pkg/opps.
2249 - cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0)
2250 (pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81);
2251 - fix initialisation of time-ave vars and do only full time-step increment
2252 (i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81);
2253 o pkg/layers:
2254 - use standard RW pkg S/R to write the output
2255 and remove local write_fld version (which had a problem).
2256 - use simple cumulative-time array (no level index) to fix time-ave S/R calls.
2257 - fix LAYERS_CALC argument list.
2258 o pkg/timeave:
2259 - store cumulative-time in a simple tiled array (drop the level index)
2260 - add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array.
2261 o pkg/ocn,aim_compon_interf
2262 - changes for multi-threaded coupled run. (tested with ifort-11 on danton)
2263
2264 checkpoint62 (2009/12/23)
2265 o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output.
2266 (was not previously tested in any other exp.)
2267 o pkg/monitor:
2268 - clean-up _RL/_RS version: add specific S/R for statistics with mask & volume:
2269 mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one
2270 (mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics.
2271 - use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F).
2272 - change del2 calculation.
2273 - use interior masks (instead of maskH, <- to be remove).
2274 - shorter monitor suffix for forcing stats ("forcing" instead of "extforcing").
2275 o mask & obcs:
2276 - define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S).
2277 - move global area computation from ini_masks_etc.F to ini_linear_phisurf.F
2278 (called after packages_init_fixed)
2279 o pkg/obcs:
2280 - move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once.
2281 Fixes bug in obcs+exf with nSx*nSy.GT.1
2282 - fix multi-tile handling in obcs balance code
2283 o nonHydrostatic:
2284 - Implement AB-3 for non-hydrostatic vertical momentum ;
2285 (change ordering of var. stored in pickup file when using NH)
2286 - move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D.
2287 - add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x
2288 (in prep. for new NH free surface form).
2289 o pkg/obcs:
2290 add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe
2291 o model/src:
2292 fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography
2293
2294 checkpoint61z (2009/12/01)
2295 o nonHydrostatic:
2296 Fix missing vertical flux of vert. momentum near surface (k=1). This fixes
2297 a spurious source of energy in simple baroclinic adjusment test case.
2298 Update all non-hydrostatic exp output.
2299 o model/src (3-d solver):
2300 Change again 3-D solver free-surface RHS term when exactConserv=T:
2301 simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1
2302 (which was not the case with previous formulation).
2303 To recover previous version, just reset "oldFreeSurfTerm" to previous value.
2304 Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW.
2305 o nonHydrostatic:
2306 - compatible with implicDiv2Dflow < 1 ; + implement implicit factor
2307 for Non-Hydrostatic pressure gradient (similar to implicSurfPress).
2308 - change 3-D solver to work with r* (for now, only with linear free-surf.)
2309 - add few debug diagnostics (cg3d_x, residual)
2310 o model/src:
2311 fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b).
2312 update output of exp. global_ocean.cs32x15.viscA4
2313 o update output of exp. global_ocean.cs32x15.icedyn after removing
2314 #define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h
2315 o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
2316 o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output
2317 for complex grids, for now only to "state", "adstate", "adexf", "adseaice"
2318 o model: add Christopher Wolfe's implemetation of the single reduction cg2d
2319 (d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and
2320 runtime flag useSRCGSolver. Modify verification experiment global_with_exf
2321 to test this code
2322 o pkg/cd_code:
2323 Change defaut D-grid time-stepping to get the same for D-grid momentum as for
2324 C-grid momentum. D-grid velocity used to be stepped forward in time with
2325 Adams-Bashforth only on surface pressure term. Tests show that using AB on
2326 D-grid coriolis term improves stability (as expected from CD-scheme paper).
2327 To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h).
2328 Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2),
2329 lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD),
2330 tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens.
2331 Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2,
2332 global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD.
2333 o pkg/obcs:
2334 - fix bug in initialisation (broken since Oct 1rst modification)
2335 for useOBCSprescribe without useEXF.
2336
2337 checkpoint61y (2009/11/15)
2338 o pkg/seaice
2339 - change (once again) the discretization for the evp solver: rather than
2340 squaring the averages of strain rates, average the squares to give
2341 a better approximation to VP behavior (in simple test); this breaks
2342 verification experiments that use EVP (lab_sea and lab_sea.hb87)
2343 --> update outputs
2344 o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit)
2345 to improve vectorization of adjoint code on TARGET_NEC_SX
2346 o verification/vermix:
2347 - change vermix to a more "classical" 1d column with high vertical
2348 resolution, seasonal heat flux forcing and constant wind forcing
2349 --> update outputs
2350 o pkg/seaice
2351 - fix diagnostics of principal stress components for EVP
2352 - add optional diagnostics of non-linear convergence for LSOR solver
2353 - make maximum zeta a runtime parameter
2354 o model/src (3-d solver):
2355 Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49),
2356 which consisted in removing the Surf. Non-Hydrostatic pressure from the
2357 whole column and adding it to Eta (inspired from Casualli, 1999):
2358 Only affects 3-D solver initial guess and only if using ExactConserv,
2359 but tests did show a degradation of solver convergence. For this reason,
2360 decide to disable this piece of code.
2361 to recover previous version, just set zeroPsNH = exactConserv (line 78).
2362 Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW
2363 o pkg/ggl90:
2364 - fix previous modif (unfortunatly has not been documented here).
2365 o pkg/seaice/autodiff:
2366 - add CPP flag to include clipping of zeta in EVP code;
2367 although clipping of zeta is not necessary for EVP and not recommended
2368 it was done by default, now clipping is disabled by default
2369 - modify computation and store zetaC/Z in seaice_evp for TAF
2370 - add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default)
2371 - change seaice_calc_viscosities/strainrates for better
2372 vectorization after AD by TAF
2373 - rearrange common blocks in SEAICE.h once again for easier dumps of
2374 adjoint output, adjust adcommon.h and g_common.h
2375 - change flux form of default advection scheme for better vectorization
2376 of adjoint code
2377 - modify lab_sea/input.lsr to test the flux form of default advection
2378 scheme
2379 o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level
2380 transition in checkpoint61r)
2381
2382 checkpoint61x (2009/10/19)
2383 o adjoint: adding two new verification experiments
2384 * tutorial_global_biogeo: an online dic sensitivity experiment
2385 (work with G. Forget)
2386 * tutorial_dic_adjoffline: an offline dic sensitivity experiment
2387 (an update of the Dutkiewicz et al., 2006 paper)
2388 Both use the same CO2FLUX cost function, but different controls
2389 Gradient checks look good, but some recomp. could still be traightened out
2390 Should add xx_dic control variable to test at some point
2391 o model/src:
2392 add run-time parameters to check and/or mask initial Temp & Salt
2393 o pkg/ptracers:
2394 apply zonal filter (if used) to all passive tracers
2395
2396 checkpoint61w (2009/10/12)
2397 o adjoint:
2398 * update and finish work on adjoint of dic package (G. Forget)
2399 * start adjoint of offline package
2400 * bug fix for cube-sphere TLM code (active_file_g.F)
2401 o tutorial_global_oce_optim:
2402 now tested with 4 tiles (change data.grdchk and update output_adm.txt)
2403 and add SIZE.h_mpi for MPI testing
2404 o pkg autodiff
2405 - fix bug in autodiff_restore
2406 - make genmake2 remove comments and empty lines from ad_input_code.f in
2407 order to reduce file size (new script file remove_comments_sed)
2408 o allows to specify vertical profile of vertical viscosity (viscArNr)
2409 o pkg autodiff
2410 autodiff_ini_model_io: comment out writing of grid information to netcdf
2411 files, because at this time the grid fields are a bunch of zeros
2412 (this is analogous to ini_mnc_vars.F)
2413 o pkg seaice/autodiff:
2414 left-over from removing the 3-time-level fields:
2415 - small rearrangement of common blocks (SEAICE.h)
2416 - fix field declaration in order to get meaningful output in
2417 adseaice.*.nc (adcommon.h)
2418 o pkg obcs:
2419 - go through NH code only if nonHydrostatic=T
2420 - fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart)
2421 - move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields
2422 => Update output of experiment seaice_obcs
2423 - useOBCSbalance: code is wrong with multi-tile / proc: add a stop.
2424 - fix NH+Orlanski restart (add wvel OBC value in pickup file)
2425 - fix restart for useOBCSprescribe + useEXF
2426 o pkg ctrl
2427 - make obcs as control parameter work also with useSingleCPUio
2428 - replace a few sny and snx by Ny and Nx to be consistent with
2429 ctrl_set_globfld_x/yz.F
2430 o pkg seaice
2431 - re-introduce global field frWtrAtm for the case of
2432 ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F)
2433 - catch the case of an empty filename in seaice_cost_init_fixed.F
2434 o pkg ecco:
2435 - small bug fixes in the_main_loop
2436 . fix order of monitor arguments
2437 . change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY
2438 . move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so
2439 that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF
2440 - replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the
2441 imbalance diagnostics for wmean_h/sflux = 0
2442 - add actual values to f_obcsn/s/w/e in ecco_cost_final.F
2443 - catch the case of empty filenames in ecco_cost_init_fixed.F
2444 and ecco_readparms.F
2445 - fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta)
2446 to make this statement meaningfull in ecco_cost_weights.F
2447 o pkg zonal_filt:
2448 - change ZONAL_FILTER S/R interface (allows to filter 2-D fields)
2449 - when using rStar, filter uVel*hFacW instead of uVel
2450 (tested without topography: fix a Pb of growing instability with NLFS)
2451 o pkg/aim/thsice:
2452 -Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F
2453 (works as SST restoring)
2454 o pkg/thsice:
2455 -add specific parameter for salt restoring in slab mixed-layer
2456 (by default equal to the temperature restoring)
2457
2458 checkpoint61v (2009/09/21)
2459 o pkg/kpp:
2460 -add double diffusive contributions as a hack, turned off by default
2461 for now, and the code can be excluded with a CPP-flag
2462 EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX
2463 -add a verification experiments to "vermix" to test this code
2464 o pkg/mom_common:
2465 Move computation of length scales to mom_init_fixed.F (avoid recomputation
2466 at each time-steps*levels).
2467 o pkg/layers:
2468 Created a new package for computing volume fluxes in temperature or
2469 [not yet implemented] density layers, e.g. for calculating residual
2470 overturning circulations.
2471 o pkg/diagnostics:
2472 implement a RS type version for the set of DIAGNOSTICS-FILL subroutines
2473 o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option)
2474 o pkg/mdsio (& pkg/rw): rework high level S/R interface:
2475 To avoid mixing type (RS/RL) of input/output array argument,
2476 replace single mixed-type array with a pair from each type (RS/RL).
2477 o setting pickupSuff force to start from a pickup (even if nIter0=0): this
2478 is now implemented for all pkgs (previously only done for the main pickup)
2479
2480 checkpoint61u (2009/08/25)
2481 o pkg/obcs:
2482 - change OB?eta from _RS to _RL and put them into a separate commen block
2483 - add code to read OB?eta from a file via obcs_prescribe_read: the code
2484 compiles and does not destroy any other experiments, the data is read
2485 properly, but the code is not tested in actual applications
2486 o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to
2487 create a meaningful unit attribute for the time coordinate variable
2488 o pkg/ebm: add plenty of missing "_d 0" ;
2489 update results of experiment global_ocean_ebm (fwd + adjoint tests)
2490 Notes: several pieces of code only works for (very) specific set up
2491 (domain size, lat range, etc ...); should be documented & stop if one
2492 of those assumptions is not meet.
2493 o pkg/seaice: add missing "_d 0" in HSNOW initialisation
2494 update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests)
2495 and offline_exf_seaice (seaicetd + adjoint).
2496 o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC):
2497 update results of experiments: lab_sea (4 fwd tests + 3 adjoint),
2498 seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2).
2499 o few changes to pass when compiling with strick checking of arguments
2500 across S/R (allow to find few bugs in S/R calls).
2501 o pkg/seaice:
2502 - seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new
2503 2d-fields, for slightly better performance
2504
2505 checkpoint61t (2009/07/22)
2506 o pkg/seaice:
2507 - remove unused variables in seaice_evp
2508 - reduce number of SQRT in seaice_evp and seaice_calc_viscosities
2509 o eeset_parms.F, open_copy_data_file.F & ini_parms.F:
2510 named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT):
2511 each processor opens a different file (a fix from Matt).
2512 o cg2d:
2513 use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F :
2514 this reduces number of EXCH calls by 2 when using exch2.
2515 For now, keep previous size array for gc2d_nsa.F to avoid Pb with store
2516 directives and missing simple EXCH (exch_s3d_rx) adjoint code.
2517 o pkg/thsice:
2518 add code for Near Infra-Red albedo (from Jeff)
2519 (turned on with run-time flag: thSIce_calc_albNIR, in data.ice).
2520 o ini_model_io:
2521 move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F
2522 MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F
2523 to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice.
2524
2525 checkpoint61s (2009/06/30)
2526 o pkg/exch2 (exch2_rxN_cube*):
2527 remove last BARRIER (no need to synchronise after getting data from shared
2528 buffer (get) as long as any change to buffer (put,recv) is between BARRIER)
2529 o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH
2530 and generate new output (for the 2 tests) using default rotationPeriod.
2531 o pkg/exch2:
2532 - always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F
2533 (was already the case with AUTODIFF_EXCH2 defined)
2534 - add bj in exch2 arrays and S/R.
2535 - can now use pkg/exch2 for regular (non CS) set-up; switch test experiment
2536 MLAdjust to exch2 (identical results except with MPI -> truncation diff);
2537 o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep
2538 - adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY
2539 GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT
2540 - verification experiment natl_box.longstep
2541 o build_options: ifort+mpi_aces optfile (following Constantinos advise):
2542 allow different versions of ifort (8 or 9) and different versions
2543 of mpi (mpich or mpich2) to be used with the same optfile.
2544 requires to load a netcdf module and set MPI_INC_DIR (see comments inside
2545 optfile). Change testing scripts (example_scripts/ACESgrid) accordingly.
2546 o pkg/seaice:
2547 fix previous modif (3-level field removed) for old-pickup reading
2548
2549 checkpoint61r (2009/06/25)
2550 o pkg/seaice:
2551 - clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps:
2552 1. introduce fields for time step (N-1)
2553 2. do not use levels 2 and 3 anymore (but keep them)
2554 3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This
2555 includes changes to pkg/thsice/thsice_get_velocity.F,
2556 model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and
2557 pkg/obcs/obcs_apply_uvice.F.
2558 - completely remove code for leap-frog time stepping for second order
2559 advection
2560 - adjusted adjoint accordingly;
2561 gradient checks have improved by an order of magnitude!
2562
2563 checkpoint61q (2009/06/22)
2564 o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver
2565 - the boundary conditions along open boundaries are unclear, because the
2566 associated masks are set to zero and are thus treated as closed when
2567 applying the slip-boundary conditions.
2568 - move initialisation of grid variables from seaice_init_varia to _fixed
2569 o adding doc/diags_changes.txt
2570 o model/src:
2571 do_the_model_io: rename few pkg S/R which are called from do_the_model_io,
2572 to avoid "_diags" naming if no relation to pkg/diagnostics.
2573 ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF
2574 file and only call PLOT_FIELD_XYZ if debugMode=T.
2575 remove few PLOT_FIELD_XY calls outside initialisation.
2576 remove few unnecessary BARRIER.
2577 o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling
2578 of salt_plume package in Southern Ocean
2579 o pkg/thsice:
2580 - fix hOceMxL in overlap (needed for sea-ice advection);
2581 update output of experiment global_ocean.cs32x15.icedyn.
2582 o pkg/seaice:
2583 - make the (placeholder-)tracer IceAge a little more meaningful
2584 by avoiding ridging of age due to convergent ice flow
2585 - add diagnostics for surface temperature, atmospheric and oceanic
2586 heat flux, and atmospheric and oceanic ice growth
2587
2588 checkpoint61p (2009/06/10)
2589 o eesupp (global_max & global_sum):
2590 - add one more element to buffer (start at index 0) for GL_MAX/SUM output;
2591 - remove starting & endding barrier (no longer needed)
2592 o pkg/mdsio, writelocal:
2593 works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined
2594 (remove the STOP): uses shared buffer IO to store data from all threads
2595 and then let master-thread write nThreads tiles.
2596 o pkg/mdsio (read/write field):
2597 - tiled IO done in 1 piece (all levels at a time);
2598 - new header file "MDSIO_BUFF_3D.h" with 3-D buffers.
2599 - multi-threaded: allow to read/write local (non-shared) array
2600 (was already working with singleCpuIO ; now works also without);
2601 => no longer needs barrier call after reading a file (added inside
2602 mds_read/write field).
2603 - move barrier calls outside gather/scatter_2d to mds_read/write_field
2604 o pkg/obcs/exf
2605 - exf_getffieldrec.F: add a few ". _d 0" and
2606 add code to catch the case fldperiod = 0.
2607 - obcs_precribe_read.F: change if statements so that they match
2608 the variable type (_RL)
2609 - add a separate exf_iprec_obcs to exf_set_obcs (by default equal to
2610 exf_iprec) as part of namelist EXF_NML_01
2611 o pkg/mdsio:
2612 - read/write tiled (local) files: read/write 1-level tile chunk at a time
2613 (instead of segment of length sNx); expected to speed up tiled IO.
2614 o pkg/exch2:
2615 - take buffer copy from/to array out of S/R exch2_send/recv into new
2616 S/R exch2_put/get ; Exch of local variable now works with MPI+MTH
2617 (tested by removing commom block statement in SOLVE_FOR_PRESSURE.h).
2618 - ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get)
2619 - simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds
2620 (which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by
2621 including Topology header file (and common blocks).
2622 - implement EXCH_IGNORE_CORNERS in scalar exchange (rx1);
2623 remove 2nd exch call in exch2_s3d_rx (no longer needed).
2624 - document S/R arg. list (+ update some comments)
2625 o pkg/seaice:
2626 - added SEAICE_CLIM_AIR code, which permits modulation of surface air
2627 temperature and humidity over sea ice based on climatological values.
2628 - clean up computation of Hibler+Bryan (1987) stress coupling for the case
2629 of LSR (this change is expected to change the results slightly because now
2630 it uses slightly difference moduli from the second last LSR solution, but
2631 that is more consistent with the stress computations; this part of the code
2632 is not tested in the verification experiments)
2633 - fix diagnostics for flux of ice in case of B-grid
2634 - turn strain rates eij and press into global fields within global
2635 common block in SEAICE.h for more straighforward diagnostics
2636 - fix diagnostics for principal stress components, press, zeta, eta
2637 to give something meaning full
2638 o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate
2639 new output (all 4 tests) using default rotationPeriod.
2640 o pkg KPP:
2641 - add flag (LimitHblStable) to avoid limiting BL depth under stable conditions
2642 - fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1
2643 and normal grid from 1 to Nr)
2644 o Fix computations of L4rdt in mom_calc_visc.F
2645 o eesupp:
2646 new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg):
2647 should be called before a "stop" if we know that all process are going
2648 to stop; if one Proc does call this S/R, will hang in MPI_FINALISE.
2649
2650 checkpoint61o (2009/05/26)
2651 o pkg/exch2: change check_depths to issue just a warning (instead of error+stop)
2652 o model/src/ini_curvilinear_grid.F:
2653 compute angleSin/CosC when they are not read from a file
2654 o pkg/seaice:
2655 add pseudo time stepping for LSOR
2656 o pkg/exch2:
2657 temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW
2658 o pkg/seaice:
2659 Adding separate sea ice albedo, drag coefficients, and HO in Southern
2660 Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h
2661 o SingleCpuIO:
2662 fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used.
2663 o pkg/seaice:
2664 put exchanged variable in (local) common block for MPI+Multi-Threads
2665 to work (necessary with exch1, and for now with exch2 too).
2666 o verification: to get more experiments tested with mpi, mth and mpi+mth,
2667 change tiling of:
2668 aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15,
2669 hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope
2670 update output of exp:
2671 exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5),
2672 tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod)
2673 + ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU
2674 (note: output.txt generated on faulks using only 1 tile)
2675 o eesupp & mdsio (SingleCpuIO):
2676 - remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time
2677 parameter "W2_useE2ioLayOut" (read from file "data.exch2").
2678 Note: was not effective for globalFile & useSingleCpuIO=F; now fixed.
2679 - move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc).
2680 - fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same
2681 gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array).
2682 o pkg/exch2:
2683 - new code to set-up W2-Exch2 topology (replace matlab-topology-generator):
2684 read parameter file "data.exch2" if it exists; otherwise try default regular
2685 cube without blank-tile; new header file "W2_EXCH2_SIZE.h";
2686 - update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible
2687 with new code (not to be used, just as a backup solution).
2688 - add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2"
2689 in utils/exch2/input.
2690
2691 checkpoint61n (2009/05/12)
2692 o eesupp & mdsio (SingleCpuIO):
2693 - move mapping to global io-buffer inside gather_2d/scater_2d: this save
2694 memory (1 less 2D global RL array); skip 1 buffer copy; and only send/
2695 receive real*4 array (instead of real*8) to read/write 32.bit files.
2696 (new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S
2697 and remove new mapping S/R)
2698 o pkg/mdsio: in preparation for topology-generator within pkg/exch2:
2699 - Change declaration of SingleCpuIO buffer, reduced to only 1 dim.:
2700 xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h
2701 when using exch2. Add S/R to map global io-buffer to global model array.
2702 - uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt.
2703
2704 checkpoint61m (2009/04/29)
2705 o write_utils : change WRITE_1D_R8 to WRITE_1D_RL
2706 and add 3 other S/R for other types (R4,R8,RS).
2707 Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument.
2708 o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros):
2709 - ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ;
2710 - reduce number of macro definitions (keep only those which are used);
2711 can always call directly the corrresponding S/R if needed.
2712 - everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix
2713 _R4/_R8 to _RS/_RL when applied to _RS/_RL variable.
2714 Fixed wrong type of arg in:
2715 atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F
2716 ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F
2717 To fix: global_sum of var in common block is wrong (multi-threaded) in:
2718 dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F
2719 To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops)
2720 o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd
2721 "nlfs" mpi test is going to stop when checking for unconnected tile egdes.
2722 o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error
2723 o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile
2724 edges are closed (zero depth); might happen with "blank tiles";
2725 for now, disabled if using OBCS.
2726 o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi":
2727 link *_mpi files from "MODS" dir) to return to a strait-forward behavior.
2728 o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D)
2729 to reduce length of 1.D array print in STDOUT.
2730 o adjustment.cs-32x32x1: changed to oceanic test with 1 continent
2731 + use 48 tiles (16x8): this will allow to test "blank tiles".
2732 o start to test MPI + multi-threaded (change testreport to skip tests
2733 where number of tiles do not match).
2734 o genmake2: add option "-omp" to turn on Open-MP ;
2735 passed to testreport (if using -mth) ; merge few (*+mth) optfiles.
2736 o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them)
2737 and keep the original tile numbering. Note: compatible with old
2738 W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files.
2739
2740 checkpoint61l (2009/04/07)
2741 o Overlaps had been forgotten in calculating ijk keys : fixed
2742 o fix cyrus makedepend for gcc 4.4
2743 o experiment fizhi-cs-aqualev20:
2744 switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE)
2745 and generate new output. Note: new output is much closer to the old
2746 one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from
2747 the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007.
2748 o pkg/fizhi:
2749 - change to avoid indices going deliberately over array-bounds
2750 - remove unnecessary MPI stuff
2751 - perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY"
2752 - new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE:
2753 does not go over array-bounds and therefore returns reliable output.
2754 - in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls:
2755 this S/R has 4 output arguments, which are used inside "get_alarm";
2756 when it is called with the same variable "ndum" in place of several
2757 output arguments, this produces weird side effect inside "get_alarm"
2758 (e.g., datein=dates(n) is overwritten by timein=times(n) since both
2759 datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum"
2760 address) and produces error.
2761 o tools/gemake2: (March 27-29 2009)
2762 with option "-mpi": link *_mpi files from "MODS" dir (this is what
2763 testreport does).
2764 o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output
2765 o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F:
2766 update lab_sea.lsr & lab_sea.salt_plume results
2767 o pkg/seaice:
2768 Major overhaul of the LSOR solver: change discretization from original
2769 finite differences to finite volume. The old routine is still in the
2770 file seaice_lsr.F and can be turned on with the CPP-flag
2771 SEAICE_OLD_AND_BAD_DISCRETIZATION
2772 Along with this change, the discretization of the strain rates is changed.
2773 The same flag turns on the old discretization in seaice_calc_strainrates.F
2774 All verification experiments with seaice are affected (except for
2775 seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old
2776 results by setting the above flag.
2777 Further changes involve changes in defaults:
2778 - ALLOW_FLOODING is defined and turned on by default
2779 - SEAICEadvSnow = .true. is now the default
2780 - SEAICEadvSalt = .true. is now the default
2781 - SEAICEadvAge = .true. is now the default
2782 - SEAICE_clipVelocities = .false. is now the default
2783 (as per J. Zhang's recommendation)
2784 - B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE
2785 is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS
2786 - seaice_growth: replace computation of UG by a simple copy from wspeed
2787
2788 checkpoint61k (2009/03/18)
2789 o pkg/seaice: a few bug fixes mostly concerning the metric terms:
2790 seaice_lsr: fixed a few metric terms,
2791 affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs
2792 add more debugging diagnostics
2793 seaice_evp: removed superfluous many metric terms of FV discretization
2794 of stress divergence
2795 affects lab_sea, lab_sea.hb87
2796 seaice_ocean_stress: removed superfluous many metric terms of FV discretization
2797 of stress divergence for non-evp solver
2798 (this part is not tested anywhere)
2799 seaice_calc_strainrates: fixed a bug in no-slip boundary conditions,
2800 they were effectively only half slip
2801 affects lab_sea.hb87
2802 updated all relevant verification experiments (except lab_sea//output_adm.txt
2803 which was left over, but fails at level 7 & 6)
2804
2805 checkpoint61j (2009/03/17)
2806 o pkg/seaice: turn a few hard wired parameters into run time parameters
2807 o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model
2808 time in seconds as promised by the usints in seaice_monitor and exf_monitor
2809 o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids
2810 that are not cubed-sphere grids
2811 o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR
2812 o pkg/ctrl:
2813 fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low)
2814 o non-hydrostatic (calc_gw.F):
2815 fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec
2816 update output of exp. global_ocean.cs32x15.viscA4
2817 o remove backward compatibility for thetaMin,phiMin
2818 (replaced by xgOrigin,ygOrigin on Jan 27, 2009)
2819 o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the
2820 interpolated wind field not only for curvilineargrid=.true., but also
2821 for a rotated grid (rotateGrid=.true.)
2822 o pkg/exf: add capability to bypass interpolation for runoff
2823 by setting yet another CPP-flag
2824 o eesupp/src, B-grid exchange:
2825 add simple (6 tiles, non MPI) CS exch + standard interface S/R.
2826 o autodiff
2827 new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV
2828 allows to switch to single-prec common blocks;
2829 corresponding switch occurs in tamc.h, integer isbyte
2830 TAF store directivs "byte" and "kind" seem equivalent;
2831 Most tamc.h have been updated correspondingly.
2832
2833 checkpoint61i (2009/02/13)
2834 o autodiff:
2835 fix autodiff_sore/_restore indices for obcs
2836 (spotted by I. Hoteit, M. Mazloff)
2837 o pkg/autodiff, pkg/ctrl:
2838 Add flag to reduce all tapelev I/O to single-prec.
2839 In data.ctrl set
2840 doSinglePrecTapelev = .TRUE.
2841 o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2:
2842 check in hack for SX8 compiler (for dxV, dyU); remove it afterwards.
2843 o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for
2844 real fresh water flux (not yet)
2845 o pkg/mdsio & rw:
2846 - add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta)
2847 - add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX.
2848 o pkg/flt:
2849 - replace FLT_INIT by 3-steps standard initialization S/R: readparms,
2850 init_fixed & ini_varia.
2851 - clean-up & simplify linear interpolation S/R:
2852 move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid.
2853 - fix some indices (mainly vertical index) ; add IMPLICIT NONE.
2854 - more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R.
2855 - add vert. coordinate & horiz. indices to output files.
2856 - change vertical position in initial condition, from index to depth [m].
2857 - store horizontal (decimal) indices i,j in common block (instead of coord. x,y)
2858 (easier to get to a curvilinear grid) ; delX,delY no longer used.
2859 o pkg/ggl90: a few modifications:
2860 - fix bottom boundary condition, and interpolation of KappaE
2861 near top and bottom
2862 - use same set of viscosity/diffusivity for TKE/momnetum/tracer
2863 - add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH)
2864 - add a few options for mixing-length upper limit (--> mxlMaxFlag)
2865 o rename thetaMin,phiMin -> xgOrigin,ygOrigin
2866 (maintain temporary backward compatibility, until next checkpoint)
2867
2868 checkpoint61h (2009/01/27)
2869 o pkg/diagnostics with "periodic averaging diagnostics":
2870 fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output.
2871 o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82
2872 o pkg/obcs: fix loop ranges for balancing code
2873 o pkg/flt:
2874 - improve criteria for finding which tile owns a float.
2875 - fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case.
2876 o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg
2877 aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling
2878 with ocean biogeo)
2879 o pkg/flt:
2880 - do some cleaning and fix the restart ;
2881 - add output.txt in flt_example/results to get this pkg tested.
2882 o genmake2: add an EXTENDED_SRC option and flag.
2883 for now, cannot be turned on on command line (only through genmake_local)
2884 o pkg/mdsio: read/write vector:
2885 - singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS
2886 - singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR
2887 & MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS.
2888 - affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO)
2889 (drop to 4 digits matching for grad). But this test does not look very
2890 reliable (was already failling on eddy, fc5, at 6.digits). Update output.
2891
2892 checkpoint61g (2008/12/29)
2893 o pkg/flt:
2894 - move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name)
2895 + make OPTIONS file more standard.
2896 - rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name)
2897 - fix _BYTESWAPIO CPP-Flag
2898 - standard reading of file-parameter "data.flt"
2899 - fix argument list of S/R FLT_RESTART
2900 still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F
2901 o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell
2902 o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to
2903 a still unfixed compiler/optimization bug
2904
2905 checkpoint61f (2008/11/21)
2906 o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ;
2907 update results of global_ocean.cs32x15.icedyn test.
2908 o move getcon.F from model/src to pkg/fizhi.
2909 o pkg/exf: add parameter for extrapolation of temp up to the surface
2910 and option to prevent negative evap (in bulk_largeyeager04 only).
2911 o Prather Advection scheme: fix tracer conservation for divergent flow
2912 (e.g., when using NonLin Free-Surface).
2913 o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead
2914 o gmredi (Visbeck-variable-K):
2915 - add more parameters to Visbeck-variable-K.
2916 - use a 5 points average for dSigmaR in Visbeck-K calculation
2917 (more "homogenous": same stencil and same weights as in dSigmaH)
2918 - update output of ideal_2D_oce experiment.
2919 o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4
2920 (#undef REAL4_IS_SLOW)
2921 - pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4
2922 coordinate variable
2923 - pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables
2924 (surface forcing fields), removes some of the functionality
2925 - model/src/write_grid.F: write _RS variables as RS-netcdf variables
2926 - model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but
2927 probably not all: copy _RS surface flux fields to RL field before
2928 calling DIAGNOSTICS_FILL
2929 - model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into
2930 real*4 (CALL EXCH_*_RS) versions.
2931 - tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1
2932 (generate new output).
2933
2934 checkpoint61e (2008/10/23)
2935 o gmredi (Visbeck-variable-K):
2936 - fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h
2937 - change computation of Visbeck-K where Slope > Smax :
2938 now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct)
2939 previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output.
2940 o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic
2941 to be the same as with Z-coord. (i.e., m/s & no-units respectively).
2942 o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc)
2943 o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz
2944 does not become too large (to avoid precision problems in implicit-diffusion
2945 solver); update ideal_2D_oce output.
2946 o pkg ggl90:
2947 - in ggl90_cal.F: compute only one set of visc/diff, used to
2948 step forward TKE/T/S/momentum
2949 - default value of GGL90viscMax/GGL90diffMax larger and equal (to
2950 have Prandlt =1)
2951 o gmredi (fm07):
2952 - add lower limit on Transition layer thickness + lower limit on 1/lambda
2953 - allow to set few more params from data.gmredi
2954 o pkg ggl90:
2955 - add missing sqrt(2) factor in computation of mixing length
2956 scale in ggl90_calc.F
2957 (see Eq. (2.35) in Blanke and Delecluse, JPO, 1993)
2958
2959 checkpoint61d (2008/09/25)
2960 o adjoint modifs
2961 - adapt to new field rhoInSitu
2962 - allow to revert from StoreDynVars2D, StoreDynVars3D
2963 to individual fields
2964 (switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D)
2965 o store 3-D (in-situ) density in commom block (DYNVARS.h)
2966 - save 1 rho computation.
2967 - no longer modify T & S inland when using down_slope pkg.
2968 o gad_som : allow to switch to SOM advection for T & S without corresponding
2969 pickup files (using new S/R: MDS_CHECK4FILE).
2970 o keep removing _BEGIN/_END_MASTER between MDSIO S/R call
2971 (for useSingleCpuIO to work in multi-threaded)
2972 o pkg/shelfice:
2973 - disentangle parameters: retire shelfIceFile in data/PARM05 and substitute
2974 with SHELFICEtopoFile in data.shelfice
2975 - move code for reading ice shelf topography and modifying hFacC into separate
2976 subroutines of the shelfice package
2977 - separate initialisation of "fixed" and "variable" variables
2978 - kTopC is not (yet) replaced by kSurfC, although this is possible
2979 o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s
2980 o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors)
2981 and rename:
2982 ini_phiref.F --> set_ref_state.F (+ set anelastic factors)
2983 ini_reference_state.F --> load_ref_files.F (- set anelastic factors)
2984 o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst)
2985
2986 checkpoint61c (2008/08/30)
2987 o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid"
2988 to add mass source/sink of fluid in the interior (3-D generalisation
2989 of oceanic real-fresh water flux).
2990 o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max)
2991 o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before)
2992 o new pkg: down_slope
2993 density-driven downsloping flow parameterisation (Tellus, 1999, 412-430).
2994 - presently, modify T & S inland (dwnslp_calc_rho.F).
2995 can be avoided if rho was stored in common bloc and used in calc_phi_hyd.
2996 - implementation for ocean in P-coords not tested.
2997 - add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg.
2998 o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC)
2999 (to facilitate conversion of oceanic pkg to p-coordinate).
3000 o change FIND_RHO to FIND_RHO_2D :
3001 pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK.
3002 o new pkg: cheapaml
3003
3004 checkpoint61b (2008/08/05)
3005 o exch2:
3006 change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS)
3007 - no longer depend on the order sequence (N,S,E,W).
3008 - 3rd exchange no longer needed (tested with 24 tiles).
3009 - same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff)
3010 - exch_UV_A-grid readily available (but not yet tested).
3011 comment out 3rd exch call and remove copy of V to U at SE & NE face-corners
3012 (both are no longer needed) in exch_uv: no effect in forward run; but
3013 get truncation error differences with adjoint exch.
3014 o exch2:
3015 - change index-bounds storage (moved from target to local tile,
3016 more intuitive this way) ; rename/remove some variables.
3017 - change utils/exch2/matlab-topology-generator & code_mods accordingly.
3018
3019 checkpoint61a (2008/07/29)
3020 o exch2/matlab-topology-generator:
3021 fix bug in index bounds for N-S internal exchange (hard to tell if this
3022 had any effect on the solution).
3023 o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf
3024 is exceeded
3025 o testreport: modify syntax of awk, so that it works also with
3026 awk, and not only with nawk and gawk
3027
3028 checkpoint61 (2008/06/24)
3029 o autodiff
3030 Change default for TAF usage by removing argument '-nonew_arg'
3031 This changes TAF subroutine argument list (ordering of active var.)
3032 Omission of this flag leads to incompatibility w.r.t. TAMC
3033 To restore TAMC-compatibility, need following modifs:
3034 * use adoptfile tools/adjoint_options/adjoint_tamc_compatibility
3035 * use CPP option #define AUTODIFF_TAMC_COMPATIBILITY
3036 Tested TAF version is 1.9.22
3037 N.B.: exch2 hand-written adjoint code currently not TAMC compatible
3038
3039 checkpoint60 (2008/06/19)
3040 --->>> This is the last checkpoint for which generating the adjoint
3041 --->>> is done via the TAMC-compatibility TAF-flag "-nonewarg"
3042 --->>> by default.
3043 --->>> Future checkpoints will ommit this flag by default.
3044 o pkg/generic_advdiff, os7mp: simplify and avoid division by zero.
3045 o pkg/grdchk: Add gradient check to etan0 perturbations.
3046 o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK).
3047 o pkg/autodiff: more flexibility in zeroadj.
3048 model/src: modifying do_oceanic_phys.F accordingly.
3049 o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation.
3050 o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option
3051 special setup of gmredi for which the adjoint is stable
3052 enough for parameter optimization.
3053 o bridging the gap between eddy stress and GM.
3054 -> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi)
3055 along with a change in CPP option (now ALLOW_EDDYPSI).
3056 -> when using GM w/ GM_AdvForm:
3057 The total eddy streamfunction (Psi = eddyPsi + K x Slope)
3058 is applied either in the tracer Eq. or in momentum Eq.
3059 depending on data.gmredi (intro. GM_InMomAsStress).
3060 -> ALLOW_EDDYPSI_CONTROL for estimation purpose.
3061 The key modifications are in model/src/taueddy_external_forcing.F
3062 pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F
3063
3064 checkpoint59r (2008/05/29)
3065 o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array
3066 from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F);
3067 fix option to read coriolis(@ cell-corner) from files with CS-grid.
3068 o pkg/mnc: add some attributes to standard 1D-coordinate variables
3069 o pkg/diagnostics: enforce missing_value attribute for scalar variables at
3070 mass points, when using mnc for output
3071 - add runtime parameter (missing_value, missing_value_int) to override
3072 default (which is the value of getcon('UNDEF'))
3073 o pkg/mnc: prepare mnc for the actual use of missing values with the
3074 diagnostics package: small fix in mnc_cw_readwrite.template and more
3075 initialisation of never used fields
3076 - replace mnc_common.h and mnc_id_header.h with corresponding upper case
3077 versions
3078 o pkg/thsice/thsice_ini_vars.F added default initial values so that
3079 thermodynamics sea ice solver does not blow up when some initial fields
3080 are missing.
3081 o move from external_forcing_surf.F to ini_forcing.F
3082 the p-coord. hack consisting in using pLoad to set phi0surf ;
3083 update output of tutorial_global_oce_in_p (affected @ truncation level).
3084 o Freshen up a bit hs94.1x64x5, notably:
3085 remove rotationPeriod and tRef=5*0. (adjoint only), and add
3086 exactConserv=.TRUE.
3087 o pkg/generic_advdiff:
3088 change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only
3089 applies to files where Temperature & Salinity 2nd Order moments are used.
3090 o pkg/ptracers: add second-order moment advection schemes (80 and 81);
3091 this uses a dynamically allocated internal state data structure
3092 (#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h)
3093 and requires a fortran 90 compiler
3094
3095 checkpoint59q (2008/05/06)
3096 o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3)
3097 (from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977)
3098 o Refresh tutorial_global_oce_biogeo, notably:
3099 - change bathymetry (put back seamounts in ACC, use hFacs)
3100 - change EOS (POLY3 --> JMD95Z)
3101 - use Bryan-Lewis vertical diffusivity
3102 - use multidimensional advection
3103 - remove old virtual virtual in dic pkg, now done through ptracer pkg
3104 - change a couple of parameters in dic pkg
3105 o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F
3106 o pkg/obcs: change default to OBCSfixTopo = .true.,
3107 - set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result
3108 - replace "debugMode" with "debugLevel .GE. debLevB"
3109 o implementation of TAF directives for gchem,cfc,dic
3110 o remove "exp5" (replaced by tutorial_deep_convection).
3111 o pkg/obcs: add code to fix topography gradients normal to open boundaries;
3112 this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms;
3113 the code can be turned on by setting OBCSfixTopo = .true. in data.obcs
3114 --> changes results in exp4, seaice_obcs
3115 o tutorial_deep_convection :
3116 update the set-up and increase resolution and domain size ; start
3117 from pseudo initial conditions = output at t=120mn in order to see
3118 something happening when running testreport.
3119 o pkg/seaice: add os7mp as an advection scheme
3120 add check for advection schemes
3121 add a flag for restoring T and S underneath sea ice
3122 o pkg/my82: add netcdf-support and diagnostics
3123 o thsice pkg:
3124 - Now hsMax limits snow height by turning it into ice following
3125 flooding scheme (and now conserving energy)
3126 - Slight rewriting of the formula in thsice_calc_thick.F
3127 - Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos
3128 --> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice
3129
3130 checkpoint59p (2008/04/10)
3131 o gchem / dic / cfc :
3132 - add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h);
3133 - add new parameter files: "data.dic" & "data.cfc" ;
3134 - various re-arrangement in initialisation & header file ;
3135 - fix tutorial_global_oce_biogeo for multi-threaded test.
3136 o pkg/dic: test for "pickup_dic" file when restarting ;
3137 if no pickup-file, can restart with a re-initialised pH (same as it did
3138 before) providing pickupStrictlyMatch is set to False.
3139 o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP
3140 + fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP
3141 o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2
3142 and staggerTimeStep is off (needed for stability of Internal-wave dynamics).
3143 o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax,
3144 & lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers
3145 (note: not clear to me what lambdaTr1ClimRelax is still used for ...)
3146 o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which
3147 scheme to use for vorticty-term ;
3148 - compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F
3149 (with default selectVortScheme, return to original discretisation)
3150 - remove weird combination (e.g.: upwindVorticity & highOrderVorticity)
3151 o pkg/seaice: add a line to the summary to indicate grid type (B/C)
3152 o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the
3153 bottom ; only used with variable horizontal viscosity and non-hydrostatic.
3154 also fix diagnostics VISCAHW & VISCA4W.
3155
3156 checkpoint59o (2008/03/07)
3157 o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran).
3158 o change the loop ordering in most gad_*_adv_x.F to improve vectorization:
3159 move a few statemens out the main loop into separate loops
3160 o pkg/shelfice:
3161 - sort out freshwater flux; convert freshwater fluxes to mass fluxes
3162 (kg/m^2/s), does not break tests, because in verification/isomip,
3163 rhoConstFresh=rhoConst (by accident)
3164 - rearrange computation of tLoc, sLoc, pLoc to make code more efficient
3165 - move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into
3166 new file model/src/seawater.F, so that they are available for all pkgs.
3167 - convert potential temperature into in-situ temperature. This changes the
3168 isomip tests => update tests
3169 o add a flag writePickupAtEnd (default=true) to be able to suppress
3170 writing a pickup at the last timestep
3171 o tools/mpack-1.6 :
3172 - disable automake (not working) and autoconf (not needed).
3173 - update to version 1.6.4 which fix MD5 code on some 64 bits platforms
3174 also cleaner with much less compilation warnings.
3175 o pkg/profiles:
3176 rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg
3177 (for "less than 32 characters name" compiler requirement)
3178 o pkg/obcs and pkg/exf: added capability to specify seaice open boundary
3179 conditions that have a different sampling frequency than S/T/U/V obcs
3180 o pkg/diagnostics (stats-diags):
3181 - fix global Min/Max in case 1 processor get only empty tiles
3182 o genmake2: replace (4 times)
3183 make genmake_tc_1.o >> genmake_warnings 2>&1
3184 with
3185 COMM="$CC $CFLAGS -c genmake_tc_1.c"
3186 echo $COMM >> genmake_warnings
3187 $COMM >> genmake_warnings 2>&1
3188 to make genmake2 always see the value of CC as specified in the optfile.
3189 o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid.
3190 - add diagnostics for 1srt & 2nd Order moments and sub-grid variance.
3191 - modify verification advect_cs test to test SOM-advection on CS-grid.
3192 o pkg/ctrl:
3193 - Rewrite of ctrl_map_ini_ecco.F,
3194 introducing a generic routine (ctrl_map_ini_gen.F).
3195 - Modification of ctrl_bound/adctrl_bound handling control vector bounds.
3196
3197 checkpoint59n (2008/02/09)
3198 o pkg/diagnostics: for large number of diagnostics, store diagnostic mate
3199 number in dedicate array "hdiag":
3200 - new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST
3201 with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST.
3202 - many small changes (integer format) for large number of diagnostics
3203 - start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with
3204 a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23.
3205 o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For
3206 usingSphericalGrid, this allows to define the rotated grid coordinates
3207 via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the
3208 geographical coordinates according to the inverse of the rotation defined
3209 by the Euler angles, so that Coriolis parameter and online-interpolation by
3210 exf works with the geographical coordinates on XC/YC/XG/YG.
3211 Naturally, this feature does not work with all packages, so some
3212 combinations are prohibited in config_summary (flt, flt_zonal, ecco,
3213 profiles), because there the coordinates are assumed to be regular
3214 spherical grid coordinates.
3215 o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc:
3216 - introduce isopycnal diffusion coefficient control.
3217 o tools/adjoint_options:
3218 - additional control vector components.
3219 o pkg/mnc: have mnc create marginally meaning full coordinate variables
3220 (that is the grid indices) if usingCurvilinearGrid and NOT EXCH2
3221 o pkg/mypackage:
3222 - add example of read/write pickup for state-var ;
3223 - add entry points to the main code for state-vars diags & write-pickup.
3224 o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year
3225 transitions for useExfYearlyFields
3226 - add new subroutine that determines the file to read from for
3227 use*YearlyFields = .TRUE. and .FALSE.
3228 - add a verification experiment to global_with_exf that tests
3229 useExfYearlyFields with USE_EXF_INTERPOLATION defined
3230 o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in
3231 analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new
3232 subroutines (which could be generated from a template, because they are
3233 almost identical), for now they are included in obcs_prescribe_read.F for
3234 simplicity
3235 o pkg/exf:
3236 - add a little more diagnostic to exf_interp_read (in analogy to
3237 mds_read_field, can be turned off with debugLevel < debugLevA=1)
3238 - improve vectorizability of exf_interp for TARGET_NEC_SX, makes code
3239 ugly but fast by unrolling short inner loops, inserting a unroll=8
3240 directive in routine lagran, and splitting a loop and making do while the
3241 outermost loop (the latter requires the intoduction of index arrays)
3242 o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice
3243 o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver
3244 http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html
3245 o verification/seaice_obcs: updated for restart test and latest options
3246 o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different
3247 ice rheology (so-called truncated ellipse, that gets rid of tensile stress);
3248 for now this is only available for the C-grid code and also within
3249 #ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code
3250
3251 checkpoint59m (2008/01/14)
3252 o pkg/seaice: use different time constant for melting (SEAICE_gamma_t)
3253 and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature
3254 o gad_som : fix flux output (& diagnostics) to have same units as other
3255 advection scheme fluxes (was previously multiplied by deltaT).
3256 o added verification/seaice_obcs both to test seaice open boundaries
3257 and to provide an example matlab scrpt for generating them
3258 o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume
3259 o pkg/salt_plume: clean up salt_plume_frac.F to
3260 remove redundancy in PlumeMethod 1 and 4
3261 o pkg/kpp: added saltplume diagnostics
3262 o pkg/obcs and pkg/seaice:
3263 - do not set uice and vice to zero when OB*icefile are unspecified
3264 - OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default
3265 - moved seaice tracer obcs after call to seaice_growth
3266 o pkg/salt_plume: added various options for salt plume depth
3267 criterion and for vertical distribution of the salt
3268
3269 checkpoint59l (2007/12/18)
3270 o pkg/ptracers: new version of ptracers pickup:
3271 read meta file and write only fields which are needed to restart.
3272 ( same logic as main pickup file ; also using pickupStrictlyMatch )
3273 o pkg/seaice:
3274 - add timescale for melting due to warm mixed layer as a means of
3275 setting SEAICE_availHeatFrac more conveniently
3276 - add a CPP-flag/runtime parameter check for flooding algorithm
3277 - reformulated availHeat in seaice_growth.F to be independent of AREA
3278 o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent
3279 unit changes
3280 o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint
3281 o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC
3282 SX vector computer.
3283 o pkg/seaice:
3284 - removed SEAICE_FFIELDS.h and seaice_get_forcing.F
3285 seaice forcing fields can now be read only through pkg/exf
3286 - removed some unused halos
3287 o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP
3288 o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL
3289 or U/VICE from U/VWIND before computing U/VSTRESS
3290
3291 checkpoint59k (2007/11/30)
3292 o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between
3293 dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results.
3294 o fix un-initialised variable problem (in mom_vecinv & shap_filt):
3295 all experiments pass when compile with un-initialised var. checking option.
3296 o added pkg/salt_plume
3297 o script to test restart (for now, in MITgcm_contrib/jmc_script)
3298 o pkg/seaice: new read/write pickup version.
3299 read meta file and write only fields which are needed to restart.
3300 ( same logic as main pickup file ; also using pickupStrictlyMatch )
3301 o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates)
3302 o lab_sea.hb87: modify the domain & update output.hb87.txt :
3303 lat-long grid & no-slip BC in seaice-dynamics produce different sigma12
3304 at j=1 & j=Ny+1 : this case is not treated correctly in the restart
3305 process. Fixed here by closing the domain at the Northern boundary.
3306 o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD.
3307 o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing
3308 a set of consecutive levels in/from a 3-D array.
3309 o pkg/ptracers:
3310 use a 2 characters string ioLabel to identify tracer (if more than 99 tracers).
3311 to-do: fix pkg/diagnostics when large number of diagnostics are defined.
3312
3313 checkpoint59j (2007/11/09)
3314 o in pkgs: dic, obcs, offline, rbcs:
3315 standard way to compute coeff. for time interpolation between 2 time reccords
3316 which retains full precision (& make results less dependent on compiler).
3317 update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo.
3318 o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those
3319 packages instead of reading ice cover and wind speed separately
3320 o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h
3321 (keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad
3322 to allow to compile customized code before the update)
3323 o cleaning-up:
3324 - fix CPP instruction syntax in pkg/obcs
3325 - replace (some) call to MDSIO S/R with call to RW interface S/R ; and
3326 add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio)
3327 - fix some threads issue in IO parts.
3328 o pkg/dic:
3329 - add tons of "_d 0" (--> much better testreports !)
3330 and then update outputs of tutorial_global_oce_biogeo
3331 o pkg/mom_fluxform:
3332 add a special version of momentum advection intended to conserve momentum
3333 next to a bathymetry step or a coastline edge. (default = off = #undef)
3334 o new read/write pickup version:
3335 - for now, only implemented for main (mdsio) pickup file.
3336 - write out only what is needed to restart; merge pickup_nh , pickup_ph
3337 and main pickup together.
3338 - read meta file; read only what is needed to restart; stop if a field
3339 is missing (if pickupStrictlyMatch=T, = the default) or try to restart
3340 if it make sense (even if the restart is not perfect).
3341 - if no meta file, assume that pickup to read corresponds exactly to
3342 a pickup that would currently be written.
3343 - read pickup written in the old format (until checkpoint59i) if it
3344 recognizes an old meta file (no field-list).
3345 - add a meta file in exp. which starts from a pickup: 2 cases:
3346 a) minimal meta file (with just file precision) + pickupStrictlyMatch=F
3347 e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta
3348 b) a meta file describing the content of the associated pickup file
3349 e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta
3350 o pkg/mdsio & pkg/rw:
3351 - new routine to read a meta file ; new set of routine to read
3352 Multiple-fields file (with meta file).
3353 o added open boundary conditions capability for seaice
3354 HSNOW, HSALT, UICE, and VICE
3355
3356 checkpoint59i (2007/10/21)
3357 o adjoint:
3358 * fix multiDimAdvection adjoint
3359 (partial recomputation problem by TAF for fVerT(:,:,kDown)
3360 and comlev1 size definition (maxpass vs. max. number of tracers)
3361 * verification/global_ocean.90x45x15 adjoint now tests
3362 NLFS and multiDimAdvection using DST3 (=30)
3363 * verification/lab_sea now tests multiDimAdvection using DST3 (=30)
3364 o pkg/kpp: add "_d 0" to real constant (if missing);
3365 update output of exp: natl_box (10.digits); vermix (std, 7.digits)
3366 and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits).
3367 o prepare for "clever pickup" implementation: add new header file "RESTART.h"
3368 for internal parameters related to restart process (formerly from PARAMS.h)
3369 and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2.
3370 o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed
3371 as argument. (only atm2d & obcs write_pickup have not yet been updated)
3372 o pkg/monitor:
3373 - use GLOBAL_SUM_TILE instead of _GLOBAL_SUM
3374 - fix mon_stats_rs (statistics over the full domain, even where field is zero)
3375 - account for deep Atmosphere factor and density factor (anelastic)
3376 o added open boundary conditions capability for seaice HEFF and AREA
3377 o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989)
3378 thermodynamics
3379 - requires a little reorganization, which affects the testreport results
3380 of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment,
3381 so that now the conservative form is tested
3382 - add a few comments
3383 o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code*
3384 o add a little bit of code to gad_os7mp_adv_?.F to help vectorization
3385 o add new diagnostics to seaice: advective, diffusive fluxes (only for
3386 multidim-advection, for scheme 2 they are not filled) and transports,
3387 thermodynamic growth rates
3388 o change units of EmPmR (inside the code, + within coupling interface)
3389 from m/s to kg/m2/s (mass flux) but leave input file unchanged.
3390 Affects results @ truncation level (cg2d match) and update output of
3391 experiments: lab_sea(6), global_ocean.90x40x15(10),
3392 global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11)
3393 + adjoint results: global_ocean_ebm(11) and lab_sea (12).
3394 Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T).
3395 Next: will retire convertEmP2rUnit (simply using mass2rUnit instead).
3396
3397 checkpoint59h (2007/09/29)
3398 o pkg/exf:
3399 - improve vectorization by moving if-statement out of loops in
3400 exf_mapfields, exf_radiation
3401 - exf_bulkformulae.F: introduce 2D fields and vectorize code
3402 o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package
3403 o testreport:
3404 - allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE
3405 monitor & update offline_exf_seaice exp. output.
3406 - AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost)
3407 o pkg/seaice:
3408 - bug fix in the evp solver: boundary conditions were affected be
3409 masking of zMax/zMin (changes results)
3410 - minor bug fix in boundary conditions in seaice_calc_strainrates
3411 (changes results for no_slip)
3412 - seaice_lsr.F: make interpolation of eta dependent on boundaries
3413 - replace hardcoded lower limit for zeta (zMin) by runtime parameter
3414 - add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean
3415 stress formulation and no-slip boundary conditions
3416 o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP
3417 in gad_calc_rhs.F ; add few safety stops in initialisation phase.
3418 o pkg/seaice: a first HSALT time stepping equation has been checked in
3419 o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV
3420 in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem
3421 without requiring DO-IF statements
3422 o pkg/thsice:
3423 use continuous power-law function for partition of energy between lateral
3424 melting/freezing and thinning/thickening ; old code using step function
3425 still available with #undef THSICE_FRACEN_POWERLAW
3426 update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice
3427 o testreport: change AD testing : check against results/output_adm.txt
3428 using same scripts as for forward test.
3429
3430 checkpoint59g (2007/09/17)
3431 o adjoint testing: in preparation for changing testreport:
3432 - output format: cost and grad written on separated lines
3433 - ad output results in directory "results" (instead of "results_ad")
3434 o pkg/seaice: adding ice salinity HSALT as a prognostic variable
3435 o pkg/seaice: changes for using pkg/seaice with pkg/obcs
3436 o pkg/ecco: allow user defined cost function contributions
3437 o testreport:
3438 Allow to choose (per experiment) the list of tested output variables
3439 and the main variable (used to issue a pass/FAIL ) ;
3440 - for now, done by adding the specific list in file: [exp]/input/tr_checklist
3441 - default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ;
3442 Also modify printing of summary:
3443 a) ">" NN "<" indicates the "main" variable (used for pass/FAIL)
3444 b) echo the list of tested variables in the individual summary.txt of
3445 each experiment.
3446 o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of
3447 threads and number of processes (with #define GLOBAL_SUM_SEND_RECV)
3448 (but still depend on the tile decompostion of the domain).
3449 o pkg/seaice: change a discretization detail to make the B-grid code
3450 "more symmetric". This change is likely to remove all "ridges/leads" that
3451 where quasi-aligned with the grid in B-grid solutions. It may also be
3452 the solution to the stress coupling issues with the B-grid.
3453 o each tested exp: add a "run" directory with a standard ".cvsignore" file ;
3454 remove .cvsignore from input dir. (since testreport no longer run here).
3455 o pkg/thsice:
3456 - cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h"
3457 - fix reshaping of sea-ice just after advection:
3458 melt all the ice only if ice-volume is too small.
3459 - re-visit lateral/thinning repartition of melting (modifs from May 04, 2007):
3460 prevent lateral melting if sea-ice fraction is too close to iceMaskMin ;
3461 and update experiment global_ocean.cs32x15.icedyn (+start from pickup files).
3462 o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water
3463 tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged.
3464 o define mass2rUnit & rUnit2mass as units conversion factor, used for surface
3465 forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit
3466 (z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse;
3467 and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error
3468 of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16
3469 -> update output.txt
3470 o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME):
3471 this affects truncation error: -> update output.txt of exp:
3472 global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr,
3473 ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon.
3474
3475 checkpoint59f (2007/08/21)
3476 o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode)
3477 o pkg/ctrl: ctrl_bound forces parameter corrections to stay in
3478 a bounded range (in forward mode)
3479 o pkg/ecco, ctrl, autodiff and mom_common:
3480 internal parameter controls, completements of implementations
3481 o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy.
3482 o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ;
3483 (not seem any difference in testing results).
3484 o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains
3485 at face corners.
3486 o pkg/generic_advdiff:
3487 - in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR)
3488 loop range indices for computing vertical advection tendency
3489 and do the calculation in the interior only (no overlap) ;
3490 for now, only implemented for SOM advection (to save CPU time).
3491 - add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment)
3492 o exch2 adjoint
3493 First set of changes:
3494 - add exch2 hand-written adjoint templates
3495 - exch2 hand-written no longer use TAF-flag 'nownew_arg'
3496 This will require cleanup in pkg/autodiff/*.F
3497 (changed routines currently kept separate in verif. code/)
3498 - Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC
3499 that used to hide exch2 or cubed-sphere specific code
3500 (commented via 'cph-exch2')
3501 o pkg/seaice
3502 - Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE.
3503 o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update
3504 output of global_ocean.cs32x15.thsice .
3505
3506 checkpoint59e (2007/07/26)
3507 o exch2: new S/R that only use the cube-tracer (center-position) exchange:
3508 for B-grid vector (not yet tested) and C-grid vector (<- only used
3509 when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined).
3510 o starting implementation of Duffy et al. (GRL 1999) salt plume scheme
3511 (#ifdef ALLOW_SALT_PLUME)
3512 o gather_2d/scatter_2d: removed halo regions
3513 o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007
3514 scheme and the corresponding test case (under front_relax dir). For now,
3515 only available with Skew-flux form and not yet tested in realistic set-up.
3516 adjoint: store directives updated, but gradient checks deteriorated,
3517 so maybe GM/Redi adjoint is now broken.
3518 o seaice adjoint
3519 * add AREA, HEFF, HSNOW as control variable
3520 (should not change lab_sea results)
3521 * CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40
3522 o pkg/seaice:
3523 * added computation of saltFlux in seaice_growth;
3524 For time being, sea ice salinity is assumed constant
3525 contribution of snow flooding to freshening of sea ice is neglected.
3526 SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it
3527 defaults to 0.0 in order to maintain backward compatibility.
3528 Typical values for SEAICE_salinity are 4 to 10 g/kg.
3529 * replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F
3530 * added SEAICE_availHeatFrac, which specifies fraction of surface level
3531 heat content used to melt or grow ice
3532 * commented out cap of HICE: it helps keep ice thinner
3533 * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option
3534 * applied OBCS T/S mask to HEFFM sea ice mask
3535
3536 checkpoint59d (2007/06/21)
3537 o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array
3538 for {PKG} state variables, and called from DO_STATEVARS_DIAGS.
3539 (keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics)
3540 o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0"
3541 and change default value of parameter "GM_Small_Number";
3542 update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15,
3543 global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf,
3544 tutorial_global_oce_biogeo, tutorial_global_oce_latlon
3545 o pkg/ecco: cost function when applying pkg/smooth to controls
3546 o pkg/ctrl: add forcingPrecond run time parameter
3547 o pkg/seaice:
3548 - replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code
3549 - fix bug in metric terms of u-equation in LSR solver (implicit part),
3550 changes verification/lab_sea
3551 - rearrange implicit part of u-equation in LSR solver to make it easier to
3552 read, understand, and debug. This causes changes at the truncation level.
3553 - fix (serious) bug in the boundary conditions (sign error in the implicit
3554 part) of the LSR solver. Changes all LSR results.
3555 - fixed problem with HSNOW initialization to avoid thick snow when AREA
3556 is initilized with small values - does not change lab_sea results.
3557 - added HsnowFile initialization capability
3558 o pkg/smooth: addition to model/src and pkg/ctrl so allow
3559 initialization of pkg/smooth and application to control vector
3560 o pkg/seaice: fix another bug in the LSR no-slip boundary conditons
3561 o dependencies: pkg/profiles requires pkg/cal
3562 o pkg/profiles:
3563 - added option ALLOW_PROFILES_GENERICGRID
3564 -> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming
3565 that interpolation information (grid points and coefficients) is provided
3566 within the netcdf input files.
3567 -> sample matlab scripts can be found in MITgcm_contrib/gael
3568 that allow you to prepare netcdf input files.
3569 - also modified: cleaner include statements, cleaner error print statements,
3570 cleaner stops when error, and more tests of the netcdf input files consistency.
3571 o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs.
3572 o pkg/seaice:
3573 - move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this
3574 requires a new routine: seaice_diagnostics_fill.F
3575 - make sure that seaice does not move if not forced (pressure replacement
3576 method, Hibler and Ip, 1995), changes results
3577 - and new damping criterion for EVP solver according to Hunke, JCP, 2001
3578 - SEAICE_evpDampC = > 0. turns it on (615. is the recommended value).
3579 It is turned off by default (=-1.), because it changes the results.
3580 - make it possible to read AREA from a file, too.
3581
3582 checkpoint59c (2007/06/04)
3583 o add S/R and diagnostics for oceanic mixed-layer depth
3584 o move GMRedi call after all vertical mixing schemes (including KPP)
3585 o pkg/thsice:
3586 - ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs
3587 (melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice
3588 o pkg/obcs:
3589 - bug fix for balance code
3590 o pkg/seaice:
3591 - allow values of SEAICE_elasticParm > 1
3592 - add new parameter SEAICE_evpTauRelax as an alternative
3593 to SEAICE_elasticParm
3594 - make lsr boundary conditions free slip (by default), changes result
3595 - add code for no slip boundary conditions for lsr
3596 - set minimum of zeta to zero (and not 4e8) (changes results)
3597 - add a cap on AREA after advecting AREA if seaice_growth is not called
3598 o change calculation of Visbeck K:
3599 - no longer depend on tapering scheme; instead, compute slope (limited
3600 by GM_maxSlope). this is equivalent to what was comuted before with
3601 clipping or linear tappering.
3602 - fix vertical averaging (wrong by 1/2 level)
3603 - leave the old version (but will not be maintained) within
3604 #ifdef OLD_VISBECK_CALC / #endif
3605 - update output of exp. ideal_2D_oce
3606 o change error catch in calc_r_star to improve vectorization
3607 o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and
3608 add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf).
3609 o adjoint:
3610 Re-organized adjoint checkpointing according to Matt Mazloff
3611 (but with modifs/completions/cleanups)
3612 Storing is now bundled into large arrays to optimized I/O
3613 (and second step in cleanup of the_main_loop)
3614
3615 checkpoint59b (2007/05/16)
3616 o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d):
3617 - export/import (between ocean & coupler) fields needed for ocean DIC.
3618 o pkg/seaice:
3619 - get rid of three more exchanges seaice_calc_viscosities (required
3620 different loop boundaries in seaice_lsr and seaice_ocean_stress)
3621 - bug fix in seaice_ocean_stress (update of lab_sea required)
3622 - reduce loop boundaries to necessary minimum also in seaice_evp
3623 - go back to the old way of computing deltaC/Z as the adjoint likes that
3624 better
3625 o Refresh of tutorial_global_oce_latlon (includes changing salinity-like
3626 passive tracer to an Age Tracer) + update output.txt
3627 o pkg/exf:
3628 - implement A-grid / C-grid selection for wind-stress input files.
3629 - clean-up exf_wind.F (remove us, use wspeed instead ; add wStress)
3630 for now, in exf_bulk_largeyeager04.F only :
3631 - change implementation for case where windspeed + 2. components wind-stress
3632 are read-in. AND use rhoConstFresh to convert evap.
3633 o pkg/seaice:
3634 - use correct EXCH_UV for wind-forcing (on A-grid).
3635 - change SEAICE_OPTIONS.h to limit the number of option combinations (regarding
3636 SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops.
3637 o pkg/exf:
3638 - default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC)
3639 EXF_INTERPOLATION:
3640 - merge global_with_exf/code version of exf_interp_read.F
3641 to the main code ;
3642 - Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when
3643 reading the file ; Important: This options needs to be defined to recover
3644 previous code.
3645 otherwise, use fixed size array to read in (size=exf_interp_bufferSize).
3646 - no longer loose real*8 precision along the way when using exf_iprec=64.
3647 o pkg/seaice: rearrangement of common blocks (really needs more cleaning up)
3648 - change discretisation of evp-solver in order to avoid another exchange
3649 (changes lab_sea) and clean up a little
3650 - replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS)
3651 help the adjoint (this also changes the results slightly)
3652 - add a few "_d 0" where they had been missing in seaice_evp.F
3653 - cleaning up: remove unused seaice_calc_rhs.F
3654 o pkg/exf: some cleaning-up:
3655 - change various "constants" into runtime parameters
3656 - cleaned-up Large&Yeager04 routine which should eventually
3657 replace exf_bulkformulae.F (changed names of S/R and CPP)
3658 and merged various ALLOW_ATM_WIND options
3659 only used with thsice pkg (in thsice_get_exf.F):
3660 - implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04)
3661 which are used when useStabilityFct_overIce=TRUE (= the default)
3662 - change default values of ice & snow emissivity and scale downward LW
3663 by ice & snow emissivity.
3664 o pkg/thsice:
3665 fix few little problems, in thsice_calc_thickn.F:
3666 - growth vertically (and not laterally) if iceFrac == iceMaskMax
3667 - melt only laterally if hIce < hThinIce (as the comments say)
3668 and in thsice_extend.F:
3669 - allow to form ice even when iceFrac == iceMaskMax (by increasing thickness)
3670 - start to form ice as soon as the minimum ice-volume is reachable.
3671 update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice),
3672 and cpl_aim+ocn
3673 o pkg/kpp
3674 - move computation of surface related input fields to KPP into a new
3675 subroutine kpp_forcing_surf.F
3676 - remove wrong (within bi,bj loops) EXCH calls.
3677 - little cleaning (add argument myThid in last position, cvs header ...)
3678 - for now, fix conservation problem by exchanging KPPviscAz (may not
3679 be the best fix)
3680 o pkg/seaice
3681 - check for inconsistent evp parameter/cpp-flag combination
3682 - remove leftover errIO flat for obsolete name list error handling
3683 o OpenAD
3684 - changed verification/OpenAD to full baroclinic setup (including GM/Redi)
3685
3686 checkpoint59a (2007/05/01)
3687 o pkg/seaice: some parameter clarifications and a little bit of clean up
3688 o pkg/thsice: rename run-time parameters:
3689 himin -> hIceMin
3690 himin0 -> hThinIce
3691 hihig -> hThickIce
3692 i0 -> i0swFrac
3693 transCoef -> bMeltCoef
3694 frac_energy -> fracMelting
3695 add new parameters: hNewIceMax, fracFreezing, dhSnowLin
3696 with default values (for now) that do not change the results.
3697 remove old version of thsice vars advection in pkg/seaice.
3698 o in FFIELDS.h:
3699 - replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD
3700 - make pLoad & sIceLoad always available (but still only used if
3701 ATMOSPHERIC_LOADING is #define).
3702 o pkg/kpp: replaced _KPP_RL with _RL
3703 o bug fixes for vertical diffusivity computations when both KPP and
3704 3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F
3705 are no longer updating the vertical diffusivity array
3706 (passed as argument) but are (re-) setting those arrays.
3707 o pkg/seaice: fix bug in evp solver, while doing that
3708 - change (improve?) discretization of stress computations for both
3709 cgrid-lsr and evp solver
3710 - add a new routine to compute strain rates
3711 - the above changes lab_sea results
3712 - add no slip conditions for evp solver (off by default), lsr-version
3713 may follow
3714 - fix exchange for shear at Z-points (does not change lab_sea)
3715 - retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp
3716 (to force the user to pick a time step since there is not "safe" way
3717 of choosing it)
3718 - add principal stress diagnostics
3719 - rearrange fields for evp a little to avoid having to call a: too many
3720 exchanges and b: exchanges for stress trensor components which we do
3721 not have.
3722 - modify Hibler+Bryan (1987) stress coupling so that it reuses information
3723 of evp, complete rewrite for lsr case (latter is does not yet work
3724 in all cases)
3725 o pkg/kpp: add code to have mixing in shelf ice caverns
3726 - add myThid to all kpp routines (long overdue)
3727
3728 checkpoint59 (2007/04/19)
3729 o pkg/exf:
3730 - fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND &
3731 ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid
3732 - move exf header files from lower_case.h to UPPER_CASE.h ;
3733 add missing cvs Header & Name
3734 - add adjoint routines and flow dirs for newly used exch_uv_agrid routines
3735 - add namelist param. selectStressGridPosition, exf_monFreq
3736 - retire many _CLIM routines, and remove data.exf_clim
3737 + params moved to data.exf
3738 + climsst, climsss now handled by exf_set_gen, i.e.
3739 climss?period=0 refers to constant field,
3740 climss?period=-12 to monthly forcing
3741 - split up namelists in data.exf
3742 o pkg/seaice:
3743 - remove seaice_exch and seaice_exch_uv
3744 - remove superfluous exchange of theta
3745 - add myThid to seaice_budget_ocean/ice
3746 - add new interface for atmospheric wind forcing (C-grid only)
3747 + new routine
3748 + two new field (taux, tauy for stress over ice)
3749 + removed one global field (DAIRN) for C-grid case only
3750 o pkg/thsise
3751 - 2nd set of modifs for thsice adjoint in conjunction with exf
3752 o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.)
3753
3754 checkpoint58y_post (2007/04/15)
3755 o Added capability for latitudinal dependence of Bryan and Lewis, 1979
3756 vertical diffusivity, similar to that in MOM4; turned on using
3757 #define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using
3758 diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file.
3759 o Added capability for 3D specification of background vertical diffusion
3760 coefficient. This is done by (i) #define ALLOW_3D_DIFFKR
3761 in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime
3762 "data" file that contains the 3D vertical diffusivity coefficients.
3763 o ice dynamics (pkg/seaice) with thsice thermodynamics:
3764 - add code within pkg thsice to advect & diffuse sea-ice fields
3765 similar to (and will replace) what has been added in seaice_advdiff.F,
3766 but: - conserving Mass, Heat & Salt.
3767 - better when using non-linear advection scheme (not yet fully tested)
3768 - can also be used in atmospheric set-up (for now, only the diffusion).
3769
3770 checkpoint58x_post (2007/04/04)
3771 o IO option for global-file compact format:
3772 - add options when generating topology (utils/exch2/matlab-topology-generator)
3773 - add I/O capability (pkg/mdsio).
3774 - adapt utils/matlab/rdmds.m to read this format.
3775 for now long-line format not yet supported by pkg/mdsio (& exch2).
3776 o shelfice: add a few diagnostics
3777
3778 checkpoint58w_post (2007/03/13)
3779 o p-coord. non-hydrostatic using reference profile for w <-> omega conversion:
3780 rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref
3781 (and replace horiVertRatio in NH code).
3782 Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !)
3783 and tutorial_plume_on_slope (sensitive to truncation)
3784 o seaice: if ALLOW_ATM_WIND is undefined use wind stress
3785 directly to drive seaice model (C-grid only)
3786 o exf: when input wind-stress (#undef ALLOW_ATM_WIND):
3787 - reintroduce computation of wind from stress,
3788 - compute tau (in exf_bulkformulae.F) from windstress averaged to
3789 mass points to avoid tau = 0
3790 - fix serious bug: (1/3) in Fortran is not the same as (1./3.)
3791 o rdmnc.m: make it work with "global" files created with gluemnc
3792 o rdmnc.m : some improvements in dealing with singleton dimension
3793 (tested on all testreport mnc output files).
3794 o genmake2: disable pkg/profiles if netcdf test fails.
3795 o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output.
3796 o move call to cal_readparms up to make calendar parameters/variable available
3797 to all packages
3798
3799 checkpoint58v_post (2007/02/08)
3800 o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get
3801 useDynP_inEos_Zc tested.
3802 o pkg/exf: changes to properly interpolate/mask/scale initial fields
3803 o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields
3804 and portions thereof. See read_cs.txt for description and examples.
3805 o utils/matlab/cs_grid/bk_line: to compute transport through passages,
3806 add a script (grt_circ_bkl.m) to generate broken-line between 2 points,
3807 following the great-circle arc between those 2 points.
3808 o trap un-initialized variable with pathscale compiler on weddell.mit.edu
3809 (thanks to Constantinos): fix few problems and get (almost) all exp to pass.
3810 o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in
3811 - enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h)
3812 - used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81)
3813 - still needs work (not working with some options ; efficiency to improve)
3814 and serious testing.
3815 - use this scheme for temperature & salinity in 2 advection test exp.:
3816 advect_xy & advect_xz, respectively.
3817
3818 checkpoint58u_post (2007/01/12)
3819 o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels.
3820 o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA.
3821 o testreport: add option "-skipdir" to skip some test.
3822 o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent
3823 momentum calculation.
3824 o gad_advection: fix vertAdvecScheme (if different from advectionScheme)
3825 o some cleaning: usePickupBeforeC35 no longer supported ; remove this option.
3826 remove checkpoint.F and the_correction_step.F (no longer used);
3827 do the k loop inside CYCLE_TRACER (supposed to be more efficient).
3828 o add option (linFSConserveTr) to correct for tracer source/sink due to
3829 Linear Free surface
3830 o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine
3831 o pkg/thsice: fix reading mnc-pickups
3832
3833 checkpoint58t_post (2006/12/30)
3834 o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F)
3835 o pkg/mdsio:
3836 - clean-up mdsio_readfield.F & mdsio_writefield_new.F and
3837 move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) &
3838 mdsio_write_field.F (S/R MDS_WRITE_FIELD);
3839 - fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD
3840 - collect old S/R in one file: mdsio_rw_field.F (now just a call to
3841 either MDS_READ_FIELD or MDS_WRITE_FIELD )
3842 - new S/R (to replace MDSWRITEMETA), which allows to write more
3843 informations (variable names, time ...) to meta files.
3844 - modify rdmds.m to give back the meta file content.
3845 o pkg/diagnostics: change vertical interpolation to be safer, and more
3846 flexible (define p-levels to interpolate to in data.diagnostics);
3847 add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right
3848 diagnostic pointer.
3849 o pkg/seaice: more cleaning up of seaice_growth, added many comments
3850 o pkg/exf: put runoff0 and runoff1 into the appropriate common block
3851 o fix multi-category seaice:
3852 - change cpp flag SEAICE_MULTILEVEL to more meaningful name:
3853 SEAICE_MULTICATEGORY
3854 - fix short wave heat flux
3855 o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics
3856 and allow to use EVP solver. Change forward lab_sea: test both EVP
3857 solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint)
3858 o Initial check-in of lab_sea adjoint
3859 (very similar to natl_box_adjoint/code_seaice)
3860 * used C-grid and EVP solver
3861 * used KPP, GM/Redi
3862 * uses inAdExact=.TRUE.
3863 * gradient checks fail for both ADM and TLM
3864 due to sensitive snow melt code in seaice_grwoth (look for "JZ")
3865 f.d. gradients actually seem more problematic than ADM, TLM gradients;
3866 issue is related to forward mismatch between g77 an ifort
3867 o pkg/seaice: overhaul of thermodynamics
3868 - growth.F and groatb.F are replaced by new routine seaice_growth.F
3869 - budget.F is replaced by two new routines seaice_budget_ocean/ice.F
3870 - move a few global fields out of SEAICE.h into seaice_growth.F and
3871 make them 2D (FICE/QNETO/ ...)
3872 - remove FO (it is the same as QNETO)
3873 - introduce a few local fields to avoid modifying external fields such
3874 as atemp, etc.
3875
3876 checkpoint58s_post (2006/12/11)
3877 o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F
3878 changed exf_set_gen.F so that
3879 genperiod=0 means input file is one time-constant field and
3880 genperiod=-12 means input file contains 12 monthly means
3881 o CG2D: use pre-computed solver main-diagonal (stored in common block);
3882 this affects truncation error ; generate new output file for exp. which
3883 fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d),
3884 global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d),
3885 ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d),
3886 MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d),
3887 tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d),
3888 vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d)
3889 o start implementation of deep-atmosphere and anelastic formulation
3890 o verification: remove 2nd copy of input files and use script "prepare_run"
3891 to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M)
3892 o mom_common/vecinv/fluxform: fix a few initialisation isssues
3893 o profiles: fix for multithreaded case
3894
3895 o diagnostics: rename few diags:
3896 s/'PRESSURE'/'RCENTER '/g
3897 s/'TICE '/'oceFreez'/g
3898 s/'TAUX '/'oceTAUX '/g
3899 s/'TAUY '/'oceTAUY '/g
3900 s/'SWFLUX '/'oceQsw '/g
3901 s/DIFx/DFxE/g
3902 s/DIFy/DFyE/g
3903 and add few ocean-forcing diagnostics:
3904 atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS
3905 o modifications to pkg/seaice/growth.F and budget.F, which change results of
3906 lab_sea experiment: HSNOW was sometimes treated as effective and sometimes
3907 as actual snow thickness. It now refers everywhere to effective snow
3908 thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA.
3909
3910 checkpoint58r_post (2006/11/17)
3911 o modifications to pkg/seaice/growth.F, which change results of
3912 lab_sea experiment: fixes pertain to melting snow over open water, to
3913 masking EVAP under sea ice, and to using the correct AREA variable for
3914 computations of EVAP, PRECIP, HSNOW, and GHEFF
3915 o add ability to read bathy, salt, and theta using MNC (off by def)
3916 o add flooding algorithm and advection of HSNOW for pkg/seaice;
3917 both are turned off by default and do no change any results
3918 o seaice advection with pkg/thsice: a step toward the use of non-linear
3919 advection scheme, but #ifdef or commented out for now (requires more EXCH).
3920 o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens
3921 (identical results) and the standard version of EXTERNAL_FIELDS_LOAD
3922 in natl_box (affects results @ truncation level: update output.txt)
3923 o multi-threading and IO:
3924 - replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R.
3925 - remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls
3926 (needed to work with SingleCpuIO): tested in all verif. exp.
3927 o GAD: use simpler DST3 formulation as default (old version left within #ifdef)
3928 affects the results (but none of the verification test uses this scheme).
3929 o Adding some pkg/diagnostics capability to pkg/seaice
3930 (will certainly be subject to changes)
3931 o ctrl: adding new control variables:
3932 lwflux, lwdown, evap, snowprecip, apressure, runoff
3933
3934 checkpoint58q_post (2006/10/20)
3935 o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up
3936 1/6-deg Southern Ocean configuration by 8% on IBM Datastar and
3937 high_res_cube configuration by 4% on Columbia.
3938 o clean-up multi-threaded problems (reported by debugger tcheck on ACES);
3939 add (in global_with_exf/code) a version of EXF_INTERP_READ without
3940 dynamical allocation (seems to work in multi-threaded).
3941 o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using
3942 single CPU io) so that TAF does not have to see EESUPPORT.h
3943 o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux)
3944
3945 checkpoint58p_post (2006/09/08)
3946 o obcs: stop if obcs is used with useCDscheme = .true.
3947 o shelfice:
3948 - fix a sign error so that no slip at shelfice interface works
3949 - remove stop for combination non-hydrostatic code and shelfice. That does
3950 not mean, that the results are correct, but at least they are numerically
3951 stable
3952 o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted)
3953 o added adjoint exch routined for all exch*3d* routines
3954 and updated flow directives
3955
3956 checkpoint58o_post (2006/08/28)
3957 o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ;
3958 remove old subroutines (_XY_ & _XYZ_); update the adjoint version.
3959 o change controling S/R for writing pickup file (new S/R do_write_pickup)
3960 and clean-up reading/writing of pickup files.
3961 o fix local version of read/write pickup (NH part) in rotating_tank/code
3962 o simplify EXCH interface:
3963 - change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list)
3964 - not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version
3965 o added the regrid package
3966 o shelfice:
3967 - add a simple boundary layer scheme to reduce noise
3968 - fix the indexing in shelfice_u/v_drag so that there will be actually drag
3969
3970 checkpoint58n_post (2006/08/14)
3971 o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to
3972 local variable (not in common block).
3973 o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass.
3974 - still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more);
3975 - still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls
3976 to work with SingleCpuIO.
3977 o add "_d 0" to real constant of pkg/cfc subroutines ;
3978 update exp. cfc_exemple & tutorial_cfc_offline output files.
3979 o multi-threading and IO:
3980 - all threads call READ_FLD S/R (needed if using SingleCpuIO):
3981 (no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R.
3982 - barrier before and after reading.
3983 - stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE)
3984 - avoid using MDS_WRITELOCAL for LAND pkg output.
3985 - new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics
3986 common-block variables ; Allows multi-threading with master-thread IO.
3987 o change default MAX_NO_THREADS from 32 to 4 ;
3988 and stop cleanly when MAX_NO_THREADS is too small.
3989 o add S/R BAR_CHECK to check multi-threaded barrier synchronization
3990
3991 checkpoint58m_post (2006/07/17)
3992 o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc.
3993 and side-drag) on CS-grid : global_ocean.cs32x15.viscA4
3994 o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp.
3995 keep global_ocean.90x40x15 (for AD testing) with former secondary test
3996 (".qshyd") as the main test (mv output.qshyd.txt to output.txt)
3997 o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos;
3998 add MITgcm_tutorials (= code + all the tutorials)
3999 o ecco, option to compute cost for total ssh (mean+anom)
4000 o consistent with addition of ptracer and ssh in pkg/profiles
4001 o profiles: adding ptracer and ssh
4002 o testreport: change multi-test output-file name
4003 (from output.txt.{name} to output.{name}.txt)
4004 o profiles: now ok for mutli-tiles case
4005 o seaice: add 4 parameters for different advection schemes for area,
4006 (effective) seaice thickness, enthalphy, and snow height. Their default
4007 is the standard parameter SEAICEadvScheme
4008 o calc_gw:
4009 - add cosFacU in zonal viscous flux (harmonic.visc.).
4010 - put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt.
4011 of tutorial_plume_on_slope.
4012 o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria).
4013 o calc_gw: true flux-form, account for horizontal grid spacing.
4014 update rotating_tank results, but not plume_on_slope (affected at
4015 truncation level, 11 digits).
4016
4017 checkpoint58l_post (2006/07/12)
4018 o calc_gw:
4019 - take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V
4020 - remove side-drag for now (need to fix it); update plume_on_slope results.
4021 - fix for partial-cell & non-uniform dz; update plume_on_slope results.
4022 o commit code to make SST/SSS weights spatially variable
4023 (based on either variable in-situ or variable initial T/S weights)
4024 o pkg/ecco:
4025 * commit code to relax deviations of xx_theta, xx_salt to 5*sigma,
4026 now based on horizontally varying weights wthetaLev, wsaltLev
4027 * cost_averagesflags now returns year indices in addition to day, month
4028 * sflux balance is performed on annual basis
4029 (sflxumm, sfluxmm2, bal_sfluxmm)
4030 * for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO,
4031 including separate counting and multipliers
4032 o pkg/rbcs
4033 * add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing
4034
4035 checkpoint58k_post (2006/07/06)
4036 o testreport:
4037 - always build in dir. "build" (if not there, mkdir build instead of building
4038 & running in input)
4039 - run in dir run (if it exists), in build otherwise.
4040 - call prepare_run (if input/prepare_run exists)
4041 - run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists.
4042 o pkg/exf modifications to interpolation and rotation routines for more
4043 reasonable treatment of North Pole singularity: for tracers North Pole
4044 value is set to northernmost zonal-mean value, for zonal velocity it is
4045 set to zero, and for meridional velocity it is set to northernmost value.
4046 o pkg/exf/exf_check_range.F
4047 - add tile index to diagnostics and move stop statement to the very
4048 end of the routine.
4049 o pkg/diagnostics: (diagnostics_main_init.F)
4050 define title of isomorphic variables according to the current config.
4051 o pkg/thsice with pkg/seaice dynamics:
4052 - fix domain of computation (interior only, required for exf) and do exchanges
4053 - seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient
4054 o towards a standard way of dealing with multi-threading in MONITOR
4055 and ${PKG}_MONITOR (all except ptracers_monitor) subroutines.
4056 o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith)
4057 to W momentum equation in nonhydrostatic and quasihydrostatic runs.
4058 o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor.
4059 o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block)
4060 o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL
4061 (problems ? with gradient check in bottom_ctrl_5x5 adjoint test)
4062 o tracer advection:
4063 - clean-up and simplify calc_common_factors.F
4064 - make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer
4065 advection subroutine (but still not used within DST advection S/R)
4066 o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim)
4067
4068 checkpoint58j_post (2006/06/15)
4069 o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields
4070 from file (collects calls previously in FORWARD_STEP)
4071 o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS
4072 o adjoint store dir. adjusted accordingly
4073 o genmake2
4074 replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list.
4075
4076 checkpoint58i_post (2006/06/14)
4077 o pkg/seaice: add parameter that allows to scale/turn off effect of seaice
4078 on wind stress (SEAICEstressFactor defaults to 1.)
4079 o Total number of Timers is finite (<=40): comment out 2 non-essential one
4080 in the_main_loop.F to avoid Pb (e.g., when running fizhi test)
4081 o vector_invariant: fix highOrderVorticity(=4.th.Order) advection
4082 on CS-grid: no longer loosing mass.
4083 o exf & curvilinear-grid: no longer modify longitude xC & xG.
4084 o pkg/ggl90: fix sloppy output and fix a bug
4085 o pkg/seaice: added SEAICEuseEVPpickup parameter
4086 - Set to false in order to start EVP solver with
4087 non-EVP pickup files when using SEAICEuseEVP
4088 - fix sign error in diffusion in seaice_calc_rhs
4089
4090 checkpoint58h_post (2006/06/07)
4091 * Modifications for bottom topography control
4092 o replace hFacC by _hFacC at various places
4093 o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL
4094 o add non-self-adjoint cg2d_nsa
4095 o update autodiff support routines
4096 o re-initialise hfac after ctrl_depth_ini
4097 o works for 5x5 box, doesnt work for global_ocean.90x40x15
4098 * Adding verification for 5x5 box (4-layer) bottom topography control
4099
4100 checkpoint58g_post (2006/06/07)
4101 o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g.,
4102 used for mean seasonal cycle, mean diurnal cycle); add an example
4103 in verification/global_ocean.cs32x15/input.thsice/data.diagnostics
4104 o pkg/ggl90:
4105 - add parameter (minimum surface kinetic energy)
4106 - fix bug (avoiding division by zero)
4107 o couple pkg/thsice to pkg/seaice:
4108 - modify advection in seaice to accomodate new scalar fields to be advected
4109 - only muliDimAdection scheme work with seaice/thsice
4110 - mapping of thsice-variables to seaice-variables, back and forth
4111 - does not break the verification experiments, but does not give the
4112 desired results either
4113 o pkg/seaice
4114 - make (default) second order advection a bit less confusing?
4115
4116 checkpoint58f_post (2006/06/05)
4117 o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice
4118 to pkg/seaice):
4119 - new routines thsice_map_exf and thsice_get_exf provide the interface
4120 - add an additional formal parameter to thsice_solve4temp
4121 o pkg/exf:
4122 - add new fields wspeed, snowprecip (to be able to couple to thsice)
4123 - correct Stefan-Boltzmann constant
4124 - new parameter for longwave surface emittance
4125 - separate some stuff from exf_bulkformulae into new routines
4126 exf_radiation, exf_wind
4127 - add new parameters and constants: longwave emissivity for ocean, ice
4128 and snow, evaporation parameters over ice
4129 - decouple wind/stress computation from ALLOW_BULKFORMULA: always compute
4130 either wind from stress or stress from wind
4131 o pkg/thSIce:
4132 - split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F
4133 - put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND
4134 and THSICE_CALC_THICKN
4135 - for now, call to THSICE_GET_BULKF remains inside i,j loops.
4136 - add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h
4137 to make debugging easier.
4138 - affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output
4139 o pkg/bulk_force:
4140 - clean-up comments and parameters ;
4141 - add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ;
4142 o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched;
4143 generate new output for test-experiment: aim.5l_cs.thSI
4144 o results_ad : rename "output.txt_adm" to "output_adm.txt" and change
4145 testreport accordingly
4146
4147 checkpoint58e_post (2006/05/17)
4148 o SEAICE_CGRID adjoint done
4149 o R_STAR adjoint implemented.
4150 * Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ )
4151 * need to sort out init. of h0facc, etc.
4152 o Make pkg/profile fully independent of ecco,cost, etc. stuff
4153 to be able to use it in pure forward.
4154
4155 checkpoint58d_post (2006/04/21)
4156 o upgrade simple test-experiment to tutorial example:
4157 step.1: duplicate the experiment and (step.2) will remove the old copy.
4158 tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box)
4159 tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere)
4160 tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation)
4161 tutorial_global_oce_biogeo <- copy of dic_example
4162 tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection)
4163 tutorial_plume_on_slope <- copy of plume_on_slope
4164 tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity)
4165 tutorial_global_oce_optim <- empty for now (David ?)
4166 tutorial_global_oce_in_p <- copy of global_ocean_pressure
4167 some tutorials (R1) were already checked-in under tutorial_examples in release1_branch
4168 o correct a sign problem in cost_scat.F
4169 o obcs and ptracers: fix boundary conditions for advections schemes
4170 with larger stencil
4171 o thsice adjoint: start
4172 o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for
4173 completeness
4174 o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING
4175 and COSINEMETH_III, add comments in default CPP_OPTIONS.h
4176 o ptracers adjoint:
4177 * avoid extensive recomputatations
4178 * fix missing re-init. of gptr (missed by TAF)
4179 o obcs: add a flag (OBCSprintDiags, defaults is true) that allows
4180 me to turn off the excessive output to STDOUT that this package produces
4181 o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common
4182 and add those terms in Vector-Invariant formulation.
4183 o in ctrl pkg, if ALLOW_CAL, use monthly mean controls
4184 if the control period (xx_hfluxperiod etc) is 0
4185 o in profiles pkg, clean routines and fix details
4186 o in ecco pkg, reading ssh data:
4187 fix problem in case the model does not start at iter0=0
4188 o fix mnc-pickup/restart for ptracers
4189 o new package prifiles:
4190 code to compute profile-based cost by Gael Forget
4191 (modifs in ecco, ctrl, autodiff)
4192 o Benign bug fix in initialization (spotted by M. Mazloff) of
4193 ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F
4194
4195 checkpoint58c_post (2006/03/23)
4196 o adjoint: finish NLFS adjoint and provide reference output in
4197 verification/global_ocean.90x40x15/results_ad_nlfs
4198 o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the
4199 documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in
4200 SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only
4201 with SEAICE_CGRID defined.
4202 o move calendarDumps from "data" to "data.cal" and clean-up the code
4203 with a simple call to pkg/cal S/R: CAL_TIME2WRITE
4204 o add useEXF & useCAL flags (for now, set in hard-coded way)
4205 o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum
4206 (were missing in NH mode, and wrong in quasihydrostatic mode).
4207 waiting for Chris updated version of calc_gw to add those CALLs.
4208 o fix bug in quasihydrostatic S/R ;
4209 add a test for this option: global_ocean.90x40x15.qshyd
4210 o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs.
4211 (called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS)
4212 o add on/off flag useOffLine for package OFFLINE
4213 o seaice:
4214 - modify advection so that it works also on the C-grid
4215 - extend loop ranges in seaice_lsr and seaice_dynsolver; fixes
4216 problem in multi-tile runs with C-grid
4217 - add flags for clipping ice velocities and/or masking solver forcing
4218 - fix drag (ocean on ice) formulation and a bug that caused noise in the
4219 C-grid solver
4220 - added a few comments to seaice_diffusion.F
4221 - separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V
4222 are now exclusive)
4223 - add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which
4224 required re-ordering the code a little:
4225 + make DAIRN global variable (defined in SEAICE)
4226 + move computation of the viscosities eta and zeta into a new separate
4227 routine (because I need to recompute them in seaice_ocean_stress.F)
4228
4229 checkpoint58b_post (2006/03/13)
4230 o AIM+thSIce: fix sign of Short-Wave through the Ice ;
4231 update output.txt of exp. aim.5l_cs.thSI
4232 o various mnc cleanups and improvements:
4233 + shrink lookup tables by factor of ~4
4234 + better error reporting when running out of lookup space
4235 + able to handle longer path/file names (up to 500 chars)
4236 o adjoint:
4237 - Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations.
4238 - TBD: "hidden" mom_vecinv recomp. in dynamics
4239 o change forcing_In_AB to affects both T,S forcing and Momentum forcing
4240 (allow to differentiate between forcing components using new integer flags:
4241 momForcingOutAB=1/0 & tracForcingOutAB=1/0)
4242 and add new flag to put Dissipation tendency out of Adams-Bashforth.
4243 o ecco
4244 - enable trend removal from SSH anomaly obs.
4245 o adjoint
4246 - a fix for PmEpR when #undef EXACT_CONSERV
4247 - fix of "hidden" recomp. in thermodynamics (no TAF warnings)
4248 - try to fix "hidden" recomp. in forward_step for NLFS
4249 (NLFS seems broken sometimes after I checked it in)
4250 o seaice:
4251 - add c-grid version of the dynamic solver:
4252 + three new routines that are the c-grid substitute lsr, dynsolver
4253 and ostres
4254 + put a few fields that were local to dynsolver into global common
4255 blocks, so that I can move the computation of stresses etc into
4256 seaice_lsr (saves coding but may break the adjoint).
4257 - replace more hardwired parameters by runtime parameters
4258 - add ice masks that mask the rhs of the implicit solvers where there
4259 is no ice (commented out in seaice_dynsolver, because i am not sure
4260 if this works properly), eventually this should replace the clipping
4261 of ice velocities in seaice_dynsolver to +/-40cm/s.
4262 o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly
4263 include it only where its needed
4264 o move balancing of fluxes before the call of external_forcing_surf
4265 o seaice:
4266 - correct units of turning angles (now they are really in degrees)
4267 - move computation of GWATX/Y out of main routine into dynsolver
4268 - initialize GWATX/Y in seaice_init
4269 o Apply mask on Fresh-Water flux (needed for SSH forcing).
4270 update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual)
4271 o seaice: add runtime flags for turning angles (default to zero)
4272 o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean
4273 and trend from exf forcing and ctrl control adjustments
4274 o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF
4275 (since checkpoint57x_post)
4276 o change the default rotation period to 86164.s = the Earth rotation
4277 o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T)
4278 and based on a reference stratification. Tested within hs94.cs-32x32x5.
4279 o seaice advection: add code for choosing between the default (2nd order
4280 central differences) and multiDim advection schemes provided by
4281 pkg/generic_advdiff
4282 o seaice:
4283 - removed all references to SEAICE_GRID.h fields from
4284 dynsolver, advect, diffus, lsr, without changing the results of lab_sea
4285 (cubed-sphere configuration will change a little)
4286 - grid computations in seaice_init are obsolete now.
4287 - cleaned up code a little so that is easier to read (hopefully).
4288 - added new (better?) discretizations of default advection and diffusion
4289 (turn on with SEAICEuseFluxForm)
4290 - replace 1 in 3d global fields by kSurface in growth.F
4291
4292 checkpoint58a_post (2006/02/13)
4293 o seaice:
4294 - bug fix in advect.F
4295 o shelfice:
4296 - separate shelfice load anomaly from pload (breaks with time
4297 dependent forcing), => introduce constant field shelficeLoadAnomaly.
4298 Its default is 0., but it may be computed more cleverly from (unknown)
4299 t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
4300 done offline. A good approximation of the pressure load anomaly is
4301 necessary to avoid large initial adjustment processes underneath
4302 deep-reaching shelfice.
4303 - small fix in ISOMIP shelfice_thermodynamics
4304 - add more sophisticated thermodynamics of Hellmer (1989), this is
4305 now the default
4306 - give a few constants more intuitive names
4307 o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful
4308 if bulk formulae are used in long integration (especially EmPmR). Turn
4309 on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01
4310 if balancePrintMean, the imbalance that is substracted is printed to
4311 STDOUT.
4312 o fix bug (typo) in obcs_apply_eta.F
4313 o add a new package shelfice which enables us to model the circulation
4314 underneath shelf-ice with draughts of hundreds of meters.
4315 - works
4316 - to do: + include improved thermodynamics
4317 + check whether kSurfC (from model/inc/SURFACE.h) can be used
4318 instead of new field kTopC
4319 + can we use topoFile, Ro_surf and existing code in ini_depth.F
4320 instead of new field R_shelfIce and new code in ini_depth.F
4321 and ini_mask_etc.F?
4322 + adjust vertical mixing schemes?
4323 o seaice pkg:
4324 - add a cpp-flag to include a simple formula for a salinity dependent
4325 freezing point of sea water at the surface
4326 - change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and
4327 meridional stresses are now different (and hopefully correct)
4328 o AIM pkg: change threshold on large-scale condensation to conserve Heat.
4329 update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics
4330 and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG)
4331 o pkg/diagnostics: add options and parameters for regional-statistics
4332 diagnostics ; define regions by reading a region-mask from a file
4333 (might add other options later)
4334 o pkg/bulk_force:
4335 - add option and parameters to use AIM surface-flux formulae.
4336 - Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ;
4337 others forcing fields (defined in PARM05, parameter file "data") are loaded
4338 from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F).
4339 - initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F
4340 - use the right EXCH call for uwind,vwind (to work on CS-grid).
4341 - re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h)
4342 and parameters (note: calcWindStress replaces .NOT.readwindstress).
4343 - cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP).
4344
4345 checkpoint58 (2006/01/12)
4346 o add "--embed-source" option to genmake2 which, when the supporting
4347 tools can be compiled (as determined by genmake2) will turn on the
4348 embed_files package which then embeds the entire MITgcm source code
4349 (*.[fFhc] + Makefile) used for the build within the executable
4350 - requested by CNH but off by default
4351 - adds a paltry <9MB to the mitgcmuv executable in most cases
4352 - only writes the output when useEMBEDSRC in eedata is true
4353 o clean up 3-dim. relaxation codes:
4354 * Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec
4355 * Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs)
4356 * Thanks to Tom Haine for testing!
4357
4358 checkpoint57z_post (2005/12/31)
4359 o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate):
4360 affects output (@ truncation level) of exp. plume_on_slope ; updated.
4361 o fix the pickup behavior for obcs in combination with ptracers
4362 o fix a bug in ptracers_external_fields_load
4363 o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...)
4364 affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!)
4365 o transfered surface NH pressure to eta field (if exactConserv).
4366 o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign)
4367 and update lab_sea output.txt file.
4368 o completing 3-dim. relaxation code: additional term
4369 1/tau*( theta(i,j,k) - thetaStar(i,j,k) )
4370 in S/R EXTERNAL_FORCING_T (file external_forcing.F)
4371 * At compile time, in "EXF_OPTIONS.h" set
4372 #define ALLOW_CLIMTEMP_RELAXATION
4373 #define ALLOW_CLIMSALT_RELAXATION
4374 * At runtime in "data", under &PARM03 set (e.g., units in seconds)
4375 tauThetaClimRelax3Dim = 15552000.0,
4376 tauSaltClimRelax3Dim = 15552000.0,
4377 * 3 cases:
4378 1) Use a constant-in-time 3-dim. field
4379 2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec.
4380 3) Real-time relax. to time-evolving prescribed field
4381 o Adding Laplacian-type smoothness constraint on
4382 initial and boundary (forcing) controls (ic, bc)
4383 * enable at compile-time via
4384 ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION
4385 * enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1
4386 * Absolute scale somewhat unclear so far
4387 * no area weighting was included since no other cost term does so far
4388
4389 checkpoint57y_post (2005/12/08)
4390 First step for a NLFS adjoint
4391 o initially suppress rStar (new flag DISABLE_RSTAR_CODE)
4392 o new init. routines for calc_r_star, calc_surf_dr
4393 o still need to deal with ini_masks_etc
4394 o testreport seemed happy
4395 checkpoint57y_pre (2005/12/08)
4396
4397 o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs.
4398 o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc)
4399 o add new offset feature to offline pkg (plus minor cleanup)
4400 o cfc fixes for final year of integration
4401 o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should
4402 be in GCHEM_OPTIONS).
4403
4404 checkpoint57x_post (2005/12/04)
4405 o fix testreport Pb in multiple test experiment.
4406 o cleanup our namelist syntax in verification:
4407 - make it more F95 standards compliant (some work still needed)
4408 - allows the vast majority of our tests to work with gfortran
4409 o Non-Hydrostatic:
4410 - put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h
4411 - fix exchange calls for CS-grid using the new EXCH_S3D_RL.
4412 o Allow to apply AB on T,S rather than on AB(gT,gS):
4413 - implemented within #ifdef ALLOW_ADAMSBASHFORTH_3
4414 - use the same arrays (gtNm,gsNm) to hold tracer field at previous
4415 time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)).
4416 - need a "clever" read_pickup to restart from the other AB formulation
4417 o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h
4418 o remove some unused variables (reduces number of compiler warnings)
4419 o adjoint
4420 * Disable useVariableViscosity for adjoint for time being
4421 (there are a number of extensive recomputations)
4422 * Initialize certain variables needed for adjoint
4423
4424 checkpoint57w_post (2005/11/03)
4425 o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names
4426 fix the singleCpuIO RS version of MDSWRITEFIELD
4427 and add a WARNING if using globalFiles=T with multi-processors.
4428 o write grid-file(s) in only one format (MDS or MNC): default=MNC (if
4429 using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc
4430 o tracer advection scheme:
4431 add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get
4432 those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile,
4433 was not very convenient).
4434 add implicit version for DST-3 & DST3_Flux_Limit vertical advection;
4435 (further tests needed for the implicit DST & Flux-Limiter schemes).
4436 o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef
4437 and sRef for convenience, handy, when you want to initialize
4438 ptracers in a large domain with a constant non-zero value. Also,
4439 untangle ptracers_init.F a little.
4440
4441 checkpoint57v_post (2005/10/13)
4442 o change dome exp. to use variable viscosity in side-drag terms.
4443 o remove all the files from the cfc_offline test since they are now
4444 incorporated into tutorial_cfc_offline which has been producing
4445 identical results for a few days of testing
4446 o add new parameter: sideDragFactor to enable half-slip-side BC
4447 and change side-drag S/R to use viscosity from mom_calc_visc
4448 (can switch back by setting sideDragFactor=0.); affects results at
4449 truncation level; regenerate output for exp.: global_ocean.cs32x10(x3),
4450 global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5).
4451 o vorticity & strain are now computed without masking, to account for
4452 no-slip-side BC in variable viscosity calculation ; mask is applied
4453 anyway later on, before computing advection/coriolis terms.
4454 o modify exp4 to test new obcs support for reading from external files
4455 and for passive tracers
4456 o fix behavior of ptracers_monitor when monitor output is written to a
4457 netcdf-file; still not independent of monitor.F (writes in the same
4458 file).
4459 o change default value of tRef (put a uniform, meaningful value for ocean
4460 & atmos) and initialize sRef (was missing, as Martin mentioned).
4461 o Redefine viscC?Leith*. Change the coefficients of Leith viscosity
4462 to be proportional to enstrophy dissipation length. Thus,
4463 viscC?leith?_new=pi*(viscC?leith?_old)^(1/3)
4464 This is now consistent with Smagorinsky and with the manual.
4465
4466 checkpoint57u_post
4467 o OBCS and PTRACERS: add open boundary support for passive tracers
4468 - either use homogenous (pseudo) v.Neumann conditions or prescribe
4469 OB-values from file; this is not different from the way theta and salinity
4470 are treated
4471 - however, Orlanski-radiation conditions are not supported, and the model
4472 will stop if you use pTracers and Orlanski at the same time.
4473 - beefed up the rountine obcs_external_fields_load: now only those open
4474 boundary values are overwritten with values from files for which there
4475 are really files, otherwise the OB-fields remain untouched. This makes
4476 it possible to use different OBs at different ends of the domain (as
4477 with EXF)
4478 o reduce number of exch calls in shap_filt (s2).
4479 o CS-grid: fix divergence contribution to Leith viscosity. Affects (@
4480 truncation level) 4/5 MLAdjust test results (11&12 digits match).
4481
4482 checkpoint57t_post (2005/10/03)
4483 o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4
4484 o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get
4485 same truncation, independent of the face number: affects affects several
4486 test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5).
4487 o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times);
4488 note that biharmonic viscosity + no-slip was not tested in any experiment.
4489 o fix bug in non-linear free-surf side-drag ; generate new output for
4490 global_ocean.cs32x15(+.thsice) & global_ocean_pressure.
4491 o make mnc honor the writeBinaryPrec flag for most kinds of output
4492 o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum
4493 o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation
4494 error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5).
4495 o add brackets in multi-terms sum to get same truncation, independent of
4496 the face number (manage to get exactly same value of gU,gV at the cs-edge)
4497 affects several test. exp. Update global_ocean.cs32x15 (+.thsice).
4498 o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax
4499 and viscA4Remax, which allow one to limit the minimum viscosity by specifying
4500 a maximum grid-scale Reynolds number. Also, changes all length calculations
4501 in the case of grid anisotropy to geometric mean of dx**2 and dy**2.
4502 Suggested values of viscosity parameters found in mom_calc_visc.
4503 Many new viscosity diagnostics available.
4504
4505 checkpoint57s_post (2005/09/20)
4506 o Add clearing-house for viscosity calculations, mom_calc_visc and
4507 correct numerous bugs in LeithD and Smagorinsky discretizations.
4508 mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be
4509 used simultaneously, and to be used in mom_vecinv and mom_fluxform.
4510 Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F)
4511 and with Strain-Tension viscous term calculation (mom_hdissip.F).
4512 The Strain-Tension form is now called with useStrainTensonVisc=.true.
4513 ViscAhStrain and viscAhTension are now retired.
4514 o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4".
4515 o In response to JMC's bug report, genmake2 now ignores any soft-links
4516 that it finds in the *current* directory when searching for files.
4517 Soft-links found in any other source directories will still work as
4518 they did before.
4519 o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls
4520 a C routine to unlimit the stack size
4521 o mnc-ify pkg/aim snapshot vars
4522 o mnc-ify pkg/land as requested by Daniel
4523 o various changes to mnc including:
4524 - all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format
4525 - output can now be grouped so that all files within a group
4526 change the ITER portion of their names in lock-step together
4527 - can now read ("global") PER-FACE (in addition to PER-TILE) files
4528 and works with both EXCH1 and EXCH2 (but needs more testing)
4529 - writing works for all verification test cases w/ g77 on Linux
4530
4531 checkpoint57r_post (2005/09/07)
4532 o make MNC variable initialization happen earlier
4533 o add diagnostics for (almost) each term of the momentum Eq.
4534 o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics.
4535 o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups)
4536 o remove MINIMAL_TAVE_OUTPUT option ;
4537 add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT).
4538 o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src
4539 allows to compile without pkg/mdsio (& test successfully hs94.1x64x5)
4540 o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice)
4541 o add time-dependent SST, SSS control
4542 o cost terms in ecco/ modularized (new cost_generic.F)
4543 o cost_averages routines are modularized (new cost_averagesgeneric.F)
4544 o new infrastructure for seaice model vs. obs misfits in seaice/
4545 * driver from the_main_loop.F is seaice_cost_driver.F
4546 * first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA)
4547 * gradient check in Exp. 6a of natl_box_adjoint/
4548 o natl_box_adjoint input_seaice for Lab. Sea now available online via wget
4549 (see README file)
4550
4551 checkpoint57q_post (2005/08/19)
4552 o fix initialisation Pb in calc_gw (get NANs in exp5 with g77)
4553 o fix annoying months-old bug in mnc/mdsio output for seaice pkg
4554 - bug was reported by Jean-Michel and Ian Fenty
4555 o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F)
4556 update exp. cpl_aim+ocn output.
4557 o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT
4558 Needed for high-res. runs with large global files
4559 to be able to limit tapelev size
4560 o Changed some tests for adjoint:
4561 * carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT
4562 * natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT
4563 * global_ocean.90x40x15/ back to default 3-level checkpointing
4564 o Modifications to enable scripted COMMON to MODULE conversion
4565 * verification/OpenAD/code/ has necessary scripts and description;
4566 * converts, compiles and runs successfully;
4567
4568 checkpoint57p_post (2005/08/01)
4569 o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F
4570 o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED
4571 (already the case for some pkgs, including recent MNC_init, e.g. thsice)
4572 o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP)
4573 o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F
4574 (was already the case for dissipation with mom_vecinv,
4575 and also the case for grad.PhiHyd when staggered-timeStep)
4576 This will allow to put dissipation out-off the AB time-stepping.
4577 Unfortunately, affects truncation error. Update output of exp. that "fails"
4578 (cg2d matching number) and leave the others for later: front_relax(10),
4579 global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12),
4580 matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2).
4581
4582 checkpoint57o_post (2005/07/30)
4583 o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and
4584 (2) its ready to be documented during the 20050801 DocFest
4585 o MNC-ify the gmredi package -- tested and works w/ and w/o mnc
4586 for ideal_2D_oce and lab_sea on linux_ia32_g77
4587 o set to #undef CTRL_SET_OLD_MAXCVARS_30
4588 in global1x1_tot/code_seaice_adj to access indices 32, 33
4589 (worth another tag)
4590
4591 checkpoint57n_post (2005/07/29)
4592 o adding precip control xx_precip 32
4593 o adding swflux control xx_swflux 33
4594 o Replacing 10 forcing penalty cost routines by 1 generic.
4595 o Implementing partitioning in time-mean and variable adjustment
4596 for atmos. state.
4597 o Time-mean constant error is now read in data.ecco (instead of hard-coded)
4598 o in natl_box_adjoint:
4599 * updated exp 1 to 10
4600 (but does not have time-mean vs. variable split results yet)
4601 o updated global1x1/*_seaice_adj/
4602 to incorporate latest changes
4603 o enable useSingleCpuIO for mdsio vector routines
4604 (applies in particular to tapelev I/O)
4605 o removed inefficient K-loop in all active_file*control*.F
4606
4607 checkpoint57m_post (2005/07/28)
4608 o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into)
4609 and advect_cs (use EXCH-2 and standard cs-32 grid files).
4610 o pkg/exch2: filling of face-corner halo regions is optional
4611 (ifdef W2_FILL_NULL_REGIONS) and is turned off by default.
4612
4613 checkpoint57l_post (2005/07/14)
4614 tag before updating tutorials (pre-release-2)
4615 o add cos & sin of grid-direction orientation angle (curvilinear grid only,
4616 for output and interpolation of input fields onto model grid)
4617 o fix radius in mom_v_metric_cylinder.F (wrong by dy/2).
4618 Affects results of exp. rotating_tank ; update output.txt.
4619 o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor
4620 and taking the square quantity and/or using a fraction-weight field.
4621 o fix aim_diagnostics_init.F mate numbers.
4622 o add mnc output capability to diagnostics/diagstat and update
4623 our cvsignore files for the ACSII output generated
4624
4625 checkpoint57k_post (2005/07/02)
4626 o lab_sea now uses diagnostics package and provides a suite of
4627 new EXF diagnostics output.
4628
4629 checkpoint57j_post (2005/06/30)
4630 o exf
4631 * bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton):
4632 Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982);
4633 terms -2*ATAN(x) + pi/2 were added to both stable and unstable case.
4634 * extended diagnostics output
4635 - now includes all EXF variables
4636 - hs, hl moved to common block
4637 - separate S/R for diagnostics, called after ctrl vector is added
4638 - name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
4639 - EXFqnet contains true Qnet (i.e. includes qsw)
4640 * updated verif. lab_sea, global_with_exf
4641 * Rearranging hflux (exf_mapfields -> exf_getforcing)
4642 to ensure that diagnostics sees a true EXFqnet
4643 o add matlab scripts for CS-grid vectors (in utils/cs_grid)
4644 o diagnostics pkg: change pointers so that 1 diagnostic can be used
4645 several times with different frequencies.
4646 o mnc-ify the thsice package as requested by Daniel Enderton
4647 - the monitor--MNC output needs work
4648 - many attributes need to be added (most are currently blank)
4649 o mnc-ify theaim_v23 package as requested by Daniel Enderton
4650 - many attributes need to be added (most are currently blank)
4651 o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign)
4652 o add Sadourny like discretization to the 4th.O vorticity advection scheme
4653 o fix bug in rStar code (calc_r_star.F) when used with topo/bathy.
4654 update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn,
4655 fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice).
4656 o fix few little things to avoid floating error with -ftrapuv (ifort v9)
4657 (ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F)
4658
4659 checkpoint57i_post (2005/06/19)
4660 o Diagnostics package was changed: diagnostic allocation is now deactivated
4661 by setting an empty file name in the namelist (used to be by setting 0 frequency)
4662 o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ;
4663 add 1rst Order upwind vertical Shear.
4664 o add a quick fix for A/B checkpointing in OFFLINE mode
4665 o add IGNORE_TIME define and -ignore_time option to genmake2 as an
4666 end-run around the C/Fortran linking horror in eesup/src/timers.F
4667 o added pkg/runclock: allows user to terminate run based on wall clock
4668 o added non-hydrostatic scaling parameter: nh_am2
4669 o pkg/my82: futile attempt to make results compiler-independent by adding
4670 some "_d 0", etc. no effect.
4671 o for mnc output, fill the 'T' coordinate var with myTime and create a
4672 separate 'iter' variable for iteration count
4673 o pkg/diagnostics:
4674 add new capability: output of Global/Regional & per-level statistics ;
4675 tested against monitor output (including land & thSIce) on various exp.
4676 o make seaice-pkg I/O type flags (MNC/MDS) more standard.
4677
4678 checkpoint57h_done (2005/05/19)
4679 tag after changing user customized files (DIAGNOSTICS_SIZE.h,
4680 data.diagnostics, data.gchem, data.ptracers) is done.
4681
4682 o pkg/diagnostics: prepare for Global/Regional statistics.
4683 add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h
4684 o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
4685 and rename it: DIFFERENT_MULTIPLE
4686
4687 checkpoint57h_post (2005/05/14)
4688 o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers
4689 o pkg/diagnostics: change output frequency, now in seconds (instead
4690 of Nb of iterations). This requires to change data.diagnostics.
4691 checkpoint57h_pre (2005/05/12)
4692
4693 o in mnc, let the user create the output dir if both mnc_outdir_date
4694 and mnc_outdir_num are false
4695 o add fflags() to pkg/diagnostics which allows one to specify, on a
4696 per-file basis, the file precision [default behavior is unchanged]
4697 o added diagnostics to pkg/kpp, including computation of mixed layer
4698 depth based on a temperature/density criterion
4699 o updated verification/natl_box to test the new pkg/kpp diagnostics
4700 o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T)
4701 o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4)
4702 o fix mnc flags in pkg/seaice so that they are "owned" by seaice,
4703 not mnc -- this mistake was found by JMC and is now corrected
4704
4705 checkpoint57g_post (2005/04/15)
4706 o add Adams-Bashforth 3rd Order time stepping:
4707 - default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3)
4708 - not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ...
4709 checkpoint57g_pre (2005/04/15)
4710
4711 o make lambda[Theta,Salt]ClimRelax spatially varying
4712 (default remains spatially uniform constant based on tau)
4713 o added new control variables
4714 * init. uVel, vVel, etanN
4715 * lambda[Theta,Salt]ClimRelax
4716 o separate masks used for ctrl_pack/unpack 'from write_grid' output
4717 (suggested by G. Forget)
4718
4719 checkpoint57f_post (2005/04/06)
4720 o add parameter "baseTime" = model base time = time at iteration zero
4721 new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to
4722 account for baseTime shift
4723 o move Coriolis arrays from PARAMS.h to GRID.h
4724 checkpoint57f_pre (2005/04/06)
4725
4726 o mnc-ifying the seaice package
4727 o introduced an alternative length scale calculation for use in the limiting
4728 maximum viscosity (off by default, see mom_vi_hdissip.F for details)
4729 o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S
4730 o added modified Leith scheme with viscosity proportional to grad(Hdiv)
4731 as well as grad(vort3). Made it compatible with both approximate form
4732 for the cubed sphere and full form of these gradients. Added flag
4733 useFullLeith to select between approximate and full form.
4734 o add "d0" in getcon.F to reduce differences between compilers/platforms
4735 update output.txt of exp. fizhi-gridalt-hs
4736 o change port_rand funtion to allow to set the seed.
4737 o fix obscure MNC bug involving conversion between reals and integers
4738 - it caused no problems with certain (eg. gcc, ifc) compilers but the
4739 new version is now more standards-compliant
4740 o adjoint-related modifications
4741 * gad_dst3_adv_?: to be able to use advscheme=30 in adjoint
4742 * gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33
4743 * mom_vi_hdissip: to be able to use Leith scheme in adjoint
4744
4745 checkpoint57e_post (2005/02/28)
4746 o Adding eddy stress controls a la Ferreira et al.
4747 checkpoint57e_pre (actually was tagged: eckpoint57e_pre)
4748
4749 o fizhi pkg: fix AtoC and CtoA when called with same input & output array
4750 update output.txt of exp. fizhi-gridalt-hs
4751 o add more "Z" dimensions and associated coordinate vars to MNC
4752 o pkg/exf: added twoDigitYear capability for option useExfYearlyFields
4753 o parameter calendarDumps: when set, approximate months (30-31 days) and years
4754 (360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq,
4755 KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar
4756 months and years. Requires pkg/cal.
4757 o diagnostics: add pickup functionality
4758 - off by default for backwards compatibility
4759 - current version only uses MDSIO -- MNC will be added
4760 o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies.
4761 o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2)
4762
4763 checkpoint57d_post (2005/02/11)
4764 o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing
4765 o modify verification/ideal_2D_oce so that it tests the creation of mnc
4766 output from the diagnostics package
4767 o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up
4768 o make genmake2 more portable by using ".$FS" instead of ".f" for more
4769 of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys)
4770 o add coordinate variables to the MNC output from the diagnostics package
4771 o change MNC-flags default value: true when useMNC=TRUE
4772 o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F
4773 the ability (off by default) to read the grid information using MNC
4774 o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt
4775 o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging
4776 o do snap-shot diagnostics at the middle of the time-interval (instead of
4777 at the end).
4778 o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add
4779 new test for AIM with thSIce + slab-ocean
4780 o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h)
4781 o move state variable diagnostics to the beginning of the time step ;
4782 (note: still needs some work specially for snap-shot diagnostics)
4783 duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z
4784
4785 checkpoint57c_post (2005/01/27)
4786 o Change testing option (-ieee) to get closer agreement between g77 & ifort
4787 o generate new output.txt files on faulks with g77 & the new -ieee option
4788 checkpoint57c_pre (2005/01/27)
4789
4790 o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF);
4791 update output.txt of exp. global_ocean.90x40x15
4792 o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer
4793 results; update global_ocean_pressure & global_ocean.cs32x15 output.txt
4794 o add saltFlux(+File) forcing capability with periodicExternalForcing
4795 o allow to use pkg diagnostics for GM-Redi & ThSIce output
4796 o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc.
4797 o improvements for the MNC output from DIAGNOSTICS:
4798 - correct handling of the unlimitied dimension
4799 - all dims now have associated coordinate variables
4800 - variables located at U, V, and Corner ("Z") points are now written
4801 with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that
4802 *all* data points are output
4803 o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice
4804 o added pkg/seaice/seaice_monitor.F
4805 o mdsio_readfield.F can now read files visible only to master MPI process.
4806 o pkg/seaice: some test code for ice-modified ocean stress
4807 o exf_getffields interpolation defaults to bilinear for all scalar forcing
4808 fields (remains bicubic for wind velocity and stress). This avoids, e.g.,
4809 spurious negative numbers for precipitation and humidity. Will cause
4810 some small numerical differences for integrations using pkg/exf/exf_interp.F.
4811 o pkg/ctrl/
4812 * Add ctrlvec diagnostics in pack/unpack for nondimensional I/O
4813 May be enabled via doPackDiag
4814 * introduce z-scaling of
4815 + gradient (doZscalePack) and
4816 + control (doZscaleUnpack)
4817 o pkg/mdsio/
4818 * enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F
4819 * N.B.: leave tiled I/O for tapelev (i.e. mds...vector)
4820
4821 checkpoint57b_post (2004/12/20)
4822 o simplify options in diagnostics_fill arguments (remove weird combinations)
4823 o fix MNC coordinate variables so that they now contain per-face index
4824 values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in
4825 general, EXCH2 grids are only aligned to a "local" coordinate system
4826 o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput)
4827 o Implement instantaneous output within pkg diagnostics:
4828 setting a negative frequency in data.diagnostics produces
4829 "snap-shot" output (as opposed to time-average if freq > 0)
4830 o move out off EQUIVALENCE all diagnostics that fizhi does not use ;
4831 NOTE: change ptracer diagnostics name: use 2 characters to work with
4832 more than 9 tracers. Add also diagnostics of advect & diffus flux.
4833 o more CF compliance: convert all MNC 'iter' variables to 'T' so that it
4834 becomes the coordinate variable for the 'T' dimension
4835 o add CF-style coordinate variables to MNC
4836 - just a first cut: numbers are meaningless on the cubesphere and
4837 missing along the T axis but otherwise it works!
4838 o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX
4839 o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC.
4840 o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon)
4841 this is based directly on what the model compute, so that the content of
4842 each diagnostics might be affected by switching options (e.g., implicitDiffusion)
4843 o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F)
4844 o clean up build options files for SunOS, in particular
4845 - remove -traditional from xmakedepend
4846 - change -xarch=v9 to -xarch=native for f77
4847 - restore use of make (not gmake)
4848 - add CC=gcc if using g77
4849 o changes per discussion of AM, JMC, & EH3 today:
4850 - move redundant "grid" variables out of "state" -- in preparation of
4851 creating proper CF-style coordinate variables and in recognition
4852 that any/all grid variables can be easily copied (eg. w/NCO) from
4853 the grid files into any of the other NetCDF files
4854 - *always* output grid variables with MDSIO (this will eventually be
4855 changed)
4856 - output MNC grid file if useMNC is true
4857 o every instance of _END_MASTER() has been found and replaced with
4858 _END_MASTER( myThid ) in order to satisfy certain picky Sun
4859 preprocessors
4860 o re-arrange diagnostics pkg initialisation:
4861 - allow each package to extend the available diagnostics list
4862 - add some checking and fix small problems (multi-threaded, ...)
4863 - new S/R diagnostics_fill (replace fill_diagnostics):
4864 look through the short list of active diag. (instead of the long list)
4865 create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active
4866
4867 checkpoint57a_post (2004/12/10)
4868 o this set of changes restores TAMC compatibility
4869 tested for global_ocean.90x40x15 adjoint on trough
4870 (what a pain)
4871
4872 checkpoint57a_pre (2004/12/10)
4873 o some modifs in tools/build_options for sunos
4874 o call ctrl_pack for ctrl at end for optimcycle=0
4875
4876 checkpoint57 (2004/12/09)
4877 o add horizontal bi-harmonic viscosity for vertical velocity
4878 - new parameter viscA4W (defaults to viscA4)
4879 - affects only non-hydrostatic code
4880 - to be done: no-slip lateral boundary conditions
4881 o switch back to "sflux = sflux - runoff" in exf_getforcing.F
4882 o implement Implicit Vertical advection for pTracers
4883 o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k)
4884 (implemented also for implicit vertical diffusion & advection)
4885 o OBCS: extend application of tracer open boundary conditions
4886 to a strip beyond the boundary of width Olx/Oly
4887 o add call monitor to TAF set of required calls (flow directives)
4888 and include in natl_box_adjoint
4889 o untangle a few ifdefs related to cost, ctrl, autodiff
4890 untangel a few ALLOW_ECCO_OPTIMIZATION
4891 o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr)
4892 (theta2, salt2 in ecco_cost_weights)
4893
4894 checkpoint56c_post (2004/12/03)
4895 o OBCS as control variables
4896 - update ctrl_ad_diff.list, obcs_ad_diff.list
4897 - remove balance of obcs controls from default
4898 - fix index bug nobcs in ctrl_init
4899 - fix dummy fields filen in ctrl_pack
4900 - add dummy weights for obcs
4901 o lsopt: comment out fort.94 output
4902 o optim:
4903 - remove unnecessary header files
4904 - adjusted namelists
4905 - add xerbla.F to Makefile
4906 o exf:
4907 - multiple modifications of exf_check_range
4908 - unit change in exf_init_runoff from [m/year] to [m/s]
4909 o mdsio:
4910 - i/o-vector change debugLevel from debLevA to debLevB
4911
4912 checkpoint56b_post (2004/12/01)
4913 o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that
4914 is called from DO_THE_MODEL_IO
4915 - rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE
4916 - introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq)
4917 - clean up PTRACERS_WRITE_TIMEAVE a little
4918 o add another verification experiment that tests both the cfc-pkg and
4919 the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with
4920 reactive tendencies treated inline with regular timestepping
4921 o testreport previously did a lousy job of comparing small numbers, so
4922 we (Ed and Martin) changed the way the cut-off of 1.e-12 is
4923 implemented in the little c-progam tmp_cmpnum.c which is embedded in
4924 testreport.
4925 o ptracers_monitor: bug fix for MPI
4926
4927 checkpoint56a_post (2004/11/28)
4928 o GCHEM: finish reorganizating the package
4929 - forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency
4930 (introduces another 3D-array for each passive tracer, but only if
4931 GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING
4932 gchemTendency is not needed because the timestep is done separately)
4933 - gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY
4934 - GCHEM is now---more or less cleanly---separate from PTRACERS
4935 - to bo done: handling of surfaceForcingPtr that is needed for KPP not
4936 so clear to me how that should be done in a general way.
4937 o CFC: improve formatting of output in CFC_ATMOS
4938 o PTRACERS:
4939 - rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so
4940 that ALL experiments with ptracers enable can be checked. This makes
4941 GCHEM_MONITOR obsolete.
4942 - include a runtime parameter PTRACERS_monitorFreq that defaults to
4943 monitorFreq
4944 - set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true
4945 o add PTRACERS (PTR0[1-5]) to testreport output
4946 o exf_check_range:
4947 * default changed to .TRUE.
4948 * will check values for niter0 if debLevA, every timestep if debLevB
4949 * STOP in exf_check_range if 'out of range'
4950 * range chosen generous to allow for potential extema
4951 TBD: a version with stricter range
4952 permitted range would be runtime parameters
4953 o GMredi:
4954 - fix ldd97 slope limit ; extend valid domain of Psi-Bolus ;
4955 - change S/R GRAD_SIGMA to be valid in the overlap on CS-grid.
4956 - change the default GMREDI_OPTIONS.h: compile everything except Visbeck
4957 o GCHEM:
4958 - move call to GCHEM_FORCING_SEP, so that it is now called before
4959 the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP
4960 - introduced a useGCHEM runtime flag and applied it everywhere.
4961 - renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING;
4962 this flag is now only visible within GCHEM-pkg routines.
4963 - moved gchem_forcing_int temporarily into ptracers_forcing, this will
4964 be replaced by a 3D array that is computed before thermodynamics; for
4965 this, the tracer ID iTracer had to be included into the parameter list
4966 of ptracers_forcing
4967 - set up forward_step to call gchem_forcing, that will replace
4968 gchem_forcing_int in ptracers_forcing
4969 - cleaning up
4970 o small cleaning of exch2: remove files that are also in eesupp/src
4971
4972 checkpoint56 (2004/11/17)
4973 o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0
4974 o mnc: cleanup "full" files--fixes out-of-memory problem
4975 o ECCO-GODAE
4976 * model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup
4977 * fully merged and updated from SIO code
4978 windstress sign change affects
4979 - exf_inscal_[u/v]stress
4980 - sign of xx_tau[u/v] adjustments
4981 - signs in cost_scat
4982 * ctrl_get_gen: avoid update of tau[u/v] for first few days
4983 * natl_box_adjoint updated and compressed
4984 * 2-level checkpoint switch added
4985 (tested in EXP. 1 of natl_box_adjoint)
4986 * new switch doInitXX to avoid init. of xx_... in optimcycle=0
4987 o SVD
4988 * first complete, non-hacked version for SVD calculations
4989 * all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_...
4990 performed via direct access files admtlm_vector.it????
4991 (via ctrl_[un]pack)
4992 * optimcycle is used for ARPACK iteration counter
4993 (note: adxx_... is iterated, rather than xx_...; latter is constant!)
4994 * EV problem ok w.r.t. L2-norm in tangent space; need to check other norms
4995 and add linear transforms where necessary
4996 * controls are initial/final SST, SSS (can be extended; need to check
4997 ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F
4998 o mdsio: filename info to both stderr, stdout
4999 o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec]
5000 from sign change
5001
5002 checkpoint55j_post (2004/11/10)
5003 o isolate dissipation tendency (allow to keep it out off AB) in V.I form.
5004 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
5005 o add consistent build directories and .cvsignore files to verification
5006 o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity
5007 o make all subroutines 30 or less characters in length for certain older
5008 compilers to work (a thorough search only turns up two routines in
5009 pkg/ptracers)
5010 o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity;
5011 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
5012
5013 checkpoint55i_post (2004/10/28)
5014 o change arrays for total vertical diffusivity (2.D if explicit,
5015 3.D if implicit) ; each ptracer uses its own background value.
5016 o added mnc/NetCDF output capability to ocn_compon_interf
5017 - added bits to verification/cpl_aim+ocn so that it can run on
5018 ITRDA and other clusters without the mpirun "-wd" option
5019 o fixed wayward endif in mom_fluxform.F that messed up cyclindrical
5020 configuration
5021 o give MNC the ability to create additional files rather than
5022 exceeding a specified file size limit "MNC_MAX_FILESIZE"
5023 - the default is just less than 2GB which is a practical limit
5024 on many systems
5025 o Compute the non-local term using either KPP vertical diffusivity (=default)
5026 or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T)
5027
5028 checkpoint55h_post (2004/10/20)
5029 o add verification test "vermix"
5030 o remove all the *_ioinc flags and replace with the single global
5031 outputTypesInclusive flag
5032 o allow to set a vertical profile of vertical diffusivity for T & S
5033 o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS
5034 o useMNC moved from data.mnc to data.pkg
5035
5036 checkpoint55g_post (2004/10/14)
5037 o Renaming carbon AD experiments to comply with testreport conventions
5038 o Updating adjoint of Held-Suarez hs94.1x64x5
5039 o Fixing directives for non-ECCO forward_step, after ECCO directives
5040 have been fixed to avoid recomp. of do_oceanic_phys
5041 Works well for global_ocean.90x40x15,
5042 but recomp. issue remains for carbon
5043 o Updating adjoint output for natl_box_adjoint after
5044 pkg/ecco has been modified (see taga c55d_post)
5045
5046 checkpoint55f_post (2004/10/13)
5047 o rename to timeave_init_fixed
5048
5049 checkpoint55e_post (2004/10/13)
5050 o some delicate re-shuffle of store directives to avoid one
5051 extra call of do_oceanic_physics
5052 affects ecco_the_main_loop.F, do_oceanic_physics.F
5053 checkpoint_lev1_directives.h
5054 o NB: this may break global_ocean adjoint temporarily,
5055 but it is clear how to fix it. Will do later, need this now.
5056
5057 checkpoint55d_post (2004/10/11)
5058 o ECCO specific cost function terms (up-to-date with 1x1 runs)
5059 o ecco_cost_weights is modified to 1x1 runs
5060 o modifs to allow observations to be read in as
5061 single file or yearly files
5062 o enable to read exf forcing fields as either
5063 single file or yearly files (flag useExfYearlyFields)
5064 checkpoint55d_pre (2004/10/08)
5065
5066 o switch between 2-level and 3-level checkpointing
5067 o add ability of MNC to write local and "partial" (eg. 2D slices where
5068 the full 3D field is never actually stored) arrays to NetCDF files
5069 with the correct (that is, the complete multi-dimensional) set of
5070 array indicies
5071 - used in mom_vecinv() to write the diagFreq output
5072 - tested (demonstrated) in verification/aim.5l_cs
5073 o further mnc-ification
5074 - add verification/lab_sea to the list with mnc setups
5075 - fix undefined mnc v-names in cd_code
5076 - add kpp to mnc output (both snapshot and timeave)
5077 o non-hydrostatic code
5078 - added horizontal viscosity parameter viscAhW for w, that replaces viscAh
5079 in calc_gw.F
5080 - defaults to viscAh
5081 - this is useful, when I want to use viscAh=0 (e.g., only biharmonic
5082 friction or Leith) in non-hydrostatic mode, as long as there is
5083 no biharmonic friction and/or Leigth or equivalent for vertical velocity.
5084 o pkg/cost
5085 extend simple cost functions to treat time mean quantities
5086 (T,U,V) via cost_accumulate_state from cost_tile
5087 o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to
5088 be 2 times larger than the minimum size the advection scheme requires.
5089 now get a perfect conservation of salt in advect_cs test-exp (updated)
5090 o GGL90 (Gaspar's TKE mixed layer)
5091 - add horizontal diffusion of TKE, requires exchanges in
5092 do_fields_blocking_exchanges, horizontal diffusivity is zero by
5093 default. In OPA there is no horizontal diffusion of TKE but the
5094 mixing coefficients are computed from a horizontal average of TKE of
5095 6 points or so. I think that diffusion has a little more physical
5096 justification.
5097 - clean up ggl90_calc in the hope of reducing memory usage (this hope
5098 was in vain)
5099 - mask tke-variable in ggl90_init
5100 o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass)
5101 o fix biharmonic diffusion on CS-grid.
5102 o more obcs stuff
5103 - added obcs_external_fields_load as an alternative to the EXF-pkg option
5104 for reading boundary values. This routine is called from
5105 obcs_prescribe_read
5106 - updated obcs_check
5107 - changed sponge layer relaxation parameter units for days to seconds
5108 - turned off sponge layer by default
5109 - changed argument list of OBCS_CALC to myTime+deltaTclock
5110 - fixed about 35 bugs in obcs_external_fields_load
5111
5112 checkpoint55c_post (2004/09/23)
5113 o obcs stuff
5114 - new runtime flags useOBCSprescribe, useOBCSbalance
5115 - re-arranged obcs_calc
5116 - moved exf_getobcs to obcs_prescibe_read
5117 obcs_prescibe_read is called after ORLANSKI stuff
5118 and independent of it (executable can contain all).
5119 - updated obcs_check
5120 - added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE.
5121 These may be necessary only if tangential velocities are
5122 prescribed at OB, not sure, needs testing.
5123 o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments
5124 which simplifies the calls and passes the ifc check-bounds test
5125
5126 checkpoint55b_post (2004/09/22)
5127 o add a 2D scalar, Z location, exchange_2 routine.
5128 o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows
5129 to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)]
5130 affects advect_cs results (for the wrong reason): update output.txt
5131 o use a more standard discretization for biharmonic viscosity ;
5132 (original version still available with #define MOM_VI_ORIGINAL_VISCA4 )
5133 affects results of dome set-up: update output.txt
5134 o fix gad_advection.F (CubedSphere part), back to version 1.23
5135 o fix bug in mom_vi_del2uv.F (CubedSphere part).
5136
5137 checkpoint55a_post (2004/09/20)
5138 o merged code to
5139 * prescribe/read time-dependent open boundaries
5140 (works in conjunction with exf, cal)
5141 * sponge layer code for open boundaries
5142 * each boundary N/S/E/W now has its own CPP option
5143 (healthy for the adjoint)
5144
5145 checkpoint55 (2004/09/17)
5146 o up-to-date adjoint of previous breaks
5147 - natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix
5148 - global_ocean_ebm: adjoint still needs fix (TLM ok)
5149 - global_ocean.90x40x15: extended GMREDI_OPTIONS.h
5150 - carbon: * remove tr1-related adjoint verification
5151 * add ptracer as control variable
5152 o remove all tr1-related code (ALLOW_PASSIVE_TRACER)
5153 (adjoint stuff still has some tr1 'names', but all use ptracer arrays)
5154
5155 checkpoint54f_post (2004/09/16)
5156 o in verification/carbin/ remove experiment related to
5157 ALLOW_PASSIVE_TRACER (array tr1 etc)
5158 code_ad/ input_ad/ results_ad
5159
5160 o add two new packages
5161 - ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993)
5162 + subject to optimization (memory)
5163 - opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997)
5164 + subject to reordering (many GOTOs in the original code)
5165 + so far opps is called for every (i,j) point, and then operates in
5166 the vertical; one may want to reorder the scheme in order operate in
5167 horizontal slabs at the cost of (a lot of) memory, at least ten new 3D
5168 fields)
5169 o overhaul of IO so that we now have flags for MDSIO and/or MNC
5170 - all verification tests compile and run with linux_ia32_g77
5171 - defaults are compatible with current input files--nothing
5172 should change if you were not previously using MNC
5173 - MNC output has been added in numerous places (eg. timeave)
5174 but there are still a few writes not yet do-able with MNC
5175 (this is in progress)
5176 - flags now allow for either/or/both use of MDSIO and MNC and
5177 documentation will soon follow
5178 - numerous small formatting cleanups for ProTeX
5179 o add version info (via BUILD_INFO.h) to MNC and stdout
5180
5181 checkpoint54e_post (2004/09/02)
5182 o add two new packages
5183 - pp81 (Packanowski and Philander, 1981), Richardson number and
5184 stratification dependent mixing
5185 - my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme
5186 - these scheme operate in a similar manner as KPP (without ghat, of
5187 course), however there is only one diffusivity that is used for both
5188 temperature and salinity (and passive tracers)
5189 o add offline package
5190 o add "verification/dic_example" which contains a dic-gchem-ptracer setup
5191 provided by Stephanie Dutkiewicz
5192 o genmake2: add ability to search for C compilers and cleanup test output
5193 - fixes recent SX-6 problems and should help with others (eg. HP-UX)
5194
5195 checkpoint54d_post (2004/07/27)
5196 o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed
5197 o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong,
5198 leading to additional shift by 5 days each year of integration
5199 (i.e. leading to considerable offset over the years)
5200 o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep
5201 o start with no AB and no initial filtering (staggerTimeStep):
5202 change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5
5203 o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F
5204 (external loading & cpl import/export stay in forward_step.F)
5205 o update coupling interface to work with new staggerTimeStep
5206 o change MDSIO ptracers_pickup.
5207 o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F);
5208 o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*")
5209 o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell)
5210
5211 checkpoint54c_post (2004/07/18)
5212 o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr
5213 this affects (truncation error) output.txt of test-exp:
5214 global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box
5215 o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array)
5216 o change Qnet to always be the net heat flux, (+upward).
5217 affects (truncation error) output of natl_box exp.: updated
5218 o define the max number of passive tracers in PTRACERS_SIZE.h
5219 o start to test mnc routinely in exp0
5220 o add sea-ice loading (sIceLoad) as a new forcing field.
5221
5222 checkpoint54b_post (2004/07/08)
5223 o add testreport "-j JOBS" option for parallel builds (tested and pretty
5224 impressive on Altix and Opteron systems)
5225 o diagnostics can now write NetCDF files through the mnc package
5226 o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output
5227 o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added
5228 o staggerTimeStep & NLFS: rescale T & S surface tendencies.
5229 affects (truncation error) output of lab_sea & natl_box exp.: updated
5230 o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.)
5231
5232 checkpoint54a_post (2004/07/06)
5233 o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order).
5234 o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.)
5235 o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished)
5236 o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D)
5237 + internal_wave (shift in writing cg2d_ini_res)
5238 checkpoint54a_pre (2004/07/05)
5239
5240 o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice
5241 - modified verification/lab_sea and natl_box_adjoint accordingly
5242
5243 checkpoint54 (2004/07/02)
5244 checkpoint53g_post (2004/07/02)
5245 o prepare splitting of thermodynamics: store convect.counter in common block
5246 o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error)
5247 output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave
5248 o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection
5249 o new parameter "nShapS": allow to treat differently S from T (nShapT)
5250 o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S)
5251 o restore adjointability
5252
5253 checkpoint53f_post (2004/06/25)
5254 o modifications that affect AIM experiment results (update output.txt):
5255 - no advection of S at top interface Nr (pkg/generic_advdiff)
5256 - air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F)
5257 o AIM pkg:
5258 - include stability function into surf.Flux derivative relative to Tsurf
5259 - calculate clear-sky radiation & surface temp. change (for diagnostics)
5260
5261 checkpoint53e_post
5262 o merged cylindrical coord configuration
5263 o added rotating_tank experiment
5264 checkpoint53e_pre
5265
5266 checkpoint53d_post (2004/06/14)
5267 o faulks upgraded: re-generate output.txt that have changed:
5268 global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box
5269 o Added Bryan and Lewis, 1979, vertical diffusivity profile
5270 o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing.
5271 o added Sadourny discretization of Coriolis
5272 - moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h
5273 - re-enabled use of omega3 (useAbsVorticity)
5274 o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for
5275 vector-invariant equations
5276 - note: does *NOT* yet use same variable visc. for no-slip BC's.
5277 o recoded the lateral boundary conditions for non-hydrostatic w, this time
5278 hopefully without new bugs
5279 - still to do: biharmonic friction for non-hydrostatic w
5280 o bug fix for mom_*_sidedrag: rA -> rAs,rAw
5281 o regenerated output for global_ocean_ebm (using -ieee)
5282 o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation
5283 of mom_common/
5284 - simple re-arrangement of instructions within computing loop
5285 checkpoint53d_pre (2004/05/21)
5286
5287 checkpoint53c_post (2004/05/21)
5288 o new version of coupler for AIM+thSIce and Ocean models
5289 - new fields (SSS,h_MixLayer ...) are exchanged through the coupler
5290 - land: change Evaporation of snow
5291 - aim with thSIce: fix bug in snow-precip.
5292 o changes to calc_gw.F
5293 - bug fix for w^2 term near the bottom boundary
5294 - (hopefully) improve the lateral slip boundary condtions for use with
5295 partial/looped cells
5296 - because the bug fix changes two verification experiments anyway (exp5
5297 and plume on slope), change the lateral boundary condition from half slip
5298 to the value of no_slip_sides
5299 o ebm package wasnt quite up to the parallel task. Fixed that.
5300 o Adjoint of EBM package + verification
5301 * TLM OK
5302 * ADM not sufficient accuracy yet (needs further testing)
5303
5304 checkpoint53b_post (2004/05/14)
5305 o Commiting new energy balance model to repository
5306 * package is pkg/ebm
5307 * verif. is verification/global_ocean_ebm
5308 * references are in ebm_driver.F
5309 C * X. Wang, P. Stone and J. Marotzke, 1999:
5310 C Global thermohaline circulation. Part I:
5311 C Sensitivity to atmospheric moisture transport.
5312 C J. Climate 12(1), 71-82
5313 C * X. Wang, P. Stone and J. Marotzke, 1999:
5314 C Global thermohaline circulation. Part II:
5315 C Sensitivity with interactive transport.
5316 C J. Climate 12(1), 83-91
5317 C * M. Nakamura, P. Stone and J. Marotzke, 1994:
5318 C Destabilization of the thermohaline circulation
5319 C by atmospheric eddy transports.
5320 C J. Climate 7(12), 1870-1882
5321 o Will need long integration testing.
5322 checkpoint53b_pre (2004/05/14)
5323
5324 o created pkg/mom_common in preparation for variable viscosity code
5325 o renamed and split ini_mnc_io
5326 o pkg/land: only liquid water can diffuse or run-off
5327 o AIM using land: soil wetness availability account for snow
5328 o added printMapIncludesZeros to EEPARMS namelist
5329
5330 checkpoint53a_post (2004/05/11)
5331 o restore TAMC compatiility for exf_constants.h
5332 (no usage of _d in .h)
5333 o Additional storing in KPP in an attempt to fix
5334 TAMC problem with adjoint of KPP code.
5335 (no success...)
5336 Identical code works fine with TAF.
5337 o Fixed verification/natl_box_adjoint experiments.
5338 Initial conditions for Experiments 4 and 5 are now
5339 set to "SEAICE_initialHEFF=0", which is more reasonable,
5340 and hence gives results closer to that of Experiment 2.
5341 Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again.
5342
5343 checkpoint53 (2004/05/06)
5344 o stable checkpoint with up to date adjoint
5345 TLM tests only run for 1st grdchk at the moment. Its unclear if
5346 this is a code problem or a problem with resetting code for g_
5347 variables that is being autogenerated wrong.
5348 Otherwise:
5349 o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix.
5350 o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ)
5351 are both still in chaos following their security messes.
5352
5353 checkpoint52n_post (2004/05/06)
5354 o various build (mostly genmake2) changes including:
5355 - ability to build/run more easily within Cygwin and MacOS X
5356 - more complicated Makefiles with a stronger dependence on Gnu Make
5357 o pkg/seaice modifications
5358 - added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost
5359 of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer
5360 and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm
5361 - changed proxy for geostrophic velocity and updated
5362 verification/lab_sea/results/* accordingly
5363 - removed ADI dynamic solver from pkg/seaice
5364 - replaced all occurrences of 1/CSTICE or 1/CSUICE
5365 they caused a segmentation fault under certain circumstances
5366 - removed unused field WATR
5367 o bug fix in exf-package:
5368 - u/vwind are defined at tracer/pressure points. The values of u/vwindmask
5369 now reflect that.
5370 o small fixes in the cal-package:
5371 - set reference date to first of January for the 'model'-calendar
5372 - failing of cal_CheckDate in cal_FullDate now actually results in a
5373 warning
5374 o small modifications in exf-package to increase flexibility:
5375 - change climtempfreeze from a constant to a runtime parameter that
5376 is specified in data.exf_clim (default = -1.9)
5377 - introduce runtime parameter windstressmax (default = 2.0) that is
5378 specified in data.exf
5379 o fix in pkg/thsice:
5380 - update Evap (Tsf changes) to be consistent with Latent heat flux
5381 - maintain snow precipitation unchanged (even if Tsf >=0).
5382 both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice
5383
5384 checkpoint52m_post (2004/04/18)
5385 o commented out call to cal_GetMonthsRec in swfrac.F and added some comments;
5386 this does not change any of the results, because myIter=0 in swfrac always
5387 lead to jwtype=2 (the default anyway), but the call makes little sense
5388 as a default
5389 o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated
5390 o re-work pkg/thsice interface with ocean & bulk_force pkg to allow
5391 atmospheric model (AIM) to use it ; add a "slab ocean" component.
5392 o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice)
5393 o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice
5394 o extending useSingleCpuIO option to work with new exch2 I/O format
5395 - old-style, missing-tile I/O is still accessible by defining CPP
5396 option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h
5397 o monitor package can write to NetCDF files and/or STDOUT
5398 o fix re-definition bug in MNC_GRID_INIT_ALL()
5399 o doc/api_reference added
5400 - a framework for building an API Reference Manual using all
5401 the "protex" comments embedded in the code
5402 - see pkg/generic_advdiff, pkg/mnc for examples
5403 o MNC:
5404 - make myThid the last argument for all subroutines
5405 - new default for the grid files: NO halos
5406 - add useMNC and other run-time flags
5407 - separate per-file-group handling of the unlimited dimension
5408 - early initialization of MNC w/ flags read at the eeboot stage
5409 and lookup tables set in initialize_fixed
5410 - write all MNC output to a freshly-created directory
5411 o thermodynamics sea-ice (thsice) is now tested with testreport.
5412 o test exp. advect_cs: use the standard cs32 grid ; update output.
5413 o Added functionality to grdchk:
5414 pick global i,j,k position (or nearest wet) where to perform check.
5415
5416 checkpoint52l_post (2004/03/11)
5417 o new land formulation:
5418 a) use ground enthalpy as prognostic variable to ensure exact
5419 energy conservation.
5420 b) account for water temperature and for latent heat of freezing
5421 in all processes (rain, run-off, ground storage)
5422 c) compute surface and ground temperature implicitly.
5423 o aim_v23 modification for new land model:
5424 a) Treat separately land / ocean / sea-ice surface fluxes
5425 to allow implicit computation of land & sea-ice surface temp.
5426 b) add snow precipitation.
5427 checkpoint52l_pre (2004/03/11)
5428
5429 o fix problem (when 1 tile is empty) in min/max monitor.
5430 o fix bug in timeAve (u,vZetatave in common block)
5431 o no restoring terms under ice for pkg/seaice
5432 o moved SEAICE_DO_DIAGS to S/R do_the_model_io
5433 o bug fix for pkg/seaice pickups
5434 o change MNC call locations and add coordinate attributes
5435 o mask vorticity at the corner ; affects global_ocean.cs output
5436 o fix ini_curvilinear_grid ; test CS experiments with mpi
5437 o aim.5l_cs: modify sea-ice fraction input file ; update output
5438 o exf: Adding simple range check routine for exf fields after read
5439
5440 checkpoint52k_post (2004/02/23)
5441 o removed top-level directory "diags"
5442 - we migrated these functions to pkg/timeave a long time ago
5443 o fixed bug introduced in pkg/monitor
5444 o accuracy ctrlprec = 32 insuffient for gradient checks using
5445 averaged fields (I/O via cost_averages)
5446 -> use ctrl.h in active_file*.F to control I/O precision.
5447 o paramter list of CALL ADTHE_MAIN_LOOP
5448 o added initial do_the_model_io to ecco
5449 o set all ...Freq to zero after cost_final
5450 taveFreq, dumpFreq, pChkptFreq
5451 o MAIN and ECCO differentiability restored
5452
5453 checkpoint52j_post (2004/02/18)
5454 o fix nchklev in tamc.h for global_ocean...
5455 o Bringing flow and store directives up-to-date
5456 o Really weird thing!
5457 call do_the_model_io from the_main_loop with parameters
5458 starttime, niter0, instead of mytime, myiter, screws up the adjoint:
5459 TAF places a faulty re-call of initialise_varia
5460 after cost_final call which should not be there!
5461 checkpoint52j_pre (2004/02/03)
5462
5463 o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and
5464 error messages
5465 o fix errorMessageUnit problem. remove old version of mdsio from eesup/src
5466 o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating
5467 debug output
5468 o modfied mdsio_writefield.F to handle non-global files under exch2
5469 o update AIM Cubed-Sphere exp (aim.5l_cs):
5470 use land, p*, and Franco.M forcing fields with fractional land-sea mask.
5471 o update AIM Equatorial Channel exp:
5472 use standard aim_v23 pkg and change the SST fields to be more realistic.
5473 o globalFile now works with exch2
5474 o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and
5475 mon_vort3.F to make exch2 friendly with >1 tile per cube face
5476 o limit timeave output for hi-res integrations
5477
5478 checkpoint52i_post (2004/01/21)
5479 o removed CPP_EEOPTIONS.h from verification/*/code
5480 o updated the tiling for global_ocean_pressure
5481 checkpoint52i_pre (2004/01/20)
5482
5483 o update aim.5l_LatLon using the standard aim_v23 pkg (instead of
5484 the old pkg/aim).
5485
5486 checkpoint52h_pre (2004/01/20)
5487 o shortened offending lines in exch2_send_rx?.template
5488 o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator
5489 o genmake2: add build & execute test for NetCDF code
5490 o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed
5491 old grid files, moved CPP_EEMACROS.h to pkg/exch2
5492 o added useSingleCPUIO flag to monitor.F and mon_out.F
5493 o added temporary hack for sea-ice dynamics on the cube:
5494 metric terms are ignored and it is assumed that
5495 there is no sea-ice on cube faces 1, 2, 4, and 5.
5496
5497 checkpoint52f_post (2004/01/09)
5498 o added exch2 cube routines to pkg/exch2
5499 o modified hs94.cs-32x32x5 to use it
5500 o added new grid files to hs94.cs-32x32x5
5501 checkpoint52f_pre (2004/01/07)
5502
5503 checkpoint52e_post (2004/01/07)
5504 o first attempt to solve vertical advection (momemtum & T,S) Implicitly
5505 for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom)
5506 o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F)
5507 to work with implicit vertical advection and AB ;
5508 o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme.
5509 o update output (gad_calc_rhs.F changes affect truncation error) of exp:
5510 front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box
5511 checkpoint52e_pre (2004/01/02)
5512
5513 o fix bug in impldiff when Nr=1 or Nr=2.
5514 o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt
5515 o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test.
5516 o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2
5517 ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure
5518 o added exf_offset_atemp for Celsius to Kelvin conversion of atemp
5519 o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024
5520 o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations
5521
5522 checkpoint52d_post (2003/12/16)
5523 o re-tiled many expts to allow comparison in multi-processor mode
5524 - updated output accordingly
5525 - changed hs94.128x64x5 to use intial T from file rather than use the
5526 random number generator
5527 o add infrastructure in model routines for fizhi and gridalt packages
5528 o change global_ocean.cs32x15 because of Pb with GM on CS-grid.
5529 o changes to permit hi-res, cubed-sphere, configuration
5530 - added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
5531 - added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F
5532 - added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation
5533 of surface winds for the cube
5534 (A verification experiment, based on global_ocean.cs32x15, but with
5535 pkg/seaice turned on and with on-the-fly interpolation from the NCEP
5536 Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice,
5537 complete with example surface forcing files and matlab scripts to look
5538 at the output and compare it with that of global_ocean.cs32x15.)
5539 o packages pickup: $PKG_write_pickup called from packages_write_pickup ;
5540 but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code
5541 to conform to the common rule.
5542 o check-in the first version of the coupler + interfaces for multi-components
5543 set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI.
5544 - imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD).
5545 - atmosphere: use pkg aim_v23 ; no sea-ice for now.
5546 - ocean and atmos. share the same horizontal grid (no interpolation).
5547 - exchanges between component and coupler is done in forward_step
5548 o new verification experiment, cpl_aim+ocn:
5549 coupled ocean - AIM atmosphere on cs32 grid.
5550
5551 checkpoint52d_pre (2003/12/06)
5552 o surface flux time-av diagnostic modified for NLFS & RealFreshWater
5553 o add call to AIM pendant S/R in external_forcing & external_fields_load.F
5554
5555 checkpoint52c_post (2003/11/25)
5556 o Fixing OPTIONS files for use of exf:
5557 - ALLOW_ECCO not needed
5558 - ECCO_CPPOPTIONS.h should not be included from
5559 EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h
5560 as has been the case in the past
5561 - All cal/exf related options are currently set in
5562 single header file. Should remain so until we
5563 agree on a consistent new policy.
5564 o Removed all CPP options for cal package.
5565 cal has no more CPP options.
5566 o modified STOREs in GAD_ADVECTION
5567 o corrected key comp. for passkey
5568
5569 checkpoint52b_post (2003/11/23)
5570 o new version: "thsice" of thermodynamic sea-ice pkg:
5571 - only 1 call from "forward_step"; conserve energy, fresh-water & salt.
5572 - modify fluxes but do not change theta directly;
5573 - light cleaning of bulk_force pkg (still needed with thsice).
5574 - add forcing fields + data files in global_ocean.cs32x15/inp_thsice
5575 + output_thsice.txt to test thsice & bulk_force pkgs.
5576 o put back grid & coriolis monitor output.
5577 checkpoint52b_pre (2003/11/23)
5578
5579 o call "do_the_model_io" at the beginning (=> dump initial state)
5580 o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P)
5581 o sort out interplay between tamc.h and PTRACERS_OPTIONS.h
5582 (need info on NUMBER_OF_PTRACERS)
5583 o missing PTRACERS headers in some routines
5584 o default tamc.h in pkg/autodiff supposed to crash
5585 to ensure proper customization
5586
5587 checkpoint52a_post (2003/11/17)
5588 o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp
5589 - moved surfaceTendencyTice from pkg/seaice to main code
5590 - subroutine FREEZE_SURFACE now limits only surface temperature
5591 and is called in FORWARD_STEP (if allowFreezing=.TRUE.)
5592 => new output.txt for global_ocean.cs32x15 & global_with_exf
5593 - keep the old version of FREEZE for backward compatibility;
5594 global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE.
5595 - corresponding modifs for TAF directives
5596 o added surface flux output variables to TIMEAVE_STATVARS
5597 o time-averaged output for pkg/ptracers
5598 o fix problem with ECCO-related divided adjoint
5599 snapshot file was missing some ad-variables,
5600 but no warning issued by TAF
5601
5602 checkpoint52a_pre (2003/11/12)
5603 o some bug fixes for #undef REAL4_IS_SLOW
5604
5605 checkpoint52 = ecco_c52_e35
5606 o after testing adjoints of checkpoint51u_post
5607
5608 checkpoint51u_post (2003/11/06)
5609 o this is the post-merge tag of the ecco-branch
5610 (needs another clean checkout and re-testing)
5611 o various natl_box_adjoint configs and results
5612 but no input fields
5613 o obcs adjoint not yet merged!
5614 o adding ECCO global 1x1 and 2x2 degree configs
5615 o updated/extended some store directives for seaice
5616 o pkg/ecco now containes ecco-specific part of cost function
5617 o top level routines the_main_loop, forward_step
5618 supersede those in model/src/
5619 previous input data.cost now in data.ecco
5620 (new namelist ecco_cost_nml)
5621 o in ctrl/ cleaned some cross-dependencies and updated CPP options
5622
5623 checkpoint51t_post (2003/11/04)
5624 o this is the pre-merge tag of the ecco-branch
5625
5626 checkpoint51s_post (2003/11/04)
5627 o cleanup: removed various obsolete #define-s
5628 o pkg/grdchk
5629 - renamed 'ph-grd 3' to 'grad-res'
5630 - merged from ecco-branch
5631 (remaining bug fixes for obcs gradient checks)
5632 - additional high-precision output for testreport
5633 (grep for 'precision_grdchk_result')
5634
5635 checkpoint51r_post (2003/11/03)
5636 o cleaned up or removed CPP_OPTIONS.h files
5637 o updated results for some of the tests to reflect the new
5638 optfiles (-ieee: -O0 instead of -O3)
5639
5640 checkpoint51q_post (2003/10/30)
5641 o cd_code:
5642 - moved cd_scheme.F -> cd_code_scheme.F
5643 - separate read_checkpoint from cd_code_ini_vars.F
5644 - separated cd_code part from write_checkpoint
5645 - updated AD_SOURCE, generated .flow
5646 - added CD_CODE_VARS.h to the_main_loop
5647 - Moving cd_code specific store dir.s to pkg/cd_code
5648 o ctrl package totally restructured
5649 - pack/unpack now optional and decoupled from
5650 xx_/adxx_ I/O
5651 - ctrl_pack/unpack cleaned
5652 (new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F)
5653 - confined inclusion of AD_CONFIG.h to where necessary.
5654 o genmake2: changed AD dependencies from SRCFILES to AD_FILES
5655
5656 checkpoint51p_post (2003/10/30)
5657 o create initial cd_code package
5658 - WARNING: the initialization of fields within packages
5659 is broken because INI_FIELDS (where READ_CHECKPOINT is
5660 called) is called *before* PACKAGES_INIT_VARIABLES.
5661 This seems to be backwards since
5662 1) its important to initially zero the entire field including
5663 the "halo" region
5664 2) zeroing needs to be done *before* reading pickup info
5665 and the pickup call might or might not happen in any
5666 particular run
5667 - this needs an overhaul for R2
5668 o cleanup verification/*/code/GMREDI_OPTIONS.h
5669 o cleanup testreport
5670
5671 checkpoint51o_post (2003/10/27)
5672 o bringing AD-related verif's up to date with genmake2
5673 - carbon/
5674 - global_ocean.90x40x15/
5675 - hs.94.1x64x5/
5676 - (front_relax/ )
5677 o (more) consistent directory structure for AD-related verif.'s
5678 o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK
5679 o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF
5680 o bug fix in find_alpha.F for MDJWF:
5681 - modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for
5682 change rho -> rho-rhoConst
5683 - replace call find_rho to find_rhonum
5684 o initialisation of rFlx extended to full array (required by TAF)
5685 and shifted to thermodynamics
5686 o removed PTRACERS.h in ptracers routine
5687 o added surfacetendencyPtr to S/R parameter list pracers_forcing
5688 o Correcting initialisations for fVerU, fVerV.
5689 o helping TAF to recognize dependency on kUp for
5690 fVerU, fVerV
5691 o Replacing delZ by delR in pkg/ctrl/
5692 checkpoint51o_pre (2003/10/24)
5693
5694 o undid all of cp51 pending some cleanups and discussion
5695 o added the [#include "AD_CONFIG.h"] statement to all files that need
5696 it for adjoint/tl #defines
5697 o re-worked the build logic in genmake2 to support AD_CONFIG.h
5698 o removed tools/genmake since it no longer works
5699
5700 checkpoint51n_post (2003/10/23)
5701 o modifications to make FREEZE flux visible to pkg/kpp
5702 - moved surfaceTendencyTice from pkg/seaice to main code
5703 - FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
5704 - subroutine FREEZE now limits only surface temperature
5705 (this means new output.txt for global_ocean.90x40x15,
5706 global_ocean.cs32x15, and global_with_exf)
5707 o added surface flux output variables to TIMEAVE_STATVARS
5708
5709 checkpoint51n_pre (2003/10/23)
5710 o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F
5711 o added [#include "AD_CONFIG.h"] to all files that use the following
5712 defines:
5713 - ALLOW_ADJOINT_RUN
5714 - ALLOW_TANGENTLINEAR_RUN
5715 - ALLOW_ECCO_OPTIMIZATION
5716
5717 checkpoint51m_post (2003/10/21)
5718 o incorporating changes to get TAMC/TAF working in genmake2
5719 - added new TAMC/TAF targets to the Makefile
5720 - various cleanups related to package handling
5721 - these changes should have no impact on the forward model
5722
5723 checkpoint51l_post (2003/10/20)
5724 o changes to pkg/cal and pkg/exf that allow and speed-up long integrations
5725 - faster algorithm for cal_addtime.F
5726 - higher precision arithmetic, where needed
5727 - pkg/exf *startdate variables changed from calendar date to
5728 model integration time
5729
5730 checkpoint51l_pre (2003/10/17)
5731 o add salt flux to forcing fields (used when salty sea-ice forms or melts)
5732 o enable to apply restoring on S & T only in a latitude band.
5733 o update output (external_forcing_surf modif. change truncation errors)
5734 global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box
5735
5736 checkpoint51k_post (2003/10/16)
5737 o change default to: useNHMTerms=.FALSE.
5738 - new output.txt for atmos. exp (NHMTerms were wrong but now turned off):
5739 adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5
5740 - new output.txt for idealized oceanic exp (NHMTerms are now turned off):
5741 exp1, ideal_2D_oce
5742 - change data file of oceanic exp (leave the results unchanged for now)
5743 exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box
5744 o set gravitySign automatically according to the vertical coordinate used
5745 (and change sign: back to "logical" value: +1 when R increases downward)
5746 o added an include barrier to the default CPP_OPTIONS.h and
5747 removed the #include "PACKAGES_CONFIG.h" from it
5748 o fix a bug in mom_fluxform (from chk51j_post)
5749
5750 checkpoint51j_post (2003/10/10)
5751 o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/
5752 o adjusted some flow directives (dynamics, thermodynamics)
5753 o added cubed-sphere case to test cost function
5754 o heckpoint_lev?_directives.h now include
5755 pkg-specific directives, whenever those are enabled.
5756 o Moving pkg-specific flow directives to corresponding pkg
5757 Moving pkg-specific differentiation list to corresponding pkg
5758 Moving pkg-specific checkpoint-lev storing to corresponding pkg
5759 ---> conventions are
5760 - pkg_ad.flow
5761 - pkg_ad_diff.list
5762 - pkg_ad_check_lev?_dir.h
5763
5764 checkpoint51i_post (2003/10/09)
5765 o merge of the branch-genmake2
5766 - knowingly breaks the older genmake
5767 - automatic generation of all ALLOW_${PKG_NAME} defines
5768 - new testreport supersedes older testscript
5769 o large number of package inclusion and header cleanups
5770 checkpoint51i_pre (2003/10/08)
5771
5772 o new output for adjoin of global ocean vector invariant
5773 o fix for checkpoint of thermodynamic seaice and bulk_force
5774 o Steph gchem various cleanups
5775
5776 checkpoint 51h_pre
5777 o fixed some single quotes
5778 o modify gchem pkg to be more versatile
5779 o modifications to clean up dic pkg
5780 o add pkg/cfc
5781
5782 checkpoint51g_post (2003/10/02)
5783 o provide links for ARPACK and ADM*TLM
5784 o start removing verification/vero/
5785 o update AD-related stuff
5786 (in particular some IF-statements in model/src/ routines)
5787 o adding to verification/global_ocean.90x40x15/ adjoint of
5788 vector invariant setup
5789
5790 checkpoint51f_post (2003/10/02)
5791 o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif)
5792 o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation
5793 of tracer Green's fucntions for ocean inversion project.
5794
5795 checkpoint51f_pre (2003/08/07)
5796 o Added on-the-fly spatial interpolation capability
5797 "USE_EXF_INTERPOLATION" to pkg/exf.
5798 - This is a temporary Cartesian-grid hack until
5799 the super-duper ESMF coupler becomes available.
5800 - See verification/global_with_exf/README for usage example.
5801 - Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
5802 flags and modified pkg/seaice accordingly.
5803 o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
5804 and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
5805 non-local transport term.
5806
5807 checkpoint51e_post (2003/08/03)
5808 o pkg/mom_vecinv:
5809 - changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec)
5810 - add time-ave diagnostic of vorticity advection.
5811 o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV.
5812 o atmospheric geopotential: - include water vapor effect;
5813 - use p^kappa in p* scaling.
5814 o land pkg: read initial state from files.
5815 o AIM : add stratospheric drag in the upper level
5816
5817 checkpoint51d_post (2003/07/18)
5818 o change function ILNBLNK (=> last non-blank char.) to return zero
5819 (instead of the string length) when the string. char is empty
5820 o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid)
5821 o modif's to restore TAMC compatibility
5822 - avoid "_d" constructs in PARAMETER declarations
5823 - avoid interrupting lines by comment lines
5824 o Use cluster local disks for purely local I/O
5825 vs. globally visible disks needed for ctrl stuff
5826 (merged from ecco-branch)
5827 - new active_file_loc... and mdsio_..._loc routines
5828 - affected packages: autodiff, ctrl, grdchk, mdsio
5829
5830 checkpoint51c_post (2003/07/08)
5831 o introducing integer flag debugLevel
5832 - debLevZero: suppress all output
5833 - debLevA: standard
5834 - debLevB: equivalent to current debugMode=.TRUE.
5835 o introducing pathname variable mdsioLocalDir for mdsio
5836 that can be specified at runtime
5837 (relevant for cluster I/O to local disk)
5838 `
5839 >>>checkpoint51b_post
5840 adjoint of ptracers
5841 o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM
5842 o extended state in checkpoint_lev?, etc.
5843 o alternative ctrl/cost with tr1 or ptracer
5844 o new comlev1_bibj_ptracers
5845 o new ptracers.flow
5846 o made ptracers_forcing same as external_forcing_s
5847 o added verification for adjoint with ptracers
5848 - adm. grdchk fail so far
5849 - tlm. grdchk OK
5850 - checked tapelev/comlev recomputations: OK
5851 <<<checkpoint51b_pre
5852
5853 checkpoint51a_post (2003/06/25)
5854 o added code for biogeochemistry package
5855 - new pkgs: dic, gchem
5856 - new subroutine in ptracers
5857 o modify code for biogeo packages
5858 - in model/src and pkg/ptracers
5859
5860 checkpoint51 (2003/06/24)
5861 o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN
5862 - autodiff, ctrl, exf, grdchk, seaice
5863 kept separate packages
5864 - cost, ecco, obcs
5865 o updating verification/internal_wave, verification/lab_sea
5866 (all verif's pass on faulks.lcs.mit.edu RH7.3, g77)
5867
5868 checkpoint50i_post (2003/06/23)
5869 o Preparing next differentiable checkpoint and sync
5870 of MAIN vs. ecco-branch
5871 - 1st step: this one is differentiable
5872 - 2nd step: next(! not this) checkpoint will have updated packages
5873 from ecco-branch)
5874
5875 checkpoint50h_post (2003/06/20)
5876 o new package "land": provide surface BC for AIM.
5877 o pkg/ptracers: apply exchange to all tracers after reading a pickup.
5878 o AIM: use true log-P extrapolation for near surface temp (= as in
5879 F.Molteni paper) ; update aim.5l_cs output.
5880 o New variable in PARM03 for more flexible pickups
5881 o somewhat cleaned package initialisation sequence for
5882 ctrl/ cost/ ecco/ in packages_... routines
5883
5884 checkpoint50g_post (2003/05/23)
5885 o merged with release1_p17 (pkg/seaice and verification/lab_sea)
5886 - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
5887 - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
5888 made the default because of faster convergence than ADI
5889
5890 checkpoint50f_post (2003/05/23)
5891 o exf totally restructured
5892 - replaced all exf_set_ routines by one generic exf_set_gen.F
5893 and made sure it's still differentiable
5894 - split exf_getffields.F into new exf_bulkformulae.F
5895 - exf_inscal_/exf_outscal_ suffixes consistent with field names
5896 - updated adjoint/makefile and relevant verif. accordingly
5897
5898 checkpoint50f_pre (2003/05/23)
5899 o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ;
5900 + change Evap over land. (update aim.5l_cs output)
5901 o added missing .cvsignores and made uniform across expts
5902 o changed configuration of tidal_basin_2d expt
5903 o added pkg/debug functions for tracing code in fatal crashes
5904 o tidied pkg/monitor to use MONITOR_OPTIONS.h
5905 o new fn in pkg/monitor to stop model if solution grows too big
5906 o removed lots of single quotes from comments
5907
5908 checkpoint50e_post (2003/05/14)
5909 o make KPP work with PTRACERS
5910 - fix gad_calc_rhs to call new routine kpp_transport_ptr, which is
5911 nearly a copy of kpp_transport_s
5912 - there is no analogue to SurfaceTendencyS, so I have to use
5913 gPtr(of the surface layer) instead
5914 o add a new platform SunFire+mpi (SunFire 15000) to genmake
5915 checkpoint50e_pre (2003/05/13)
5916
5917 checkpoint50d_post (2003/05/13)
5918 o change kpp output from multiple-record state files to single-record state
5919 files analogous to write_state.F
5920 o reduce the output frequency of cg3d-related stuff to the monitor frequency,
5921 analogous to the cg2d-related output.
5922 o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512,
5923 so that writing to internal file fn (with length 512) fails.
5924 checkpoint50d_pre (2003/05/12)
5925
5926 checkpoint50c_post (2003/05/12)
5927 o fix problem in ini_procs.F when using MPI (was there since checkpoint48f)
5928 o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy.
5929 o add time-average diagnostic of U*V and vertical diffusive flux for theta.
5930 o bug fixed in convective adjustment diagnostic (multi-tile set-up).
5931 o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries.
5932
5933 checkpoint50c_pre (2003/04/30)
5934 Merging from release1_p13:
5935 o bug fix for pkg/seaice dynamic solver
5936 o Added SEAICE_initialHEFF to pkg/seaice
5937
5938 checkpoint50b_post (2003/04/17)
5939 o store u*,v* in gU,V instead of in guNm1,gvNm1
5940 o in order to put the momForcing out of the Adams-Bashforth:
5941 move forcing & CD-scheme calls from mom_fluxform & mom_vecinv
5942 to timestep.F
5943 o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays
5944 o re-generate output for highly sensitive test-exp:
5945 global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box
5946
5947 checkpoint50b_pre (2003/04/17)
5948 o restore the use of momAdvection & useCoriolis flags (mom_vecinv)
5949 o corrected CPP option mismatch in exf_Bulk... functions for case
5950 #define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP
5951
5952 checkpoint50a_post (2003/03/21)
5953 o Bug fix for merging between c50 and KPP.
5954 ikey was passed from thermodynamics to kpp_calc via
5955 common block rather than being recomputed in kpp_calc,
5956 in contradiction with new key itdkey.
5957 New key ikppkey created, and tamc.h headers updated.
5958
5959 checkpoint50 (2003/03/08)
5960 - 2nd step of merge with ecco-branch:
5961 merge changes in ecco-branch back into main trunk
5962 - bug fix in find_alpha
5963 - more storing in gmredi_calc_tensor.F, kpp_routines.F
5964 - avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC
5965 - merged some sliced AD support routines
5966
5967 checkpoint49 (2003/03/06)
5968 merged from ecco-branch:
5969 o exf:
5970 - Enable initialisation of forcing fields to constant
5971 (runtime) values.
5972 - in exf_getffields.F
5973 Reduce i-/j-loop to interior domain, discarding overlaps.
5974 That also fixes wrong TAF-key computations for key_1, key_2
5975 with bulf formulae.
5976 - exf_init.F modify #ifdef for exf_init_evap
5977 - exf_getffieldrec.F, ctrl_getrec.F
5978 The following INT-usages are not safe:
5979 fldsecs = int(fldsecs/fldperiod)*fldperiod
5980 fldcount = int(fldsecs/fldperiod) + 1
5981 and were modified.
5982 o autodiff: checkpoint_lev...
5983 - updated storing for bulk formulae (some arrays were missing)
5984 - added state for seaice package
5985 - synchronized with main branch
5986 o DIVA:
5987 Modif.s in
5988 - the_main_loop.F
5989 - the_model_main.F
5990 and added cost_final_restore.F cost_final_store.F
5991 o With these changes, it is possible to fully separate
5992 the first forward run to compute the cost function (mdthe_main_loop)
5993 and adjoint runs over individual DIVA intervals (adthe_main_loop)
5994 into separate model executions.
5995 This enables better tuning of DIVA to given queue sizes.
5996 o Loss of cost function value in consecutive DIVA runs is
5997 fixed by storing to 'costfinal' file.
5998 o Appropriate call of ctrl_unpack/_pack,grdchk_main at
5999 beginning/end of adjoint integration is accounted for.
6000 The current changes apply to TAF-1.4.26.
6001 TAF has one remaining bug, requiring one manual change
6002 (see MITgcm manual).
6003 o cal: synchronized between MAIN and ecco-branch
6004
6005 checkpoint48i_post (2003/03/05)
6006 o Changes to restore differentiability of code w.r.t. previous tag
6007 (mostly adding new routines to make list and replacing
6008 pressure by totPhiHyd).
6009 o Updated and merged grdchk package
6010 - has both ADM and TLM checks
6011 - works for single- and multi-proc.
6012 - output cleaned
6013 - worked successfully for parallel DIVA
6014 o genmake:
6015 - Adding -platform=SP4
6016 - Modif. for DEC Alpha (many don't have makedepend; use mkdep instead).
6017 o Modif. for DIVA:
6018 ctrl_unpack should not be called in intermediate DIVA interval.
6019 (similar thing would apply for active files such as
6020 tbar, sbar, psbar, which should not be reinitialised;
6021 only relevant for ecco-branch)
6022
6023 checkpoint48h_post (2003/02/28)
6024 o improve "ini_p_ground" when using finite difference form for calc_phi_hyd
6025 o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F
6026 o Added SEAICE_initialHEFF to pkg/seaice
6027 o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT
6028
6029 checkpoint48g_post (2003/02/18)
6030 --- EOS:
6031 o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF
6032 store total Potential in totPhyHyd for diagnostics & EOS.
6033 o fix restart and overlap Pb when using Z-coord and EOS funct. of P
6034 --- Pressure/geopotential gradient:
6035 o use Ro_surf & R_low instead of hFac in cal_phi_hyd:
6036 o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind
6037 ( changes results of global_ocean_pressure )
6038 o NLFS + z-coord.: add eta*Rho' contribution.
6039 o accurate phiHyd when using interface-W at the middle between 2 centers
6040 ( changes results of ideal_2D_oce )
6041 o includes r* 2nd term in potential gradient.
6042
6043 checkpoint48f_post (2003/02/18)
6044 Merging from release1_p12:
6045 o Modifications for using pkg/exf with pkg/seaice
6046 - improved description of the various forcing configurations
6047 - added basic radiation bulk formulae to pkg/exf
6048 - units/sign fix for evap computation in exf_getffields.F
6049 - updated verification/global_with_exf/results/output.txt
6050 o Added pkg/sbo for computing IERS Special Bureau for the Oceans
6051 (SBO) core products, including oceanic mass, center-of-mass,
6052 angular, and bottom pressure (see pkg/sbo/README.sbo).
6053 o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F
6054 to avoid negative values in shallow regions.
6055 - updated verification/natl_box/results/output.txt
6056 - updated verification/lab_sea/results/output.txt
6057 o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F
6058 o Added useSingleCpuIO option (see PARAMS.h).
6059 o Updated useSingleCpuIO option in mdsio_writefield.F to
6060 work with multi-field files, e.g., for single-file pickup.
6061 o pkg/seaice:
6062 - bug fix in growth.F: QNET for no shortwave case
6063 - added HeffFile for specifying initial sea-ice thickness
6064 - changed SEAICE_EXTERNAL_FLUXES wind stress implementation
6065 o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf,
6066 kpp_transport_t.F, forward_step.F, and the_main_loop.F
6067 o pkg/seaice:
6068 - adjoint-friendly modifications
6069 - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
6070
6071 checkpoint48e_post (2003/02/12)
6072 o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post)
6073 o dynamics: change definition of computational domain & adapt mom_fluxform
6074 accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2.
6075 o following exp works with Olx=Oly=2 (and pass through checkbounds option):
6076 adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1
6077 exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5
6078 global_ocean.90x40x15 global_with_exf global_ocean_pressure
6079 inverted_barometer solid-body.cs-32x32x1
6080 (high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure)
6081
6082 checkpoint48d_post (2003/02/09)
6083 o in preparation for r*:
6084 a) use pre-computed gradient of hydrostatic potential:
6085 changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce
6086 b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd:
6087 => affects results of glob_oce_pressure (different truncation error)
6088 update output.txt of ideal_2D_oce & global_ocean_pressure
6089
6090 checkpoint48d_pre (2003/02/08)
6091 o in preparation for r*:
6092 new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient.
6093 pass the 2 comp. of the grad. as arguments to momentum S/R.
6094 but for the moment, only used if it does not change the results.
6095 o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP
6096
6097 checkpoint48c_post (2003/02/06)
6098 Modifications in treatment of initial flux forcing controls
6099 to avoid extra storing of flux fields.
6100
6101 checkpoint48c_pre (2003/01/21)
6102 o Added tidal_basin_2d experiment (currently 1D!)
6103 o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented)
6104
6105 checkpoint48b_post (2003/01/27)
6106 o r* coordinate added in #ifdef NONLIN_FRSURF block.
6107 (modification to pressure gradient not yet implemented)
6108 o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports
6109 (for U & V) that are used for vertical advection of momentum.
6110
6111 checkpoint48a_post (2003/01/24)
6112 o In preparation for r*, use temp. array to compute vertical transport
6113 in flux-form momentum pkg. => change results of few test-exp.
6114 Update output of: exp4, exp5, front_relax, global_ocean_pressure,
6115 lab_sea, natl_box & plume_on_slope
6116
6117 checkpoint48 (2003/01/23)
6118 o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D')
6119
6120 checkpoint47j_post (2003/01/21)
6121 o add new exp. (ideal_2D_oce) to test "exotic" parameters and options.
6122 o moved adexch from forward_step to addummy_in_stepping
6123 o added exch in ctrl_map_...
6124 o aveFreq.=0. at end of cost_final to avoid overwrite in
6125 reverse checkpointing loop
6126 o Yet more changes in gmredi:
6127 * adgmredi_calc_tensor
6128 avoiding all recomputation of gmredi_slope_limit
6129 * adgmredi_x/y/rtransport
6130 added flag for excessive storing to avoid recomp. of
6131 u/v/rtans, dTdx/y/z
6132 -> this is not really necessary and very memory-consuming
6133 * adgmredi_slope_psi:
6134 consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff
6135 * gmredi_slope_limit
6136 re-activated full calculation of taperfct for case 'ac02'
6137 o updating verification/ adjoints of carbon, global_ocean.90x40x15
6138
6139 checkpoint47i_post (2003/01/13)
6140 o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled.
6141 o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi)
6142 default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post)
6143 o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf)
6144 o gmredi: fix few bugs.
6145
6146 checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48)
6147 This will be a good checkpoint to plug into the ecco-branch.
6148 o few modif.'s to get latest version adjointed
6149 (mainly kick out code in ini_linear_phisurf)
6150 o modif's to run adjoint with exactConserv
6151 o case GM_BOLUS_ADVEC should be cleaned
6152 S/R gmredi_slope_psi should be cleaned
6153 o verification/carbon now has exactConserv=.TRUE.
6154
6155 checkpoint47g_post (2003/01/10)
6156 o time-average AIM output: becomes independent from statvars time-average
6157 (can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH)
6158 o After TAF bug fix:
6159 Tested adjoint of gmredi package.
6160 Tests were done with checkpoint47 rather than with latest
6161 checkpoint47f_post since the latter is broken for the adjoint
6162 verification/carbon/ contains both ADM and TLM gradient checks.
6163 Here they are, before they get changed/lost/stolen.
6164 Mostly modif.'s to fix numerical sensitivities.
6165 Gradient checks OK for
6166 - GM_taper_scheme:
6167 * clipping
6168 * ac02
6169 * linear
6170 * glw91
6171 * dm95
6172 * ldd97
6173 - GMREDI_OPTIONS:
6174 * GM_VISBECK_VARIABLE_K
6175 * GM_NON_UNITY_DIAGONAL
6176 * GM_EXTRA_DIAGONAL
6177 * GM_BOLUS_ADVEC
6178 in conjunction with data.gmredi parameters to be checked in
6179 in a few minutes under verification/carbon/code/
6180
6181 checkpoint47f_post (2002/12/28)
6182 Merging from release1_p10:
6183 o modifications for using pkg/exf with pkg/seaice
6184 - pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
6185 and SEAICE_EXTERNAL_FLUXES
6186 - pkg/exf CPP options EXF_READ_EVAP and
6187 EXF_NO_BULK_COMPUTATIONS
6188 - usage examples are Experiments 8 and 9 in
6189 verification/lab_sea/README
6190 - verification/lab_sea default experiment now uses
6191 pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
6192
6193 checkpoint47e_post (2002/12/27)
6194 o created a tag prior to creating a branch
6195
6196 checkpoint47d_post (2002/12/16)
6197 o fixed bug in the oceanic pressure coordinates code: vertical viscosity
6198 at the bottom boundary had an erroneous half slip boundary condition
6199 o added bottom drag and no slip boundary condition capabilities to
6200 oceanic pressure coordinates code
6201 o added new verification experiment global_ocean_pressure, this experiment is
6202 also described in the tutorial section of the manual
6203 checkpoint47d_pre (2002/12/16)
6204
6205 checkpoint47c_post (2002/12/16)
6206 o Added a verification experiment for a global cubed-sphere ocean run
6207 - verification/global_ocean.cubed32x32x30
6208 - uses pkg/therm_seaice and pkg/bulk_forcing
6209
6210 o allow to run AIM physics with SPEEDY input files (from Franco Molteni)
6211 o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1)
6212 when using P-coordinate; only implemented for atmospheric config.
6213 o OCEANICP & realFreshWater: include P-E direct effect on wVel ;
6214 NOTES: requires option NONLIN_FRSURF to be "#define".
6215 o update advect_xz/results/output.txt (left from checkpoint44g_post)
6216
6217 checkpoint47b_post (2002/12/05)
6218 Merging from release1_p9:
6219 o pkg/seaice
6220 - removed GOTO's and added taf directives
6221 - double precision constants to reduce the g77 (Linux)
6222 to F77 (SGI) differences reported in release1_p8
6223 o tools/genmake
6224 - added SGI options
6225 o verification/testscript
6226 - updated to that of checkpoint47a_post
6227 o verification/global_ocean.90x40x15/input/eedata
6228 - modified for SGI f77 compatibility
6229 o verification/lab_sea
6230 - added description of sea-ice model
6231 - added missing matlab routines
6232 - added test of thermodynamics parallelization
6233
6234 checkpoint47a_post (2002/11/23)
6235 o new pkg: aim_v23
6236 = F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm.
6237 for now, keep the same surface forcing as before.
6238 - Part-Cell implemented into AIM; check that Heat & Water are conserved
6239 - aim.5l_cs: use new aim pkg (run 10yr & get better results than before)
6240 - aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg
6241 o add diagnostic of surface correction term in monitor output
6242
6243 o bulk_force and therm_seaice
6244 - Two packages: bulk_force (Bulk forcing)
6245 and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2
6246 - Earlier integration from Stephaine Dutkiewicz
6247 and Patrick Heimbach.
6248 - Two ifdef statements for compile time,
6249 ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE
6250
6251 checkpoint47 (2002/11/15)
6252 differentiable version of checkpoint46n_post
6253 o bug fix in quasihydrostaticterms
6254 o * "clean" adjoint code (in terms of extensive recomputations)
6255 can now be obtained for all GMREDI options (i.e. for
6256 - GM_VISBECK_VARIABLE_K
6257 - GM_NON_UNITY_DIAGONAL
6258 - GM_EXTRA_DIAGONAL
6259 - GM_BOLUS_ADVEC )
6260 * However, wrong gradient check problem remains unsolved.
6261 * New CPP options have been introduced for different
6262 tapering schemes
6263 o external_fields_load now part of differentiation list
6264 o pressure needs multiple storing;
6265 would be nice to have store_pressure at beginning or
6266 end of forward_step, e.g. by having phiHyd global (5-dim.)
6267 (NB: pressure is needed for certain cases in find_rho,
6268 which is also invoked through convective_adjustment).
6269 o recomputations in find_rho for cases
6270 'JMD95'/'UNESCO' or 'MDJWF' are OK.
6271 o #define ATMOSPHERIC_LOADING should be differentiable
6272 o ini_forcing shifted to begining of initialise_varia
6273 o Incorporating QNVS line search routines into MITgcm
6274 (this is separate code, and therefore not under pkg)
6275 lsopt/, optim/
6276 o Updated verification/carbon/
6277 - #define GM_VISBECK_VARIABLE_K
6278 - GM_taper_scheme = 'ldd97'
6279
6280 checkpoint46n_post (2002/11/12)
6281 Merging from release1_p8:
6282 o verification/natl_box:
6283 updating new external_fields_load routine
6284 o New package: pkg/seaice
6285 Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
6286 The sea-ice code is based on Hibler (1979-1980).
6287 Two sea-ice dynamic solvers, ADI and LSR, are included.
6288 In addition to computing prognostic sea-ice variables and diagnosing
6289 the forcing/external data fields that drive the ocean model,
6290 SEAICE_MODEL also sets theta to the freezing point under sea-ice.
6291 The implied surface heat flux is then stored in variable
6292 surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
6293 kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
6294 non-local transport term. Because this call precedes model
6295 thermodynamics, temperature under sea-ice may not be "exactly" at
6296 the freezing point by the time theta is dumped or time-averaged.
6297 N.B.: fairly large differences in accuracy occur across
6298 different platforms/compilers; comparison between
6299 g77 (Linux) and F77 (SGI Origin 2000/MIPSpro)
6300 generated output gives:
6301 T S U V
6302 C D M c m s m s m s m s
6303 n p a R g m m e . m m e . m m e . m m e .
6304 f n k u 2 i a a d i a a d i a a d i a a d
6305 g d e n d n x n . n x n . n x n . n x n .
6306
6307 Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea
6308 o GAD:
6309 - generated new common blocks to account for call of
6310 same gad routines with differing traceridentities
6311 (needed to modify tracerIdentity indices in GAD.h)
6312 - generated separate common blocks for case useCubedSphereExchange
6313 (Department of Futurology)
6314 - parameter lists to gmredi_?transport: added tracerIdentity
6315 - added new key indices to tamc.h
6316 o external_fields_load:
6317 - added this routine to TAF list
6318 - needed to make some common blocks global and additional storing
6319 along the same lines as exf package (checkpoint_lev?_directives.h)
6320 o exf:
6321 updated external forcing package
6322 - bug fixes carried over from ecco-branch
6323 (missing OBCS_OPTIONS.h in two routines)
6324 - enable easy to use "no forcing".
6325 - added exf I/O for atmospheric loading
6326 - added exf I/O for runoff data
6327 - transfered scaling between exf <-> MITgcm to exf namelist
6328 o Adding new verification experiment global_with_exf.
6329 This verification experiment is almost identical to the
6330 global_ocean.90x40x15 experiment, except that it uses
6331 the exf (and cal) package instead of the
6332 external_fields_load routine (cf README file).
6333
6334 checkpoint46m_post (2002/11/07)
6335 o modified testscript to return -- when there are no lines of "%MON" output
6336 o added new flag "quasiHydrostatic" for QH mode
6337 and new routine quasihydrostaticterms()
6338 o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term)
6339 New routine: mom_u_coriolis_nh()
6340 o fixed sign of non-hydrostatic metric terms in u and v equations.
6341 Depend on correct sign of gravitySign.
6342 o added work.pc* to .cvsignore in aim directories using ifc
6343 o introduced flag for controllin non-hydrostatic metric terms
6344 o removed gravitySign from PARM04
6345 o switched to g77/ifc from pgf77 in aim experiments
6346
6347 checkpoint46l_post (2002/11/01)
6348 o made convective adjustment work with pressure coordinates:
6349 - changed the direction of k-loop in convective_adjustment.F for the
6350 case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation)
6351 - adjusted the reference pressure k-index in convective_adjustment.F
6352 - adjusted the convection condition in convect.F (in analogy to
6353 calc_ivdc.F)
6354 - convective_adjustment no longer computes anything on the halos
6355 - removed the warnings about negative salinity from find_rho.F and
6356 find_alpha.F; instead the new routine look_for_neg_salinity, called
6357 at the beginning of find_rho, find_alpha, and find_beta, does a
6358 check of the entire slice, if CPP-option
6359 CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
6360 checkpoint46l_pre (2002/10/23)
6361
6362 checkpoint46k_post (2002/10/23)
6363 o fixed the verification/global_ocean.90x40x15 experiment:
6364 - new bathymetry (the world according to A., JMC, and M.)
6365 - new initial fields and forcing fields (*.bin files)
6366 - new POLY3.COEFFS (for the next release one should switch to a full
6367 equation of state: JMD95P or MDJWF)
6368 - fixed several errors and redundancies in the data file
6369 - experiment uses looped cells
6370 - added matlab directory with diagnostic scripts for plotting of output
6371
6372 o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F:
6373 - read AIM physics parameters from a file (data.aimphys)
6374 - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
6375
6376 checkpoint46j_post (2002/10/07)
6377 o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH
6378 o move wVel computation at the end of the time step, in S/R integr_continuity
6379 o create specific S/R to exchange T,S before DYNAMICS (for stagger time step)
6380 o update timeave pkg for wVel diagnostic.
6381 checkpoint46j_pre (2002/09/27)
6382
6383 checkpoint46i_post (2002/09/25)
6384 o Clean up AIM package (and keep the results unchanged):
6385 include CPP_OPTION and use IMPLICT NONE in all routines ;
6386 declare all the variables _RL ; use _d 0 for all numerical constants.
6387 use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 !
6388
6389 checkpoint46h_post (2002/09/25)
6390 o cleaned up the use of rhoNil and rhoConst.
6391 - rhoNil should only appear in the LINEAR equation of state, everywhere
6392 else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
6393 and the dynamical equations are all divided by rhoConst
6394 o introduced new parameter rhoConstFresh, a reference density of fresh
6395 water, to remove the fresh water flux's dependence on rhoNil. The default
6396 value is 999.8 kg/m^3
6397 o cleanup up external_forcing.F and external_forcing_surf.F
6398 - can now be used by both OCEANIC and OCEANICP
6399 checkpoint46h_pre (2002/09/18)
6400
6401 Added code to convert surface volume flux (fresh water) into
6402 a mass flux when using P coordinates in the ocean (OCEANICP).
6403 Note: It assumes you have set rho0=rhoConst=density of fresh water.
6404
6405 checkpoint46g_post (2002/09/18)
6406 o Include a new diagnostic variable phiHydLow for the ocean model
6407 - in z-coordinates, it is the bottom pressure anomaly
6408 - in p-coordinates, it is the sea surface elevation
6409 - in both cases, these variable have global drift, reflecting the mass
6410 drift in z-coordinates and the volume drift in p-coordinates
6411 - included time averaging for phiHydLow, be aware of the drift!
6412 o depth-dependent computation of Bo_surf for pressure coordinates
6413 in the ocean (buoyancyRelation='OCEANICP')
6414 - requires a new routine (FIND_RHO_SCALAR) to compute density with only
6415 Theta, Salinity, and Pressure in the parameter list. This routine is
6416 presently contained in find_rho.F. This routine does not give the
6417 correct density for 'POLY3', which would be a z-dependent reference
6418 density.
6419 o cleaned up find_rho
6420 - removed obsolete 'eqn' from the parameter list.
6421 o added two new verification experiments: gop and goz
6422 (4x4 degree global ocean, 15 layers in pressure and height coordinates)
6423 checkpoint46g_pre (2002/09/16)
6424
6425 checkpoint46f_post (2002/09/16)
6426 o Enable tangent linear (forward mode) gradient checks:
6427 - extended active file handling to g_... files
6428 - added TANGENT_SIMULATION to theSimulationMode
6429 - extended grdchk package accordingly
6430 o added tangent linear setup in verification/carbon/code_ftl
6431 o added adjoint setup in verification/front_relax/code_ad
6432
6433 checkpoint46e_post (2002/09/05)
6434 o Added new equation of state -> MDJWF
6435 - EOS of McDougall et al., 2002, JAOT, submitted
6436 - caveat: the equation of state is only valid for a smaller (more
6437 realistic?) range of values than JMD95P/Z and UNESCO
6438 - added masks to the calculation of pressure in store_pressure
6439 - added more check values for density in check_eos (ini_eos.F), some of
6440 the old check values are out of the range of the MDJWF-eos, so don't
6441 expect perfect matches for those
6442 checkpoint46e_pre (2002/08/19)
6443
6444 checkpoint46d_post (2002/08/19)
6445 o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and
6446 'OCEANICP', also initialised field pressure correctly in ini_eos in the
6447 case of pressure coordinates. eosType='JMD95Z' in
6448 combination with buoyancyRelation='OCEANICP' now causes an error.
6449 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
6450 in find_alpha/beta.
6451 checkpoint46d_pre (2002/08/15)
6452
6453 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
6454 so that JMD95Z and JMD95P give approptiate static stability in find_rho.
6455
6456 checkpoint46c_post (2002/08/15)
6457 o Changes necessary for ocean in p-coordinates
6458 - Added new buoyancy relation = 'OCEANICP'
6459 - Added new parameters = gravitySign (this used to be contained inside
6460 the factor dRdZ which I added when we first switched to R coordinates).
6461 X GM/Redi is not compatible (yet)
6462 X bottom drag and no-slip need to be debugged.
6463 checkpoint46c_pre (2002/08/07)
6464
6465 checkpoint46b_post (2002/08/07)
6466 o Added new equation of state -> JMD95Z and JMD95P
6467 - EOS of Jackett and McDougall, 1995, JAOT
6468 - moved all EOS parameters into EOS.h
6469 - new routines ini_eos.F, store_pressure.F
6470 o Added UNESCO EOS, but not recommended because it requires
6471 in-situ temperature (see JMD95)
6472 o Modified formatting for knudsen2.f in utils/knudsen2 and added
6473 unesco.f to be used with POLY3
6474 checkpoint46b_pre (2002/07/31)
6475
6476 checkpoint46a_post (2002/07/31)
6477 o Added (atmospheric) pressure loading
6478 - new field in FFIELDS.h, etc...
6479 - new cpp flag ATMOSPHERIC_LOADING
6480 o Changed hFacC to _hFacC in calc_phi_hyd.F
6481 o Added SHORTWAVE_HEATING to some files for consistency
6482 checkpoint46a_pre (2002/07/13)
6483
6484 checkpoint46 (2002/07/13)
6485 further merges from release1_p5
6486 o new ctrl package
6487 - adopted from ECCO environment to enable optimization
6488 - added Eliassen Palm fluxes to controls
6489 o added Eliassen Palm flux controls to gradient check package
6490 o cost package
6491 - Compatible with new ctrl package
6492 - added Eliassen Palm cost hooks
6493 - modif's of existing cost functions
6494 o Adjoint-related bug fixes in kpp:
6495 - kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix
6496 - kpp_routines: store of Rib avoids partial recomputation bug of TAF.
6497 o autodiff package
6498 - flow directives:
6499 + new for S/R do_the_model_io
6500 + enhanced for S/R checkpoint
6501 + new gmredi.flow
6502 - Introduced CPP option ALLOW_AUTODIFF_MONITOR to
6503 disable adcommon.h/g_common.h by default.
6504 - fixed problem for adjoint of global_max
6505 o modified verification/carbon/
6506 o New setup for adjoint of global_ocean
6507 o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F)
6508 o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F)
6509 o incorporated hooks for sponge layer code (external_forcing.F)
6510
6511 checkpoint45d_post (2002/07/12)
6512 o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F)
6513 o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S
6514 (affects plume_on_slope "cg2d" output)
6515 o add new parameter deltaTfreesurf for free-surface time stepping
6516 o exchange gT,gS when using staggerTimeStep & GM & Oly<4
6517 o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B
6518 o change phiMin in exp1 (to agree with documentation)
6519 o add new flags:
6520 - T,S forcing inside/outside Adams-Bashforth
6521 - turn off temp,salt advection and/or forcing
6522 - for each tracer, define internal flag for multiDimAdvection & A-B
6523 o monitor: change definition of KE to check conservation of Energy
6524
6525 checkpoint45c_post (2002/05/30)
6526 o Removed f90 comments ("!")
6527 o Modified initialisations to enable exf package for MITgcm
6528 (without invoking ECCO_PACKAGE).
6529 o modifications to gradient check package (Martin Losch)
6530 - enable centered differences
6531 - modified format of standard output
6532
6533 checkpoint45b_post (2002/05/30)
6534 o cleaned exchange calls in cg2d
6535 o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step
6536 o included CPP option SINGLE_LAYER_MODE in thermodynamics
6537 to configure barotropic setup (Martin Losch)
6538 o moved some initialisations within bi,bj loop in dynamics
6539 (TAF flow dependency)
6540 o in initialise_varia, moved call packages_init_variables
6541 before convective_adjustment_init
6542 (corresponding adjustment of TAF tape initialisation).
6543 o in calc_diffusivity/calc_viscosity extended domain to full overlap.
6544
6545 checkpoint45a_post (2002/05/01)
6546 o compute Rho over the whole domain (extend iMin,jMin indices)
6547 o specific exchange for X-slice domain (case Ny=1)
6548 o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code
6549 o solve_for_pressure : set cg2d_x to zero where OBCS are applied
6550
6551 checkpoint44h_post = checkpoint45
6552 o Fix to restore differentiability:
6553 place at which packages_init_variables is called in
6554 initialise_varia is crucial for reverse control flow.
6555 o modifications in GMRedi to enable stable adjoint
6556 (corresponding modif's in thermodynamics, dynamics)
6557 o added missing hook for sponge layer code in external_forcing
6558 o modified test cost functions
6559 o storing in gad_advection (plus removal of write(0,*)!
6560 o missing headers TR1.h added in convective_adjustment routines
6561 o errorMessageUnit set non-equal zero in eeboot
6562 (conflict on some platforms, e.g. IBM SP3)
6563 o modified carbon verif.
6564
6565 checkpoint44h_pre (2002/03/14)
6566 o vertical grid option: allow to put the Interface at the middle between
6567 2 cell-centers ; replace delZ in pkg/kpp by drF.
6568 o GM Advective form: Tracers are advected using the residual transport (=
6569 Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form.
6570
6571 checkpoint44g_post (2002/03/05)
6572 o fix surface correction term in multiDimAdvection (affects plume_on_slope
6573 results) ; ifdef missing in thermodynamics.F
6574
6575 checkpoint44f_pre,checkpoint44f_post
6576 o added PTRACERS package
6577 This allows an arbitrary number of passive tracers to be integrated
6578 forward simultaneously with the dynamicaly model.
6579 + Implemented so far:
6580 - basic forward algorithm (time-stepping, advection, diffusion, convection)
6581 - I/O and checkpointing
6582 - GM/Redi *but* using the GM/Redi coefficient of Salt
6583 + Not implemented so far:
6584 - KPP
6585 - OBCS
6586 + No specific example supplied (yet) but global_ocean.90x40x15 has the
6587 necessary data.ptracer file. Simply use -enable=ptracers and uncomment
6588 line in data.pkg.
6589 + This package is disabled by default since it increases storage.
6590
6591
6592 o testscript: added -cleanup option
6593 o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter
6594 b) enable to filter 2D fields.
6595
6596 checkpoint44e_pre,post
6597 o re-wrote convective adjustment to use pre-calculated weights
6598 Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F
6599 Adds: model/src/convective_weights.F, convectively_mixtracer.F
6600 Original calls to convect() still in place.
6601
6602 chkpt44d_pre,post
6603 o added missing EXCLUDE_MONITOR flags
6604 o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi
6605 (incompatible typ in MIN/MAX expressions caused problems
6606 on IBM SP3)
6607 o in genmake added variable MAKEDEPEND
6608 plus resetting for case SunOS
6609 o added timer_stats.c routine for IBM SP3
6610 o removed variables in dynamics
6611 !!! I forgot to create tag chkpt44d_pre !!!
6612 !!! But chkpt44d_pre = chkpt44c_post !!!
6613
6614 o real fresh water flux implemented with non-linear free-surface.
6615
6616 chkpt44c_pre,post
6617 o few fix (mask in shap_s2, EmPmR in external_field_load,
6618 USE_NATURAL_BCS in solve_for_P);
6619 o add arguments myIter & myTime to S/R obcs_calc & solve_for_P
6620
6621 checkpoint44b_pre/_post
6622 o merge of relevant stuff from the ecco-branch:
6623 - genmake: removed $S64 overwrite for case SunOS
6624 - pkg/exf: update and corrections for field swapping and obcs
6625 - pkg/ecco: parameter lists for the_model_main, the_main_loop
6626 harmonized between ECCO and MITgcm
6627 - pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
6628 updated checkpointing_lev... lists for obcs
6629 - model/src: minor changes in forward_step, plot_field
6630 added directive for divided adjoint in the_main_loop
6631 - pkg/mdsio: added mdsio_gl_slice
6632
6633 o check parameters & config (chkpt44a_pre,post)
6634 o OBC and NonLin_FrSurf.
6635
6636 checkpoint44 (2002/01/18)
6637 o fix bug in mom_vi_del2uv
6638 o select when filters are applied ; add options to zonal_filter (data.zonfilt)
6639 o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
6640 o update AIM experiments (NCEP input files)
6641 o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
6642 o added some stuff for AD
6643
6644 checkpoint43 (2001/09/28)
6645 o added two new advection tests
6646 o added global 4x4 degree ocean test
6647 o added test of H&S94 with free surface on cube
6648 o some final mods for gradient check, adjoint,...
6649
6650 checkpoint42 (2001/09/27)
6651 Fixed AD-related problems:
6652 o Store directives up-to-date with re-arranged Adams-Bashforth
6653 (mainly thermodynamics.F)
6654 o New store directives for multi-dim. advection schemes
6655 * new CPP flag ALLOW_MULTI_DIM_ADVECTION
6656 * new common block and key passkey
6657 (mainly gad_advection.F)
6658 o Modified store directives for split of dynamics/thermodynamics
6659 for the case ALLOW_KPP
6660 o Cleaned argument list for timestep_tracer.F
6661
6662 checkpoint41 (2001/09/27)
6663 o re-formatted/added comments in prologues of key subroutines
6664 to work with protex
6665
6666 checkpoint40 (2001/09/27)
6667 o moved calc_gs, calc_gt and calc_tr1 back to model/src
6668 o added FLT (floats) package from Arne along with demo. experiment
6669 o re-arranged Adams-Bashforth scheme for tracers to allow easier
6670 implementation of forward-in-time forcing terms
6671 o more mods for non-linear free-surface including new variable
6672 o modified multi-dim method to work on cube
6673 o bug fix in KPP (from DM)
6674
6675 checkpoint40pre9 (2001/09/27)
6676 o added DST advection schemes
6677 o fix MPI bug on SGI's
6678 o modifications for non-linear free-surface
6679 o fixed conditionals for fixed flow/passive tracer only mode
6680 o added tension/strain form of stress tensor
6681 o changes to commenting of arguments for TAF/TAMC
6682 o added/updated many matlab scripts
6683 o added multi-dimensional advection method for tracers
6684
6685 checkpoint40pre8 (2001/09/05)
6686 o new package rw/
6687 Added method for dumping intermediate local arrays:
6688 mdsio_writetile - same as mdsio_writefield except works from inside
6689 bi,bj loop
6690 mdsio_writelocal - same as mdsio_writetile except works for local
6691 arrays
6692 write_local_r? - higher-level wrapper for mdsio_writelocal
6693 Controlled by diagFreq. Defaults to zero (ie. no dumps)
6694 Example given at end of mom_vecinv.F that dumps some local arrays.
6695 o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to
6696 control flux-form versus vector invariant code.
6697 Switch is runtime flag vectorInvariantMomentum (defaults to false)
6698 or genmake -DISABLE ...
6699 o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F
6700 (additional storing is now needed for case vecinv;
6701 currently nothing implemented to switch this storing off
6702 in case fluxform is used since no CPP flag available).
6703
6704 checkpoint40pre7 (2001/08/14)
6705 o bug fix in dynamics.F
6706 calc_viscosity called before k=1,Nr loop.
6707 o added some #ifdef's ALLOW_PASSIVE_TRACER
6708 o cleaned initialisations in ctrl_map_ini
6709 related to TAF
6710
6711 checkpoint40pre6 (2001/08/13)
6712 o split dynamics into thermodynamics & dynamics
6713 o corresponding split of calc_diffusivity into
6714 calc_diffusivity, calc_viscosity
6715 (kpp_calc_diff, kpp_calc_visc).
6716 o Added diffkr, kapgm to control variables
6717 o bug fix in gmredi_slope_limit for ldd97
6718
6719 checkpoint40pre5 (2001/07/31)
6720 o proper initialization of Adams-Bashforth time stepping
6721 + uses forward step for very first step of model (iter=0)
6722 o re-generated *all* output since almost all output is modified by this
6723 change (sorry but we've been putting this one off for about 2 years)
6724 + natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were
6725 *not* regenerated since they are already out of date and I don't
6726 want to create the impression that they are suddenly working.
6727 o removed KAP stuff for DEC's
6728 o modified/added many .cvsignore files in */code and */input
6729 o added new expt "solid-body.cs-32x32x1"
6730 + this uses an alternative form of ini_curvilinear_grid.F which
6731 is not necessarily any better than the current one...
6732
6733 checkpoint40pre4 (2001/07/30)
6734 o added re-initialisations of utrans,vtrans,rtrans in
6735 calc_common_factors which are crucial for TAF.
6736 o extended iMin,jMin range for calc_common_factors,
6737 calc_diffusivity
6738 o added option ALLOW_PASSIVE_TRACER
6739 o a few minor updates and fixes
6740
6741 checkpoint40pre3 (2001/07/13)
6742 o created calc_gtr1.F for gad package
6743 o split the_main_loop and re-introduced forward_step
6744 o some recomputations of nIter0 for TAMC
6745
6746 checkpoint40pre2 (2001/07/13)
6747 o Updated to latest branch of AJA, JMC
6748 o Added gradient check package
6749 o Added routines for passive tracer handling
6750 o Added carbon sequestration sensitivity experiment
6751
6752 checkpoint39 (2001/05/14)
6753 o Modifications and fixes to support TAMC
6754 (mainly missing or wrong directives)
6755 o Corrected common blocks when fooling TAMC to produce adjoint I/O
6756 in addummy_in_stepping
6757 o Updated verification/vero/ (bug fixes in code/, correct pickups in input/)
6758 o Enabled "sliced" (xz-,yz-) exchanges, needed for obcs.
6759 o Included following packages:
6760 cal: calendar
6761 exf: external forcing
6762 ecco: essential routines to control use of cal, exf
6763 (NB: this is not the full ECCO environment)
6764 o disabled some packages by default in genmake
6765
6766 checkpoint38 (2001/04/10)
6767 o see notes_c37_adj.txt
6768 o corrected wrong layer index in external_forcing_t
6769 o replaced the_main_loop/forward_step by the_main_loop
6770 o removed forceoutput from write_state
6771 (replaced criteria for initial/final state)
6772 o added runtime flag for pre-C35 pickups: usePickupBeforeC35
6773
6774 checkpoint37 (2001/03/13)
6775 o mdsio.F routine split and packaged in pkg/mdsio
6776 (mdsio.F and mdsio_gl.F still exist in eesupp/src but are not
6777 used unless genmake -disable=mdsio)
6778 o allow a more precise surface-geopotential gradient for the atmosphere
6779 taking into account the change in space of Alpha (=1/rho) at the surface.
6780 o variable "etaN" (replace cg2d_x) is the surface R-anomaly [r unit]
6781 (ocean: sea surface height [m] / atmos: surface pressure anomaly [Pa])
6782 o Change units: Phi_Hydrostatic (=phiHyd), Phi_Surface(=cg2d_x) and
6783 Phi_NonHydrostatic (=cg3d_x), all have now the dimension of a potential
6784 [m2/s2] (pressure/rhoConst in the ocean ; Geo-Potential in the atmosphere).
6785 o Time-Average diagnostics defined as a pseudo package "timeave".
6786 o pickup files : old pickup (before c35) did not work with new code (c35
6787 and after) unless activating 2 commented lines in initialise-varia.
6788 o Non-Hydrostatic pickup file Pb fixed.
6789 o bug with Rigid-lid version (since c35) fixed.
6790
6791 checkpoint36 (2001/02/20)
6792 o implement Crank-Nickelson barotropic time-stepping
6793 o recover Time-Average diagnostics
6794 o fix Pb in checkpoint (PR#19)
6795 o AIM become a standard package ; clean unused CPP_kees
6796
6797 checkpoint35 (2001/02/08)
6798 o subtantial rewrite of dynamics.f
6799 o allows staggered time-stepping
6800 o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt
6801 o added bottom drag (linear + quadratic)
6802
6803 checkpoint34 (2001/01/30)
6804 o Modified exchange routines for correct reverse simulation.
6805 o Added verification output to comply with bug fix in impldiff.F
6806 as of c33 (exp2, natl_box).
6807 o Corrected store directives in dynamics.F
6808 o Corrected array boundaries in impldiff.F
6809 o Corrected array dimensions in gmredi.
6810 Added temporary scalars to avoid storage by TAMC (gmredi, kpp).
6811 o Added routine GLOBAL_SUM_INT to global_sum.F
6812 o Added mdsio_gl.F for ECCO purposes.
6813
6814 checkpoint33 (2000/11/30)
6815 o Fixed bug in lower BC in impldiff.F
6816 o Fixed confusion about units of forcing arrays in FFIELDS.h
6817 namely Fu,Fv,Qnet,Qsw,EmPmR:
6818 - Removed verification/natl_box/code/external_fields_scale.F
6819 (did not differ from that in model/src)
6820 - Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
6821 (see FFIELDS.h for description)
6822 - Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
6823 kpp_calc.F and kpp_transport_t.F
6824 - Removed model/src/external_fields_scale.F and calls to it
6825 - verification/natl_box uses flux data with "atmospheric" sign so
6826 a special version of external_fields_load.F is used to
6827 change the data as it's read in. This way, the arrays
6828 have the right units and signs at all times tha a user could
6829 possibly use them.
6830 o Corrected genmake to delete a temporary file during configuration
6831
6832 checkpoint32 (2000/11/13)
6833 o Scaling of forcing fields moved from external_forcing.F to
6834 external_fields_scale.F, called directly after loading fields.
6835 o Surface relaxation terms added to surface tendency fields in
6836 extra subroutine.
6837 o impldiff.F changed to avoid storing by TAMC of huge intermediate
6838 fields.
6839 o Changes in GMRedi to comply with packaging structure.
6840 o Modifications and bug fixes in KPP package.
6841 o Verification experiment for KPP added (verification/nat_box/)
6842
6843 checkpoint31 (2000/09/11)
6844 o Packages interface brought in line with defined standard
6845 -> new routines packages_...F
6846 -> changes in initialise_fixed.F, initialise_varia.F
6847 -> enables initialisation interface for ECCO package
6848 o Rescaling of external forcing fields immediately after read
6849 (removed from external_forcing.F)
6850 -> new: surface_fields_scale.F
6851 -> affects ini_foorcing.F, external_fields_load.F
6852 o Computation of surface tendencies before tendency updates.
6853 -> new: external_forcing_surf.F
6854 o Change of variable names useGMRedi, useKPP, useECCO
6855 o Further changes in dynamics.F, impldiff.F for TAMC
6856 o Tested for experiments 0, 2, 4.
6857 - not yet tested for GMRedi.
6858 - not yet tested for KPP.
6859
6860 checkpoint30 (2000/07/13)
6861 o Updates for OBCs
6862 o New experiment for test OBCs (internal_wave)
6863 o New output.txt in verification/exp4/results/
6864 o Updates for KPP: calculation of viscosity corrected, new variables
6865 kpp_dumpFreq and kpp_taveFreq
6866 o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.)
6867 and entry for T90 in genmake
6868
6869 checkpoint29 (2000/06/21)
6870 o packaged KPP and GM/Redi
6871
6872 checkpoint28 (2000/06/09)
6873 o Corrected initialization of hFacMin for difference vertical coordinates
6874 o Modified calculation of partial cell thickness to more robust algorithm
6875 o config_summary.F: replaced write_1D_... by write_0D_...
6876 read_write.F: added subroutines write_0D_...
6877 o routines calc_common_factors, calc_gs, calc_gt, calc_phi_hyd, find_rho:
6878 included some initialisations required for TAMC.
6879 o routine calc_isoslopes: modified sqrt computation to make it
6880 differentiable for zero argument.
6881 o routines dynamics, impldiff:
6882 included store directives and tape key computations required for TAMC.
6883 o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC
6884
6885 checkpoint27 (2000/04/10)
6886 o fixed calc_isoslopes() to so that cancellation of terms in tensor
6887 formulation works properly with variable resolution.
6888 o restructured the calling tree between the_model_main() and dynamics()
6889 o split initialise() into initialise_fixed() and initialise_varia()
6890 o introduced initialization file pSurfInitFile for free surface (cg2d_x)
6891 in new routine ini_psurf()
6892
6893 checkpoint26 (2000/04/05)
6894 o moved some #ifdef in optional routines to encompass everything
6895 except the argument declarations. This was using up some memory.
6896 o fixed macros like _ADT to work with both versions of Linux cpp
6897 o cleaned up some unused and uninitialized variables
6898 (helps when debugging with strict compile options)
6899 o split up CPP_EEOPTIONS.h into options and macros
6900 (macros are now in eesupp/inc/CPP_EEMACROS.h)
6901 o patch for 2 processor JAM mode
6902
6903 checkpoint25 (2000/03/15)
6904 o updates for OBCs and NH
6905 o dramatically reduced memory usage
6906 o added "JAM" routines for use on Artic network
6907 o parameterization of convection by implicit vertical diffusion
6908 o added a diagnostic of convective index
6909 o moved call to calc_divg_hat() from dynamics() to solve_for_pressure()
6910 (this is was partly for OBCs and NH but also in anticipation of
6911 an explicit free-surface option)
6912 o initial state input files for U and V
6913
6914 checkpoint24 (1999/08/02)
6915 o Removed some spurious "REAL"s
6916 o Updated KPP to latest version from JPL
6917 o Added a COS(latitude) in horizontal viscosity
6918
6919 checkpoint23 (1999/05/26)
6920 o Added del^4 diffusion for salt and temperature
6921 o Multiple minor fixes (implicit none's, arguments to global_sum, etc.)
6922
6923 checkpoint22 (1999/05/18)
6924 o Made many small changes: implicit none, format(i5), etc...
6925 o Introduced KPP mixing scheme (compiles and runs but *not* tested)
6926
6927 checkpoint21 (1999/05/18)
6928 o Introduced new I/O package that supports direct-access records (mdsio.F)
6929 o Split-up mid-level I/O routines
6930 o Updated input data for experiments 0,1,2,4 and 5
6931 o Finally removed the genmake.* scripts (everyone seems happy with genmake)
6932
6933 checkpoint20 (1999/03/22)
6934 o Tidied up open-boundaries some more
6935 o Added non-hydrostatic code
6936 o Fixed some input data
6937 o Modified MPI start-up to work in "coupled" context.
6938
6939 checkpoint19 (1998/12/15)
6940 o Tidied up directory structure for verification experiments.
6941 o Added new code for open boundaries.
6942 o Corrected advective terms near boundaries.
6943 o Added CPP flag for "old UV" geometry and corrected spherical geometry.
6944 o Implemented free-slip/no-slip BCs and del^4 dissipation.
6945 o Split default parameters out of ini_parms.F into set_defaults.F.
6946
6947 checkpoint18 (1998/11/30)
6948 o Further changes for optional code generation with
6949 CPP - ugh!
6950
6951 checkpoint17 (1998/11/03)
6952 o Beginning to incorporating modularity
6953 for supporting atmos. and ocean configs.
6954 o Small changes for TAMC complinace
6955 o New ultra simple test case. Barotropic box
6956 configuration "exp0".
6957
6958 checkpoint16 (1998/10/28)
6959 o Minor changes to exchange routines to support
6960 accumulation in reverse mode. Adjoint of an
6961 assignment is an addition.
6962 o Changes to support compilation by TAMC (LR(1)
6963 syntax) and by g77 under Linux ( 72 character
6964 limit ).
6965
6966 checkpoint15 (1998/09/29)
6967 Rewrote exchange routines to allow
6968 o General tile <-> tile connectivity.
6969 o TAMC reverse mode flag ( is this really needed? )
6970 o Variable width overlap and exchange region widths.
6971 o Hooks for sharing data via DMA, Arctic, Memory Channel,
6972 shmput/shmget, VIA, SYSV shmem and every other cool
6973 communication method.
6974
6975 checkpoint14 (1998/09/09)
6976 Consistent isomorphism chages made. These allow dynamical core
6977 to support both pressure and meters as a vertical coordinate.
6978
6979 checkpoint13 (1998/07/17)
6980 Release which corrects global_max problem and a couple
6981 of KGM time-averaging diagnostic errors. Also contains
6982 a double-gyre experiment setup as well as the baseline
6983 4 degree global template. The double gyre template is
6984 organised to allow it to be applied automatically to
6985 the baseline configuration.
6986
6987 branch-point-rdot
6988 A few tidy-ups have been made bt the real point of this
6989 check-point (excuse the pun) is to allow a branch to be
6990 made for the purposes of adding the rDot alterations.
6991 I don't want to commit the rDot to the main-trunk until
6992 we've actually tested it...
6993
6994 checkpoint12 (1998/07/08)
6995 Tidy up and added generic genmake script (formerly
6996 configure script).
6997 Released to testers.
6998
6999 checkpoint11 (1998/07/02)
7000 Re-arranged initialise() and introduced ini_vertical_grid()
7001 and ini_masks_etc().
7002
7003 checkpoint10 (1998/07/01)
7004 Introduced the configure script.
7005 Separated out the diags package.
7006 Added template for writing time-averages of tile/intermediate quantities.
7007 Updated SIZE.h in exp2 and made the data big-endian.
7008
7009 checkpoint9 (1998/06/22)
7010 MPI fix. Filename changes (meta/data). salbin*y stuff.
7011 General tidy-up.
7012 SST.bin SSS.bin added to verification/exp2
7013
7014 checkpoint8 (1998/06/22)
7015 Inludes time-dependant forcing and time-averaging.
7016 Works at 4x4 and 2.8125x2.8125 global
7017
7018 checkpoint7-4degree-ref
7019 Branch from checkpoint7. Released for application to
7020 global modeling and general modeling - process studies, regional
7021 model etc..
7022 Configured for verification/exp2 - 4 degree global, two process.
7023
7024 checkpoint7 (1998/06/15)
7025 Created by cnh
7026 Simple 4 degree global simulation
7027 configuration.
7028 Includes climatological wind,
7029 hydrography, bathymetry etc
7030 Does not include Heat Flux and E-P
7031
7032 checkpoint6 (1998/06/08)
7033 Created by cnh
7034 merged checkpoint5 with CD and
7035 spherical polar code.
7036 Still some problems with GM Redi
7037 abd full topography.
7038
7039 checkpoint5 (1998/06/08)
7040 Created by AJA
7041 contains updates to GM Redi
7042 and reordered timestepping loop
7043 for Implicit Diffusion.
7044
7045 checkpoint4 (1998/05/30)
7046 Created by cnh
7047 Contains memory saving macros ( _rdxc etc..) for when
7048 grid variations are limited.
7049 Contains polynomial coeffs for EOS and knudsen program
7050 for generation.
7051
7052 checkpoint3 (1998/05/26)
7053 Created by cnh
7054 Added extra flags for runtime options
7055 Added this file
7056 Added implicit free-surface
7057 Added pre-conditioner
7058 Put compare01 into repository ( compare01/... )
7059 Put data and eedata into repository ( verification/exp1 )
7060
7061 checkpoint2
7062 Created by AJA
7063 Added GM/Redi
7064
7065 checkpoint1
7066 Created by AJA
7067 Restructured kloop in dynamics.F
7068 Added non-linear EOS
7069
7070 baseline
7071 Original checked in code

  ViewVC Help
Powered by ViewVC 1.1.22