4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/ebm: |
8 |
|
- fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file. |
9 |
|
- add multi-threaded test for verification exp. global_ocean_ebm |
10 |
|
|
11 |
|
checkpoint63b (2011/08/29) |
12 |
|
o pkg/ebm: |
13 |
|
- fix sign of runoff; |
14 |
|
- update directly forcing fields (Qnet,EmPmR) to use standard |
15 |
|
external_forcing_surf.F (remove ebm_forcing_surf.F); |
16 |
|
- avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F); |
17 |
|
- set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm) |
18 |
|
and apply relaxation towards corresponding SST field (2-D map or ZonAver). |
19 |
|
- update global_ocean_ebm parameters file data and update output (fwd+ad). |
20 |
|
o verification/matrix_example: |
21 |
|
- split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for |
22 |
|
MPI and mutlti-threaded testing. |
23 |
|
o pkg/matrix: |
24 |
|
- change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ; |
25 |
|
- fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter); |
26 |
|
- fix for multi-threaded (remove DATA statement); |
27 |
|
- use standard DIFFERENT_MULTIPLE function; |
28 |
|
- add MATRIX_OPTIONS.h |
29 |
|
o verification/matrix_example: |
30 |
|
To allow to split the domain in several tiles, change the domain size |
31 |
|
from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on |
32 |
|
Western side) of land points. |
33 |
|
o (*_)write_pickup: |
34 |
|
- fix few bugs in mypackage_read/write_pickup.F |
35 |
|
- in MDS_WR_METAFILES calls, replace "myTime" by a local copy into |
36 |
|
array of length 1 (was caught by compiler syntax-check). |
37 |
|
o pkg/diagnostics (velocity potential solver): |
38 |
|
- fix initialisation of main diagonal matrix (for overlap values) |
39 |
|
o tools/build_options: |
40 |
|
- towards single optfile for MPI and non-MPI built: merge few +mpi optfile |
41 |
|
into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11) |
42 |
|
- linux_amd64_gfortran: merge +mpi_generic version into standard optfile: |
43 |
|
* move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ; |
44 |
|
* FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list; |
45 |
|
and use "-devel" testreport option for standard testing on baudelaire. |
46 |
|
o pkg/grdchk: |
47 |
|
- Assume that all gradient-check position are within the same tile |
48 |
|
corresponding to global indices (iGloTile,jGloTile) and that |
49 |
|
positions (i,j indices or nbeg) are local to this tile; |
50 |
|
- set tile local-indices and proc. number according to tile global-indices; |
51 |
|
- remove grdchkwhichproc from namelist (retired param); |
52 |
|
- send adjoint gradient to all procs so that all procs print it to STDOUT; |
53 |
|
- switch on MPI test for global_ocean.90x40x15 AD test experiment. |
54 |
|
o adding package bbl (Bottom Boundary Layer) |
55 |
|
description in MITgcm/pkg/bbl/bbl_description.tex |
56 |
|
example/test experiment in MITgcm_contrib/bbl |
57 |
|
o adjoint verifications |
58 |
|
- changed 5 experiments to multi-tiles |
59 |
|
* global_ocean.90x40x15 |
60 |
|
* obcs_ctrl |
61 |
|
* offline_exf_seaice |
62 |
|
* tutorial_dic_adjoffline |
63 |
|
* tutorial_tracer_adjsens |
64 |
|
changed reference output for those that crossed tile boundaries |
65 |
|
(changed choices of gradient check positions) |
66 |
|
- with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi) |
67 |
|
- temporary bug fix in grdchk_loc.F for obcs |
68 |
|
o genmake2 & testreport |
69 |
|
- add target "obj" (just for OBJFILES files) to Makefile; |
70 |
|
- add option to specify FEXTRAFLAGS on command line. |
71 |
|
o pkg/mypackage: |
72 |
|
- remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS |
73 |
|
|
74 |
|
checkpoint63a (2011/08/02) |
75 |
|
o pkg/diagnostics (velocity potential): |
76 |
|
- fix velocity-potential calculation when using OBCS: balance net inflow |
77 |
|
at each level (new S/R OBCS_DIAG_BALANCE). |
78 |
|
- fix some of the problems with OBCS in stream-function calculation. |
79 |
|
o pkg/exf/exf_readparms.F |
80 |
|
- make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF, |
81 |
|
EXF_NML_OBCS) more consistent, so that you need not have these lists |
82 |
|
in data.exf when they are not used. |
83 |
|
o optim/optim_readdata.F: |
84 |
|
- add some output about obcs variables that might help debugging |
85 |
|
- add a check about nvarlength |
86 |
|
o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec |
87 |
|
o pkg/diagnostics (velocity potential): |
88 |
|
- fix mask for OBCS (still problems in stream-function with OBCS); |
89 |
|
- add specific parameter (default = main code CG2D params) for solver; |
90 |
|
- in case of poor convergence, use solution corresponding to lowest residual. |
91 |
|
o pkg/seaice/seaice_growth.F: small changes that permit vectorizable |
92 |
|
adjoint code. In general statements like tmpscal=fld(i,j) are problematic |
93 |
|
and should be avoided where possible. |
94 |
|
o model/src (rStar): |
95 |
|
- include r* effect on reference-state (PhiRef) in totPhiHyd |
96 |
|
(so that it's really the potential anomaly at the cell center); |
97 |
|
affect solution only if z* with full pressure in EOS. |
98 |
|
- test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and |
99 |
|
update output (because of z* in totPhiHyd and viscA4 changes); |
100 |
|
- keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly |
101 |
|
@ constant r) until interpolation at constant r is implemented. |
102 |
|
o pkg/diagnostics |
103 |
|
- fix RCENTER diagnostics in case cell center is not at interface middle |
104 |
|
o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use |
105 |
|
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies |
106 |
|
that THETA and SALT are "conservative temperature" and "absolute |
107 |
|
salinity" |
108 |
|
o pkg/ctrl |
109 |
|
- fix computation of endrec in s/r ctrl_init_rec |
110 |
|
- ctrl_pack/unpack_*: remove unused variables and some obsolete code |
111 |
|
o pkg/seaice/seaice_growth.F |
112 |
|
- fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code, |
113 |
|
remove then obsolete STORE directives |
114 |
|
- fix STORE directives for tice and tices, so that only the |
115 |
|
appropriate part of the fields are stored (and not the entire |
116 |
|
field); update global_ocean.cs32x15.seaice AD output. |
117 |
|
- cosmetic changes: adjust CPP flags and indentation for better |
118 |
|
legibilty |
119 |
|
o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by |
120 |
|
Chris Wilson) |
121 |
|
o pkg/gmredi: |
122 |
|
Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF), |
123 |
|
and test it in verification exp. "front_relax.bvp" (update output.bvp.txt) |
124 |
|
|
125 |
|
checkpoint63 (2011/07/11) |
126 |
|
o pkg/exch2: |
127 |
|
- rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h |
128 |
|
- exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the |
129 |
|
(2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y |
130 |
|
increments, calculates Cumul-Sum @ tile origin and sends results to each tile. |
131 |
|
o pkg/diagnostics: |
132 |
|
- deal with pairs of post-processed diags which are computed together; in |
133 |
|
particular, re-order list of diags within 1 file to save 2nd computation. |
134 |
|
- add S/R to compute velocity stream-function (called after velocity-potential |
135 |
|
calculation) from divergence free transport -> new diagnostics "PsiVEL". |
136 |
|
- add parameter to select grid-point location where PsiVEL == 0. |
137 |
|
o eesupp/src: |
138 |
|
new S/R to calculate cumulated sum on tiled array, corner grid-cell location |
139 |
|
(specific S/R needed with exch2 topology - for now, just print an error msg) |
140 |
|
o pkg/shelfice |
141 |
|
- Implement friction velocity-dependent transfer coefficients following |
142 |
|
Holland and Jenkins, JPO, 1999 |
143 |
|
Original code by M. Losch with small modifs. |
144 |
|
Enable with CPP option SHI_ALLOW_GAMMAFRICT |
145 |
|
and runtime flag SHELFICEuseGammaFrict |
146 |
|
o verification lab_sea & global_ocean.cs32x15: |
147 |
|
- use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local): |
148 |
|
does not miss some dependencies (but is slower) and also works with many files |
149 |
|
(default makedepend limitation for AD built). |
150 |
|
- use cyrus_makedepend in adjustment.128x64x1 (so that it still tested). |
151 |
|
o pkg/diagnostics: |
152 |
|
- add run-time parameter "useMissingValue" (def=False) to fill land-point |
153 |
|
(i.e., where mask=0) with MissingValue ; used only in MNC output file. |
154 |
|
This replaces CPP-option DIAGNOSTICS_MISSING_VALUE. |
155 |
|
- Extend the use of "missing_value" setting from data.diagnostics for the case |
156 |
|
of counter-diagnostics (where fraction-weight is zero). This applies both to |
157 |
|
MNC and MDS output files. |
158 |
|
o pkg/seaice/seaice_growth.F: |
159 |
|
- add 'a priori' cap of latent heat flux based on actual mass considerations |
160 |
|
when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the |
161 |
|
non-legacy seaice_solve4temp. |
162 |
|
- add diagnostic of the residual sublimation freshwater flux (the freshwater |
163 |
|
flux taken from the ocean if the total actual latent heat fluxes exceed |
164 |
|
the maximum) |
165 |
|
- remove the CPP switch around the *_FWbySublim unit change and move diagnostic |
166 |
|
fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F. |
167 |
|
- add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef |
168 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim). |
169 |
|
- bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET. |
170 |
|
- bug fix : missing part to Martin's r_FWbySublim pathological case fix. |
171 |
|
o verification 1D_ocean_ice_column: |
172 |
|
made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet |
173 |
|
update results |
174 |
|
o pkg/diagnostics: |
175 |
|
- Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P') |
176 |
|
which are not filled-up but computed from other diags ; In this case, the mate |
177 |
|
diag points to the primary (filled-up) diag to used for post processing. |
178 |
|
- Update Velocity-potential computation using post-processed diag framework. |
179 |
|
==> Change the ordering of fields and time-periods in MDS output file |
180 |
|
when using periodic averaging: now writes one time record with the full set |
181 |
|
of fields for this time period, then the next time reccord (it used to be |
182 |
|
one field with the full set of time records then the next field). |
183 |
|
Note: this is now similar to NetCDF (MNC) output file. <== |
184 |
|
|
185 |
|
checkpoint62z (2011/06/21) |
186 |
|
o adjoint monitor: |
187 |
|
- Add adjoint monitor output for packages exf, seaice |
188 |
|
and update relevant testreport output |
189 |
|
o pkg/seaice: |
190 |
|
- re-order diags inits so that they appear in order in available_diagnostics.log |
191 |
|
- added diags: hsnow thermo. rates of change, area preceeding ridiging process, |
192 |
|
area/heff/hsnow preceeding thermodynamic growth/melt. |
193 |
|
- modified diag: SIdA; output actual effect, as the description states. |
194 |
|
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
195 |
|
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
196 |
|
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
197 |
|
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
198 |
|
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
199 |
|
- added diagnostics for seaice generic tracers (SItr*). |
200 |
|
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
201 |
|
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
202 |
|
I. Fenty: 18-Jun-2011: |
203 |
|
Minor changes to seaice package: |
204 |
|
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
205 |
|
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
206 |
|
- Differentiated "regularization variables" from "floor variables" |
207 |
|
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
208 |
|
* hiceMin became SEAICE_hice_reg (old hiceMin) |
209 |
|
(with _reg meaning regularization variable) |
210 |
|
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
211 |
|
so as to ensure energy conservation when going between phases |
212 |
|
- A22 was not used anywhere |
213 |
|
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
214 |
|
well-boundedness and smooth adjoint in seaice_growth.F |
215 |
|
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
216 |
|
because the old regularization always set heffActual >= 0.05 cm |
217 |
|
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
218 |
|
on AREA when HEFF > 0. |
219 |
|
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
220 |
|
requiring that DISABLE_AREA_FLOOR *not* be defined |
221 |
|
Affected verifications: |
222 |
|
- 1D_ocean_ice_column (output.txt output_adm.txt) |
223 |
|
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
224 |
|
o pkg/diagnostics: |
225 |
|
- move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R). |
226 |
|
- rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument |
227 |
|
(was _RL, now integer) with option = 0 to retrieve all levels. |
228 |
|
- add pieces of code to compute velocity potential at each level (new diagnostics |
229 |
|
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
230 |
|
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
231 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
232 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
233 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
234 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
235 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
236 |
|
o model/src (rStar): |
237 |
|
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
238 |
|
affect solution only if z* with full pressure in EOS; |
239 |
|
update output of test-exp global_ocean.90x40x15. |
240 |
|
o pkg/seaice: |
241 |
|
- introduce siEps=1e-5 parameter |
242 |
|
- use areaMax in AREA update (part 4), consistent with ridging step (part 2.5). |
243 |
|
- re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code. |
244 |
|
- introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer. |
245 |
|
For now it covers, and was tested for, ice salinity and age (attached to HEFF), |
246 |
|
as well as ice cover age and ridging index (attached to AREA). |
247 |
|
For now the run time parameters (in data.seaice/SEAICE_PARM03) are |
248 |
|
SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA'). |
249 |
|
Up to SItrMaxNum=3 tracers can be used simultaneously. |
250 |
|
o pkg/salt_plume: |
251 |
|
-introduce SPsalFRAC run time parameter that sets the fraction of the |
252 |
|
salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically) |
253 |
|
that gets vertically redistributed (fluxed down) by pkg/salt_plume. |
254 |
|
o model debug options: |
255 |
|
- Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored |
256 |
|
in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h). |
257 |
|
- Refine debug-msg printing selection (3 new levels): |
258 |
|
debugMode : controls printing of debug messages (sequence of S/R calls). |
259 |
|
debugLevel : controls printing of algorithm-relevant auxiliary/debug messages |
260 |
|
debLevZero = 0 ; /* level of disabled aux. msg printing */ |
261 |
|
debLevA = 1 ; /* level of minimum aux. msg printing */ |
262 |
|
debLevB = 2 ; /* level of low aux. print (report read-file opening)*/ |
263 |
|
debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */ |
264 |
|
debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */ |
265 |
|
debLevE = 5 ; /* level of extensive debug printing */ |
266 |
|
New debugLevel default: with default debugMode value (=F), |
267 |
|
= 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.; |
268 |
|
and if debugMode=T, default debugLevel = 4 (debLevD). |
269 |
|
Relation with previous settings: |
270 |
|
debLevB (=2) corresponds to former debLevA (=1) |
271 |
|
debLevD (=4) corresponds to former debLevB (=2) |
272 |
|
Note: |
273 |
|
a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before); |
274 |
|
b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs); |
275 |
|
to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5) |
276 |
|
- Add new parameter (printResidualFreq, read from PARM02 namelist) to print |
277 |
|
detailed CG solvers convergence; off (=0) by default, except if debugLevel=5. |
278 |
|
o pkg/obcs: |
279 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
280 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
281 |
|
o pkg/thsice: |
282 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
283 |
|
2nd layer seaice sublimation (unlikely to happen) |
284 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
285 |
|
done in gad_advection & seaice_advection). |
286 |
|
o adjoint: |
287 |
|
bug fix spotted by Gael Forget: |
288 |
|
seaice_advection and thsice_advection still had |
289 |
|
legacy CPP options to avoid CS corner updates for adjoint |
290 |
|
o pkg/seaice: |
291 |
|
=> Change some of the defaults (2011/05/29): |
292 |
|
- change SEAICEuseFluxForm default (from False to True) |
293 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
294 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
295 |
|
avection scheme is used without any diffusion. |
296 |
|
also: |
297 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
298 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
299 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
300 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
301 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
302 |
|
update results of test exp.: |
303 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
304 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
305 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
306 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
307 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
308 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
309 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
310 |
|
o pkg/seaice/seaice_growth.F: |
311 |
|
- use Ian Fenty's capping formulas for actual ice |
312 |
|
thickness thoughout EVOLUTION branch. |
313 |
|
- put treatment pathological case #2) in CPP brackets |
314 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
315 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
316 |
|
o pkg/seaice: |
317 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
318 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
319 |
|
also pass fac as a param, which can be 1. (to update the tendency |
320 |
|
field) or the time step (to update the field itself). |
321 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
322 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
323 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
324 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
325 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
326 |
|
o pkg/seaice: |
327 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
328 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
329 |
|
to just compute the laplacian of input-field. |
330 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
331 |
|
- fix flux-form version in diffus.F to conserve tracer. |
332 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
333 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
334 |
|
|
335 |
|
checkpoint62y (2011/05/26) |
336 |
|
o pkg/seaice: |
337 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
338 |
|
a_QSWbyATM_cover in qnet (as it should be). |
339 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
340 |
|
(output.seaice.txt output_adm.seaice.txt). |
341 |
|
o pkg/seaice + obcs: |
342 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
343 |
|
equivalent of assuming no tracer gradient outside the OB region. |
344 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
345 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
346 |
|
after changes above); |
347 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
348 |
|
only at OB location (instead of over a band of OLx width). |
349 |
|
o pkg/seaice: |
350 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
351 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
352 |
|
o pkg/obcs: |
353 |
|
- split header file "OBCS.h" into 4 separated files: |
354 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
355 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
356 |
|
(contain no conditional statement which depends on OBCS options). |
357 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
358 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
359 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
360 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
361 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
362 |
|
o pkg/obcs: |
363 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
364 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
365 |
|
over a band of OLx width) |
366 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
367 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
368 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
369 |
|
o obcs in model/src: |
370 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
371 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
372 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
373 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
374 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
375 |
|
- zero out velocity outside OB interior region: This has no effect on |
376 |
|
the solution but just to prevent unrealistic velocity outside OB. |
377 |
|
o obcs and non-lin free-surf: |
378 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
379 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
380 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
381 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
382 |
|
update results of test-exp. exp4(nlfs). |
383 |
|
o exp4 (nlfs) test-exp: |
384 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
385 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
386 |
|
o obcs and 2d/3d solver norm: |
387 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
388 |
|
and outside OB interior region (will allow to place OB further inside the |
389 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
390 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
391 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
392 |
|
e.g. in tutorial_plume_on_slope. |
393 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
394 |
|
o pkg rbcs: |
395 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
396 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
397 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
398 |
|
o pkg/shelfice/shelfice_init_fixed.F |
399 |
|
fix CPP-flag combinations |
400 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
401 |
|
* update/change/correct ice age calculations |
402 |
|
* add age updates for pathological cases |
403 |
|
Probably needs more testing... |
404 |
|
|
405 |
|
checkpoint62x (2011/05/13) |
406 |
|
o pkg/mom_vecinv: |
407 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
408 |
|
to zero-out (outside OB) gradient of vorticity. |
409 |
|
o verification exp.: |
410 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
411 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
412 |
|
o pkg/obcs: |
413 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
414 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
415 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
416 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
417 |
|
variables needs its own mask. |
418 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
419 |
|
from the first guess (zero) in analogy to other control variables |
420 |
|
o pkg/shelfice: |
421 |
|
- start basic adjoint |
422 |
|
o pkg/ctrl: |
423 |
|
- remove extra 2D field "for good measure" when initializing in |
424 |
|
ctrl_set_globfld_[xy/xz/yz].F |
425 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
426 |
|
- improve error messages in ctrl_set_unpack_* |
427 |
|
o OBC implementation in momentum: |
428 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
429 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
430 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
431 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
432 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
433 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
434 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
435 |
|
Update output of experiment dome and exp4 (+nlfs). |
436 |
o exp4 test-exp: |
o exp4 test-exp: |
437 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
438 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
439 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
440 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
441 |
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
442 |
and biharmonic-viscosity ; prescribe time varying OB but without pkg/exf. |
and biharmonic-viscosity ; also use prescribed time varying OB. |
443 |
o pkg/obcs: |
o pkg/obcs: |
444 |
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
445 |
o model/src: |
o model/src: |