4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the |
8 |
|
interpolated wind field not only for curvilineargrid=.true., but also |
9 |
|
for a rotated grid (rotateGrid=.true.) |
10 |
|
o pkg/exf: add capability to bypass interpolation for runoff |
11 |
|
by setting yet another CPP-flag |
12 |
|
o autodiff |
13 |
|
new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV |
14 |
|
allows to switch to single-prec common blocks; |
15 |
|
corresponding switch occurs in tamc.h, integer isbyte |
16 |
|
TAF store directivs "byte" and "kind" seem equivalent; |
17 |
|
Most tamc.h have been updated correspondingly. |
18 |
|
|
19 |
|
checkpoint61i |
20 |
|
o autodiff: |
21 |
|
fix autodiff_sore/_restore indices for obcs |
22 |
|
(spotted by I. Hoteit, M. Mazloff) |
23 |
|
o pkg/autodiff, pkg/ctrl: |
24 |
|
Add flag to reduce all tapelev I/O to single-prec. |
25 |
|
In data.ctrl set |
26 |
|
doSinglePrecTapelev = .TRUE. |
27 |
|
o model/src/ini_curvilinear_grid.F: check in hack for SX8 compiler |
28 |
|
to make sure that recip_dxV and recip_dyU are never zero, until we |
29 |
|
have a proper exchange for them. Most compilers do not seem |
30 |
|
to mind divisions by zero in the overlaps, as long as the results are |
31 |
|
not used anywhere, but sxf90 does. |
32 |
|
o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for |
33 |
|
real fresh water flux (not yet) |
34 |
|
o pkg/mdsio & rw: |
35 |
|
- add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta) |
36 |
|
- add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX. |
37 |
|
o pkg/flt: |
38 |
|
- replace FLT_INIT by 3-steps standard initialization S/R: readparms, |
39 |
|
init_fixed & ini_varia. |
40 |
|
- clean-up & simplify linear interpolation S/R: |
41 |
|
move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid. |
42 |
|
- fix some indices (mainly vertical index) ; add IMPLICIT NONE. |
43 |
|
- more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R. |
44 |
|
- add vert. coordinate & horiz. indices to output files. |
45 |
|
- change vertical position in initial condition, from index to depth [m]. |
46 |
|
- store horizontal (decimal) indices i,j in common block (instead of coord. x,y) |
47 |
|
(easier to get to a curvilinear grid) ; delX,delY no longer used. |
48 |
|
o pkg/ggl90: a few modifications: |
49 |
|
- fix bottom boundary condition, and interpolation of KappaE |
50 |
|
near top and bottom |
51 |
|
- use same set of viscosity/diffusivity for TKE/momnetum/tracer |
52 |
|
- add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH) |
53 |
|
- add a few options for mixing-length upper limit (--> mxlMaxFlag) |
54 |
|
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
55 |
|
(maintain temporary backward compatibility, until next checkpoint) |
56 |
|
|
57 |
|
checkpoint61h |
58 |
|
o pkg/diagnostics with "periodic averaging diagnostics": |
59 |
|
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
60 |
|
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
61 |
|
o pkg/obcs: fix loop ranges for balancing code |
62 |
|
o pkg/flt: |
63 |
|
- improve criteria for finding which tile owns a float. |
64 |
|
- fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case. |
65 |
|
o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg |
66 |
|
aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling |
67 |
|
with ocean biogeo) |
68 |
|
o pkg/flt: |
69 |
|
- do some cleaning and fix the restart ; |
70 |
|
- add output.txt in flt_example/results to get this pkg tested. |
71 |
|
o genmake2: add an EXTENDED_SRC option and flag. |
72 |
|
for now, cannot be turned on on command line (only through genmake_local) |
73 |
|
o pkg/mdsio: read/write vector: |
74 |
|
- singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS |
75 |
|
- singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR |
76 |
|
& MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS. |
77 |
|
- affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO) |
78 |
|
(drop to 4 digits matching for grad). But this test does not look very |
79 |
|
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
80 |
|
|
81 |
|
checkpoint61g |
82 |
|
o pkg/flt: |
83 |
|
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
84 |
|
+ make OPTIONS file more standard. |
85 |
|
- rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name) |
86 |
|
- fix _BYTESWAPIO CPP-Flag |
87 |
|
- standard reading of file-parameter "data.flt" |
88 |
|
- fix argument list of S/R FLT_RESTART |
89 |
|
still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F |
90 |
|
o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell |
91 |
|
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
92 |
|
a still unfixed compiler/optimization bug |
93 |
|
|
94 |
|
checkpoint61f |
95 |
|
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
96 |
|
update results of global_ocean.cs32x15.icedyn test. |
97 |
|
o move getcon.F from model/src to pkg/fizhi. |
98 |
|
o pkg/exf: add parameter for extrapolation of temp up to the surface |
99 |
|
and option to prevent negative evap (in bulk_largeyeager04 only). |
100 |
|
o Prather Advection scheme: fix tracer conservation for divergent flow |
101 |
|
(e.g., when using NonLin Free-Surface). |
102 |
|
o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead |
103 |
|
o gmredi (Visbeck-variable-K): |
104 |
|
- add more parameters to Visbeck-variable-K. |
105 |
|
- use a 5 points average for dSigmaR in Visbeck-K calculation |
106 |
|
(more "homogenous": same stencil and same weights as in dSigmaH) |
107 |
|
- update output of ideal_2D_oce experiment. |
108 |
|
o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4 |
109 |
|
(#undef REAL4_IS_SLOW) |
110 |
|
- pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4 |
111 |
|
coordinate variable |
112 |
|
- pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables |
113 |
|
(surface forcing fields), removes some of the functionality |
114 |
|
- model/src/write_grid.F: write _RS variables as RS-netcdf variables |
115 |
|
- model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but |
116 |
|
probably not all: copy _RS surface flux fields to RL field before |
117 |
|
calling DIAGNOSTICS_FILL |
118 |
|
- model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into |
119 |
|
real*4 (CALL EXCH_*_RS) versions. |
120 |
|
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
121 |
|
(generate new output). |
122 |
|
|
123 |
|
checkpoint61e |
124 |
|
o gmredi (Visbeck-variable-K): |
125 |
|
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
126 |
|
- change computation of Visbeck-K where Slope > Smax : |
127 |
|
now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct) |
128 |
|
previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output. |
129 |
|
o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic |
130 |
|
to be the same as with Z-coord. (i.e., m/s & no-units respectively). |
131 |
|
o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc) |
132 |
|
o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz |
133 |
|
does not become too large (to avoid precision problems in implicit-diffusion |
134 |
|
solver); update ideal_2D_oce output. |
135 |
|
o pkg ggl90: |
136 |
|
- in ggl90_cal.F: compute only one set of visc/diff, used to |
137 |
|
step forward TKE/T/S/momentum |
138 |
|
- default value of GGL90viscMax/GGL90diffMax larger and equal (to |
139 |
|
have Prandlt =1) |
140 |
|
o gmredi (fm07): |
141 |
|
- add lower limit on Transition layer thickness + lower limit on 1/lambda |
142 |
|
- allow to set few more params from data.gmredi |
143 |
|
o pkg ggl90: |
144 |
|
- add missing sqrt(2) factor in computation of mixing length |
145 |
|
scale in ggl90_calc.F |
146 |
|
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
147 |
|
|
148 |
|
checkpoint61d |
149 |
|
o adjoint modifs |
150 |
|
- adapt to new field rhoInSitu |
151 |
|
- allow to revert from StoreDynVars2D, StoreDynVars3D |
152 |
|
to individual fields |
153 |
|
(switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D) |
154 |
|
o store 3-D (in-situ) density in commom block (DYNVARS.h) |
155 |
|
- save 1 rho computation. |
156 |
|
- no longer modify T & S inland when using down_slope pkg. |
157 |
|
o gad_som : allow to switch to SOM advection for T & S without corresponding |
158 |
|
pickup files (using new S/R: MDS_CHECK4FILE). |
159 |
|
o keep removing _BEGIN/_END_MASTER between MDSIO S/R call |
160 |
|
(for useSingleCpuIO to work in multi-threaded) |
161 |
|
o pkg/shelfice: |
162 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
163 |
|
with SHELFICEtopoFile in data.shelfice |
164 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
165 |
|
subroutines of the shelfice package |
166 |
|
- separate initialisation of "fixed" and "variable" variables |
167 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
168 |
|
o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
169 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
170 |
|
and rename: |
171 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
172 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
173 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
174 |
|
|
175 |
|
checkpoint61c |
176 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
177 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
178 |
|
of oceanic real-fresh water flux). |
179 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
180 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
181 |
|
o new pkg: down_slope |
182 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
183 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
184 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
185 |
|
- implementation for ocean in P-coords not tested. |
186 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
187 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
188 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
189 |
|
o change FIND_RHO to FIND_RHO_2D : |
190 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
191 |
|
o new pkg: cheapaml |
192 |
|
|
193 |
|
checkpoint61b |
194 |
|
o exch2: |
195 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
196 |
|
- no longer depend on the order sequence (N,S,E,W). |
197 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
198 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
199 |
|
- exch_UV_A-grid readily available (but not yet tested). |
200 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
201 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
202 |
|
get truncation error differences with adjoint exch. |
203 |
|
o exch2: |
204 |
|
- change index-bounds storage (moved from target to local tile, |
205 |
|
more intuitive this way) ; rename/remove some variables. |
206 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
207 |
|
|
208 |
|
checkpoint61a |
209 |
|
o exch2/matlab-topology-generator: |
210 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
211 |
|
had any effect on the solution). |
212 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
213 |
|
is exceeded |
214 |
|
o testreport: modify syntax of awk, so that it works also with |
215 |
|
awk, and not only with nawk and gawk |
216 |
|
|
217 |
|
checkpoint61 |
218 |
|
o autodiff |
219 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
220 |
|
This changes TAF subroutine argument list (ordering of active var.) |
221 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
222 |
|
To restore TAMC-compatibility, need following modifs: |
223 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
224 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
225 |
|
Tested TAF version is 1.9.22 |
226 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
227 |
|
|
228 |
|
checkpoint60 |
229 |
|
--->>> This is the last checkpoint for which generating the adjoint |
230 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
231 |
|
--->>> by default. |
232 |
|
--->>> Future checkpoints will ommit this flag by default. |
233 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
234 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
235 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
236 |
|
o pkg/autodiff: more flexibility in zeroadj. |
237 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
238 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
239 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
240 |
|
special setup of gmredi for which the adjoint is stable |
241 |
|
enough for parameter optimization. |
242 |
|
o bridging the gap between eddy stress and GM. |
243 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
244 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
245 |
|
-> when using GM w/ GM_AdvForm: |
246 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
247 |
|
is applied either in the tracer Eq. or in momentum Eq. |
248 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
249 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
250 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
251 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
252 |
|
|
253 |
|
checkpoint59r |
254 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
255 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
256 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
257 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
258 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
259 |
|
mass points, when using mnc for output |
260 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
261 |
|
default (which is the value of getcon('UNDEF')) |
262 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
263 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
264 |
|
initialisation of never used fields |
265 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
266 |
|
versions |
267 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
268 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
269 |
|
are missing. |
270 |
|
o move from external_forcing_surf.F to ini_forcing.F |
271 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
272 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
273 |
|
o Freshen up a bit hs94.1x64x5, notably: |
274 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
275 |
|
exactConserv=.TRUE. |
276 |
|
o pkg/generic_advdiff: |
277 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
278 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
279 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
280 |
|
this uses a dynamically allocated internal state data structure |
281 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
282 |
|
and requires a fortran 90 compiler |
283 |
|
|
284 |
|
checkpoint59q |
285 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
286 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
287 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
288 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
289 |
|
- change EOS (POLY3 --> JMD95Z) |
290 |
|
- use Bryan-Lewis vertical diffusivity |
291 |
|
- use multidimensional advection |
292 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
293 |
|
- change a couple of parameters in dic pkg |
294 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
295 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
296 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
297 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
298 |
|
o implementation of TAF directives for gchem,cfc,dic |
299 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
300 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
301 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
302 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
303 |
|
--> changes results in exp4, seaice_obcs |
304 |
|
o tutorial_deep_convection : |
305 |
|
update the set-up and increase resolution and domain size ; start |
306 |
|
from pseudo initial conditions = output at t=120mn in order to see |
307 |
|
something happening when running testreport. |
308 |
|
o pkg/seaice: add os7mp as an advection scheme |
309 |
|
add check for advection schemes |
310 |
|
add a flag for restoring T and S underneath sea ice |
311 |
|
o pkg/my82: add netcdf-support and diagnostics |
312 |
|
o thsice pkg: |
313 |
|
- Now hsMax limits snow height by turning it into ice following |
314 |
|
flooding scheme (and now conserving energy) |
315 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
316 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
317 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
318 |
|
|
319 |
|
checkpoint59p |
320 |
|
o gchem / dic / cfc : |
321 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
322 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
323 |
|
- various re-arrangement in initialisation & header file ; |
324 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
325 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
326 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
327 |
|
before) providing pickupStrictlyMatch is set to False. |
328 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
329 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
330 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
331 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
332 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
333 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
334 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
335 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
336 |
|
scheme to use for vorticty-term ; |
337 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
338 |
|
(with default selectVortScheme, return to original discretisation) |
339 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
340 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
341 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
342 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
343 |
|
also fix diagnostics VISCAHW & VISCA4W. |
344 |
|
|
345 |
|
checkpoint59o |
346 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
347 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
348 |
|
move a few statemens out the main loop into separate loops |
349 |
|
o pkg/shelfice: |
350 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
351 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
352 |
|
rhoConstFresh=rhoConst (by accident) |
353 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
354 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
355 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
356 |
|
- convert potential temperature into in-situ temperature. This changes the |
357 |
|
isomip tests => update tests |
358 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
359 |
|
writing a pickup at the last timestep |
360 |
|
o tools/mpack-1.6 : |
361 |
|
- disable automake (not working) and autoconf (not needed). |
362 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
363 |
|
also cleaner with much less compilation warnings. |
364 |
|
o pkg/profiles: |
365 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
366 |
|
(for "less than 32 characters name" compiler requirement) |
367 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
368 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
369 |
|
o pkg/diagnostics (stats-diags): |
370 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
371 |
|
o genmake2: replace (4 times) |
372 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
373 |
|
with |
374 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
375 |
|
echo $COMM >> genmake_warnings |
376 |
|
$COMM >> genmake_warnings 2>&1 |
377 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
378 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
379 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
380 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
381 |
|
o pkg/ctrl: |
382 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
383 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
384 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
385 |
|
|
386 |
|
checkpoint59n |
387 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
388 |
|
number in dedicate array "hdiag": |
389 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
390 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
391 |
|
- many small changes (integer format) for large number of diagnostics |
392 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
393 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
394 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
395 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
396 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
397 |
|
geographical coordinates according to the inverse of the rotation defined |
398 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
399 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
400 |
|
Naturally, this feature does not work with all packages, so some |
401 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
402 |
|
profiles), because there the coordinates are assumed to be regular |
403 |
|
spherical grid coordinates. |
404 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
405 |
|
- introduce isopycnal diffusion coefficient control. |
406 |
|
o tools/adjoint_options: |
407 |
|
- additional control vector components. |
408 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
409 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
410 |
|
o pkg/mypackage: |
411 |
|
- add example of read/write pickup for state-var ; |
412 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
413 |
|
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
414 |
|
transitions for useExfYearlyFields |
415 |
|
- add new subroutine that determines the file to read from for |
416 |
|
use*YearlyFields = .TRUE. and .FALSE. |
417 |
|
- add a verification experiment to global_with_exf that tests |
418 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
419 |
|
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
420 |
|
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
421 |
|
subroutines (which could be generated from a template, because they are |
422 |
|
almost identical), for now they are included in obcs_prescribe_read.F for |
423 |
|
simplicity |
424 |
|
o pkg/exf: |
425 |
|
- add a little more diagnostic to exf_interp_read (in analogy to |
426 |
|
mds_read_field, can be turned off with debugLevel < debugLevA=1) |
427 |
|
- improve vectorizability of exf_interp for TARGET_NEC_SX, makes code |
428 |
|
ugly but fast by unrolling short inner loops, inserting a unroll=8 |
429 |
|
directive in routine lagran, and splitting a loop and making do while the |
430 |
|
outermost loop (the latter requires the intoduction of index arrays) |
431 |
|
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice |
432 |
|
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver |
433 |
|
http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html |
434 |
|
o verification/seaice_obcs: updated for restart test and latest options |
435 |
|
o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different |
436 |
|
ice rheology (so-called truncated ellipse, that gets rid of tensile stress); |
437 |
|
for now this is only available for the C-grid code and also within |
438 |
|
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
439 |
|
|
440 |
|
checkpoint59m |
441 |
|
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
442 |
|
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
443 |
|
o gad_som : fix flux output (& diagnostics) to have same units as other |
444 |
|
advection scheme fluxes (was previously multiplied by deltaT). |
445 |
|
o added verification/seaice_obcs both to test seaice open boundaries |
446 |
|
and to provide an example matlab scrpt for generating them |
447 |
|
o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume |
448 |
|
o pkg/salt_plume: clean up salt_plume_frac.F to |
449 |
|
remove redundancy in PlumeMethod 1 and 4 |
450 |
|
o pkg/kpp: added saltplume diagnostics |
451 |
|
o pkg/obcs and pkg/seaice: |
452 |
|
- do not set uice and vice to zero when OB*icefile are unspecified |
453 |
|
- OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default |
454 |
|
- moved seaice tracer obcs after call to seaice_growth |
455 |
|
o pkg/salt_plume: added various options for salt plume depth |
456 |
|
criterion and for vertical distribution of the salt |
457 |
|
|
458 |
|
checkpoint59l |
459 |
|
o pkg/ptracers: new version of ptracers pickup: |
460 |
|
read meta file and write only fields which are needed to restart. |
461 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
462 |
|
o pkg/seaice: |
463 |
|
- add timescale for melting due to warm mixed layer as a means of |
464 |
|
setting SEAICE_availHeatFrac more conveniently |
465 |
|
- add a CPP-flag/runtime parameter check for flooding algorithm |
466 |
|
- reformulated availHeat in seaice_growth.F to be independent of AREA |
467 |
|
o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent |
468 |
|
unit changes |
469 |
|
o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint |
470 |
|
o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC |
471 |
|
SX vector computer. |
472 |
|
o pkg/seaice: |
473 |
|
- removed SEAICE_FFIELDS.h and seaice_get_forcing.F |
474 |
|
seaice forcing fields can now be read only through pkg/exf |
475 |
|
- removed some unused halos |
476 |
|
o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP |
477 |
|
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
478 |
|
or U/VICE from U/VWIND before computing U/VSTRESS |
479 |
|
|
480 |
|
checkpoint59k |
481 |
|
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
482 |
|
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
483 |
|
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
484 |
|
all experiments pass when compile with un-initialised var. checking option. |
485 |
|
o added pkg/salt_plume |
486 |
|
o script to test restart (for now, in MITgcm_contrib/jmc_script) |
487 |
|
o pkg/seaice: new read/write pickup version. |
488 |
|
read meta file and write only fields which are needed to restart. |
489 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
490 |
|
o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates) |
491 |
|
o lab_sea.hb87: modify the domain & update output.hb87.txt : |
492 |
|
lat-long grid & no-slip BC in seaice-dynamics produce different sigma12 |
493 |
|
at j=1 & j=Ny+1 : this case is not treated correctly in the restart |
494 |
|
process. Fixed here by closing the domain at the Northern boundary. |
495 |
|
o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD. |
496 |
|
o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing |
497 |
|
a set of consecutive levels in/from a 3-D array. |
498 |
|
o pkg/ptracers: |
499 |
|
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
500 |
|
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
501 |
|
|
502 |
|
checkpoint59j |
503 |
|
o in pkgs: dic, obcs, offline, rbcs: |
504 |
|
standard way to compute coeff. for time interpolation between 2 time reccords |
505 |
|
which retains full precision (& make results less dependent on compiler). |
506 |
|
update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo. |
507 |
|
o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those |
508 |
|
packages instead of reading ice cover and wind speed separately |
509 |
|
o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h |
510 |
|
(keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad |
511 |
|
to allow to compile customized code before the update) |
512 |
|
o cleaning-up: |
513 |
|
- fix CPP instruction syntax in pkg/obcs |
514 |
|
- replace (some) call to MDSIO S/R with call to RW interface S/R ; and |
515 |
|
add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio) |
516 |
|
- fix some threads issue in IO parts. |
517 |
|
o pkg/dic: |
518 |
|
- add tons of "_d 0" (--> much better testreports !) |
519 |
|
and then update outputs of tutorial_global_oce_biogeo |
520 |
|
o pkg/mom_fluxform: |
521 |
|
add a special version of momentum advection intended to conserve momentum |
522 |
|
next to a bathymetry step or a coastline edge. (default = off = #undef) |
523 |
|
o new read/write pickup version: |
524 |
|
- for now, only implemented for main (mdsio) pickup file. |
525 |
|
- write out only what is needed to restart; merge pickup_nh , pickup_ph |
526 |
|
and main pickup together. |
527 |
|
- read meta file; read only what is needed to restart; stop if a field |
528 |
|
is missing (if pickupStrictlyMatch=T, = the default) or try to restart |
529 |
|
if it make sense (even if the restart is not perfect). |
530 |
|
- if no meta file, assume that pickup to read corresponds exactly to |
531 |
|
a pickup that would currently be written. |
532 |
|
- read pickup written in the old format (until checkpoint59i) if it |
533 |
|
recognizes an old meta file (no field-list). |
534 |
|
- add a meta file in exp. which starts from a pickup: 2 cases: |
535 |
|
a) minimal meta file (with just file precision) + pickupStrictlyMatch=F |
536 |
|
e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta |
537 |
|
b) a meta file describing the content of the associated pickup file |
538 |
|
e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta |
539 |
|
o pkg/mdsio & pkg/rw: |
540 |
|
- new routine to read a meta file ; new set of routine to read |
541 |
|
Multiple-fields file (with meta file). |
542 |
|
o added open boundary conditions capability for seaice |
543 |
|
HSNOW, HSALT, UICE, and VICE |
544 |
|
|
545 |
|
checkpoint59i |
546 |
|
o adjoint: |
547 |
|
* fix multiDimAdvection adjoint |
548 |
|
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
549 |
|
and comlev1 size definition (maxpass vs. max. number of tracers) |
550 |
|
* verification/global_ocean.90x45x15 adjoint now tests |
551 |
|
NLFS and multiDimAdvection using DST3 (=30) |
552 |
|
* verification/lab_sea now tests multiDimAdvection using DST3 (=30) |
553 |
|
o pkg/kpp: add "_d 0" to real constant (if missing); |
554 |
|
update output of exp: natl_box (10.digits); vermix (std, 7.digits) |
555 |
|
and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits). |
556 |
|
o prepare for "clever pickup" implementation: add new header file "RESTART.h" |
557 |
|
for internal parameters related to restart process (formerly from PARAMS.h) |
558 |
|
and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2. |
559 |
|
o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed |
560 |
|
as argument. (only atm2d & obcs write_pickup have not yet been updated) |
561 |
|
o pkg/monitor: |
562 |
|
- use GLOBAL_SUM_TILE instead of _GLOBAL_SUM |
563 |
|
- fix mon_stats_rs (statistics over the full domain, even where field is zero) |
564 |
|
- account for deep Atmosphere factor and density factor (anelastic) |
565 |
|
o added open boundary conditions capability for seaice HEFF and AREA |
566 |
|
o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989) |
567 |
|
thermodynamics |
568 |
|
- requires a little reorganization, which affects the testreport results |
569 |
|
of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment, |
570 |
|
so that now the conservative form is tested |
571 |
|
- add a few comments |
572 |
|
o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code* |
573 |
|
o add a little bit of code to gad_os7mp_adv_?.F to help vectorization |
574 |
|
o add new diagnostics to seaice: advective, diffusive fluxes (only for |
575 |
|
multidim-advection, for scheme 2 they are not filled) and transports, |
576 |
|
thermodynamic growth rates |
577 |
|
o change units of EmPmR (inside the code, + within coupling interface) |
578 |
|
from m/s to kg/m2/s (mass flux) but leave input file unchanged. |
579 |
|
Affects results @ truncation level (cg2d match) and update output of |
580 |
|
experiments: lab_sea(6), global_ocean.90x40x15(10), |
581 |
|
global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11) |
582 |
|
+ adjoint results: global_ocean_ebm(11) and lab_sea (12). |
583 |
|
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
584 |
|
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
585 |
|
|
586 |
|
checkpoint59h |
587 |
|
o pkg/exf: |
588 |
|
- improve vectorization by moving if-statement out of loops in |
589 |
|
exf_mapfields, exf_radiation |
590 |
|
- exf_bulkformulae.F: introduce 2D fields and vectorize code |
591 |
|
o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package |
592 |
|
o testreport: |
593 |
|
- allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE |
594 |
|
monitor & update offline_exf_seaice exp. output. |
595 |
|
- AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost) |
596 |
|
o pkg/seaice: |
597 |
|
- bug fix in the evp solver: boundary conditions were affected be |
598 |
|
masking of zMax/zMin (changes results) |
599 |
|
- minor bug fix in boundary conditions in seaice_calc_strainrates |
600 |
|
(changes results for no_slip) |
601 |
|
- seaice_lsr.F: make interpolation of eta dependent on boundaries |
602 |
|
- replace hardcoded lower limit for zeta (zMin) by runtime parameter |
603 |
|
- add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean |
604 |
|
stress formulation and no-slip boundary conditions |
605 |
|
o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP |
606 |
|
in gad_calc_rhs.F ; add few safety stops in initialisation phase. |
607 |
|
o pkg/seaice: a first HSALT time stepping equation has been checked in |
608 |
|
o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV |
609 |
|
in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem |
610 |
|
without requiring DO-IF statements |
611 |
|
o pkg/thsice: |
612 |
|
use continuous power-law function for partition of energy between lateral |
613 |
|
melting/freezing and thinning/thickening ; old code using step function |
614 |
|
still available with #undef THSICE_FRACEN_POWERLAW |
615 |
|
update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice |
616 |
|
o testreport: change AD testing : check against results/output_adm.txt |
617 |
|
using same scripts as for forward test. |
618 |
|
|
619 |
|
checkpoint59g |
620 |
|
o adjoint testing: in preparation for changing testreport: |
621 |
|
- output format: cost and grad written on separated lines |
622 |
|
- ad output results in directory "results" (instead of "results_ad") |
623 |
|
o pkg/seaice: adding ice salinity HSALT as a prognostic variable |
624 |
|
o pkg/seaice: changes for using pkg/seaice with pkg/obcs |
625 |
|
o pkg/ecco: allow user defined cost function contributions |
626 |
|
o testreport: |
627 |
|
Allow to choose (per experiment) the list of tested output variables |
628 |
|
and the main variable (used to issue a pass/FAIL ) ; |
629 |
|
- for now, done by adding the specific list in file: [exp]/input/tr_checklist |
630 |
|
- default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ; |
631 |
|
Also modify printing of summary: |
632 |
|
a) ">" NN "<" indicates the "main" variable (used for pass/FAIL) |
633 |
|
b) echo the list of tested variables in the individual summary.txt of |
634 |
|
each experiment. |
635 |
|
o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of |
636 |
|
threads and number of processes (with #define GLOBAL_SUM_SEND_RECV) |
637 |
|
(but still depend on the tile decompostion of the domain). |
638 |
|
o pkg/seaice: change a discretization detail to make the B-grid code |
639 |
|
"more symmetric". This change is likely to remove all "ridges/leads" that |
640 |
|
where quasi-aligned with the grid in B-grid solutions. It may also be |
641 |
|
the solution to the stress coupling issues with the B-grid. |
642 |
|
o each tested exp: add a "run" directory with a standard ".cvsignore" file ; |
643 |
|
remove .cvsignore from input dir. (since testreport no longer run here). |
644 |
|
o pkg/thsice: |
645 |
|
- cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h" |
646 |
|
- fix reshaping of sea-ice just after advection: |
647 |
|
melt all the ice only if ice-volume is too small. |
648 |
|
- re-visit lateral/thinning repartition of melting (modifs from May 04, 2007): |
649 |
|
prevent lateral melting if sea-ice fraction is too close to iceMaskMin ; |
650 |
|
and update experiment global_ocean.cs32x15.icedyn (+start from pickup files). |
651 |
|
o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water |
652 |
|
tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged. |
653 |
|
o define mass2rUnit & rUnit2mass as units conversion factor, used for surface |
654 |
|
forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit |
655 |
|
(z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse; |
656 |
|
and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error |
657 |
|
of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16 |
658 |
|
-> update output.txt |
659 |
|
o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME): |
660 |
|
this affects truncation error: -> update output.txt of exp: |
661 |
|
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
662 |
|
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
663 |
|
|
664 |
|
checkpoint59f |
665 |
|
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
666 |
|
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
667 |
|
a bounded range (in forward mode) |
668 |
|
o pkg/ecco, ctrl, autodiff and mom_common: |
669 |
|
internal parameter controls, completements of implementations |
670 |
|
o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy. |
671 |
|
o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ; |
672 |
|
(not seem any difference in testing results). |
673 |
|
o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains |
674 |
|
at face corners. |
675 |
|
o pkg/generic_advdiff: |
676 |
|
- in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR) |
677 |
|
loop range indices for computing vertical advection tendency |
678 |
|
and do the calculation in the interior only (no overlap) ; |
679 |
|
for now, only implemented for SOM advection (to save CPU time). |
680 |
|
- add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment) |
681 |
|
o exch2 adjoint |
682 |
|
First set of changes: |
683 |
|
- add exch2 hand-written adjoint templates |
684 |
|
- exch2 hand-written no longer use TAF-flag 'nownew_arg' |
685 |
|
This will require cleanup in pkg/autodiff/*.F |
686 |
|
(changed routines currently kept separate in verif. code/) |
687 |
|
- Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC |
688 |
|
that used to hide exch2 or cubed-sphere specific code |
689 |
|
(commented via 'cph-exch2') |
690 |
|
o pkg/seaice |
691 |
|
- Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE. |
692 |
|
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
693 |
|
output of global_ocean.cs32x15.thsice . |
694 |
|
|
695 |
|
checkpoint59e |
696 |
|
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
697 |
|
for B-grid vector (not yet tested) and C-grid vector (<- only used |
698 |
|
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
699 |
|
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme |
700 |
|
(#ifdef ALLOW_SALT_PLUME) |
701 |
|
o gather_2d/scatter_2d: removed halo regions |
702 |
|
o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007 |
703 |
|
scheme and the corresponding test case (under front_relax dir). For now, |
704 |
|
only available with Skew-flux form and not yet tested in realistic set-up. |
705 |
|
adjoint: store directives updated, but gradient checks deteriorated, |
706 |
|
so maybe GM/Redi adjoint is now broken. |
707 |
|
o seaice adjoint |
708 |
|
* add AREA, HEFF, HSNOW as control variable |
709 |
|
(should not change lab_sea results) |
710 |
|
* CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40 |
711 |
|
o pkg/seaice: |
712 |
|
* added computation of saltFlux in seaice_growth; |
713 |
|
For time being, sea ice salinity is assumed constant |
714 |
|
contribution of snow flooding to freshening of sea ice is neglected. |
715 |
|
SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it |
716 |
|
defaults to 0.0 in order to maintain backward compatibility. |
717 |
|
Typical values for SEAICE_salinity are 4 to 10 g/kg. |
718 |
|
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F |
719 |
|
* added SEAICE_availHeatFrac, which specifies fraction of surface level |
720 |
|
heat content used to melt or grow ice |
721 |
|
* commented out cap of HICE: it helps keep ice thinner |
722 |
|
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
723 |
|
* applied OBCS T/S mask to HEFFM sea ice mask |
724 |
|
|
725 |
|
checkpoint59d |
726 |
|
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
727 |
|
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
728 |
|
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
729 |
|
o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0" |
730 |
|
and change default value of parameter "GM_Small_Number"; |
731 |
|
update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15, |
732 |
|
global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf, |
733 |
|
tutorial_global_oce_biogeo, tutorial_global_oce_latlon |
734 |
|
o pkg/ecco: cost function when applying pkg/smooth to controls |
735 |
|
o pkg/ctrl: add forcingPrecond run time parameter |
736 |
|
o pkg/seaice: |
737 |
|
- replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code |
738 |
|
- fix bug in metric terms of u-equation in LSR solver (implicit part), |
739 |
|
changes verification/lab_sea |
740 |
|
- rearrange implicit part of u-equation in LSR solver to make it easier to |
741 |
|
read, understand, and debug. This causes changes at the truncation level. |
742 |
|
- fix (serious) bug in the boundary conditions (sign error in the implicit |
743 |
|
part) of the LSR solver. Changes all LSR results. |
744 |
|
- fixed problem with HSNOW initialization to avoid thick snow when AREA |
745 |
|
is initilized with small values - does not change lab_sea results. |
746 |
|
- added HsnowFile initialization capability |
747 |
|
o pkg/smooth: addition to model/src and pkg/ctrl so allow |
748 |
|
initialization of pkg/smooth and application to control vector |
749 |
|
o pkg/seaice: fix another bug in the LSR no-slip boundary conditons |
750 |
|
o dependencies: pkg/profiles requires pkg/cal |
751 |
|
o pkg/profiles: |
752 |
|
- added option ALLOW_PROFILES_GENERICGRID |
753 |
|
-> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming |
754 |
|
that interpolation information (grid points and coefficients) is provided |
755 |
|
within the netcdf input files. |
756 |
|
-> sample matlab scripts can be found in MITgcm_contrib/gael |
757 |
|
that allow you to prepare netcdf input files. |
758 |
|
- also modified: cleaner include statements, cleaner error print statements, |
759 |
|
cleaner stops when error, and more tests of the netcdf input files consistency. |
760 |
|
o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs. |
761 |
|
o pkg/seaice: |
762 |
|
- move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this |
763 |
|
requires a new routine: seaice_diagnostics_fill.F |
764 |
|
- make sure that seaice does not move if not forced (pressure replacement |
765 |
|
method, Hibler and Ip, 1995), changes results |
766 |
|
- and new damping criterion for EVP solver according to Hunke, JCP, 2001 |
767 |
|
- SEAICE_evpDampC = > 0. turns it on (615. is the recommended value). |
768 |
|
It is turned off by default (=-1.), because it changes the results. |
769 |
|
- make it possible to read AREA from a file, too. |
770 |
|
|
771 |
|
checkpoint59c |
772 |
|
o add S/R and diagnostics for oceanic mixed-layer depth |
773 |
|
o move GMRedi call after all vertical mixing schemes (including KPP) |
774 |
|
o pkg/thsice: |
775 |
|
- ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs |
776 |
|
(melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice |
777 |
|
o pkg/obcs: |
778 |
|
- bug fix for balance code |
779 |
|
o pkg/seaice: |
780 |
|
- allow values of SEAICE_elasticParm > 1 |
781 |
|
- add new parameter SEAICE_evpTauRelax as an alternative |
782 |
|
to SEAICE_elasticParm |
783 |
|
- make lsr boundary conditions free slip (by default), changes result |
784 |
|
- add code for no slip boundary conditions for lsr |
785 |
|
- set minimum of zeta to zero (and not 4e8) (changes results) |
786 |
|
- add a cap on AREA after advecting AREA if seaice_growth is not called |
787 |
|
o change calculation of Visbeck K: |
788 |
|
- no longer depend on tapering scheme; instead, compute slope (limited |
789 |
|
by GM_maxSlope). this is equivalent to what was comuted before with |
790 |
|
clipping or linear tappering. |
791 |
|
- fix vertical averaging (wrong by 1/2 level) |
792 |
|
- leave the old version (but will not be maintained) within |
793 |
|
#ifdef OLD_VISBECK_CALC / #endif |
794 |
|
- update output of exp. ideal_2D_oce |
795 |
|
o change error catch in calc_r_star to improve vectorization |
796 |
|
o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and |
797 |
|
add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf). |
798 |
|
o adjoint: |
799 |
|
Re-organized adjoint checkpointing according to Matt Mazloff |
800 |
|
(but with modifs/completions/cleanups) |
801 |
|
Storing is now bundled into large arrays to optimized I/O |
802 |
|
(and second step in cleanup of the_main_loop) |
803 |
|
|
804 |
|
checkpoint59b |
805 |
|
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
806 |
|
- export/import (between ocean & coupler) fields needed for ocean DIC. |
807 |
|
o pkg/seaice: |
808 |
|
- get rid of three more exchanges seaice_calc_viscosities (required |
809 |
|
different loop boundaries in seaice_lsr and seaice_ocean_stress) |
810 |
|
- bug fix in seaice_ocean_stress (update of lab_sea required) |
811 |
|
- reduce loop boundaries to necessary minimum also in seaice_evp |
812 |
|
- go back to the old way of computing deltaC/Z as the adjoint likes that |
813 |
|
better |
814 |
|
o Refresh of tutorial_global_oce_latlon (includes changing salinity-like |
815 |
|
passive tracer to an Age Tracer) + update output.txt |
816 |
|
o pkg/exf: |
817 |
|
- implement A-grid / C-grid selection for wind-stress input files. |
818 |
|
- clean-up exf_wind.F (remove us, use wspeed instead ; add wStress) |
819 |
|
for now, in exf_bulk_largeyeager04.F only : |
820 |
|
- change implementation for case where windspeed + 2. components wind-stress |
821 |
|
are read-in. AND use rhoConstFresh to convert evap. |
822 |
|
o pkg/seaice: |
823 |
|
- use correct EXCH_UV for wind-forcing (on A-grid). |
824 |
|
- change SEAICE_OPTIONS.h to limit the number of option combinations (regarding |
825 |
|
SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops. |
826 |
|
o pkg/exf: |
827 |
|
- default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) |
828 |
|
EXF_INTERPOLATION: |
829 |
|
- merge global_with_exf/code version of exf_interp_read.F |
830 |
|
to the main code ; |
831 |
|
- Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when |
832 |
|
reading the file ; Important: This options needs to be defined to recover |
833 |
|
previous code. |
834 |
|
otherwise, use fixed size array to read in (size=exf_interp_bufferSize). |
835 |
|
- no longer loose real*8 precision along the way when using exf_iprec=64. |
836 |
|
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
837 |
|
- change discretisation of evp-solver in order to avoid another exchange |
838 |
|
(changes lab_sea) and clean up a little |
839 |
|
- replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS) |
840 |
|
help the adjoint (this also changes the results slightly) |
841 |
|
- add a few "_d 0" where they had been missing in seaice_evp.F |
842 |
|
- cleaning up: remove unused seaice_calc_rhs.F |
843 |
|
o pkg/exf: some cleaning-up: |
844 |
|
- change various "constants" into runtime parameters |
845 |
|
- cleaned-up Large&Yeager04 routine which should eventually |
846 |
|
replace exf_bulkformulae.F (changed names of S/R and CPP) |
847 |
|
and merged various ALLOW_ATM_WIND options |
848 |
|
only used with thsice pkg (in thsice_get_exf.F): |
849 |
|
- implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04) |
850 |
|
which are used when useStabilityFct_overIce=TRUE (= the default) |
851 |
|
- change default values of ice & snow emissivity and scale downward LW |
852 |
|
by ice & snow emissivity. |
853 |
|
o pkg/thsice: |
854 |
|
fix few little problems, in thsice_calc_thickn.F: |
855 |
|
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
856 |
|
- melt only laterally if hIce < hThinIce (as the comments say) |
857 |
|
and in thsice_extend.F: |
858 |
|
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
859 |
|
- start to form ice as soon as the minimum ice-volume is reachable. |
860 |
|
update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice), |
861 |
|
and cpl_aim+ocn |
862 |
|
o pkg/kpp |
863 |
|
- move computation of surface related input fields to KPP into a new |
864 |
|
subroutine kpp_forcing_surf.F |
865 |
|
- remove wrong (within bi,bj loops) EXCH calls. |
866 |
|
- little cleaning (add argument myThid in last position, cvs header ...) |
867 |
|
- for now, fix conservation problem by exchanging KPPviscAz (may not |
868 |
|
be the best fix) |
869 |
|
o pkg/seaice |
870 |
|
- check for inconsistent evp parameter/cpp-flag combination |
871 |
|
- remove leftover errIO flat for obsolete name list error handling |
872 |
|
o OpenAD |
873 |
|
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
874 |
|
|
875 |
|
checkpoint59a |
876 |
|
o pkg/seaice: some parameter clarifications and a little bit of clean up |
877 |
|
o pkg/thsice: rename run-time parameters: |
878 |
|
himin -> hIceMin |
879 |
|
himin0 -> hThinIce |
880 |
|
hihig -> hThickIce |
881 |
|
i0 -> i0swFrac |
882 |
|
transCoef -> bMeltCoef |
883 |
|
frac_energy -> fracMelting |
884 |
|
add new parameters: hNewIceMax, fracFreezing, dhSnowLin |
885 |
|
with default values (for now) that do not change the results. |
886 |
|
remove old version of thsice vars advection in pkg/seaice. |
887 |
|
o in FFIELDS.h: |
888 |
|
- replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD |
889 |
|
- make pLoad & sIceLoad always available (but still only used if |
890 |
|
ATMOSPHERIC_LOADING is #define). |
891 |
|
o pkg/kpp: replaced _KPP_RL with _RL |
892 |
|
o bug fixes for vertical diffusivity computations when both KPP and |
893 |
|
3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F |
894 |
|
are no longer updating the vertical diffusivity array |
895 |
|
(passed as argument) but are (re-) setting those arrays. |
896 |
|
o pkg/seaice: fix bug in evp solver, while doing that |
897 |
|
- change (improve?) discretization of stress computations for both |
898 |
|
cgrid-lsr and evp solver |
899 |
|
- add a new routine to compute strain rates |
900 |
|
- the above changes lab_sea results |
901 |
|
- add no slip conditions for evp solver (off by default), lsr-version |
902 |
|
may follow |
903 |
|
- fix exchange for shear at Z-points (does not change lab_sea) |
904 |
|
- retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp |
905 |
|
(to force the user to pick a time step since there is not "safe" way |
906 |
|
of choosing it) |
907 |
|
- add principal stress diagnostics |
908 |
|
- rearrange fields for evp a little to avoid having to call a: too many |
909 |
|
exchanges and b: exchanges for stress trensor components which we do |
910 |
|
not have. |
911 |
|
- modify Hibler+Bryan (1987) stress coupling so that it reuses information |
912 |
|
of evp, complete rewrite for lsr case (latter is does not yet work |
913 |
|
in all cases) |
914 |
|
o pkg/kpp: add code to have mixing in shelf ice caverns |
915 |
|
- add myThid to all kpp routines (long overdue) |
916 |
|
|
917 |
|
checkpoint59 |
918 |
|
o pkg/exf: |
919 |
|
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
920 |
|
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
921 |
|
- move exf header files from lower_case.h to UPPER_CASE.h ; |
922 |
|
add missing cvs Header & Name |
923 |
|
- add adjoint routines and flow dirs for newly used exch_uv_agrid routines |
924 |
|
- add namelist param. selectStressGridPosition, exf_monFreq |
925 |
|
- retire many _CLIM routines, and remove data.exf_clim |
926 |
|
+ params moved to data.exf |
927 |
|
+ climsst, climsss now handled by exf_set_gen, i.e. |
928 |
|
climss?period=0 refers to constant field, |
929 |
|
climss?period=-12 to monthly forcing |
930 |
|
- split up namelists in data.exf |
931 |
|
o pkg/seaice: |
932 |
|
- remove seaice_exch and seaice_exch_uv |
933 |
|
- remove superfluous exchange of theta |
934 |
|
- add myThid to seaice_budget_ocean/ice |
935 |
|
- add new interface for atmospheric wind forcing (C-grid only) |
936 |
|
+ new routine |
937 |
|
+ two new field (taux, tauy for stress over ice) |
938 |
|
+ removed one global field (DAIRN) for C-grid case only |
939 |
|
o pkg/thsise |
940 |
|
- 2nd set of modifs for thsice adjoint in conjunction with exf |
941 |
|
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
942 |
|
|
943 |
|
checkpoint58y_post |
944 |
|
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
945 |
|
vertical diffusivity, similar to that in MOM4; turned on using |
946 |
|
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
947 |
|
diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file. |
948 |
|
o Added capability for 3D specification of background vertical diffusion |
949 |
|
coefficient. This is done by (i) #define ALLOW_3D_DIFFKR |
950 |
|
in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime |
951 |
|
"data" file that contains the 3D vertical diffusivity coefficients. |
952 |
|
o ice dynamics (pkg/seaice) with thsice thermodynamics: |
953 |
|
- add code within pkg thsice to advect & diffuse sea-ice fields |
954 |
|
similar to (and will replace) what has been added in seaice_advdiff.F, |
955 |
|
but: - conserving Mass, Heat & Salt. |
956 |
|
- better when using non-linear advection scheme (not yet fully tested) |
957 |
|
- can also be used in atmospheric set-up (for now, only the diffusion). |
958 |
|
|
959 |
|
checkpoint58x_post |
960 |
|
o IO option for global-file compact format: |
961 |
|
- add options when generating topology (utils/exch2/matlab-topology-generator) |
962 |
|
- add I/O capability (pkg/mdsio). |
963 |
|
- adapt utils/matlab/rdmds.m to read this format. |
964 |
|
for now long-line format not yet supported by pkg/mdsio (& exch2). |
965 |
|
o shelfice: add a few diagnostics |
966 |
|
|
967 |
|
checkpoint58w_post |
968 |
|
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
969 |
|
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
970 |
|
(and replace horiVertRatio in NH code). |
971 |
|
Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !) |
972 |
|
and tutorial_plume_on_slope (sensitive to truncation) |
973 |
|
o seaice: if ALLOW_ATM_WIND is undefined use wind stress |
974 |
|
directly to drive seaice model (C-grid only) |
975 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND): |
976 |
|
- reintroduce computation of wind from stress, |
977 |
|
- compute tau (in exf_bulkformulae.F) from windstress averaged to |
978 |
|
mass points to avoid tau = 0 |
979 |
|
- fix serious bug: (1/3) in Fortran is not the same as (1./3.) |
980 |
|
o rdmnc.m: make it work with "global" files created with gluemnc |
981 |
|
o rdmnc.m : some improvements in dealing with singleton dimension |
982 |
|
(tested on all testreport mnc output files). |
983 |
|
o genmake2: disable pkg/profiles if netcdf test fails. |
984 |
|
o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output. |
985 |
|
o move call to cal_readparms up to make calendar parameters/variable available |
986 |
|
to all packages |
987 |
|
|
988 |
|
checkpoint58v_post |
989 |
|
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
990 |
|
useDynP_inEos_Zc tested. |
991 |
|
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
992 |
|
o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields |
993 |
|
and portions thereof. See read_cs.txt for description and examples. |
994 |
|
o utils/matlab/cs_grid/bk_line: to compute transport through passages, |
995 |
|
add a script (grt_circ_bkl.m) to generate broken-line between 2 points, |
996 |
|
following the great-circle arc between those 2 points. |
997 |
|
o trap un-initialized variable with pathscale compiler on weddell.mit.edu |
998 |
|
(thanks to Constantinos): fix few problems and get (almost) all exp to pass. |
999 |
|
o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in |
1000 |
|
- enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h) |
1001 |
|
- used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81) |
1002 |
|
- still needs work (not working with some options ; efficiency to improve) |
1003 |
|
and serious testing. |
1004 |
|
- use this scheme for temperature & salinity in 2 advection test exp.: |
1005 |
|
advect_xy & advect_xz, respectively. |
1006 |
|
|
1007 |
|
checkpoint58u_post |
1008 |
|
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
1009 |
|
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
1010 |
|
o testreport: add option "-skipdir" to skip some test. |
1011 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent |
1012 |
|
momentum calculation. |
1013 |
|
o gad_advection: fix vertAdvecScheme (if different from advectionScheme) |
1014 |
|
o some cleaning: usePickupBeforeC35 no longer supported ; remove this option. |
1015 |
|
remove checkpoint.F and the_correction_step.F (no longer used); |
1016 |
|
do the k loop inside CYCLE_TRACER (supposed to be more efficient). |
1017 |
|
o add option (linFSConserveTr) to correct for tracer source/sink due to |
1018 |
|
Linear Free surface |
1019 |
|
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
1020 |
|
o pkg/thsice: fix reading mnc-pickups |
1021 |
|
|
1022 |
|
checkpoint58t_post |
1023 |
|
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
1024 |
|
o pkg/mdsio: |
1025 |
|
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
1026 |
|
move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) & |
1027 |
|
mdsio_write_field.F (S/R MDS_WRITE_FIELD); |
1028 |
|
- fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD |
1029 |
|
- collect old S/R in one file: mdsio_rw_field.F (now just a call to |
1030 |
|
either MDS_READ_FIELD or MDS_WRITE_FIELD ) |
1031 |
|
- new S/R (to replace MDSWRITEMETA), which allows to write more |
1032 |
|
informations (variable names, time ...) to meta files. |
1033 |
|
- modify rdmds.m to give back the meta file content. |
1034 |
|
o pkg/diagnostics: change vertical interpolation to be safer, and more |
1035 |
|
flexible (define p-levels to interpolate to in data.diagnostics); |
1036 |
|
add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right |
1037 |
|
diagnostic pointer. |
1038 |
|
o pkg/seaice: more cleaning up of seaice_growth, added many comments |
1039 |
|
o pkg/exf: put runoff0 and runoff1 into the appropriate common block |
1040 |
|
o fix multi-category seaice: |
1041 |
|
- change cpp flag SEAICE_MULTILEVEL to more meaningful name: |
1042 |
|
SEAICE_MULTICATEGORY |
1043 |
|
- fix short wave heat flux |
1044 |
|
o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics |
1045 |
|
and allow to use EVP solver. Change forward lab_sea: test both EVP |
1046 |
|
solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint) |
1047 |
|
o Initial check-in of lab_sea adjoint |
1048 |
|
(very similar to natl_box_adjoint/code_seaice) |
1049 |
|
* used C-grid and EVP solver |
1050 |
|
* used KPP, GM/Redi |
1051 |
|
* uses inAdExact=.TRUE. |
1052 |
|
* gradient checks fail for both ADM and TLM |
1053 |
|
due to sensitive snow melt code in seaice_grwoth (look for "JZ") |
1054 |
|
f.d. gradients actually seem more problematic than ADM, TLM gradients; |
1055 |
|
issue is related to forward mismatch between g77 an ifort |
1056 |
|
o pkg/seaice: overhaul of thermodynamics |
1057 |
|
- growth.F and groatb.F are replaced by new routine seaice_growth.F |
1058 |
|
- budget.F is replaced by two new routines seaice_budget_ocean/ice.F |
1059 |
|
- move a few global fields out of SEAICE.h into seaice_growth.F and |
1060 |
|
make them 2D (FICE/QNETO/ ...) |
1061 |
|
- remove FO (it is the same as QNETO) |
1062 |
|
- introduce a few local fields to avoid modifying external fields such |
1063 |
|
as atemp, etc. |
1064 |
|
|
1065 |
|
checkpoint58s_post |
1066 |
|
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
1067 |
|
changed exf_set_gen.F so that |
1068 |
|
genperiod=0 means input file is one time-constant field and |
1069 |
|
genperiod=-12 means input file contains 12 monthly means |
1070 |
|
o CG2D: use pre-computed solver main-diagonal (stored in common block); |
1071 |
|
this affects truncation error ; generate new output file for exp. which |
1072 |
|
fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d), |
1073 |
|
global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d), |
1074 |
|
ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d), |
1075 |
|
MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d), |
1076 |
|
tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d), |
1077 |
|
vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d) |
1078 |
|
o start implementation of deep-atmosphere and anelastic formulation |
1079 |
|
o verification: remove 2nd copy of input files and use script "prepare_run" |
1080 |
|
to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M) |
1081 |
|
o mom_common/vecinv/fluxform: fix a few initialisation isssues |
1082 |
|
o profiles: fix for multithreaded case |
1083 |
|
|
1084 |
|
o diagnostics: rename few diags: |
1085 |
|
s/'PRESSURE'/'RCENTER '/g |
1086 |
|
s/'TICE '/'oceFreez'/g |
1087 |
|
s/'TAUX '/'oceTAUX '/g |
1088 |
|
s/'TAUY '/'oceTAUY '/g |
1089 |
|
s/'SWFLUX '/'oceQsw '/g |
1090 |
|
s/DIFx/DFxE/g |
1091 |
|
s/DIFy/DFyE/g |
1092 |
|
and add few ocean-forcing diagnostics: |
1093 |
|
atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS |
1094 |
|
o modifications to pkg/seaice/growth.F and budget.F, which change results of |
1095 |
|
lab_sea experiment: HSNOW was sometimes treated as effective and sometimes |
1096 |
|
as actual snow thickness. It now refers everywhere to effective snow |
1097 |
|
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
1098 |
|
|
1099 |
|
checkpoint58r_post |
1100 |
|
o modifications to pkg/seaice/growth.F, which change results of |
1101 |
|
lab_sea experiment: fixes pertain to melting snow over open water, to |
1102 |
|
masking EVAP under sea ice, and to using the correct AREA variable for |
1103 |
|
computations of EVAP, PRECIP, HSNOW, and GHEFF |
1104 |
|
o add ability to read bathy, salt, and theta using MNC (off by def) |
1105 |
|
o add flooding algorithm and advection of HSNOW for pkg/seaice; |
1106 |
|
both are turned off by default and do no change any results |
1107 |
|
o seaice advection with pkg/thsice: a step toward the use of non-linear |
1108 |
|
advection scheme, but #ifdef or commented out for now (requires more EXCH). |
1109 |
|
o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens |
1110 |
|
(identical results) and the standard version of EXTERNAL_FIELDS_LOAD |
1111 |
|
in natl_box (affects results @ truncation level: update output.txt) |
1112 |
|
o multi-threading and IO: |
1113 |
|
- replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R. |
1114 |
|
- remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls |
1115 |
|
(needed to work with SingleCpuIO): tested in all verif. exp. |
1116 |
|
o GAD: use simpler DST3 formulation as default (old version left within #ifdef) |
1117 |
|
affects the results (but none of the verification test uses this scheme). |
1118 |
|
o Adding some pkg/diagnostics capability to pkg/seaice |
1119 |
|
(will certainly be subject to changes) |
1120 |
|
o ctrl: adding new control variables: |
1121 |
|
lwflux, lwdown, evap, snowprecip, apressure, runoff |
1122 |
|
|
1123 |
|
checkpoint58q_post |
1124 |
|
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
1125 |
|
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
1126 |
|
high_res_cube configuration by 4% on Columbia. |
1127 |
|
o clean-up multi-threaded problems (reported by debugger tcheck on ACES); |
1128 |
|
add (in global_with_exf/code) a version of EXF_INTERP_READ without |
1129 |
|
dynamical allocation (seems to work in multi-threaded). |
1130 |
|
o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using |
1131 |
|
single CPU io) so that TAF does not have to see EESUPPORT.h |
1132 |
|
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
1133 |
|
|
1134 |
|
checkpoint58p_post |
1135 |
|
o obcs: stop if obcs is used with useCDscheme = .true. |
1136 |
|
o shelfice: |
1137 |
|
- fix a sign error so that no slip at shelfice interface works |
1138 |
|
- remove stop for combination non-hydrostatic code and shelfice. That does |
1139 |
|
not mean, that the results are correct, but at least they are numerically |
1140 |
|
stable |
1141 |
|
o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted) |
1142 |
|
o added adjoint exch routined for all exch*3d* routines |
1143 |
|
and updated flow directives |
1144 |
|
|
1145 |
|
checkpoint58o_post |
1146 |
|
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
1147 |
|
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
1148 |
|
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
1149 |
|
and clean-up reading/writing of pickup files. |
1150 |
|
o fix local version of read/write pickup (NH part) in rotating_tank/code |
1151 |
|
o simplify EXCH interface: |
1152 |
|
- change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list) |
1153 |
|
- not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version |
1154 |
|
o added the regrid package |
1155 |
|
o shelfice: |
1156 |
|
- add a simple boundary layer scheme to reduce noise |
1157 |
|
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
1158 |
|
|
1159 |
|
checkpoint58n_post |
1160 |
|
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
1161 |
|
local variable (not in common block). |
1162 |
|
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
1163 |
|
- still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more); |
1164 |
|
- still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls |
1165 |
|
to work with SingleCpuIO. |
1166 |
|
o add "_d 0" to real constant of pkg/cfc subroutines ; |
1167 |
|
update exp. cfc_exemple & tutorial_cfc_offline output files. |
1168 |
|
o multi-threading and IO: |
1169 |
|
- all threads call READ_FLD S/R (needed if using SingleCpuIO): |
1170 |
|
(no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R. |
1171 |
|
- barrier before and after reading. |
1172 |
|
- stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE) |
1173 |
|
- avoid using MDS_WRITELOCAL for LAND pkg output. |
1174 |
|
- new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics |
1175 |
|
common-block variables ; Allows multi-threading with master-thread IO. |
1176 |
|
o change default MAX_NO_THREADS from 32 to 4 ; |
1177 |
|
and stop cleanly when MAX_NO_THREADS is too small. |
1178 |
|
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
1179 |
|
|
1180 |
|
checkpoint58m_post |
1181 |
|
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
1182 |
|
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
1183 |
|
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
1184 |
|
keep global_ocean.90x40x15 (for AD testing) with former secondary test |
1185 |
|
(".qshyd") as the main test (mv output.qshyd.txt to output.txt) |
1186 |
|
o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos; |
1187 |
|
add MITgcm_tutorials (= code + all the tutorials) |
1188 |
|
o ecco, option to compute cost for total ssh (mean+anom) |
1189 |
|
o consistent with addition of ptracer and ssh in pkg/profiles |
1190 |
|
o profiles: adding ptracer and ssh |
1191 |
|
o testreport: change multi-test output-file name |
1192 |
|
(from output.txt.{name} to output.{name}.txt) |
1193 |
|
o profiles: now ok for mutli-tiles case |
1194 |
|
o seaice: add 4 parameters for different advection schemes for area, |
1195 |
|
(effective) seaice thickness, enthalphy, and snow height. Their default |
1196 |
|
is the standard parameter SEAICEadvScheme |
1197 |
|
o calc_gw: |
1198 |
|
- add cosFacU in zonal viscous flux (harmonic.visc.). |
1199 |
|
- put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt. |
1200 |
|
of tutorial_plume_on_slope. |
1201 |
|
o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria). |
1202 |
|
o calc_gw: true flux-form, account for horizontal grid spacing. |
1203 |
|
update rotating_tank results, but not plume_on_slope (affected at |
1204 |
|
truncation level, 11 digits). |
1205 |
|
|
1206 |
|
checkpoint58l_post |
1207 |
|
o calc_gw: |
1208 |
|
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
1209 |
|
- remove side-drag for now (need to fix it); update plume_on_slope results. |
1210 |
|
- fix for partial-cell & non-uniform dz; update plume_on_slope results. |
1211 |
|
o commit code to make SST/SSS weights spatially variable |
1212 |
|
(based on either variable in-situ or variable initial T/S weights) |
1213 |
|
o pkg/ecco: |
1214 |
|
* commit code to relax deviations of xx_theta, xx_salt to 5*sigma, |
1215 |
|
now based on horizontally varying weights wthetaLev, wsaltLev |
1216 |
|
* cost_averagesflags now returns year indices in addition to day, month |
1217 |
|
* sflux balance is performed on annual basis |
1218 |
|
(sflxumm, sfluxmm2, bal_sfluxmm) |
1219 |
|
* for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO, |
1220 |
|
including separate counting and multipliers |
1221 |
|
o pkg/rbcs |
1222 |
|
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
1223 |
|
|
1224 |
|
checkpoint58k_post |
1225 |
|
o testreport: |
1226 |
|
- always build in dir. "build" (if not there, mkdir build instead of building |
1227 |
|
& running in input) |
1228 |
|
- run in dir run (if it exists), in build otherwise. |
1229 |
|
- call prepare_run (if input/prepare_run exists) |
1230 |
|
- run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists. |
1231 |
|
o pkg/exf modifications to interpolation and rotation routines for more |
1232 |
|
reasonable treatment of North Pole singularity: for tracers North Pole |
1233 |
|
value is set to northernmost zonal-mean value, for zonal velocity it is |
1234 |
|
set to zero, and for meridional velocity it is set to northernmost value. |
1235 |
|
o pkg/exf/exf_check_range.F |
1236 |
|
- add tile index to diagnostics and move stop statement to the very |
1237 |
|
end of the routine. |
1238 |
|
o pkg/diagnostics: (diagnostics_main_init.F) |
1239 |
|
define title of isomorphic variables according to the current config. |
1240 |
|
o pkg/thsice with pkg/seaice dynamics: |
1241 |
|
- fix domain of computation (interior only, required for exf) and do exchanges |
1242 |
|
- seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient |
1243 |
|
o towards a standard way of dealing with multi-threading in MONITOR |
1244 |
|
and ${PKG}_MONITOR (all except ptracers_monitor) subroutines. |
1245 |
|
o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith) |
1246 |
|
to W momentum equation in nonhydrostatic and quasihydrostatic runs. |
1247 |
|
o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor. |
1248 |
|
o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block) |
1249 |
|
o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL |
1250 |
|
(problems ? with gradient check in bottom_ctrl_5x5 adjoint test) |
1251 |
|
o tracer advection: |
1252 |
|
- clean-up and simplify calc_common_factors.F |
1253 |
|
- make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer |
1254 |
|
advection subroutine (but still not used within DST advection S/R) |
1255 |
|
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
1256 |
|
|
1257 |
|
checkpoint58j_post |
1258 |
|
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
1259 |
|
from file (collects calls previously in FORWARD_STEP) |
1260 |
|
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
1261 |
|
o adjoint store dir. adjusted accordingly |
1262 |
|
o genmake2 |
1263 |
|
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
1264 |
|
|
1265 |
|
checkpoint58i_post |
1266 |
|
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
1267 |
|
on wind stress (SEAICEstressFactor defaults to 1.) |
1268 |
|
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
1269 |
|
in the_main_loop.F to avoid Pb (e.g., when running fizhi test) |
1270 |
|
o vector_invariant: fix highOrderVorticity(=4.th.Order) advection |
1271 |
|
on CS-grid: no longer loosing mass. |
1272 |
|
o exf & curvilinear-grid: no longer modify longitude xC & xG. |
1273 |
|
o pkg/ggl90: fix sloppy output and fix a bug |
1274 |
|
o pkg/seaice: added SEAICEuseEVPpickup parameter |
1275 |
|
- Set to false in order to start EVP solver with |
1276 |
|
non-EVP pickup files when using SEAICEuseEVP |
1277 |
|
- fix sign error in diffusion in seaice_calc_rhs |
1278 |
|
|
1279 |
|
checkpoint58h_post |
1280 |
|
* Modifications for bottom topography control |
1281 |
|
o replace hFacC by _hFacC at various places |
1282 |
|
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
1283 |
|
o add non-self-adjoint cg2d_nsa |
1284 |
|
o update autodiff support routines |
1285 |
|
o re-initialise hfac after ctrl_depth_ini |
1286 |
|
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
1287 |
|
* Adding verification for 5x5 box (4-layer) bottom topography control |
1288 |
|
|
1289 |
|
checkpoint58g_post |
1290 |
|
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
1291 |
|
used for mean seasonal cycle, mean diurnal cycle); add an example |
1292 |
|
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
1293 |
|
o pkg/ggl90: |
1294 |
|
- add parameter (minimum surface kinetic energy) |
1295 |
|
- fix bug (avoiding division by zero) |
1296 |
|
o couple pkg/thsice to pkg/seaice: |
1297 |
|
- modify advection in seaice to accomodate new scalar fields to be advected |
1298 |
|
- only muliDimAdection scheme work with seaice/thsice |
1299 |
|
- mapping of thsice-variables to seaice-variables, back and forth |
1300 |
|
- does not break the verification experiments, but does not give the |
1301 |
|
desired results either |
1302 |
|
o pkg/seaice |
1303 |
|
- make (default) second order advection a bit less confusing? |
1304 |
|
|
1305 |
|
checkpoint58f_post |
1306 |
|
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
1307 |
|
to pkg/seaice): |
1308 |
|
- new routines thsice_map_exf and thsice_get_exf provide the interface |
1309 |
|
- add an additional formal parameter to thsice_solve4temp |
1310 |
|
o pkg/exf: |
1311 |
|
- add new fields wspeed, snowprecip (to be able to couple to thsice) |
1312 |
|
- correct Stefan-Boltzmann constant |
1313 |
|
- new parameter for longwave surface emittance |
1314 |
|
- separate some stuff from exf_bulkformulae into new routines |
1315 |
|
exf_radiation, exf_wind |
1316 |
|
- add new parameters and constants: longwave emissivity for ocean, ice |
1317 |
|
and snow, evaporation parameters over ice |
1318 |
|
- decouple wind/stress computation from ALLOW_BULKFORMULA: always compute |
1319 |
|
either wind from stress or stress from wind |
1320 |
|
o pkg/thSIce: |
1321 |
|
- split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F |
1322 |
|
- put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND |
1323 |
|
and THSICE_CALC_THICKN |
1324 |
|
- for now, call to THSICE_GET_BULKF remains inside i,j loops. |
1325 |
|
- add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h |
1326 |
|
to make debugging easier. |
1327 |
|
- affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output |
1328 |
|
o pkg/bulk_force: |
1329 |
|
- clean-up comments and parameters ; |
1330 |
|
- add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ; |
1331 |
|
o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched; |
1332 |
|
generate new output for test-experiment: aim.5l_cs.thSI |
1333 |
|
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
1334 |
|
testreport accordingly |
1335 |
|
|
1336 |
|
checkpoint58e_post |
1337 |
|
o SEAICE_CGRID adjoint done |
1338 |
|
o R_STAR adjoint implemented. |
1339 |
|
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
1340 |
|
* need to sort out init. of h0facc, etc. |
1341 |
|
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
1342 |
|
to be able to use it in pure forward. |
1343 |
|
|
1344 |
|
checkpoint58d_post |
1345 |
|
o upgrade simple test-experiment to tutorial example: |
1346 |
|
step.1: duplicate the experiment and (step.2) will remove the old copy. |
1347 |
|
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
1348 |
|
tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere) |
1349 |
|
tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation) |
1350 |
|
tutorial_global_oce_biogeo <- copy of dic_example |
1351 |
|
tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection) |
1352 |
|
tutorial_plume_on_slope <- copy of plume_on_slope |
1353 |
|
tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity) |
1354 |
|
tutorial_global_oce_optim <- empty for now (David ?) |
1355 |
|
tutorial_global_oce_in_p <- copy of global_ocean_pressure |
1356 |
|
some tutorials (R1) were already checked-in under tutorial_examples in release1_branch |
1357 |
|
o correct a sign problem in cost_scat.F |
1358 |
|
o obcs and ptracers: fix boundary conditions for advections schemes |
1359 |
|
with larger stencil |
1360 |
|
o thsice adjoint: start |
1361 |
|
o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for |
1362 |
|
completeness |
1363 |
|
o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING |
1364 |
|
and COSINEMETH_III, add comments in default CPP_OPTIONS.h |
1365 |
|
o ptracers adjoint: |
1366 |
|
* avoid extensive recomputatations |
1367 |
|
* fix missing re-init. of gptr (missed by TAF) |
1368 |
|
o obcs: add a flag (OBCSprintDiags, defaults is true) that allows |
1369 |
|
me to turn off the excessive output to STDOUT that this package produces |
1370 |
|
o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common |
1371 |
|
and add those terms in Vector-Invariant formulation. |
1372 |
|
o in ctrl pkg, if ALLOW_CAL, use monthly mean controls |
1373 |
|
if the control period (xx_hfluxperiod etc) is 0 |
1374 |
|
o in profiles pkg, clean routines and fix details |
1375 |
|
o in ecco pkg, reading ssh data: |
1376 |
|
fix problem in case the model does not start at iter0=0 |
1377 |
|
o fix mnc-pickup/restart for ptracers |
1378 |
|
o new package prifiles: |
1379 |
|
code to compute profile-based cost by Gael Forget |
1380 |
|
(modifs in ecco, ctrl, autodiff) |
1381 |
|
o Benign bug fix in initialization (spotted by M. Mazloff) of |
1382 |
|
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
1383 |
|
|
1384 |
|
checkpoint58c_post |
1385 |
|
o adjoint: finish NLFS adjoint and provide reference output in |
1386 |
|
verification/global_ocean.90x40x15/results_ad_nlfs |
1387 |
|
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
1388 |
|
documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in |
1389 |
|
SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only |
1390 |
|
with SEAICE_CGRID defined. |
1391 |
|
o move calendarDumps from "data" to "data.cal" and clean-up the code |
1392 |
|
with a simple call to pkg/cal S/R: CAL_TIME2WRITE |
1393 |
|
o add useEXF & useCAL flags (for now, set in hard-coded way) |
1394 |
|
o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum |
1395 |
|
(were missing in NH mode, and wrong in quasihydrostatic mode). |
1396 |
|
waiting for Chris updated version of calc_gw to add those CALLs. |
1397 |
|
o fix bug in quasihydrostatic S/R ; |
1398 |
|
add a test for this option: global_ocean.90x40x15.qshyd |
1399 |
|
o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs. |
1400 |
|
(called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS) |
1401 |
|
o add on/off flag useOffLine for package OFFLINE |
1402 |
|
o seaice: |
1403 |
|
- modify advection so that it works also on the C-grid |
1404 |
|
- extend loop ranges in seaice_lsr and seaice_dynsolver; fixes |
1405 |
|
problem in multi-tile runs with C-grid |
1406 |
|
- add flags for clipping ice velocities and/or masking solver forcing |
1407 |
|
- fix drag (ocean on ice) formulation and a bug that caused noise in the |
1408 |
|
C-grid solver |
1409 |
|
- added a few comments to seaice_diffusion.F |
1410 |
|
- separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V |
1411 |
|
are now exclusive) |
1412 |
|
- add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which |
1413 |
|
required re-ordering the code a little: |
1414 |
|
+ make DAIRN global variable (defined in SEAICE) |
1415 |
|
+ move computation of the viscosities eta and zeta into a new separate |
1416 |
|
routine (because I need to recompute them in seaice_ocean_stress.F) |
1417 |
|
|
1418 |
|
checkpoint58b_post |
1419 |
|
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
1420 |
|
update output.txt of exp. aim.5l_cs.thSI |
1421 |
|
o various mnc cleanups and improvements: |
1422 |
|
+ shrink lookup tables by factor of ~4 |
1423 |
|
+ better error reporting when running out of lookup space |
1424 |
|
+ able to handle longer path/file names (up to 500 chars) |
1425 |
|
o adjoint: |
1426 |
|
- Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations. |
1427 |
|
- TBD: "hidden" mom_vecinv recomp. in dynamics |
1428 |
|
o change forcing_In_AB to affects both T,S forcing and Momentum forcing |
1429 |
|
(allow to differentiate between forcing components using new integer flags: |
1430 |
|
momForcingOutAB=1/0 & tracForcingOutAB=1/0) |
1431 |
|
and add new flag to put Dissipation tendency out of Adams-Bashforth. |
1432 |
|
o ecco |
1433 |
|
- enable trend removal from SSH anomaly obs. |
1434 |
|
o adjoint |
1435 |
|
- a fix for PmEpR when #undef EXACT_CONSERV |
1436 |
|
- fix of "hidden" recomp. in thermodynamics (no TAF warnings) |
1437 |
|
- try to fix "hidden" recomp. in forward_step for NLFS |
1438 |
|
(NLFS seems broken sometimes after I checked it in) |
1439 |
|
o seaice: |
1440 |
|
- add c-grid version of the dynamic solver: |
1441 |
|
+ three new routines that are the c-grid substitute lsr, dynsolver |
1442 |
|
and ostres |
1443 |
|
+ put a few fields that were local to dynsolver into global common |
1444 |
|
blocks, so that I can move the computation of stresses etc into |
1445 |
|
seaice_lsr (saves coding but may break the adjoint). |
1446 |
|
- replace more hardwired parameters by runtime parameters |
1447 |
|
- add ice masks that mask the rhs of the implicit solvers where there |
1448 |
|
is no ice (commented out in seaice_dynsolver, because i am not sure |
1449 |
|
if this works properly), eventually this should replace the clipping |
1450 |
|
of ice velocities in seaice_dynsolver to +/-40cm/s. |
1451 |
|
o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly |
1452 |
|
include it only where its needed |
1453 |
|
o move balancing of fluxes before the call of external_forcing_surf |
1454 |
|
o seaice: |
1455 |
|
- correct units of turning angles (now they are really in degrees) |
1456 |
|
- move computation of GWATX/Y out of main routine into dynsolver |
1457 |
|
- initialize GWATX/Y in seaice_init |
1458 |
|
o Apply mask on Fresh-Water flux (needed for SSH forcing). |
1459 |
|
update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual) |
1460 |
|
o seaice: add runtime flags for turning angles (default to zero) |
1461 |
|
o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean |
1462 |
|
and trend from exf forcing and ctrl control adjustments |
1463 |
|
o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF |
1464 |
|
(since checkpoint57x_post) |
1465 |
|
o change the default rotation period to 86164.s = the Earth rotation |
1466 |
|
o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T) |
1467 |
|
and based on a reference stratification. Tested within hs94.cs-32x32x5. |
1468 |
|
o seaice advection: add code for choosing between the default (2nd order |
1469 |
|
central differences) and multiDim advection schemes provided by |
1470 |
|
pkg/generic_advdiff |
1471 |
|
o seaice: |
1472 |
|
- removed all references to SEAICE_GRID.h fields from |
1473 |
|
dynsolver, advect, diffus, lsr, without changing the results of lab_sea |
1474 |
|
(cubed-sphere configuration will change a little) |
1475 |
|
- grid computations in seaice_init are obsolete now. |
1476 |
|
- cleaned up code a little so that is easier to read (hopefully). |
1477 |
|
- added new (better?) discretizations of default advection and diffusion |
1478 |
|
(turn on with SEAICEuseFluxForm) |
1479 |
|
- replace 1 in 3d global fields by kSurface in growth.F |
1480 |
|
|
1481 |
|
checkpoint58a_post |
1482 |
|
o seaice: |
1483 |
|
- bug fix in advect.F |
1484 |
|
o shelfice: |
1485 |
|
- separate shelfice load anomaly from pload (breaks with time |
1486 |
|
dependent forcing), => introduce constant field shelficeLoadAnomaly. |
1487 |
|
Its default is 0., but it may be computed more cleverly from (unknown) |
1488 |
|
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be |
1489 |
|
done offline. A good approximation of the pressure load anomaly is |
1490 |
|
necessary to avoid large initial adjustment processes underneath |
1491 |
|
deep-reaching shelfice. |
1492 |
|
- small fix in ISOMIP shelfice_thermodynamics |
1493 |
|
- add more sophisticated thermodynamics of Hellmer (1989), this is |
1494 |
|
now the default |
1495 |
|
- give a few constants more intuitive names |
1496 |
|
o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful |
1497 |
|
if bulk formulae are used in long integration (especially EmPmR). Turn |
1498 |
|
on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01 |
1499 |
|
if balancePrintMean, the imbalance that is substracted is printed to |
1500 |
|
STDOUT. |
1501 |
|
o fix bug (typo) in obcs_apply_eta.F |
1502 |
|
o add a new package shelfice which enables us to model the circulation |
1503 |
|
underneath shelf-ice with draughts of hundreds of meters. |
1504 |
|
- works |
1505 |
|
- to do: + include improved thermodynamics |
1506 |
|
+ check whether kSurfC (from model/inc/SURFACE.h) can be used |
1507 |
|
instead of new field kTopC |
1508 |
|
+ can we use topoFile, Ro_surf and existing code in ini_depth.F |
1509 |
|
instead of new field R_shelfIce and new code in ini_depth.F |
1510 |
|
and ini_mask_etc.F? |
1511 |
|
+ adjust vertical mixing schemes? |
1512 |
|
o seaice pkg: |
1513 |
|
- add a cpp-flag to include a simple formula for a salinity dependent |
1514 |
|
freezing point of sea water at the surface |
1515 |
|
- change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and |
1516 |
|
meridional stresses are now different (and hopefully correct) |
1517 |
o AIM pkg: change threshold on large-scale condensation to conserve Heat. |
o AIM pkg: change threshold on large-scale condensation to conserve Heat. |
1518 |
update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics |
update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics |
1519 |
and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG) |
and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG) |
2374 |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
2375 |
- these scheme operate in a similar manner as KPP (without ghat, of |
- these scheme operate in a similar manner as KPP (without ghat, of |
2376 |
course), however there is only one diffusivity that is used for both |
course), however there is only one diffusivity that is used for both |
2377 |
temperature and salinity (and passive tracers)ç |
temperature and salinity (and passive tracers) |
2378 |
o add offline package |
o add offline package |
2379 |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
2380 |
provided by Stephanie Dutkiewicz |
provided by Stephanie Dutkiewicz |