4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o move from external_forcing_surf.F to ini_forcing.F |
8 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
9 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
10 |
|
o Freshen up a bit hs94.1x64x5, notably: |
11 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add exactConserv=.TRUE. |
12 |
|
o pkg/generic_advdiff: |
13 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
14 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
15 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
16 |
|
this uses a dynamically allocated internal state data structure |
17 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
18 |
|
and requires a fortran 90 compiler |
19 |
|
|
20 |
|
checkpoint59q |
21 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
22 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
23 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
24 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
25 |
|
- change EOS (POLY3 --> JMD95Z) |
26 |
|
- use Bryan-Lewis vertical diffusivity |
27 |
|
- use multidimensional advection |
28 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
29 |
|
- change a couple of parameters in dic pkg |
30 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
31 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
32 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
33 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
34 |
|
o implementation of TAF directives for gchem,cfc,dic |
35 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
36 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
37 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
38 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
39 |
|
--> changes results in exp4, seaice_obcs |
40 |
|
o tutorial_deep_convection : |
41 |
|
update the set-up and increase resolution and domain size ; start |
42 |
|
from pseudo initial conditions = output at t=120mn in order to see |
43 |
|
something happening when running testreport. |
44 |
|
o pkg/seaice: add os7mp as an advection scheme |
45 |
|
add check for advection schemes |
46 |
|
add a flag for restoring T and S underneath sea ice |
47 |
|
o pkg/my82: add netcdf-support and diagnostics |
48 |
|
o thsice pkg: |
49 |
|
- Now hsMax limits snow height by turning it into ice following |
50 |
|
flooding scheme (and now conserving energy) |
51 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
52 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
53 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
54 |
|
|
55 |
|
checkpoint59p |
56 |
|
o gchem / dic / cfc : |
57 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
58 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
59 |
|
- various re-arrangement in initialisation & header file ; |
60 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
61 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
62 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
63 |
|
before) providing pickupStrictlyMatch is set to False. |
64 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
65 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
66 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
67 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
68 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
69 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
70 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
71 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
72 |
|
scheme to use for vorticty-term ; |
73 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
74 |
|
(with default selectVortScheme, return to original discretisation) |
75 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
76 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
77 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
78 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
79 |
|
also fix diagnostics VISCAHW & VISCA4W. |
80 |
|
|
81 |
|
checkpoint59o |
82 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
83 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
84 |
|
move a few statemens out the main loop into separate loops |
85 |
|
o pkg/shelfice: |
86 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
87 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
88 |
|
rhoConstFresh=rhoConst (by accident) |
89 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
90 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
91 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
92 |
|
- convert potential temperature into in-situ temperature. This changes the |
93 |
|
isomip tests => update tests |
94 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
95 |
|
writing a pickup at the last timestep |
96 |
|
o tools/mpack-1.6 : |
97 |
|
- disable automake (not working) and autoconf (not needed). |
98 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
99 |
|
also cleaner with much less compilation warnings. |
100 |
|
o pkg/profiles: |
101 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
102 |
|
(for "less than 32 characters name" compiler requirement) |
103 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
104 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
105 |
|
o pkg/diagnostics (stats-diags): |
106 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
107 |
|
o genmake2: replace (4 times) |
108 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
109 |
|
with |
110 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
111 |
|
echo $COMM >> genmake_warnings |
112 |
|
$COMM >> genmake_warnings 2>&1 |
113 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
114 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
115 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
116 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
117 |
|
o pkg/ctrl: |
118 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
119 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
120 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
121 |
|
|
122 |
|
checkpoint59n |
123 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
124 |
|
number in dedicate array "hdiag": |
125 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
126 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
127 |
|
- many small changes (integer format) for large number of diagnostics |
128 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
129 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
130 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
131 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
132 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
133 |
|
geographical coordinates according to the inverse of the rotation defined |
134 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
135 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
136 |
|
Naturally, this feature does not work with all packages, so some |
137 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
138 |
|
profiles), because there the coordinates are assumed to be regular |
139 |
|
spherical grid coordinates. |
140 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
141 |
|
- introduce isopycnal diffusion coefficient control. |
142 |
|
o tools/adjoint_options: |
143 |
|
- additional control vector components. |
144 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
145 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
146 |
|
o pkg/mypackage: |
147 |
|
- add example of read/write pickup for state-var ; |
148 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
149 |
|
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
150 |
|
transitions for useExfYearlyFields |
151 |
|
- add new subroutine that determines the file to read from for |
152 |
|
use*YearlyFields = .TRUE. and .FALSE. |
153 |
|
- add a verification experiment to global_with_exf that tests |
154 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
155 |
|
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
156 |
|
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
157 |
|
subroutines (which could be generated from a template, because they are |
158 |
|
almost identical), for now they are included in obcs_prescribe_read.F for |
159 |
|
simplicity |
160 |
|
o pkg/exf: |
161 |
|
- add a little more diagnostic to exf_interp_read (in analogy to |
162 |
|
mds_read_field, can be turned off with debugLevel < debugLevA=1) |
163 |
|
- improve vectorizability of exf_interp for TARGET_NEC_SX, makes code |
164 |
|
ugly but fast by unrolling short inner loops, inserting a unroll=8 |
165 |
|
directive in routine lagran, and splitting a loop and making do while the |
166 |
|
outermost loop (the latter requires the intoduction of index arrays) |
167 |
|
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice |
168 |
|
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver |
169 |
|
http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html |
170 |
|
o verification/seaice_obcs: updated for restart test and latest options |
171 |
|
o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different |
172 |
|
ice rheology (so-called truncated ellipse, that gets rid of tensile stress); |
173 |
|
for now this is only available for the C-grid code and also within |
174 |
|
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
175 |
|
|
176 |
|
checkpoint59m |
177 |
|
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
178 |
|
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
179 |
|
o gad_som : fix flux output (& diagnostics) to have same units as other |
180 |
|
advection scheme fluxes (was previously multiplied by deltaT). |
181 |
|
o added verification/seaice_obcs both to test seaice open boundaries |
182 |
|
and to provide an example matlab scrpt for generating them |
183 |
|
o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume |
184 |
|
o pkg/salt_plume: clean up salt_plume_frac.F to |
185 |
|
remove redundancy in PlumeMethod 1 and 4 |
186 |
|
o pkg/kpp: added saltplume diagnostics |
187 |
|
o pkg/obcs and pkg/seaice: |
188 |
|
- do not set uice and vice to zero when OB*icefile are unspecified |
189 |
|
- OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default |
190 |
|
- moved seaice tracer obcs after call to seaice_growth |
191 |
|
o pkg/salt_plume: added various options for salt plume depth |
192 |
|
criterion and for vertical distribution of the salt |
193 |
|
|
194 |
|
checkpoint59l |
195 |
|
o pkg/ptracers: new version of ptracers pickup: |
196 |
|
read meta file and write only fields which are needed to restart. |
197 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
198 |
|
o pkg/seaice: |
199 |
|
- add timescale for melting due to warm mixed layer as a means of |
200 |
|
setting SEAICE_availHeatFrac more conveniently |
201 |
|
- add a CPP-flag/runtime parameter check for flooding algorithm |
202 |
|
- reformulated availHeat in seaice_growth.F to be independent of AREA |
203 |
|
o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent |
204 |
|
unit changes |
205 |
|
o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint |
206 |
|
o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC |
207 |
|
SX vector computer. |
208 |
|
o pkg/seaice: |
209 |
|
- removed SEAICE_FFIELDS.h and seaice_get_forcing.F |
210 |
|
seaice forcing fields can now be read only through pkg/exf |
211 |
|
- removed some unused halos |
212 |
|
o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP |
213 |
|
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
214 |
|
or U/VICE from U/VWIND before computing U/VSTRESS |
215 |
|
|
216 |
|
checkpoint59k |
217 |
|
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
218 |
|
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
219 |
|
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
220 |
|
all experiments pass when compile with un-initialised var. checking option. |
221 |
|
o added pkg/salt_plume |
222 |
|
o script to test restart (for now, in MITgcm_contrib/jmc_script) |
223 |
|
o pkg/seaice: new read/write pickup version. |
224 |
|
read meta file and write only fields which are needed to restart. |
225 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
226 |
|
o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates) |
227 |
|
o lab_sea.hb87: modify the domain & update output.hb87.txt : |
228 |
|
lat-long grid & no-slip BC in seaice-dynamics produce different sigma12 |
229 |
|
at j=1 & j=Ny+1 : this case is not treated correctly in the restart |
230 |
|
process. Fixed here by closing the domain at the Northern boundary. |
231 |
|
o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD. |
232 |
|
o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing |
233 |
|
a set of consecutive levels in/from a 3-D array. |
234 |
|
o pkg/ptracers: |
235 |
|
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
236 |
|
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
237 |
|
|
238 |
|
checkpoint59j |
239 |
|
o in pkgs: dic, obcs, offline, rbcs: |
240 |
|
standard way to compute coeff. for time interpolation between 2 time reccords |
241 |
|
which retains full precision (& make results less dependent on compiler). |
242 |
|
update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo. |
243 |
|
o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those |
244 |
|
packages instead of reading ice cover and wind speed separately |
245 |
|
o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h |
246 |
|
(keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad |
247 |
|
to allow to compile customized code before the update) |
248 |
|
o cleaning-up: |
249 |
|
- fix CPP instruction syntax in pkg/obcs |
250 |
|
- replace (some) call to MDSIO S/R with call to RW interface S/R ; and |
251 |
|
add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio) |
252 |
|
- fix some threads issue in IO parts. |
253 |
|
o pkg/dic: |
254 |
|
- add tons of "_d 0" (--> much better testreports !) |
255 |
|
and then update outputs of tutorial_global_oce_biogeo |
256 |
|
o pkg/mom_fluxform: |
257 |
|
add a special version of momentum advection intended to conserve momentum |
258 |
|
next to a bathymetry step or a coastline edge. (default = off = #undef) |
259 |
|
o new read/write pickup version: |
260 |
|
- for now, only implemented for main (mdsio) pickup file. |
261 |
|
- write out only what is needed to restart; merge pickup_nh , pickup_ph |
262 |
|
and main pickup together. |
263 |
|
- read meta file; read only what is needed to restart; stop if a field |
264 |
|
is missing (if pickupStrictlyMatch=T, = the default) or try to restart |
265 |
|
if it make sense (even if the restart is not perfect). |
266 |
|
- if no meta file, assume that pickup to read corresponds exactly to |
267 |
|
a pickup that would currently be written. |
268 |
|
- read pickup written in the old format (until checkpoint59i) if it |
269 |
|
recognizes an old meta file (no field-list). |
270 |
|
- add a meta file in exp. which starts from a pickup: 2 cases: |
271 |
|
a) minimal meta file (with just file precision) + pickupStrictlyMatch=F |
272 |
|
e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta |
273 |
|
b) a meta file describing the content of the associated pickup file |
274 |
|
e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta |
275 |
|
o pkg/mdsio & pkg/rw: |
276 |
|
- new routine to read a meta file ; new set of routine to read |
277 |
|
Multiple-fields file (with meta file). |
278 |
|
o added open boundary conditions capability for seaice |
279 |
|
HSNOW, HSALT, UICE, and VICE |
280 |
|
|
281 |
|
checkpoint59i |
282 |
|
o adjoint: |
283 |
|
* fix multiDimAdvection adjoint |
284 |
|
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
285 |
|
and comlev1 size definition (maxpass vs. max. number of tracers) |
286 |
|
* verification/global_ocean.90x45x15 adjoint now tests |
287 |
|
NLFS and multiDimAdvection using DST3 (=30) |
288 |
|
* verification/lab_sea now tests multiDimAdvection using DST3 (=30) |
289 |
|
o pkg/kpp: add "_d 0" to real constant (if missing); |
290 |
|
update output of exp: natl_box (10.digits); vermix (std, 7.digits) |
291 |
|
and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits). |
292 |
|
o prepare for "clever pickup" implementation: add new header file "RESTART.h" |
293 |
|
for internal parameters related to restart process (formerly from PARAMS.h) |
294 |
|
and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2. |
295 |
|
o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed |
296 |
|
as argument. (only atm2d & obcs write_pickup have not yet been updated) |
297 |
|
o pkg/monitor: |
298 |
|
- use GLOBAL_SUM_TILE instead of _GLOBAL_SUM |
299 |
|
- fix mon_stats_rs (statistics over the full domain, even where field is zero) |
300 |
|
- account for deep Atmosphere factor and density factor (anelastic) |
301 |
|
o added open boundary conditions capability for seaice HEFF and AREA |
302 |
|
o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989) |
303 |
|
thermodynamics |
304 |
|
- requires a little reorganization, which affects the testreport results |
305 |
|
of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment, |
306 |
|
so that now the conservative form is tested |
307 |
|
- add a few comments |
308 |
|
o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code* |
309 |
|
o add a little bit of code to gad_os7mp_adv_?.F to help vectorization |
310 |
|
o add new diagnostics to seaice: advective, diffusive fluxes (only for |
311 |
|
multidim-advection, for scheme 2 they are not filled) and transports, |
312 |
|
thermodynamic growth rates |
313 |
|
o change units of EmPmR (inside the code, + within coupling interface) |
314 |
|
from m/s to kg/m2/s (mass flux) but leave input file unchanged. |
315 |
|
Affects results @ truncation level (cg2d match) and update output of |
316 |
|
experiments: lab_sea(6), global_ocean.90x40x15(10), |
317 |
|
global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11) |
318 |
|
+ adjoint results: global_ocean_ebm(11) and lab_sea (12). |
319 |
|
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
320 |
|
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
321 |
|
|
322 |
|
checkpoint59h |
323 |
|
o pkg/exf: |
324 |
|
- improve vectorization by moving if-statement out of loops in |
325 |
|
exf_mapfields, exf_radiation |
326 |
|
- exf_bulkformulae.F: introduce 2D fields and vectorize code |
327 |
|
o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package |
328 |
|
o testreport: |
329 |
|
- allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE |
330 |
|
monitor & update offline_exf_seaice exp. output. |
331 |
|
- AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost) |
332 |
|
o pkg/seaice: |
333 |
|
- bug fix in the evp solver: boundary conditions were affected be |
334 |
|
masking of zMax/zMin (changes results) |
335 |
|
- minor bug fix in boundary conditions in seaice_calc_strainrates |
336 |
|
(changes results for no_slip) |
337 |
|
- seaice_lsr.F: make interpolation of eta dependent on boundaries |
338 |
|
- replace hardcoded lower limit for zeta (zMin) by runtime parameter |
339 |
|
- add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean |
340 |
|
stress formulation and no-slip boundary conditions |
341 |
|
o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP |
342 |
|
in gad_calc_rhs.F ; add few safety stops in initialisation phase. |
343 |
|
o pkg/seaice: a first HSALT time stepping equation has been checked in |
344 |
|
o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV |
345 |
|
in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem |
346 |
|
without requiring DO-IF statements |
347 |
|
o pkg/thsice: |
348 |
|
use continuous power-law function for partition of energy between lateral |
349 |
|
melting/freezing and thinning/thickening ; old code using step function |
350 |
|
still available with #undef THSICE_FRACEN_POWERLAW |
351 |
|
update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice |
352 |
|
o testreport: change AD testing : check against results/output_adm.txt |
353 |
|
using same scripts as for forward test. |
354 |
|
|
355 |
|
checkpoint59g |
356 |
|
o adjoint testing: in preparation for changing testreport: |
357 |
|
- output format: cost and grad written on separated lines |
358 |
|
- ad output results in directory "results" (instead of "results_ad") |
359 |
|
o pkg/seaice: adding ice salinity HSALT as a prognostic variable |
360 |
|
o pkg/seaice: changes for using pkg/seaice with pkg/obcs |
361 |
|
o pkg/ecco: allow user defined cost function contributions |
362 |
|
o testreport: |
363 |
|
Allow to choose (per experiment) the list of tested output variables |
364 |
|
and the main variable (used to issue a pass/FAIL ) ; |
365 |
|
- for now, done by adding the specific list in file: [exp]/input/tr_checklist |
366 |
|
- default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ; |
367 |
|
Also modify printing of summary: |
368 |
|
a) ">" NN "<" indicates the "main" variable (used for pass/FAIL) |
369 |
|
b) echo the list of tested variables in the individual summary.txt of |
370 |
|
each experiment. |
371 |
|
o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of |
372 |
|
threads and number of processes (with #define GLOBAL_SUM_SEND_RECV) |
373 |
|
(but still depend on the tile decompostion of the domain). |
374 |
|
o pkg/seaice: change a discretization detail to make the B-grid code |
375 |
|
"more symmetric". This change is likely to remove all "ridges/leads" that |
376 |
|
where quasi-aligned with the grid in B-grid solutions. It may also be |
377 |
|
the solution to the stress coupling issues with the B-grid. |
378 |
|
o each tested exp: add a "run" directory with a standard ".cvsignore" file ; |
379 |
|
remove .cvsignore from input dir. (since testreport no longer run here). |
380 |
|
o pkg/thsice: |
381 |
|
- cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h" |
382 |
|
- fix reshaping of sea-ice just after advection: |
383 |
|
melt all the ice only if ice-volume is too small. |
384 |
|
- re-visit lateral/thinning repartition of melting (modifs from May 04, 2007): |
385 |
|
prevent lateral melting if sea-ice fraction is too close to iceMaskMin ; |
386 |
|
and update experiment global_ocean.cs32x15.icedyn (+start from pickup files). |
387 |
|
o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water |
388 |
|
tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged. |
389 |
|
o define mass2rUnit & rUnit2mass as units conversion factor, used for surface |
390 |
|
forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit |
391 |
|
(z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse; |
392 |
|
and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error |
393 |
|
of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16 |
394 |
|
-> update output.txt |
395 |
|
o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME): |
396 |
|
this affects truncation error: -> update output.txt of exp: |
397 |
|
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
398 |
|
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
399 |
|
|
400 |
|
checkpoint59f |
401 |
|
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
402 |
|
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
403 |
|
a bounded range (in forward mode) |
404 |
|
o pkg/ecco, ctrl, autodiff and mom_common: |
405 |
|
internal parameter controls, completements of implementations |
406 |
|
o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy. |
407 |
|
o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ; |
408 |
|
(not seem any difference in testing results). |
409 |
|
o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains |
410 |
|
at face corners. |
411 |
|
o pkg/generic_advdiff: |
412 |
|
- in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR) |
413 |
|
loop range indices for computing vertical advection tendency |
414 |
|
and do the calculation in the interior only (no overlap) ; |
415 |
|
for now, only implemented for SOM advection (to save CPU time). |
416 |
|
- add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment) |
417 |
|
o exch2 adjoint |
418 |
|
First set of changes: |
419 |
|
- add exch2 hand-written adjoint templates |
420 |
|
- exch2 hand-written no longer use TAF-flag 'nownew_arg' |
421 |
|
This will require cleanup in pkg/autodiff/*.F |
422 |
|
(changed routines currently kept separate in verif. code/) |
423 |
|
- Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC |
424 |
|
that used to hide exch2 or cubed-sphere specific code |
425 |
|
(commented via 'cph-exch2') |
426 |
|
o pkg/seaice |
427 |
|
- Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE. |
428 |
|
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
429 |
|
output of global_ocean.cs32x15.thsice . |
430 |
|
|
431 |
|
checkpoint59e |
432 |
|
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
433 |
|
for B-grid vector (not yet tested) and C-grid vector (<- only used |
434 |
|
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
435 |
|
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme |
436 |
|
(#ifdef ALLOW_SALT_PLUME) |
437 |
|
o gather_2d/scatter_2d: removed halo regions |
438 |
|
o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007 |
439 |
|
scheme and the corresponding test case (under front_relax dir). For now, |
440 |
|
only available with Skew-flux form and not yet tested in realistic set-up. |
441 |
|
adjoint: store directives updated, but gradient checks deteriorated, |
442 |
|
so maybe GM/Redi adjoint is now broken. |
443 |
|
o seaice adjoint |
444 |
|
* add AREA, HEFF, HSNOW as control variable |
445 |
|
(should not change lab_sea results) |
446 |
|
* CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40 |
447 |
|
o pkg/seaice: |
448 |
|
* added computation of saltFlux in seaice_growth; |
449 |
|
For time being, sea ice salinity is assumed constant |
450 |
|
contribution of snow flooding to freshening of sea ice is neglected. |
451 |
|
SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it |
452 |
|
defaults to 0.0 in order to maintain backward compatibility. |
453 |
|
Typical values for SEAICE_salinity are 4 to 10 g/kg. |
454 |
|
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F |
455 |
|
* added SEAICE_availHeatFrac, which specifies fraction of surface level |
456 |
|
heat content used to melt or grow ice |
457 |
|
* commented out cap of HICE: it helps keep ice thinner |
458 |
|
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
459 |
|
* applied OBCS T/S mask to HEFFM sea ice mask |
460 |
|
|
461 |
|
checkpoint59d |
462 |
|
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
463 |
|
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
464 |
|
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
465 |
|
o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0" |
466 |
|
and change default value of parameter "GM_Small_Number"; |
467 |
|
update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15, |
468 |
|
global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf, |
469 |
|
tutorial_global_oce_biogeo, tutorial_global_oce_latlon |
470 |
|
o pkg/ecco: cost function when applying pkg/smooth to controls |
471 |
|
o pkg/ctrl: add forcingPrecond run time parameter |
472 |
|
o pkg/seaice: |
473 |
|
- replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code |
474 |
|
- fix bug in metric terms of u-equation in LSR solver (implicit part), |
475 |
|
changes verification/lab_sea |
476 |
|
- rearrange implicit part of u-equation in LSR solver to make it easier to |
477 |
|
read, understand, and debug. This causes changes at the truncation level. |
478 |
|
- fix (serious) bug in the boundary conditions (sign error in the implicit |
479 |
|
part) of the LSR solver. Changes all LSR results. |
480 |
|
- fixed problem with HSNOW initialization to avoid thick snow when AREA |
481 |
|
is initilized with small values - does not change lab_sea results. |
482 |
|
- added HsnowFile initialization capability |
483 |
|
o pkg/smooth: addition to model/src and pkg/ctrl so allow |
484 |
|
initialization of pkg/smooth and application to control vector |
485 |
|
o pkg/seaice: fix another bug in the LSR no-slip boundary conditons |
486 |
|
o dependencies: pkg/profiles requires pkg/cal |
487 |
|
o pkg/profiles: |
488 |
|
- added option ALLOW_PROFILES_GENERICGRID |
489 |
|
-> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming |
490 |
|
that interpolation information (grid points and coefficients) is provided |
491 |
|
within the netcdf input files. |
492 |
|
-> sample matlab scripts can be found in MITgcm_contrib/gael |
493 |
|
that allow you to prepare netcdf input files. |
494 |
|
- also modified: cleaner include statements, cleaner error print statements, |
495 |
|
cleaner stops when error, and more tests of the netcdf input files consistency. |
496 |
|
o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs. |
497 |
|
o pkg/seaice: |
498 |
|
- move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this |
499 |
|
requires a new routine: seaice_diagnostics_fill.F |
500 |
|
- make sure that seaice does not move if not forced (pressure replacement |
501 |
|
method, Hibler and Ip, 1995), changes results |
502 |
|
- and new damping criterion for EVP solver according to Hunke, JCP, 2001 |
503 |
|
- SEAICE_evpDampC = > 0. turns it on (615. is the recommended value). |
504 |
|
It is turned off by default (=-1.), because it changes the results. |
505 |
|
- make it possible to read AREA from a file, too. |
506 |
|
|
507 |
|
checkpoint59c |
508 |
|
o add S/R and diagnostics for oceanic mixed-layer depth |
509 |
|
o move GMRedi call after all vertical mixing schemes (including KPP) |
510 |
|
o pkg/thsice: |
511 |
|
- ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs |
512 |
|
(melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice |
513 |
|
o pkg/obcs: |
514 |
|
- bug fix for balance code |
515 |
|
o pkg/seaice: |
516 |
|
- allow values of SEAICE_elasticParm > 1 |
517 |
|
- add new parameter SEAICE_evpTauRelax as an alternative |
518 |
|
to SEAICE_elasticParm |
519 |
|
- make lsr boundary conditions free slip (by default), changes result |
520 |
|
- add code for no slip boundary conditions for lsr |
521 |
|
- set minimum of zeta to zero (and not 4e8) (changes results) |
522 |
|
- add a cap on AREA after advecting AREA if seaice_growth is not called |
523 |
|
o change calculation of Visbeck K: |
524 |
|
- no longer depend on tapering scheme; instead, compute slope (limited |
525 |
|
by GM_maxSlope). this is equivalent to what was comuted before with |
526 |
|
clipping or linear tappering. |
527 |
|
- fix vertical averaging (wrong by 1/2 level) |
528 |
|
- leave the old version (but will not be maintained) within |
529 |
|
#ifdef OLD_VISBECK_CALC / #endif |
530 |
|
- update output of exp. ideal_2D_oce |
531 |
|
o change error catch in calc_r_star to improve vectorization |
532 |
|
o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and |
533 |
|
add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf). |
534 |
|
o adjoint: |
535 |
|
Re-organized adjoint checkpointing according to Matt Mazloff |
536 |
|
(but with modifs/completions/cleanups) |
537 |
|
Storing is now bundled into large arrays to optimized I/O |
538 |
|
(and second step in cleanup of the_main_loop) |
539 |
|
|
540 |
|
checkpoint59b |
541 |
|
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
542 |
|
- export/import (between ocean & coupler) fields needed for ocean DIC. |
543 |
|
o pkg/seaice: |
544 |
|
- get rid of three more exchanges seaice_calc_viscosities (required |
545 |
|
different loop boundaries in seaice_lsr and seaice_ocean_stress) |
546 |
|
- bug fix in seaice_ocean_stress (update of lab_sea required) |
547 |
|
- reduce loop boundaries to necessary minimum also in seaice_evp |
548 |
|
- go back to the old way of computing deltaC/Z as the adjoint likes that |
549 |
|
better |
550 |
|
o Refresh of tutorial_global_oce_latlon (includes changing salinity-like |
551 |
|
passive tracer to an Age Tracer) + update output.txt |
552 |
|
o pkg/exf: |
553 |
|
- implement A-grid / C-grid selection for wind-stress input files. |
554 |
|
- clean-up exf_wind.F (remove us, use wspeed instead ; add wStress) |
555 |
|
for now, in exf_bulk_largeyeager04.F only : |
556 |
|
- change implementation for case where windspeed + 2. components wind-stress |
557 |
|
are read-in. AND use rhoConstFresh to convert evap. |
558 |
|
o pkg/seaice: |
559 |
|
- use correct EXCH_UV for wind-forcing (on A-grid). |
560 |
|
- change SEAICE_OPTIONS.h to limit the number of option combinations (regarding |
561 |
|
SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops. |
562 |
|
o pkg/exf: |
563 |
|
- default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) |
564 |
|
EXF_INTERPOLATION: |
565 |
|
- merge global_with_exf/code version of exf_interp_read.F |
566 |
|
to the main code ; |
567 |
|
- Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when |
568 |
|
reading the file ; Important: This options needs to be defined to recover |
569 |
|
previous code. |
570 |
|
otherwise, use fixed size array to read in (size=exf_interp_bufferSize). |
571 |
|
- no longer loose real*8 precision along the way when using exf_iprec=64. |
572 |
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
573 |
|
- change discretisation of evp-solver in order to avoid another exchange |
574 |
|
(changes lab_sea) and clean up a little |
575 |
|
- replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS) |
576 |
|
help the adjoint (this also changes the results slightly) |
577 |
|
- add a few "_d 0" where they had been missing in seaice_evp.F |
578 |
|
- cleaning up: remove unused seaice_calc_rhs.F |
579 |
o pkg/exf: some cleaning-up: |
o pkg/exf: some cleaning-up: |
580 |
- change various "constants" into runtime parameters |
- change various "constants" into runtime parameters |
581 |
- cleaned-up Large&Yeager04 routine which should eventually |
- cleaned-up Large&Yeager04 routine which should eventually |
589 |
o pkg/thsice: |
o pkg/thsice: |
590 |
fix few little problems, in thsice_calc_thickn.F: |
fix few little problems, in thsice_calc_thickn.F: |
591 |
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
592 |
- melt laterally only if hIce < hThinIce (as the comments say) |
- melt only laterally if hIce < hThinIce (as the comments say) |
593 |
and in thsice_extend.F: |
and in thsice_extend.F: |
594 |
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
595 |
- start to form ice as soon as the minimum ice-volume is reachable. |
- start to form ice as soon as the minimum ice-volume is reachable. |
626 |
ATMOSPHERIC_LOADING is #define). |
ATMOSPHERIC_LOADING is #define). |
627 |
o pkg/kpp: replaced _KPP_RL with _RL |
o pkg/kpp: replaced _KPP_RL with _RL |
628 |
o bug fixes for vertical diffusivity computations when both KPP and |
o bug fixes for vertical diffusivity computations when both KPP and |
629 |
3D diffusivity arrays are used. |
3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F |
630 |
|
are no longer updating the vertical diffusivity array |
631 |
|
(passed as argument) but are (re-) setting those arrays. |
632 |
o pkg/seaice: fix bug in evp solver, while doing that |
o pkg/seaice: fix bug in evp solver, while doing that |
633 |
- change (improve?) discretization of stress computations for both |
- change (improve?) discretization of stress computations for both |
634 |
cgrid-lsr and evp solver |
cgrid-lsr and evp solver |