4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/seaice: add new parameter SEAICE_deltaMin that is used ***only*** |
8 |
|
for regularizing Delta (and nothing else, like the parameter |
9 |
|
which is also used for all sorts of things SEAICE_EPS). Defaults to |
10 |
|
SEAICE_EPS for backward compatibility only. |
11 |
|
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
12 |
|
the wrong key by inialising it before use -> fixes a recomputation |
13 |
|
problem but does not fix the gradient |
14 |
|
o pkg/layers: |
15 |
|
- move resetting of flux arrays to outside the iLa loop |
16 |
|
(this caused layers_diapycnal to not work with more than one layer coord.) |
17 |
|
- fix bug in calculation of layers_recip_delta in layers_init_fixed.F |
18 |
|
o pkg/layers: |
19 |
|
- remove from common block 3D layers fields (used to diagnose transport |
20 |
|
in tracer coords) and declare them as local arrays in layers_calc.F |
21 |
|
o pkg/seaice: |
22 |
|
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
23 |
|
in lab_sea forward experiment (changes results -> updated) |
24 |
|
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
25 |
|
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
26 |
|
computations; for SEAICE_VECTORIZE_LSR |
27 |
|
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
28 |
|
sweep to the outside, |
29 |
|
- remove store directives and add "CADJ loop sequential" directives |
30 |
|
in analogy to model/src/solve_tridiagonal.F |
31 |
|
- replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop |
32 |
|
boundaries to yield more readable code. This has also the charming side |
33 |
|
effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without |
34 |
|
SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in |
35 |
|
seaice_lsr_tridiagu/v now requires either of these flags, vectorization |
36 |
|
still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as |
37 |
|
an additional option) |
38 |
|
The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F |
39 |
|
but the adjoint gradients (which are affected by this change) still explode. |
40 |
|
o coupler (atm & ocn _compon_interf): |
41 |
|
- avoid using Exch2 IO mapping if not suitable. |
42 |
|
|
43 |
|
checkpoint65m (2015/06/15) |
44 |
|
o pkg/layers: |
45 |
|
- clean-up old parameters setting (from Sep 2012): |
46 |
|
+ remove old parameters setting from common block (declared locally); |
47 |
|
+ stop if any old parameter is mixed with new parameters; |
48 |
|
+ check for valid or consistent parameter setting (e.g., layers_name) |
49 |
|
- check that layers_bounds for Pot.Density are in the right range; |
50 |
|
this is supposed to catch un-updated setting after recently shifting |
51 |
|
potential density field "prho" by -1000 (now in "sigma" scale). |
52 |
|
o pkg/layers: |
53 |
|
- Added missing call to layers_fill for keeping track of tottend in |
54 |
|
pkg/diagnostics/diagnostics_fill_state.F |
55 |
|
o pkg/layers: |
56 |
|
- added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning |
57 |
|
of diapycnal fluxes |
58 |
|
o pkg/layers: |
59 |
|
- reverted changes to interpolation to previous treatment; there |
60 |
|
was never actually a problem |
61 |
|
o pkg/layers: |
62 |
|
- fix interpolation of layers tracers in the presence of partial cells |
63 |
|
- add lots of new functionality to compute water mass transformation |
64 |
|
(enabled by CPP flag LAYERS_THERMODYNAMICS) |
65 |
|
- add new calls from main code (diags_oceanic_surf_flux.F, |
66 |
|
thermodynamics.F, impldiff.F) and gad to save the necessary fields |
67 |
|
for layers_thermodynamics calculations |
68 |
|
o pkg/ptracers: |
69 |
|
- add capability of stepping a passive tracer forward without advection |
70 |
|
by setting PTRACERS_advScheme to 0. |
71 |
|
o pkg/diagnostics: |
72 |
|
- add few (threads) _BARRIER around any update of "diag_pkgStatus". |
73 |
|
o pkg/layers: |
74 |
|
- shift potential density field "prho" by -1000 for density layer averaging so |
75 |
|
that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000); |
76 |
|
Note that density bin boundaries (layers_bounds in data.layers) have |
77 |
|
to be set accordingly (i.e., shifted, in sigma scale). |
78 |
|
o pkg/layers: |
79 |
|
- fix snap-shot output of layer thickness @ V.pt and output of pot.density |
80 |
|
- fix calculation of layer non-weighted velocity and layer probability |
81 |
|
- add diagnostics for pot.density used for layer averaging |
82 |
|
o pkg/seaice: |
83 |
|
- seaice_calc_viscosity.F: change computation of deltaC**2 to ensure |
84 |
|
positiveness, modify a few comments and improve variable names, |
85 |
|
- the changed computation of deltaC affects most seaice-related |
86 |
|
experiments at the truncation level. |
87 |
|
seaice_itd.thermo is affected by far the most, with |
88 |
|
only 7 digits of agreement remaining; update experiments. |
89 |
|
|
90 |
|
checkpoint65l (2015/05/04) |
91 |
|
o pkg/shelfice: |
92 |
|
- in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set |
93 |
|
factor drKp1 to zero where it is negative (ie. do not use |
94 |
|
SHELFICEBoundaryLayer if hFacC>1) |
95 |
|
- the same for factor drLoc in shelfice_forcing.F |
96 |
|
o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem |
97 |
|
with modules in ptracers, when using testreport option "-small_f" |
98 |
|
o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD) |
99 |
|
- replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1)) |
100 |
|
o verification/testreport |
101 |
|
- add new option -small_f |
102 |
|
with this option testreport first makes the target small_f (*.f files) |
103 |
|
before running make (all). This is useful for explicit inlining when |
104 |
|
all sources need to be full available. |
105 |
|
o pkg/exf/exf_interp.F: |
106 |
|
remove previous changes related to reverse (decreasing) input grids latitude |
107 |
|
|
108 |
|
checkpoint65k (2015/04/01) |
109 |
|
o pkg/ecco: |
110 |
|
fix missing cosphi initialization; use eccoiter in place of optimcycle; |
111 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
112 |
|
instead of active read/write |
113 |
|
o pkg/ctrl: |
114 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
115 |
|
instead of active read/write. |
116 |
|
o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F |
117 |
|
return if .NOT.useAUTODIFF |
118 |
|
o pkg/seaice: add CPP brackets (cost function related). |
119 |
|
o model/src: |
120 |
|
add useAUTODIFF run time switch. |
121 |
|
o pkg/exf/exf_interp.F: |
122 |
|
add code to allow input grids with latitude starting in the north (i.e. when |
123 |
|
j=1 corresponds to northern edge of field); modify global_with_exf to test |
124 |
|
this feature. |
125 |
|
o verification/testreport: |
126 |
|
- replace "grep -A3" with POSIX conformal sed command, because there are |
127 |
|
implementations of grep that cannot do contextual searches |
128 |
|
- replace "cat -n" by "nl" (two occurrences), because not all implementations |
129 |
|
of "cat" have the option "-n" |
130 |
|
o model/src: |
131 |
|
add new file gsw_teos10.F that contains 3 functions, more or less a copy |
132 |
|
of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to |
133 |
|
convert from conservative to potential temperature. For now they are not |
134 |
|
called anywhere. |
135 |
|
o pkg/ggl90: make "useIDEMIX" useful |
136 |
|
- re-organize code in s/r ggl90_calc a little to move computations that |
137 |
|
are different for idemix into separate loops (changes verification |
138 |
|
experiment idemix at truncation level, 12 digits remain -> updated) |
139 |
|
- requires 2 new 2D fields KappaM, verticalShear |
140 |
|
- make hFacI and recip_hFacI local 3D variables that are passed to |
141 |
|
s/r ggl90_idemix |
142 |
|
- fix and improve some comments |
143 |
|
|
144 |
|
checkpoint65j (2015/02/25) |
145 |
|
o pkg/openad |
146 |
|
- synchronize seawater.F with version in model/src: replace routine |
147 |
|
body of sw_temp by calling sw_ptmp and fix/add a few comments. |
148 |
|
o pkg/mnc: |
149 |
|
- change default value of pickup_read/write_mnc params to FALSE |
150 |
|
(since few features are missing in reading MNC pickup files). |
151 |
|
o model/src: |
152 |
|
- change default (background) vertical diffusivity for salt to be the |
153 |
|
temperature (background) vertical diffusivity. |
154 |
|
- change background vertical diffusivity in vertical mixing pkgs ggl90, |
155 |
|
kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity. |
156 |
|
This makes ptracers default diffusivity (that uses salt diffKr) more |
157 |
|
consistent with vertical mixing schemes. |
158 |
|
o verification/testreport: |
159 |
|
- fix typo in "-pcls" option ; |
160 |
|
- put temp files in /tmp (instead of in local dir) |
161 |
|
- add option "-ncad" to use genmake2 new option "-nocat4ad" |
162 |
|
- allow to use "-j" option (for multi-procs make) for AD, OAD and TLM. |
163 |
|
o pkg/ggl90 (idemix code): |
164 |
|
- apply few fixes ; add some missing "_d 0" ; update output of exp. |
165 |
|
global_ocean.90x40x15.idemix |
166 |
|
o OpenAD |
167 |
|
- enable active file I/O and begin removal of work-around code |
168 |
|
for OpenAD for handling control variables (memory vs. active files) |
169 |
|
- new CPP options file OPENAD_OPTIONS.h |
170 |
|
- revert to genarr2d gradient check for hs94.1x64x5 |
171 |
|
- (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens) |
172 |
|
- gentim2d works for halfpipe_streamice but not yet hs94.1x64x5 |
173 |
|
o tools/genmake2: |
174 |
|
- add option for an alternative Makefile (from Martin) where multiple |
175 |
|
source files are sent to TAF (instead of all in one file). |
176 |
|
o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013) |
177 |
|
- code provided by Carsten Eden as an extension of ggl90 |
178 |
|
- so far the code is turned on within ggl90 by setting a CPP-flag at |
179 |
|
compile time; a runtime flag implementation is not yet complete |
180 |
|
- tested in new verification experiment global_ocean.90x40x15.idemix |
181 |
|
o verification: |
182 |
|
- reduce length of the AD test run by half for experiments |
183 |
|
global_ocean.cs32x15 (std + thsice) and isomip |
184 |
|
- enable active file I/O for OpenAD, adjust verifications accordingly |
185 |
|
- halfpipe_streamice: change gradient check from genarr2d to gentim2d |
186 |
|
o verification/testreport: |
187 |
|
- fix two non-POSIX sed statements so that there are no error messages |
188 |
|
on Mac OS X |
189 |
|
- replace hostname -s with hostname | sed 's/\..*$//' |
190 |
|
o model/src/seawater.F: |
191 |
|
- simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged |
192 |
|
(following the matlab code), which would have avoided the bug caught |
193 |
|
by Matt (see below) in the first place |
194 |
|
o pkg/shelfice: |
195 |
|
- implement alternative discretisation of quadratic drag (selectBotDragQuadr) |
196 |
|
and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag. |
197 |
|
- fix sign of friction tendency (no-slip BC) and fix u,v drag for thin |
198 |
|
ice-shelf case (i.e., within surface level). |
199 |
|
- add config summary in shelfice_check.F |
200 |
|
- remove global variable recip_SHELFICElatentHeat and replace by a local |
201 |
|
variable recip_latentHeat |
202 |
|
- introduce diagnostics for friction velocity uStar (in case of |
203 |
|
SHELFICEuseGammaFrict) |
204 |
|
- change verification experiment isomip.htd: |
205 |
|
+ start from pickup (as input_ad at nIter0=8640) |
206 |
|
+ start from SHELFICEmassFile instead of SHELFICEloadAnomaly file |
207 |
|
+ test SHELFICEuseGammaFrict = .TRUE. |
208 |
|
+ test SHELFICEadvDiffHeatFlux = .TRUE. |
209 |
|
o model/src: |
210 |
|
- fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to |
211 |
|
in-situ Temp) and in routine SW_TEMP (in pkg/openad); |
212 |
|
update output of experiments global_with_exf.yearly and isomip (all 6). |
213 |
|
o pkg/shelfice: |
214 |
|
- change setting of kTopC to also be zero where there is no ice-shelf. |
215 |
|
- zero out surface forcing arrays (for now, for T & S + EmPmR) where |
216 |
|
ice-shelf is. |
217 |
|
- first attempt to get RealFreshWaterFlux effects: for now, only without |
218 |
|
SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping. |
219 |
|
o pkg/seaice: add the option to prescribe a fixed thickness PDF |
220 |
|
for thermodynamic calculations |
221 |
|
- because of divisions of the type 7/7 not exactly equal to 1, this change |
222 |
|
affects results of some verification experiments by up to 4 digits: |
223 |
|
global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume, |
224 |
|
seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides |
225 |
|
adjoint: lab_sea, lab_sea.noseaicedyn |
226 |
|
-> updated |
227 |
|
|
228 |
|
checkpoint65i (2015/01/23) |
229 |
|
o model/src: |
230 |
|
- change units of frictionHeating field from W to W/m^2 |
231 |
|
- fix bug in frictional heating from stratospheric drag in |
232 |
|
S/R ATM_PHYS_TENDENCY_APPLY_V |
233 |
|
- with synchronous time-stepping: move resetting to zero of frictionHeating |
234 |
|
field from load_fields_driver.F to thermodynamics.F ; |
235 |
|
- add diagnostics for frictional heating. |
236 |
|
o model/src & gmredi K3D: |
237 |
|
- add frictionHeating field to pickup-files (for synchronous time-stepping) |
238 |
|
- move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h |
239 |
|
- rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name |
240 |
|
and name in pickup file). |
241 |
|
- fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F |
242 |
|
o model/src: |
243 |
|
- move (from ini_forcing.F) initialisation of all arrays in header file |
244 |
|
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
245 |
|
(since Nov 2012) with option selectAddFluid=1. |
246 |
|
o pkg/shelfice: |
247 |
|
- change units (+ document) of newly added field "shelfIceMassDynTendency" |
248 |
|
- upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays. |
249 |
|
o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers |
250 |
|
o pkg/seaice: two new runtime parameters: |
251 |
|
- SEAICE_cStar replaces the hard wired "20" in the strength formulation, |
252 |
|
long overdue |
253 |
|
- SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012) |
254 |
|
parameterization of tensil stress for fast ice (does not do anything yet) |
255 |
|
o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method |
256 |
|
for LSR: move checking overlaps out of JFNK-if-block |
257 |
|
o pkg/atm_phys: |
258 |
|
- move copy of grid and dynamical fields out of atm_phys_driver.F into |
259 |
|
new S/R ATM_PHYS_DYN2PHYS. |
260 |
|
- fix level height for Linear Free-Surf case (to be consistent with |
261 |
|
fixed-in-time pressure levels). |
262 |
|
o pkg/mom_common (bottomdrag): |
263 |
|
- average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center |
264 |
|
to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG; |
265 |
|
update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag. |
266 |
|
o pkg/shelfice (u/v_drag): |
267 |
|
- add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG; |
268 |
|
- use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F |
269 |
|
(now similar to shelfice_u_drag.F) |
270 |
|
- remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG |
271 |
|
from mom_vecinv.F (similar to mom_fluxform calls). |
272 |
|
o pkg/mom_common (bottomdrag): |
273 |
|
- add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG; |
274 |
|
- add options for alternative discretisation of velocity norm in quadratic |
275 |
|
bottom drag: averaging of grid-cell-center KE to U.point and V.point |
276 |
|
(selectBotDragQuadr=0, original code) can produce noisy patterns; this |
277 |
|
improves when averaging only the other component (e.g. vVel for U bottom |
278 |
|
drag) using wet-point method (selectBotDragQuadr=2) or not (=1). |
279 |
|
- add options (bottomVisc_pCell) to account for partial-cell in bottom |
280 |
|
friction (no-slip BC) thus getting the true distance from the bottom; |
281 |
|
off by default since this also reduces model stability (explicit bottom |
282 |
|
friction). Changes produce different machine truncation with linear-drag |
283 |
|
+ no-slip BC: update output of experiments exp4.stevens (10 digits) and |
284 |
|
front_relax (bvp & mxl, 10 & 11 digits). |
285 |
|
o model/src & mom pkgs: |
286 |
|
- add one more level to vertical viscosity local arrays (Nr+1, previously Nr) |
287 |
|
since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k |
288 |
|
- for now and until vertical mixing scheme are updated to fill up level Nr+1, |
289 |
|
just copy level Nr value to level Nr+1. |
290 |
|
o doc: |
291 |
|
- add notes form Abhisek Chakraborty on how to close Heat & Salt budgets. |
292 |
|
o pkg/streamice: |
293 |
|
- shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F, |
294 |
|
SHELFICE.h: move array shelficemass to init_varia, initialise |
295 |
|
from array shelficemassinit, which is set in init_fixed and |
296 |
|
has option to be set from file; introduce array |
297 |
|
shelficeMassDynTend array, set thru file in init_fixed |
298 |
|
- NEW FILE: shelfice_step_icemass.F: update shelficemass from either |
299 |
|
shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in |
300 |
|
pkg/streamice |
301 |
|
- shelfice_thermodynamics.F: call shelfice_step_icemass if |
302 |
|
SHELFICEMassStepping = .true. |
303 |
|
- shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f |
304 |
|
|
305 |
|
checkpoint65h (2014/12/17) |
306 |
|
o verification/global_ocean.90x40x15, global_ocean_ebm: |
307 |
|
- update to generic controls. |
308 |
|
o pkg/ctrl: |
309 |
|
- ctrl_map_ini_genarr.F: test for igen>0 |
310 |
|
- ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D. |
311 |
|
- move gentim2d part of ctrl_map_ini_genarr.F to |
312 |
|
new separate routine : ctrl_map_ini_gentim2d.F |
313 |
|
- ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F: |
314 |
|
add time variable weights and cyclic controls (time mean, |
315 |
|
seasonal cycle, etc) capabilities to gentim2d |
316 |
|
o pkg/ecco: |
317 |
|
- move reading of error, conversion to weights from |
318 |
|
ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei) |
319 |
|
o global_oce_llc90, cs32: |
320 |
|
- activte sbo. |
321 |
|
- CTRL_SIZE.h : add maxCtrlProc. |
322 |
|
- activate the new genctrl capabilities. |
323 |
|
- update following reorganization of global_oce_input_fields.tar.gz |
324 |
|
o pkg/ctrl/ctrl_ad_diff.list: |
325 |
|
- add missing ctrl_init_rec.f |
326 |
|
o tools/OAD_support/keepOriginal: |
327 |
|
- add ctrl_init_rec.F |
328 |
|
o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F: |
329 |
|
- avoid recomputations of xx_gentim2d_dummy. |
330 |
|
o momentum diagnostics: |
331 |
|
- move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and |
332 |
|
mom_vecinv.F to timestep.F (to include Smag-3D contribution). |
333 |
|
o pkg/seaice/seaice_lsr.F: |
334 |
|
- fix computation of BU/BV, make sure they are non-zero, only necessary |
335 |
|
for cubed sphere exchanges and SEAICE_OLx/y>0. |
336 |
|
This makes calling s/r fill_cs_corner_rl obsolete (removed). |
337 |
|
o verification/global_ocean.cs32x15/input.seaice |
338 |
|
- add test for strong implicit coupling and restricted addtive Schwarz |
339 |
|
methods for LSR |
340 |
|
- update results/output.seaice.txt |
341 |
|
o verification/tutorial_global_oce_biogeo: |
342 |
|
- AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up) |
343 |
|
and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK); |
344 |
|
update output_adm,_oadm,_tlm.txt |
345 |
|
o pkg/dic: |
346 |
|
- change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h |
347 |
|
- add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn |
348 |
|
for tracer 1 & 2 is set (to avoid double counting of dilution effect). |
349 |
|
o verification/tutorial_global_oce_biogeo: |
350 |
|
- AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since |
351 |
|
dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ; |
352 |
|
update output_adm,_oadm,_tlm.txt |
353 |
|
o eesupp/src: |
354 |
|
- add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F) |
355 |
|
and call it in seaice_lsr when using nonzero SEAICE_OLx/y |
356 |
|
o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing |
357 |
|
LSR (following Hutchings et al. 2004) |
358 |
|
- introduce zetaZ as a global variable (requires adjustments in |
359 |
|
seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ |
360 |
|
in seaice_calc_viscosities.F |
361 |
|
- new flag SEAICEuseStrImpCpl (default off) |
362 |
|
- add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the |
363 |
|
momentum equations |
364 |
|
- JFNK-solver (preconditioner) adjusted to allow using this method |
365 |
|
(where it does not have any positive effect) |
366 |
|
o pkg/seaice |
367 |
|
- add overlap for restrictive additive Schwartz method also to LSR, but |
368 |
|
turn it off by default (because it only seems to work for non-cubed |
369 |
|
sphere/llc topologies) |
370 |
|
o pkg/autodiff |
371 |
|
- add extra exchanges in addummy_in_steppging also for mnc output |
372 |
|
o pkg/seaice: |
373 |
|
- add extra exchanges before dumping adjoint fields in seaice_ad_dump.F |
374 |
|
to avoid stripes in the adjoint output (similar to addummy_in_stepping.F) |
375 |
|
o pkg/obcs: |
376 |
|
- add option to specify domain-connected piece Id along OB though files |
377 |
|
(for now, only used to diagnose PhiVel; default =1 -> global correction) |
378 |
|
- modify obcs_diag_balance.F to process each connected-part separately; |
379 |
|
exclude OB where Id = 0 but keep the full divergence there (-> constant |
380 |
|
Psi along this portion of OB and all inflow derived from grad(Phi)) |
381 |
|
- add example of OB-conect files in verification/so_box_biogeo/input. |
382 |
|
o pkg/diagnostics: |
383 |
|
- improve treatment of Open-Boundaries in Velocity-Potential calculation: |
384 |
|
a) use non zero matrix element across OB and solve for Phi 1 grid point |
385 |
|
outside OB (i.e, where tracer OBCS are applied). |
386 |
|
b) global imbalance of inFlow/outFlow across OB: instead of modifying |
387 |
|
velocity across OB, spread it uniformly along the OB in the RHS. |
388 |
|
|
389 |
|
checkpoint65g (2014/11/19) |
390 |
|
o pkg/diagnostcis: |
391 |
|
- add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param |
392 |
|
o pkg/my82,pp81,kl10: |
393 |
|
- fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D |
394 |
|
field diffKr as background diffusivity to set minimum diffusivity value. |
395 |
|
o pkg/seaice: |
396 |
|
- add new parameter SEAICEuseEVPrev (for revisited EVP by |
397 |
|
Bouillon et al 2013) |
398 |
|
- add SEAICE_evpAlpha/Beta to namelist |
399 |
|
- modify seaice_evp code to able to use SEAICEuseEVPrev. These changes |
400 |
|
involve trivial re-ordering of divisions/multiplications that should not |
401 |
|
have any effects, but ... they do change the results of lab_sea.hb87 so |
402 |
|
that only 2 digits of agreement remain, in line with the general |
403 |
|
instability/fragility of the evp-code. For now, I do not care and just |
404 |
|
update the verification experiment |
405 |
|
o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc) |
406 |
|
- remove xx_genarr2d_numsmooth etc |
407 |
|
- use xx_genarr2d_preproc etc instead |
408 |
|
- carry out smooth_correl2D at initialization stage rather than during |
409 |
|
time stepping. |
410 |
|
- get smoothOpNb from xx_gentim2d_preproc |
411 |
|
o global_oce_cs32 : |
412 |
|
- add test of generic ecco capabilities. |
413 |
|
o pkg/exf/exf_getsurfacefluxes.F : |
414 |
|
- add to tmpUE/tmpVN rather than re-initializing them (conventional behavior). |
415 |
|
o pkg/ctrl,ecco : |
416 |
|
- omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED |
417 |
|
is defined. |
418 |
|
o pkg/seaice: add diagnostics for Delta (deformation parameter) |
419 |
|
o model/src: |
420 |
|
- when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical |
421 |
|
diffusivity (background) is specified but ignored. |
422 |
|
o verification: |
423 |
|
- in testreport, convert hostname to lower case for default output dir name |
424 |
|
o model, pkg : add useCTRL, useECCO parameters (on/off run time switch). |
425 |
|
o pkg/dic: add modifications from Hajoon: |
426 |
|
- add iron sedimentation flux function of the flux of PO4 out of bottom layer |
427 |
|
- light attenuation: add self-shading effect by climatological Chlorophyll |
428 |
|
(read from file). |
429 |
|
o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also |
430 |
|
compiles when SEAICE_ALLOW_DYNAMICS is undefined |
431 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate |
432 |
|
AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than |
433 |
|
ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted, |
434 |
|
approach where CPP_OPTIONS.h includes an omnipotent |
435 |
|
ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h'). |
436 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where |
437 |
|
ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong. |
438 |
|
o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF |
439 |
|
to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included |
440 |
|
(it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...) |
441 |
|
o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl : |
442 |
|
add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed |
443 |
|
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h |
444 |
|
- AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h |
445 |
|
- CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc |
446 |
|
o pkg/ctrl,ecco,exf : |
447 |
|
- remove variables associated with NON-generic costs, |
448 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
449 |
|
- remove NON-generic NON-obcs controls, |
450 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
451 |
|
o pkg/ctrl : added ctrl_local_params.h |
452 |
|
o pkg/ecco : added ecco_local_params.h |
453 |
|
o verification : added ECCO_CTRL_DEPRECATED to most as and oad |
454 |
|
experiments, which will progressively be removed once the |
455 |
|
experiments are revised to use only generic controls/costs. |
456 |
|
|
457 |
|
checkpoint65f (2014/10/13) |
458 |
|
o pkg/ctrl, ecco, seaice : minor changes in headers |
459 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic |
460 |
|
cost function and control capabilities added since checkpoint65c. |
461 |
|
o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h. |
462 |
o pkg/ecco: increase modularity and improve logic |
o pkg/ecco: increase modularity and improve logic |
463 |
- ecco_toolbox.F (new) : basic operations that are often used |
- ecco_toolbox.F (new) : basic operations that are often used, |
464 |
(for now, ecco_toolbox.F simply contains function ecco_zero). |
including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk, |
465 |
|
ecco_addcost, ecco_add, ecco_div, ecco_readbar. |
466 |
- cost_gencal.F (new) : determine filnames and records. |
- cost_gencal.F (new) : determine filnames and records. |
467 |
- cost_gendif.F (new) : compute masked model-data difference. |
- cost_genread.F, cost_generic.F : condense code using ecco_toolbox. |
|
- cost_genread.F : use ecco_zero to initialize field to 0s. |
|
468 |
- cost_generic.F : use spzeroloc rather than hard-coded -9999, |
- cost_generic.F : use spzeroloc rather than hard-coded -9999, |
469 |
and exploit the above functions leading to more compact code. |
and exploit the above functions leading to more compact code. |
470 |
|
- cost_genread.F : rm un-necessary arguments, re-arrange args order. |
471 |
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, |
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, |
472 |
using_ers, using_gfo, using_mdt is now only defined within gencost) |
using_ers, using_gfo, using_mdt is now only defined within gencost) |
473 |
o pkg/ecco: extend generic cost capabilities |
o pkg/ecco: extend generic cost capabilities |
474 |
- pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost |
- pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost |
475 |
capabilities via gencost_preproc (+ _c,_i,_r related params), |
capabilities via gencost_preproc (+ _c,_i,_r related params), |
476 |
gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod, |
gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod, |
477 |
gencost_outputlevel arguments to cost_generic |
gencost_outputlevel arguments to cost_generic |
478 |
- pkg/ecco/cost_genread.F (new) : interface between cost_generic |
- pkg/ecco/cost_genread.F (new) : interface between cost_generic |
490 |
- pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs |
- pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs |
491 |
o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA |
o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA |
492 |
o pkg/ecco: internal re-organization |
o pkg/ecco: internal re-organization |
493 |
- resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl |
- resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl |
494 |
(rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter, |
(rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter, |
495 |
mv relevant variables definition from ecco_cost.h to ecco.h, |
mv relevant variables definition from ecco_cost.h to ecco.h, |
496 |
make sure gencost routines only include ecco.h) |
make sure gencost routines only include ecco.h) |
497 |
- throughout : add missing CCP switches, rm unused variables, |
- throughout : add missing CCP switches, rm unused variables, |
498 |
and rm un-necessary CPP switches |
and rm un-necessary CPP switches |
499 |
- throughout gencost routines : replace modelstartdate with |
- throughout gencost routines : replace modelstartdate with |
500 |
gencost_startdate when needed |
gencost_startdate when needed |
501 |
- cost_bp_read.F : use arguments, instead of common blocs |
- cost_bp_read.F : use arguments, instead of common blocs |
502 |
so that it can be used also by (new) cost_gencost_bpv4.F |
so that it can be used also by (new) cost_gencost_bpv4.F |
503 |
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0 |
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0 |
504 |
- ecco_phys.F : compute etanFull |
- ecco_phys.F : compute etanFull |
505 |
- ecco_readparms.F : rename using_topex as using_tpj, add |
- ecco_readparms.F : rename using_topex as using_tpj, add |
817 |
nearly a factor of 10 (but keep in mind there is mostly seaice code in |
nearly a factor of 10 (but keep in mind there is mostly seaice code in |
818 |
this experiment): |
this experiment): |
819 |
> size mitgcmuv_ad |
> size mitgcmuv_ad |
820 |
text data bss dec hex |
text data bss dec hex |
821 |
5100659 1216 220458952 225560827 d71c8fb |
5100659 1216 220458952 225560827 d71c8fb |
822 |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
823 |
but only a moderate increase of 36% for global_ocean.cs32x15: |
but only a moderate increase of 36% for global_ocean.cs32x15: |
824 |
text data bss dec hex |
text data bss dec hex |