/[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.883 - (show annotations) (download)
Thu Sep 27 14:42:59 2007 UTC (16 years, 7 months ago) by dimitri
Branch: MAIN
Changes since 1.882: +4 -2 lines
Added comments, which describe the changes made in kpp_calc_diff_s & _t.F on
April 23, 2007.  These routines no longer update the vertical
diffusivity array (passed as argument) but are (re-) setting those
arrays.  Also changed order GMREDI_CALC_DIFF & KPP_CALC_DIFF_T in
calc_diffusivity.F and ptracers_calc_diff.F since now the order matters.

1 $Header: /u/gcmpack/MITgcm/doc/tag-index,v 1.882 2007/09/27 09:42:27 mlosch Exp $
2 $Name: $
3
4 Notes on tags used in MITgcmUV
5 ==============================
6
7 o pkg/exf: improve vectorization by moving if-statement out of loops
8 o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package
9 o testreport:
10 - allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE
11 monitor & update offline_exf_seaice exp. output.
12 - AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost)
13 o pkg/seaice:
14 - bug fix in the evp solver: boundary conditions were affected be
15 masking of zMax/zMin (changes results)
16 - minor bug fix in boundary conditions in seaice_calc_strainrates
17 (changes results for no_slip)
18 - seaice_lsr.F: make interpolation of eta dependent on boundaries
19 - replace hardcoded lower limit for zeta (zMin) by runtime parameter
20 - add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean
21 stress formulation and no-slip boundary conditions
22 o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP
23 in gad_calc_rhs.F ; add few safety stops in initialisation phase.
24 o pkg/seaice: a first HSALT time stepping equation has been checked in
25 o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV
26 in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem
27 without requiring DO-IF statements
28 o pkg/thsice:
29 use continuous power-law function for partition of energy between lateral
30 melting/freezing and thinning/thickening ; old code using step function
31 still available with #undef THSICE_FRACEN_POWERLAW
32 update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice
33 o testreport: change AD testing : check against results/output_adm.txt
34 using same scripts as for forward test.
35
36 checkpoint59g
37 o adjoint testing: in preparation for changing testreport:
38 - output format: cost and grad written on separated lines
39 - ad output results in directory "results" (instead of "results_ad")
40 o pkg/seaice: adding ice salinity HSALT as a prognostic variable
41 o pkg/seaice: changes for using pkg/seaice with pkg/obcs
42 o pkg/ecco: allow user defined cost function contributions
43 o testreport:
44 Allow to choose (per experiment) the list of tested output variables
45 and the main variable (used to issue a pass/FAIL ) ;
46 - for now, done by adding the specific list in file: [exp]/input/tr_checklist
47 - default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ;
48 Also modify printing of summary:
49 a) ">" NN "<" indicates the "main" variable (used for pass/FAIL)
50 b) echo the list of tested variables in the individual summary.txt of
51 each experiment.
52 o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of
53 threads and number of processes (with #define GLOBAL_SUM_SEND_RECV)
54 (but still depend on the tile decompostion of the domain).
55 o pkg/seaice: change a discretization detail to make the B-grid code
56 "more symmetric". This change is likely to remove all "ridges/leads" that
57 where quasi-aligned with the grid in B-grid solutions. It may also be
58 the solution to the stress coupling issues with the B-grid.
59 o each tested exp: add a "run" directory with a standard ".cvsignore" file ;
60 remove .cvsignore from input dir. (since testreport no longer run here).
61 o pkg/thsice:
62 - cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h"
63 - fix reshaping of sea-ice just after advection:
64 melt all the ice only if ice-volume is too small.
65 - re-visit lateral/thinning repartition of melting (modifs from May 04, 2007):
66 prevent lateral melting if sea-ice fraction is too close to iceMaskMin ;
67 and update experiment global_ocean.cs32x15.icedyn (+start from pickup files).
68 o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water
69 tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged.
70 o define mass2rUnit & rUnit2mass as units conversion factor, used for surface
71 forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit
72 (z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse;
73 and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error
74 of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16
75 -> update output.txt
76 o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME):
77 this affects truncation error: -> update output.txt of exp:
78 global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr,
79 ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon.
80
81 checkpoint59f
82 o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode)
83 o pkg/ctrl: ctrl_bound forces parameter corrections to stay in
84 a bounded range (in forward mode)
85 o pkg/ecco, ctrl, autodiff and mom_common:
86 internal parameter controls, completements of implementations
87 o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy.
88 o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ;
89 (not seem any difference in testing results).
90 o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains
91 at face corners.
92 o pkg/generic_advdiff:
93 - in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR)
94 loop range indices for computing vertical advection tendency
95 and do the calculation in the interior only (no overlap) ;
96 for now, only implemented for SOM advection (to save CPU time).
97 - add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment)
98 o exch2 adjoint
99 First set of changes:
100 - add exch2 hand-written adjoint templates
101 - exch2 hand-written no longer use TAF-flag 'nownew_arg'
102 This will require cleanup in pkg/autodiff/*.F
103 (changed routines currently kept separate in verif. code/)
104 - Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC
105 that used to hide exch2 or cubed-sphere specific code
106 (commented via 'cph-exch2')
107 o pkg/seaice
108 - Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE.
109 o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update
110 output of global_ocean.cs32x15.thsice .
111
112 checkpoint59e
113 o exch2: new S/R that only use the cube-tracer (center-position) exchange:
114 for B-grid vector (not yet tested) and C-grid vector (<- only used
115 when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined).
116 o starting implementation of Duffy et al. (GRL 1999) salt plume scheme
117 (#ifdef ALLOW_SALT_PLUME)
118 o gather_2d/scatter_2d: removed halo regions
119 o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007
120 scheme and the corresponding test case (under front_relax dir). For now,
121 only available with Skew-flux form and not yet tested in realistic set-up.
122 adjoint: store directives updated, but gradient checks deteriorated,
123 so maybe GM/Redi adjoint is now broken.
124 o seaice adjoint
125 * add AREA, HEFF, HSNOW as control variable
126 (should not change lab_sea results)
127 * CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40
128 o pkg/seaice:
129 * added computation of saltFlux in seaice_growth;
130 For time being, sea ice salinity is assumed constant
131 contribution of snow flooding to freshening of sea ice is neglected.
132 SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it
133 defaults to 0.0 in order to maintain backward compatibility.
134 Typical values for SEAICE_salinity are 4 to 10 g/kg.
135 * replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F
136 * added SEAICE_availHeatFrac, which specifies fraction of surface level
137 heat content used to melt or grow ice
138 * commented out cap of HICE: it helps keep ice thinner
139 * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option
140 * applied OBCS T/S mask to HEFFM sea ice mask
141
142 checkpoint59d
143 o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array
144 for {PKG} state variables, and called from DO_STATEVARS_DIAGS.
145 (keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics)
146 o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0"
147 and change default value of parameter "GM_Small_Number";
148 update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15,
149 global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf,
150 tutorial_global_oce_biogeo, tutorial_global_oce_latlon
151 o pkg/ecco: cost function when applying pkg/smooth to controls
152 o pkg/ctrl: add forcingPrecond run time parameter
153 o pkg/seaice:
154 - replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code
155 - fix bug in metric terms of u-equation in LSR solver (implicit part),
156 changes verification/lab_sea
157 - rearrange implicit part of u-equation in LSR solver to make it easier to
158 read, understand, and debug. This causes changes at the truncation level.
159 - fix (serious) bug in the boundary conditions (sign error in the implicit
160 part) of the LSR solver. Changes all LSR results.
161 - fixed problem with HSNOW initialization to avoid thick snow when AREA
162 is initilized with small values - does not change lab_sea results.
163 - added HsnowFile initialization capability
164 o pkg/smooth: addition to model/src and pkg/ctrl so allow
165 initialization of pkg/smooth and application to control vector
166 o pkg/seaice: fix another bug in the LSR no-slip boundary conditons
167 o dependencies: pkg/profiles requires pkg/cal
168 o pkg/profiles:
169 - added option ALLOW_PROFILES_GENERICGRID
170 -> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming
171 that interpolation information (grid points and coefficients) is provided
172 within the netcdf input files.
173 -> sample matlab scripts can be found in MITgcm_contrib/gael
174 that allow you to prepare netcdf input files.
175 - also modified: cleaner include statements, cleaner error print statements,
176 cleaner stops when error, and more tests of the netcdf input files consistency.
177 o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs.
178 o pkg/seaice:
179 - move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this
180 requires a new routine: seaice_diagnostics_fill.F
181 - make sure that seaice does not move if not forced (pressure replacement
182 method, Hibler and Ip, 1995), changes results
183 - and new damping criterion for EVP solver according to Hunke, JCP, 2001
184 - SEAICE_evpDampC = > 0. turns it on (615. is the recommended value).
185 It is turned off by default (=-1.), because it changes the results.
186 - make it possible to read AREA from a file, too.
187
188 checkpoint59c
189 o add S/R and diagnostics for oceanic mixed-layer depth
190 o move GMRedi call after all vertical mixing schemes (including KPP)
191 o pkg/thsice:
192 - ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs
193 (melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice
194 o pkg/obcs:
195 - bug fix for balance code
196 o pkg/seaice:
197 - allow values of SEAICE_elasticParm > 1
198 - add new parameter SEAICE_evpTauRelax as an alternative
199 to SEAICE_elasticParm
200 - make lsr boundary conditions free slip (by default), changes result
201 - add code for no slip boundary conditions for lsr
202 - set minimum of zeta to zero (and not 4e8) (changes results)
203 - add a cap on AREA after advecting AREA if seaice_growth is not called
204 o change calculation of Visbeck K:
205 - no longer depend on tapering scheme; instead, compute slope (limited
206 by GM_maxSlope). this is equivalent to what was comuted before with
207 clipping or linear tappering.
208 - fix vertical averaging (wrong by 1/2 level)
209 - leave the old version (but will not be maintained) within
210 #ifdef OLD_VISBECK_CALC / #endif
211 - update output of exp. ideal_2D_oce
212 o change error catch in calc_r_star to improve vectorization
213 o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and
214 add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf).
215 o adjoint:
216 Re-organized adjoint checkpointing according to Matt Mazloff
217 (but with modifs/completions/cleanups)
218 Storing is now bundled into large arrays to optimized I/O
219 (and second step in cleanup of the_main_loop)
220
221 checkpoint59b
222 o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d):
223 - export/import (between ocean & coupler) fields needed for ocean DIC.
224 o pkg/seaice:
225 - get rid of three more exchanges seaice_calc_viscosities (required
226 different loop boundaries in seaice_lsr and seaice_ocean_stress)
227 - bug fix in seaice_ocean_stress (update of lab_sea required)
228 - reduce loop boundaries to necessary minimum also in seaice_evp
229 - go back to the old way of computing deltaC/Z as the adjoint likes that
230 better
231 o Refresh of tutorial_global_oce_latlon (includes changing salinity-like
232 passive tracer to an Age Tracer) + update output.txt
233 o pkg/exf:
234 - implement A-grid / C-grid selection for wind-stress input files.
235 - clean-up exf_wind.F (remove us, use wspeed instead ; add wStress)
236 for now, in exf_bulk_largeyeager04.F only :
237 - change implementation for case where windspeed + 2. components wind-stress
238 are read-in. AND use rhoConstFresh to convert evap.
239 o pkg/seaice:
240 - use correct EXCH_UV for wind-forcing (on A-grid).
241 - change SEAICE_OPTIONS.h to limit the number of option combinations (regarding
242 SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops.
243 o pkg/exf:
244 - default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC)
245 EXF_INTERPOLATION:
246 - merge global_with_exf/code version of exf_interp_read.F
247 to the main code ;
248 - Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when
249 reading the file ; Important: This options needs to be defined to recover
250 previous code.
251 otherwise, use fixed size array to read in (size=exf_interp_bufferSize).
252 - no longer loose real*8 precision along the way when using exf_iprec=64.
253 o pkg/seaice: rearrangement of common blocks (really needs more cleaning up)
254 - change discretisation of evp-solver in order to avoid another exchange
255 (changes lab_sea) and clean up a little
256 - replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS)
257 help the adjoint (this also changes the results slightly)
258 - add a few "_d 0" where they had been missing in seaice_evp.F
259 - cleaning up: remove unused seaice_calc_rhs.F
260 o pkg/exf: some cleaning-up:
261 - change various "constants" into runtime parameters
262 - cleaned-up Large&Yeager04 routine which should eventually
263 replace exf_bulkformulae.F (changed names of S/R and CPP)
264 and merged various ALLOW_ATM_WIND options
265 only used with thsice pkg (in thsice_get_exf.F):
266 - implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04)
267 which are used when useStabilityFct_overIce=TRUE (= the default)
268 - change default values of ice & snow emissivity and scale downward LW
269 by ice & snow emissivity.
270 o pkg/thsice:
271 fix few little problems, in thsice_calc_thickn.F:
272 - growth vertically (and not laterally) if iceFrac == iceMaskMax
273 - melt only laterally if hIce < hThinIce (as the comments say)
274 and in thsice_extend.F:
275 - allow to form ice even when iceFrac == iceMaskMax (by increasing thickness)
276 - start to form ice as soon as the minimum ice-volume is reachable.
277 update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice),
278 and cpl_aim+ocn
279 o pkg/kpp
280 - move computation of surface related input fields to KPP into a new
281 subroutine kpp_forcing_surf.F
282 - remove wrong (within bi,bj loops) EXCH calls.
283 - little cleaning (add argument myThid in last position, cvs header ...)
284 - for now, fix conservation problem by exchanging KPPviscAz (may not
285 be the best fix)
286 o pkg/seaice
287 - check for inconsistent evp parameter/cpp-flag combination
288 - remove leftover errIO flat for obsolete name list error handling
289 o OpenAD
290 - changed verification/OpenAD to full baroclinic setup (including GM/Redi)
291
292 checkpoint59a
293 o pkg/seaice: some parameter clarifications and a little bit of clean up
294 o pkg/thsice: rename run-time parameters:
295 himin -> hIceMin
296 himin0 -> hThinIce
297 hihig -> hThickIce
298 i0 -> i0swFrac
299 transCoef -> bMeltCoef
300 frac_energy -> fracMelting
301 add new parameters: hNewIceMax, fracFreezing, dhSnowLin
302 with default values (for now) that do not change the results.
303 remove old version of thsice vars advection in pkg/seaice.
304 o in FFIELDS.h:
305 - replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD
306 - make pLoad & sIceLoad always available (but still only used if
307 ATMOSPHERIC_LOADING is #define).
308 o pkg/kpp: replaced _KPP_RL with _RL
309 o bug fixes for vertical diffusivity computations when both KPP and
310 3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F
311 are no longer updating the vertical diffusivity array
312 (passed as argument) but are (re-) setting those arrays.
313 o pkg/seaice: fix bug in evp solver, while doing that
314 - change (improve?) discretization of stress computations for both
315 cgrid-lsr and evp solver
316 - add a new routine to compute strain rates
317 - the above changes lab_sea results
318 - add no slip conditions for evp solver (off by default), lsr-version
319 may follow
320 - fix exchange for shear at Z-points (does not change lab_sea)
321 - retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp
322 (to force the user to pick a time step since there is not "safe" way
323 of choosing it)
324 - add principal stress diagnostics
325 - rearrange fields for evp a little to avoid having to call a: too many
326 exchanges and b: exchanges for stress trensor components which we do
327 not have.
328 - modify Hibler+Bryan (1987) stress coupling so that it reuses information
329 of evp, complete rewrite for lsr case (latter is does not yet work
330 in all cases)
331 o pkg/kpp: add code to have mixing in shelf ice caverns
332 - add myThid to all kpp routines (long overdue)
333
334 checkpoint59
335 o pkg/exf:
336 - fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND &
337 ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid
338 - move exf header files from lower_case.h to UPPER_CASE.h ;
339 add missing cvs Header & Name
340 - add adjoint routines and flow dirs for newly used exch_uv_agrid routines
341 - add namelist param. selectStressGridPosition, exf_monFreq
342 - retire many _CLIM routines, and remove data.exf_clim
343 + params moved to data.exf
344 + climsst, climsss now handled by exf_set_gen, i.e.
345 climss?period=0 refers to constant field,
346 climss?period=-12 to monthly forcing
347 - split up namelists in data.exf
348 o pkg/seaice:
349 - remove seaice_exch and seaice_exch_uv
350 - remove superfluous exchange of theta
351 - add myThid to seaice_budget_ocean/ice
352 - add new interface for atmospheric wind forcing (C-grid only)
353 + new routine
354 + two new field (taux, tauy for stress over ice)
355 + removed one global field (DAIRN) for C-grid case only
356 o pkg/thsise
357 - 2nd set of modifs for thsice adjoint in conjunction with exf
358 o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.)
359
360 checkpoint58y_post
361 o Added capability for latitudinal dependence of Bryan and Lewis, 1979
362 vertical diffusivity, similar to that in MOM4; turned on using
363 #define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using
364 diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file.
365 o Added capability for 3D specification of background vertical diffusion
366 coefficient. This is done by (i) #define ALLOW_3D_DIFFKR
367 in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime
368 "data" file that contains the 3D vertical diffusivity coefficients.
369 o ice dynamics (pkg/seaice) with thsice thermodynamics:
370 - add code within pkg thsice to advect & diffuse sea-ice fields
371 similar to (and will replace) what has been added in seaice_advdiff.F,
372 but: - conserving Mass, Heat & Salt.
373 - better when using non-linear advection scheme (not yet fully tested)
374 - can also be used in atmospheric set-up (for now, only the diffusion).
375
376 checkpoint58x_post
377 o IO option for global-file compact format:
378 - add options when generating topology (utils/exch2/matlab-topology-generator)
379 - add I/O capability (pkg/mdsio).
380 - adapt utils/matlab/rdmds.m to read this format.
381 for now long-line format not yet supported by pkg/mdsio (& exch2).
382 o shelfice: add a few diagnostics
383
384 checkpoint58w_post
385 o p-coord. non-hydrostatic using reference profile for w <-> omega conversion:
386 rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref
387 (and replace horiVertRatio in NH code).
388 Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !)
389 and tutorial_plume_on_slope (sensitive to truncation)
390 o seaice: if ALLOW_ATM_WIND is undefined use wind stress
391 directly to drive seaice model (C-grid only)
392 o exf: when input wind-stress (#undef ALLOW_ATM_WIND):
393 - reintroduce computation of wind from stress,
394 - compute tau (in exf_bulkformulae.F) from windstress averaged to
395 mass points to avoid tau = 0
396 - fix serious bug: (1/3) in Fortran is not the same as (1./3.)
397 o rdmnc.m: make it work with "global" files created with gluemnc
398 o rdmnc.m : some improvements in dealing with singleton dimension
399 (tested on all testreport mnc output files).
400 o genmake2: disable pkg/profiles if netcdf test fails.
401 o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output.
402 o move call to cal_readparms up to make calendar parameters/variable available
403 to all packages
404
405 checkpoint58v_post
406 o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get
407 useDynP_inEos_Zc tested.
408 o pkg/exf: changes to properly interpolate/mask/scale initial fields
409 o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields
410 and portions thereof. See read_cs.txt for description and examples.
411 o utils/matlab/cs_grid/bk_line: to compute transport through passages,
412 add a script (grt_circ_bkl.m) to generate broken-line between 2 points,
413 following the great-circle arc between those 2 points.
414 o trap un-initialized variable with pathscale compiler on weddell.mit.edu
415 (thanks to Constantinos): fix few problems and get (almost) all exp to pass.
416 o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in
417 - enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h)
418 - used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81)
419 - still needs work (not working with some options ; efficiency to improve)
420 and serious testing.
421 - use this scheme for temperature & salinity in 2 advection test exp.:
422 advect_xy & advect_xz, respectively.
423
424 checkpoint58u_post
425 o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels.
426 o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA.
427 o testreport: add option "-skipdir" to skip some test.
428 o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent
429 momentum calculation.
430 o gad_advection: fix vertAdvecScheme (if different from advectionScheme)
431 o some cleaning: usePickupBeforeC35 no longer supported ; remove this option.
432 remove checkpoint.F and the_correction_step.F (no longer used);
433 do the k loop inside CYCLE_TRACER (supposed to be more efficient).
434 o add option (linFSConserveTr) to correct for tracer source/sink due to
435 Linear Free surface
436 o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine
437 o pkg/thsice: fix reading mnc-pickups
438
439 checkpoint58t_post
440 o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F)
441 o pkg/mdsio:
442 - clean-up mdsio_readfield.F & mdsio_writefield_new.F and
443 move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) &
444 mdsio_write_field.F (S/R MDS_WRITE_FIELD);
445 - fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD
446 - collect old S/R in one file: mdsio_rw_field.F (now just a call to
447 either MDS_READ_FIELD or MDS_WRITE_FIELD )
448 - new S/R (to replace MDSWRITEMETA), which allows to write more
449 informations (variable names, time ...) to meta files.
450 - modify rdmds.m to give back the meta file content.
451 o pkg/diagnostics: change vertical interpolation to be safer, and more
452 flexible (define p-levels to interpolate to in data.diagnostics);
453 add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right
454 diagnostic pointer.
455 o pkg/seaice: more cleaning up of seaice_growth, added many comments
456 o pkg/exf: put runoff0 and runoff1 into the appropriate common block
457 o fix multi-category seaice:
458 - change cpp flag SEAICE_MULTILEVEL to more meaningful name:
459 SEAICE_MULTICATEGORY
460 - fix short wave heat flux
461 o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics
462 and allow to use EVP solver. Change forward lab_sea: test both EVP
463 solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint)
464 o Initial check-in of lab_sea adjoint
465 (very similar to natl_box_adjoint/code_seaice)
466 * used C-grid and EVP solver
467 * used KPP, GM/Redi
468 * uses inAdExact=.TRUE.
469 * gradient checks fail for both ADM and TLM
470 due to sensitive snow melt code in seaice_grwoth (look for "JZ")
471 f.d. gradients actually seem more problematic than ADM, TLM gradients;
472 issue is related to forward mismatch between g77 an ifort
473 o pkg/seaice: overhaul of thermodynamics
474 - growth.F and groatb.F are replaced by new routine seaice_growth.F
475 - budget.F is replaced by two new routines seaice_budget_ocean/ice.F
476 - move a few global fields out of SEAICE.h into seaice_growth.F and
477 make them 2D (FICE/QNETO/ ...)
478 - remove FO (it is the same as QNETO)
479 - introduce a few local fields to avoid modifying external fields such
480 as atemp, etc.
481
482 checkpoint58s_post
483 o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F
484 changed exf_set_gen.F so that
485 genperiod=0 means input file is one time-constant field and
486 genperiod=-12 means input file contains 12 monthly means
487 o CG2D: use pre-computed solver main-diagonal (stored in common block);
488 this affects truncation error ; generate new output file for exp. which
489 fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d),
490 global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d),
491 ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d),
492 MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d),
493 tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d),
494 vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d)
495 o start implementation of deep-atmosphere and anelastic formulation
496 o verification: remove 2nd copy of input files and use script "prepare_run"
497 to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M)
498 o mom_common/vecinv/fluxform: fix a few initialisation isssues
499 o profiles: fix for multithreaded case
500
501 o diagnostics: rename few diags:
502 s/'PRESSURE'/'RCENTER '/g
503 s/'TICE '/'oceFreez'/g
504 s/'TAUX '/'oceTAUX '/g
505 s/'TAUY '/'oceTAUY '/g
506 s/'SWFLUX '/'oceQsw '/g
507 s/DIFx/DFxE/g
508 s/DIFy/DFyE/g
509 and add few ocean-forcing diagnostics:
510 atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS
511 o modifications to pkg/seaice/growth.F and budget.F, which change results of
512 lab_sea experiment: HSNOW was sometimes treated as effective and sometimes
513 as actual snow thickness. It now refers everywhere to effective snow
514 thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA.
515
516 checkpoint58r_post
517 o modifications to pkg/seaice/growth.F, which change results of
518 lab_sea experiment: fixes pertain to melting snow over open water, to
519 masking EVAP under sea ice, and to using the correct AREA variable for
520 computations of EVAP, PRECIP, HSNOW, and GHEFF
521 o add ability to read bathy, salt, and theta using MNC (off by def)
522 o add flooding algorithm and advection of HSNOW for pkg/seaice;
523 both are turned off by default and do no change any results
524 o seaice advection with pkg/thsice: a step toward the use of non-linear
525 advection scheme, but #ifdef or commented out for now (requires more EXCH).
526 o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens
527 (identical results) and the standard version of EXTERNAL_FIELDS_LOAD
528 in natl_box (affects results @ truncation level: update output.txt)
529 o multi-threading and IO:
530 - replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R.
531 - remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls
532 (needed to work with SingleCpuIO): tested in all verif. exp.
533 o GAD: use simpler DST3 formulation as default (old version left within #ifdef)
534 affects the results (but none of the verification test uses this scheme).
535 o Adding some pkg/diagnostics capability to pkg/seaice
536 (will certainly be subject to changes)
537 o ctrl: adding new control variables:
538 lwflux, lwdown, evap, snowprecip, apressure, runoff
539
540 checkpoint58q_post
541 o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up
542 1/6-deg Southern Ocean configuration by 8% on IBM Datastar and
543 high_res_cube configuration by 4% on Columbia.
544 o clean-up multi-threaded problems (reported by debugger tcheck on ACES);
545 add (in global_with_exf/code) a version of EXF_INTERP_READ without
546 dynamical allocation (seems to work in multi-threaded).
547 o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using
548 single CPU io) so that TAF does not have to see EESUPPORT.h
549 o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux)
550
551 checkpoint58p_post
552 o obcs: stop if obcs is used with useCDscheme = .true.
553 o shelfice:
554 - fix a sign error so that no slip at shelfice interface works
555 - remove stop for combination non-hydrostatic code and shelfice. That does
556 not mean, that the results are correct, but at least they are numerically
557 stable
558 o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted)
559 o added adjoint exch routined for all exch*3d* routines
560 and updated flow directives
561
562 checkpoint58o_post
563 o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ;
564 remove old subroutines (_XY_ & _XYZ_); update the adjoint version.
565 o change controling S/R for writing pickup file (new S/R do_write_pickup)
566 and clean-up reading/writing of pickup files.
567 o fix local version of read/write pickup (NH part) in rotating_tank/code
568 o simplify EXCH interface:
569 - change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list)
570 - not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version
571 o added the regrid package
572 o shelfice:
573 - add a simple boundary layer scheme to reduce noise
574 - fix the indexing in shelfice_u/v_drag so that there will be actually drag
575
576 checkpoint58n_post
577 o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to
578 local variable (not in common block).
579 o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass.
580 - still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more);
581 - still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls
582 to work with SingleCpuIO.
583 o add "_d 0" to real constant of pkg/cfc subroutines ;
584 update exp. cfc_exemple & tutorial_cfc_offline output files.
585 o multi-threading and IO:
586 - all threads call READ_FLD S/R (needed if using SingleCpuIO):
587 (no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R.
588 - barrier before and after reading.
589 - stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE)
590 - avoid using MDS_WRITELOCAL for LAND pkg output.
591 - new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics
592 common-block variables ; Allows multi-threading with master-thread IO.
593 o change default MAX_NO_THREADS from 32 to 4 ;
594 and stop cleanly when MAX_NO_THREADS is too small.
595 o add S/R BAR_CHECK to check multi-threaded barrier synchronization
596
597 checkpoint58m_post
598 o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc.
599 and side-drag) on CS-grid : global_ocean.cs32x15.viscA4
600 o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp.
601 keep global_ocean.90x40x15 (for AD testing) with former secondary test
602 (".qshyd") as the main test (mv output.qshyd.txt to output.txt)
603 o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos;
604 add MITgcm_tutorials (= code + all the tutorials)
605 o ecco, option to compute cost for total ssh (mean+anom)
606 o consistent with addition of ptracer and ssh in pkg/profiles
607 o profiles: adding ptracer and ssh
608 o testreport: change multi-test output-file name
609 (from output.txt.{name} to output.{name}.txt)
610 o profiles: now ok for mutli-tiles case
611 o seaice: add 4 parameters for different advection schemes for area,
612 (effective) seaice thickness, enthalphy, and snow height. Their default
613 is the standard parameter SEAICEadvScheme
614 o calc_gw:
615 - add cosFacU in zonal viscous flux (harmonic.visc.).
616 - put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt.
617 of tutorial_plume_on_slope.
618 o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria).
619 o calc_gw: true flux-form, account for horizontal grid spacing.
620 update rotating_tank results, but not plume_on_slope (affected at
621 truncation level, 11 digits).
622
623 checkpoint58l_post
624 o calc_gw:
625 - take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V
626 - remove side-drag for now (need to fix it); update plume_on_slope results.
627 - fix for partial-cell & non-uniform dz; update plume_on_slope results.
628 o commit code to make SST/SSS weights spatially variable
629 (based on either variable in-situ or variable initial T/S weights)
630 o pkg/ecco:
631 * commit code to relax deviations of xx_theta, xx_salt to 5*sigma,
632 now based on horizontally varying weights wthetaLev, wsaltLev
633 * cost_averagesflags now returns year indices in addition to day, month
634 * sflux balance is performed on annual basis
635 (sflxumm, sfluxmm2, bal_sfluxmm)
636 * for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO,
637 including separate counting and multipliers
638 o pkg/rbcs
639 * add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing
640
641 checkpoint58k_post
642 o testreport:
643 - always build in dir. "build" (if not there, mkdir build instead of building
644 & running in input)
645 - run in dir run (if it exists), in build otherwise.
646 - call prepare_run (if input/prepare_run exists)
647 - run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists.
648 o pkg/exf modifications to interpolation and rotation routines for more
649 reasonable treatment of North Pole singularity: for tracers North Pole
650 value is set to northernmost zonal-mean value, for zonal velocity it is
651 set to zero, and for meridional velocity it is set to northernmost value.
652 o pkg/exf/exf_check_range.F
653 - add tile index to diagnostics and move stop statement to the very
654 end of the routine.
655 o pkg/diagnostics: (diagnostics_main_init.F)
656 define title of isomorphic variables according to the current config.
657 o pkg/thsice with pkg/seaice dynamics:
658 - fix domain of computation (interior only, required for exf) and do exchanges
659 - seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient
660 o towards a standard way of dealing with multi-threading in MONITOR
661 and ${PKG}_MONITOR (all except ptracers_monitor) subroutines.
662 o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith)
663 to W momentum equation in nonhydrostatic and quasihydrostatic runs.
664 o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor.
665 o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block)
666 o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL
667 (problems ? with gradient check in bottom_ctrl_5x5 adjoint test)
668 o tracer advection:
669 - clean-up and simplify calc_common_factors.F
670 - make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer
671 advection subroutine (but still not used within DST advection S/R)
672 o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim)
673
674 checkpoint58j_post
675 o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields
676 from file (collects calls previously in FORWARD_STEP)
677 o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS
678 o adjoint store dir. adjusted accordingly
679 o genmake2
680 replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list.
681
682 checkpoint58i_post
683 o pkg/seaice: add parameter that allows to scale/turn off effect of seaice
684 on wind stress (SEAICEstressFactor defaults to 1.)
685 o Total number of Timers is finite (<=40): comment out 2 non-essential one
686 in the_main_loop.F to avoid Pb (e.g., when running fizhi test)
687 o vector_invariant: fix highOrderVorticity(=4.th.Order) advection
688 on CS-grid: no longer loosing mass.
689 o exf & curvilinear-grid: no longer modify longitude xC & xG.
690 o pkg/ggl90: fix sloppy output and fix a bug
691 o pkg/seaice: added SEAICEuseEVPpickup parameter
692 - Set to false in order to start EVP solver with
693 non-EVP pickup files when using SEAICEuseEVP
694 - fix sign error in diffusion in seaice_calc_rhs
695
696 checkpoint58h_post
697 * Modifications for bottom topography control
698 o replace hFacC by _hFacC at various places
699 o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL
700 o add non-self-adjoint cg2d_nsa
701 o update autodiff support routines
702 o re-initialise hfac after ctrl_depth_ini
703 o works for 5x5 box, doesnt work for global_ocean.90x40x15
704 * Adding verification for 5x5 box (4-layer) bottom topography control
705
706 checkpoint58g_post
707 o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g.,
708 used for mean seasonal cycle, mean diurnal cycle); add an example
709 in verification/global_ocean.cs32x15/input.thsice/data.diagnostics
710 o pkg/ggl90:
711 - add parameter (minimum surface kinetic energy)
712 - fix bug (avoiding division by zero)
713 o couple pkg/thsice to pkg/seaice:
714 - modify advection in seaice to accomodate new scalar fields to be advected
715 - only muliDimAdection scheme work with seaice/thsice
716 - mapping of thsice-variables to seaice-variables, back and forth
717 - does not break the verification experiments, but does not give the
718 desired results either
719 o pkg/seaice
720 - make (default) second order advection a bit less confusing?
721
722 checkpoint58f_post
723 o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice
724 to pkg/seaice):
725 - new routines thsice_map_exf and thsice_get_exf provide the interface
726 - add an additional formal parameter to thsice_solve4temp
727 o pkg/exf:
728 - add new fields wspeed, snowprecip (to be able to couple to thsice)
729 - correct Stefan-Boltzmann constant
730 - new parameter for longwave surface emittance
731 - separate some stuff from exf_bulkformulae into new routines
732 exf_radiation, exf_wind
733 - add new parameters and constants: longwave emissivity for ocean, ice
734 and snow, evaporation parameters over ice
735 - decouple wind/stress computation from ALLOW_BULKFORMULA: always compute
736 either wind from stress or stress from wind
737 o pkg/thSIce:
738 - split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F
739 - put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND
740 and THSICE_CALC_THICKN
741 - for now, call to THSICE_GET_BULKF remains inside i,j loops.
742 - add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h
743 to make debugging easier.
744 - affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output
745 o pkg/bulk_force:
746 - clean-up comments and parameters ;
747 - add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ;
748 o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched;
749 generate new output for test-experiment: aim.5l_cs.thSI
750 o results_ad : rename "output.txt_adm" to "output_adm.txt" and change
751 testreport accordingly
752
753 checkpoint58e_post
754 o SEAICE_CGRID adjoint done
755 o R_STAR adjoint implemented.
756 * Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ )
757 * need to sort out init. of h0facc, etc.
758 o Make pkg/profile fully independent of ecco,cost, etc. stuff
759 to be able to use it in pure forward.
760
761 checkpoint58d_post
762 o upgrade simple test-experiment to tutorial example:
763 step.1: duplicate the experiment and (step.2) will remove the old copy.
764 tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box)
765 tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere)
766 tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation)
767 tutorial_global_oce_biogeo <- copy of dic_example
768 tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection)
769 tutorial_plume_on_slope <- copy of plume_on_slope
770 tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity)
771 tutorial_global_oce_optim <- empty for now (David ?)
772 tutorial_global_oce_in_p <- copy of global_ocean_pressure
773 some tutorials (R1) were already checked-in under tutorial_examples in release1_branch
774 o correct a sign problem in cost_scat.F
775 o obcs and ptracers: fix boundary conditions for advections schemes
776 with larger stencil
777 o thsice adjoint: start
778 o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for
779 completeness
780 o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING
781 and COSINEMETH_III, add comments in default CPP_OPTIONS.h
782 o ptracers adjoint:
783 * avoid extensive recomputatations
784 * fix missing re-init. of gptr (missed by TAF)
785 o obcs: add a flag (OBCSprintDiags, defaults is true) that allows
786 me to turn off the excessive output to STDOUT that this package produces
787 o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common
788 and add those terms in Vector-Invariant formulation.
789 o in ctrl pkg, if ALLOW_CAL, use monthly mean controls
790 if the control period (xx_hfluxperiod etc) is 0
791 o in profiles pkg, clean routines and fix details
792 o in ecco pkg, reading ssh data:
793 fix problem in case the model does not start at iter0=0
794 o fix mnc-pickup/restart for ptracers
795 o new package prifiles:
796 code to compute profile-based cost by Gael Forget
797 (modifs in ecco, ctrl, autodiff)
798 o Benign bug fix in initialization (spotted by M. Mazloff) of
799 ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F
800
801 checkpoint58c_post
802 o adjoint: finish NLFS adjoint and provide reference output in
803 verification/global_ocean.90x40x15/results_ad_nlfs
804 o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the
805 documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in
806 SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only
807 with SEAICE_CGRID defined.
808 o move calendarDumps from "data" to "data.cal" and clean-up the code
809 with a simple call to pkg/cal S/R: CAL_TIME2WRITE
810 o add useEXF & useCAL flags (for now, set in hard-coded way)
811 o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum
812 (were missing in NH mode, and wrong in quasihydrostatic mode).
813 waiting for Chris updated version of calc_gw to add those CALLs.
814 o fix bug in quasihydrostatic S/R ;
815 add a test for this option: global_ocean.90x40x15.qshyd
816 o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs.
817 (called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS)
818 o add on/off flag useOffLine for package OFFLINE
819 o seaice:
820 - modify advection so that it works also on the C-grid
821 - extend loop ranges in seaice_lsr and seaice_dynsolver; fixes
822 problem in multi-tile runs with C-grid
823 - add flags for clipping ice velocities and/or masking solver forcing
824 - fix drag (ocean on ice) formulation and a bug that caused noise in the
825 C-grid solver
826 - added a few comments to seaice_diffusion.F
827 - separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V
828 are now exclusive)
829 - add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which
830 required re-ordering the code a little:
831 + make DAIRN global variable (defined in SEAICE)
832 + move computation of the viscosities eta and zeta into a new separate
833 routine (because I need to recompute them in seaice_ocean_stress.F)
834
835 checkpoint58b_post
836 o AIM+thSIce: fix sign of Short-Wave through the Ice ;
837 update output.txt of exp. aim.5l_cs.thSI
838 o various mnc cleanups and improvements:
839 + shrink lookup tables by factor of ~4
840 + better error reporting when running out of lookup space
841 + able to handle longer path/file names (up to 500 chars)
842 o adjoint:
843 - Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations.
844 - TBD: "hidden" mom_vecinv recomp. in dynamics
845 o change forcing_In_AB to affects both T,S forcing and Momentum forcing
846 (allow to differentiate between forcing components using new integer flags:
847 momForcingOutAB=1/0 & tracForcingOutAB=1/0)
848 and add new flag to put Dissipation tendency out of Adams-Bashforth.
849 o ecco
850 - enable trend removal from SSH anomaly obs.
851 o adjoint
852 - a fix for PmEpR when #undef EXACT_CONSERV
853 - fix of "hidden" recomp. in thermodynamics (no TAF warnings)
854 - try to fix "hidden" recomp. in forward_step for NLFS
855 (NLFS seems broken sometimes after I checked it in)
856 o seaice:
857 - add c-grid version of the dynamic solver:
858 + three new routines that are the c-grid substitute lsr, dynsolver
859 and ostres
860 + put a few fields that were local to dynsolver into global common
861 blocks, so that I can move the computation of stresses etc into
862 seaice_lsr (saves coding but may break the adjoint).
863 - replace more hardwired parameters by runtime parameters
864 - add ice masks that mask the rhs of the implicit solvers where there
865 is no ice (commented out in seaice_dynsolver, because i am not sure
866 if this works properly), eventually this should replace the clipping
867 of ice velocities in seaice_dynsolver to +/-40cm/s.
868 o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly
869 include it only where its needed
870 o move balancing of fluxes before the call of external_forcing_surf
871 o seaice:
872 - correct units of turning angles (now they are really in degrees)
873 - move computation of GWATX/Y out of main routine into dynsolver
874 - initialize GWATX/Y in seaice_init
875 o Apply mask on Fresh-Water flux (needed for SSH forcing).
876 update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual)
877 o seaice: add runtime flags for turning angles (default to zero)
878 o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean
879 and trend from exf forcing and ctrl control adjustments
880 o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF
881 (since checkpoint57x_post)
882 o change the default rotation period to 86164.s = the Earth rotation
883 o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T)
884 and based on a reference stratification. Tested within hs94.cs-32x32x5.
885 o seaice advection: add code for choosing between the default (2nd order
886 central differences) and multiDim advection schemes provided by
887 pkg/generic_advdiff
888 o seaice:
889 - removed all references to SEAICE_GRID.h fields from
890 dynsolver, advect, diffus, lsr, without changing the results of lab_sea
891 (cubed-sphere configuration will change a little)
892 - grid computations in seaice_init are obsolete now.
893 - cleaned up code a little so that is easier to read (hopefully).
894 - added new (better?) discretizations of default advection and diffusion
895 (turn on with SEAICEuseFluxForm)
896 - replace 1 in 3d global fields by kSurface in growth.F
897
898 checkpoint58a_post
899 o seaice:
900 - bug fix in advect.F
901 o shelfice:
902 - separate shelfice load anomaly from pload (breaks with time
903 dependent forcing), => introduce constant field shelficeLoadAnomaly.
904 Its default is 0., but it may be computed more cleverly from (unknown)
905 t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
906 done offline. A good approximation of the pressure load anomaly is
907 necessary to avoid large initial adjustment processes underneath
908 deep-reaching shelfice.
909 - small fix in ISOMIP shelfice_thermodynamics
910 - add more sophisticated thermodynamics of Hellmer (1989), this is
911 now the default
912 - give a few constants more intuitive names
913 o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful
914 if bulk formulae are used in long integration (especially EmPmR). Turn
915 on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01
916 if balancePrintMean, the imbalance that is substracted is printed to
917 STDOUT.
918 o fix bug (typo) in obcs_apply_eta.F
919 o add a new package shelfice which enables us to model the circulation
920 underneath shelf-ice with draughts of hundreds of meters.
921 - works
922 - to do: + include improved thermodynamics
923 + check whether kSurfC (from model/inc/SURFACE.h) can be used
924 instead of new field kTopC
925 + can we use topoFile, Ro_surf and existing code in ini_depth.F
926 instead of new field R_shelfIce and new code in ini_depth.F
927 and ini_mask_etc.F?
928 + adjust vertical mixing schemes?
929 o seaice pkg:
930 - add a cpp-flag to include a simple formula for a salinity dependent
931 freezing point of sea water at the surface
932 - change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and
933 meridional stresses are now different (and hopefully correct)
934 o AIM pkg: change threshold on large-scale condensation to conserve Heat.
935 update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics
936 and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG)
937 o pkg/diagnostics: add options and parameters for regional-statistics
938 diagnostics ; define regions by reading a region-mask from a file
939 (might add other options later)
940 o pkg/bulk_force:
941 - add option and parameters to use AIM surface-flux formulae.
942 - Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ;
943 others forcing fields (defined in PARM05, parameter file "data") are loaded
944 from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F).
945 - initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F
946 - use the right EXCH call for uwind,vwind (to work on CS-grid).
947 - re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h)
948 and parameters (note: calcWindStress replaces .NOT.readwindstress).
949 - cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP).
950
951 checkpoint58
952 o add "--embed-source" option to genmake2 which, when the supporting
953 tools can be compiled (as determined by genmake2) will turn on the
954 embed_files package which then embeds the entire MITgcm source code
955 (*.[fFhc] + Makefile) used for the build within the executable
956 - requested by CNH but off by default
957 - adds a paltry <9MB to the mitgcmuv executable in most cases
958 - only writes the output when useEMBEDSRC in eedata is true
959 o clean up 3-dim. relaxation codes:
960 * Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec
961 * Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs)
962 * Thanks to Tom Haine for testing!
963
964 checkpoint57z_post
965 o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate):
966 affects output (@ truncation level) of exp. plume_on_slope ; updated.
967 o fix the pickup behavior for obcs in combination with ptracers
968 o fix a bug in ptracers_external_fields_load
969 o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...)
970 affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!)
971 o transfered surface NH pressure to eta field (if exactConserv).
972 o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign)
973 and update lab_sea output.txt file.
974 o completing 3-dim. relaxation code: additional term
975 1/tau*( theta(i,j,k) - thetaStar(i,j,k) )
976 in S/R EXTERNAL_FORCING_T (file external_forcing.F)
977 * At compile time, in "EXF_OPTIONS.h" set
978 #define ALLOW_CLIMTEMP_RELAXATION
979 #define ALLOW_CLIMSALT_RELAXATION
980 * At runtime in "data", under &PARM03 set (e.g., units in seconds)
981 tauThetaClimRelax3Dim = 15552000.0,
982 tauSaltClimRelax3Dim = 15552000.0,
983 * 3 cases:
984 1) Use a constant-in-time 3-dim. field
985 2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec.
986 3) Real-time relax. to time-evolving prescribed field
987 o Adding Laplacian-type smoothness constraint on
988 initial and boundary (forcing) controls (ic, bc)
989 * enable at compile-time via
990 ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION
991 * enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1
992 * Absolute scale somewhat unclear so far
993 * no area weighting was included since no other cost term does so far
994
995 checkpoint57y_post
996 First step for a NLFS adjoint
997 o initially suppress rStar (new flag DISABLE_RSTAR_CODE)
998 o new init. routines for calc_r_star, calc_surf_dr
999 o still need to deal with ini_masks_etc
1000 o testreport seemed happy
1001 checkpoint57y_pre
1002
1003 o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs.
1004 o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc)
1005 o add new offset feature to offline pkg (plus minor cleanup)
1006 o cfc fixes for final year of integration
1007 o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should
1008 be in GCHEM_OPTIONS).
1009
1010 checkpoint57x_post
1011 o fix testreport Pb in multiple test experiment.
1012 o cleanup our namelist syntax in verification:
1013 - make it more F95 standards compliant (some work still needed)
1014 - allows the vast majority of our tests to work with gfortran
1015 o Non-Hydrostatic:
1016 - put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h
1017 - fix exchange calls for CS-grid using the new EXCH_S3D_RL.
1018 o Allow to apply AB on T,S rather than on AB(gT,gS):
1019 - implemented within #ifdef ALLOW_ADAMSBASHFORTH_3
1020 - use the same arrays (gtNm,gsNm) to hold tracer field at previous
1021 time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)).
1022 - need a "clever" read_pickup to restart from the other AB formulation
1023 o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h
1024 o remove some unused variables (reduces number of compiler warnings)
1025 o adjoint
1026 * Disable useVariableViscosity for adjoint for time being
1027 (there are a number of extensive recomputations)
1028 * Initialize certain variables needed for adjoint
1029
1030 checkpoint57w_post
1031 o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names
1032 fix the singleCpuIO RS version of MDSWRITEFIELD
1033 and add a WARNING if using globalFiles=T with multi-processors.
1034 o write grid-file(s) in only one format (MDS or MNC): default=MNC (if
1035 using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc
1036 o tracer advection scheme:
1037 add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get
1038 those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile,
1039 was not very convenient).
1040 add implicit version for DST-3 & DST3_Flux_Limit vertical advection;
1041 (further tests needed for the implicit DST & Flux-Limiter schemes).
1042 o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef
1043 and sRef for convenience, handy, when you want to initialize
1044 ptracers in a large domain with a constant non-zero value. Also,
1045 untangle ptracers_init.F a little.
1046
1047 checkpoint57v_post
1048 o change dome exp. to use variable viscosity in side-drag terms.
1049 o remove all the files from the cfc_offline test since they are now
1050 incorporated into tutorial_cfc_offline which has been producing
1051 identical results for a few days of testing
1052 o add new parameter: sideDragFactor to enable half-slip-side BC
1053 and change side-drag S/R to use viscosity from mom_calc_visc
1054 (can switch back by setting sideDragFactor=0.); affects results at
1055 truncation level; regenerate output for exp.: global_ocean.cs32x10(x3),
1056 global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5).
1057 o vorticity & strain are now computed without masking, to account for
1058 no-slip-side BC in variable viscosity calculation ; mask is applied
1059 anyway later on, before computing advection/coriolis terms.
1060 o modify exp4 to test new obcs support for reading from external files
1061 and for passive tracers
1062 o fix behavior of ptracers_monitor when monitor output is written to a
1063 netcdf-file; still not independent of monitor.F (writes in the same
1064 file).
1065 o change default value of tRef (put a uniform, meaningful value for ocean
1066 & atmos) and initialize sRef (was missing, as Martin mentioned).
1067 o Redefine viscC?Leith*. Change the coefficients of Leith viscosity
1068 to be proportional to enstrophy dissipation length. Thus,
1069 viscC?leith?_new=pi*(viscC?leith?_old)^(1/3)
1070 This is now consistent with Smagorinsky and with the manual.
1071
1072 checkpoint57u_post
1073 o OBCS and PTRACERS: add open boundary support for passive tracers
1074 - either use homogenous (pseudo) v.Neumann conditions or prescribe
1075 OB-values from file; this is not different from the way theta and salinity
1076 are treated
1077 - however, Orlanski-radiation conditions are not supported, and the model
1078 will stop if you use pTracers and Orlanski at the same time.
1079 - beefed up the rountine obcs_external_fields_load: now only those open
1080 boundary values are overwritten with values from files for which there
1081 are really files, otherwise the OB-fields remain untouched. This makes
1082 it possible to use different OBs at different ends of the domain (as
1083 with EXF)
1084 o reduce number of exch calls in shap_filt (s2).
1085 o CS-grid: fix divergence contribution to Leith viscosity. Affects (@
1086 truncation level) 4/5 MLAdjust test results (11&12 digits match).
1087
1088 checkpoint57t_post
1089 o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4
1090 o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get
1091 same truncation, independent of the face number: affects affects several
1092 test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5).
1093 o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times);
1094 note that biharmonic viscosity + no-slip was not tested in any experiment.
1095 o fix bug in non-linear free-surf side-drag ; generate new output for
1096 global_ocean.cs32x15(+.thsice) & global_ocean_pressure.
1097 o make mnc honor the writeBinaryPrec flag for most kinds of output
1098 o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum
1099 o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation
1100 error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5).
1101 o add brackets in multi-terms sum to get same truncation, independent of
1102 the face number (manage to get exactly same value of gU,gV at the cs-edge)
1103 affects several test. exp. Update global_ocean.cs32x15 (+.thsice).
1104 o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax
1105 and viscA4Remax, which allow one to limit the minimum viscosity by specifying
1106 a maximum grid-scale Reynolds number. Also, changes all length calculations
1107 in the case of grid anisotropy to geometric mean of dx**2 and dy**2.
1108 Suggested values of viscosity parameters found in mom_calc_visc.
1109 Many new viscosity diagnostics available.
1110
1111 checkpoint57s_post
1112 o Add clearing-house for viscosity calculations, mom_calc_visc and
1113 correct numerous bugs in LeithD and Smagorinsky discretizations.
1114 mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be
1115 used simultaneously, and to be used in mom_vecinv and mom_fluxform.
1116 Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F)
1117 and with Strain-Tension viscous term calculation (mom_hdissip.F).
1118 The Strain-Tension form is now called with useStrainTensonVisc=.true.
1119 ViscAhStrain and viscAhTension are now retired.
1120 o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4".
1121 o In response to JMC's bug report, genmake2 now ignores any soft-links
1122 that it finds in the *current* directory when searching for files.
1123 Soft-links found in any other source directories will still work as
1124 they did before.
1125 o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls
1126 a C routine to unlimit the stack size
1127 o mnc-ify pkg/aim snapshot vars
1128 o mnc-ify pkg/land as requested by Daniel
1129 o various changes to mnc including:
1130 - all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format
1131 - output can now be grouped so that all files within a group
1132 change the ITER portion of their names in lock-step together
1133 - can now read ("global") PER-FACE (in addition to PER-TILE) files
1134 and works with both EXCH1 and EXCH2 (but needs more testing)
1135 - writing works for all verification test cases w/ g77 on Linux
1136
1137 checkpoint57r_post
1138 o make MNC variable initialization happen earlier
1139 o add diagnostics for (almost) each term of the momentum Eq.
1140 o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics.
1141 o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups)
1142 o remove MINIMAL_TAVE_OUTPUT option ;
1143 add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT).
1144 o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src
1145 allows to compile without pkg/mdsio (& test successfully hs94.1x64x5)
1146 o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice)
1147 o add time-dependent SST, SSS control
1148 o cost terms in ecco/ modularized (new cost_generic.F)
1149 o cost_averages routines are modularized (new cost_averagesgeneric.F)
1150 o new infrastructure for seaice model vs. obs misfits in seaice/
1151 * driver from the_main_loop.F is seaice_cost_driver.F
1152 * first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA)
1153 * gradient check in Exp. 6a of natl_box_adjoint/
1154 o natl_box_adjoint input_seaice for Lab. Sea now available online via wget
1155 (see README file)
1156
1157 checkpoint57q_post
1158 o fix initialisation Pb in calc_gw (get NANs in exp5 with g77)
1159 o fix annoying months-old bug in mnc/mdsio output for seaice pkg
1160 - bug was reported by Jean-Michel and Ian Fenty
1161 o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F)
1162 update exp. cpl_aim+ocn output.
1163 o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT
1164 Needed for high-res. runs with large global files
1165 to be able to limit tapelev size
1166 o Changed some tests for adjoint:
1167 * carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT
1168 * natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT
1169 * global_ocean.90x40x15/ back to default 3-level checkpointing
1170 o Modifications to enable scripted COMMON to MODULE conversion
1171 * verification/OpenAD/code/ has necessary scripts and description;
1172 * converts, compiles and runs successfully;
1173
1174 checkpoint57p_post
1175 o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F
1176 o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED
1177 (already the case for some pkgs, including recent MNC_init, e.g. thsice)
1178 o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP)
1179 o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F
1180 (was already the case for dissipation with mom_vecinv,
1181 and also the case for grad.PhiHyd when staggered-timeStep)
1182 This will allow to put dissipation out-off the AB time-stepping.
1183 Unfortunately, affects truncation error. Update output of exp. that "fails"
1184 (cg2d matching number) and leave the others for later: front_relax(10),
1185 global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12),
1186 matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2).
1187
1188 checkpoint57o_post
1189 o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and
1190 (2) its ready to be documented during the 20050801 DocFest
1191 o MNC-ify the gmredi package -- tested and works w/ and w/o mnc
1192 for ideal_2D_oce and lab_sea on linux_ia32_g77
1193 o set to #undef CTRL_SET_OLD_MAXCVARS_30
1194 in global1x1_tot/code_seaice_adj to access indices 32, 33
1195 (worth another tag)
1196
1197 checkpoint57n_post
1198 o adding precip control xx_precip 32
1199 o adding swflux control xx_swflux 33
1200 o Replacing 10 forcing penalty cost routines by 1 generic.
1201 o Implementing partitioning in time-mean and variable adjustment
1202 for atmos. state.
1203 o Time-mean constant error is now read in data.ecco (instead of hard-coded)
1204 o in natl_box_adjoint:
1205 * updated exp 1 to 10
1206 (but does not have time-mean vs. variable split results yet)
1207 o updated global1x1/*_seaice_adj/
1208 to incorporate latest changes
1209 o enable useSingleCpuIO for mdsio vector routines
1210 (applies in particular to tapelev I/O)
1211 o removed inefficient K-loop in all active_file*control*.F
1212
1213 checkpoint57m_post
1214 o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into)
1215 and advect_cs (use EXCH-2 and standard cs-32 grid files).
1216 o pkg/exch2: filling of face-corner halo regions is optional
1217 (ifdef W2_FILL_NULL_REGIONS) and is turned off by default.
1218
1219 checkpoint57l_post
1220 tag before updating tutorials (pre-release-2)
1221 o add cos & sin of grid-direction orientation angle (curvilinear grid only,
1222 for output and interpolation of input fields onto model grid)
1223 o fix radius in mom_v_metric_cylinder.F (wrong by dy/2).
1224 Affects results of exp. rotating_tank ; update output.txt.
1225 o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor
1226 and taking the square quantity and/or using a fraction-weight field.
1227 o fix aim_diagnostics_init.F mate numbers.
1228 o add mnc output capability to diagnostics/diagstat and update
1229 our cvsignore files for the ACSII output generated
1230
1231 checkpoint57k_post
1232 o lab_sea now uses diagnostics package and provides a suite of
1233 new EXF diagnostics output.
1234
1235 checkpoint57j_post
1236 o exf
1237 * bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton):
1238 Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982);
1239 terms -2*ATAN(x) + pi/2 were added to both stable and unstable case.
1240 * extended diagnostics output
1241 - now includes all EXF variables
1242 - hs, hl moved to common block
1243 - separate S/R for diagnostics, called after ctrl vector is added
1244 - name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
1245 - EXFqnet contains true Qnet (i.e. includes qsw)
1246 * updated verif. lab_sea, global_with_exf
1247 * Rearranging hflux (exf_mapfields -> exf_getforcing)
1248 to ensure that diagnostics sees a true EXFqnet
1249 o add matlab scripts for CS-grid vectors (in utils/cs_grid)
1250 o diagnostics pkg: change pointers so that 1 diagnostic can be used
1251 several times with different frequencies.
1252 o mnc-ify the thsice package as requested by Daniel Enderton
1253 - the monitor--MNC output needs work
1254 - many attributes need to be added (most are currently blank)
1255 o mnc-ify theaim_v23 package as requested by Daniel Enderton
1256 - many attributes need to be added (most are currently blank)
1257 o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign)
1258 o add Sadourny like discretization to the 4th.O vorticity advection scheme
1259 o fix bug in rStar code (calc_r_star.F) when used with topo/bathy.
1260 update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn,
1261 fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice).
1262 o fix few little things to avoid floating error with -ftrapuv (ifort v9)
1263 (ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F)
1264
1265 checkpoint57i_post
1266 o Diagnostics package was changed: diagnostic allocation is now deactivated
1267 by setting an empty file name in the namelist (used to be by setting 0 frequency)
1268 o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ;
1269 add 1rst Order upwind vertical Shear.
1270 o add a quick fix for A/B checkpointing in OFFLINE mode
1271 o add IGNORE_TIME define and -ignore_time option to genmake2 as an
1272 end-run around the C/Fortran linking horror in eesup/src/timers.F
1273 o added pkg/runclock: allows user to terminate run based on wall clock
1274 o added non-hydrostatic scaling parameter: nh_am2
1275 o pkg/my82: futile attempt to make results compiler-independent by adding
1276 some "_d 0", etc. no effect.
1277 o for mnc output, fill the 'T' coordinate var with myTime and create a
1278 separate 'iter' variable for iteration count
1279 o pkg/diagnostics:
1280 add new capability: output of Global/Regional & per-level statistics ;
1281 tested against monitor output (including land & thSIce) on various exp.
1282 o make seaice-pkg I/O type flags (MNC/MDS) more standard.
1283
1284 checkpoint57h_done
1285 tag after changing user customized files (DIAGNOSTICS_SIZE.h,
1286 data.diagnostics, data.gchem, data.ptracers) is done.
1287
1288 o pkg/diagnostics: prepare for Global/Regional statistics.
1289 add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h
1290 o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
1291 and rename it: DIFFERENT_MULTIPLE
1292
1293 checkpoint57h_post
1294 o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers
1295 o pkg/diagnostics: change output frequency, now in seconds (instead
1296 of Nb of iterations). This requires to change data.diagnostics.
1297 checkpoint57h_pre
1298
1299 o in mnc, let the user create the output dir if both mnc_outdir_date
1300 and mnc_outdir_num are false
1301 o add fflags() to pkg/diagnostics which allows one to specify, on a
1302 per-file basis, the file precision [default behavior is unchanged]
1303 o added diagnostics to pkg/kpp, including computation of mixed layer
1304 depth based on a temperature/density criterion
1305 o updated verification/natl_box to test the new pkg/kpp diagnostics
1306 o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T)
1307 o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4)
1308 o fix mnc flags in pkg/seaice so that they are "owned" by seaice,
1309 not mnc -- this mistake was found by JMC and is now corrected
1310
1311 checkpoint57g_post
1312 o add Adams-Bashforth 3rd Order time stepping:
1313 - default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3)
1314 - not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ...
1315 checkpoint57g_pre
1316
1317 o make lambda[Theta,Salt]ClimRelax spatially varying
1318 (default remains spatially uniform constant based on tau)
1319 o added new control variables
1320 * init. uVel, vVel, etanN
1321 * lambda[Theta,Salt]ClimRelax
1322 o separate masks used for ctrl_pack/unpack 'from write_grid' output
1323 (suggested by G. Forget)
1324
1325 checkpoint57f_post
1326 o add parameter "baseTime" = model base time = time at iteration zero
1327 new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to
1328 account for baseTime shift
1329 o move Coriolis arrays from PARAMS.h to GRID.h
1330 checkpoint57f_pre
1331
1332 o mnc-ifying the seaice package
1333 o introduced an alternative length scale calculation for use in the limiting
1334 maximum viscosity (off by default, see mom_vi_hdissip.F for details)
1335 o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S
1336 o added modified Leith scheme with viscosity proportional to grad(Hdiv)
1337 as well as grad(vort3). Made it compatible with both approximate form
1338 for the cubed sphere and full form of these gradients. Added flag
1339 useFullLeith to select between approximate and full form.
1340 o add "d0" in getcon.F to reduce differences between compilers/platforms
1341 update output.txt of exp. fizhi-gridalt-hs
1342 o change port_rand funtion to allow to set the seed.
1343 o fix obscure MNC bug involving conversion between reals and integers
1344 - it caused no problems with certain (eg. gcc, ifc) compilers but the
1345 new version is now more standards-compliant
1346 o adjoint-related modifications
1347 * gad_dst3_adv_?: to be able to use advscheme=30 in adjoint
1348 * gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33
1349 * mom_vi_hdissip: to be able to use Leith scheme in adjoint
1350
1351 checkpoint57e_post
1352 o Adding eddy stress controls a la Ferreira et al.
1353 checkpoint57e_pre (actually was tagged: eckpoint57e_pre)
1354
1355 o fizhi pkg: fix AtoC and CtoA when called with same input & output array
1356 update output.txt of exp. fizhi-gridalt-hs
1357 o add more "Z" dimensions and associated coordinate vars to MNC
1358 o pkg/exf: added twoDigitYear capability for option useExfYearlyFields
1359 o parameter calendarDumps: when set, approximate months (30-31 days) and years
1360 (360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq,
1361 KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar
1362 months and years. Requires pkg/cal.
1363 o diagnostics: add pickup functionality
1364 - off by default for backwards compatibility
1365 - current version only uses MDSIO -- MNC will be added
1366 o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies.
1367 o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2)
1368
1369 checkpoint57d_post
1370 o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing
1371 o modify verification/ideal_2D_oce so that it tests the creation of mnc
1372 output from the diagnostics package
1373 o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up
1374 o make genmake2 more portable by using ".$FS" instead of ".f" for more
1375 of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys)
1376 o add coordinate variables to the MNC output from the diagnostics package
1377 o change MNC-flags default value: true when useMNC=TRUE
1378 o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F
1379 the ability (off by default) to read the grid information using MNC
1380 o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt
1381 o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging
1382 o do snap-shot diagnostics at the middle of the time-interval (instead of
1383 at the end).
1384 o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add
1385 new test for AIM with thSIce + slab-ocean
1386 o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h)
1387 o move state variable diagnostics to the beginning of the time step ;
1388 (note: still needs some work specially for snap-shot diagnostics)
1389 duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z
1390
1391 checkpoint57c_post
1392 o Change testing option (-ieee) to get closer agreement between g77 & ifort
1393 o generate new output.txt files on faulks with g77 & the new -ieee option
1394 checkpoint57c_pre
1395
1396 o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF);
1397 update output.txt of exp. global_ocean.90x40x15
1398 o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer
1399 results; update global_ocean_pressure & global_ocean.cs32x15 output.txt
1400 o add saltFlux(+File) forcing capability with periodicExternalForcing
1401 o allow to use pkg diagnostics for GM-Redi & ThSIce output
1402 o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc.
1403 o improvements for the MNC output from DIAGNOSTICS:
1404 - correct handling of the unlimitied dimension
1405 - all dims now have associated coordinate variables
1406 - variables located at U, V, and Corner ("Z") points are now written
1407 with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that
1408 *all* data points are output
1409 o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice
1410 o added pkg/seaice/seaice_monitor.F
1411 o mdsio_readfield.F can now read files visible only to master MPI process.
1412 o pkg/seaice: some test code for ice-modified ocean stress
1413 o exf_getffields interpolation defaults to bilinear for all scalar forcing
1414 fields (remains bicubic for wind velocity and stress). This avoids, e.g.,
1415 spurious negative numbers for precipitation and humidity. Will cause
1416 some small numerical differences for integrations using pkg/exf/exf_interp.F.
1417 o pkg/ctrl/
1418 * Add ctrlvec diagnostics in pack/unpack for nondimensional I/O
1419 May be enabled via doPackDiag
1420 * introduce z-scaling of
1421 + gradient (doZscalePack) and
1422 + control (doZscaleUnpack)
1423 o pkg/mdsio/
1424 * enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F
1425 * N.B.: leave tiled I/O for tapelev (i.e. mds...vector)
1426
1427 checkpoint57b_post
1428 o simplify options in diagnostics_fill arguments (remove weird combinations)
1429 o fix MNC coordinate variables so that they now contain per-face index
1430 values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in
1431 general, EXCH2 grids are only aligned to a "local" coordinate system
1432 o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput)
1433 o Implement instantaneous output within pkg diagnostics:
1434 setting a negative frequency in data.diagnostics produces
1435 "snap-shot" output (as opposed to time-average if freq > 0)
1436 o move out off EQUIVALENCE all diagnostics that fizhi does not use ;
1437 NOTE: change ptracer diagnostics name: use 2 characters to work with
1438 more than 9 tracers. Add also diagnostics of advect & diffus flux.
1439 o more CF compliance: convert all MNC 'iter' variables to 'T' so that it
1440 becomes the coordinate variable for the 'T' dimension
1441 o add CF-style coordinate variables to MNC
1442 - just a first cut: numbers are meaningless on the cubesphere and
1443 missing along the T axis but otherwise it works!
1444 o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX
1445 o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC.
1446 o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon)
1447 this is based directly on what the model compute, so that the content of
1448 each diagnostics might be affected by switching options (e.g., implicitDiffusion)
1449 o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F)
1450 o clean up build options files for SunOS, in particular
1451 - remove -traditional from xmakedepend
1452 - change -xarch=v9 to -xarch=native for f77
1453 - restore use of make (not gmake)
1454 - add CC=gcc if using g77
1455 o changes per discussion of AM, JMC, & EH3 today:
1456 - move redundant "grid" variables out of "state" -- in preparation of
1457 creating proper CF-style coordinate variables and in recognition
1458 that any/all grid variables can be easily copied (eg. w/NCO) from
1459 the grid files into any of the other NetCDF files
1460 - *always* output grid variables with MDSIO (this will eventually be
1461 changed)
1462 - output MNC grid file if useMNC is true
1463 o every instance of _END_MASTER() has been found and replaced with
1464 _END_MASTER( myThid ) in order to satisfy certain picky Sun
1465 preprocessors
1466 o re-arrange diagnostics pkg initialisation:
1467 - allow each package to extend the available diagnostics list
1468 - add some checking and fix small problems (multi-threaded, ...)
1469 - new S/R diagnostics_fill (replace fill_diagnostics):
1470 look through the short list of active diag. (instead of the long list)
1471 create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active
1472
1473 checkpoint57a_post
1474 o this set of changes restores TAMC compatibility
1475 tested for global_ocean.90x40x15 adjoint on trough
1476 (what a pain)
1477
1478 checkpoint57a_pre
1479 o some modifs in tools/build_options for sunos
1480 o call ctrl_pack for ctrl at end for optimcycle=0
1481
1482 checkpoint57
1483 o add horizontal bi-harmonic viscosity for vertical velocity
1484 - new parameter viscA4W (defaults to viscA4)
1485 - affects only non-hydrostatic code
1486 - to be done: no-slip lateral boundary conditions
1487 o switch back to "sflux = sflux - runoff" in exf_getforcing.F
1488 o implement Implicit Vertical advection for pTracers
1489 o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k)
1490 (implemented also for implicit vertical diffusion & advection)
1491 o OBCS: extend application of tracer open boundary conditions
1492 to a strip beyond the boundary of width Olx/Oly
1493 o add call monitor to TAF set of required calls (flow directives)
1494 and include in natl_box_adjoint
1495 o untangle a few ifdefs related to cost, ctrl, autodiff
1496 untangel a few ALLOW_ECCO_OPTIMIZATION
1497 o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr)
1498 (theta2, salt2 in ecco_cost_weights)
1499
1500 checkpoint56c_post
1501 o OBCS as control variables
1502 - update ctrl_ad_diff.list, obcs_ad_diff.list
1503 - remove balance of obcs controls from default
1504 - fix index bug nobcs in ctrl_init
1505 - fix dummy fields filen in ctrl_pack
1506 - add dummy weights for obcs
1507 o lsopt: comment out fort.94 output
1508 o optim:
1509 - remove unnecessary header files
1510 - adjusted namelists
1511 - add xerbla.F to Makefile
1512 o exf:
1513 - multiple modifications of exf_check_range
1514 - unit change in exf_init_runoff from [m/year] to [m/s]
1515 o mdsio:
1516 - i/o-vector change debugLevel from debLevA to debLevB
1517
1518 checkpoint56b_post
1519 o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that
1520 is called from DO_THE_MODEL_IO
1521 - rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE
1522 - introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq)
1523 - clean up PTRACERS_WRITE_TIMEAVE a little
1524 o add another verification experiment that tests both the cfc-pkg and
1525 the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with
1526 reactive tendencies treated inline with regular timestepping
1527 o testreport previously did a lousy job of comparing small numbers, so
1528 we (Ed and Martin) changed the way the cut-off of 1.e-12 is
1529 implemented in the little c-progam tmp_cmpnum.c which is embedded in
1530 testreport.
1531 o ptracers_monitor: bug fix for MPI
1532
1533 checkpoint56a_post
1534 o GCHEM: finish reorganizating the package
1535 - forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency
1536 (introduces another 3D-array for each passive tracer, but only if
1537 GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING
1538 gchemTendency is not needed because the timestep is done separately)
1539 - gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY
1540 - GCHEM is now---more or less cleanly---separate from PTRACERS
1541 - to bo done: handling of surfaceForcingPtr that is needed for KPP not
1542 so clear to me how that should be done in a general way.
1543 o CFC: improve formatting of output in CFC_ATMOS
1544 o PTRACERS:
1545 - rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so
1546 that ALL experiments with ptracers enable can be checked. This makes
1547 GCHEM_MONITOR obsolete.
1548 - include a runtime parameter PTRACERS_monitorFreq that defaults to
1549 monitorFreq
1550 - set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true
1551 o add PTRACERS (PTR0[1-5]) to testreport output
1552 o exf_check_range:
1553 * default changed to .TRUE.
1554 * will check values for niter0 if debLevA, every timestep if debLevB
1555 * STOP in exf_check_range if 'out of range'
1556 * range chosen generous to allow for potential extema
1557 TBD: a version with stricter range
1558 permitted range would be runtime parameters
1559 o GMredi:
1560 - fix ldd97 slope limit ; extend valid domain of Psi-Bolus ;
1561 - change S/R GRAD_SIGMA to be valid in the overlap on CS-grid.
1562 - change the default GMREDI_OPTIONS.h: compile everything except Visbeck
1563 o GCHEM:
1564 - move call to GCHEM_FORCING_SEP, so that it is now called before
1565 the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP
1566 - introduced a useGCHEM runtime flag and applied it everywhere.
1567 - renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING;
1568 this flag is now only visible within GCHEM-pkg routines.
1569 - moved gchem_forcing_int temporarily into ptracers_forcing, this will
1570 be replaced by a 3D array that is computed before thermodynamics; for
1571 this, the tracer ID iTracer had to be included into the parameter list
1572 of ptracers_forcing
1573 - set up forward_step to call gchem_forcing, that will replace
1574 gchem_forcing_int in ptracers_forcing
1575 - cleaning up
1576 o small cleaning of exch2: remove files that are also in eesupp/src
1577
1578 checkpoint56
1579 o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0
1580 o mnc: cleanup "full" files--fixes out-of-memory problem
1581 o ECCO-GODAE
1582 * model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup
1583 * fully merged and updated from SIO code
1584 windstress sign change affects
1585 - exf_inscal_[u/v]stress
1586 - sign of xx_tau[u/v] adjustments
1587 - signs in cost_scat
1588 * ctrl_get_gen: avoid update of tau[u/v] for first few days
1589 * natl_box_adjoint updated and compressed
1590 * 2-level checkpoint switch added
1591 (tested in EXP. 1 of natl_box_adjoint)
1592 * new switch doInitXX to avoid init. of xx_... in optimcycle=0
1593 o SVD
1594 * first complete, non-hacked version for SVD calculations
1595 * all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_...
1596 performed via direct access files admtlm_vector.it????
1597 (via ctrl_[un]pack)
1598 * optimcycle is used for ARPACK iteration counter
1599 (note: adxx_... is iterated, rather than xx_...; latter is constant!)
1600 * EV problem ok w.r.t. L2-norm in tangent space; need to check other norms
1601 and add linear transforms where necessary
1602 * controls are initial/final SST, SSS (can be extended; need to check
1603 ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F
1604 o mdsio: filename info to both stderr, stdout
1605 o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec]
1606 from sign change
1607
1608 checkpoint55j_post
1609 o isolate dissipation tendency (allow to keep it out off AB) in V.I form.
1610 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
1611 o add consistent build directories and .cvsignore files to verification
1612 o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity
1613 o make all subroutines 30 or less characters in length for certain older
1614 compilers to work (a thorough search only turns up two routines in
1615 pkg/ptracers)
1616 o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity;
1617 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
1618
1619 checkpoint55i_post
1620 o change arrays for total vertical diffusivity (2.D if explicit,
1621 3.D if implicit) ; each ptracer uses its own background value.
1622 o added mnc/NetCDF output capability to ocn_compon_interf
1623 - added bits to verification/cpl_aim+ocn so that it can run on
1624 ITRDA and other clusters without the mpirun "-wd" option
1625 o fixed wayward endif in mom_fluxform.F that messed up cyclindrical
1626 configuration
1627 o give MNC the ability to create additional files rather than
1628 exceeding a specified file size limit "MNC_MAX_FILESIZE"
1629 - the default is just less than 2GB which is a practical limit
1630 on many systems
1631 o Compute the non-local term using either KPP vertical diffusivity (=default)
1632 or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T)
1633
1634 checkpoint55h_post
1635 o add verification test "vermix"
1636 o remove all the *_ioinc flags and replace with the single global
1637 outputTypesInclusive flag
1638 o allow to set a vertical profile of vertical diffusivity for T & S
1639 o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS
1640 o useMNC moved from data.mnc to data.pkg
1641
1642 checkpoint55g_post
1643 o Renaming carbon AD experiments to comply with testreport conventions
1644 o Updating adjoint of Held-Suarez hs94.1x64x5
1645 o Fixing directives for non-ECCO forward_step, after ECCO directives
1646 have been fixed to avoid recomp. of do_oceanic_phys
1647 Works well for global_ocean.90x40x15,
1648 but recomp. issue remains for carbon
1649 o Updating adjoint output for natl_box_adjoint after
1650 pkg/ecco has been modified (see taga c55d_post)
1651
1652 checkpoint55f_post
1653 o rename to timeave_init_fixed
1654
1655 checkpoint55e_post
1656 o some delicate re-shuffle of store directives to avoid one
1657 extra call of do_oceanic_physics
1658 affects ecco_the_main_loop.F, do_oceanic_physics.F
1659 checkpoint_lev1_directives.h
1660 o NB: this may break global_ocean adjoint temporarily,
1661 but it is clear how to fix it. Will do later, need this now.
1662
1663 checkpoint55d_post
1664 o ECCO specific cost function terms (up-to-date with 1x1 runs)
1665 o ecco_cost_weights is modified to 1x1 runs
1666 o modifs to allow observations to be read in as
1667 single file or yearly files
1668 o enable to read exf forcing fields as either
1669 single file or yearly files (flag useExfYearlyFields)
1670 checkpoint55d_pre
1671
1672 o switch between 2-level and 3-level checkpointing
1673 o add ability of MNC to write local and "partial" (eg. 2D slices where
1674 the full 3D field is never actually stored) arrays to NetCDF files
1675 with the correct (that is, the complete multi-dimensional) set of
1676 array indicies
1677 - used in mom_vecinv() to write the diagFreq output
1678 - tested (demonstrated) in verification/aim.5l_cs
1679 o further mnc-ification
1680 - add verification/lab_sea to the list with mnc setups
1681 - fix undefined mnc v-names in cd_code
1682 - add kpp to mnc output (both snapshot and timeave)
1683 o non-hydrostatic code
1684 - added horizontal viscosity parameter viscAhW for w, that replaces viscAh
1685 in calc_gw.F
1686 - defaults to viscAh
1687 - this is useful, when I want to use viscAh=0 (e.g., only biharmonic
1688 friction or Leith) in non-hydrostatic mode, as long as there is
1689 no biharmonic friction and/or Leigth or equivalent for vertical velocity.
1690 o pkg/cost
1691 extend simple cost functions to treat time mean quantities
1692 (T,U,V) via cost_accumulate_state from cost_tile
1693 o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to
1694 be 2 times larger than the minimum size the advection scheme requires.
1695 now get a perfect conservation of salt in advect_cs test-exp (updated)
1696 o GGL90 (Gaspar's TKE mixed layer)
1697 - add horizontal diffusion of TKE, requires exchanges in
1698 do_fields_blocking_exchanges, horizontal diffusivity is zero by
1699 default. In OPA there is no horizontal diffusion of TKE but the
1700 mixing coefficients are computed from a horizontal average of TKE of
1701 6 points or so. I think that diffusion has a little more physical
1702 justification.
1703 - clean up ggl90_calc in the hope of reducing memory usage (this hope
1704 was in vain)
1705 - mask tke-variable in ggl90_init
1706 o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass)
1707 o fix biharmonic diffusion on CS-grid.
1708 o more obcs stuff
1709 - added obcs_external_fields_load as an alternative to the EXF-pkg option
1710 for reading boundary values. This routine is called from
1711 obcs_prescribe_read
1712 - updated obcs_check
1713 - changed sponge layer relaxation parameter units for days to seconds
1714 - turned off sponge layer by default
1715 - changed argument list of OBCS_CALC to myTime+deltaTclock
1716 - fixed about 35 bugs in obcs_external_fields_load
1717
1718 checkpoint55c_post
1719 o obcs stuff
1720 - new runtime flags useOBCSprescribe, useOBCSbalance
1721 - re-arranged obcs_calc
1722 - moved exf_getobcs to obcs_prescibe_read
1723 obcs_prescibe_read is called after ORLANSKI stuff
1724 and independent of it (executable can contain all).
1725 - updated obcs_check
1726 - added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE.
1727 These may be necessary only if tangential velocities are
1728 prescribed at OB, not sure, needs testing.
1729 o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments
1730 which simplifies the calls and passes the ifc check-bounds test
1731
1732 checkpoint55b_post
1733 o add a 2D scalar, Z location, exchange_2 routine.
1734 o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows
1735 to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)]
1736 affects advect_cs results (for the wrong reason): update output.txt
1737 o use a more standard discretization for biharmonic viscosity ;
1738 (original version still available with #define MOM_VI_ORIGINAL_VISCA4 )
1739 affects results of dome set-up: update output.txt
1740 o fix gad_advection.F (CubedSphere part), back to version 1.23
1741 o fix bug in mom_vi_del2uv.F (CubedSphere part).
1742
1743 checkpoint55a_post
1744 o merged code to
1745 * prescribe/read time-dependent open boundaries
1746 (works in conjunction with exf, cal)
1747 * sponge layer code for open boundaries
1748 * each boundary N/S/E/W now has its own CPP option
1749 (healthy for the adjoint)
1750
1751 checkpoint55
1752 o up-to-date adjoint of previous breaks
1753 - natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix
1754 - global_ocean_ebm: adjoint still needs fix (TLM ok)
1755 - global_ocean.90x40x15: extended GMREDI_OPTIONS.h
1756 - carbon: * remove tr1-related adjoint verification
1757 * add ptracer as control variable
1758 o remove all tr1-related code (ALLOW_PASSIVE_TRACER)
1759 (adjoint stuff still has some tr1 'names', but all use ptracer arrays)
1760
1761 checkpoint54f_post
1762 o in verification/carbin/ remove experiment related to
1763 ALLOW_PASSIVE_TRACER (array tr1 etc)
1764 code_ad/ input_ad/ results_ad
1765
1766 o add two new packages
1767 - ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993)
1768 + subject to optimization (memory)
1769 - opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997)
1770 + subject to reordering (many GOTOs in the original code)
1771 + so far opps is called for every (i,j) point, and then operates in
1772 the vertical; one may want to reorder the scheme in order operate in
1773 horizontal slabs at the cost of (a lot of) memory, at least ten new 3D
1774 fields)
1775 o overhaul of IO so that we now have flags for MDSIO and/or MNC
1776 - all verification tests compile and run with linux_ia32_g77
1777 - defaults are compatible with current input files--nothing
1778 should change if you were not previously using MNC
1779 - MNC output has been added in numerous places (eg. timeave)
1780 but there are still a few writes not yet do-able with MNC
1781 (this is in progress)
1782 - flags now allow for either/or/both use of MDSIO and MNC and
1783 documentation will soon follow
1784 - numerous small formatting cleanups for ProTeX
1785 o add version info (via BUILD_INFO.h) to MNC and stdout
1786
1787 checkpoint54e_post
1788 o add two new packages
1789 - pp81 (Packanowski and Philander, 1981), Richardson number and
1790 stratification dependent mixing
1791 - my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme
1792 - these scheme operate in a similar manner as KPP (without ghat, of
1793 course), however there is only one diffusivity that is used for both
1794 temperature and salinity (and passive tracers)ç
1795 o add offline package
1796 o add "verification/dic_example" which contains a dic-gchem-ptracer setup
1797 provided by Stephanie Dutkiewicz
1798 o genmake2: add ability to search for C compilers and cleanup test output
1799 - fixes recent SX-6 problems and should help with others (eg. HP-UX)
1800
1801 checkpoint54d_post
1802 o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed
1803 o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong,
1804 leading to additional shift by 5 days each year of integration
1805 (i.e. leading to considerable offset over the years)
1806 o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep
1807 o start with no AB and no initial filtering (staggerTimeStep):
1808 change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5
1809 o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F
1810 (external loading & cpl import/export stay in forward_step.F)
1811 o update coupling interface to work with new staggerTimeStep
1812 o change MDSIO ptracers_pickup.
1813 o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F);
1814 o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*")
1815 o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell)
1816
1817 checkpoint54c_post
1818 o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr
1819 this affects (truncation error) output.txt of test-exp:
1820 global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box
1821 o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array)
1822 o change Qnet to always be the net heat flux, (+upward).
1823 affects (truncation error) output of natl_box exp.: updated
1824 o define the max number of passive tracers in PTRACERS_SIZE.h
1825 o start to test mnc routinely in exp0
1826 o add sea-ice loading (sIceLoad) as a new forcing field.
1827
1828 checkpoint54b_post
1829 o add testreport "-j JOBS" option for parallel builds (tested and pretty
1830 impressive on Altix and Opteron systems)
1831 o diagnostics can now write NetCDF files through the mnc package
1832 o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output
1833 o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added
1834 o staggerTimeStep & NLFS: rescale T & S surface tendencies.
1835 affects (truncation error) output of lab_sea & natl_box exp.: updated
1836 o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.)
1837
1838 checkpoint54a_post
1839 o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order).
1840 o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.)
1841 o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished)
1842 o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D)
1843 + internal_wave (shift in writing cg2d_ini_res)
1844 checkpoint54a_pre
1845
1846 o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice
1847 - modified verification/lab_sea and natl_box_adjoint accordingly
1848
1849 checkpoint54
1850 checkpoint53g_post
1851 o prepare splitting of thermodynamics: store convect.counter in common block
1852 o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error)
1853 output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave
1854 o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection
1855 o new parameter "nShapS": allow to treat differently S from T (nShapT)
1856 o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S)
1857 o restore adjointability
1858
1859 checkpoint53f_post
1860 o modifications that affect AIM experiment results (update output.txt):
1861 - no advection of S at top interface Nr (pkg/generic_advdiff)
1862 - air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F)
1863 o AIM pkg:
1864 - include stability function into surf.Flux derivative relative to Tsurf
1865 - calculate clear-sky radiation & surface temp. change (for diagnostics)
1866
1867 checkpoint53e_post
1868 o merged cylindrical coord configuration
1869 o added rotating_tank experiment
1870 checkpoint53e_pre
1871
1872 checkpoint53d_post
1873 o faulks upgraded: re-generate output.txt that have changed:
1874 global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box
1875 o Added Bryan and Lewis, 1979, vertical diffusivity profile
1876 o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing.
1877 o added Sadourny discretization of Coriolis
1878 - moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h
1879 - re-enabled use of omega3 (useAbsVorticity)
1880 o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for
1881 vector-invariant equations
1882 - note: does *NOT* yet use same variable visc. for no-slip BC's.
1883 o recoded the lateral boundary conditions for non-hydrostatic w, this time
1884 hopefully without new bugs
1885 - still to do: biharmonic friction for non-hydrostatic w
1886 o bug fix for mom_*_sidedrag: rA -> rAs,rAw
1887 o regenerated output for global_ocean_ebm (using -ieee)
1888 o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation
1889 of mom_common/
1890 - simple re-arrangement of instructions within computing loop
1891 checkpoint53d_pre
1892
1893 checkpoint53c_post
1894 o new version of coupler for AIM+thSIce and Ocean models
1895 - new fields (SSS,h_MixLayer ...) are exchanged through the coupler
1896 - land: change Evaporation of snow
1897 - aim with thSIce: fix bug in snow-precip.
1898 o changes to calc_gw.F
1899 - bug fix for w^2 term near the bottom boundary
1900 - (hopefully) improve the lateral slip boundary condtions for use with
1901 partial/looped cells
1902 - because the bug fix changes two verification experiments anyway (exp5
1903 and plume on slope), change the lateral boundary condition from half slip
1904 to the value of no_slip_sides
1905 o ebm package wasnt quite up to the parallel task. Fixed that.
1906 o Adjoint of EBM package + verification
1907 * TLM OK
1908 * ADM not sufficient accuracy yet (needs further testing)
1909
1910 checkpoint53b_post
1911 o Commiting new energy balance model to repository
1912 * package is pkg/ebm
1913 * verif. is verification/global_ocean_ebm
1914 * references are in ebm_driver.F
1915 C * X. Wang, P. Stone and J. Marotzke, 1999:
1916 C Global thermohaline circulation. Part I:
1917 C Sensitivity to atmospheric moisture transport.
1918 C J. Climate 12(1), 71-82
1919 C * X. Wang, P. Stone and J. Marotzke, 1999:
1920 C Global thermohaline circulation. Part II:
1921 C Sensitivity with interactive transport.
1922 C J. Climate 12(1), 83-91
1923 C * M. Nakamura, P. Stone and J. Marotzke, 1994:
1924 C Destabilization of the thermohaline circulation
1925 C by atmospheric eddy transports.
1926 C J. Climate 7(12), 1870-1882
1927 o Will need long integration testing.
1928 checkpoint53b_pre
1929
1930 o created pkg/mom_common in preparation for variable viscosity code
1931 o renamed and split ini_mnc_io
1932 o pkg/land: only liquid water can diffuse or run-off
1933 o AIM using land: soil wetness availability account for snow
1934 o added printMapIncludesZeros to EEPARMS namelist
1935
1936 checkpoint53a_post
1937 o restore TAMC compatiility for exf_constants.h
1938 (no usage of _d in .h)
1939 o Additional storing in KPP in an attempt to fix
1940 TAMC problem with adjoint of KPP code.
1941 (no success...)
1942 Identical code works fine with TAF.
1943 o Fixed verification/natl_box_adjoint experiments.
1944 Initial conditions for Experiments 4 and 5 are now
1945 set to "SEAICE_initialHEFF=0", which is more reasonable,
1946 and hence gives results closer to that of Experiment 2.
1947 Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again.
1948
1949 checkpoint53
1950 o stable checkpoint with up to date adjoint
1951 TLM tests only run for 1st grdchk at the moment. Its unclear if
1952 this is a code problem or a problem with resetting code for g_
1953 variables that is being autogenerated wrong.
1954 Otherwise:
1955 o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix.
1956 o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ)
1957 are both still in chaos following their security messes.
1958
1959 checkpoint52n_post
1960 o various build (mostly genmake2) changes including:
1961 - ability to build/run more easily within Cygwin and MacOS X
1962 - more complicated Makefiles with a stronger dependence on Gnu Make
1963 o pkg/seaice modifications
1964 - added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost
1965 of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer
1966 and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm
1967 - changed proxy for geostrophic velocity and updated
1968 verification/lab_sea/results/* accordingly
1969 - removed ADI dynamic solver from pkg/seaice
1970 - replaced all occurrences of 1/CSTICE or 1/CSUICE
1971 they caused a segmentation fault under certain circumstances
1972 - removed unused field WATR
1973 o bug fix in exf-package:
1974 - u/vwind are defined at tracer/pressure points. The values of u/vwindmask
1975 now reflect that.
1976 o small fixes in the cal-package:
1977 - set reference date to first of January for the 'model'-calendar
1978 - failing of cal_CheckDate in cal_FullDate now actually results in a
1979 warning
1980 o small modifications in exf-package to increase flexibility:
1981 - change climtempfreeze from a constant to a runtime parameter that
1982 is specified in data.exf_clim (default = -1.9)
1983 - introduce runtime parameter windstressmax (default = 2.0) that is
1984 specified in data.exf
1985 o fix in pkg/thsice:
1986 - update Evap (Tsf changes) to be consistent with Latent heat flux
1987 - maintain snow precipitation unchanged (even if Tsf >=0).
1988 both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice
1989
1990 checkpoint52m_post
1991 o commented out call to cal_GetMonthsRec in swfrac.F and added some comments;
1992 this does not change any of the results, because myIter=0 in swfrac always
1993 lead to jwtype=2 (the default anyway), but the call makes little sense
1994 as a default
1995 o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated
1996 o re-work pkg/thsice interface with ocean & bulk_force pkg to allow
1997 atmospheric model (AIM) to use it ; add a "slab ocean" component.
1998 o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice)
1999 o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice
2000 o extending useSingleCpuIO option to work with new exch2 I/O format
2001 - old-style, missing-tile I/O is still accessible by defining CPP
2002 option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h
2003 o monitor package can write to NetCDF files and/or STDOUT
2004 o fix re-definition bug in MNC_GRID_INIT_ALL()
2005 o doc/api_reference added
2006 - a framework for building an API Reference Manual using all
2007 the "protex" comments embedded in the code
2008 - see pkg/generic_advdiff, pkg/mnc for examples
2009 o MNC:
2010 - make myThid the last argument for all subroutines
2011 - new default for the grid files: NO halos
2012 - add useMNC and other run-time flags
2013 - separate per-file-group handling of the unlimited dimension
2014 - early initialization of MNC w/ flags read at the eeboot stage
2015 and lookup tables set in initialize_fixed
2016 - write all MNC output to a freshly-created directory
2017 o thermodynamics sea-ice (thsice) is now tested with testreport.
2018 o test exp. advect_cs: use the standard cs32 grid ; update output.
2019 o Added functionality to grdchk:
2020 pick global i,j,k position (or nearest wet) where to perform check.
2021
2022 checkpoint52l_post
2023 o new land formulation:
2024 a) use ground enthalpy as prognostic variable to ensure exact
2025 energy conservation.
2026 b) account for water temperature and for latent heat of freezing
2027 in all processes (rain, run-off, ground storage)
2028 c) compute surface and ground temperature implicitly.
2029 o aim_v23 modification for new land model:
2030 a) Treat separately land / ocean / sea-ice surface fluxes
2031 to allow implicit computation of land & sea-ice surface temp.
2032 b) add snow precipitation.
2033 checkpoint52l_pre
2034
2035 o fix problem (when 1 tile is empty) in min/max monitor.
2036 o fix bug in timeAve (u,vZetatave in common block)
2037 o no restoring terms under ice for pkg/seaice
2038 o moved SEAICE_DO_DIAGS to S/R do_the_model_io
2039 o bug fix for pkg/seaice pickups
2040 o change MNC call locations and add coordinate attributes
2041 o mask vorticity at the corner ; affects global_ocean.cs output
2042 o fix ini_curvilinear_grid ; test CS experiments with mpi
2043 o aim.5l_cs: modify sea-ice fraction input file ; update output
2044 o exf: Adding simple range check routine for exf fields after read
2045
2046 checkpoint52k_post
2047 o removed top-level directory "diags"
2048 - we migrated these functions to pkg/timeave a long time ago
2049 o fixed bug introduced in pkg/monitor
2050 o accuracy ctrlprec = 32 insuffient for gradient checks using
2051 averaged fields (I/O via cost_averages)
2052 -> use ctrl.h in active_file*.F to control I/O precision.
2053 o paramter list of CALL ADTHE_MAIN_LOOP
2054 o added initial do_the_model_io to ecco
2055 o set all ...Freq to zero after cost_final
2056 taveFreq, dumpFreq, pChkptFreq
2057 o MAIN and ECCO differentiability restored
2058
2059 checkpoint52j_post
2060 o fix nchklev in tamc.h for global_ocean...
2061 o Bringing flow and store directives up-to-date
2062 o Really weird thing!
2063 call do_the_model_io from the_main_loop with parameters
2064 starttime, niter0, instead of mytime, myiter, screws up the adjoint:
2065 TAF places a faulty re-call of initialise_varia
2066 after cost_final call which should not be there!
2067 checkpoint52j_pre
2068
2069 o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and
2070 error messages
2071 o fix errorMessageUnit problem. remove old version of mdsio from eesup/src
2072 o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating
2073 debug output
2074 o modfied mdsio_writefield.F to handle non-global files under exch2
2075 o update AIM Cubed-Sphere exp (aim.5l_cs):
2076 use land, p*, and Franco.M forcing fields with fractional land-sea mask.
2077 o update AIM Equatorial Channel exp:
2078 use standard aim_v23 pkg and change the SST fields to be more realistic.
2079 o globalFile now works with exch2
2080 o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and
2081 mon_vort3.F to make exch2 friendly with >1 tile per cube face
2082 o limit timeave output for hi-res integrations
2083
2084 checkpoint52i_post
2085 o removed CPP_EEOPTIONS.h from verification/*/code
2086 o updated the tiling for global_ocean_pressure
2087 checkpoint52i_pre
2088
2089 o update aim.5l_LatLon using the standard aim_v23 pkg (instead of
2090 the old pkg/aim).
2091
2092 checkpoint52h_pre
2093 o shortened offending lines in exch2_send_rx?.template
2094 o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator
2095 o genmake2: add build & execute test for NetCDF code
2096 o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed
2097 old grid files, moved CPP_EEMACROS.h to pkg/exch2
2098 o added useSingleCPUIO flag to monitor.F and mon_out.F
2099 o added temporary hack for sea-ice dynamics on the cube:
2100 metric terms are ignored and it is assumed that
2101 there is no sea-ice on cube faces 1, 2, 4, and 5.
2102
2103 checkpoint52f_post
2104 o added exch2 cube routines to pkg/exch2
2105 o modified hs94.cs-32x32x5 to use it
2106 o added new grid files to hs94.cs-32x32x5
2107 checkpoint52f_pre
2108
2109 checkpoint52e_post
2110 o first attempt to solve vertical advection (momemtum & T,S) Implicitly
2111 for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom)
2112 o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F)
2113 to work with implicit vertical advection and AB ;
2114 o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme.
2115 o update output (gad_calc_rhs.F changes affect truncation error) of exp:
2116 front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box
2117 checkpoint52e_pre
2118
2119 o fix bug in impldiff when Nr=1 or Nr=2.
2120 o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt
2121 o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test.
2122 o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2
2123 ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure
2124 o added exf_offset_atemp for Celsius to Kelvin conversion of atemp
2125 o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024
2126 o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations
2127
2128 checkpoint52d_post
2129 o re-tiled many expts to allow comparison in multi-processor mode
2130 - updated output accordingly
2131 - changed hs94.128x64x5 to use intial T from file rather than use the
2132 random number generator
2133 o add infrastructure in model routines for fizhi and gridalt packages
2134 o change global_ocean.cs32x15 because of Pb with GM on CS-grid.
2135 o changes to permit hi-res, cubed-sphere, configuration
2136 - added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
2137 - added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F
2138 - added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation
2139 of surface winds for the cube
2140 (A verification experiment, based on global_ocean.cs32x15, but with
2141 pkg/seaice turned on and with on-the-fly interpolation from the NCEP
2142 Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice,
2143 complete with example surface forcing files and matlab scripts to look
2144 at the output and compare it with that of global_ocean.cs32x15.)
2145 o packages pickup: $PKG_write_pickup called from packages_write_pickup ;
2146 but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code
2147 to conform to the common rule.
2148 o check-in the first version of the coupler + interfaces for multi-components
2149 set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI.
2150 - imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD).
2151 - atmosphere: use pkg aim_v23 ; no sea-ice for now.
2152 - ocean and atmos. share the same horizontal grid (no interpolation).
2153 - exchanges between component and coupler is done in forward_step
2154 o new verification experiment, cpl_aim+ocn:
2155 coupled ocean - AIM atmosphere on cs32 grid.
2156
2157 checkpoint52d_pre
2158 o surface flux time-av diagnostic modified for NLFS & RealFreshWater
2159 o add call to AIM pendant S/R in external_forcing & external_fields_load.F
2160
2161 checkpoint52c_post
2162 o Fixing OPTIONS files for use of exf:
2163 - ALLOW_ECCO not needed
2164 - ECCO_CPPOPTIONS.h should not be included from
2165 EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h
2166 as has been the case in the past
2167 - All cal/exf related options are currently set in
2168 single header file. Should remain so until we
2169 agree on a consistent new policy.
2170 o Removed all CPP options for cal package.
2171 cal has no more CPP options.
2172 o modified STOREs in GAD_ADVECTION
2173 o corrected key comp. for passkey
2174
2175 checkpoint52b_post
2176 o new version: "thsice" of thermodynamic sea-ice pkg:
2177 - only 1 call from "forward_step"; conserve energy, fresh-water & salt.
2178 - modify fluxes but do not change theta directly;
2179 - light cleaning of bulk_force pkg (still needed with thsice).
2180 - add forcing fields + data files in global_ocean.cs32x15/inp_thsice
2181 + output_thsice.txt to test thsice & bulk_force pkgs.
2182 o put back grid & coriolis monitor output.
2183 checkpoint52b_pre
2184
2185 o call "do_the_model_io" at the beginning (=> dump initial state)
2186 o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P)
2187 o sort out interplay between tamc.h and PTRACERS_OPTIONS.h
2188 (need info on NUMBER_OF_PTRACERS)
2189 o missing PTRACERS headers in some routines
2190 o default tamc.h in pkg/autodiff supposed to crash
2191 to ensure proper customization
2192
2193 checkpoint52a_post
2194 o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp
2195 - moved surfaceTendencyTice from pkg/seaice to main code
2196 - subroutine FREEZE_SURFACE now limits only surface temperature
2197 and is called in FORWARD_STEP (if allowFreezing=.TRUE.)
2198 => new output.txt for global_ocean.cs32x15 & global_with_exf
2199 - keep the old version of FREEZE for backward compatibility;
2200 global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE.
2201 - corresponding modifs for TAF directives
2202 o added surface flux output variables to TIMEAVE_STATVARS
2203 o time-averaged output for pkg/ptracers
2204 o fix problem with ECCO-related divided adjoint
2205 snapshot file was missing some ad-variables,
2206 but no warning issued by TAF
2207
2208 checkpoint52a_pre
2209 o some bug fixes for #undef REAL4_IS_SLOW
2210
2211 checkpoint52 = ecco_c52_e35
2212 o after testing adjoints of checkpoint51u_post
2213
2214 checkpoint51u_post
2215 o this is the post-merge tag of the ecco-branch
2216 (needs another clean checkout and re-testing)
2217 o various natl_box_adjoint configs and results
2218 but no input fields
2219 o obcs adjoint not yet merged!
2220 o adding ECCO global 1x1 and 2x2 degree configs
2221 o updated/extended some store directives for seaice
2222 o pkg/ecco now containes ecco-specific part of cost function
2223 o top level routines the_main_loop, forward_step
2224 supersede those in model/src/
2225 previous input data.cost now in data.ecco
2226 (new namelist ecco_cost_nml)
2227 o in ctrl/ cleaned some cross-dependencies and updated CPP options
2228
2229 checkpoint51t_post
2230 o this is the pre-merge tag of the ecco-branch
2231
2232 checkpoint51s_post
2233 o cleanup: removed various obsolete #define-s
2234 o pkg/grdchk
2235 - renamed 'ph-grd 3' to 'grad-res'
2236 - merged from ecco-branch
2237 (remaining bug fixes for obcs gradient checks)
2238 - additional high-precision output for testreport
2239 (grep for 'precision_grdchk_result')
2240
2241 checkpoint51r_post
2242 o cleaned up or removed CPP_OPTIONS.h files
2243 o updated results for some of the tests to reflect the new
2244 optfiles (-ieee: -O0 instead of -O3)
2245
2246 checkpoint51q_post
2247 o cd_code:
2248 - moved cd_scheme.F -> cd_code_scheme.F
2249 - separate read_checkpoint from cd_code_ini_vars.F
2250 - separated cd_code part from write_checkpoint
2251 - updated AD_SOURCE, generated .flow
2252 - added CD_CODE_VARS.h to the_main_loop
2253 - Moving cd_code specific store dir.s to pkg/cd_code
2254 o ctrl package totally restructured
2255 - pack/unpack now optional and decoupled from
2256 xx_/adxx_ I/O
2257 - ctrl_pack/unpack cleaned
2258 (new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F)
2259 - confined inclusion of AD_CONFIG.h to where necessary.
2260 o genmake2: changed AD dependencies from SRCFILES to AD_FILES
2261
2262 checkpoint51p_post
2263 o create initial cd_code package
2264 - WARNING: the initialization of fields within packages
2265 is broken because INI_FIELDS (where READ_CHECKPOINT is
2266 called) is called *before* PACKAGES_INIT_VARIABLES.
2267 This seems to be backwards since
2268 1) its important to initially zero the entire field including
2269 the "halo" region
2270 2) zeroing needs to be done *before* reading pickup info
2271 and the pickup call might or might not happen in any
2272 particular run
2273 - this needs an overhaul for R2
2274 o cleanup verification/*/code/GMREDI_OPTIONS.h
2275 o cleanup testreport
2276
2277 checkpoint51o_post
2278 o bringing AD-related verif's up to date with genmake2
2279 - carbon/
2280 - global_ocean.90x40x15/
2281 - hs.94.1x64x5/
2282 - (front_relax/ )
2283 o (more) consistent directory structure for AD-related verif.'s
2284 o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK
2285 o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF
2286 o bug fix in find_alpha.F for MDJWF:
2287 - modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for
2288 change rho -> rho-rhoConst
2289 - replace call find_rho to find_rhonum
2290 o initialisation of rFlx extended to full array (required by TAF)
2291 and shifted to thermodynamics
2292 o removed PTRACERS.h in ptracers routine
2293 o added surfacetendencyPtr to S/R parameter list pracers_forcing
2294 o Correcting initialisations for fVerU, fVerV.
2295 o helping TAF to recognize dependency on kUp for
2296 fVerU, fVerV
2297 o Replacing delZ by delR in pkg/ctrl/
2298 checkpoint51o_pre
2299
2300 o undid all of cp51 pending some cleanups and discussion
2301 o added the [#include "AD_CONFIG.h"] statement to all files that need
2302 it for adjoint/tl #defines
2303 o re-worked the build logic in genmake2 to support AD_CONFIG.h
2304 o removed tools/genmake since it no longer works
2305
2306 checkpoint51n_post
2307 o modifications to make FREEZE flux visible to pkg/kpp
2308 - moved surfaceTendencyTice from pkg/seaice to main code
2309 - FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
2310 - subroutine FREEZE now limits only surface temperature
2311 (this means new output.txt for global_ocean.90x40x15,
2312 global_ocean.cs32x15, and global_with_exf)
2313 o added surface flux output variables to TIMEAVE_STATVARS
2314
2315 checkpoint51n_pre
2316 o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F
2317 o added [#include "AD_CONFIG.h"] to all files that use the following
2318 defines:
2319 - ALLOW_ADJOINT_RUN
2320 - ALLOW_TANGENTLINEAR_RUN
2321 - ALLOW_ECCO_OPTIMIZATION
2322
2323 checkpoint51m_post
2324 o incorporating changes to get TAMC/TAF working in genmake2
2325 - added new TAMC/TAF targets to the Makefile
2326 - various cleanups related to package handling
2327 - these changes should have no impact on the forward model
2328
2329 checkpoint51l_post
2330 o changes to pkg/cal and pkg/exf that allow and speed-up long integrations
2331 - faster algorithm for cal_addtime.F
2332 - higher precision arithmetic, where needed
2333 - pkg/exf *startdate variables changed from calendar date to
2334 model integration time
2335
2336 checkpoint51l_pre
2337 o add salt flux to forcing fields (used when salty sea-ice forms or melts)
2338 o enable to apply restoring on S & T only in a latitude band.
2339 o update output (external_forcing_surf modif. change truncation errors)
2340 global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box
2341
2342 checkpoint51k_post
2343 o change default to: useNHMTerms=.FALSE.
2344 - new output.txt for atmos. exp (NHMTerms were wrong but now turned off):
2345 adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5
2346 - new output.txt for idealized oceanic exp (NHMTerms are now turned off):
2347 exp1, ideal_2D_oce
2348 - change data file of oceanic exp (leave the results unchanged for now)
2349 exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box
2350 o set gravitySign automatically according to the vertical coordinate used
2351 (and change sign: back to "logical" value: +1 when R increases downward)
2352 o added an include barrier to the default CPP_OPTIONS.h and
2353 removed the #include "PACKAGES_CONFIG.h" from it
2354 o fix a bug in mom_fluxform (from chk51j_post)
2355
2356 checkpoint51j_post
2357 o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/
2358 o adjusted some flow directives (dynamics, thermodynamics)
2359 o added cubed-sphere case to test cost function
2360 o heckpoint_lev?_directives.h now include
2361 pkg-specific directives, whenever those are enabled.
2362 o Moving pkg-specific flow directives to corresponding pkg
2363 Moving pkg-specific differentiation list to corresponding pkg
2364 Moving pkg-specific checkpoint-lev storing to corresponding pkg
2365 ---> conventions are
2366 - pkg_ad.flow
2367 - pkg_ad_diff.list
2368 - pkg_ad_check_lev?_dir.h
2369
2370 checkpoint51i_post
2371 o merge of the branch-genmake2
2372 - knowingly breaks the older genmake
2373 - automatic generation of all ALLOW_${PKG_NAME} defines
2374 - new testreport supersedes older testscript
2375 o large number of package inclusion and header cleanups
2376 checkpoint51i_pre
2377
2378 o new output for adjoin of global ocean vector invariant
2379 o fix for checkpoint of thermodynamic seaice and bulk_force
2380 o Steph gchem various cleanups
2381
2382 checkpoint 51h_pre
2383 o fixed some single quotes
2384 o modify gchem pkg to be more versatile
2385 o modifications to clean up dic pkg
2386 o add pkg/cfc
2387
2388 checkpoint51g_post
2389 o provide links for ARPACK and ADM*TLM
2390 o start removing verification/vero/
2391 o update AD-related stuff
2392 (in particular some IF-statements in model/src/ routines)
2393 o adding to verification/global_ocean.90x40x15/ adjoint of
2394 vector invariant setup
2395
2396 checkpoint51f_post
2397 o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif)
2398 o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation
2399 of tracer Green's fucntions for ocean inversion project.
2400
2401 checkpoint51f_pre
2402 o Added on-the-fly spatial interpolation capability
2403 "USE_EXF_INTERPOLATION" to pkg/exf.
2404 - This is a temporary Cartesian-grid hack until
2405 the super-duper ESMF coupler becomes available.
2406 - See verification/global_with_exf/README for usage example.
2407 - Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
2408 flags and modified pkg/seaice accordingly.
2409 o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
2410 and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
2411 non-local transport term.
2412
2413 checkpoint51e_post
2414 o pkg/mom_vecinv:
2415 - changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec)
2416 - add time-ave diagnostic of vorticity advection.
2417 o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV.
2418 o atmospheric geopotential: - include water vapor effect;
2419 - use p^kappa in p* scaling.
2420 o land pkg: read initial state from files.
2421 o AIM : add stratospheric drag in the upper level
2422
2423 checkpoint51d_post
2424 o change function ILNBLNK (=> last non-blank char.) to return zero
2425 (instead of the string length) when the string. char is empty
2426 o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid)
2427 o modif's to restore TAMC compatibility
2428 - avoid "_d" constructs in PARAMETER declarations
2429 - avoid interrupting lines by comment lines
2430 o Use cluster local disks for purely local I/O
2431 vs. globally visible disks needed for ctrl stuff
2432 (merged from ecco-branch)
2433 - new active_file_loc... and mdsio_..._loc routines
2434 - affected packages: autodiff, ctrl, grdchk, mdsio
2435
2436 checkpoint51c_post
2437 o introducing integer flag debugLevel
2438 - debLevZero: suppress all output
2439 - debLevA: standard
2440 - debLevB: equivalent to current debugMode=.TRUE.
2441 o introducing pathname variable mdsioLocalDir for mdsio
2442 that can be specified at runtime
2443 (relevant for cluster I/O to local disk)
2444 `
2445 >>>checkpoint51b_post
2446 adjoint of ptracers
2447 o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM
2448 o extended state in checkpoint_lev?, etc.
2449 o alternative ctrl/cost with tr1 or ptracer
2450 o new comlev1_bibj_ptracers
2451 o new ptracers.flow
2452 o made ptracers_forcing same as external_forcing_s
2453 o added verification for adjoint with ptracers
2454 - adm. grdchk fail so far
2455 - tlm. grdchk OK
2456 - checked tapelev/comlev recomputations: OK
2457 <<<checkpoint51b_pre
2458
2459 checkpoint51a_post
2460 o added code for biogeochemistry package
2461 - new pkgs: dic, gchem
2462 - new subroutine in ptracers
2463 o modify code for biogeo packages
2464 - in model/src and pkg/ptracers
2465
2466 checkpoint51
2467 o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN
2468 - autodiff, ctrl, exf, grdchk, seaice
2469 kept separate packages
2470 - cost, ecco, obcs
2471 o updating verification/internal_wave, verification/lab_sea
2472 (all verif's pass on faulks.lcs.mit.edu RH7.3, g77)
2473
2474 checkpoint50i_post
2475 o Preparing next differentiable checkpoint and sync
2476 of MAIN vs. ecco-branch
2477 - 1st step: this one is differentiable
2478 - 2nd step: next(! not this) checkpoint will have updated packages
2479 from ecco-branch)
2480
2481 checkpoint50h_post
2482 o new package "land": provide surface BC for AIM.
2483 o pkg/ptracers: apply exchange to all tracers after reading a pickup.
2484 o AIM: use true log-P extrapolation for near surface temp (= as in
2485 F.Molteni paper) ; update aim.5l_cs output.
2486 o New variable in PARM03 for more flexible pickups
2487 o somewhat cleaned package initialisation sequence for
2488 ctrl/ cost/ ecco/ in packages_... routines
2489
2490 checkpoint50g_post
2491 o merged with release1_p17 (pkg/seaice and verification/lab_sea)
2492 - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
2493 - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
2494 made the default because of faster convergence than ADI
2495
2496 checkpoint50f_post
2497 o exf totally restructured
2498 - replaced all exf_set_ routines by one generic exf_set_gen.F
2499 and made sure it's still differentiable
2500 - split exf_getffields.F into new exf_bulkformulae.F
2501 - exf_inscal_/exf_outscal_ suffixes consistent with field names
2502 - updated adjoint/makefile and relevant verif. accordingly
2503
2504 checkpoint50f_pre
2505 o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ;
2506 + change Evap over land. (update aim.5l_cs output)
2507 o added missing .cvsignores and made uniform across expts
2508 o changed configuration of tidal_basin_2d expt
2509 o added pkg/debug functions for tracing code in fatal crashes
2510 o tidied pkg/monitor to use MONITOR_OPTIONS.h
2511 o new fn in pkg/monitor to stop model if solution grows too big
2512 o removed lots of single quotes from comments
2513
2514 checkpoint50e_post
2515 o make KPP work with PTRACERS
2516 - fix gad_calc_rhs to call new routine kpp_transport_ptr, which is
2517 nearly a copy of kpp_transport_s
2518 - there is no analogue to SurfaceTendencyS, so I have to use
2519 gPtr(of the surface layer) instead
2520 o add a new platform SunFire+mpi (SunFire 15000) to genmake
2521 checkpoint50e_pre
2522
2523 checkpoint50d_post
2524 o change kpp output from multiple-record state files to single-record state
2525 files analogous to write_state.F
2526 o reduce the output frequency of cg3d-related stuff to the monitor frequency,
2527 analogous to the cg2d-related output.
2528 o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512,
2529 so that writing to internal file fn (with length 512) fails.
2530 checkpoint50d_pre
2531
2532 checkpoint50c_post
2533 o fix problem in ini_procs.F when using MPI (was there since checkpoint48f)
2534 o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy.
2535 o add time-average diagnostic of U*V and vertical diffusive flux for theta.
2536 o bug fixed in convective adjustment diagnostic (multi-tile set-up).
2537 o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries.
2538
2539 checkpoint50c_pre
2540 Merging from release1_p13:
2541 o bug fix for pkg/seaice dynamic solver
2542 o Added SEAICE_initialHEFF to pkg/seaice
2543
2544 checkpoint50b_post
2545 o store u*,v* in gU,V instead of in guNm1,gvNm1
2546 o in order to put the momForcing out of the Adams-Bashforth:
2547 move forcing & CD-scheme calls from mom_fluxform & mom_vecinv
2548 to timestep.F
2549 o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays
2550 o re-generate output for highly sensitive test-exp:
2551 global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box
2552
2553 checkpoint50b_pre
2554 o restore the use of momAdvection & useCoriolis flags (mom_vecinv)
2555 o corrected CPP option mismatch in exf_Bulk... functions for case
2556 #define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP
2557
2558 checkpoint50a_post
2559 o Bug fix for merging between c50 and KPP.
2560 ikey was passed from thermodynamics to kpp_calc via
2561 common block rather than being recomputed in kpp_calc,
2562 in contradiction with new key itdkey.
2563 New key ikppkey created, and tamc.h headers updated.
2564
2565 checkpoint50
2566 - 2nd step of merge with ecco-branch:
2567 merge changes in ecco-branch back into main trunk
2568 - bug fix in find_alpha
2569 - more storing in gmredi_calc_tensor.F, kpp_routines.F
2570 - avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC
2571 - merged some sliced AD support routines
2572
2573 checkpoint49
2574 merged from ecco-branch:
2575 o exf:
2576 - Enable initialisation of forcing fields to constant
2577 (runtime) values.
2578 - in exf_getffields.F
2579 Reduce i-/j-loop to interior domain, discarding overlaps.
2580 That also fixes wrong TAF-key computations for key_1, key_2
2581 with bulf formulae.
2582 - exf_init.F modify #ifdef for exf_init_evap
2583 - exf_getffieldrec.F, ctrl_getrec.F
2584 The following INT-usages are not safe:
2585 fldsecs = int(fldsecs/fldperiod)*fldperiod
2586 fldcount = int(fldsecs/fldperiod) + 1
2587 and were modified.
2588 o autodiff: checkpoint_lev...
2589 - updated storing for bulk formulae (some arrays were missing)
2590 - added state for seaice package
2591 - synchronized with main branch
2592 o DIVA:
2593 Modif.s in
2594 - the_main_loop.F
2595 - the_model_main.F
2596 and added cost_final_restore.F cost_final_store.F
2597 o With these changes, it is possible to fully separate
2598 the first forward run to compute the cost function (mdthe_main_loop)
2599 and adjoint runs over individual DIVA intervals (adthe_main_loop)
2600 into separate model executions.
2601 This enables better tuning of DIVA to given queue sizes.
2602 o Loss of cost function value in consecutive DIVA runs is
2603 fixed by storing to 'costfinal' file.
2604 o Appropriate call of ctrl_unpack/_pack,grdchk_main at
2605 beginning/end of adjoint integration is accounted for.
2606 The current changes apply to TAF-1.4.26.
2607 TAF has one remaining bug, requiring one manual change
2608 (see MITgcm manual).
2609 o cal: synchronized between MAIN and ecco-branch
2610
2611 checkpoint48i_post
2612 o Changes to restore differentiability of code w.r.t. previous tag
2613 (mostly adding new routines to make list and replacing
2614 pressure by totPhiHyd).
2615 o Updated and merged grdchk package
2616 - has both ADM and TLM checks
2617 - works for single- and multi-proc.
2618 - output cleaned
2619 - worked successfully for parallel DIVA
2620 o genmake:
2621 - Adding -platform=SP4
2622 - Modif. for DEC Alpha (many don't have makedepend; use mkdep instead).
2623 o Modif. for DIVA:
2624 ctrl_unpack should not be called in intermediate DIVA interval.
2625 (similar thing would apply for active files such as
2626 tbar, sbar, psbar, which should not be reinitialised;
2627 only relevant for ecco-branch)
2628
2629 checkpoint48h_post
2630 o improve "ini_p_ground" when using finite difference form for calc_phi_hyd
2631 o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F
2632 o Added SEAICE_initialHEFF to pkg/seaice
2633 o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT
2634
2635 checkpoint48g_post
2636 --- EOS:
2637 o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF
2638 store total Potential in totPhyHyd for diagnostics & EOS.
2639 o fix restart and overlap Pb when using Z-coord and EOS funct. of P
2640 --- Pressure/geopotential gradient:
2641 o use Ro_surf & R_low instead of hFac in cal_phi_hyd:
2642 o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind
2643 ( changes results of global_ocean_pressure )
2644 o NLFS + z-coord.: add eta*Rho' contribution.
2645 o accurate phiHyd when using interface-W at the middle between 2 centers
2646 ( changes results of ideal_2D_oce )
2647 o includes r* 2nd term in potential gradient.
2648
2649 checkpoint48f_post
2650 Merging from release1_p12:
2651 o Modifications for using pkg/exf with pkg/seaice
2652 - improved description of the various forcing configurations
2653 - added basic radiation bulk formulae to pkg/exf
2654 - units/sign fix for evap computation in exf_getffields.F
2655 - updated verification/global_with_exf/results/output.txt
2656 o Added pkg/sbo for computing IERS Special Bureau for the Oceans
2657 (SBO) core products, including oceanic mass, center-of-mass,
2658 angular, and bottom pressure (see pkg/sbo/README.sbo).
2659 o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F
2660 to avoid negative values in shallow regions.
2661 - updated verification/natl_box/results/output.txt
2662 - updated verification/lab_sea/results/output.txt
2663 o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F
2664 o Added useSingleCpuIO option (see PARAMS.h).
2665 o Updated useSingleCpuIO option in mdsio_writefield.F to
2666 work with multi-field files, e.g., for single-file pickup.
2667 o pkg/seaice:
2668 - bug fix in growth.F: QNET for no shortwave case
2669 - added HeffFile for specifying initial sea-ice thickness
2670 - changed SEAICE_EXTERNAL_FLUXES wind stress implementation
2671 o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf,
2672 kpp_transport_t.F, forward_step.F, and the_main_loop.F
2673 o pkg/seaice:
2674 - adjoint-friendly modifications
2675 - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
2676
2677 checkpoint48e_post
2678 o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post)
2679 o dynamics: change definition of computational domain & adapt mom_fluxform
2680 accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2.
2681 o following exp works with Olx=Oly=2 (and pass through checkbounds option):
2682 adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1
2683 exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5
2684 global_ocean.90x40x15 global_with_exf global_ocean_pressure
2685 inverted_barometer solid-body.cs-32x32x1
2686 (high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure)
2687
2688 checkpoint48d_post
2689 o in preparation for r*:
2690 a) use pre-computed gradient of hydrostatic potential:
2691 changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce
2692 b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd:
2693 => affects results of glob_oce_pressure (different truncation error)
2694 update output.txt of ideal_2D_oce & global_ocean_pressure
2695
2696 checkpoint48d_pre
2697 o in preparation for r*:
2698 new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient.
2699 pass the 2 comp. of the grad. as arguments to momentum S/R.
2700 but for the moment, only used if it does not change the results.
2701 o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP
2702
2703 checkpoint48c_post
2704 Modifications in treatment of initial flux forcing controls
2705 to avoid extra storing of flux fields.
2706
2707 checkpoint48c_pre
2708 o Added tidal_basin_2d experiment (currently 1D!)
2709 o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented)
2710
2711 checkpoint48b_post
2712 o r* coordinate added in #ifdef NONLIN_FRSURF block.
2713 (modification to pressure gradient not yet implemented)
2714 o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports
2715 (for U & V) that are used for vertical advection of momentum.
2716
2717 checkpoint48a_post
2718 o In preparation for r*, use temp. array to compute vertical transport
2719 in flux-form momentum pkg. => change results of few test-exp.
2720 Update output of: exp4, exp5, front_relax, global_ocean_pressure,
2721 lab_sea, natl_box & plume_on_slope
2722
2723 checkpoint48
2724 o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D')
2725
2726 checkpoint47j_post
2727 o add new exp. (ideal_2D_oce) to test "exotic" parameters and options.
2728 o moved adexch from forward_step to addummy_in_stepping
2729 o added exch in ctrl_map_...
2730 o aveFreq.=0. at end of cost_final to avoid overwrite in
2731 reverse checkpointing loop
2732 o Yet more changes in gmredi:
2733 * adgmredi_calc_tensor
2734 avoiding all recomputation of gmredi_slope_limit
2735 * adgmredi_x/y/rtransport
2736 added flag for excessive storing to avoid recomp. of
2737 u/v/rtans, dTdx/y/z
2738 -> this is not really necessary and very memory-consuming
2739 * adgmredi_slope_psi:
2740 consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff
2741 * gmredi_slope_limit
2742 re-activated full calculation of taperfct for case 'ac02'
2743 o updating verification/ adjoints of carbon, global_ocean.90x40x15
2744
2745 checkpoint47i_post
2746 o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled.
2747 o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi)
2748 default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post)
2749 o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf)
2750 o gmredi: fix few bugs.
2751
2752 checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48)
2753 This will be a good checkpoint to plug into the ecco-branch.
2754 o few modif.'s to get latest version adjointed
2755 (mainly kick out code in ini_linear_phisurf)
2756 o modif's to run adjoint with exactConserv
2757 o case GM_BOLUS_ADVEC should be cleaned
2758 S/R gmredi_slope_psi should be cleaned
2759 o verification/carbon now has exactConserv=.TRUE.
2760
2761 checkpoint47g_post
2762 o time-average AIM output: becomes independent from statvars time-average
2763 (can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH)
2764 o After TAF bug fix:
2765 Tested adjoint of gmredi package.
2766 Tests were done with checkpoint47 rather than with latest
2767 checkpoint47f_post since the latter is broken for the adjoint
2768 verification/carbon/ contains both ADM and TLM gradient checks.
2769 Here they are, before they get changed/lost/stolen.
2770 Mostly modif.'s to fix numerical sensitivities.
2771 Gradient checks OK for
2772 - GM_taper_scheme:
2773 * clipping
2774 * ac02
2775 * linear
2776 * glw91
2777 * dm95
2778 * ldd97
2779 - GMREDI_OPTIONS:
2780 * GM_VISBECK_VARIABLE_K
2781 * GM_NON_UNITY_DIAGONAL
2782 * GM_EXTRA_DIAGONAL
2783 * GM_BOLUS_ADVEC
2784 in conjunction with data.gmredi parameters to be checked in
2785 in a few minutes under verification/carbon/code/
2786
2787 checkpoint47f_post
2788 Merging from release1_p10:
2789 o modifications for using pkg/exf with pkg/seaice
2790 - pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
2791 and SEAICE_EXTERNAL_FLUXES
2792 - pkg/exf CPP options EXF_READ_EVAP and
2793 EXF_NO_BULK_COMPUTATIONS
2794 - usage examples are Experiments 8 and 9 in
2795 verification/lab_sea/README
2796 - verification/lab_sea default experiment now uses
2797 pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
2798
2799 checkpoint47e_post
2800 o created a tag prior to creating a branch
2801
2802 checkpoint47d_post
2803 o fixed bug in the oceanic pressure coordinates code: vertical viscosity
2804 at the bottom boundary had an erroneous half slip boundary condition
2805 o added bottom drag and no slip boundary condition capabilities to
2806 oceanic pressure coordinates code
2807 o added new verification experiment global_ocean_pressure, this experiment is
2808 also described in the tutorial section of the manual
2809 checkpoint47d_pre
2810
2811 checkpoint47c_post
2812 o Added a verification experiment for a global cubed-sphere ocean run
2813 - verification/global_ocean.cubed32x32x30
2814 - uses pkg/therm_seaice and pkg/bulk_forcing
2815
2816 o allow to run AIM physics with SPEEDY input files (from Franco Molteni)
2817 o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1)
2818 when using P-coordinate; only implemented for atmospheric config.
2819 o OCEANICP & realFreshWater: include P-E direct effect on wVel ;
2820 NOTES: requires option NONLIN_FRSURF to be "#define".
2821 o update advect_xz/results/output.txt (left from checkpoint44g_post)
2822
2823 checkpoint47b_post
2824 Merging from release1_p9:
2825 o pkg/seaice
2826 - removed GOTO's and added taf directives
2827 - double precision constants to reduce the g77 (Linux)
2828 to F77 (SGI) differences reported in release1_p8
2829 o tools/genmake
2830 - added SGI options
2831 o verification/testscript
2832 - updated to that of checkpoint47a_post
2833 o verification/global_ocean.90x40x15/input/eedata
2834 - modified for SGI f77 compatibility
2835 o verification/lab_sea
2836 - added description of sea-ice model
2837 - added missing matlab routines
2838 - added test of thermodynamics parallelization
2839
2840 checkpoint47a_post
2841 o new pkg: aim_v23
2842 = F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm.
2843 for now, keep the same surface forcing as before.
2844 - Part-Cell implemented into AIM; check that Heat & Water are conserved
2845 - aim.5l_cs: use new aim pkg (run 10yr & get better results than before)
2846 - aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg
2847 o add diagnostic of surface correction term in monitor output
2848
2849 o bulk_force and therm_seaice
2850 - Two packages: bulk_force (Bulk forcing)
2851 and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2
2852 - Earlier integration from Stephaine Dutkiewicz
2853 and Patrick Heimbach.
2854 - Two ifdef statements for compile time,
2855 ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE
2856
2857 checkpoint47
2858 differentiable version of checkpoint46n_post
2859 o bug fix in quasihydrostaticterms
2860 o * "clean" adjoint code (in terms of extensive recomputations)
2861 can now be obtained for all GMREDI options (i.e. for
2862 - GM_VISBECK_VARIABLE_K
2863 - GM_NON_UNITY_DIAGONAL
2864 - GM_EXTRA_DIAGONAL
2865 - GM_BOLUS_ADVEC )
2866 * However, wrong gradient check problem remains unsolved.
2867 * New CPP options have been introduced for different
2868 tapering schemes
2869 o external_fields_load now part of differentiation list
2870 o pressure needs multiple storing;
2871 would be nice to have store_pressure at beginning or
2872 end of forward_step, e.g. by having phiHyd global (5-dim.)
2873 (NB: pressure is needed for certain cases in find_rho,
2874 which is also invoked through convective_adjustment).
2875 o recomputations in find_rho for cases
2876 'JMD95'/'UNESCO' or 'MDJWF' are OK.
2877 o #define ATMOSPHERIC_LOADING should be differentiable
2878 o ini_forcing shifted to begining of initialise_varia
2879 o Incorporating QNVS line search routines into MITgcm
2880 (this is separate code, and therefore not under pkg)
2881 lsopt/, optim/
2882 o Updated verification/carbon/
2883 - #define GM_VISBECK_VARIABLE_K
2884 - GM_taper_scheme = 'ldd97'
2885
2886 checkpoint46n_post
2887 Merging from release1_p8:
2888 o verification/natl_box:
2889 updating new external_fields_load routine
2890 o New package: pkg/seaice
2891 Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
2892 The sea-ice code is based on Hibler (1979-1980).
2893 Two sea-ice dynamic solvers, ADI and LSR, are included.
2894 In addition to computing prognostic sea-ice variables and diagnosing
2895 the forcing/external data fields that drive the ocean model,
2896 SEAICE_MODEL also sets theta to the freezing point under sea-ice.
2897 The implied surface heat flux is then stored in variable
2898 surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
2899 kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
2900 non-local transport term. Because this call precedes model
2901 thermodynamics, temperature under sea-ice may not be "exactly" at
2902 the freezing point by the time theta is dumped or time-averaged.
2903 N.B.: fairly large differences in accuracy occur across
2904 different platforms/compilers; comparison between
2905 g77 (Linux) and F77 (SGI Origin 2000/MIPSpro)
2906 generated output gives:
2907 T S U V
2908 C D M c m s m s m s m s
2909 n p a R g m m e . m m e . m m e . m m e .
2910 f n k u 2 i a a d i a a d i a a d i a a d
2911 g d e n d n x n . n x n . n x n . n x n .
2912
2913 Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea
2914 o GAD:
2915 - generated new common blocks to account for call of
2916 same gad routines with differing traceridentities
2917 (needed to modify tracerIdentity indices in GAD.h)
2918 - generated separate common blocks for case useCubedSphereExchange
2919 (Department of Futurology)
2920 - parameter lists to gmredi_?transport: added tracerIdentity
2921 - added new key indices to tamc.h
2922 o external_fields_load:
2923 - added this routine to TAF list
2924 - needed to make some common blocks global and additional storing
2925 along the same lines as exf package (checkpoint_lev?_directives.h)
2926 o exf:
2927 updated external forcing package
2928 - bug fixes carried over from ecco-branch
2929 (missing OBCS_OPTIONS.h in two routines)
2930 - enable easy to use "no forcing".
2931 - added exf I/O for atmospheric loading
2932 - added exf I/O for runoff data
2933 - transfered scaling between exf <-> MITgcm to exf namelist
2934 o Adding new verification experiment global_with_exf.
2935 This verification experiment is almost identical to the
2936 global_ocean.90x40x15 experiment, except that it uses
2937 the exf (and cal) package instead of the
2938 external_fields_load routine (cf README file).
2939
2940 checkpoint46m_post
2941 o modified testscript to return -- when there are no lines of "%MON" output
2942 o added new flag "quasiHydrostatic" for QH mode
2943 and new routine quasihydrostaticterms()
2944 o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term)
2945 New routine: mom_u_coriolis_nh()
2946 o fixed sign of non-hydrostatic metric terms in u and v equations.
2947 Depend on correct sign of gravitySign.
2948 o added work.pc* to .cvsignore in aim directories using ifc
2949 o introduced flag for controllin non-hydrostatic metric terms
2950 o removed gravitySign from PARM04
2951 o switched to g77/ifc from pgf77 in aim experiments
2952
2953 checkpoint46l_post
2954 o made convective adjustment work with pressure coordinates:
2955 - changed the direction of k-loop in convective_adjustment.F for the
2956 case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation)
2957 - adjusted the reference pressure k-index in convective_adjustment.F
2958 - adjusted the convection condition in convect.F (in analogy to
2959 calc_ivdc.F)
2960 - convective_adjustment no longer computes anything on the halos
2961 - removed the warnings about negative salinity from find_rho.F and
2962 find_alpha.F; instead the new routine look_for_neg_salinity, called
2963 at the beginning of find_rho, find_alpha, and find_beta, does a
2964 check of the entire slice, if CPP-option
2965 CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
2966 checkpoint46l_pre
2967
2968 checkpoint46k_post
2969 o fixed the verification/global_ocean.90x40x15 experiment:
2970 - new bathymetry (the world according to A., JMC, and M.)
2971 - new initial fields and forcing fields (*.bin files)
2972 - new POLY3.COEFFS (for the next release one should switch to a full
2973 equation of state: JMD95P or MDJWF)
2974 - fixed several errors and redundancies in the data file
2975 - experiment uses looped cells
2976 - added matlab directory with diagnostic scripts for plotting of output
2977
2978 o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F:
2979 - read AIM physics parameters from a file (data.aimphys)
2980 - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
2981
2982 checkpoint46j_post
2983 o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH
2984 o move wVel computation at the end of the time step, in S/R integr_continuity
2985 o create specific S/R to exchange T,S before DYNAMICS (for stagger time step)
2986 o update timeave pkg for wVel diagnostic.
2987 checkpoint46j_pre
2988
2989 checkpoint46i_post
2990 o Clean up AIM package (and keep the results unchanged):
2991 include CPP_OPTION and use IMPLICT NONE in all routines ;
2992 declare all the variables _RL ; use _d 0 for all numerical constants.
2993 use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 !
2994
2995 checkpoint46h_post
2996 o cleaned up the use of rhoNil and rhoConst.
2997 - rhoNil should only appear in the LINEAR equation of state, everywhere
2998 else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
2999 and the dynamical equations are all divided by rhoConst
3000 o introduced new parameter rhoConstFresh, a reference density of fresh
3001 water, to remove the fresh water flux's dependence on rhoNil. The default
3002 value is 999.8 kg/m^3
3003 o cleanup up external_forcing.F and external_forcing_surf.F
3004 - can now be used by both OCEANIC and OCEANICP
3005 checkpoint46h_pre
3006
3007 Added code to convert surface volume flux (fresh water) into
3008 a mass flux when using P coordinates in the ocean (OCEANICP).
3009 Note: It assumes you have set rho0=rhoConst=density of fresh water.
3010
3011 checkpoint46g_post
3012 o Include a new diagnostic variable phiHydLow for the ocean model
3013 - in z-coordinates, it is the bottom pressure anomaly
3014 - in p-coordinates, it is the sea surface elevation
3015 - in both cases, these variable have global drift, reflecting the mass
3016 drift in z-coordinates and the volume drift in p-coordinates
3017 - included time averaging for phiHydLow, be aware of the drift!
3018 o depth-dependent computation of Bo_surf for pressure coordinates
3019 in the ocean (buoyancyRelation='OCEANICP')
3020 - requires a new routine (FIND_RHO_SCALAR) to compute density with only
3021 Theta, Salinity, and Pressure in the parameter list. This routine is
3022 presently contained in find_rho.F. This routine does not give the
3023 correct density for 'POLY3', which would be a z-dependent reference
3024 density.
3025 o cleaned up find_rho
3026 - removed obsolete 'eqn' from the parameter list.
3027 o added two new verification experiments: gop and goz
3028 (4x4 degree global ocean, 15 layers in pressure and height coordinates)
3029 checkpoint46g_pre
3030
3031 checkpoint46f_post
3032 o Enable tangent linear (forward mode) gradient checks:
3033 - extended active file handling to g_... files
3034 - added TANGENT_SIMULATION to theSimulationMode
3035 - extended grdchk package accordingly
3036 o added tangent linear setup in verification/carbon/code_ftl
3037 o added adjoint setup in verification/front_relax/code_ad
3038
3039 checkpoint46e_post
3040 o Added new equation of state -> MDJWF
3041 - EOS of McDougall et al., 2002, JAOT, submitted
3042 - caveat: the equation of state is only valid for a smaller (more
3043 realistic?) range of values than JMD95P/Z and UNESCO
3044 - added masks to the calculation of pressure in store_pressure
3045 - added more check values for density in check_eos (ini_eos.F), some of
3046 the old check values are out of the range of the MDJWF-eos, so don't
3047 expect perfect matches for those
3048 checkpoint46e_pre
3049
3050 checkpoint46d_post
3051 o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and
3052 'OCEANICP', also initialised field pressure correctly in ini_eos in the
3053 case of pressure coordinates. eosType='JMD95Z' in
3054 combination with buoyancyRelation='OCEANICP' now causes an error.
3055 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
3056 in find_alpha/beta.
3057 checkpoint46d_pre
3058
3059 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
3060 so that JMD95Z and JMD95P give approptiate static stability in find_rho.
3061
3062 checkpoint46c_post
3063 o Changes necessary for ocean in p-coordinates
3064 - Added new buoyancy relation = 'OCEANICP'
3065 - Added new parameters = gravitySign (this used to be contained inside
3066 the factor dRdZ which I added when we first switched to R coordinates).
3067 X GM/Redi is not compatible (yet)
3068 X bottom drag and no-slip need to be debugged.
3069 checkpoint46c_pre
3070
3071 checkpoint46b_post
3072 o Added new equation of state -> JMD95Z and JMD95P
3073 - EOS of Jackett and McDougall, 1995, JAOT
3074 - moved all EOS parameters into EOS.h
3075 - new routines ini_eos.F, store_pressure.F
3076 o Added UNESCO EOS, but not recommended because it requires
3077 in-situ temperature (see JMD95)
3078 o Modified formatting for knudsen2.f in utils/knudsen2 and added
3079 unesco.f to be used with POLY3
3080 checkpoint46b_pre
3081
3082 checkpoint46a_post
3083 o Added (atmospheric) pressure loading
3084 - new field in FFIELDS.h, etc...
3085 - new cpp flag ATMOSPHERIC_LOADING
3086 o Changed hFacC to _hFacC in calc_phi_hyd.F
3087 o Added SHORTWAVE_HEATING to some files for consistency
3088 checkpoint46a_pre
3089
3090 checkpoint46
3091 further merges from release1_p5
3092 o new ctrl package
3093 - adopted from ECCO environment to enable optimization
3094 - added Eliassen Palm fluxes to controls
3095 o added Eliassen Palm flux controls to gradient check package
3096 o cost package
3097 - Compatible with new ctrl package
3098 - added Eliassen Palm cost hooks
3099 - modif's of existing cost functions
3100 o Adjoint-related bug fixes in kpp:
3101 - kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix
3102 - kpp_routines: store of Rib avoids partial recomputation bug of TAF.
3103 o autodiff package
3104 - flow directives:
3105 + new for S/R do_the_model_io
3106 + enhanced for S/R checkpoint
3107 + new gmredi.flow
3108 - Introduced CPP option ALLOW_AUTODIFF_MONITOR to
3109 disable adcommon.h/g_common.h by default.
3110 - fixed problem for adjoint of global_max
3111 o modified verification/carbon/
3112 o New setup for adjoint of global_ocean
3113 o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F)
3114 o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F)
3115 o incorporated hooks for sponge layer code (external_forcing.F)
3116
3117 checkpoint45d_post
3118 o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F)
3119 o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S
3120 (affects plume_on_slope "cg2d" output)
3121 o add new parameter deltaTfreesurf for free-surface time stepping
3122 o exchange gT,gS when using staggerTimeStep & GM & Oly<4
3123 o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B
3124 o change phiMin in exp1 (to agree with documentation)
3125 o add new flags:
3126 - T,S forcing inside/outside Adams-Bashforth
3127 - turn off temp,salt advection and/or forcing
3128 - for each tracer, define internal flag for multiDimAdvection & A-B
3129 o monitor: change definition of KE to check conservation of Energy
3130
3131 checkpoint45c_post
3132 o Removed f90 comments ("!")
3133 o Modified initialisations to enable exf package for MITgcm
3134 (without invoking ECCO_PACKAGE).
3135 o modifications to gradient check package (Martin Losch)
3136 - enable centered differences
3137 - modified format of standard output
3138
3139 checkpoint45b_post
3140 o cleaned exchange calls in cg2d
3141 o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step
3142 o included CPP option SINGLE_LAYER_MODE in thermodynamics
3143 to configure barotropic setup (Martin Losch)
3144 o moved some initialisations within bi,bj loop in dynamics
3145 (TAF flow dependency)
3146 o in initialise_varia, moved call packages_init_variables
3147 before convective_adjustment_init
3148 (corresponding adjustment of TAF tape initialisation).
3149 o in calc_diffusivity/calc_viscosity extended domain to full overlap.
3150
3151 checkpoint45a_post
3152 o compute Rho over the whole domain (extend iMin,jMin indices)
3153 o specific exchange for X-slice domain (case Ny=1)
3154 o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code
3155 o solve_for_pressure : set cg2d_x to zero where OBCS are applied
3156
3157 checkpoint44h_post = checkpoint45
3158 o Fix to restore differentiability:
3159 place at which packages_init_variables is called in
3160 initialise_varia is crucial for reverse control flow.
3161 o modifications in GMRedi to enable stable adjoint
3162 (corresponding modif's in thermodynamics, dynamics)
3163 o added missing hook for sponge layer code in external_forcing
3164 o modified test cost functions
3165 o storing in gad_advection (plus removal of write(0,*)!
3166 o missing headers TR1.h added in convective_adjustment routines
3167 o errorMessageUnit set non-equal zero in eeboot
3168 (conflict on some platforms, e.g. IBM SP3)
3169 o modified carbon verif.
3170
3171 checkpoint44h_pre
3172 o vertical grid option: allow to put the Interface at the middle between
3173 2 cell-centers ; replace delZ in pkg/kpp by drF.
3174 o GM Advective form: Tracers are advected using the residual transport (=
3175 Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form.
3176
3177 checkpoint44g_post
3178 o fix surface correction term in multiDimAdvection (affects plume_on_slope
3179 results) ; ifdef missing in thermodynamics.F
3180
3181 checkpoint44f_pre,checkpoint44f_post
3182 o added PTRACERS package
3183 This allows an arbitrary number of passive tracers to be integrated
3184 forward simultaneously with the dynamicaly model.
3185 + Implemented so far:
3186 - basic forward algorithm (time-stepping, advection, diffusion, convection)
3187 - I/O and checkpointing
3188 - GM/Redi *but* using the GM/Redi coefficient of Salt
3189 + Not implemented so far:
3190 - KPP
3191 - OBCS
3192 + No specific example supplied (yet) but global_ocean.90x40x15 has the
3193 necessary data.ptracer file. Simply use -enable=ptracers and uncomment
3194 line in data.pkg.
3195 + This package is disabled by default since it increases storage.
3196
3197
3198 o testscript: added -cleanup option
3199 o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter
3200 b) enable to filter 2D fields.
3201
3202 checkpoint44e_pre,post
3203 o re-wrote convective adjustment to use pre-calculated weights
3204 Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F
3205 Adds: model/src/convective_weights.F, convectively_mixtracer.F
3206 Original calls to convect() still in place.
3207
3208 chkpt44d_pre,post
3209 o added missing EXCLUDE_MONITOR flags
3210 o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi
3211 (incompatible typ in MIN/MAX expressions caused problems
3212 on IBM SP3)
3213 o in genmake added variable MAKEDEPEND
3214 plus resetting for case SunOS
3215 o added timer_stats.c routine for IBM SP3
3216 o removed variables in dynamics
3217 !!! I forgot to create tag chkpt44d_pre !!!
3218 !!! But chkpt44d_pre = chkpt44c_post !!!
3219
3220 o real fresh water flux implemented with non-linear free-surface.
3221
3222 chkpt44c_pre,post
3223 o few fix (mask in shap_s2, EmPmR in external_field_load,
3224 USE_NATURAL_BCS in solve_for_P);
3225 o add arguments myIter & myTime to S/R obcs_calc & solve_for_P
3226
3227 checkpoint44b_pre/_post
3228 o merge of relevant stuff from the ecco-branch:
3229 - genmake: removed $S64 overwrite for case SunOS
3230 - pkg/exf: update and corrections for field swapping and obcs
3231 - pkg/ecco: parameter lists for the_model_main, the_main_loop
3232 harmonized between ECCO and MITgcm
3233 - pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
3234 updated checkpointing_lev... lists for obcs
3235 - model/src: minor changes in forward_step, plot_field
3236 added directive for divided adjoint in the_main_loop
3237 - pkg/mdsio: added mdsio_gl_slice
3238
3239 o check parameters & config (chkpt44a_pre,post)
3240 o OBC and NonLin_FrSurf.
3241
3242 checkpoint44
3243 o fix bug in mom_vi_del2uv
3244 o select when filters are applied ; add options to zonal_filter (data.zonfilt)
3245 o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
3246 o update AIM experiments (NCEP input files)
3247 o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
3248 o added some stuff for AD
3249
3250 checkpoint43
3251 o added two new advection tests
3252 o added global 4x4 degree ocean test
3253 o added test of H&S94 with free surface on cube
3254 o some final mods for gradient check, adjoint,...
3255
3256 checkpoint42
3257 Fixed AD-related problems:
3258 o Store directives up-to-date with re-arranged Adams-Bashforth
3259 (mainly thermodynamics.F)
3260 o New store directives for multi-dim. advection schemes
3261 * new CPP flag ALLOW_MULTI_DIM_ADVECTION
3262 * new common block and key passkey
3263 (mainly gad_advection.F)
3264 o Modified store directives for split of dynamics/thermodynamics
3265 for the case ALLOW_KPP
3266 o Cleaned argument list for timestep_tracer.F
3267
3268 checkpoint41
3269 o re-formatted/added comments in prologues of key subroutines
3270 to work with protex
3271
3272 checkpoint40
3273 o moved calc_gs, calc_gt and calc_tr1 back to model/src
3274 o added FLT (floats) package from Arne along with demo. experiment
3275 o re-arranged Adams-Bashforth scheme for tracers to allow easier
3276 implementation of forward-in-time forcing terms
3277 o more mods for non-linear free-surface including new variable
3278 o modified multi-dim method to work on cube
3279 o bug fix in KPP (from DM)
3280
3281 checkpoint40pre9
3282 o added DST advection schemes
3283 o fix MPI bug on SGI's
3284 o modifications for non-linear free-surface
3285 o fixed conditionals for fixed flow/passive tracer only mode
3286 o added tension/strain form of stress tensor
3287 o changes to commenting of arguments for TAF/TAMC
3288 o added/updated many matlab scripts
3289 o added multi-dimensional advection method for tracers
3290
3291 checkpoint40pre8
3292 o new package rw/
3293 Added method for dumping intermediate local arrays:
3294 mdsio_writetile - same as mdsio_writefield except works from inside
3295 bi,bj loop
3296 mdsio_writelocal - same as mdsio_writetile except works for local
3297 arrays
3298 write_local_r? - higher-level wrapper for mdsio_writelocal
3299 Controlled by diagFreq. Defaults to zero (ie. no dumps)
3300 Example given at end of mom_vecinv.F that dumps some local arrays.
3301 o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to
3302 control flux-form versus vector invariant code.
3303 Switch is runtime flag vectorInvariantMomentum (defaults to false)
3304 or genmake -DISABLE ...
3305 o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F
3306 (additional storing is now needed for case vecinv;
3307 currently nothing implemented to switch this storing off
3308 in case fluxform is used since no CPP flag available).
3309
3310 checkpoint40pre7
3311 o bug fix in dynamics.F
3312 calc_viscosity called before k=1,Nr loop.
3313 o added some #ifdef's ALLOW_PASSIVE_TRACER
3314 o cleaned initialisations in ctrl_map_ini
3315 related to TAF
3316
3317 checkpoint40pre6
3318 o split dynamics into thermodynamics & dynamics
3319 o corresponding split of calc_diffusivity into
3320 calc_diffusivity, calc_viscosity
3321 (kpp_calc_diff, kpp_calc_visc).
3322 o Added diffkr, kapgm to control variables
3323 o bug fix in gmredi_slope_limit for ldd97
3324
3325 checkpoint40pre5
3326 o proper initialization of Adams-Bashforth time stepping
3327 + uses forward step for very first step of model (iter=0)
3328 o re-generated *all* output since almost all output is modified by this
3329 change (sorry but we've been putting this one off for about 2 years)
3330 + natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were
3331 *not* regenerated since they are already out of date and I don't
3332 want to create the impression that they are suddenly working.
3333 o removed KAP stuff for DEC's
3334 o modified/added many .cvsignore files in */code and */input
3335 o added new expt "solid-body.cs-32x32x1"
3336 + this uses an alternative form of ini_curvilinear_grid.F which
3337 is not necessarily any better than the current one...
3338
3339 checkpoint40pre4
3340 o added re-initialisations of utrans,vtrans,rtrans in
3341 calc_common_factors which are crucial for TAF.
3342 o extended iMin,jMin range for calc_common_factors,
3343 calc_diffusivity
3344 o added option ALLOW_PASSIVE_TRACER
3345 o a few minor updates and fixes
3346
3347 checkpoint40pre3
3348 o created calc_gtr1.F for gad package
3349 o split the_main_loop and re-introduced forward_step
3350 o some recomputations of nIter0 for TAMC
3351
3352 checkpoint40pre2
3353 o Updated to latest branch of AJA, JMC
3354 o Added gradient check package
3355 o Added routines for passive tracer handling
3356 o Added carbon sequestration sensitivity experiment
3357
3358 checkpoint39
3359 o Modifications and fixes to support TAMC
3360 (mainly missing or wrong directives)
3361 o Corrected common blocks when fooling TAMC to produce adjoint I/O
3362 in addummy_in_stepping
3363 o Updated verification/vero/ (bug fixes in code/, correct pickups in input/)
3364 o Enabled "sliced" (xz-,yz-) exchanges, needed for obcs.
3365 o Included following packages:
3366 cal: calendar
3367 exf: external forcing
3368 ecco: essential routines to control use of cal, exf
3369 (NB: this is not the full ECCO environment)
3370 o disabled some packages by default in genmake
3371
3372 checkpoint38
3373 o see notes_c37_adj.txt
3374 o corrected wrong layer index in external_forcing_t
3375 o replaced the_main_loop/forward_step by the_main_loop
3376 o removed forceoutput from write_state
3377 (replaced criteria for initial/final state)
3378 o added runtime flag for pre-C35 pickups: usePickupBeforeC35
3379
3380 checkpoint37
3381 o mdsio.F routine split and packaged in pkg/mdsio
3382 (mdsio.F and mdsio_gl.F still exist in eesupp/src but are not
3383 used unless genmake -disable=mdsio)
3384 o allow a more precise surface-geopotential gradient for the atmosphere
3385 taking into account the change in space of Alpha (=1/rho) at the surface.
3386 o variable "etaN" (replace cg2d_x) is the surface R-anomaly [r unit]
3387 (ocean: sea surface height [m] / atmos: surface pressure anomaly [Pa])
3388 o Change units: Phi_Hydrostatic (=phiHyd), Phi_Surface(=cg2d_x) and
3389 Phi_NonHydrostatic (=cg3d_x), all have now the dimension of a potential
3390 [m2/s2] (pressure/rhoConst in the ocean ; Geo-Potential in the atmosphere).
3391 o Time-Average diagnostics defined as a pseudo package "timeave".
3392 o pickup files : old pickup (before c35) did not work with new code (c35
3393 and after) unless activating 2 commented lines in initialise-varia.
3394 o Non-Hydrostatic pickup file Pb fixed.
3395 o bug with Rigid-lid version (since c35) fixed.
3396
3397 checkpoint36
3398 o implement Crank-Nickelson barotropic time-stepping
3399 o recover Time-Average diagnostics
3400 o fix Pb in checkpoint (PR#19)
3401 o AIM become a standard package ; clean unused CPP_kees
3402
3403 checkpoint35
3404 o subtantial rewrite of dynamics.f
3405 o allows staggered time-stepping
3406 o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt
3407 o added bottom drag (linear + quadratic)
3408
3409 checkpoint34
3410 o Modified exchange routines for correct reverse simulation.
3411 o Added verification output to comply with bug fix in impldiff.F
3412 as of c33 (exp2, natl_box).
3413 o Corrected store directives in dynamics.F
3414 o Corrected array boundaries in impldiff.F
3415 o Corrected array dimensions in gmredi.
3416 Added temporary scalars to avoid storage by TAMC (gmredi, kpp).
3417 o Added routine GLOBAL_SUM_INT to global_sum.F
3418 o Added mdsio_gl.F for ECCO purposes.
3419
3420 checkpoint33
3421 o Fixed bug in lower BC in impldiff.F
3422 o Fixed confusion about units of forcing arrays in FFIELDS.h
3423 namely Fu,Fv,Qnet,Qsw,EmPmR:
3424 - Removed verification/natl_box/code/external_fields_scale.F
3425 (did not differ from that in model/src)
3426 - Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
3427 (see FFIELDS.h for description)
3428 - Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
3429 kpp_calc.F and kpp_transport_t.F
3430 - Removed model/src/external_fields_scale.F and calls to it
3431 - verification/natl_box uses flux data with "atmospheric" sign so
3432 a special version of external_fields_load.F is used to
3433 change the data as it's read in. This way, the arrays
3434 have the right units and signs at all times tha a user could
3435 possibly use them.
3436 o Corrected genmake to delete a temporary file during configuration
3437
3438 checkpoint32
3439 o Scaling of forcing fields moved from external_forcing.F to
3440 external_fields_scale.F, called directly after loading fields.
3441 o Surface relaxation terms added to surface tendency fields in
3442 extra subroutine.
3443 o impldiff.F changed to avoid storing by TAMC of huge intermediate
3444 fields.
3445 o Changes in GMRedi to comply with packaging structure.
3446 o Modifications and bug fixes in KPP package.
3447 o Verification experiment for KPP added (verification/nat_box/)
3448
3449 checkpoint31
3450 o Packages interface brought in line with defined standard
3451 -> new routines packages_...F
3452 -> changes in initialise_fixed.F, initialise_varia.F
3453 -> enables initialisation interface for ECCO package
3454 o Rescaling of external forcing fields immediately after read
3455 (removed from external_forcing.F)
3456 -> new: surface_fields_scale.F
3457 -> affects ini_foorcing.F, external_fields_load.F
3458 o Computation of surface tendencies before tendency updates.
3459 -> new: external_forcing_surf.F
3460 o Change of variable names useGMRedi, useKPP, useECCO
3461 o Further changes in dynamics.F, impldiff.F for TAMC
3462 o Tested for experiments 0, 2, 4.
3463 - not yet tested for GMRedi.
3464 - not yet tested for KPP.
3465
3466 checkpoint30
3467 o Updates for OBCs
3468 o New experiment for test OBCs (internal_wave)
3469 o New output.txt in verification/exp4/results/
3470 o Updates for KPP: calculation of viscosity corrected, new variables
3471 kpp_dumpFreq and kpp_taveFreq
3472 o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.)
3473 and entry for T90 in genmake
3474
3475 checkpoint29
3476 o packaged KPP and GM/Redi
3477
3478 checkpoint28
3479 o Corrected initialization of hFacMin for difference vertical coordinates
3480 o Modified calculation of partial cell thickness to more robust algorithm
3481 o config_summary.F: replaced write_1D_... by write_0D_...
3482 read_write.F: added subroutines write_0D_...
3483 o routines calc_common_factors, calc_gs, calc_gt, calc_phi_hyd, find_rho:
3484 included some initialisations required for TAMC.
3485 o routine calc_isoslopes: modified sqrt computation to make it
3486 differentiable for zero argument.
3487 o routines dynamics, impldiff:
3488 included store directives and tape key computations required for TAMC.
3489 o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC
3490
3491 checkpoint27
3492 o fixed calc_isoslopes() to so that cancellation of terms in tensor
3493 formulation works properly with variable resolution.
3494 o restructured the calling tree between the_model_main() and dynamics()
3495 o split initialise() into initialise_fixed() and initialise_varia()
3496 o introduced initialization file pSurfInitFile for free surface (cg2d_x)
3497 in new routine ini_psurf()
3498
3499 checkpoint26
3500 o moved some #ifdef in optional routines to encompass everything
3501 except the argument declarations. This was using up some memory.
3502 o fixed macros like _ADT to work with both versions of Linux cpp
3503 o cleaned up some unused and uninitialized variables
3504 (helps when debugging with strict compile options)
3505 o split up CPP_EEOPTIONS.h into options and macros
3506 (macros are now in eesupp/inc/CPP_EEMACROS.h)
3507 o patch for 2 processor JAM mode
3508
3509 checkpoint25
3510 o updates for OBCs and NH
3511 o dramatically reduced memory usage
3512 o added "JAM" routines for use on Artic network
3513 o parameterization of convection by implicit vertical diffusion
3514 o added a diagnostic of convective index
3515 o moved call to calc_divg_hat() from dynamics() to solve_for_pressure()
3516 (this is was partly for OBCs and NH but also in anticipation of
3517 an explicit free-surface option)
3518 o initial state input files for U and V
3519
3520 checkpoint24
3521 o Removed some spurious "REAL"s
3522 o Updated KPP to latest version from JPL
3523 o Added a COS(latitude) in horizontal viscosity
3524
3525 checkpoint23
3526 o Added del^4 diffusion for salt and temperature
3527 o Multiple minor fixes (implicit none's, arguments to global_sum, etc.)
3528
3529 checkpoint22
3530 o Made many small changes: implicit none, format(i5), etc...
3531 o Introduced KPP mixing scheme (compiles and runs but *not* tested)
3532
3533 checkpoint21
3534 o Introduced new I/O package that supports direct-access records (mdsio.F)
3535 o Split-up mid-level I/O routines
3536 o Updated input data for experiments 0,1,2,4 and 5
3537 o Finally removed the genmake.* scripts (everyone seems happy with genmake)
3538
3539 checkpoint20
3540 o Tidied up open-boundaries some more
3541 o Added non-hydrostatic code
3542 o Fixed some input data
3543 o Modified MPI start-up to work in "coupled" context.
3544
3545 checkpoint19
3546 o Tidied up directory structure for verification experiments.
3547 o Added new code for open boundaries.
3548 o Corrected advective terms near boundaries.
3549 o Added CPP flag for "old UV" geometry and corrected spherical geometry.
3550 o Implemented free-slip/no-slip BCs and del^4 dissipation.
3551 o Split default parameters out of ini_parms.F into set_defaults.F.
3552
3553 checkpoint18
3554 o Further changes for optional code generation with
3555 CPP - ugh!
3556
3557 checkpoint17
3558 o Beginning to incorporating modularity
3559 for supporting atmos. and ocean configs.
3560 o Small changes for TAMC complinace
3561 o New ultra simple test case. Barotropic box
3562 configuration "exp0".
3563
3564 checkpoint16
3565 o Minor changes to exchange routines to support
3566 accumulation in reverse mode. Adjoint of an
3567 assignment is an addition.
3568 o Changes to support compilation by TAMC (LR(1)
3569 syntax) and by g77 under Linux ( 72 character
3570 limit ).
3571
3572 checkpoint15
3573 Rewrote exchange routines to allow
3574 o General tile <-> tile connectivity.
3575 o TAMC reverse mode flag ( is this really needed? )
3576 o Variable width overlap and exchange region widths.
3577 o Hooks for sharing data via DMA, Arctic, Memory Channel,
3578 shmput/shmget, VIA, SYSV shmem and every other cool
3579 communication method.
3580
3581 checkpoint14
3582 Consistent isomorphism chages made. These allow dynamical core
3583 to support both pressure and meters as a vertical coordinate.
3584
3585 checkpoint13
3586 Release which corrects global_max problem and a couple
3587 of KGM time-averaging diagnostic errors. Also contains
3588 a double-gyre experiment setup as well as the baseline
3589 4 degree global template. The double gyre template is
3590 organised to allow it to be applied automatically to
3591 the baseline configuration.
3592
3593 branch-point-rdot
3594 A few tidy-ups have been made bt the real point of this
3595 check-point (excuse the pun) is to allow a branch to be
3596 made for the purposes of adding the rDot alterations.
3597 I don't want to commit the rDot to the main-trunk until
3598 we've actually tested it...
3599
3600 checkpoint12
3601 Tidy up and added generic genmake script (formerly
3602 configure script).
3603 Released to testers.
3604
3605 checkpoint11
3606 Re-arranged initialise() and introduced ini_vertical_grid()
3607 and ini_masks_etc().
3608
3609 checkpoint10
3610 Introduced the configure script.
3611 Separated out the diags package.
3612 Added template for writing time-averages of tile/intermediate quantities.
3613 Updated SIZE.h in exp2 and made the data big-endian.
3614
3615 checkpoint9
3616 MPI fix. Filename changes (meta/data). salbin*y stuff.
3617 General tidy-up.
3618 SST.bin SSS.bin added to verification/exp2
3619
3620 checkpoint8
3621 Inludes time-dependant forcing and time-averaging.
3622 Works at 4x4 and 2.8125x2.8125 global
3623
3624 checkpoint7-4degree-ref
3625 Branch from checkpoint7. Released for application to
3626 global modeling and general modeling - process studies, regional
3627 model etc..
3628 Configured for verification/exp2 - 4 degree global, two process.
3629
3630 checkpoint7
3631 Created by cnh
3632 Simple 4 degree global simulation
3633 configuration.
3634 Includes climatological wind,
3635 hydrography, bathymetry etc
3636 Does not include Heat Flux and E-P
3637
3638 checkpoint6
3639 Created by cnh
3640 merged checkpoint5 with CD and
3641 spherical polar code.
3642 Still some problems with GM Redi
3643 abd full topography.
3644
3645 checkpoint5
3646 Created by AJA
3647 contains updates to GM Redi
3648 and reordered timestepping loop
3649 for Implicit Diffusion.
3650
3651 checkpoint4
3652 Created by cnh
3653 Contains memory saving macros ( _rdxc etc..) for when
3654 grid variations are limited.
3655 Contains polynomial coeffs for EOS and knudsen program
3656 for generation.
3657
3658 checkpoint3
3659 Created by cnh
3660 Added extra flags for runtime options
3661 Added this file
3662 Added implicit free-surface
3663 Added pre-conditioner
3664 Put compare01 into repository ( compare01/... )
3665 Put data and eedata into repository ( verification/exp1 )
3666
3667 checkpoint2
3668 Created by AJA
3669 Added GM/Redi
3670
3671 checkpoint1
3672 Created by AJA
3673 Restructured kloop in dynamics.F
3674 Added non-linear EOS
3675
3676 baseline
3677 Original checked in code

  ViewVC Help
Powered by ViewVC 1.1.22