4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o added pkg/frazil - see frazil_description.tex for details |
8 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
9 |
|
- fix exponents for velocity dependent exchange coefficients: change |
10 |
|
from 2/3(=0) to 0.66666666666666667 |
11 |
|
- move computation of velocity dependent exchange coefficients into |
12 |
|
separate loop, so that it applies to both thermodynamics |
13 |
|
- move some divisions by constants out of loops |
14 |
|
|
15 |
|
checkpoint63j (2012/02/16) |
16 |
|
o pkg/seaice: |
17 |
|
- overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc. |
18 |
|
- SItracer: added run time params, and allow coupling to ocn salinity. |
19 |
|
o pkg/seaice: remove (almost) all divisions by constants within loops |
20 |
|
in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d |
21 |
|
results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only |
22 |
|
those, caused by 1/QI -> recip_QI) -> update output.seaice.txt, |
23 |
|
output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt |
24 |
|
o pkg/seaice : |
25 |
|
- simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula |
26 |
|
= 1 or 2, using newly added run time parameter SEAICE_availHeatTaper. |
27 |
|
- fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148. |
28 |
|
- add permanent SItflux diag that corresponds to TFLUX but includes |
29 |
|
ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget. |
30 |
|
- allow activation/testing of a fix for suspected missing term in |
31 |
|
ocn-ice heat budget (to be confirmed). To test this, you want to |
32 |
|
undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param |
33 |
|
SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic. |
34 |
|
- no change in results, fwd or ad. |
35 |
|
o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below: |
36 |
|
- switch to variable freezing point. |
37 |
|
Results change : cg2d -> 1 digits; ad -> 3-6-6 digits. |
38 |
|
- bug fix : the sublimation term that was missing is now activated. |
39 |
|
Results change : cg2d -> 2 digits; ad -> 8-6-6 digits. |
40 |
|
- bug fix : flooding sign term for SIsal0.NE.0. |
41 |
|
Result change : cg2d -> 8 digits; ad -> 11-12-9 digits. |
42 |
|
o pkg/seaice: |
43 |
|
- unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT |
44 |
|
is now the default, and the old default constant freezing point is recovered |
45 |
|
with SEAICE_tempFrz0 = -1.96, |
46 |
|
SEAICE_dTempFrz_dS = 0., |
47 |
|
- retire SEAICE_freeze (= the old way of specifycing the constant freezing point) |
48 |
|
- remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there. |
49 |
|
- bug fix (thanks to M. Losch) : the sublimation term that was missing is now |
50 |
|
activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM. |
51 |
|
- bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211) |
52 |
|
was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail). |
53 |
|
- bug fix (thanks to O. Jahn) : area loss for melting got messed up in |
54 |
|
seaice_growth r149 for legacy branch (no results change). |
55 |
|
- introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code |
56 |
|
from I. Fenty). |
57 |
|
- results did not change except for global_ocean.cs32x15, mostly due to the |
58 |
|
switch to variable freezing point (see above item for detail). |
59 |
|
o pkg/thsice: |
60 |
|
- fix and simplify interface to salt_plume pkg ; diagnose directly amount of |
61 |
|
seawater freezing in thsice_calc_thickn (not used). |
62 |
|
o pkg/seaice: turbulent flux term specification via run time params. |
63 |
|
- replace CPP switches with run time switches to facilitate testing |
64 |
|
- retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX, |
65 |
|
GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR |
66 |
|
- added runtime parameter : SEAICEturbFluxFormula |
67 |
|
- move Mcphee constants to SEAICE_PARAMS.h |
68 |
|
- seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula; |
69 |
|
SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply); |
70 |
|
remove seaice_summary call (moved to seaice_init_fixed) |
71 |
|
- seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on |
72 |
|
SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms) |
73 |
|
- seaice_summary.F : add missing report of read turbulent flux term set up |
74 |
|
and SITRACER. |
75 |
|
- seaice_check.F : check range; inform and stop if retired CPPs are used |
76 |
|
(incl. SEAICE_AGE). |
77 |
|
- seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without |
78 |
|
CPP switch, same computation as before for the different options. |
79 |
|
- change results at the truncation level. |
80 |
|
o pkg/seaice: |
81 |
|
- remove un-used parameters LAD & MAX_TICE ; add new run-time parameters: |
82 |
|
useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and |
83 |
|
SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY. |
84 |
|
- update verification/*/input*/data.seaice: |
85 |
|
to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY |
86 |
|
code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ; |
87 |
|
and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code, |
88 |
|
set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0. |
89 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY): |
90 |
|
- remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same |
91 |
|
algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0); |
92 |
|
difference in results only due to machine truncation. |
93 |
|
- remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using |
94 |
|
MaykutPolySatVap; keep MIN_LWDOWN. |
95 |
|
- adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation. |
96 |
|
- update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87, |
97 |
|
+ 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits). |
98 |
|
o pkg/salt_plume: |
99 |
|
- isolate saltPlumeFlux array exch into a specific S/R called from |
100 |
|
do_oceanic_phys.F |
101 |
|
- add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice. |
102 |
|
o verification: |
103 |
|
- move untested set-up to MITgcm_contrib/verification_other. |
104 |
|
o pkg/seaice: |
105 |
|
- retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER. |
106 |
|
o pkg/seaice: |
107 |
|
- seaice_solve4temp.F (keeping results unchanged): |
108 |
|
* add 2 future run-time params to select which saturation vapor pressure |
109 |
|
formula is used and how post-iteration fluxes are set. |
110 |
|
Temporary set these 2 params according to option SOLVE4TEMP_LEGACY; |
111 |
|
* New piece of code (not used) to update surf. atmos. heat flux F_ia using |
112 |
|
the linearized expression to stay consistent with tsurf finding. |
113 |
|
- seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x |
114 |
|
can be < 0. |
115 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef): |
116 |
|
- remove from F_ia (and from it's derivative dFiDTs1) the contribution of |
117 |
|
conductive heat flux F_c , and add it explicitly when updating tsurf as |
118 |
|
solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf |
119 |
|
so that now F_ia has a consistent meaning through the entire routine. |
120 |
|
This causes differences at truncation level: update output of fwd exp. |
121 |
|
global_ocean.cs32x15.seaice. |
122 |
|
o pkg/seaice: |
123 |
|
- lots of editing/cleaning in seaice_solve4temp.F + better documentation |
124 |
|
of arrays, sign/direction of fluxes; no effect on results. |
125 |
|
- replace hard coded 273.16 (=previous value of celsius2K) by celsius2K |
126 |
|
in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part); |
127 |
|
note: this should have been done before changing celsius2K default. |
128 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
129 |
|
exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs |
130 |
|
- replace hard coded seawater freezing temp in seaice_solve4temp.F (part |
131 |
|
SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default |
132 |
|
value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater |
133 |
|
freezing temp is consistent with value in seaice_growth.F ; this causes |
134 |
|
differences at machine truncation level: update lab_sea AD output (3/4). |
135 |
|
o pkg/seaice: |
136 |
|
- mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask |
137 |
|
and climsst/sss even when using seaice (to prevent calculation that might |
138 |
|
use SST on land); does not affect any verification exp. |
139 |
|
- apply mask to taux,tauy (in seaice_get_dynforcing.F); update output |
140 |
|
of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix. |
141 |
|
o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness |
142 |
|
over land (non-legacy code) |
143 |
|
o vectorize salt_plume package: |
144 |
|
- add extra code to salt_plume_frac and salt_plume_tendency_apply_s |
145 |
|
- this code computes plumebk everywhere (also over land), thus requires |
146 |
|
code to avoid divisions by zero and catch the case of kLev=Nr. |
147 |
|
- efficiency of salt_plume_frac is still sub-optimal |
148 |
|
o tools (genmake2): |
149 |
|
- fix makefile NAME specification (option: -makefile NAME) by adding |
150 |
|
"-f $MAKEFILE" in few places where it was missing including makedepend |
151 |
|
command (contribution from Paul). |
152 |
|
|
153 |
|
checkpoint63i (2012/01/24) |
154 |
|
o model/src: |
155 |
|
- add factorized versions of some EOS code to find_rho.F, |
156 |
|
define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX) |
157 |
|
o model/src: |
158 |
|
- add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h; |
159 |
|
- change default celsius2K from 273.16 to 273.15 |
160 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
161 |
|
exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd), |
162 |
|
global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm). |
163 |
|
o model/src: add a little initialisation trick to find_rho.F and find_alpha.F |
164 |
|
to make TAF generate vectorizable code |
165 |
|
o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows. |
166 |
|
Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers |
167 |
|
have flags that do this more efficiently. |
168 |
|
o pkg/diagnostics/diagstats_calc.F |
169 |
|
- for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact |
170 |
|
o pkg/obcs (with exch2): |
171 |
|
- derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F) |
172 |
|
and remove code (in obcs_readparms.F) which was based on EXCH of indices |
173 |
|
(through buffer) and did not account for exch2 (e.g., CS-grid) topology. |
174 |
|
o pkg/exf and seaice exp: |
175 |
|
- change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0) |
176 |
|
so that switching off area & heff advection flags does not affect results. |
177 |
|
- change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h |
178 |
|
- keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef |
179 |
|
EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update |
180 |
|
results of verification experiments: 1D_ocean_ice_column(fwd), |
181 |
|
global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8) |
182 |
|
and offline_exf_seaice (all 4). |
183 |
|
o pkg/seaice: |
184 |
|
- remove array YNEG, RIVER, TMIX (replaced by local var) from common block; |
185 |
|
remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef. |
186 |
|
- fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY) |
187 |
|
but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and |
188 |
|
not multi-dim advection; |
189 |
|
- fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and |
190 |
|
SHORTWAVE_HEATING #undef. |
191 |
|
o optim: make Makefile more robust (?) |
192 |
|
o pkg/obcs: |
193 |
|
* fix treatment of obcs_read_pickup for TAF |
194 |
|
o pkg/shelfice: |
195 |
|
* add missing initialisation of num_shifwflx |
196 |
|
* new adjoint verification exp. for isomip |
197 |
|
* change Prandtl and Schmidt numbers from generic formulations |
198 |
|
(in terms of model diffus. and visc.) to separate runtime |
199 |
|
parameters, with Holland and Jenkins (1999) default values. |
200 |
|
o pkg/exf (interpolation): |
201 |
|
- extended input field (2 rows) near the N & S poles: |
202 |
|
* fill in with the symetric value (when even Nb of data in longitude) |
203 |
|
* add average value at the poles only for scalar quantities ; for vector |
204 |
|
component interpolation, skip the averaging and keep duplicated values, |
205 |
|
unless the 2 components have same location (uvInterp=T) in which case |
206 |
|
interpolate the 2 components together using S/R EXF_INTERP_UV. |
207 |
|
- new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field |
208 |
|
together: this allows to account properly for local orientation when |
209 |
|
averaging at N & S pole. |
210 |
|
- add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding |
211 |
|
exf-interpolation near N & S poles. Undef by default. |
212 |
|
- add debug check/print on 1rst iter if debugLevel >=2. |
213 |
|
o pkg/exf: |
214 |
|
- change masking flags definition (no longer "parameter"), put them in |
215 |
|
common block and set them in S/R EXF_INIT_FIXED. |
216 |
|
- change recognized masking flag from s,u,v to c,w,s since the mask |
217 |
|
to use (maskC,W,S) depends on position on model grid and has little to |
218 |
|
do with scalar/vector difference; fix masking if using P-coordinates. |
219 |
|
- fix masking of wind-stress (was wrong if interpolated or read on A-grid) |
220 |
|
and update results of exp. global_with_exf (x2). |
221 |
|
- fix setting of zenith-angle table when SHORTWAVE_HEATING is undef. |
222 |
|
o pkg/obcs |
223 |
|
- S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate) |
224 |
|
o pkg/exf (interpolation): |
225 |
|
- assume periodicity in X only if input field cover full longitude range. |
226 |
|
- improve search for lat. index (supposed to be faster, in ~log2(ny) steps, |
227 |
|
and should vectorise). |
228 |
|
- fix input lat of the 2 added row (in case we provide N.pole data). |
229 |
|
|
230 |
|
checkpoint63h (2011/12/30) |
231 |
|
o pkg/seaice: |
232 |
|
- change declaration of UVM from _RL to _RS in order to get B-grid |
233 |
|
uIce,vIce monitor when _RS = real*4 |
234 |
|
o pkg/offline: |
235 |
|
- new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags); |
236 |
|
- compute vertical velocity if not read from file (switch on exactConserv |
237 |
|
& staggerTimeStep); |
238 |
|
- fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq. |
239 |
|
o verification: |
240 |
|
- update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input) |
241 |
|
with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m": |
242 |
|
fix Pb in yG definition @ 2 missing corners (previously yG was averaged); |
243 |
|
- update output of exp. global_ocean.cs32x15.viscA4 after changing |
244 |
|
grid-file angles (used here for coriolis-3d); |
245 |
|
- remove (or gzip) few files not needed to run fizhi-cs experiments. |
246 |
|
o pkg/exf (vector interpolation): |
247 |
|
- rotate vector component toward local grid-axis orientation using grid-angles |
248 |
|
(stored in GRID.h) instead of locally computed rotation angle; keep old code |
249 |
|
available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default). |
250 |
|
o pkg/seaice: |
251 |
|
- allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION |
252 |
|
undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined. |
253 |
|
o pkg/PKG_OPTIONS.h files: |
254 |
|
- move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h", |
255 |
|
outside of the #ifdef ALLOW_THISPKG / #endif block. |
256 |
|
- update verification/*/code/PKG_OPTIONS.h files. |
257 |
|
o add a verification experiment (offline_exf_seaice/input.seaice) that test |
258 |
|
the B-grid LSOR solver |
259 |
|
o pkg/seaice: sort out emissivity and long wave radiation step 2: |
260 |
|
- add emissivity for snow and ice as new run-time parameters |
261 |
|
(unfortunately) that default to the corresponding exf values; this |
262 |
|
changes results in most verification experiments so that for backward |
263 |
|
compatibility these parameter have to be set explicitly to inconsistent |
264 |
|
values (ugly); |
265 |
|
- the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired |
266 |
|
emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp |
267 |
|
until we agree how to handle this bug properly |
268 |
|
o pkg/exf (interpolation): |
269 |
|
- add a set of run-time param ({inputfield}_interpMethod), one for |
270 |
|
each interpolated input field, to select the interpolation method |
271 |
|
with a value of zero switching off the interpolation; |
272 |
|
- print interpolation parameters to standard output; |
273 |
|
- refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined |
274 |
|
(to use instead runoff_interpMethod=0 in data.exf). |
275 |
|
- simplify default setting of interpolation parameters (for all fields, |
276 |
|
set position to match model grid cell-center position, leading to trivial |
277 |
|
interpolation in case of regular Lat-Lon grid) and fix for the case of |
278 |
|
non-uniform delY. |
279 |
|
o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for |
280 |
|
within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1. |
281 |
|
this factor is absolutely required, because the lw exitance (= out-going |
282 |
|
long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown, |
283 |
|
where the reflectivity rho = 1-emissivity for conservation reasons. Once |
284 |
|
this is established, we can remove the CPP-Flag (if we want to). |
285 |
|
o pkg/seaice: |
286 |
|
- qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and |
287 |
|
ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined |
288 |
|
- sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity |
289 |
|
what the name implies (and not emissivity*BoltzmannConstant), this means |
290 |
|
the old default value of 5.5e-8 now means |
291 |
|
5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in |
292 |
|
S/R exf_readparms |
293 |
|
- FV-discretization of the B-grid LSOR solver, turn on with |
294 |
|
SEAICE_LSRBNEW. This new solver also involves a slight re-organization |
295 |
|
of the calling routine dynsolver, so that B and C-grid code look a |
296 |
|
little more alike. |
297 |
|
- fix index bugs in ostres.F (B-grid code) |
298 |
|
o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better |
299 |
|
o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the |
300 |
|
default for SEAICE_emissivity, if useEXF; requires setting a wrong |
301 |
|
parameter value in global_ocean.cs32x15/input.seaice/data.seaice for |
302 |
|
backward compatiblity |
303 |
|
o model/src: use sigmaR in calc_ivdc |
304 |
|
|
305 |
|
checkpoint63g (2011/12/16) |
306 |
|
o pkg/seaice/seaice_growth.F: |
307 |
|
fix heat conservation of the coupled ocean-seaice system. |
308 |
|
when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of |
309 |
|
solid vs liquid water treatment is resolved via QNET. |
310 |
|
o pkg/seaice/seaice_growth.F: |
311 |
|
add missing term for sublimation in saltFlux, which was breaking conservation. |
312 |
|
o pkg/seaice/seaice_model.F: |
313 |
|
Remove this patholigical case treatment in evolution branch, |
314 |
|
where it is un-necessary and breaks conservation. |
315 |
|
Update global_ocean.cs32x15/results accordingly for |
316 |
|
output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt |
317 |
|
o model/src: |
318 |
|
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in |
319 |
|
external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE. |
320 |
|
o pkg/obcs: |
321 |
|
modify Stevens boundary conditions so that S/R obcs_calc_stevens computes |
322 |
|
tendency for temperature and salinity that is then applied to update |
323 |
|
theta and salt in S/R obcs_apply_ts; this requires proper masking of all |
324 |
|
horizontal advection and diffusion contributions on the boundary (in |
325 |
|
S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and |
326 |
|
removing the mask in S/R timestep_tracer. The advantage of this approach is |
327 |
|
that the updated tracer values include contributions from the surface |
328 |
|
forcing and vertical diffusion. |
329 |
|
This modification changes exp4.stevens because of vertical diffusion. |
330 |
|
o model/src: |
331 |
|
change non-curvilinear grid setting to also work with exch2 + blank tiles: |
332 |
|
- move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst |
333 |
|
face dimensions. |
334 |
|
- new S/R INI_LOCAL_GRID to define model tile-local grid (using same units |
335 |
|
as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID |
336 |
|
and INI_SPHERICAL_POLAR_GRID. |
337 |
|
change test-experiment global_ocean.90x40x15: |
338 |
|
- split the domain in many more tiles (9x4 tiles of 10x10 each); |
339 |
|
- switch to exch2 and remove 1 blank-tile (but only for MPI test). |
340 |
|
- update results of both test (std & dwnslp). |
341 |
|
o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in |
342 |
|
tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation |
343 |
|
o model/src: |
344 |
|
- take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS |
345 |
|
and fix initialisation when using sigma-coords. |
346 |
|
o model/src: |
347 |
|
- improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc. |
348 |
|
to their current value at the beginning of forward_step.F": add a new run-time |
349 |
|
switch "doResetHFactors" (default=false) and use it to do (or not) the resetting. |
350 |
|
- set doResetHFactors=T in the following test exp: |
351 |
|
global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS), |
352 |
|
global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS) |
353 |
|
and tutorial_global_oce_in_p (nonLinFS in p) |
354 |
|
o pkg/ecco |
355 |
|
- added IES cost term |
356 |
|
o verification/advect_xz |
357 |
|
- scale down the depth by 1/100 (from 200 km to just 2.km) |
358 |
|
- add secondary test using divergent flow, r-star and implicit vertical advection. |
359 |
|
- add note (check_conserve_TS.txt) and matlab script to check global |
360 |
|
conservation of T & S with NonLin-FreeSurf and Adams-Bashforth. |
361 |
|
o pkg/rbcs: |
362 |
|
- add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F). |
363 |
|
o pkg/obcs (Stevens BCs): |
364 |
|
- fix various problems in the phase speed computations of the Stevens |
365 |
|
boundary conditions: |
366 |
|
- sign error for western and southern boundaries, |
367 |
|
- time tendencies were underestimated by factor of dTracerLev and some just |
368 |
|
zero (for multidim advection schemes) -> now estimate time tendencies |
369 |
|
from difference between previous (n) time level and the one before (n-1); |
370 |
|
this requires storing a field per tracer per boundary, also in the pickup |
371 |
|
files. |
372 |
|
- replace deltaTmom in cflMer/Zon computation with dTracerLev |
373 |
|
- set default phase velocity to cflMer/Zon |
374 |
|
- update verification experiment exp4.stevens |
375 |
|
o pkg/generic_advdiff (implicit_r): |
376 |
|
- fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf |
377 |
|
(remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F); |
378 |
|
- fix implicit vertical diffusion or advection with NonLin FreeSurf |
379 |
|
(was using current recip_hFacC instead of future recip_hFacC): set future |
380 |
|
recip_hFac in thermodynamics.F and pass & use it in all vertical implicit |
381 |
|
solver S/R ; |
382 |
|
- fill diagnostics of vertical advective fluxes (computed from tendency) |
383 |
|
when using implicit vert. advection; |
384 |
|
- update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion: |
385 |
|
global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD), |
386 |
|
tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD) |
387 |
|
and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5. |
388 |
|
o pkg/diagnostics: |
389 |
|
- add diags for T & S tendency which goes through Adams-Bashforth. |
390 |
|
|
391 |
|
checkpoint63f (2011/11/30) |
392 |
|
o pkg/obcs/obcs_calc_stevens.F: |
393 |
|
- join some loops to reduce number of if-statements |
394 |
|
- fix a bug in code for northern and southern boundaries. |
395 |
|
o pkg/seaice/seaice_init_varia.F |
396 |
|
- undo resetting UVM=0 that has slipped in unnoticed in r1.49 and |
397 |
|
caused zero ice-velocities for the B-grid code |
398 |
|
o pkg/seaice/seaice_init_fixed.F |
399 |
|
- fix a bug in the initialisation of the second metric terms |
400 |
|
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0. |
401 |
|
- this affects all seaice configurations with useCurviLinearGrid = .true. |
402 |
|
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms |
403 |
|
= .true. (default) |
404 |
|
- the only verification experiment affected is global_ocean.cs32x15: |
405 |
|
icedyn, seaice, and seaice_dynmix (AD) |
406 |
|
o pkg/thsice/thsice_diagnostics_state.F |
407 |
|
- only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does |
408 |
|
not contain garbage that can lead to surprises in diagstats_calc.F |
409 |
|
o model/src: |
410 |
|
- move bi,bj loops inside INTEGR_CONTINUITY ; |
411 |
|
- call INTEGR_CONTINUITY directly from forward_step.F |
412 |
|
(previously called from momentum_correction_step.F) |
413 |
|
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F, |
414 |
|
forward_step.F and pkg/ecco/the_main_loop.F |
415 |
|
o model/src/do_oceanic_phys.F: |
416 |
|
- reset addMass to zero only if useICEFRONT ; |
417 |
|
- separated k-loop for rhoInSitu calculation ; |
418 |
|
- add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P) |
419 |
|
and at constant T,S (= WdRHOdP); |
420 |
|
NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport |
421 |
|
of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical |
422 |
|
transport of locally-referenced potential density); |
423 |
|
to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP) |
424 |
|
o gluemnc: |
425 |
|
- replace ncrcat with ncks when adding variables to *.glob.nc |
426 |
|
- change the way variables without record dimensions are handled so that |
427 |
|
files that have variables with and without record variables can be glued: |
428 |
|
add a record dimension with a new unique name to be able to differentiate |
429 |
|
between variable with and without a-prior record dimensions. Remove |
430 |
|
this record dimension before adding the variable to the *.glob.nc file. |
431 |
|
This procedure automatically works also for grid.*.nc files that do not |
432 |
|
have any record dimension. |
433 |
|
o verification/cpl_aim+ocn: |
434 |
|
- generate new reference output on baudelaire (gfortran, mpich2) (previously |
435 |
|
from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script. |
436 |
|
o pkg/obcs/obcs_calc_stevens.F: |
437 |
|
- add code for northern and southern boundaries. |
438 |
|
- reorder some loops to save some operations and so that drFBar can be scalar |
439 |
|
o model/src: |
440 |
|
- re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine |
441 |
|
truncation) and add diagnostics for Adams-Bashforth tendency increment. |
442 |
|
- update test-exp. AD output: |
443 |
|
1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl; |
444 |
|
and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20, |
445 |
|
front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5), |
446 |
|
global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4), |
447 |
|
matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre, |
448 |
|
tutorial_global_oce_in_p, tutorial_global_oce_latlon and |
449 |
|
tutorial_plume_on_slope. |
450 |
|
o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX |
451 |
|
that vectorises. This code uses 3 extra 2D fields, F90 array assignments |
452 |
|
and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX |
453 |
|
does not even come with an F77 compiler anymore, this should not be |
454 |
|
a limitation |
455 |
|
|
456 |
|
checkpoint63e (2011/11/06) |
457 |
|
o pkg/seaice adjoint of LSR: |
458 |
|
- substantially rework STORE dirs. |
459 |
|
- add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED |
460 |
|
this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields |
461 |
|
and only perform SOLV_MAX_FIXED adjoint iters. |
462 |
|
If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration |
463 |
|
always goes to same record, meaning that the last forward field will be |
464 |
|
the one used in the adjoint - an approximation. |
465 |
|
- now produces non-zero LSR-related gradients, and acceptable gradients for |
466 |
|
An's zonal (x-z) test case (to be checked in) |
467 |
|
- lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR |
468 |
|
(but these are screwed up by the thermodynamics in the first place); |
469 |
|
reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution; |
470 |
|
output_adm.txt also reflects changes to seaice_lsr |
471 |
|
- global_ocean.cs32x15: |
472 |
|
* the "default" input_ad.seaice has been re-defined to always exclude dynamics |
473 |
|
(output_adm.seaice.txt was updated) |
474 |
|
* new input_ad.seaice_dynmix tests a forward LSR / backward free-drift |
475 |
|
(output_adm.seaice_dynmix.txt) |
476 |
|
o test-exp. exp4+stevens: |
477 |
|
- switch off pTracers and nonHydrostatic (restart problems with NH); update output |
478 |
|
o pkg/seaice (lsr solver): |
479 |
|
- put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only); |
480 |
|
update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15 |
481 |
|
- fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD) |
482 |
|
- new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution |
483 |
|
into initial guess for linearised solver; use weight ~ (1/err)^2,4. |
484 |
|
- compute (with new S/R) and print initial (+ free-driff sol. if available) |
485 |
|
and final residual of linearised system. |
486 |
|
o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity |
487 |
|
(requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F) |
488 |
|
o pkg/obcs: Stevens BCs (still only for east and west) |
489 |
|
- fix Stevens BCs by using intermediate velocities of previous |
490 |
|
time step as "baroclinic" contribution rather velocity of one grid cell |
491 |
|
inside the boundaries; more consistent but makes the entire treatment |
492 |
|
more complicated, requires new pickup files and two new S/Rs: |
493 |
|
obcs_copy_uv_n and obcs_save_uv_n |
494 |
|
keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY |
495 |
|
(undefined by default) |
496 |
|
- silently move computation of some grid factors into separate loops to |
497 |
|
save some recomputations |
498 |
|
- add a hack for non-linear free surface |
499 |
|
- add a verification experiment to exp4 that tests this code |
500 |
|
o make gluemnc/xplodemnc work with (moron) non-GNU shell tools |
501 |
|
|
502 |
|
checkpoint63d (2011/10/25) |
503 |
|
o pkg/obcs + seaice-dynamics: |
504 |
|
- new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before |
505 |
|
solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB |
506 |
|
values (consistent with an implicit method). |
507 |
|
- add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to |
508 |
|
return to older implementation (same results as before); note that none of |
509 |
|
the "experimental" OBCS_SEAICE options are implemented in the new version. |
510 |
|
- switch test exp. seaice_obcs to use new version (update output). |
511 |
|
o pkg/seaice: |
512 |
|
- add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS) |
513 |
|
- add parenthesis in Water-Ice drag calculations (evp & lsr); |
514 |
|
- in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1; |
515 |
|
and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice) |
516 |
|
- update output of test exp lab_sea that uses evp or lsr (fwd+ad) |
517 |
|
and global_ocean.cs32x15 (icedyn & seaice fwd+ad). |
518 |
|
o pkg/layers: |
519 |
|
- Include potential density as new coordinate (Thanks to David Munday) |
520 |
|
o pkg/dic: |
521 |
|
- Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add |
522 |
|
carbonate computation/output to CALC_PCO2_APPROX |
523 |
|
o pkg/generic_advdiff |
524 |
|
- make TAF generate code that vectorizes: |
525 |
|
gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F |
526 |
|
o model/src: |
527 |
|
- improve vectorization also for adjoint code of |
528 |
|
solve_tridiagonal and solve_pentadiagonal. As this requires up to |
529 |
|
5 new 3D-fields, this code is only turned on for the combination of |
530 |
|
ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message |
531 |
|
for singular matrix check (only for TARGET_NEC_SX). |
532 |
|
- remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to |
533 |
|
ALLOW_AUTODIFF. This flag now needs to be set outside of |
534 |
|
solve_tri/pentadiagonal.F |
535 |
|
o pkg/exf: |
536 |
|
- fix previous modif in exf_readparms.F (revision 1.66: treatment of |
537 |
|
optional namelist EXF_NML_OBCS). |
538 |
|
- add many debug-print (to trace down where pkg/cal error msg comes from) |
539 |
|
o pkg/mom_vecinv/mom_vi_hdissip.F |
540 |
|
- rearrange loops so that vectorization is improved and in particular |
541 |
|
the adjoint routine vectorizes. The code is a little longer now, but I |
542 |
|
think easier to read. |
543 |
|
Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested. |
544 |
|
o pkg/seaice: |
545 |
|
- allow to specify initial seaice velocity from files (uIceFile,vIceFile) |
546 |
|
o pkg/exch2: |
547 |
|
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
548 |
|
used as default; keep using matrix version in adjustment.cs-32x32x1. |
549 |
|
o tools/build_options: |
550 |
|
- after merging some MPI and/or multi-threads specific optfiles so that |
551 |
|
the modified default optfile support both built (using genmake2 -mpi |
552 |
|
for the MPI built, using genmake2 -omp for OpenMP built), |
553 |
|
move now obsolete optfiles to tools/build_options/unsupported/ |
554 |
|
(add copy of email sent to support list in doc/optfiles_changes.txt) |
555 |
|
|
556 |
|
checkpoint63c (2011/09/28) |
557 |
|
o pkg/ebm: |
558 |
|
- fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of |
559 |
|
test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d) |
560 |
|
o pkg/seaice (SItracer pickup) |
561 |
|
* Simple code for pickup of SItracer fields (#define ALLOW_SITRACER) |
562 |
|
To be done: |
563 |
|
- thorough testing of missing fields in S/R seaice_read_pickup |
564 |
|
- thorough matching between generic tracers and specific fields used |
565 |
|
(e.g. volume-weighted age, area-weighted age, salinity, ...) |
566 |
|
o pkg/grdchk: |
567 |
|
- all procs calculate and print finite-difference gradient (for testreport) |
568 |
|
- change description output used by testreport; |
569 |
|
- AD testing: also compare and report Finite-difference gradient; |
570 |
|
=> update all output_adm*.txt |
571 |
|
o test exp. global_ocean_ebm: |
572 |
|
- switch back useRealFreshWaterFlux (no problem anymore with run-off); |
573 |
|
and turn on exactConserve; update (fwd) output. |
574 |
|
o pkg/seaice (LSR): |
575 |
|
- print to STDOUT number of solver iterations at SEAICE_monFreq interval. |
576 |
|
- modify solver to deal cleanly with u/v switch at face edges (CS-grid): |
577 |
|
* identical results with non-CS topology (but save up to half of EXCH calls) |
578 |
|
* no much changes in cs-32 verification tests since no ice at face edges |
579 |
|
(differences due to convergence criteria, since nb of iterations changed) |
580 |
|
* expect some differences on lat-lon-cap grid. |
581 |
|
update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice) |
582 |
|
o pkg/exch2: |
583 |
|
- add new CPP option to disable Cumul-Sum matrix (to save storage when using |
584 |
|
many tiles); until alternative coding is added, just add a stop. |
585 |
|
o pkg/kpp: |
586 |
|
- move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F |
587 |
|
to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list). |
588 |
|
o optfiles: |
589 |
|
- merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles |
590 |
|
into corresponding standard one, which now support different build: |
591 |
|
(when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built) |
592 |
|
- add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael) |
593 |
|
o pkg/obcs (seaice): |
594 |
|
- add missing EXCH for uIce,vIce after applying OBCS; |
595 |
|
- remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding |
596 |
|
argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R |
597 |
|
EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F; |
598 |
|
- fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared) |
599 |
|
- verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi |
600 |
|
and eedata.mth for MPI and mutlti-threaded testing. |
601 |
|
o pkg/flt: |
602 |
|
- make FLT EXCH working with multi-threads (and MPI + multi-threads); |
603 |
|
- use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h; |
604 |
|
- fix pickup and trajectories + profiles output with multi-threads; |
605 |
|
- add parameter to select group of fields to write along trajectory and |
606 |
|
profile (default unchanged); |
607 |
|
- only call PORT_RAND* function when flt_noise <> 0; |
608 |
|
- add multi-threaded test for verification exp. flt_example. |
609 |
|
o eesupp/src: |
610 |
|
- fix S/R ALL_PROC_DIE for MPI+multi-threads. |
611 |
|
- USE_OMP_THREADING: check that number of threads (from eedata) matches |
612 |
|
actual number (from env.var. setting). |
613 |
|
o pkg/ebm: |
614 |
|
- fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file. |
615 |
|
- add multi-threaded test for verification exp. global_ocean_ebm |
616 |
|
|
617 |
|
checkpoint63b (2011/08/29) |
618 |
|
o pkg/ebm: |
619 |
|
- fix sign of runoff; |
620 |
|
- update directly forcing fields (Qnet,EmPmR) to use standard |
621 |
|
external_forcing_surf.F (remove ebm_forcing_surf.F); |
622 |
|
- avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F); |
623 |
|
- set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm) |
624 |
|
and apply relaxation towards corresponding SST field (2-D map or ZonAver). |
625 |
|
- update global_ocean_ebm parameters file data and update output (fwd+ad). |
626 |
|
o verification/matrix_example: |
627 |
|
- split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for |
628 |
|
MPI and mutlti-threaded testing. |
629 |
|
o pkg/matrix: |
630 |
|
- change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ; |
631 |
|
- fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter); |
632 |
|
- fix for multi-threaded (remove DATA statement); |
633 |
|
- use standard DIFFERENT_MULTIPLE function; |
634 |
|
- add MATRIX_OPTIONS.h |
635 |
|
o verification/matrix_example: |
636 |
|
To allow to split the domain in several tiles, change the domain size |
637 |
|
from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on |
638 |
|
Western side) of land points. |
639 |
|
o (*_)write_pickup: |
640 |
|
- fix few bugs in mypackage_read/write_pickup.F |
641 |
|
- in MDS_WR_METAFILES calls, replace "myTime" by a local copy into |
642 |
|
array of length 1 (was caught by compiler syntax-check). |
643 |
|
o pkg/diagnostics (velocity potential solver): |
644 |
|
- fix initialisation of main diagonal matrix (for overlap values) |
645 |
|
o tools/build_options: |
646 |
|
- towards single optfile for MPI and non-MPI built: merge few +mpi optfile |
647 |
|
into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11) |
648 |
|
- linux_amd64_gfortran: merge +mpi_generic version into standard optfile: |
649 |
|
* move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ; |
650 |
|
* FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list; |
651 |
|
and use "-devel" testreport option for standard testing on baudelaire. |
652 |
|
o pkg/grdchk: |
653 |
|
- Assume that all gradient-check position are within the same tile |
654 |
|
corresponding to global indices (iGloTile,jGloTile) and that |
655 |
|
positions (i,j indices or nbeg) are local to this tile; |
656 |
|
- set tile local-indices and proc. number according to tile global-indices; |
657 |
|
- remove grdchkwhichproc from namelist (retired param); |
658 |
|
- send adjoint gradient to all procs so that all procs print it to STDOUT; |
659 |
|
- switch on MPI test for global_ocean.90x40x15 AD test experiment. |
660 |
|
o adding package bbl (Bottom Boundary Layer) |
661 |
|
description in MITgcm/pkg/bbl/bbl_description.tex |
662 |
|
example/test experiment in MITgcm_contrib/bbl |
663 |
|
o adjoint verifications |
664 |
|
- changed 5 experiments to multi-tiles |
665 |
|
* global_ocean.90x40x15 |
666 |
|
* obcs_ctrl |
667 |
|
* offline_exf_seaice |
668 |
|
* tutorial_dic_adjoffline |
669 |
|
* tutorial_tracer_adjsens |
670 |
|
changed reference output for those that crossed tile boundaries |
671 |
|
(changed choices of gradient check positions) |
672 |
|
- with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi) |
673 |
|
- temporary bug fix in grdchk_loc.F for obcs |
674 |
|
o genmake2 & testreport |
675 |
|
- add target "obj" (just for OBJFILES files) to Makefile; |
676 |
|
- add option to specify FEXTRAFLAGS on command line. |
677 |
|
o pkg/mypackage: |
678 |
|
- remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS |
679 |
|
|
680 |
|
checkpoint63a (2011/08/02) |
681 |
|
o pkg/diagnostics (velocity potential): |
682 |
|
- fix velocity-potential calculation when using OBCS: balance net inflow |
683 |
|
at each level (new S/R OBCS_DIAG_BALANCE). |
684 |
|
- fix some of the problems with OBCS in stream-function calculation. |
685 |
|
o pkg/exf/exf_readparms.F |
686 |
|
- make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF, |
687 |
|
EXF_NML_OBCS) more consistent, so that you need not have these lists |
688 |
|
in data.exf when they are not used. |
689 |
|
o optim/optim_readdata.F: |
690 |
|
- add some output about obcs variables that might help debugging |
691 |
|
- add a check about nvarlength |
692 |
|
o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec |
693 |
|
o pkg/diagnostics (velocity potential): |
694 |
|
- fix mask for OBCS (still problems in stream-function with OBCS); |
695 |
|
- add specific parameter (default = main code CG2D params) for solver; |
696 |
|
- in case of poor convergence, use solution corresponding to lowest residual. |
697 |
|
o pkg/seaice/seaice_growth.F: small changes that permit vectorizable |
698 |
|
adjoint code. In general statements like tmpscal=fld(i,j) are problematic |
699 |
|
and should be avoided where possible. |
700 |
|
o model/src (rStar): |
701 |
|
- include r* effect on reference-state (PhiRef) in totPhiHyd |
702 |
|
(so that it's really the potential anomaly at the cell center); |
703 |
|
affect solution only if z* with full pressure in EOS. |
704 |
|
- test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and |
705 |
|
update output (because of z* in totPhiHyd and viscA4 changes); |
706 |
|
- keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly |
707 |
|
@ constant r) until interpolation at constant r is implemented. |
708 |
|
o pkg/diagnostics |
709 |
|
- fix RCENTER diagnostics in case cell center is not at interface middle |
710 |
|
o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use |
711 |
|
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies |
712 |
|
that THETA and SALT are "conservative temperature" and "absolute |
713 |
|
salinity" |
714 |
|
o pkg/ctrl |
715 |
|
- fix computation of endrec in s/r ctrl_init_rec |
716 |
|
- ctrl_pack/unpack_*: remove unused variables and some obsolete code |
717 |
|
o pkg/seaice/seaice_growth.F |
718 |
|
- fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code, |
719 |
|
remove then obsolete STORE directives |
720 |
|
- fix STORE directives for tice and tices, so that only the |
721 |
|
appropriate part of the fields are stored (and not the entire |
722 |
|
field); update global_ocean.cs32x15.seaice AD output. |
723 |
|
- cosmetic changes: adjust CPP flags and indentation for better |
724 |
|
legibilty |
725 |
|
o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by |
726 |
|
Chris Wilson) |
727 |
|
o pkg/gmredi: |
728 |
|
Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF), |
729 |
|
and test it in verification exp. "front_relax.bvp" (update output.bvp.txt) |
730 |
|
|
731 |
|
checkpoint63 (2011/07/11) |
732 |
|
o pkg/exch2: |
733 |
|
- rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h |
734 |
|
- exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the |
735 |
|
(2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y |
736 |
|
increments, calculates Cumul-Sum @ tile origin and sends results to each tile. |
737 |
|
o pkg/diagnostics: |
738 |
|
- deal with pairs of post-processed diags which are computed together; in |
739 |
|
particular, re-order list of diags within 1 file to save 2nd computation. |
740 |
|
- add S/R to compute velocity stream-function (called after velocity-potential |
741 |
|
calculation) from divergence free transport -> new diagnostics "PsiVEL". |
742 |
|
- add parameter to select grid-point location where PsiVEL == 0. |
743 |
|
o eesupp/src: |
744 |
|
new S/R to calculate cumulated sum on tiled array, corner grid-cell location |
745 |
|
(specific S/R needed with exch2 topology - for now, just print an error msg) |
746 |
|
o pkg/shelfice |
747 |
|
- Implement friction velocity-dependent transfer coefficients following |
748 |
|
Holland and Jenkins, JPO, 1999 |
749 |
|
Original code by M. Losch with small modifs. |
750 |
|
Enable with CPP option SHI_ALLOW_GAMMAFRICT |
751 |
|
and runtime flag SHELFICEuseGammaFrict |
752 |
|
o verification lab_sea & global_ocean.cs32x15: |
753 |
|
- use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local): |
754 |
|
does not miss some dependencies (but is slower) and also works with many files |
755 |
|
(default makedepend limitation for AD built). |
756 |
|
- use cyrus_makedepend in adjustment.128x64x1 (so that it still tested). |
757 |
|
o pkg/diagnostics: |
758 |
|
- add run-time parameter "useMissingValue" (def=False) to fill land-point |
759 |
|
(i.e., where mask=0) with MissingValue ; used only in MNC output file. |
760 |
|
This replaces CPP-option DIAGNOSTICS_MISSING_VALUE. |
761 |
|
- Extend the use of "missing_value" setting from data.diagnostics for the case |
762 |
|
of counter-diagnostics (where fraction-weight is zero). This applies both to |
763 |
|
MNC and MDS output files. |
764 |
|
o pkg/seaice/seaice_growth.F: |
765 |
|
- add 'a priori' cap of latent heat flux based on actual mass considerations |
766 |
|
when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the |
767 |
|
non-legacy seaice_solve4temp. |
768 |
|
- add diagnostic of the residual sublimation freshwater flux (the freshwater |
769 |
|
flux taken from the ocean if the total actual latent heat fluxes exceed |
770 |
|
the maximum) |
771 |
|
- remove the CPP switch around the *_FWbySublim unit change and move diagnostic |
772 |
|
fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F. |
773 |
|
- add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef |
774 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim). |
775 |
|
- bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET. |
776 |
|
- bug fix : missing part to Martin's r_FWbySublim pathological case fix. |
777 |
|
o verification 1D_ocean_ice_column: |
778 |
|
made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet |
779 |
|
update results |
780 |
|
o pkg/diagnostics: |
781 |
|
- Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P') |
782 |
|
which are not filled-up but computed from other diags ; In this case, the mate |
783 |
|
diag points to the primary (filled-up) diag to used for post processing. |
784 |
|
- Update Velocity-potential computation using post-processed diag framework. |
785 |
|
==> Change the ordering of fields and time-periods in MDS output file |
786 |
|
when using periodic averaging: now writes one time record with the full set |
787 |
|
of fields for this time period, then the next time reccord (it used to be |
788 |
|
one field with the full set of time records then the next field). |
789 |
|
Note: this is now similar to NetCDF (MNC) output file. <== |
790 |
|
|
791 |
|
checkpoint62z (2011/06/21) |
792 |
|
o adjoint monitor: |
793 |
|
- Add adjoint monitor output for packages exf, seaice |
794 |
|
and update relevant testreport output |
795 |
|
o pkg/seaice: |
796 |
|
- re-order diags inits so that they appear in order in available_diagnostics.log |
797 |
|
- added diags: hsnow thermo. rates of change, area preceeding ridiging process, |
798 |
|
area/heff/hsnow preceeding thermodynamic growth/melt. |
799 |
|
- modified diag: SIdA; output actual effect, as the description states. |
800 |
|
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
801 |
|
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
802 |
|
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
803 |
|
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
804 |
|
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
805 |
|
- added diagnostics for seaice generic tracers (SItr*). |
806 |
|
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
807 |
|
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
808 |
|
I. Fenty: 18-Jun-2011: |
809 |
|
Minor changes to seaice package: |
810 |
|
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
811 |
|
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
812 |
|
- Differentiated "regularization variables" from "floor variables" |
813 |
|
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
814 |
|
* hiceMin became SEAICE_hice_reg (old hiceMin) |
815 |
|
(with _reg meaning regularization variable) |
816 |
|
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
817 |
|
so as to ensure energy conservation when going between phases |
818 |
|
- A22 was not used anywhere |
819 |
|
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
820 |
|
well-boundedness and smooth adjoint in seaice_growth.F |
821 |
|
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
822 |
|
because the old regularization always set heffActual >= 0.05 cm |
823 |
|
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
824 |
|
on AREA when HEFF > 0. |
825 |
|
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
826 |
|
requiring that DISABLE_AREA_FLOOR *not* be defined |
827 |
|
Affected verifications: |
828 |
|
- 1D_ocean_ice_column (output.txt output_adm.txt) |
829 |
|
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
830 |
|
o pkg/diagnostics: |
831 |
|
- move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R). |
832 |
|
- rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument |
833 |
|
(was _RL, now integer) with option = 0 to retrieve all levels. |
834 |
|
- add pieces of code to compute velocity potential at each level (new diagnostics |
835 |
|
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
836 |
|
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
837 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
838 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
839 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
840 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
841 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
842 |
|
o model/src (rStar): |
843 |
|
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
844 |
|
affect solution only if z* with full pressure in EOS; |
845 |
|
update output of test-exp global_ocean.90x40x15. |
846 |
|
o pkg/seaice: |
847 |
|
- introduce siEps=1e-5 parameter |
848 |
|
- use areaMax in AREA update (part 4), consistent with ridging step (part 2.5). |
849 |
|
- re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code. |
850 |
|
- introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer. |
851 |
|
For now it covers, and was tested for, ice salinity and age (attached to HEFF), |
852 |
|
as well as ice cover age and ridging index (attached to AREA). |
853 |
|
For now the run time parameters (in data.seaice/SEAICE_PARM03) are |
854 |
|
SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA'). |
855 |
|
Up to SItrMaxNum=3 tracers can be used simultaneously. |
856 |
|
o pkg/salt_plume: |
857 |
|
-introduce SPsalFRAC run time parameter that sets the fraction of the |
858 |
|
salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically) |
859 |
|
that gets vertically redistributed (fluxed down) by pkg/salt_plume. |
860 |
|
o model debug options: |
861 |
|
- Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored |
862 |
|
in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h). |
863 |
|
- Refine debug-msg printing selection (3 new levels): |
864 |
|
debugMode : controls printing of debug messages (sequence of S/R calls). |
865 |
|
debugLevel : controls printing of algorithm-relevant auxiliary/debug messages |
866 |
|
debLevZero = 0 ; /* level of disabled aux. msg printing */ |
867 |
|
debLevA = 1 ; /* level of minimum aux. msg printing */ |
868 |
|
debLevB = 2 ; /* level of low aux. print (report read-file opening)*/ |
869 |
|
debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */ |
870 |
|
debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */ |
871 |
|
debLevE = 5 ; /* level of extensive debug printing */ |
872 |
|
New debugLevel default: with default debugMode value (=F), |
873 |
|
= 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.; |
874 |
|
and if debugMode=T, default debugLevel = 4 (debLevD). |
875 |
|
Relation with previous settings: |
876 |
|
debLevB (=2) corresponds to former debLevA (=1) |
877 |
|
debLevD (=4) corresponds to former debLevB (=2) |
878 |
|
Note: |
879 |
|
a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before); |
880 |
|
b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs); |
881 |
|
to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5) |
882 |
|
- Add new parameter (printResidualFreq, read from PARM02 namelist) to print |
883 |
|
detailed CG solvers convergence; off (=0) by default, except if debugLevel=5. |
884 |
|
o pkg/obcs: |
885 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
886 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
887 |
|
o pkg/thsice: |
888 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
889 |
|
2nd layer seaice sublimation (unlikely to happen) |
890 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
891 |
|
done in gad_advection & seaice_advection). |
892 |
|
o adjoint: |
893 |
|
bug fix spotted by Gael Forget: |
894 |
|
seaice_advection and thsice_advection still had |
895 |
|
legacy CPP options to avoid CS corner updates for adjoint |
896 |
|
o pkg/seaice: |
897 |
|
=> Change some of the defaults (2011/05/29): |
898 |
|
- change SEAICEuseFluxForm default (from False to True) |
899 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
900 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
901 |
|
avection scheme is used without any diffusion. |
902 |
|
also: |
903 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
904 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
905 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
906 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
907 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
908 |
|
update results of test exp.: |
909 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
910 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
911 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
912 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
913 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
914 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
915 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
916 |
|
o pkg/seaice/seaice_growth.F: |
917 |
|
- use Ian Fenty's capping formulas for actual ice |
918 |
|
thickness thoughout EVOLUTION branch. |
919 |
|
- put treatment pathological case #2) in CPP brackets |
920 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
921 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
922 |
|
o pkg/seaice: |
923 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
924 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
925 |
|
also pass fac as a param, which can be 1. (to update the tendency |
926 |
|
field) or the time step (to update the field itself). |
927 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
928 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
929 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
930 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
931 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
932 |
|
o pkg/seaice: |
933 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
934 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
935 |
|
to just compute the laplacian of input-field. |
936 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
937 |
|
- fix flux-form version in diffus.F to conserve tracer. |
938 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
939 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
940 |
|
|
941 |
|
checkpoint62y (2011/05/26) |
942 |
|
o pkg/seaice: |
943 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
944 |
|
a_QSWbyATM_cover in qnet (as it should be). |
945 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
946 |
|
(output.seaice.txt output_adm.seaice.txt). |
947 |
|
o pkg/seaice + obcs: |
948 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
949 |
|
equivalent of assuming no tracer gradient outside the OB region. |
950 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
951 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
952 |
|
after changes above); |
953 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
954 |
|
only at OB location (instead of over a band of OLx width). |
955 |
|
o pkg/seaice: |
956 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
957 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
958 |
|
o pkg/obcs: |
959 |
|
- split header file "OBCS.h" into 4 separated files: |
960 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
961 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
962 |
|
(contain no conditional statement which depends on OBCS options). |
963 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
964 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
965 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
966 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
967 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
968 |
|
o pkg/obcs: |
969 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
970 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
971 |
|
over a band of OLx width) |
972 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
973 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
974 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
975 |
|
o obcs in model/src: |
976 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
977 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
978 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
979 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
980 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
981 |
|
- zero out velocity outside OB interior region: This has no effect on |
982 |
|
the solution but just to prevent unrealistic velocity outside OB. |
983 |
|
o obcs and non-lin free-surf: |
984 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
985 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
986 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
987 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
988 |
|
update results of test-exp. exp4(nlfs). |
989 |
|
o exp4 (nlfs) test-exp: |
990 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
991 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
992 |
|
o obcs and 2d/3d solver norm: |
993 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
994 |
|
and outside OB interior region (will allow to place OB further inside the |
995 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
996 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
997 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
998 |
|
e.g. in tutorial_plume_on_slope. |
999 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
1000 |
|
o pkg rbcs: |
1001 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
1002 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
1003 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
1004 |
|
o pkg/shelfice/shelfice_init_fixed.F |
1005 |
|
fix CPP-flag combinations |
1006 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
1007 |
|
* update/change/correct ice age calculations |
1008 |
|
* add age updates for pathological cases |
1009 |
|
Probably needs more testing... |
1010 |
|
|
1011 |
|
checkpoint62x (2011/05/13) |
1012 |
|
o pkg/mom_vecinv: |
1013 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
1014 |
|
to zero-out (outside OB) gradient of vorticity. |
1015 |
|
o verification exp.: |
1016 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
1017 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
1018 |
|
o pkg/obcs: |
1019 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
1020 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
1021 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
1022 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
1023 |
|
variables needs its own mask. |
1024 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
1025 |
|
from the first guess (zero) in analogy to other control variables |
1026 |
|
o pkg/shelfice: |
1027 |
|
- start basic adjoint |
1028 |
|
o pkg/ctrl: |
1029 |
|
- remove extra 2D field "for good measure" when initializing in |
1030 |
|
ctrl_set_globfld_[xy/xz/yz].F |
1031 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
1032 |
|
- improve error messages in ctrl_set_unpack_* |
1033 |
|
o OBC implementation in momentum: |
1034 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
1035 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
1036 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
1037 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
1038 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
1039 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
1040 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
1041 |
|
Update output of experiment dome and exp4 (+nlfs). |
1042 |
|
o exp4 test-exp: |
1043 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
1044 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
1045 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
1046 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
1047 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
1048 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
1049 |
|
o pkg/obcs: |
1050 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
1051 |
|
o model/src: |
1052 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
1053 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
1054 |
|
from the other without ambiguity. |
1055 |
|
o seaice_obcs test-exp.: |
1056 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
1057 |
|
o pkg/obcs: |
1058 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
1059 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
1060 |
|
o pkg/seaice: |
1061 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
1062 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
1063 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
1064 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
1065 |
|
o fizhi-cs test exp.: |
1066 |
|
switch reference output convention for these 2 non-standard test-exp, |
1067 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
1068 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
1069 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
1070 |
|
o model/inc: |
1071 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
1072 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
1073 |
|
o pkg/seaice: |
1074 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
1075 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
1076 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
1077 |
|
and initial HSALT |
1078 |
|
|
1079 |
|
checkpoint62w (2011/04/26) |
1080 |
|
o pkg/mom_fluxform: |
1081 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
1082 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
1083 |
|
- update output of exp. global_ocean.90x40x15 |
1084 |
|
o pkg/mom_vecinv: |
1085 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
1086 |
|
o update seaice exp.: |
1087 |
|
use more consistent parameter values (remove "backward compatability only": |
1088 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
1089 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
1090 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
1091 |
|
o update test-exp global_ocean.90x40x15: |
1092 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
1093 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
1094 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
1095 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
1096 |
|
and update output files: output.txt & output.dwnslp.txt |
1097 |
|
o new AD-test experiment: obcs_ctrl |
1098 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
1099 |
|
o pkg/dic: |
1100 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
1101 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
1102 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
1103 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
1104 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
1105 |
|
at depth and bring the negative heat anomaly to the surface level |
1106 |
|
o pkgs _fields_load: |
1107 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
1108 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
1109 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
1110 |
|
rbcs to get interpolation weights and time reccord number. |
1111 |
|
- fix multi-threading in aim_fields_load.F |
1112 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
1113 |
|
o external_fields_load: |
1114 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
1115 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
1116 |
|
time-step to convert to integer: |
1117 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
1118 |
|
(Thanks to Christopher L. Wolfe) |
1119 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
1120 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
1121 |
|
store index of time-record which is currently loaded: |
1122 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
1123 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
1124 |
|
(to be fixed soon) |
1125 |
|
|
1126 |
|
checkpoint62v (2011/04/02) |
1127 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
1128 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
1129 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
1130 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
1131 |
|
o pkg/generic_advdiff with OBCS: |
1132 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
1133 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
1134 |
|
This will affect the results if using obcs+biharmonic diffusion. |
1135 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
1136 |
|
o pkg/obcs: |
1137 |
|
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
1138 |
|
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
1139 |
|
in Interior region. No impact on solution but affects Velocity monitor stats. |
1140 |
|
o pkg/ptracers (adjoint) |
1141 |
|
New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate |
1142 |
|
tape file for each tracer |
1143 |
|
o model/inc/src and pkg/autodiff: add parameters that allow to turn |
1144 |
|
of parts of the adjoint code at run time. For now, there are only |
1145 |
|
useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These |
1146 |
|
parameters are set in data.pkg. |
1147 |
|
This is the lazy coward's version of doing this, but still useful for |
1148 |
|
debugging. In order to do it right, everything needs to be moved to |
1149 |
|
pkg/autodiff. |
1150 |
|
o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at |
1151 |
|
the end; this fixes the adjoint balancing code for open boundaries. |
1152 |
|
o pkg/ctrl: |
1153 |
|
- change behavior of xx_${varname}period to be analogous to exf-conventions: |
1154 |
|
xx_${varname}period = 0., means time-independent control part |
1155 |
|
xx_${varname}period = -12., means one-year-periodic monthly control part |
1156 |
|
- introduce helper routine ctrl_init_rec (part of ctrl_init.F) to |
1157 |
|
clean up ctrl_init a little, remove unused variables |
1158 |
|
- ctrl_init: fixed the handling of the start/endrec for obcs-variables |
1159 |
|
- move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec |
1160 |
|
|
1161 |
|
checkpoint62u (2011/03/15) |
1162 |
|
o model/src: |
1163 |
|
- for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in |
1164 |
|
h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ; |
1165 |
|
- in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to |
1166 |
|
INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF. |
1167 |
|
o pkg/ctrl/obcs/ecco: |
1168 |
|
- remove obsolete, unused, and partially broken code: |
1169 |
|
ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within |
1170 |
|
ALLOW_CTRL_OBCS_BALANCE |
1171 |
|
- put a stop statement into ecco/cost_obcsvol.F, but also add |
1172 |
|
cost_obcsvol to ecco_ad_diff.list |
1173 |
|
o pkg/ecco: fix counting cost function contributions for obcs (code |
1174 |
|
by Matt M.) and diffkr for diagnostics |
1175 |
|
o pkg/ecco, pkg/ctrl, pkg/grdchk: |
1176 |
|
add cost penalty terms for initial uvel, vvel, eta controls |
1177 |
|
and I/O for prior error files |
1178 |
|
o pkg/mdsio: |
1179 |
|
move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option |
1180 |
|
(new argument) to check for tiled file in mdsioLocalDir : this fix the |
1181 |
|
restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir. |
1182 |
|
o pkg/ctrl: |
1183 |
|
- ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by |
1184 |
|
ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove |
1185 |
|
unused and superfluous variables |
1186 |
|
- ctrl_get_gen_rec.F: catch the case of xx_genperiod=0. |
1187 |
|
o pkg/ecco |
1188 |
|
- enable adjoint of Stevens OB |
1189 |
|
o pkg/ctrl/ecco/grdchk: |
1190 |
|
- remove global declaration of tmpfldx/yz and tmpfldx/yz2. |
1191 |
|
Fortunately, we do not have any tests for the numerous cpp-flagged |
1192 |
|
option of "obcs as control parameters" so we will never know |
1193 |
|
if this is an improvement (but at least now things compile). |
1194 |
|
- remove an obsolete initialization from ecco_cost_init_barfiles.F |
1195 |
|
- fix some problems within never used ifdefs to make the code compile |
1196 |
|
o pkg/obcs: |
1197 |
|
- Refine Interior mask definition to work with more complex OB (e.g. |
1198 |
|
if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to |
1199 |
|
read in Interior mask from file. Check if Interior mask is consistent |
1200 |
|
with OB list of indices. |
1201 |
|
o pkg/seaice |
1202 |
|
- beginning code for a seaice tracer package, |
1203 |
|
but currently only used for seaice age: SEAICE_AGE |
1204 |
|
SEAICE_num = 4 |
1205 |
|
iTracer = 1: area-weighted ice age |
1206 |
|
= 2: volume-weighted ice age |
1207 |
|
= 3, 4: template for one-year vs. multi-year ice |
1208 |
|
data.seaice has new namelist SEAICE_PARM03 for arrays related to |
1209 |
|
SEAICE_num |
1210 |
|
|
1211 |
|
checkpoint62t (2011/03/05) |
1212 |
|
o pkg/obcs: |
1213 |
|
- obcs_apply_uv.F: change to a 2 steps method, first tangential component; |
1214 |
|
then normal component. This ensures that the normal component is set |
1215 |
|
correctly even when it conficts with tangential setting from an other OB. |
1216 |
|
Affects results of test-experiment seaice_obcs: update the output.txt |
1217 |
|
o pkg/obcs: |
1218 |
|
- add code to monitor statistics of dynamical fields at OB. |
1219 |
|
- take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW : |
1220 |
|
- fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection). |
1221 |
|
- change default: balance the Net inflow through all OB (instead of balancing |
1222 |
|
each OB separately); keep the old method if setting OBC_balanceFacX < 0. |
1223 |
|
- switch on useOBCSbalance in dome experiment: only correct Western OB outflow |
1224 |
|
to match Nortern OB inflow (OBCS_balanceFacN=0). |
1225 |
|
o pkg/seaice: |
1226 |
|
- redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL |
1227 |
|
o pkg/seaice (seaice_growth v 1.113): |
1228 |
|
- reverting seaice_growth to v 1.111 in order to have code with exact bit |
1229 |
|
compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge |
1230 |
|
CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced |
1231 |
|
runtime flag SEAICEareaFormula is kept but is inactive |
1232 |
|
o model/src: |
1233 |
|
- add new param to scale curvilinear grid distance and area when using |
1234 |
|
a different sphere radius from the grid-files. |
1235 |
|
- test/check multi-threads EXCH applied to local variable (cg2d_x) |
1236 |
|
o adjoint: |
1237 |
|
- enable adjoint of Stevens OB |
1238 |
|
- add dummy_in_dynamics to enable extraction of ADJrhoinsitu |
1239 |
|
(a bit delicate because of potentially modified adj. common block structure; |
1240 |
|
current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later) |
1241 |
|
|
1242 |
|
checkpoint62s (2011/02/15) |
1243 |
|
o pkg/seaice (seaice_growth v 1.112): |
1244 |
|
- introduce SEAICEareaFormula run time parameter, which selects the recipe for |
1245 |
|
computing the ice cover tendency from effective thickness tendencies. Include |
1246 |
|
Ian Fenty's formula. |
1247 |
|
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using |
1248 |
|
SEAICEareaFormula. |
1249 |
|
- simplify notations for the various d_HEFF/d_AREA terms. |
1250 |
|
o pkg/gmredi: |
1251 |
|
- add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code |
1252 |
|
from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative; |
1253 |
|
add a verification test-run (front_relax.bvp) to test GM_useBVP. |
1254 |
|
o pkg/seaice (seaice_growth v 1.111): |
1255 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
1256 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to |
1257 |
|
also melt ice. |
1258 |
|
o pkg/seaice: |
1259 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
1260 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
1261 |
|
o pkg/cheapaml: |
1262 |
|
- from Nico Wienders: New version of this package. |
1263 |
|
o pkg/flt: |
1264 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
1265 |
|
a periodic domain (default: keep periodicity) |
1266 |
|
o pkg/gmredi: |
1267 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
1268 |
|
(needed for multi-dim advection). |
1269 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
1270 |
|
o model/src: |
1271 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
1272 |
|
o tutorial_tracer_adjsens |
1273 |
|
- extend to NLFS and replace maskC by hFacC |
1274 |
|
(change reference output accordingly) |
1275 |
|
|
1276 |
|
checkpoint62r (2011/01/24) |
1277 |
|
o testreport: |
1278 |
|
- add option -deloutp (-do) to remove output file after successful run |
1279 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
1280 |
|
extract exact list of procs from this file ; adjust COMMAND by |
1281 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
1282 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
1283 |
|
first guess (of obcs) with code by Matt Mazloff |
1284 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
1285 |
|
exf/cal |
1286 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
1287 |
|
and handle case of obcs?period == 0 |
1288 |
|
Not affected by these changes: There is still an inconsistency in |
1289 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
1290 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
1291 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
1292 |
|
ALLOW_CAL is not defined |
1293 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
1294 |
|
S/R exf_swapfields |
1295 |
|
o testreport: |
1296 |
|
allow to test MPI with different number of processors for each experiment: |
1297 |
|
create file "SIZE.h.mpi" in each build dir. |
1298 |
|
Note: update of "-command" argument not yet implemented. |
1299 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
1300 |
|
alleviate the need for additional 3D tapes when using |
1301 |
|
the non-inear free surface in the adjoint. This is done |
1302 |
|
by adding an 'update' of hfacc etc. to their current |
1303 |
|
value at the beginning of forward_step.F. |
1304 |
|
o pkg/seaice |
1305 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
1306 |
|
timestepping loop |
1307 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
1308 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
1309 |
|
of the routine. |
1310 |
|
o pkg/gmredi: |
1311 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
1312 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
1313 |
|
o pkg/seaice: |
1314 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
1315 |
|
o pkg/seaice: |
1316 |
|
reduce memory footprint of seaice mutldim advection tapes, |
1317 |
|
by using a 2D tape independent of the generic_advdiff ones, |
1318 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
1319 |
|
|
1320 |
|
checkpoint62q (2010/12/29) |
1321 |
|
o model/src: |
1322 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
1323 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
1324 |
|
o pkg/flt: |
1325 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
1326 |
|
- precision of input and output files set according to readBinaryPrec |
1327 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
1328 |
|
- initial float position from tiled file was not converted to index space |
1329 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
1330 |
|
o global_ocean.cs32x15: |
1331 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
1332 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
1333 |
|
o model/src: |
1334 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
1335 |
|
ini_mask_etc (call to plot_fieds_xy*). |
1336 |
|
o pkg/thsice: |
1337 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
1338 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
1339 |
|
o pkg/mdsio: |
1340 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
1341 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
1342 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
1343 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
1344 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
1345 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
1346 |
|
o pkg/flt: |
1347 |
|
- add fourth-order Runge-Kutta integration |
1348 |
|
- add basic exch2 support (only 1 facet supported so far!) |
1349 |
|
o pkg/mdsio+rw: |
1350 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
1351 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
1352 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
1353 |
|
that uses pkg/seaice rather than pkg/thsice. |
1354 |
|
(using multidim advection for seaice) |
1355 |
|
o towards more F95 syntax for array specification in namelist: |
1356 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
1357 |
|
of all verification experiments. |
1358 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
1359 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
1360 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
1361 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
1362 |
|
that uses pkg/seaice rather than pkg/thsice. |
1363 |
|
|
1364 |
|
checkpoint62p (2010/12/17) |
1365 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
1366 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
1367 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
1368 |
|
allow for use of multim. advection in seaice adjoint. |
1369 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
1370 |
|
- first attempt to close budgets by taking into account the freshwater |
1371 |
|
flux implied by the sublimation of snow and ice. So far only the |
1372 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
1373 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
1374 |
|
o eesupp/src: |
1375 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
1376 |
|
from F95 standard to commonly accepted extended F77 form. |
1377 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
1378 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
1379 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
1380 |
|
o globalFiles: |
1381 |
|
commented out in parameter file "data" since it's not safe with MPI |
1382 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
1383 |
|
in this case); no longer commented out in restart test (tst_2+2). |
1384 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
1385 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
1386 |
|
and cannot be used together with mdsioLocalDir. |
1387 |
|
o nesting pkgs: |
1388 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
1389 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
1390 |
|
- add parameter files + utils dir + output from short run on beagle. |
1391 |
|
o pkg/seaice: |
1392 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
1393 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
1394 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
1395 |
|
|
1396 |
|
checkpoint62o (2010/11/25) |
1397 |
|
o pkg/exf: |
1398 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
1399 |
|
o pkg/seaice: |
1400 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
1401 |
|
adjoint code |
1402 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
1403 |
|
capping of heff, put contribution into d_HEFFbyNEG |
1404 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
1405 |
|
by something more sensible (parameters that are what their name implies) |
1406 |
|
- change some defaults, so that by default exf-parameters are used for |
1407 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
1408 |
|
to reproduce the old results, many data.seaice now contain funny values |
1409 |
|
for cpAir and latent heat of sublimation |
1410 |
|
o packages_readparms.F: move exf_readparms up in line so that |
1411 |
|
exf-parameters are visible for other packages (e.g. seaice) |
1412 |
|
o debugMode & debugLevel=2: |
1413 |
|
- differentiate between debugMode & debugLevel=2: |
1414 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
1415 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
1416 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
1417 |
|
=> allows to print debug-stats without all sequence of call messages. |
1418 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
1419 |
|
o pkg/obcs (obcs-sponge): |
1420 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
1421 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
1422 |
|
o pkg/generic_advdiff: |
1423 |
|
- record overlap minimum size for each advection scheme; |
1424 |
|
- refine criteria on overlap minimum size; |
1425 |
|
- check and stop (in gad_check) if overlap size is too small. |
1426 |
|
o pkg/obcs: |
1427 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
1428 |
|
once, in ptracers_implicit.F) |
1429 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
1430 |
|
apply OB values when tile has OB) |
1431 |
|
o model/src, coriolis setting: |
1432 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
1433 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
1434 |
|
files (selectCoriMap=3) with any grid. |
1435 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
1436 |
|
o pkg/seaice/seaice_growth.F: |
1437 |
|
a few cosmetic changes that reduce the number of lines of code |
1438 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
1439 |
|
- the code follows old MOM/NAOSIM code |
1440 |
|
- so far it is only implemented for the eastern and western boundaries |
1441 |
|
and NOT for pTracers |
1442 |
|
o pkg/rbcs: |
1443 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
1444 |
|
beginning of the first rbcs forcing period. |
1445 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
1446 |
|
offline package, i.e., one file per time, labeled by iteration number; |
1447 |
|
deltaTrbcs sets the timestep with which the data was generated; |
1448 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
1449 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
1450 |
|
- make arithmetic safe for negative times and odd forcing periods. |
1451 |
|
|
1452 |
|
checkpoint62n (2010/11/09) |
1453 |
|
o pkg/seaice: |
1454 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
1455 |
|
o pkg/obcs: |
1456 |
|
New S/R to copy tracer value from the OB location to narrow band region |
1457 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
1458 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
1459 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
1460 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
1461 |
|
in seaice_advection.F and advect.F. |
1462 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
1463 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
1464 |
|
o tools/genmake2: |
1465 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
1466 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
1467 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
1468 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
1469 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
1470 |
|
an optfile, but otherwise default was just "cpp". |
1471 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
1472 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
1473 |
|
(instead of just setting CC=cc) |
1474 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
1475 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
1476 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
1477 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
1478 |
|
with reference compiler switch from g77 to gfortran) |
1479 |
|
o pkg/seaice: |
1480 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
1481 |
|
seaice_check that stops the model, when the CPP flag is used. |
1482 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
1483 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
1484 |
|
experiments but will change runs where the capping is acutally active |
1485 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
1486 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
1487 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
1488 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
1489 |
|
o tools/genmake2: |
1490 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
1491 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
1492 |
|
- clean previous genmake log files before anything else. |
1493 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
1494 |
|
files only with "CLEAN" target (instead of "Clean"); |
1495 |
|
o pkg/generic_advdiff: |
1496 |
|
Change OBCS in multiDim advection (gad_advection.F): |
1497 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
1498 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
1499 |
|
which were applying future time-step OB values. |
1500 |
|
This way, all explicit calculations use current-time-step OB values |
1501 |
|
(simpler and more consistent). |
1502 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
1503 |
|
update output of experiment seaice_obcs. |
1504 |
|
o pkg/seaice: |
1505 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
1506 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
1507 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
1508 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
1509 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
1510 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
1511 |
|
o pkg aim (2010/10/26): |
1512 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
1513 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
1514 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
1515 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
1516 |
|
o pkg/obcs: |
1517 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
1518 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
1519 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
1520 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
1521 |
|
|
1522 |
|
checkpoint62m (2010/10/21) |
1523 |
|
o pkg/seaice: vectorize seaice_solve4temp.F |
1524 |
|
- move iterations loops outside of i/j-loops |
1525 |
|
- requires 2D arrays for TB and effConduct |
1526 |
|
- add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is |
1527 |
|
modified in this routine |
1528 |
|
- a little bit of clean up, adjusting indentation, etc. |
1529 |
|
- replaced a few TEN**a by exp(a*log(10.)) in new code for better |
1530 |
|
performance and '**TWO' by '**2' (because TWO is a float), |
1531 |
|
replaced ONE, ZERO |
1532 |
|
o eesupp/src: |
1533 |
|
fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube |
1534 |
|
o pkg/seaice/seaice_growth.F |
1535 |
|
Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and |
1536 |
|
merging process. The merged routine has two branches, and one activates the 'evolution' |
1537 |
|
branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now). |
1538 |
|
In summary, here is what the '10/10 revision' did consist of |
1539 |
|
part 1: seaice_growth.F revisions 1.71 to 1.75 |
1540 |
|
- Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged. |
1541 |
|
The emphasis here was on improving readability (e.g. by trying to use meaningful |
1542 |
|
variable names) and modularity (e.g. by adding arrays to store heff etc. updates). |
1543 |
|
part 1.5: |
1544 |
|
- revising the lab_sea experiment to make it a more useful (i.e. stable |
1545 |
|
and representative of an actual model run). This was done by generating a |
1546 |
|
(winter) pickup to start from, switching back the main experiment dynamic |
1547 |
|
solver from evp to lsr, having one of the experiments use the free drift solution. |
1548 |
|
part 2: seaice_growth.F revisions 1.76 to 1.85 |
1549 |
|
- Sorting out hard-coded constants that prevented heat and fresh water conservation. |
1550 |
|
- Sorting out the various fields units and sign (set early on and reset at the end) |
1551 |
|
to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and |
1552 |
|
fresh water stock is 'effective ice meters', and >0 implies more ice/snow. |
1553 |
|
- Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks, |
1554 |
|
and simplifying logical expressions to further improve readibility. |
1555 |
|
part 3: seaice_growth.F revisions 1.86 to 1.89 |
1556 |
|
- Re-organize the blocks of code more logically. |
1557 |
|
- Merging the '_if.F' pieces that add something new. |
1558 |
|
o pkg/thsice: |
1559 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
1560 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
1561 |
|
might also be problematic for TAF |
1562 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
1563 |
|
does not change the verifcation experiment, but will change all |
1564 |
|
experiments that have this flag undefined (not tested in verification); |
1565 |
|
a little reorganization to save a few 2D fields and recomputations |
1566 |
|
- 1st step of revisiting thsice adjoint (major recomp. sorted out) |
1567 |
|
- 2nd step: fix some store dirs |
1568 |
|
o seems to work somewhat, i.e. using ifort but not g77 |
1569 |
|
o likely cause are incomplete init. or recomputation |
1570 |
|
o start verification/global_ocean.cs32x15/input_ad.thsice |
1571 |
|
o pkg/obcs: add support for exch2 |
1572 |
|
- the position of the boundary and prescribed values are specified using |
1573 |
|
a global domain with exch2 facets stacked |
1574 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
1575 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
1576 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
1577 |
|
file layout is as for obcs described above: |
1578 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
1579 |
|
- for y-z sections, facets are stacked in y |
1580 |
|
o pkg/thsice: |
1581 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
1582 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
1583 |
|
not affected, but in particular the latter routine has changed |
1584 |
|
dramatically (not necessarily easier to read now). |
1585 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
1586 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
1587 |
|
o verification/lab_sea: |
1588 |
|
- overhaul of the forward model experiments. The main motivation |
1589 |
|
for this revision is that lab_sea has proven quite fragile (when |
1590 |
|
changing the sea-ice code, and switching platforms) to a point |
1591 |
|
when failures were very hard to attribute to specific code problems. |
1592 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
1593 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
1594 |
|
- the input.lsr experiment thus became obsolete and was removed. |
1595 |
|
- it was replaced with the input.fd experiment that uses an |
1596 |
|
analytical "free drift" solution as the ice velocity field. |
1597 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
1598 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
1599 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
1600 |
|
us to test additional options, along with the salt plume package. |
1601 |
|
- Finally a pickup was generated (at the end of a one year run) to |
1602 |
|
make the tests more representative of an actual model run. Previously |
1603 |
|
the tests starting point was a 1m thickness of ice everywhere. |
1604 |
|
o pkg/seaice: |
1605 |
|
- introducing S\R seaice_freedrift.F that compute the |
1606 |
|
analytical solution to an approximate ice momentum |
1607 |
|
equation (i.e. the simple stress/coriolis balance). |
1608 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
1609 |
|
of the free drift velocity field, and enable its use. |
1610 |
|
To actually use the free drift solution as the model ice |
1611 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
1612 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
1613 |
|
|
1614 |
|
checkpoint62l (2010/10/04) |
1615 |
|
o pkg/seaice: |
1616 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
1617 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
1618 |
|
version (with USE_ORIGINAL_SBI undef); |
1619 |
|
o add hooks for new packages OASIS, the package will follow |
1620 |
|
(hooks exclude the seaice pkg for now) |
1621 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
1622 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
1623 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
1624 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
1625 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
1626 |
|
Option to write/read 2D fields to files including tiles halos. |
1627 |
|
The main purpose is for adjoint related "tape I/O". |
1628 |
|
The secondary purpose is for debugging phases. |
1629 |
|
A word on those rather specifically intended purposes. |
1630 |
|
The code was meant to be stripped down to the bare minimum. |
1631 |
|
Typically, there is a unique and basic mapping to the global |
1632 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
1633 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
1634 |
|
meant to generate user friendly outputs of various shapes and forms. |
1635 |
|
Rather it is intended, for the knowledgeabale developers, |
1636 |
|
to be largely independent of the many mdsio options, to allow |
1637 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
1638 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
1639 |
|
file system behavior. With regard to tuning, most of the potential knobs |
1640 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
1641 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
1642 |
|
are not yet included, and will be added if they prove useful. |
1643 |
|
o pkg/seaice: |
1644 |
|
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
1645 |
|
o pkg/seaice: |
1646 |
|
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
1647 |
|
code (seaice_budget_ice_if.F) which enable to recover old standard |
1648 |
|
code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined. |
1649 |
|
temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F. |
1650 |
|
o model/src (rStar): |
1651 |
|
use simple average (not area weighted) of rStarFac at U,V point when using |
1652 |
|
vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection) |
1653 |
|
update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20. |
1654 |
|
|
1655 |
|
checkpoint62k (2010/09/17) |
1656 |
|
o adjoint |
1657 |
|
* changed verification/global_ocean.cs32x15 ; adjoint now tests |
1658 |
|
Adams-Bashforth 3 + NLFS + RSTAR |
1659 |
|
* some more modifs required for ECCO-GODAE v4 |
1660 |
|
o pkg/seaice |
1661 |
|
add SEAICE_AGE_VOL option to use volume instead of area for |
1662 |
|
integrating SEAICE_AGE |
1663 |
|
o model/src: |
1664 |
|
first check-in of sigma & hybrid-sigma coordinate code ; also includes |
1665 |
|
non-linear free-surface parts ; but pressure-gradient not yet coded. |
1666 |
|
o pkg/ptracers: |
1667 |
|
option for ptracer to convert Salt Relax into additional EmP. |
1668 |
|
tested in exp. global_ocean.90x40x15.dwnslp (update output) |
1669 |
|
|
1670 |
|
checkpoint62j (2010/08/25) |
1671 |
|
o pkg/ggl90: |
1672 |
|
other minor changes: remove 3-D temp array gTKE (+ add argument myIter) |
1673 |
|
o pkg/dic: car_flux.F, phos_flux.F |
1674 |
|
- reduce number of exp-calls in order to improve performance |
1675 |
|
- clean up a little (replace fields by their macros, etc., fix |
1676 |
|
typo in CPP-flag) |
1677 |
|
o pkg/ggl90: minor changes |
1678 |
|
- GGL90diffKrS was removed --> always use GGL90diffKr |
1679 |
|
- GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV |
1680 |
|
- hack of mxlMaxFlag=2 --> ensure mixing between first and second level |
1681 |
|
(commented out for now) |
1682 |
|
- change in max/min operations to ensure that smoothing is ok |
1683 |
|
- smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr) |
1684 |
|
- always use diffKrNrT as background profile (i.e. never use diffKr field) |
1685 |
|
o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj) |
1686 |
|
o pkg/dic: |
1687 |
|
- model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better |
1688 |
|
vectorization |
1689 |
|
- small bug fix in insol for the unlikely case of a cartesian grid |
1690 |
|
- towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F |
1691 |
|
+ now vectorize, which also removes adjoint recomputations; |
1692 |
|
+ replace integer maksp1 by _RL maskp1 |
1693 |
|
+ replace a**x by exp(x*log(a)) in phos_flux.F for speed |
1694 |
|
|
1695 |
|
checkpoint62i (2010/07/21) |
1696 |
|
o pkg/flt: |
1697 |
|
- with OBCS: stop floats which enter the OB region |
1698 |
|
o model/src: |
1699 |
|
- use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones) |
1700 |
|
for implicit vertical advection. |
1701 |
|
o pkg/seaice: |
1702 |
|
- account for melting in seaice age evolution. |
1703 |
|
- remove double counting of seaice ridging effect on seaice age. |
1704 |
|
|
1705 |
|
checkpoint62h (2010/06/18) |
1706 |
|
o pkg/exch2: |
1707 |
|
- remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1). |
1708 |
|
o tools/genmake2 |
1709 |
|
- remove "-pdefault" option: redundant with the use of "packages.conf"; |
1710 |
|
- remove file pkg/pkg_default : set the default as a pkg group |
1711 |
|
("default_pkg_list") defined in pkg/pkg_groups; |
1712 |
|
- fix for case pkg/pkg_depend is missing (was hanging before); |
1713 |
|
- add option "-pgroups" to specify a different pkg_groups than the default. |
1714 |
|
o verification/adjustment.cs-32x32x1: |
1715 |
|
add a "minimal" set-up test (code_min & input_min) which only compiles |
1716 |
|
eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc. |
1717 |
|
o tools/genmake2 |
1718 |
|
- extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg])) |
1719 |
|
- fix details of checking for mnc & profile pkg when NetCDF is unavailable. |
1720 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
1721 |
|
files are nearly the same anyway. |
1722 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
1723 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
1724 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
1725 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
1726 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
1727 |
|
- replace |
1728 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
1729 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
1730 |
|
by |
1731 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
1732 |
|
(changes results) |
1733 |
|
-> exf_bulkformulae v1.22, |
1734 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
1735 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
1736 |
|
output.txt 1.63 |
1737 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
1738 |
|
seaice_obcs: output.txt 1.10) |
1739 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
1740 |
|
-> exf_bulkformulae v1.23, |
1741 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
1742 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
1743 |
|
Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice. |
1744 |
|
o adjoint of exch-1: |
1745 |
|
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
1746 |
|
(note: was already like this when using EXCH-2) and remove flow dir |
1747 |
|
and hand-written AD version of high-level EXCH S/R (pkg/autodiff); |
1748 |
|
- provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow); |
1749 |
|
- update pkg/exch2 diff list. |
1750 |
|
|
1751 |
|
checkpoint62g (2010/05/19) |
1752 |
|
o eesupp/src (exch-1): |
1753 |
|
- split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F) |
1754 |
|
and remove argument "simulationMode"; same thing for all exch_*rx_cube.F |
1755 |
|
(renamed to exch1_*rx_cube.F). |
1756 |
|
- change accordingly exch_*_rx.template and AD version in pkg/autodiff |
1757 |
|
to call new exch1 S/R ; update Makefile and .cvsignore. |
1758 |
|
- replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove |
1759 |
|
exch2_xy_rx later) |
1760 |
|
Note: after updating your code, need to run "make clean" in eesupp/src |
1761 |
|
o test experiment bottom_ctrl_5x5: |
1762 |
|
new output_adm.txt with fewer grdchk & less monitor output. |
1763 |
|
o model/src: |
1764 |
|
remove the call to ini_cori in initialise_varia.F (just keep the usual one |
1765 |
|
in initialise_fixed.F). More consistent with coriolis & horizontal grid |
1766 |
|
beeing treated in the same way (ini_grid is not called a 2nd time). |
1767 |
|
o pkg/exf: |
1768 |
|
- rewrite exf_bulk_largeyeager04.F for better vectorization, changes |
1769 |
|
global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated |
1770 |
|
- fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now) |
1771 |
|
- cosmetic changes to exf_bulkformulae.F to make it look more like |
1772 |
|
exf_bulk_largeyeager04.F |
1773 |
|
o eesupp/src (exch-1): |
1774 |
|
- Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1). |
1775 |
|
- Separate buffer filling and MPI sending: allow EXCH-1 to work for local |
1776 |
|
array (non-shared) when using MPI+MTH. Also reduces number of BARRIER |
1777 |
|
(even without using MPI). |
1778 |
|
- Message mode: move RecvAck setting (indicator of buffer being ready) |
1779 |
|
from send_put to recv_get S/R (was useless before, but not sure if |
1780 |
|
it's much more useful now); |
1781 |
|
- Switch the order of sync: MPI-proc 1rst and then threads; |
1782 |
|
- take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead. |
1783 |
|
- fix AD code for communication mode ='get' (but not used). |
1784 |
|
o model/src: |
1785 |
|
initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does |
1786 |
|
not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp). |
1787 |
|
o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API |
1788 |
|
o pkg/ctrl: require a specific set of control variables and exf-flags for |
1789 |
|
adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied) |
1790 |
|
o model/src: |
1791 |
|
a) 1rst version of a new driver S/R to turn-off output freq and flags after the |
1792 |
|
1rst forward sweep, to avoid over-writing output files during recomputations |
1793 |
|
recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?) |
1794 |
|
b) 2nd version: |
1795 |
|
- add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO); |
1796 |
|
- switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast, |
1797 |
|
writePickupAtEnd) + seaice & ptracers output; |
1798 |
|
- do not switch off MNC flags (otherwise, won't get admonitor netcdf file) |
1799 |
|
o model/src: |
1800 |
|
- new S/R rotate_uv2en_rl (..._rs) that rotates vector fields. |
1801 |
|
o pkg/exch2: |
1802 |
|
- remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ; |
1803 |
|
- add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch). |
1804 |
|
o pkg/autodiff & exch2: |
1805 |
|
process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF |
1806 |
|
(for now, only if ALLOW_EXCH2 is defined). |
1807 |
|
o pkg/autodiff: |
1808 |
|
- include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F |
1809 |
|
(not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly. |
1810 |
|
+ clean-up comments (_RS is not always real*4) |
1811 |
|
- fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R) |
1812 |
|
- add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2: |
1813 |
|
was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs. |
1814 |
|
o testreport (AD-tests): |
1815 |
|
no longer link files from dir "../input" (1rst link files from |
1816 |
|
"../input_ad.[xx]" if secondary test "xx" and then from "../input_ad") |
1817 |
|
|
1818 |
|
checkpoint62f (2010/04/29) |
1819 |
|
o model/src/the_main_loop.F: |
1820 |
|
adjust store directives for seaice evp and multicategory according to |
1821 |
|
pkg/ecco/the_main_loop.F |
1822 |
|
o adjoint: |
1823 |
|
global_sum_ad was incomplete (noted many times by many people ;) |
1824 |
|
nice description by Jean U. as follows: |
1825 |
|
* allreduce(var) in global_sum.F can be interpreted as |
1826 |
|
reduce(sum) followed by broadcast of sum. |
1827 |
|
* The adjoint of that is |
1828 |
|
sum(adjoint) followed by broadcast(summed adjoint value) |
1829 |
|
or in other words, allreduce(sum, adjoint vars) |
1830 |
|
We were missing the sum(adjoint)! |
1831 |
|
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |
1832 |
|
(noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset). |
1833 |
|
The fix should produce 16-digit accuracy between |
1834 |
|
single-CPU multi-tile (e.g. nSx=2, nPx=1) and |
1835 |
|
multi-CPU single-tile (e.g. nSx=1, nPx-2) |
1836 |
|
We'll probably change this yet again shortly |
1837 |
|
o eesupp/src: |
1838 |
|
- fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?) |
1839 |
|
o pkg/icefront |
1840 |
|
- ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving |
1841 |
|
specification of addmass array based on a 2D field, which is added |
1842 |
|
at bottommost wet level at each horizontal location. |
1843 |
|
o model/src: |
1844 |
|
horizontal grid initialisation (other than curvilinear): add code for Exch2 IO |
1845 |
|
layout; (not always compatible with delX,delY setting; commented out for now). |
1846 |
|
o pkg/exch2: |
1847 |
|
change tile to processor setting (case nSy*nPy > 1): allows default model mapping |
1848 |
|
(myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config. |
1849 |
|
|
1850 |
|
checkpoint62e (2010/04/15) |
1851 |
|
o pkg/obcs: |
1852 |
|
- fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert). |
1853 |
|
o pkg/dic: |
1854 |
|
-fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up; |
1855 |
|
(note: not presently tested in any forward verification exp.) |
1856 |
|
update tutorial_global_oce_biogeo AD output file. |
1857 |
|
o pkg/exf: |
1858 |
|
- account for the variation of albedo as a function of zenith angle |
1859 |
|
by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h |
1860 |
|
o build_options: |
1861 |
|
- rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas" |
1862 |
|
o pkg/dic: |
1863 |
|
change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart: |
1864 |
|
- use binary pickup file for restart; |
1865 |
|
- initialise atmos-CO2 box from dic_pCO2 parameter; |
1866 |
|
- fix multi-threaded. |
1867 |
|
o pkg/rbcs: |
1868 |
|
- clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ; |
1869 |
|
change (+ fix IO calls) type of array RBC_mask from _RL to _RS. |
1870 |
|
- add RBCS to exp4 passive tracer 01 (rbcs was previously untested) |
1871 |
|
and update output.txt |
1872 |
|
o pkg/kpp: |
1873 |
|
- add diagnostics for KPP non-local flux of Temp, Salinity and pTracers; |
1874 |
|
- change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS |
1875 |
|
(= ratio of KPP non-local (salt) flux relative to surface-flux) when |
1876 |
|
using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat '); |
1877 |
|
- change pkg/offline to read-in average KPPghat*KPPdiffKzS from file |
1878 |
|
KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile). |
1879 |
|
o pkg/offline: |
1880 |
|
fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor |
1881 |
|
(bug was added in version 1.10 on 2007-08-23). |
1882 |
|
o pkg/offline: |
1883 |
|
- no need to specify periodicExternalForcing, etc ... to use offline pack |
1884 |
|
- offline input files no longer just single prec --> parameter offlineLoadPrec |
1885 |
|
o verification/lab_sea: |
1886 |
|
change AD test to multi-tile setup and update all 4 AD output. |
1887 |
|
NOTE: while cost function values remain very similar, |
1888 |
|
gradients are very different, although gradient checks are self-consistent |
1889 |
|
Should try to get to the bottom of this (cost function summation order?) |
1890 |
|
o pkg/dic: |
1891 |
|
in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid |
1892 |
|
a weakness of TAF that drops part of double precision in log10 derivative. |
1893 |
|
<= changes removed since problem has been fixed in current TAF version 1.9.71 |
1894 |
|
update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo. |
1895 |
|
o pkg/ecco: |
1896 |
|
add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F |
1897 |
|
update all 4 lab_sea AD output. |
1898 |
|
|
1899 |
|
checkpoint62d (2010/03/22) |
1900 |
|
o build_options: |
1901 |
|
remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles. |
1902 |
|
o remove unbalanced quote (single or double) in commented line of source code |
1903 |
|
(may cause some warning with some preprocessor/makedepend versions). |
1904 |
|
o pkg/seaice: |
1905 |
|
fix seaice_model.F for adjoint (gael) and update AD results of experiments |
1906 |
|
lab_sea (std + evp + noseaicedyn) and offline_exf_seaice. |
1907 |
|
o testreport: |
1908 |
|
add option '-runonly' (short: '-ro') to just do the run part (without make). |
1909 |
|
o eesupp: remove JAM communication code (obsolete). |
1910 |
|
o add option to genmake2 & testreport to switch "_RS" type to "real*4" |
1911 |
|
(if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return |
1912 |
|
to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1 |
1913 |
|
(update also the output). |
1914 |
|
|
1915 |
|
checkpoint62c (2010/03/02) |
1916 |
|
o tools/build_options : |
1917 |
|
move (some) old optfiles from build_options/ to build_options/unsupported/ |
1918 |
|
o model/src and pkg/exf |
1919 |
|
surface relaxation -- separating data and data.exf options |
1920 |
|
The point is to ensure that we specify the surface relaxation |
1921 |
|
either in data or in data.exf (but not half and half) and to |
1922 |
|
avoid an accidental relaxation to 0 (which happened if a time |
1923 |
|
scale was specified but the file name was left empty) |
1924 |
|
o model/src model/inc and pkg/mom_common |
1925 |
|
ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity |
1926 |
|
=> addition to the viscosity field as computed by others schemes |
1927 |
|
o tools/build_options: |
1928 |
|
- rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile) |
1929 |
|
but keep the former optfile for few weeks for smooth transition |
1930 |
|
o pkg/ecco |
1931 |
|
- allow user defined cost function contributions |
1932 |
|
CPP: ALLOW_USERCOST_CONTRIBUTION |
1933 |
|
USAGE: compute contributions in cost_usercost_all.F |
1934 |
|
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
1935 |
|
the two options are complementary. |
1936 |
|
o pkg/smooth |
1937 |
|
- migration from contrib to the main repository |
1938 |
|
|
1939 |
|
checkpoint62b (2010/01/26) |
1940 |
|
o pkg/monitor: |
1941 |
|
- change back mon_printstats_rl.F & mon_stats_rl.F and add a stop |
1942 |
|
(in case someone forgot to update customized pieces of code) |
1943 |
|
o nonHydrostatic: |
1944 |
|
- add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested); |
1945 |
|
- add a simple 2-D experiment (short_surf_wave) to test it. |
1946 |
|
o pkg/icefront: |
1947 |
|
adding the shell of, and the hooks to, a new package that |
1948 |
|
will model melting and freezing of vertical glacier ice fronts |
1949 |
|
o momentum: |
1950 |
|
add diagnostics of momentum tendency from Hydrostatic pressure gradient |
1951 |
|
(without surf.pressure term: would need a 2nd filling since implicit term). |
1952 |
|
o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace |
1953 |
|
two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR |
1954 |
|
cannot deal with the former |
1955 |
|
o cleaning: |
1956 |
|
- remove all (except OpenAD) old TLM output from results_ad dirs. |
1957 |
|
- remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R) |
1958 |
|
- comment out maskH definition (replaced by maskInC) |
1959 |
|
o pkg/monitor: |
1960 |
|
- change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl |
1961 |
|
& mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs. |
1962 |
|
|
1963 |
|
checkpoint62a (2010/01/15) |
1964 |
|
o model/src: |
1965 |
|
- bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4) |
1966 |
|
o pkg/diagnostics: |
1967 |
|
- add optional level number diagnostics (i.e., level number to be define |
1968 |
|
explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X". |
1969 |
|
- strictly check for valid parser-code(10) ; |
1970 |
|
- check if adding diag to the list from the right place. |
1971 |
|
o pkg/longstep: |
1972 |
|
- change parameters and fix tracer conservation with rstar/nonlinear free surface |
1973 |
|
o diagnostics: |
1974 |
|
- in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer |
1975 |
|
S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics. |
1976 |
|
o pkg/diagnostics: |
1977 |
|
- Add option for writing vertical integral (sum of selected levels) of an output |
1978 |
|
field instead of writing output field levels. Activate this option on a per |
1979 |
|
output-file basis, by setting the 2nd character of fileflag to 'I'. |
1980 |
|
- Add field-specific information relative to level integral in 3rd postion |
1981 |
|
of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate |
1982 |
|
vertically (x level-thickness x hFac), "r"=same but without hFac. |
1983 |
|
o do_the_model_io: |
1984 |
|
- pass end-of-model-run flag as argument, from forward_step to diagnostics_write: |
1985 |
|
in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before |
1986 |
|
writing pickups and stopping. |
1987 |
|
o pkg/diagnostics (for now, only with mdsio): |
1988 |
|
- write time information to meta file (and modify accordingly rdmds.m) : |
1989 |
|
time-averaged diagnostics output: write starting and ending time of the |
1990 |
|
time-averaging interval ; snap-shot diagnostics output remains unchanged; |
1991 |
|
o pkg/timeave: |
1992 |
|
- S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously |
1993 |
|
always Nr), now assumed to be equal to number of levels of averaged field; |
1994 |
|
only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F |
1995 |
|
o pkg/sbo: |
1996 |
|
- fix ocean bottom pressure global-average & 2-D time-ave output (was |
1997 |
|
neither initialised nor filled). |
1998 |
|
- add starting iteration in suffix of global-average output file |
1999 |
|
(to avoid over-writing the file after a restart) |
2000 |
|
- use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb). |
2001 |
|
o time-average: |
2002 |
|
- use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj) |
2003 |
|
(pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf, |
2004 |
|
ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice) |
2005 |
|
this fix DIC_COST cumulative-time array (previously: bi,bj,k) |
2006 |
|
- fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice) |
2007 |
|
- fix missing accumulation for pkg/opps. |
2008 |
|
- cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0) |
2009 |
|
(pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81); |
2010 |
|
- fix initialisation of time-ave vars and do only full time-step increment |
2011 |
|
(i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81); |
2012 |
|
o pkg/layers: |
2013 |
|
- use standard RW pkg S/R to write the output |
2014 |
|
and remove local write_fld version (which had a problem). |
2015 |
|
- use simple cumulative-time array (no level index) to fix time-ave S/R calls. |
2016 |
|
- fix LAYERS_CALC argument list. |
2017 |
|
o pkg/timeave: |
2018 |
|
- store cumulative-time in a simple tiled array (drop the level index) |
2019 |
|
- add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array. |
2020 |
|
o pkg/ocn,aim_compon_interf |
2021 |
|
- changes for multi-threaded coupled run. (tested with ifort-11 on danton) |
2022 |
|
|
2023 |
|
checkpoint62 (2009/12/23) |
2024 |
|
o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output. |
2025 |
|
(was not previously tested in any other exp.) |
2026 |
|
o pkg/monitor: |
2027 |
|
- clean-up _RL/_RS version: add specific S/R for statistics with mask & volume: |
2028 |
|
mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one |
2029 |
|
(mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics. |
2030 |
|
- use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F). |
2031 |
|
- change del2 calculation. |
2032 |
|
- use interior masks (instead of maskH, <- to be remove). |
2033 |
|
- shorter monitor suffix for forcing stats ("forcing" instead of "extforcing"). |
2034 |
|
o mask & obcs: |
2035 |
|
- define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S). |
2036 |
|
- move global area computation from ini_masks_etc.F to ini_linear_phisurf.F |
2037 |
|
(called after packages_init_fixed) |
2038 |
|
o pkg/obcs: |
2039 |
|
- move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once. |
2040 |
|
Fixes bug in obcs+exf with nSx*nSy.GT.1 |
2041 |
|
- fix multi-tile handling in obcs balance code |
2042 |
|
o nonHydrostatic: |
2043 |
|
- Implement AB-3 for non-hydrostatic vertical momentum ; |
2044 |
|
(change ordering of var. stored in pickup file when using NH) |
2045 |
|
- move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D. |
2046 |
|
- add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x |
2047 |
|
(in prep. for new NH free surface form). |
2048 |
|
o pkg/obcs: |
2049 |
|
add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe |
2050 |
|
o model/src: |
2051 |
|
fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography |
2052 |
|
|
2053 |
|
checkpoint61z (2009/12/01) |
2054 |
|
o nonHydrostatic: |
2055 |
|
Fix missing vertical flux of vert. momentum near surface (k=1). This fixes |
2056 |
|
a spurious source of energy in simple baroclinic adjusment test case. |
2057 |
|
Update all non-hydrostatic exp output. |
2058 |
|
o model/src (3-d solver): |
2059 |
|
Change again 3-D solver free-surface RHS term when exactConserv=T: |
2060 |
|
simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1 |
2061 |
|
(which was not the case with previous formulation). |
2062 |
|
To recover previous version, just reset "oldFreeSurfTerm" to previous value. |
2063 |
|
Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW. |
2064 |
|
o nonHydrostatic: |
2065 |
|
- compatible with implicDiv2Dflow < 1 ; + implement implicit factor |
2066 |
|
for Non-Hydrostatic pressure gradient (similar to implicSurfPress). |
2067 |
|
- change 3-D solver to work with r* (for now, only with linear free-surf.) |
2068 |
|
- add few debug diagnostics (cg3d_x, residual) |
2069 |
|
o model/src: |
2070 |
|
fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b). |
2071 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
2072 |
|
o update output of exp. global_ocean.cs32x15.icedyn after removing |
2073 |
|
#define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h |
2074 |
|
o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
2075 |
|
o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output |
2076 |
|
for complex grids, for now only to "state", "adstate", "adexf", "adseaice" |
2077 |
|
o model: add Christopher Wolfe's implemetation of the single reduction cg2d |
2078 |
|
(d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and |
2079 |
|
runtime flag useSRCGSolver. Modify verification experiment global_with_exf |
2080 |
|
to test this code |
2081 |
|
o pkg/cd_code: |
2082 |
|
Change defaut D-grid time-stepping to get the same for D-grid momentum as for |
2083 |
|
C-grid momentum. D-grid velocity used to be stepped forward in time with |
2084 |
|
Adams-Bashforth only on surface pressure term. Tests show that using AB on |
2085 |
|
D-grid coriolis term improves stability (as expected from CD-scheme paper). |
2086 |
|
To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h). |
2087 |
|
Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2), |
2088 |
|
lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD), |
2089 |
|
tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens. |
2090 |
|
Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2, |
2091 |
|
global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD. |
2092 |
|
o pkg/obcs: |
2093 |
|
- fix bug in initialisation (broken since Oct 1rst modification) |
2094 |
|
for useOBCSprescribe without useEXF. |
2095 |
|
|
2096 |
|
checkpoint61y (2009/11/15) |
2097 |
|
o pkg/seaice |
2098 |
|
- change (once again) the discretization for the evp solver: rather than |
2099 |
|
squaring the averages of strain rates, average the squares to give |
2100 |
|
a better approximation to VP behavior (in simple test); this breaks |
2101 |
|
verification experiments that use EVP (lab_sea and lab_sea.hb87) |
2102 |
|
--> update outputs |
2103 |
|
o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit) |
2104 |
|
to improve vectorization of adjoint code on TARGET_NEC_SX |
2105 |
|
o verification/vermix: |
2106 |
|
- change vermix to a more "classical" 1d column with high vertical |
2107 |
|
resolution, seasonal heat flux forcing and constant wind forcing |
2108 |
|
--> update outputs |
2109 |
|
o pkg/seaice |
2110 |
|
- fix diagnostics of principal stress components for EVP |
2111 |
|
- add optional diagnostics of non-linear convergence for LSOR solver |
2112 |
|
- make maximum zeta a runtime parameter |
2113 |
|
o model/src (3-d solver): |
2114 |
|
Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49), |
2115 |
|
which consisted in removing the Surf. Non-Hydrostatic pressure from the |
2116 |
|
whole column and adding it to Eta (inspired from Casualli, 1999): |
2117 |
|
Only affects 3-D solver initial guess and only if using ExactConserv, |
2118 |
|
but tests did show a degradation of solver convergence. For this reason, |
2119 |
|
decide to disable this piece of code. |
2120 |
|
to recover previous version, just set zeroPsNH = exactConserv (line 78). |
2121 |
|
Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW |
2122 |
|
o pkg/ggl90: |
2123 |
|
- fix previous modif (unfortunatly has not been documented here). |
2124 |
|
o pkg/seaice/autodiff: |
2125 |
|
- add CPP flag to include clipping of zeta in EVP code; |
2126 |
|
although clipping of zeta is not necessary for EVP and not recommended |
2127 |
|
it was done by default, now clipping is disabled by default |
2128 |
|
- modify computation and store zetaC/Z in seaice_evp for TAF |
2129 |
|
- add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default) |
2130 |
|
- change seaice_calc_viscosities/strainrates for better |
2131 |
|
vectorization after AD by TAF |
2132 |
|
- rearrange common blocks in SEAICE.h once again for easier dumps of |
2133 |
|
adjoint output, adjust adcommon.h and g_common.h |
2134 |
|
- change flux form of default advection scheme for better vectorization |
2135 |
|
of adjoint code |
2136 |
|
- modify lab_sea/input.lsr to test the flux form of default advection |
2137 |
|
scheme |
2138 |
|
o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level |
2139 |
|
transition in checkpoint61r) |
2140 |
|
|
2141 |
|
checkpoint61x (2009/10/19) |
2142 |
|
o adjoint: adding two new verification experiments |
2143 |
|
* tutorial_global_biogeo: an online dic sensitivity experiment |
2144 |
|
(work with G. Forget) |
2145 |
|
* tutorial_dic_adjoffline: an offline dic sensitivity experiment |
2146 |
|
(an update of the Dutkiewicz et al., 2006 paper) |
2147 |
|
Both use the same CO2FLUX cost function, but different controls |
2148 |
|
Gradient checks look good, but some recomp. could still be traightened out |
2149 |
|
Should add xx_dic control variable to test at some point |
2150 |
|
o model/src: |
2151 |
|
add run-time parameters to check and/or mask initial Temp & Salt |
2152 |
|
o pkg/ptracers: |
2153 |
|
apply zonal filter (if used) to all passive tracers |
2154 |
|
|
2155 |
|
checkpoint61w (2009/10/12) |
2156 |
|
o adjoint: |
2157 |
|
* update and finish work on adjoint of dic package (G. Forget) |
2158 |
|
* start adjoint of offline package |
2159 |
|
* bug fix for cube-sphere TLM code (active_file_g.F) |
2160 |
|
o tutorial_global_oce_optim: |
2161 |
|
now tested with 4 tiles (change data.grdchk and update output_adm.txt) |
2162 |
|
and add SIZE.h_mpi for MPI testing |
2163 |
|
o pkg autodiff |
2164 |
|
- fix bug in autodiff_restore |
2165 |
|
- make genmake2 remove comments and empty lines from ad_input_code.f in |
2166 |
|
order to reduce file size (new script file remove_comments_sed) |
2167 |
|
o allows to specify vertical profile of vertical viscosity (viscArNr) |
2168 |
|
o pkg autodiff |
2169 |
|
autodiff_ini_model_io: comment out writing of grid information to netcdf |
2170 |
|
files, because at this time the grid fields are a bunch of zeros |
2171 |
|
(this is analogous to ini_mnc_vars.F) |
2172 |
|
o pkg seaice/autodiff: |
2173 |
|
left-over from removing the 3-time-level fields: |
2174 |
|
- small rearrangement of common blocks (SEAICE.h) |
2175 |
|
- fix field declaration in order to get meaningful output in |
2176 |
|
adseaice.*.nc (adcommon.h) |
2177 |
|
o pkg obcs: |
2178 |
|
- go through NH code only if nonHydrostatic=T |
2179 |
|
- fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart) |
2180 |
|
- move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields |
2181 |
|
=> Update output of experiment seaice_obcs |
2182 |
|
- useOBCSbalance: code is wrong with multi-tile / proc: add a stop. |
2183 |
|
- fix NH+Orlanski restart (add wvel OBC value in pickup file) |
2184 |
|
- fix restart for useOBCSprescribe + useEXF |
2185 |
|
o pkg ctrl |
2186 |
|
- make obcs as control parameter work also with useSingleCPUio |
2187 |
|
- replace a few sny and snx by Ny and Nx to be consistent with |
2188 |
|
ctrl_set_globfld_x/yz.F |
2189 |
|
o pkg seaice |
2190 |
|
- re-introduce global field frWtrAtm for the case of |
2191 |
|
ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F) |
2192 |
|
- catch the case of an empty filename in seaice_cost_init_fixed.F |
2193 |
|
o pkg ecco: |
2194 |
|
- small bug fixes in the_main_loop |
2195 |
|
. fix order of monitor arguments |
2196 |
|
. change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY |
2197 |
|
. move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so |
2198 |
|
that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF |
2199 |
|
- replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the |
2200 |
|
imbalance diagnostics for wmean_h/sflux = 0 |
2201 |
|
- add actual values to f_obcsn/s/w/e in ecco_cost_final.F |
2202 |
|
- catch the case of empty filenames in ecco_cost_init_fixed.F |
2203 |
|
and ecco_readparms.F |
2204 |
|
- fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta) |
2205 |
|
to make this statement meaningfull in ecco_cost_weights.F |
2206 |
|
o pkg zonal_filt: |
2207 |
|
- change ZONAL_FILTER S/R interface (allows to filter 2-D fields) |
2208 |
|
- when using rStar, filter uVel*hFacW instead of uVel |
2209 |
|
(tested without topography: fix a Pb of growing instability with NLFS) |
2210 |
|
o pkg/aim/thsice: |
2211 |
|
-Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F |
2212 |
|
(works as SST restoring) |
2213 |
|
o pkg/thsice: |
2214 |
|
-add specific parameter for salt restoring in slab mixed-layer |
2215 |
|
(by default equal to the temperature restoring) |
2216 |
|
|
2217 |
|
checkpoint61v (2009/09/21) |
2218 |
|
o pkg/kpp: |
2219 |
|
-add double diffusive contributions as a hack, turned off by default |
2220 |
|
for now, and the code can be excluded with a CPP-flag |
2221 |
|
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX |
2222 |
|
-add a verification experiments to "vermix" to test this code |
2223 |
|
o pkg/mom_common: |
2224 |
|
Move computation of length scales to mom_init_fixed.F (avoid recomputation |
2225 |
|
at each time-steps*levels). |
2226 |
|
o pkg/layers: |
2227 |
|
Created a new package for computing volume fluxes in temperature or |
2228 |
|
[not yet implemented] density layers, e.g. for calculating residual |
2229 |
|
overturning circulations. |
2230 |
|
o pkg/diagnostics: |
2231 |
|
implement a RS type version for the set of DIAGNOSTICS-FILL subroutines |
2232 |
|
o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option) |
2233 |
|
o pkg/mdsio (& pkg/rw): rework high level S/R interface: |
2234 |
|
To avoid mixing type (RS/RL) of input/output array argument, |
2235 |
|
replace single mixed-type array with a pair from each type (RS/RL). |
2236 |
|
o setting pickupSuff force to start from a pickup (even if nIter0=0): this |
2237 |
|
is now implemented for all pkgs (previously only done for the main pickup) |
2238 |
|
|
2239 |
|
checkpoint61u (2009/08/25) |
2240 |
|
o pkg/obcs: |
2241 |
|
- change OB?eta from _RS to _RL and put them into a separate commen block |
2242 |
|
- add code to read OB?eta from a file via obcs_prescribe_read: the code |
2243 |
|
compiles and does not destroy any other experiments, the data is read |
2244 |
|
properly, but the code is not tested in actual applications |
2245 |
|
o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to |
2246 |
|
create a meaningful unit attribute for the time coordinate variable |
2247 |
|
o pkg/ebm: add plenty of missing "_d 0" ; |
2248 |
|
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
2249 |
|
Notes: several pieces of code only works for (very) specific set up |
2250 |
|
(domain size, lat range, etc ...); should be documented & stop if one |
2251 |
|
of those assumptions is not meet. |
2252 |
|
o pkg/seaice: add missing "_d 0" in HSNOW initialisation |
2253 |
|
update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests) |
2254 |
|
and offline_exf_seaice (seaicetd + adjoint). |
2255 |
|
o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC): |
2256 |
|
update results of experiments: lab_sea (4 fwd tests + 3 adjoint), |
2257 |
|
seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2). |
2258 |
|
o few changes to pass when compiling with strick checking of arguments |
2259 |
|
across S/R (allow to find few bugs in S/R calls). |
2260 |
|
o pkg/seaice: |
2261 |
|
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
2262 |
|
2d-fields, for slightly better performance |
2263 |
|
|
2264 |
|
checkpoint61t (2009/07/22) |
2265 |
|
o pkg/seaice: |
2266 |
|
- remove unused variables in seaice_evp |
2267 |
|
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
2268 |
|
o eeset_parms.F, open_copy_data_file.F & ini_parms.F: |
2269 |
|
named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT): |
2270 |
|
each processor opens a different file (a fix from Matt). |
2271 |
|
o cg2d: |
2272 |
|
use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F : |
2273 |
|
this reduces number of EXCH calls by 2 when using exch2. |
2274 |
|
For now, keep previous size array for gc2d_nsa.F to avoid Pb with store |
2275 |
|
directives and missing simple EXCH (exch_s3d_rx) adjoint code. |
2276 |
|
o pkg/thsice: |
2277 |
|
add code for Near Infra-Red albedo (from Jeff) |
2278 |
|
(turned on with run-time flag: thSIce_calc_albNIR, in data.ice). |
2279 |
|
o ini_model_io: |
2280 |
|
move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F |
2281 |
|
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
2282 |
|
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
2283 |
|
|
2284 |
|
checkpoint61s (2009/06/30) |
2285 |
|
o pkg/exch2 (exch2_rxN_cube*): |
2286 |
|
remove last BARRIER (no need to synchronise after getting data from shared |
2287 |
|
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
2288 |
|
o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH |
2289 |
|
and generate new output (for the 2 tests) using default rotationPeriod. |
2290 |
|
o pkg/exch2: |
2291 |
|
- always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F |
2292 |
|
(was already the case with AUTODIFF_EXCH2 defined) |
2293 |
|
- add bj in exch2 arrays and S/R. |
2294 |
|
- can now use pkg/exch2 for regular (non CS) set-up; switch test experiment |
2295 |
|
MLAdjust to exch2 (identical results except with MPI -> truncation diff); |
2296 |
|
o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep |
2297 |
|
- adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY |
2298 |
|
GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT |
2299 |
|
- verification experiment natl_box.longstep |
2300 |
|
o build_options: ifort+mpi_aces optfile (following Constantinos advise): |
2301 |
|
allow different versions of ifort (8 or 9) and different versions |
2302 |
|
of mpi (mpich or mpich2) to be used with the same optfile. |
2303 |
|
requires to load a netcdf module and set MPI_INC_DIR (see comments inside |
2304 |
|
optfile). Change testing scripts (example_scripts/ACESgrid) accordingly. |
2305 |
|
o pkg/seaice: |
2306 |
|
fix previous modif (3-level field removed) for old-pickup reading |
2307 |
|
|
2308 |
|
checkpoint61r (2009/06/25) |
2309 |
|
o pkg/seaice: |
2310 |
|
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
2311 |
|
1. introduce fields for time step (N-1) |
2312 |
|
2. do not use levels 2 and 3 anymore (but keep them) |
2313 |
|
3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This |
2314 |
|
includes changes to pkg/thsice/thsice_get_velocity.F, |
2315 |
|
model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and |
2316 |
|
pkg/obcs/obcs_apply_uvice.F. |
2317 |
|
- completely remove code for leap-frog time stepping for second order |
2318 |
|
advection |
2319 |
|
- adjusted adjoint accordingly; |
2320 |
|
gradient checks have improved by an order of magnitude! |
2321 |
|
|
2322 |
|
checkpoint61q (2009/06/22) |
2323 |
|
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
2324 |
|
- the boundary conditions along open boundaries are unclear, because the |
2325 |
|
associated masks are set to zero and are thus treated as closed when |
2326 |
|
applying the slip-boundary conditions. |
2327 |
|
- move initialisation of grid variables from seaice_init_varia to _fixed |
2328 |
|
o adding doc/diags_changes.txt |
2329 |
|
o model/src: |
2330 |
|
do_the_model_io: rename few pkg S/R which are called from do_the_model_io, |
2331 |
|
to avoid "_diags" naming if no relation to pkg/diagnostics. |
2332 |
|
ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF |
2333 |
|
file and only call PLOT_FIELD_XYZ if debugMode=T. |
2334 |
|
remove few PLOT_FIELD_XY calls outside initialisation. |
2335 |
|
remove few unnecessary BARRIER. |
2336 |
|
o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling |
2337 |
|
of salt_plume package in Southern Ocean |
2338 |
|
o pkg/thsice: |
2339 |
|
- fix hOceMxL in overlap (needed for sea-ice advection); |
2340 |
|
update output of experiment global_ocean.cs32x15.icedyn. |
2341 |
|
o pkg/seaice: |
2342 |
|
- make the (placeholder-)tracer IceAge a little more meaningful |
2343 |
|
by avoiding ridging of age due to convergent ice flow |
2344 |
|
- add diagnostics for surface temperature, atmospheric and oceanic |
2345 |
|
heat flux, and atmospheric and oceanic ice growth |
2346 |
|
|
2347 |
|
checkpoint61p (2009/06/10) |
2348 |
|
o eesupp (global_max & global_sum): |
2349 |
|
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
2350 |
|
- remove starting & endding barrier (no longer needed) |
2351 |
|
o pkg/mdsio, writelocal: |
2352 |
|
works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined |
2353 |
|
(remove the STOP): uses shared buffer IO to store data from all threads |
2354 |
|
and then let master-thread write nThreads tiles. |
2355 |
|
o pkg/mdsio (read/write field): |
2356 |
|
- tiled IO done in 1 piece (all levels at a time); |
2357 |
|
- new header file "MDSIO_BUFF_3D.h" with 3-D buffers. |
2358 |
|
- multi-threaded: allow to read/write local (non-shared) array |
2359 |
|
(was already working with singleCpuIO ; now works also without); |
2360 |
|
=> no longer needs barrier call after reading a file (added inside |
2361 |
|
mds_read/write field). |
2362 |
|
- move barrier calls outside gather/scatter_2d to mds_read/write_field |
2363 |
|
o pkg/obcs/exf |
2364 |
|
- exf_getffieldrec.F: add a few ". _d 0" and |
2365 |
|
add code to catch the case fldperiod = 0. |
2366 |
|
- obcs_precribe_read.F: change if statements so that they match |
2367 |
|
the variable type (_RL) |
2368 |
|
- add a separate exf_iprec_obcs to exf_set_obcs (by default equal to |
2369 |
|
exf_iprec) as part of namelist EXF_NML_01 |
2370 |
|
o pkg/mdsio: |
2371 |
|
- read/write tiled (local) files: read/write 1-level tile chunk at a time |
2372 |
|
(instead of segment of length sNx); expected to speed up tiled IO. |
2373 |
|
o pkg/exch2: |
2374 |
|
- take buffer copy from/to array out of S/R exch2_send/recv into new |
2375 |
|
S/R exch2_put/get ; Exch of local variable now works with MPI+MTH |
2376 |
|
(tested by removing commom block statement in SOLVE_FOR_PRESSURE.h). |
2377 |
|
- ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get) |
2378 |
|
- simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds |
2379 |
|
(which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by |
2380 |
|
including Topology header file (and common blocks). |
2381 |
|
- implement EXCH_IGNORE_CORNERS in scalar exchange (rx1); |
2382 |
|
remove 2nd exch call in exch2_s3d_rx (no longer needed). |
2383 |
|
- document S/R arg. list (+ update some comments) |
2384 |
|
o pkg/seaice: |
2385 |
|
- added SEAICE_CLIM_AIR code, which permits modulation of surface air |
2386 |
|
temperature and humidity over sea ice based on climatological values. |
2387 |
|
- clean up computation of Hibler+Bryan (1987) stress coupling for the case |
2388 |
|
of LSR (this change is expected to change the results slightly because now |
2389 |
|
it uses slightly difference moduli from the second last LSR solution, but |
2390 |
|
that is more consistent with the stress computations; this part of the code |
2391 |
|
is not tested in the verification experiments) |
2392 |
|
- fix diagnostics for flux of ice in case of B-grid |
2393 |
|
- turn strain rates eij and press into global fields within global |
2394 |
|
common block in SEAICE.h for more straighforward diagnostics |
2395 |
|
- fix diagnostics for principal stress components, press, zeta, eta |
2396 |
|
to give something meaning full |
2397 |
|
o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate |
2398 |
|
new output (all 4 tests) using default rotationPeriod. |
2399 |
|
o pkg KPP: |
2400 |
|
- add flag (LimitHblStable) to avoid limiting BL depth under stable conditions |
2401 |
|
- fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1 |
2402 |
|
and normal grid from 1 to Nr) |
2403 |
|
o Fix computations of L4rdt in mom_calc_visc.F |
2404 |
|
o eesupp: |
2405 |
|
new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg): |
2406 |
|
should be called before a "stop" if we know that all process are going |
2407 |
|
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
2408 |
|
|
2409 |
|
checkpoint61o (2009/05/26) |
2410 |
|
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
2411 |
|
o model/src/ini_curvilinear_grid.F: |
2412 |
|
compute angleSin/CosC when they are not read from a file |
2413 |
|
o pkg/seaice: |
2414 |
|
add pseudo time stepping for LSOR |
2415 |
|
o pkg/exch2: |
2416 |
|
temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW |
2417 |
|
o pkg/seaice: |
2418 |
|
Adding separate sea ice albedo, drag coefficients, and HO in Southern |
2419 |
|
Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h |
2420 |
|
o SingleCpuIO: |
2421 |
|
fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used. |
2422 |
|
o pkg/seaice: |
2423 |
|
put exchanged variable in (local) common block for MPI+Multi-Threads |
2424 |
|
to work (necessary with exch1, and for now with exch2 too). |
2425 |
|
o verification: to get more experiments tested with mpi, mth and mpi+mth, |
2426 |
|
change tiling of: |
2427 |
|
aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15, |
2428 |
|
hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope |
2429 |
|
update output of exp: |
2430 |
|
exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5), |
2431 |
|
tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod) |
2432 |
|
+ ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU |
2433 |
|
(note: output.txt generated on faulks using only 1 tile) |
2434 |
|
o eesupp & mdsio (SingleCpuIO): |
2435 |
|
- remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time |
2436 |
|
parameter "W2_useE2ioLayOut" (read from file "data.exch2"). |
2437 |
|
Note: was not effective for globalFile & useSingleCpuIO=F; now fixed. |
2438 |
|
- move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc). |
2439 |
|
- fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same |
2440 |
|
gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array). |
2441 |
|
o pkg/exch2: |
2442 |
|
- new code to set-up W2-Exch2 topology (replace matlab-topology-generator): |
2443 |
|
read parameter file "data.exch2" if it exists; otherwise try default regular |
2444 |
|
cube without blank-tile; new header file "W2_EXCH2_SIZE.h"; |
2445 |
|
- update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible |
2446 |
|
with new code (not to be used, just as a backup solution). |
2447 |
|
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
2448 |
|
in utils/exch2/input. |
2449 |
|
|
2450 |
|
checkpoint61n (2009/05/12) |
2451 |
|
o eesupp & mdsio (SingleCpuIO): |
2452 |
|
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
2453 |
|
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
2454 |
|
receive real*4 array (instead of real*8) to read/write 32.bit files. |
2455 |
|
(new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S |
2456 |
|
and remove new mapping S/R) |
2457 |
|
o pkg/mdsio: in preparation for topology-generator within pkg/exch2: |
2458 |
|
- Change declaration of SingleCpuIO buffer, reduced to only 1 dim.: |
2459 |
|
xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h |
2460 |
|
when using exch2. Add S/R to map global io-buffer to global model array. |
2461 |
|
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
2462 |
|
|
2463 |
|
checkpoint61m (2009/04/29) |
2464 |
|
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
2465 |
|
and add 3 other S/R for other types (R4,R8,RS). |
2466 |
|
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
2467 |
|
o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros): |
2468 |
|
- ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ; |
2469 |
|
- reduce number of macro definitions (keep only those which are used); |
2470 |
|
can always call directly the corrresponding S/R if needed. |
2471 |
|
- everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix |
2472 |
|
_R4/_R8 to _RS/_RL when applied to _RS/_RL variable. |
2473 |
|
Fixed wrong type of arg in: |
2474 |
|
atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F |
2475 |
|
ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F |
2476 |
|
To fix: global_sum of var in common block is wrong (multi-threaded) in: |
2477 |
|
dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F |
2478 |
|
To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops) |
2479 |
|
o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd |
2480 |
|
"nlfs" mpi test is going to stop when checking for unconnected tile egdes. |
2481 |
|
o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error |
2482 |
|
o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile |
2483 |
|
edges are closed (zero depth); might happen with "blank tiles"; |
2484 |
|
for now, disabled if using OBCS. |
2485 |
|
o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi": |
2486 |
|
link *_mpi files from "MODS" dir) to return to a strait-forward behavior. |
2487 |
|
o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D) |
2488 |
|
to reduce length of 1.D array print in STDOUT. |
2489 |
|
o adjustment.cs-32x32x1: changed to oceanic test with 1 continent |
2490 |
|
+ use 48 tiles (16x8): this will allow to test "blank tiles". |
2491 |
|
o start to test MPI + multi-threaded (change testreport to skip tests |
2492 |
|
where number of tiles do not match). |
2493 |
|
o genmake2: add option "-omp" to turn on Open-MP ; |
2494 |
|
passed to testreport (if using -mth) ; merge few (*+mth) optfiles. |
2495 |
|
o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them) |
2496 |
|
and keep the original tile numbering. Note: compatible with old |
2497 |
|
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
2498 |
|
|
2499 |
|
checkpoint61l (2009/04/07) |
2500 |
|
o Overlaps had been forgotten in calculating ijk keys : fixed |
2501 |
|
o fix cyrus makedepend for gcc 4.4 |
2502 |
|
o experiment fizhi-cs-aqualev20: |
2503 |
|
switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE) |
2504 |
|
and generate new output. Note: new output is much closer to the old |
2505 |
|
one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from |
2506 |
|
the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007. |
2507 |
|
o pkg/fizhi: |
2508 |
|
- change to avoid indices going deliberately over array-bounds |
2509 |
|
- remove unnecessary MPI stuff |
2510 |
|
- perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY" |
2511 |
|
- new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE: |
2512 |
|
does not go over array-bounds and therefore returns reliable output. |
2513 |
|
- in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls: |
2514 |
|
this S/R has 4 output arguments, which are used inside "get_alarm"; |
2515 |
|
when it is called with the same variable "ndum" in place of several |
2516 |
|
output arguments, this produces weird side effect inside "get_alarm" |
2517 |
|
(e.g., datein=dates(n) is overwritten by timein=times(n) since both |
2518 |
|
datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum" |
2519 |
|
address) and produces error. |
2520 |
|
o tools/gemake2: (March 27-29 2009) |
2521 |
|
with option "-mpi": link *_mpi files from "MODS" dir (this is what |
2522 |
|
testreport does). |
2523 |
|
o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output |
2524 |
|
o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F: |
2525 |
|
update lab_sea.lsr & lab_sea.salt_plume results |
2526 |
|
o pkg/seaice: |
2527 |
|
Major overhaul of the LSOR solver: change discretization from original |
2528 |
|
finite differences to finite volume. The old routine is still in the |
2529 |
|
file seaice_lsr.F and can be turned on with the CPP-flag |
2530 |
|
SEAICE_OLD_AND_BAD_DISCRETIZATION |
2531 |
|
Along with this change, the discretization of the strain rates is changed. |
2532 |
|
The same flag turns on the old discretization in seaice_calc_strainrates.F |
2533 |
|
All verification experiments with seaice are affected (except for |
2534 |
|
seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old |
2535 |
|
results by setting the above flag. |
2536 |
|
Further changes involve changes in defaults: |
2537 |
|
- ALLOW_FLOODING is defined and turned on by default |
2538 |
|
- SEAICEadvSnow = .true. is now the default |
2539 |
|
- SEAICEadvSalt = .true. is now the default |
2540 |
|
- SEAICEadvAge = .true. is now the default |
2541 |
|
- SEAICE_clipVelocities = .false. is now the default |
2542 |
|
(as per J. Zhang's recommendation) |
2543 |
|
- B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE |
2544 |
|
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
2545 |
|
- seaice_growth: replace computation of UG by a simple copy from wspeed |
2546 |
|
|
2547 |
|
checkpoint61k (2009/03/18) |
2548 |
|
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
2549 |
|
seaice_lsr: fixed a few metric terms, |
2550 |
|
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
2551 |
|
add more debugging diagnostics |
2552 |
|
seaice_evp: removed superfluous many metric terms of FV discretization |
2553 |
|
of stress divergence |
2554 |
|
affects lab_sea, lab_sea.hb87 |
2555 |
|
seaice_ocean_stress: removed superfluous many metric terms of FV discretization |
2556 |
|
of stress divergence for non-evp solver |
2557 |
|
(this part is not tested anywhere) |
2558 |
|
seaice_calc_strainrates: fixed a bug in no-slip boundary conditions, |
2559 |
|
they were effectively only half slip |
2560 |
|
affects lab_sea.hb87 |
2561 |
|
updated all relevant verification experiments (except lab_sea//output_adm.txt |
2562 |
|
which was left over, but fails at level 7 & 6) |
2563 |
|
|
2564 |
|
checkpoint61j (2009/03/17) |
2565 |
|
o pkg/seaice: turn a few hard wired parameters into run time parameters |
2566 |
|
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
2567 |
|
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
2568 |
|
o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids |
2569 |
|
that are not cubed-sphere grids |
2570 |
|
o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR |
2571 |
|
o pkg/ctrl: |
2572 |
|
fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low) |
2573 |
|
o non-hydrostatic (calc_gw.F): |
2574 |
|
fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec |
2575 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
2576 |
|
o remove backward compatibility for thetaMin,phiMin |
2577 |
|
(replaced by xgOrigin,ygOrigin on Jan 27, 2009) |
2578 |
|
o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the |
2579 |
|
interpolated wind field not only for curvilineargrid=.true., but also |
2580 |
|
for a rotated grid (rotateGrid=.true.) |
2581 |
|
o pkg/exf: add capability to bypass interpolation for runoff |
2582 |
|
by setting yet another CPP-flag |
2583 |
|
o eesupp/src, B-grid exchange: |
2584 |
|
add simple (6 tiles, non MPI) CS exch + standard interface S/R. |
2585 |
|
o autodiff |
2586 |
|
new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV |
2587 |
|
allows to switch to single-prec common blocks; |
2588 |
|
corresponding switch occurs in tamc.h, integer isbyte |
2589 |
|
TAF store directivs "byte" and "kind" seem equivalent; |
2590 |
|
Most tamc.h have been updated correspondingly. |
2591 |
|
|
2592 |
|
checkpoint61i (2009/02/13) |
2593 |
|
o autodiff: |
2594 |
|
fix autodiff_sore/_restore indices for obcs |
2595 |
|
(spotted by I. Hoteit, M. Mazloff) |
2596 |
|
o pkg/autodiff, pkg/ctrl: |
2597 |
|
Add flag to reduce all tapelev I/O to single-prec. |
2598 |
|
In data.ctrl set |
2599 |
|
doSinglePrecTapelev = .TRUE. |
2600 |
|
o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2: |
2601 |
|
check in hack for SX8 compiler (for dxV, dyU); remove it afterwards. |
2602 |
|
o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for |
2603 |
|
real fresh water flux (not yet) |
2604 |
|
o pkg/mdsio & rw: |
2605 |
|
- add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta) |
2606 |
|
- add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX. |
2607 |
|
o pkg/flt: |
2608 |
|
- replace FLT_INIT by 3-steps standard initialization S/R: readparms, |
2609 |
|
init_fixed & ini_varia. |
2610 |
|
- clean-up & simplify linear interpolation S/R: |
2611 |
|
move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid. |
2612 |
|
- fix some indices (mainly vertical index) ; add IMPLICIT NONE. |
2613 |
|
- more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R. |
2614 |
|
- add vert. coordinate & horiz. indices to output files. |
2615 |
|
- change vertical position in initial condition, from index to depth [m]. |
2616 |
|
- store horizontal (decimal) indices i,j in common block (instead of coord. x,y) |
2617 |
|
(easier to get to a curvilinear grid) ; delX,delY no longer used. |
2618 |
|
o pkg/ggl90: a few modifications: |
2619 |
|
- fix bottom boundary condition, and interpolation of KappaE |
2620 |
|
near top and bottom |
2621 |
|
- use same set of viscosity/diffusivity for TKE/momnetum/tracer |
2622 |
|
- add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH) |
2623 |
|
- add a few options for mixing-length upper limit (--> mxlMaxFlag) |
2624 |
|
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
2625 |
|
(maintain temporary backward compatibility, until next checkpoint) |
2626 |
|
|
2627 |
|
checkpoint61h (2009/01/27) |
2628 |
|
o pkg/diagnostics with "periodic averaging diagnostics": |
2629 |
|
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
2630 |
|
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
2631 |
|
o pkg/obcs: fix loop ranges for balancing code |
2632 |
|
o pkg/flt: |
2633 |
|
- improve criteria for finding which tile owns a float. |
2634 |
|
- fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case. |
2635 |
|
o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg |
2636 |
|
aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling |
2637 |
|
with ocean biogeo) |
2638 |
|
o pkg/flt: |
2639 |
|
- do some cleaning and fix the restart ; |
2640 |
|
- add output.txt in flt_example/results to get this pkg tested. |
2641 |
|
o genmake2: add an EXTENDED_SRC option and flag. |
2642 |
|
for now, cannot be turned on on command line (only through genmake_local) |
2643 |
|
o pkg/mdsio: read/write vector: |
2644 |
|
- singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS |
2645 |
|
- singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR |
2646 |
|
& MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS. |
2647 |
|
- affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO) |
2648 |
|
(drop to 4 digits matching for grad). But this test does not look very |
2649 |
|
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
2650 |
|
|
2651 |
|
checkpoint61g (2008/12/29) |
2652 |
|
o pkg/flt: |
2653 |
|
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
2654 |
|
+ make OPTIONS file more standard. |
2655 |
|
- rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name) |
2656 |
|
- fix _BYTESWAPIO CPP-Flag |
2657 |
|
- standard reading of file-parameter "data.flt" |
2658 |
|
- fix argument list of S/R FLT_RESTART |
2659 |
|
still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F |
2660 |
|
o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell |
2661 |
|
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
2662 |
|
a still unfixed compiler/optimization bug |
2663 |
|
|
2664 |
|
checkpoint61f (2008/11/21) |
2665 |
|
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
2666 |
|
update results of global_ocean.cs32x15.icedyn test. |
2667 |
|
o move getcon.F from model/src to pkg/fizhi. |
2668 |
|
o pkg/exf: add parameter for extrapolation of temp up to the surface |
2669 |
|
and option to prevent negative evap (in bulk_largeyeager04 only). |
2670 |
|
o Prather Advection scheme: fix tracer conservation for divergent flow |
2671 |
|
(e.g., when using NonLin Free-Surface). |
2672 |
|
o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead |
2673 |
|
o gmredi (Visbeck-variable-K): |
2674 |
|
- add more parameters to Visbeck-variable-K. |
2675 |
|
- use a 5 points average for dSigmaR in Visbeck-K calculation |
2676 |
|
(more "homogenous": same stencil and same weights as in dSigmaH) |
2677 |
|
- update output of ideal_2D_oce experiment. |
2678 |
|
o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4 |
2679 |
|
(#undef REAL4_IS_SLOW) |
2680 |
|
- pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4 |
2681 |
|
coordinate variable |
2682 |
|
- pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables |
2683 |
|
(surface forcing fields), removes some of the functionality |
2684 |
|
- model/src/write_grid.F: write _RS variables as RS-netcdf variables |
2685 |
|
- model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but |
2686 |
|
probably not all: copy _RS surface flux fields to RL field before |
2687 |
|
calling DIAGNOSTICS_FILL |
2688 |
|
- model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into |
2689 |
|
real*4 (CALL EXCH_*_RS) versions. |
2690 |
|
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
2691 |
|
(generate new output). |
2692 |
|
|
2693 |
|
checkpoint61e (2008/10/23) |
2694 |
|
o gmredi (Visbeck-variable-K): |
2695 |
|
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
2696 |
|
- change computation of Visbeck-K where Slope > Smax : |
2697 |
|
now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct) |
2698 |
|
previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output. |
2699 |
|
o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic |
2700 |
|
to be the same as with Z-coord. (i.e., m/s & no-units respectively). |
2701 |
|
o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc) |
2702 |
|
o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz |
2703 |
|
does not become too large (to avoid precision problems in implicit-diffusion |
2704 |
|
solver); update ideal_2D_oce output. |
2705 |
|
o pkg ggl90: |
2706 |
|
- in ggl90_cal.F: compute only one set of visc/diff, used to |
2707 |
|
step forward TKE/T/S/momentum |
2708 |
|
- default value of GGL90viscMax/GGL90diffMax larger and equal (to |
2709 |
|
have Prandlt =1) |
2710 |
|
o gmredi (fm07): |
2711 |
|
- add lower limit on Transition layer thickness + lower limit on 1/lambda |
2712 |
|
- allow to set few more params from data.gmredi |
2713 |
|
o pkg ggl90: |
2714 |
|
- add missing sqrt(2) factor in computation of mixing length |
2715 |
|
scale in ggl90_calc.F |
2716 |
|
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
2717 |
|
|
2718 |
|
checkpoint61d (2008/09/25) |
2719 |
|
o adjoint modifs |
2720 |
|
- adapt to new field rhoInSitu |
2721 |
|
- allow to revert from StoreDynVars2D, StoreDynVars3D |
2722 |
|
to individual fields |
2723 |
|
(switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D) |
2724 |
|
o store 3-D (in-situ) density in commom block (DYNVARS.h) |
2725 |
|
- save 1 rho computation. |
2726 |
|
- no longer modify T & S inland when using down_slope pkg. |
2727 |
|
o gad_som : allow to switch to SOM advection for T & S without corresponding |
2728 |
|
pickup files (using new S/R: MDS_CHECK4FILE). |
2729 |
|
o keep removing _BEGIN/_END_MASTER between MDSIO S/R call |
2730 |
|
(for useSingleCpuIO to work in multi-threaded) |
2731 |
|
o pkg/shelfice: |
2732 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
2733 |
|
with SHELFICEtopoFile in data.shelfice |
2734 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
2735 |
|
subroutines of the shelfice package |
2736 |
|
- separate initialisation of "fixed" and "variable" variables |
2737 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
2738 |
|
o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
2739 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
2740 |
|
and rename: |
2741 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
2742 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
2743 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
2744 |
|
|
2745 |
|
checkpoint61c (2008/08/30) |
2746 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
2747 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
2748 |
|
of oceanic real-fresh water flux). |
2749 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
2750 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
2751 |
|
o new pkg: down_slope |
2752 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
2753 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
2754 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
2755 |
|
- implementation for ocean in P-coords not tested. |
2756 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
2757 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
2758 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
2759 |
|
o change FIND_RHO to FIND_RHO_2D : |
2760 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
2761 |
|
o new pkg: cheapaml |
2762 |
|
|
2763 |
|
checkpoint61b (2008/08/05) |
2764 |
|
o exch2: |
2765 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
2766 |
|
- no longer depend on the order sequence (N,S,E,W). |
2767 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
2768 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
2769 |
|
- exch_UV_A-grid readily available (but not yet tested). |
2770 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
2771 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
2772 |
|
get truncation error differences with adjoint exch. |
2773 |
|
o exch2: |
2774 |
|
- change index-bounds storage (moved from target to local tile, |
2775 |
|
more intuitive this way) ; rename/remove some variables. |
2776 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
2777 |
|
|
2778 |
|
checkpoint61a (2008/07/29) |
2779 |
|
o exch2/matlab-topology-generator: |
2780 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
2781 |
|
had any effect on the solution). |
2782 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
2783 |
|
is exceeded |
2784 |
|
o testreport: modify syntax of awk, so that it works also with |
2785 |
|
awk, and not only with nawk and gawk |
2786 |
|
|
2787 |
|
checkpoint61 (2008/06/24) |
2788 |
|
o autodiff |
2789 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
2790 |
|
This changes TAF subroutine argument list (ordering of active var.) |
2791 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
2792 |
|
To restore TAMC-compatibility, need following modifs: |
2793 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
2794 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
2795 |
|
Tested TAF version is 1.9.22 |
2796 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
2797 |
|
|
2798 |
|
checkpoint60 (2008/06/19) |
2799 |
|
--->>> This is the last checkpoint for which generating the adjoint |
2800 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
2801 |
|
--->>> by default. |
2802 |
|
--->>> Future checkpoints will ommit this flag by default. |
2803 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
2804 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
2805 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
2806 |
|
o pkg/autodiff: more flexibility in zeroadj. |
2807 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
2808 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
2809 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
2810 |
|
special setup of gmredi for which the adjoint is stable |
2811 |
|
enough for parameter optimization. |
2812 |
|
o bridging the gap between eddy stress and GM. |
2813 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
2814 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
2815 |
|
-> when using GM w/ GM_AdvForm: |
2816 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
2817 |
|
is applied either in the tracer Eq. or in momentum Eq. |
2818 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
2819 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
2820 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
2821 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
2822 |
|
|
2823 |
|
checkpoint59r (2008/05/29) |
2824 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
2825 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
2826 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
2827 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
2828 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
2829 |
|
mass points, when using mnc for output |
2830 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
2831 |
|
default (which is the value of getcon('UNDEF')) |
2832 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
2833 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
2834 |
|
initialisation of never used fields |
2835 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
2836 |
|
versions |
2837 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
2838 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
2839 |
|
are missing. |
2840 |
|
o move from external_forcing_surf.F to ini_forcing.F |
2841 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
2842 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
2843 |
|
o Freshen up a bit hs94.1x64x5, notably: |
2844 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
2845 |
|
exactConserv=.TRUE. |
2846 |
|
o pkg/generic_advdiff: |
2847 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
2848 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
2849 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
2850 |
|
this uses a dynamically allocated internal state data structure |
2851 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
2852 |
|
and requires a fortran 90 compiler |
2853 |
|
|
2854 |
|
checkpoint59q (2008/05/06) |
2855 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
2856 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
2857 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
2858 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
2859 |
|
- change EOS (POLY3 --> JMD95Z) |
2860 |
|
- use Bryan-Lewis vertical diffusivity |
2861 |
|
- use multidimensional advection |
2862 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
2863 |
|
- change a couple of parameters in dic pkg |
2864 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
2865 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
2866 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
2867 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
2868 |
|
o implementation of TAF directives for gchem,cfc,dic |
2869 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
2870 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
2871 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
2872 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
2873 |
|
--> changes results in exp4, seaice_obcs |
2874 |
|
o tutorial_deep_convection : |
2875 |
|
update the set-up and increase resolution and domain size ; start |
2876 |
|
from pseudo initial conditions = output at t=120mn in order to see |
2877 |
|
something happening when running testreport. |
2878 |
|
o pkg/seaice: add os7mp as an advection scheme |
2879 |
|
add check for advection schemes |
2880 |
|
add a flag for restoring T and S underneath sea ice |
2881 |
|
o pkg/my82: add netcdf-support and diagnostics |
2882 |
|
o thsice pkg: |
2883 |
|
- Now hsMax limits snow height by turning it into ice following |
2884 |
|
flooding scheme (and now conserving energy) |
2885 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
2886 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
2887 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
2888 |
|
|
2889 |
|
checkpoint59p (2008/04/10) |
2890 |
|
o gchem / dic / cfc : |
2891 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
2892 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
2893 |
|
- various re-arrangement in initialisation & header file ; |
2894 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
2895 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
2896 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
2897 |
|
before) providing pickupStrictlyMatch is set to False. |
2898 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
2899 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
2900 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
2901 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
2902 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
2903 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
2904 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
2905 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
2906 |
|
scheme to use for vorticty-term ; |
2907 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
2908 |
|
(with default selectVortScheme, return to original discretisation) |
2909 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
2910 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
2911 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
2912 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
2913 |
|
also fix diagnostics VISCAHW & VISCA4W. |
2914 |
|
|
2915 |
|
checkpoint59o (2008/03/07) |
2916 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
2917 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
2918 |
|
move a few statemens out the main loop into separate loops |
2919 |
|
o pkg/shelfice: |
2920 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
2921 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
2922 |
|
rhoConstFresh=rhoConst (by accident) |
2923 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
2924 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
2925 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
2926 |
|
- convert potential temperature into in-situ temperature. This changes the |
2927 |
|
isomip tests => update tests |
2928 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
2929 |
|
writing a pickup at the last timestep |
2930 |
|
o tools/mpack-1.6 : |
2931 |
|
- disable automake (not working) and autoconf (not needed). |
2932 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
2933 |
|
also cleaner with much less compilation warnings. |
2934 |
|
o pkg/profiles: |
2935 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
2936 |
|
(for "less than 32 characters name" compiler requirement) |
2937 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
2938 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
2939 |
|
o pkg/diagnostics (stats-diags): |
2940 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
2941 |
|
o genmake2: replace (4 times) |
2942 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
2943 |
|
with |
2944 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
2945 |
|
echo $COMM >> genmake_warnings |
2946 |
|
$COMM >> genmake_warnings 2>&1 |
2947 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
2948 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
2949 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
2950 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
2951 |
|
o pkg/ctrl: |
2952 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
2953 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
2954 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
2955 |
|
|
2956 |
|
checkpoint59n (2008/02/09) |
2957 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
2958 |
|
number in dedicate array "hdiag": |
2959 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
2960 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
2961 |
|
- many small changes (integer format) for large number of diagnostics |
2962 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
2963 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
2964 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
2965 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
2966 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
2967 |
|
geographical coordinates according to the inverse of the rotation defined |
2968 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
2969 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
2970 |
|
Naturally, this feature does not work with all packages, so some |
2971 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
2972 |
|
profiles), because there the coordinates are assumed to be regular |
2973 |
|
spherical grid coordinates. |
2974 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
2975 |
|
- introduce isopycnal diffusion coefficient control. |
2976 |
|
o tools/adjoint_options: |
2977 |
|
- additional control vector components. |
2978 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
2979 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
2980 |
|
o pkg/mypackage: |
2981 |
|
- add example of read/write pickup for state-var ; |
2982 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
2983 |
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
2984 |
transitions for useExfYearlyFields |
transitions for useExfYearlyFields |
2985 |
- add new subroutine that determines the file to read from for |
- add new subroutine that determines the file to read from for |
2986 |
use*YearlyFields = .TRUE. and .FALSE. |
use*YearlyFields = .TRUE. and .FALSE. |
2987 |
|
- add a verification experiment to global_with_exf that tests |
2988 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
2989 |
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
2990 |
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
2991 |
subroutines (which could be generated from a template, because they are |
subroutines (which could be generated from a template, because they are |
3007 |
for now this is only available for the C-grid code and also within |
for now this is only available for the C-grid code and also within |
3008 |
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
3009 |
|
|
3010 |
checkpoint59m |
checkpoint59m (2008/01/14) |
3011 |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
3012 |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
3013 |
o gad_som : fix flux output (& diagnostics) to have same units as other |
o gad_som : fix flux output (& diagnostics) to have same units as other |
3025 |
o pkg/salt_plume: added various options for salt plume depth |
o pkg/salt_plume: added various options for salt plume depth |
3026 |
criterion and for vertical distribution of the salt |
criterion and for vertical distribution of the salt |
3027 |
|
|
3028 |
checkpoint59l |
checkpoint59l (2007/12/18) |
3029 |
o pkg/ptracers: new version of ptracers pickup: |
o pkg/ptracers: new version of ptracers pickup: |
3030 |
read meta file and write only fields which are needed to restart. |
read meta file and write only fields which are needed to restart. |
3031 |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
3047 |
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
3048 |
or U/VICE from U/VWIND before computing U/VSTRESS |
or U/VICE from U/VWIND before computing U/VSTRESS |
3049 |
|
|
3050 |
checkpoint59k |
checkpoint59k (2007/11/30) |
3051 |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
3052 |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
3053 |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
3069 |
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
3070 |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
3071 |
|
|
3072 |
checkpoint59j |
checkpoint59j (2007/11/09) |
3073 |
o in pkgs: dic, obcs, offline, rbcs: |
o in pkgs: dic, obcs, offline, rbcs: |
3074 |
standard way to compute coeff. for time interpolation between 2 time reccords |
standard way to compute coeff. for time interpolation between 2 time reccords |
3075 |
which retains full precision (& make results less dependent on compiler). |
which retains full precision (& make results less dependent on compiler). |
3112 |
o added open boundary conditions capability for seaice |
o added open boundary conditions capability for seaice |
3113 |
HSNOW, HSALT, UICE, and VICE |
HSNOW, HSALT, UICE, and VICE |
3114 |
|
|
3115 |
checkpoint59i |
checkpoint59i (2007/10/21) |
3116 |
o adjoint: |
o adjoint: |
3117 |
* fix multiDimAdvection adjoint |
* fix multiDimAdvection adjoint |
3118 |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
3153 |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
3154 |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
3155 |
|
|
3156 |
checkpoint59h |
checkpoint59h (2007/09/29) |
3157 |
o pkg/exf: |
o pkg/exf: |
3158 |
- improve vectorization by moving if-statement out of loops in |
- improve vectorization by moving if-statement out of loops in |
3159 |
exf_mapfields, exf_radiation |
exf_mapfields, exf_radiation |
3186 |
o testreport: change AD testing : check against results/output_adm.txt |
o testreport: change AD testing : check against results/output_adm.txt |
3187 |
using same scripts as for forward test. |
using same scripts as for forward test. |
3188 |
|
|
3189 |
checkpoint59g |
checkpoint59g (2007/09/17) |
3190 |
o adjoint testing: in preparation for changing testreport: |
o adjoint testing: in preparation for changing testreport: |
3191 |
- output format: cost and grad written on separated lines |
- output format: cost and grad written on separated lines |
3192 |
- ad output results in directory "results" (instead of "results_ad") |
- ad output results in directory "results" (instead of "results_ad") |
3231 |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
3232 |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
3233 |
|
|
3234 |
checkpoint59f |
checkpoint59f (2007/08/21) |
3235 |
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
3236 |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
3237 |
a bounded range (in forward mode) |
a bounded range (in forward mode) |
3262 |
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
3263 |
output of global_ocean.cs32x15.thsice . |
output of global_ocean.cs32x15.thsice . |
3264 |
|
|
3265 |
checkpoint59e |
checkpoint59e (2007/07/26) |
3266 |
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
3267 |
for B-grid vector (not yet tested) and C-grid vector (<- only used |
for B-grid vector (not yet tested) and C-grid vector (<- only used |
3268 |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
3292 |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
3293 |
* applied OBCS T/S mask to HEFFM sea ice mask |
* applied OBCS T/S mask to HEFFM sea ice mask |
3294 |
|
|
3295 |
checkpoint59d |
checkpoint59d (2007/06/21) |
3296 |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
3297 |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
3298 |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
3338 |
It is turned off by default (=-1.), because it changes the results. |
It is turned off by default (=-1.), because it changes the results. |
3339 |
- make it possible to read AREA from a file, too. |
- make it possible to read AREA from a file, too. |
3340 |
|
|
3341 |
checkpoint59c |
checkpoint59c (2007/06/04) |
3342 |
o add S/R and diagnostics for oceanic mixed-layer depth |
o add S/R and diagnostics for oceanic mixed-layer depth |
3343 |
o move GMRedi call after all vertical mixing schemes (including KPP) |
o move GMRedi call after all vertical mixing schemes (including KPP) |
3344 |
o pkg/thsice: |
o pkg/thsice: |
3371 |
Storing is now bundled into large arrays to optimized I/O |
Storing is now bundled into large arrays to optimized I/O |
3372 |
(and second step in cleanup of the_main_loop) |
(and second step in cleanup of the_main_loop) |
3373 |
|
|
3374 |
checkpoint59b |
checkpoint59b (2007/05/16) |
3375 |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
3376 |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
3377 |
o pkg/seaice: |
o pkg/seaice: |
3442 |
o OpenAD |
o OpenAD |
3443 |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
3444 |
|
|
3445 |
checkpoint59a |
checkpoint59a (2007/05/01) |
3446 |
o pkg/seaice: some parameter clarifications and a little bit of clean up |
o pkg/seaice: some parameter clarifications and a little bit of clean up |
3447 |
o pkg/thsice: rename run-time parameters: |
o pkg/thsice: rename run-time parameters: |
3448 |
himin -> hIceMin |
himin -> hIceMin |
3484 |
o pkg/kpp: add code to have mixing in shelf ice caverns |
o pkg/kpp: add code to have mixing in shelf ice caverns |
3485 |
- add myThid to all kpp routines (long overdue) |
- add myThid to all kpp routines (long overdue) |
3486 |
|
|
3487 |
checkpoint59 |
checkpoint59 (2007/04/19) |
3488 |
o pkg/exf: |
o pkg/exf: |
3489 |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
3490 |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
3510 |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
3511 |
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
3512 |
|
|
3513 |
checkpoint58y_post |
checkpoint58y_post (2007/04/15) |
3514 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
3515 |
vertical diffusivity, similar to that in MOM4; turned on using |
vertical diffusivity, similar to that in MOM4; turned on using |
3516 |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
3526 |
- better when using non-linear advection scheme (not yet fully tested) |
- better when using non-linear advection scheme (not yet fully tested) |
3527 |
- can also be used in atmospheric set-up (for now, only the diffusion). |
- can also be used in atmospheric set-up (for now, only the diffusion). |
3528 |
|
|
3529 |
checkpoint58x_post |
checkpoint58x_post (2007/04/04) |
3530 |
o IO option for global-file compact format: |
o IO option for global-file compact format: |
3531 |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
3532 |
- add I/O capability (pkg/mdsio). |
- add I/O capability (pkg/mdsio). |
3534 |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
3535 |
o shelfice: add a few diagnostics |
o shelfice: add a few diagnostics |
3536 |
|
|
3537 |
checkpoint58w_post |
checkpoint58w_post (2007/03/13) |
3538 |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
3539 |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
3540 |
(and replace horiVertRatio in NH code). |
(and replace horiVertRatio in NH code). |
3555 |
o move call to cal_readparms up to make calendar parameters/variable available |
o move call to cal_readparms up to make calendar parameters/variable available |
3556 |
to all packages |
to all packages |
3557 |
|
|
3558 |
checkpoint58v_post |
checkpoint58v_post (2007/02/08) |
3559 |
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
3560 |
useDynP_inEos_Zc tested. |
useDynP_inEos_Zc tested. |
3561 |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
3574 |
- use this scheme for temperature & salinity in 2 advection test exp.: |
- use this scheme for temperature & salinity in 2 advection test exp.: |
3575 |
advect_xy & advect_xz, respectively. |
advect_xy & advect_xz, respectively. |
3576 |
|
|
3577 |
checkpoint58u_post |
checkpoint58u_post (2007/01/12) |
3578 |
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
3579 |
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
3580 |
o testreport: add option "-skipdir" to skip some test. |
o testreport: add option "-skipdir" to skip some test. |
3589 |
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
3590 |
o pkg/thsice: fix reading mnc-pickups |
o pkg/thsice: fix reading mnc-pickups |
3591 |
|
|
3592 |
checkpoint58t_post |
checkpoint58t_post (2006/12/30) |
3593 |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
3594 |
o pkg/mdsio: |
o pkg/mdsio: |
3595 |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
3632 |
- introduce a few local fields to avoid modifying external fields such |
- introduce a few local fields to avoid modifying external fields such |
3633 |
as atemp, etc. |
as atemp, etc. |
3634 |
|
|
3635 |
checkpoint58s_post |
checkpoint58s_post (2006/12/11) |
3636 |
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
3637 |
changed exf_set_gen.F so that |
changed exf_set_gen.F so that |
3638 |
genperiod=0 means input file is one time-constant field and |
genperiod=0 means input file is one time-constant field and |
3666 |
as actual snow thickness. It now refers everywhere to effective snow |
as actual snow thickness. It now refers everywhere to effective snow |
3667 |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
3668 |
|
|
3669 |
checkpoint58r_post |
checkpoint58r_post (2006/11/17) |
3670 |
o modifications to pkg/seaice/growth.F, which change results of |
o modifications to pkg/seaice/growth.F, which change results of |
3671 |
lab_sea experiment: fixes pertain to melting snow over open water, to |
lab_sea experiment: fixes pertain to melting snow over open water, to |
3672 |
masking EVAP under sea ice, and to using the correct AREA variable for |
masking EVAP under sea ice, and to using the correct AREA variable for |
3690 |
o ctrl: adding new control variables: |
o ctrl: adding new control variables: |
3691 |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
3692 |
|
|
3693 |
checkpoint58q_post |
checkpoint58q_post (2006/10/20) |
3694 |
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
3695 |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
3696 |
high_res_cube configuration by 4% on Columbia. |
high_res_cube configuration by 4% on Columbia. |
3701 |
single CPU io) so that TAF does not have to see EESUPPORT.h |
single CPU io) so that TAF does not have to see EESUPPORT.h |
3702 |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
3703 |
|
|
3704 |
checkpoint58p_post |
checkpoint58p_post (2006/09/08) |
3705 |
o obcs: stop if obcs is used with useCDscheme = .true. |
o obcs: stop if obcs is used with useCDscheme = .true. |
3706 |
o shelfice: |
o shelfice: |
3707 |
- fix a sign error so that no slip at shelfice interface works |
- fix a sign error so that no slip at shelfice interface works |
3712 |
o added adjoint exch routined for all exch*3d* routines |
o added adjoint exch routined for all exch*3d* routines |
3713 |
and updated flow directives |
and updated flow directives |
3714 |
|
|
3715 |
checkpoint58o_post |
checkpoint58o_post (2006/08/28) |
3716 |
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
3717 |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
3718 |
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
3726 |
- add a simple boundary layer scheme to reduce noise |
- add a simple boundary layer scheme to reduce noise |
3727 |
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
3728 |
|
|
3729 |
checkpoint58n_post |
checkpoint58n_post (2006/08/14) |
3730 |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
3731 |
local variable (not in common block). |
local variable (not in common block). |
3732 |
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
3747 |
and stop cleanly when MAX_NO_THREADS is too small. |
and stop cleanly when MAX_NO_THREADS is too small. |
3748 |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
3749 |
|
|
3750 |
checkpoint58m_post |
checkpoint58m_post (2006/07/17) |
3751 |
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
3752 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
3753 |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
3773 |
update rotating_tank results, but not plume_on_slope (affected at |
update rotating_tank results, but not plume_on_slope (affected at |
3774 |
truncation level, 11 digits). |
truncation level, 11 digits). |
3775 |
|
|
3776 |
checkpoint58l_post |
checkpoint58l_post (2006/07/12) |
3777 |
o calc_gw: |
o calc_gw: |
3778 |
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
3779 |
- remove side-drag for now (need to fix it); update plume_on_slope results. |
- remove side-drag for now (need to fix it); update plume_on_slope results. |
3791 |
o pkg/rbcs |
o pkg/rbcs |
3792 |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
3793 |
|
|
3794 |
checkpoint58k_post |
checkpoint58k_post (2006/07/06) |
3795 |
o testreport: |
o testreport: |
3796 |
- always build in dir. "build" (if not there, mkdir build instead of building |
- always build in dir. "build" (if not there, mkdir build instead of building |
3797 |
& running in input) |
& running in input) |
3824 |
advection subroutine (but still not used within DST advection S/R) |
advection subroutine (but still not used within DST advection S/R) |
3825 |
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
3826 |
|
|
3827 |
checkpoint58j_post |
checkpoint58j_post (2006/06/15) |
3828 |
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
3829 |
from file (collects calls previously in FORWARD_STEP) |
from file (collects calls previously in FORWARD_STEP) |
3830 |
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
3832 |
o genmake2 |
o genmake2 |
3833 |
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
3834 |
|
|
3835 |
checkpoint58i_post |
checkpoint58i_post (2006/06/14) |
3836 |
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
3837 |
on wind stress (SEAICEstressFactor defaults to 1.) |
on wind stress (SEAICEstressFactor defaults to 1.) |
3838 |
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
3846 |
non-EVP pickup files when using SEAICEuseEVP |
non-EVP pickup files when using SEAICEuseEVP |
3847 |
- fix sign error in diffusion in seaice_calc_rhs |
- fix sign error in diffusion in seaice_calc_rhs |
3848 |
|
|
3849 |
checkpoint58h_post |
checkpoint58h_post (2006/06/07) |
3850 |
* Modifications for bottom topography control |
* Modifications for bottom topography control |
3851 |
o replace hFacC by _hFacC at various places |
o replace hFacC by _hFacC at various places |
3852 |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
3856 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
3857 |
* Adding verification for 5x5 box (4-layer) bottom topography control |
* Adding verification for 5x5 box (4-layer) bottom topography control |
3858 |
|
|
3859 |
checkpoint58g_post |
checkpoint58g_post (2006/06/07) |
3860 |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
3861 |
used for mean seasonal cycle, mean diurnal cycle); add an example |
used for mean seasonal cycle, mean diurnal cycle); add an example |
3862 |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
3872 |
o pkg/seaice |
o pkg/seaice |
3873 |
- make (default) second order advection a bit less confusing? |
- make (default) second order advection a bit less confusing? |
3874 |
|
|
3875 |
checkpoint58f_post |
checkpoint58f_post (2006/06/05) |
3876 |
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
3877 |
to pkg/seaice): |
to pkg/seaice): |
3878 |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
3903 |
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
3904 |
testreport accordingly |
testreport accordingly |
3905 |
|
|
3906 |
checkpoint58e_post |
checkpoint58e_post (2006/05/17) |
3907 |
o SEAICE_CGRID adjoint done |
o SEAICE_CGRID adjoint done |
3908 |
o R_STAR adjoint implemented. |
o R_STAR adjoint implemented. |
3909 |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
3911 |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
3912 |
to be able to use it in pure forward. |
to be able to use it in pure forward. |
3913 |
|
|
3914 |
checkpoint58d_post |
checkpoint58d_post (2006/04/21) |
3915 |
o upgrade simple test-experiment to tutorial example: |
o upgrade simple test-experiment to tutorial example: |
3916 |
step.1: duplicate the experiment and (step.2) will remove the old copy. |
step.1: duplicate the experiment and (step.2) will remove the old copy. |
3917 |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
3951 |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
3952 |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
3953 |
|
|
3954 |
checkpoint58c_post |
checkpoint58c_post (2006/03/23) |
3955 |
o adjoint: finish NLFS adjoint and provide reference output in |
o adjoint: finish NLFS adjoint and provide reference output in |
3956 |
verification/global_ocean.90x40x15/results_ad_nlfs |
verification/global_ocean.90x40x15/results_ad_nlfs |
3957 |
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
3985 |
+ move computation of the viscosities eta and zeta into a new separate |
+ move computation of the viscosities eta and zeta into a new separate |
3986 |
routine (because I need to recompute them in seaice_ocean_stress.F) |
routine (because I need to recompute them in seaice_ocean_stress.F) |
3987 |
|
|
3988 |
checkpoint58b_post |
checkpoint58b_post (2006/03/13) |
3989 |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
3990 |
update output.txt of exp. aim.5l_cs.thSI |
update output.txt of exp. aim.5l_cs.thSI |
3991 |
o various mnc cleanups and improvements: |
o various mnc cleanups and improvements: |
4048 |
(turn on with SEAICEuseFluxForm) |
(turn on with SEAICEuseFluxForm) |
4049 |
- replace 1 in 3d global fields by kSurface in growth.F |
- replace 1 in 3d global fields by kSurface in growth.F |
4050 |
|
|
4051 |
checkpoint58a_post |
checkpoint58a_post (2006/02/13) |
4052 |
o seaice: |
o seaice: |
4053 |
- bug fix in advect.F |
- bug fix in advect.F |
4054 |
o shelfice: |
o shelfice: |
4101 |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
4102 |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
4103 |
|
|
4104 |
checkpoint58 |
checkpoint58 (2006/01/12) |
4105 |
o add "--embed-source" option to genmake2 which, when the supporting |
o add "--embed-source" option to genmake2 which, when the supporting |
4106 |
tools can be compiled (as determined by genmake2) will turn on the |
tools can be compiled (as determined by genmake2) will turn on the |
4107 |
embed_files package which then embeds the entire MITgcm source code |
embed_files package which then embeds the entire MITgcm source code |
4114 |
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
4115 |
* Thanks to Tom Haine for testing! |
* Thanks to Tom Haine for testing! |
4116 |
|
|
4117 |
checkpoint57z_post |
checkpoint57z_post (2005/12/31) |
4118 |
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
4119 |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
4120 |
o fix the pickup behavior for obcs in combination with ptracers |
o fix the pickup behavior for obcs in combination with ptracers |
4145 |
* Absolute scale somewhat unclear so far |
* Absolute scale somewhat unclear so far |
4146 |
* no area weighting was included since no other cost term does so far |
* no area weighting was included since no other cost term does so far |
4147 |
|
|
4148 |
checkpoint57y_post |
checkpoint57y_post (2005/12/08) |
4149 |
First step for a NLFS adjoint |
First step for a NLFS adjoint |
4150 |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
4151 |
o new init. routines for calc_r_star, calc_surf_dr |
o new init. routines for calc_r_star, calc_surf_dr |
4152 |
o still need to deal with ini_masks_etc |
o still need to deal with ini_masks_etc |
4153 |
o testreport seemed happy |
o testreport seemed happy |
4154 |
checkpoint57y_pre |
checkpoint57y_pre (2005/12/08) |
4155 |
|
|
4156 |
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
4157 |
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
4160 |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
4161 |
be in GCHEM_OPTIONS). |
be in GCHEM_OPTIONS). |
4162 |
|
|
4163 |
checkpoint57x_post |
checkpoint57x_post (2005/12/04) |
4164 |
o fix testreport Pb in multiple test experiment. |
o fix testreport Pb in multiple test experiment. |
4165 |
o cleanup our namelist syntax in verification: |
o cleanup our namelist syntax in verification: |
4166 |
- make it more F95 standards compliant (some work still needed) |
- make it more F95 standards compliant (some work still needed) |
4180 |
(there are a number of extensive recomputations) |
(there are a number of extensive recomputations) |
4181 |
* Initialize certain variables needed for adjoint |
* Initialize certain variables needed for adjoint |
4182 |
|
|
4183 |
checkpoint57w_post |
checkpoint57w_post (2005/11/03) |
4184 |
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
4185 |
fix the singleCpuIO RS version of MDSWRITEFIELD |
fix the singleCpuIO RS version of MDSWRITEFIELD |
4186 |
and add a WARNING if using globalFiles=T with multi-processors. |
and add a WARNING if using globalFiles=T with multi-processors. |
4197 |
ptracers in a large domain with a constant non-zero value. Also, |
ptracers in a large domain with a constant non-zero value. Also, |
4198 |
untangle ptracers_init.F a little. |
untangle ptracers_init.F a little. |
4199 |
|
|
4200 |
checkpoint57v_post |
checkpoint57v_post (2005/10/13) |
4201 |
o change dome exp. to use variable viscosity in side-drag terms. |
o change dome exp. to use variable viscosity in side-drag terms. |
4202 |
o remove all the files from the cfc_offline test since they are now |
o remove all the files from the cfc_offline test since they are now |
4203 |
incorporated into tutorial_cfc_offline which has been producing |
incorporated into tutorial_cfc_offline which has been producing |
4238 |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
4239 |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
4240 |
|
|
4241 |
checkpoint57t_post |
checkpoint57t_post (2005/10/03) |
4242 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
4243 |
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
4244 |
same truncation, independent of the face number: affects affects several |
same truncation, independent of the face number: affects affects several |
4261 |
Suggested values of viscosity parameters found in mom_calc_visc. |
Suggested values of viscosity parameters found in mom_calc_visc. |
4262 |
Many new viscosity diagnostics available. |
Many new viscosity diagnostics available. |
4263 |
|
|
4264 |
checkpoint57s_post |
checkpoint57s_post (2005/09/20) |
4265 |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
4266 |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
4267 |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
4287 |
and works with both EXCH1 and EXCH2 (but needs more testing) |
and works with both EXCH1 and EXCH2 (but needs more testing) |
4288 |
- writing works for all verification test cases w/ g77 on Linux |
- writing works for all verification test cases w/ g77 on Linux |
4289 |
|
|
4290 |
checkpoint57r_post |
checkpoint57r_post (2005/09/07) |
4291 |
o make MNC variable initialization happen earlier |
o make MNC variable initialization happen earlier |
4292 |
o add diagnostics for (almost) each term of the momentum Eq. |
o add diagnostics for (almost) each term of the momentum Eq. |
4293 |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
4307 |
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
4308 |
(see README file) |
(see README file) |
4309 |
|
|
4310 |
checkpoint57q_post |
checkpoint57q_post (2005/08/19) |
4311 |
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
4312 |
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
4313 |
- bug was reported by Jean-Michel and Ian Fenty |
- bug was reported by Jean-Michel and Ian Fenty |
4324 |
* verification/OpenAD/code/ has necessary scripts and description; |
* verification/OpenAD/code/ has necessary scripts and description; |
4325 |
* converts, compiles and runs successfully; |
* converts, compiles and runs successfully; |
4326 |
|
|
4327 |
checkpoint57p_post |
checkpoint57p_post (2005/08/01) |
4328 |
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
4329 |
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
4330 |
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
4338 |
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
4339 |
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
4340 |
|
|
4341 |
checkpoint57o_post |
checkpoint57o_post (2005/07/30) |
4342 |
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
4343 |
(2) its ready to be documented during the 20050801 DocFest |
(2) its ready to be documented during the 20050801 DocFest |
4344 |
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
4347 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
4348 |
(worth another tag) |
(worth another tag) |
4349 |
|
|
4350 |
checkpoint57n_post |
checkpoint57n_post (2005/07/29) |
4351 |
o adding precip control xx_precip 32 |
o adding precip control xx_precip 32 |
4352 |
o adding swflux control xx_swflux 33 |
o adding swflux control xx_swflux 33 |
4353 |
o Replacing 10 forcing penalty cost routines by 1 generic. |
o Replacing 10 forcing penalty cost routines by 1 generic. |
4363 |
(applies in particular to tapelev I/O) |
(applies in particular to tapelev I/O) |
4364 |
o removed inefficient K-loop in all active_file*control*.F |
o removed inefficient K-loop in all active_file*control*.F |
4365 |
|
|
4366 |
checkpoint57m_post |
checkpoint57m_post (2005/07/28) |
4367 |
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
4368 |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
4369 |
o pkg/exch2: filling of face-corner halo regions is optional |
o pkg/exch2: filling of face-corner halo regions is optional |
4370 |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
4371 |
|
|
4372 |
checkpoint57l_post |
checkpoint57l_post (2005/07/14) |
4373 |
tag before updating tutorials (pre-release-2) |
tag before updating tutorials (pre-release-2) |
4374 |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
4375 |
for output and interpolation of input fields onto model grid) |
for output and interpolation of input fields onto model grid) |
4381 |
o add mnc output capability to diagnostics/diagstat and update |
o add mnc output capability to diagnostics/diagstat and update |
4382 |
our cvsignore files for the ACSII output generated |
our cvsignore files for the ACSII output generated |
4383 |
|
|
4384 |
checkpoint57k_post |
checkpoint57k_post (2005/07/02) |
4385 |
o lab_sea now uses diagnostics package and provides a suite of |
o lab_sea now uses diagnostics package and provides a suite of |
4386 |
new EXF diagnostics output. |
new EXF diagnostics output. |
4387 |
|
|
4388 |
checkpoint57j_post |
checkpoint57j_post (2005/06/30) |
4389 |
o exf |
o exf |
4390 |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
4391 |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
4415 |
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
4416 |
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
4417 |
|
|
4418 |
checkpoint57i_post |
checkpoint57i_post (2005/06/19) |
4419 |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
4420 |
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
4421 |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
4434 |
tested against monitor output (including land & thSIce) on various exp. |
tested against monitor output (including land & thSIce) on various exp. |
4435 |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
4436 |
|
|
4437 |
checkpoint57h_done |
checkpoint57h_done (2005/05/19) |
4438 |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
4439 |
data.diagnostics, data.gchem, data.ptracers) is done. |
data.diagnostics, data.gchem, data.ptracers) is done. |
4440 |
|
|
4443 |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
4444 |
and rename it: DIFFERENT_MULTIPLE |
and rename it: DIFFERENT_MULTIPLE |
4445 |
|
|
4446 |
checkpoint57h_post |
checkpoint57h_post (2005/05/14) |
4447 |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
4448 |
o pkg/diagnostics: change output frequency, now in seconds (instead |
o pkg/diagnostics: change output frequency, now in seconds (instead |
4449 |
of Nb of iterations). This requires to change data.diagnostics. |
of Nb of iterations). This requires to change data.diagnostics. |
4450 |
checkpoint57h_pre |
checkpoint57h_pre (2005/05/12) |
4451 |
|
|
4452 |
o in mnc, let the user create the output dir if both mnc_outdir_date |
o in mnc, let the user create the output dir if both mnc_outdir_date |
4453 |
and mnc_outdir_num are false |
and mnc_outdir_num are false |
4461 |
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
4462 |
not mnc -- this mistake was found by JMC and is now corrected |
not mnc -- this mistake was found by JMC and is now corrected |
4463 |
|
|
4464 |
checkpoint57g_post |
checkpoint57g_post (2005/04/15) |
4465 |
o add Adams-Bashforth 3rd Order time stepping: |
o add Adams-Bashforth 3rd Order time stepping: |
4466 |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
4467 |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
4468 |
checkpoint57g_pre |
checkpoint57g_pre (2005/04/15) |
4469 |
|
|
4470 |
o make lambda[Theta,Salt]ClimRelax spatially varying |
o make lambda[Theta,Salt]ClimRelax spatially varying |
4471 |
(default remains spatially uniform constant based on tau) |
(default remains spatially uniform constant based on tau) |
4475 |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
4476 |
(suggested by G. Forget) |
(suggested by G. Forget) |
4477 |
|
|
4478 |
checkpoint57f_post |
checkpoint57f_post (2005/04/06) |
4479 |
o add parameter "baseTime" = model base time = time at iteration zero |
o add parameter "baseTime" = model base time = time at iteration zero |
4480 |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
4481 |
account for baseTime shift |
account for baseTime shift |
4482 |
o move Coriolis arrays from PARAMS.h to GRID.h |
o move Coriolis arrays from PARAMS.h to GRID.h |
4483 |
checkpoint57f_pre |
checkpoint57f_pre (2005/04/06) |
4484 |
|
|
4485 |
o mnc-ifying the seaice package |
o mnc-ifying the seaice package |
4486 |
o introduced an alternative length scale calculation for use in the limiting |
o introduced an alternative length scale calculation for use in the limiting |
4501 |
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
4502 |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
4503 |
|
|
4504 |
checkpoint57e_post |
checkpoint57e_post (2005/02/28) |
4505 |
o Adding eddy stress controls a la Ferreira et al. |
o Adding eddy stress controls a la Ferreira et al. |
4506 |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
4507 |
|
|
4519 |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
4520 |
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
4521 |
|
|
4522 |
checkpoint57d_post |
checkpoint57d_post (2005/02/11) |
4523 |
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
4524 |
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
4525 |
output from the diagnostics package |
output from the diagnostics package |
4541 |
(note: still needs some work specially for snap-shot diagnostics) |
(note: still needs some work specially for snap-shot diagnostics) |
4542 |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
4543 |
|
|
4544 |
checkpoint57c_post |
checkpoint57c_post (2005/01/27) |
4545 |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
4546 |
o generate new output.txt files on faulks with g77 & the new -ieee option |
o generate new output.txt files on faulks with g77 & the new -ieee option |
4547 |
checkpoint57c_pre |
checkpoint57c_pre (2005/01/27) |
4548 |
|
|
4549 |
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
4550 |
update output.txt of exp. global_ocean.90x40x15 |
update output.txt of exp. global_ocean.90x40x15 |
4577 |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
4578 |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
4579 |
|
|
4580 |
checkpoint57b_post |
checkpoint57b_post (2004/12/20) |
4581 |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
4582 |
o fix MNC coordinate variables so that they now contain per-face index |
o fix MNC coordinate variables so that they now contain per-face index |
4583 |
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
4623 |
look through the short list of active diag. (instead of the long list) |
look through the short list of active diag. (instead of the long list) |
4624 |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
4625 |
|
|
4626 |
checkpoint57a_post |
checkpoint57a_post (2004/12/10) |
4627 |
o this set of changes restores TAMC compatibility |
o this set of changes restores TAMC compatibility |
4628 |
tested for global_ocean.90x40x15 adjoint on trough |
tested for global_ocean.90x40x15 adjoint on trough |
4629 |
(what a pain) |
(what a pain) |
4630 |
|
|
4631 |
checkpoint57a_pre |
checkpoint57a_pre (2004/12/10) |
4632 |
o some modifs in tools/build_options for sunos |
o some modifs in tools/build_options for sunos |
4633 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
4634 |
|
|
4635 |
checkpoint57 |
checkpoint57 (2004/12/09) |
4636 |
o add horizontal bi-harmonic viscosity for vertical velocity |
o add horizontal bi-harmonic viscosity for vertical velocity |
4637 |
- new parameter viscA4W (defaults to viscA4) |
- new parameter viscA4W (defaults to viscA4) |
4638 |
- affects only non-hydrostatic code |
- affects only non-hydrostatic code |
4650 |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
4651 |
(theta2, salt2 in ecco_cost_weights) |
(theta2, salt2 in ecco_cost_weights) |
4652 |
|
|
4653 |
checkpoint56c_post |
checkpoint56c_post (2004/12/03) |
4654 |
o OBCS as control variables |
o OBCS as control variables |
4655 |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
4656 |
- remove balance of obcs controls from default |
- remove balance of obcs controls from default |
4668 |
o mdsio: |
o mdsio: |
4669 |
- i/o-vector change debugLevel from debLevA to debLevB |
- i/o-vector change debugLevel from debLevA to debLevB |
4670 |
|
|
4671 |
checkpoint56b_post |
checkpoint56b_post (2004/12/01) |
4672 |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
4673 |
is called from DO_THE_MODEL_IO |
is called from DO_THE_MODEL_IO |
4674 |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
4683 |
testreport. |
testreport. |
4684 |
o ptracers_monitor: bug fix for MPI |
o ptracers_monitor: bug fix for MPI |
4685 |
|
|
4686 |
checkpoint56a_post |
checkpoint56a_post (2004/11/28) |
4687 |
o GCHEM: finish reorganizating the package |
o GCHEM: finish reorganizating the package |
4688 |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
4689 |
(introduces another 3D-array for each passive tracer, but only if |
(introduces another 3D-array for each passive tracer, but only if |
4728 |
- cleaning up |
- cleaning up |
4729 |
o small cleaning of exch2: remove files that are also in eesupp/src |
o small cleaning of exch2: remove files that are also in eesupp/src |
4730 |
|
|
4731 |
checkpoint56 |
checkpoint56 (2004/11/17) |
4732 |
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
4733 |
o mnc: cleanup "full" files--fixes out-of-memory problem |
o mnc: cleanup "full" files--fixes out-of-memory problem |
4734 |
o ECCO-GODAE |
o ECCO-GODAE |
4758 |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
4759 |
from sign change |
from sign change |
4760 |
|
|
4761 |
checkpoint55j_post |
checkpoint55j_post (2004/11/10) |
4762 |
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
4763 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
4764 |
o add consistent build directories and .cvsignore files to verification |
o add consistent build directories and .cvsignore files to verification |
4769 |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
4770 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
4771 |
|
|
4772 |
checkpoint55i_post |
checkpoint55i_post (2004/10/28) |
4773 |
o change arrays for total vertical diffusivity (2.D if explicit, |
o change arrays for total vertical diffusivity (2.D if explicit, |
4774 |
3.D if implicit) ; each ptracer uses its own background value. |
3.D if implicit) ; each ptracer uses its own background value. |
4775 |
o added mnc/NetCDF output capability to ocn_compon_interf |
o added mnc/NetCDF output capability to ocn_compon_interf |
4784 |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
4785 |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
4786 |
|
|
4787 |
checkpoint55h_post |
checkpoint55h_post (2004/10/20) |
4788 |
o add verification test "vermix" |
o add verification test "vermix" |
4789 |
o remove all the *_ioinc flags and replace with the single global |
o remove all the *_ioinc flags and replace with the single global |
4790 |
outputTypesInclusive flag |
outputTypesInclusive flag |
4792 |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
4793 |
o useMNC moved from data.mnc to data.pkg |
o useMNC moved from data.mnc to data.pkg |
4794 |
|
|
4795 |
checkpoint55g_post |
checkpoint55g_post (2004/10/14) |
4796 |
o Renaming carbon AD experiments to comply with testreport conventions |
o Renaming carbon AD experiments to comply with testreport conventions |
4797 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
4798 |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
4802 |
o Updating adjoint output for natl_box_adjoint after |
o Updating adjoint output for natl_box_adjoint after |
4803 |
pkg/ecco has been modified (see taga c55d_post) |
pkg/ecco has been modified (see taga c55d_post) |
4804 |
|
|
4805 |
checkpoint55f_post |
checkpoint55f_post (2004/10/13) |
4806 |
o rename to timeave_init_fixed |
o rename to timeave_init_fixed |
4807 |
|
|
4808 |
checkpoint55e_post |
checkpoint55e_post (2004/10/13) |
4809 |
o some delicate re-shuffle of store directives to avoid one |
o some delicate re-shuffle of store directives to avoid one |
4810 |
extra call of do_oceanic_physics |
extra call of do_oceanic_physics |
4811 |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
4813 |
o NB: this may break global_ocean adjoint temporarily, |
o NB: this may break global_ocean adjoint temporarily, |
4814 |
but it is clear how to fix it. Will do later, need this now. |
but it is clear how to fix it. Will do later, need this now. |
4815 |
|
|
4816 |
checkpoint55d_post |
checkpoint55d_post (2004/10/11) |
4817 |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
4818 |
o ecco_cost_weights is modified to 1x1 runs |
o ecco_cost_weights is modified to 1x1 runs |
4819 |
o modifs to allow observations to be read in as |
o modifs to allow observations to be read in as |
4820 |
single file or yearly files |
single file or yearly files |
4821 |
o enable to read exf forcing fields as either |
o enable to read exf forcing fields as either |
4822 |
single file or yearly files (flag useExfYearlyFields) |
single file or yearly files (flag useExfYearlyFields) |
4823 |
checkpoint55d_pre |
checkpoint55d_pre (2004/10/08) |
4824 |
|
|
4825 |
o switch between 2-level and 3-level checkpointing |
o switch between 2-level and 3-level checkpointing |
4826 |
o add ability of MNC to write local and "partial" (eg. 2D slices where |
o add ability of MNC to write local and "partial" (eg. 2D slices where |
4868 |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
4869 |
- fixed about 35 bugs in obcs_external_fields_load |
- fixed about 35 bugs in obcs_external_fields_load |
4870 |
|
|
4871 |
checkpoint55c_post |
checkpoint55c_post (2004/09/23) |
4872 |
o obcs stuff |
o obcs stuff |
4873 |
- new runtime flags useOBCSprescribe, useOBCSbalance |
- new runtime flags useOBCSprescribe, useOBCSbalance |
4874 |
- re-arranged obcs_calc |
- re-arranged obcs_calc |
4882 |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
4883 |
which simplifies the calls and passes the ifc check-bounds test |
which simplifies the calls and passes the ifc check-bounds test |
4884 |
|
|
4885 |
checkpoint55b_post |
checkpoint55b_post (2004/09/22) |
4886 |
o add a 2D scalar, Z location, exchange_2 routine. |
o add a 2D scalar, Z location, exchange_2 routine. |
4887 |
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
4888 |
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
4893 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
4894 |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
4895 |
|
|
4896 |
checkpoint55a_post |
checkpoint55a_post (2004/09/20) |
4897 |
o merged code to |
o merged code to |
4898 |
* prescribe/read time-dependent open boundaries |
* prescribe/read time-dependent open boundaries |
4899 |
(works in conjunction with exf, cal) |
(works in conjunction with exf, cal) |
4901 |
* each boundary N/S/E/W now has its own CPP option |
* each boundary N/S/E/W now has its own CPP option |
4902 |
(healthy for the adjoint) |
(healthy for the adjoint) |
4903 |
|
|
4904 |
checkpoint55 |
checkpoint55 (2004/09/17) |
4905 |
o up-to-date adjoint of previous breaks |
o up-to-date adjoint of previous breaks |
4906 |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
4907 |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
4911 |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
4912 |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
4913 |
|
|
4914 |
checkpoint54f_post |
checkpoint54f_post (2004/09/16) |
4915 |
o in verification/carbin/ remove experiment related to |
o in verification/carbin/ remove experiment related to |
4916 |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
4917 |
code_ad/ input_ad/ results_ad |
code_ad/ input_ad/ results_ad |
4937 |
- numerous small formatting cleanups for ProTeX |
- numerous small formatting cleanups for ProTeX |
4938 |
o add version info (via BUILD_INFO.h) to MNC and stdout |
o add version info (via BUILD_INFO.h) to MNC and stdout |
4939 |
|
|
4940 |
checkpoint54e_post |
checkpoint54e_post (2004/09/02) |
4941 |
o add two new packages |
o add two new packages |
4942 |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
4943 |
stratification dependent mixing |
stratification dependent mixing |
4944 |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
4945 |
- these scheme operate in a similar manner as KPP (without ghat, of |
- these scheme operate in a similar manner as KPP (without ghat, of |
4946 |
course), however there is only one diffusivity that is used for both |
course), however there is only one diffusivity that is used for both |
4947 |
temperature and salinity (and passive tracers)ç |
temperature and salinity (and passive tracers) |
4948 |
o add offline package |
o add offline package |
4949 |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
4950 |
provided by Stephanie Dutkiewicz |
provided by Stephanie Dutkiewicz |
4951 |
o genmake2: add ability to search for C compilers and cleanup test output |
o genmake2: add ability to search for C compilers and cleanup test output |
4952 |
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
4953 |
|
|
4954 |
checkpoint54d_post |
checkpoint54d_post (2004/07/27) |
4955 |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
4956 |
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
4957 |
leading to additional shift by 5 days each year of integration |
leading to additional shift by 5 days each year of integration |
4967 |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
4968 |
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
4969 |
|
|
4970 |
checkpoint54c_post |
checkpoint54c_post (2004/07/18) |
4971 |
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
4972 |
this affects (truncation error) output.txt of test-exp: |
this affects (truncation error) output.txt of test-exp: |
4973 |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
4978 |
o start to test mnc routinely in exp0 |
o start to test mnc routinely in exp0 |
4979 |
o add sea-ice loading (sIceLoad) as a new forcing field. |
o add sea-ice loading (sIceLoad) as a new forcing field. |
4980 |
|
|
4981 |
checkpoint54b_post |
checkpoint54b_post (2004/07/08) |
4982 |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
4983 |
impressive on Altix and Opteron systems) |
impressive on Altix and Opteron systems) |
4984 |
o diagnostics can now write NetCDF files through the mnc package |
o diagnostics can now write NetCDF files through the mnc package |
4988 |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
4989 |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
4990 |
|
|
4991 |
checkpoint54a_post |
checkpoint54a_post (2004/07/06) |
4992 |
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
4993 |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
4994 |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
4995 |
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
4996 |
+ internal_wave (shift in writing cg2d_ini_res) |
+ internal_wave (shift in writing cg2d_ini_res) |
4997 |
checkpoint54a_pre |
checkpoint54a_pre (2004/07/05) |
4998 |
|
|
4999 |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
5000 |
- modified verification/lab_sea and natl_box_adjoint accordingly |
- modified verification/lab_sea and natl_box_adjoint accordingly |
5001 |
|
|
5002 |
checkpoint54 |
checkpoint54 (2004/07/02) |
5003 |
checkpoint53g_post |
checkpoint53g_post (2004/07/02) |
5004 |
o prepare splitting of thermodynamics: store convect.counter in common block |
o prepare splitting of thermodynamics: store convect.counter in common block |
5005 |
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
5006 |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
5009 |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
5010 |
o restore adjointability |
o restore adjointability |
5011 |
|
|
5012 |
checkpoint53f_post |
checkpoint53f_post (2004/06/25) |
5013 |
o modifications that affect AIM experiment results (update output.txt): |
o modifications that affect AIM experiment results (update output.txt): |
5014 |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
5015 |
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
5022 |
o added rotating_tank experiment |
o added rotating_tank experiment |
5023 |
checkpoint53e_pre |
checkpoint53e_pre |
5024 |
|
|
5025 |
checkpoint53d_post |
checkpoint53d_post (2004/06/14) |
5026 |
o faulks upgraded: re-generate output.txt that have changed: |
o faulks upgraded: re-generate output.txt that have changed: |
5027 |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
5028 |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
5041 |
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
5042 |
of mom_common/ |
of mom_common/ |
5043 |
- simple re-arrangement of instructions within computing loop |
- simple re-arrangement of instructions within computing loop |
5044 |
checkpoint53d_pre |
checkpoint53d_pre (2004/05/21) |
5045 |
|
|
5046 |
checkpoint53c_post |
checkpoint53c_post (2004/05/21) |
5047 |
o new version of coupler for AIM+thSIce and Ocean models |
o new version of coupler for AIM+thSIce and Ocean models |
5048 |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
5049 |
- land: change Evaporation of snow |
- land: change Evaporation of snow |
5060 |
* TLM OK |
* TLM OK |
5061 |
* ADM not sufficient accuracy yet (needs further testing) |
* ADM not sufficient accuracy yet (needs further testing) |
5062 |
|
|
5063 |
checkpoint53b_post |
checkpoint53b_post (2004/05/14) |
5064 |
o Commiting new energy balance model to repository |
o Commiting new energy balance model to repository |
5065 |
* package is pkg/ebm |
* package is pkg/ebm |
5066 |
* verif. is verification/global_ocean_ebm |
* verif. is verification/global_ocean_ebm |
5078 |
C by atmospheric eddy transports. |
C by atmospheric eddy transports. |
5079 |
C J. Climate 7(12), 1870-1882 |
C J. Climate 7(12), 1870-1882 |
5080 |
o Will need long integration testing. |
o Will need long integration testing. |
5081 |
checkpoint53b_pre |
checkpoint53b_pre (2004/05/14) |
5082 |
|
|
5083 |
o created pkg/mom_common in preparation for variable viscosity code |
o created pkg/mom_common in preparation for variable viscosity code |
5084 |
o renamed and split ini_mnc_io |
o renamed and split ini_mnc_io |
5086 |
o AIM using land: soil wetness availability account for snow |
o AIM using land: soil wetness availability account for snow |
5087 |
o added printMapIncludesZeros to EEPARMS namelist |
o added printMapIncludesZeros to EEPARMS namelist |
5088 |
|
|
5089 |
checkpoint53a_post |
checkpoint53a_post (2004/05/11) |
5090 |
o restore TAMC compatiility for exf_constants.h |
o restore TAMC compatiility for exf_constants.h |
5091 |
(no usage of _d in .h) |
(no usage of _d in .h) |
5092 |
o Additional storing in KPP in an attempt to fix |
o Additional storing in KPP in an attempt to fix |
5099 |
and hence gives results closer to that of Experiment 2. |
and hence gives results closer to that of Experiment 2. |
5100 |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
5101 |
|
|
5102 |
checkpoint53 |
checkpoint53 (2004/05/06) |
5103 |
o stable checkpoint with up to date adjoint |
o stable checkpoint with up to date adjoint |
5104 |
TLM tests only run for 1st grdchk at the moment. Its unclear if |
TLM tests only run for 1st grdchk at the moment. Its unclear if |
5105 |
this is a code problem or a problem with resetting code for g_ |
this is a code problem or a problem with resetting code for g_ |
5109 |
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
5110 |
are both still in chaos following their security messes. |
are both still in chaos following their security messes. |
5111 |
|
|
5112 |
checkpoint52n_post |
checkpoint52n_post (2004/05/06) |
5113 |
o various build (mostly genmake2) changes including: |
o various build (mostly genmake2) changes including: |
5114 |
- ability to build/run more easily within Cygwin and MacOS X |
- ability to build/run more easily within Cygwin and MacOS X |
5115 |
- more complicated Makefiles with a stronger dependence on Gnu Make |
- more complicated Makefiles with a stronger dependence on Gnu Make |
5140 |
- maintain snow precipitation unchanged (even if Tsf >=0). |
- maintain snow precipitation unchanged (even if Tsf >=0). |
5141 |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
5142 |
|
|
5143 |
checkpoint52m_post |
checkpoint52m_post (2004/04/18) |
5144 |
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
5145 |
this does not change any of the results, because myIter=0 in swfrac always |
this does not change any of the results, because myIter=0 in swfrac always |
5146 |
lead to jwtype=2 (the default anyway), but the call makes little sense |
lead to jwtype=2 (the default anyway), but the call makes little sense |
5172 |
o Added functionality to grdchk: |
o Added functionality to grdchk: |
5173 |
pick global i,j,k position (or nearest wet) where to perform check. |
pick global i,j,k position (or nearest wet) where to perform check. |
5174 |
|
|
5175 |
checkpoint52l_post |
checkpoint52l_post (2004/03/11) |
5176 |
o new land formulation: |
o new land formulation: |
5177 |
a) use ground enthalpy as prognostic variable to ensure exact |
a) use ground enthalpy as prognostic variable to ensure exact |
5178 |
energy conservation. |
energy conservation. |
5183 |
a) Treat separately land / ocean / sea-ice surface fluxes |
a) Treat separately land / ocean / sea-ice surface fluxes |
5184 |
to allow implicit computation of land & sea-ice surface temp. |
to allow implicit computation of land & sea-ice surface temp. |
5185 |
b) add snow precipitation. |
b) add snow precipitation. |
5186 |
checkpoint52l_pre |
checkpoint52l_pre (2004/03/11) |
5187 |
|
|
5188 |
o fix problem (when 1 tile is empty) in min/max monitor. |
o fix problem (when 1 tile is empty) in min/max monitor. |
5189 |
o fix bug in timeAve (u,vZetatave in common block) |
o fix bug in timeAve (u,vZetatave in common block) |
5196 |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
5197 |
o exf: Adding simple range check routine for exf fields after read |
o exf: Adding simple range check routine for exf fields after read |
5198 |
|
|
5199 |
checkpoint52k_post |
checkpoint52k_post (2004/02/23) |
5200 |
o removed top-level directory "diags" |
o removed top-level directory "diags" |
5201 |
- we migrated these functions to pkg/timeave a long time ago |
- we migrated these functions to pkg/timeave a long time ago |
5202 |
o fixed bug introduced in pkg/monitor |
o fixed bug introduced in pkg/monitor |
5209 |
taveFreq, dumpFreq, pChkptFreq |
taveFreq, dumpFreq, pChkptFreq |
5210 |
o MAIN and ECCO differentiability restored |
o MAIN and ECCO differentiability restored |
5211 |
|
|
5212 |
checkpoint52j_post |
checkpoint52j_post (2004/02/18) |
5213 |
o fix nchklev in tamc.h for global_ocean... |
o fix nchklev in tamc.h for global_ocean... |
5214 |
o Bringing flow and store directives up-to-date |
o Bringing flow and store directives up-to-date |
5215 |
o Really weird thing! |
o Really weird thing! |
5217 |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
5218 |
TAF places a faulty re-call of initialise_varia |
TAF places a faulty re-call of initialise_varia |
5219 |
after cost_final call which should not be there! |
after cost_final call which should not be there! |
5220 |
checkpoint52j_pre |
checkpoint52j_pre (2004/02/03) |
5221 |
|
|
5222 |
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
5223 |
error messages |
error messages |
5234 |
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
5235 |
o limit timeave output for hi-res integrations |
o limit timeave output for hi-res integrations |
5236 |
|
|
5237 |
checkpoint52i_post |
checkpoint52i_post (2004/01/21) |
5238 |
o removed CPP_EEOPTIONS.h from verification/*/code |
o removed CPP_EEOPTIONS.h from verification/*/code |
5239 |
o updated the tiling for global_ocean_pressure |
o updated the tiling for global_ocean_pressure |
5240 |
checkpoint52i_pre |
checkpoint52i_pre (2004/01/20) |
5241 |
|
|
5242 |
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
5243 |
the old pkg/aim). |
the old pkg/aim). |
5244 |
|
|
5245 |
checkpoint52h_pre |
checkpoint52h_pre (2004/01/20) |
5246 |
o shortened offending lines in exch2_send_rx?.template |
o shortened offending lines in exch2_send_rx?.template |
5247 |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
5248 |
o genmake2: add build & execute test for NetCDF code |
o genmake2: add build & execute test for NetCDF code |
5253 |
metric terms are ignored and it is assumed that |
metric terms are ignored and it is assumed that |
5254 |
there is no sea-ice on cube faces 1, 2, 4, and 5. |
there is no sea-ice on cube faces 1, 2, 4, and 5. |
5255 |
|
|
5256 |
checkpoint52f_post |
checkpoint52f_post (2004/01/09) |
5257 |
o added exch2 cube routines to pkg/exch2 |
o added exch2 cube routines to pkg/exch2 |
5258 |
o modified hs94.cs-32x32x5 to use it |
o modified hs94.cs-32x32x5 to use it |
5259 |
o added new grid files to hs94.cs-32x32x5 |
o added new grid files to hs94.cs-32x32x5 |
5260 |
checkpoint52f_pre |
checkpoint52f_pre (2004/01/07) |
5261 |
|
|
5262 |
checkpoint52e_post |
checkpoint52e_post (2004/01/07) |
5263 |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
5264 |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
5265 |
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
5267 |
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
5268 |
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
5269 |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
5270 |
checkpoint52e_pre |
checkpoint52e_pre (2004/01/02) |
5271 |
|
|
5272 |
o fix bug in impldiff when Nr=1 or Nr=2. |
o fix bug in impldiff when Nr=1 or Nr=2. |
5273 |
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
5278 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
5279 |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
5280 |
|
|
5281 |
checkpoint52d_post |
checkpoint52d_post (2003/12/16) |
5282 |
o re-tiled many expts to allow comparison in multi-processor mode |
o re-tiled many expts to allow comparison in multi-processor mode |
5283 |
- updated output accordingly |
- updated output accordingly |
5284 |
- changed hs94.128x64x5 to use intial T from file rather than use the |
- changed hs94.128x64x5 to use intial T from file rather than use the |
5307 |
o new verification experiment, cpl_aim+ocn: |
o new verification experiment, cpl_aim+ocn: |
5308 |
coupled ocean - AIM atmosphere on cs32 grid. |
coupled ocean - AIM atmosphere on cs32 grid. |
5309 |
|
|
5310 |
checkpoint52d_pre |
checkpoint52d_pre (2003/12/06) |
5311 |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
5312 |
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
5313 |
|
|
5314 |
checkpoint52c_post |
checkpoint52c_post (2003/11/25) |
5315 |
o Fixing OPTIONS files for use of exf: |
o Fixing OPTIONS files for use of exf: |
5316 |
- ALLOW_ECCO not needed |
- ALLOW_ECCO not needed |
5317 |
- ECCO_CPPOPTIONS.h should not be included from |
- ECCO_CPPOPTIONS.h should not be included from |
5325 |
o modified STOREs in GAD_ADVECTION |
o modified STOREs in GAD_ADVECTION |
5326 |
o corrected key comp. for passkey |
o corrected key comp. for passkey |
5327 |
|
|
5328 |
checkpoint52b_post |
checkpoint52b_post (2003/11/23) |
5329 |
o new version: "thsice" of thermodynamic sea-ice pkg: |
o new version: "thsice" of thermodynamic sea-ice pkg: |
5330 |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
5331 |
- modify fluxes but do not change theta directly; |
- modify fluxes but do not change theta directly; |
5333 |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
5334 |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
5335 |
o put back grid & coriolis monitor output. |
o put back grid & coriolis monitor output. |
5336 |
checkpoint52b_pre |
checkpoint52b_pre (2003/11/23) |
5337 |
|
|
5338 |
o call "do_the_model_io" at the beginning (=> dump initial state) |
o call "do_the_model_io" at the beginning (=> dump initial state) |
5339 |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
5343 |
o default tamc.h in pkg/autodiff supposed to crash |
o default tamc.h in pkg/autodiff supposed to crash |
5344 |
to ensure proper customization |
to ensure proper customization |
5345 |
|
|
5346 |
checkpoint52a_post |
checkpoint52a_post (2003/11/17) |
5347 |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
5348 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
5349 |
- subroutine FREEZE_SURFACE now limits only surface temperature |
- subroutine FREEZE_SURFACE now limits only surface temperature |
5358 |
snapshot file was missing some ad-variables, |
snapshot file was missing some ad-variables, |
5359 |
but no warning issued by TAF |
but no warning issued by TAF |
5360 |
|
|
5361 |
checkpoint52a_pre |
checkpoint52a_pre (2003/11/12) |
5362 |
o some bug fixes for #undef REAL4_IS_SLOW |
o some bug fixes for #undef REAL4_IS_SLOW |
5363 |
|
|
5364 |
checkpoint52 = ecco_c52_e35 |
checkpoint52 = ecco_c52_e35 |
5365 |
o after testing adjoints of checkpoint51u_post |
o after testing adjoints of checkpoint51u_post |
5366 |
|
|
5367 |
checkpoint51u_post |
checkpoint51u_post (2003/11/06) |
5368 |
o this is the post-merge tag of the ecco-branch |
o this is the post-merge tag of the ecco-branch |
5369 |
(needs another clean checkout and re-testing) |
(needs another clean checkout and re-testing) |
5370 |
o various natl_box_adjoint configs and results |
o various natl_box_adjoint configs and results |
5379 |
(new namelist ecco_cost_nml) |
(new namelist ecco_cost_nml) |
5380 |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
5381 |
|
|
5382 |
checkpoint51t_post |
checkpoint51t_post (2003/11/04) |
5383 |
o this is the pre-merge tag of the ecco-branch |
o this is the pre-merge tag of the ecco-branch |
5384 |
|
|
5385 |
checkpoint51s_post |
checkpoint51s_post (2003/11/04) |
5386 |
o cleanup: removed various obsolete #define-s |
o cleanup: removed various obsolete #define-s |
5387 |
o pkg/grdchk |
o pkg/grdchk |
5388 |
- renamed 'ph-grd 3' to 'grad-res' |
- renamed 'ph-grd 3' to 'grad-res' |
5391 |
- additional high-precision output for testreport |
- additional high-precision output for testreport |
5392 |
(grep for 'precision_grdchk_result') |
(grep for 'precision_grdchk_result') |
5393 |
|
|
5394 |
checkpoint51r_post |
checkpoint51r_post (2003/11/03) |
5395 |
o cleaned up or removed CPP_OPTIONS.h files |
o cleaned up or removed CPP_OPTIONS.h files |
5396 |
o updated results for some of the tests to reflect the new |
o updated results for some of the tests to reflect the new |
5397 |
optfiles (-ieee: -O0 instead of -O3) |
optfiles (-ieee: -O0 instead of -O3) |
5398 |
|
|
5399 |
checkpoint51q_post |
checkpoint51q_post (2003/10/30) |
5400 |
o cd_code: |
o cd_code: |
5401 |
- moved cd_scheme.F -> cd_code_scheme.F |
- moved cd_scheme.F -> cd_code_scheme.F |
5402 |
- separate read_checkpoint from cd_code_ini_vars.F |
- separate read_checkpoint from cd_code_ini_vars.F |
5412 |
- confined inclusion of AD_CONFIG.h to where necessary. |
- confined inclusion of AD_CONFIG.h to where necessary. |
5413 |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
5414 |
|
|
5415 |
checkpoint51p_post |
checkpoint51p_post (2003/10/30) |
5416 |
o create initial cd_code package |
o create initial cd_code package |
5417 |
- WARNING: the initialization of fields within packages |
- WARNING: the initialization of fields within packages |
5418 |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
5427 |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
5428 |
o cleanup testreport |
o cleanup testreport |
5429 |
|
|
5430 |
checkpoint51o_post |
checkpoint51o_post (2003/10/27) |
5431 |
o bringing AD-related verif's up to date with genmake2 |
o bringing AD-related verif's up to date with genmake2 |
5432 |
- carbon/ |
- carbon/ |
5433 |
- global_ocean.90x40x15/ |
- global_ocean.90x40x15/ |
5448 |
o helping TAF to recognize dependency on kUp for |
o helping TAF to recognize dependency on kUp for |
5449 |
fVerU, fVerV |
fVerU, fVerV |
5450 |
o Replacing delZ by delR in pkg/ctrl/ |
o Replacing delZ by delR in pkg/ctrl/ |
5451 |
checkpoint51o_pre |
checkpoint51o_pre (2003/10/24) |
5452 |
|
|
5453 |
o undid all of cp51 pending some cleanups and discussion |
o undid all of cp51 pending some cleanups and discussion |
5454 |
o added the [#include "AD_CONFIG.h"] statement to all files that need |
o added the [#include "AD_CONFIG.h"] statement to all files that need |
5456 |
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
5457 |
o removed tools/genmake since it no longer works |
o removed tools/genmake since it no longer works |
5458 |
|
|
5459 |
checkpoint51n_post |
checkpoint51n_post (2003/10/23) |
5460 |
o modifications to make FREEZE flux visible to pkg/kpp |
o modifications to make FREEZE flux visible to pkg/kpp |
5461 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
5462 |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
5465 |
global_ocean.cs32x15, and global_with_exf) |
global_ocean.cs32x15, and global_with_exf) |
5466 |
o added surface flux output variables to TIMEAVE_STATVARS |
o added surface flux output variables to TIMEAVE_STATVARS |
5467 |
|
|
5468 |
checkpoint51n_pre |
checkpoint51n_pre (2003/10/23) |
5469 |
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
5470 |
o added [#include "AD_CONFIG.h"] to all files that use the following |
o added [#include "AD_CONFIG.h"] to all files that use the following |
5471 |
defines: |
defines: |
5473 |
- ALLOW_TANGENTLINEAR_RUN |
- ALLOW_TANGENTLINEAR_RUN |
5474 |
- ALLOW_ECCO_OPTIMIZATION |
- ALLOW_ECCO_OPTIMIZATION |
5475 |
|
|
5476 |
checkpoint51m_post |
checkpoint51m_post (2003/10/21) |
5477 |
o incorporating changes to get TAMC/TAF working in genmake2 |
o incorporating changes to get TAMC/TAF working in genmake2 |
5478 |
- added new TAMC/TAF targets to the Makefile |
- added new TAMC/TAF targets to the Makefile |
5479 |
- various cleanups related to package handling |
- various cleanups related to package handling |
5480 |
- these changes should have no impact on the forward model |
- these changes should have no impact on the forward model |
5481 |
|
|
5482 |
checkpoint51l_post |
checkpoint51l_post (2003/10/20) |
5483 |
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
5484 |
- faster algorithm for cal_addtime.F |
- faster algorithm for cal_addtime.F |
5485 |
- higher precision arithmetic, where needed |
- higher precision arithmetic, where needed |
5486 |
- pkg/exf *startdate variables changed from calendar date to |
- pkg/exf *startdate variables changed from calendar date to |
5487 |
model integration time |
model integration time |
5488 |
|
|
5489 |
checkpoint51l_pre |
checkpoint51l_pre (2003/10/17) |
5490 |
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
5491 |
o enable to apply restoring on S & T only in a latitude band. |
o enable to apply restoring on S & T only in a latitude band. |
5492 |
o update output (external_forcing_surf modif. change truncation errors) |
o update output (external_forcing_surf modif. change truncation errors) |
5493 |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
5494 |
|
|
5495 |
checkpoint51k_post |
checkpoint51k_post (2003/10/16) |
5496 |
o change default to: useNHMTerms=.FALSE. |
o change default to: useNHMTerms=.FALSE. |
5497 |
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
5498 |
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
5506 |
removed the #include "PACKAGES_CONFIG.h" from it |
removed the #include "PACKAGES_CONFIG.h" from it |
5507 |
o fix a bug in mom_fluxform (from chk51j_post) |
o fix a bug in mom_fluxform (from chk51j_post) |
5508 |
|
|
5509 |
checkpoint51j_post |
checkpoint51j_post (2003/10/10) |
5510 |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
5511 |
o adjusted some flow directives (dynamics, thermodynamics) |
o adjusted some flow directives (dynamics, thermodynamics) |
5512 |
o added cubed-sphere case to test cost function |
o added cubed-sphere case to test cost function |
5520 |
- pkg_ad_diff.list |
- pkg_ad_diff.list |
5521 |
- pkg_ad_check_lev?_dir.h |
- pkg_ad_check_lev?_dir.h |
5522 |
|
|
5523 |
checkpoint51i_post |
checkpoint51i_post (2003/10/09) |
5524 |
o merge of the branch-genmake2 |
o merge of the branch-genmake2 |
5525 |
- knowingly breaks the older genmake |
- knowingly breaks the older genmake |
5526 |
- automatic generation of all ALLOW_${PKG_NAME} defines |
- automatic generation of all ALLOW_${PKG_NAME} defines |
5527 |
- new testreport supersedes older testscript |
- new testreport supersedes older testscript |
5528 |
o large number of package inclusion and header cleanups |
o large number of package inclusion and header cleanups |
5529 |
checkpoint51i_pre |
checkpoint51i_pre (2003/10/08) |
5530 |
|
|
5531 |
o new output for adjoin of global ocean vector invariant |
o new output for adjoin of global ocean vector invariant |
5532 |
o fix for checkpoint of thermodynamic seaice and bulk_force |
o fix for checkpoint of thermodynamic seaice and bulk_force |
5538 |
o modifications to clean up dic pkg |
o modifications to clean up dic pkg |
5539 |
o add pkg/cfc |
o add pkg/cfc |
5540 |
|
|
5541 |
checkpoint51g_post |
checkpoint51g_post (2003/10/02) |
5542 |
o provide links for ARPACK and ADM*TLM |
o provide links for ARPACK and ADM*TLM |
5543 |
o start removing verification/vero/ |
o start removing verification/vero/ |
5544 |
o update AD-related stuff |
o update AD-related stuff |
5546 |
o adding to verification/global_ocean.90x40x15/ adjoint of |
o adding to verification/global_ocean.90x40x15/ adjoint of |
5547 |
vector invariant setup |
vector invariant setup |
5548 |
|
|
5549 |
checkpoint51f_post |
checkpoint51f_post (2003/10/02) |
5550 |
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
5551 |
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
5552 |
of tracer Green's fucntions for ocean inversion project. |
of tracer Green's fucntions for ocean inversion project. |
5553 |
|
|
5554 |
checkpoint51f_pre |
checkpoint51f_pre (2003/08/07) |
5555 |
o Added on-the-fly spatial interpolation capability |
o Added on-the-fly spatial interpolation capability |
5556 |
"USE_EXF_INTERPOLATION" to pkg/exf. |
"USE_EXF_INTERPOLATION" to pkg/exf. |
5557 |
- This is a temporary Cartesian-grid hack until |
- This is a temporary Cartesian-grid hack until |
5563 |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
5564 |
non-local transport term. |
non-local transport term. |
5565 |
|
|
5566 |
checkpoint51e_post |
checkpoint51e_post (2003/08/03) |
5567 |
o pkg/mom_vecinv: |
o pkg/mom_vecinv: |
5568 |
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
5569 |
- add time-ave diagnostic of vorticity advection. |
- add time-ave diagnostic of vorticity advection. |
5573 |
o land pkg: read initial state from files. |
o land pkg: read initial state from files. |
5574 |
o AIM : add stratospheric drag in the upper level |
o AIM : add stratospheric drag in the upper level |
5575 |
|
|
5576 |
checkpoint51d_post |
checkpoint51d_post (2003/07/18) |
5577 |
o change function ILNBLNK (=> last non-blank char.) to return zero |
o change function ILNBLNK (=> last non-blank char.) to return zero |
5578 |
(instead of the string length) when the string. char is empty |
(instead of the string length) when the string. char is empty |
5579 |
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
5586 |
- new active_file_loc... and mdsio_..._loc routines |
- new active_file_loc... and mdsio_..._loc routines |
5587 |
- affected packages: autodiff, ctrl, grdchk, mdsio |
- affected packages: autodiff, ctrl, grdchk, mdsio |
5588 |
|
|
5589 |
checkpoint51c_post |
checkpoint51c_post (2003/07/08) |
5590 |
o introducing integer flag debugLevel |
o introducing integer flag debugLevel |
5591 |
- debLevZero: suppress all output |
- debLevZero: suppress all output |
5592 |
- debLevA: standard |
- debLevA: standard |
5609 |
- checked tapelev/comlev recomputations: OK |
- checked tapelev/comlev recomputations: OK |
5610 |
<<<checkpoint51b_pre |
<<<checkpoint51b_pre |
5611 |
|
|
5612 |
checkpoint51a_post |
checkpoint51a_post (2003/06/25) |
5613 |
o added code for biogeochemistry package |
o added code for biogeochemistry package |
5614 |
- new pkgs: dic, gchem |
- new pkgs: dic, gchem |
5615 |
- new subroutine in ptracers |
- new subroutine in ptracers |
5616 |
o modify code for biogeo packages |
o modify code for biogeo packages |
5617 |
- in model/src and pkg/ptracers |
- in model/src and pkg/ptracers |
5618 |
|
|
5619 |
checkpoint51 |
checkpoint51 (2003/06/24) |
5620 |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
5621 |
- autodiff, ctrl, exf, grdchk, seaice |
- autodiff, ctrl, exf, grdchk, seaice |
5622 |
kept separate packages |
kept separate packages |
5624 |
o updating verification/internal_wave, verification/lab_sea |
o updating verification/internal_wave, verification/lab_sea |
5625 |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
5626 |
|
|
5627 |
checkpoint50i_post |
checkpoint50i_post (2003/06/23) |
5628 |
o Preparing next differentiable checkpoint and sync |
o Preparing next differentiable checkpoint and sync |
5629 |
of MAIN vs. ecco-branch |
of MAIN vs. ecco-branch |
5630 |
- 1st step: this one is differentiable |
- 1st step: this one is differentiable |
5631 |
- 2nd step: next(! not this) checkpoint will have updated packages |
- 2nd step: next(! not this) checkpoint will have updated packages |
5632 |
from ecco-branch) |
from ecco-branch) |
5633 |
|
|
5634 |
checkpoint50h_post |
checkpoint50h_post (2003/06/20) |
5635 |
o new package "land": provide surface BC for AIM. |
o new package "land": provide surface BC for AIM. |
5636 |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
5637 |
o AIM: use true log-P extrapolation for near surface temp (= as in |
o AIM: use true log-P extrapolation for near surface temp (= as in |
5640 |
o somewhat cleaned package initialisation sequence for |
o somewhat cleaned package initialisation sequence for |
5641 |
ctrl/ cost/ ecco/ in packages_... routines |
ctrl/ cost/ ecco/ in packages_... routines |
5642 |
|
|
5643 |
checkpoint50g_post |
checkpoint50g_post (2003/05/23) |
5644 |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
5645 |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
5646 |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
5647 |
made the default because of faster convergence than ADI |
made the default because of faster convergence than ADI |
5648 |
|
|
5649 |
checkpoint50f_post |
checkpoint50f_post (2003/05/23) |
5650 |
o exf totally restructured |
o exf totally restructured |
5651 |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
5652 |
and made sure it's still differentiable |
and made sure it's still differentiable |
5654 |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
5655 |
- updated adjoint/makefile and relevant verif. accordingly |
- updated adjoint/makefile and relevant verif. accordingly |
5656 |
|
|
5657 |
checkpoint50f_pre |
checkpoint50f_pre (2003/05/23) |
5658 |
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
5659 |
+ change Evap over land. (update aim.5l_cs output) |
+ change Evap over land. (update aim.5l_cs output) |
5660 |
o added missing .cvsignores and made uniform across expts |
o added missing .cvsignores and made uniform across expts |
5664 |
o new fn in pkg/monitor to stop model if solution grows too big |
o new fn in pkg/monitor to stop model if solution grows too big |
5665 |
o removed lots of single quotes from comments |
o removed lots of single quotes from comments |
5666 |
|
|
5667 |
checkpoint50e_post |
checkpoint50e_post (2003/05/14) |
5668 |
o make KPP work with PTRACERS |
o make KPP work with PTRACERS |
5669 |
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
5670 |
nearly a copy of kpp_transport_s |
nearly a copy of kpp_transport_s |
5671 |
- there is no analogue to SurfaceTendencyS, so I have to use |
- there is no analogue to SurfaceTendencyS, so I have to use |
5672 |
gPtr(of the surface layer) instead |
gPtr(of the surface layer) instead |
5673 |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
5674 |
checkpoint50e_pre |
checkpoint50e_pre (2003/05/13) |
5675 |
|
|
5676 |
checkpoint50d_post |
checkpoint50d_post (2003/05/13) |
5677 |
o change kpp output from multiple-record state files to single-record state |
o change kpp output from multiple-record state files to single-record state |
5678 |
files analogous to write_state.F |
files analogous to write_state.F |
5679 |
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
5680 |
analogous to the cg2d-related output. |
analogous to the cg2d-related output. |
5681 |
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
5682 |
so that writing to internal file fn (with length 512) fails. |
so that writing to internal file fn (with length 512) fails. |
5683 |
checkpoint50d_pre |
checkpoint50d_pre (2003/05/12) |
5684 |
|
|
5685 |
checkpoint50c_post |
checkpoint50c_post (2003/05/12) |
5686 |
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
5687 |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
5688 |
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
5689 |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
5690 |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
5691 |
|
|
5692 |
checkpoint50c_pre |
checkpoint50c_pre (2003/04/30) |
5693 |
Merging from release1_p13: |
Merging from release1_p13: |
5694 |
o bug fix for pkg/seaice dynamic solver |
o bug fix for pkg/seaice dynamic solver |
5695 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
5696 |
|
|
5697 |
checkpoint50b_post |
checkpoint50b_post (2003/04/17) |
5698 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
5699 |
o in order to put the momForcing out of the Adams-Bashforth: |
o in order to put the momForcing out of the Adams-Bashforth: |
5700 |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
5703 |
o re-generate output for highly sensitive test-exp: |
o re-generate output for highly sensitive test-exp: |
5704 |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
5705 |
|
|
5706 |
checkpoint50b_pre |
checkpoint50b_pre (2003/04/17) |
5707 |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
5708 |
o corrected CPP option mismatch in exf_Bulk... functions for case |
o corrected CPP option mismatch in exf_Bulk... functions for case |
5709 |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
5710 |
|
|
5711 |
checkpoint50a_post |
checkpoint50a_post (2003/03/21) |
5712 |
o Bug fix for merging between c50 and KPP. |
o Bug fix for merging between c50 and KPP. |
5713 |
ikey was passed from thermodynamics to kpp_calc via |
ikey was passed from thermodynamics to kpp_calc via |
5714 |
common block rather than being recomputed in kpp_calc, |
common block rather than being recomputed in kpp_calc, |
5715 |
in contradiction with new key itdkey. |
in contradiction with new key itdkey. |
5716 |
New key ikppkey created, and tamc.h headers updated. |
New key ikppkey created, and tamc.h headers updated. |
5717 |
|
|
5718 |
checkpoint50 |
checkpoint50 (2003/03/08) |
5719 |
- 2nd step of merge with ecco-branch: |
- 2nd step of merge with ecco-branch: |
5720 |
merge changes in ecco-branch back into main trunk |
merge changes in ecco-branch back into main trunk |
5721 |
- bug fix in find_alpha |
- bug fix in find_alpha |
5723 |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
5724 |
- merged some sliced AD support routines |
- merged some sliced AD support routines |
5725 |
|
|
5726 |
checkpoint49 |
checkpoint49 (2003/03/06) |
5727 |
merged from ecco-branch: |
merged from ecco-branch: |
5728 |
o exf: |
o exf: |
5729 |
- Enable initialisation of forcing fields to constant |
- Enable initialisation of forcing fields to constant |
5761 |
(see MITgcm manual). |
(see MITgcm manual). |
5762 |
o cal: synchronized between MAIN and ecco-branch |
o cal: synchronized between MAIN and ecco-branch |
5763 |
|
|
5764 |
checkpoint48i_post |
checkpoint48i_post (2003/03/05) |
5765 |
o Changes to restore differentiability of code w.r.t. previous tag |
o Changes to restore differentiability of code w.r.t. previous tag |
5766 |
(mostly adding new routines to make list and replacing |
(mostly adding new routines to make list and replacing |
5767 |
pressure by totPhiHyd). |
pressure by totPhiHyd). |
5779 |
tbar, sbar, psbar, which should not be reinitialised; |
tbar, sbar, psbar, which should not be reinitialised; |
5780 |
only relevant for ecco-branch) |
only relevant for ecco-branch) |
5781 |
|
|
5782 |
checkpoint48h_post |
checkpoint48h_post (2003/02/28) |
5783 |
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
5784 |
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
5785 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
5786 |
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
5787 |
|
|
5788 |
checkpoint48g_post |
checkpoint48g_post (2003/02/18) |
5789 |
--- EOS: |
--- EOS: |
5790 |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
5791 |
store total Potential in totPhyHyd for diagnostics & EOS. |
store total Potential in totPhyHyd for diagnostics & EOS. |
5799 |
( changes results of ideal_2D_oce ) |
( changes results of ideal_2D_oce ) |
5800 |
o includes r* 2nd term in potential gradient. |
o includes r* 2nd term in potential gradient. |
5801 |
|
|
5802 |
checkpoint48f_post |
checkpoint48f_post (2003/02/18) |
5803 |
Merging from release1_p12: |
Merging from release1_p12: |
5804 |
o Modifications for using pkg/exf with pkg/seaice |
o Modifications for using pkg/exf with pkg/seaice |
5805 |
- improved description of the various forcing configurations |
- improved description of the various forcing configurations |
5827 |
- adjoint-friendly modifications |
- adjoint-friendly modifications |
5828 |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
5829 |
|
|
5830 |
checkpoint48e_post |
checkpoint48e_post (2003/02/12) |
5831 |
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
5832 |
o dynamics: change definition of computational domain & adapt mom_fluxform |
o dynamics: change definition of computational domain & adapt mom_fluxform |
5833 |
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
5838 |
inverted_barometer solid-body.cs-32x32x1 |
inverted_barometer solid-body.cs-32x32x1 |
5839 |
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
5840 |
|
|
5841 |
checkpoint48d_post |
checkpoint48d_post (2003/02/09) |
5842 |
o in preparation for r*: |
o in preparation for r*: |
5843 |
a) use pre-computed gradient of hydrostatic potential: |
a) use pre-computed gradient of hydrostatic potential: |
5844 |
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
5846 |
=> affects results of glob_oce_pressure (different truncation error) |
=> affects results of glob_oce_pressure (different truncation error) |
5847 |
update output.txt of ideal_2D_oce & global_ocean_pressure |
update output.txt of ideal_2D_oce & global_ocean_pressure |
5848 |
|
|
5849 |
checkpoint48d_pre |
checkpoint48d_pre (2003/02/08) |
5850 |
o in preparation for r*: |
o in preparation for r*: |
5851 |
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
5852 |
pass the 2 comp. of the grad. as arguments to momentum S/R. |
pass the 2 comp. of the grad. as arguments to momentum S/R. |
5853 |
but for the moment, only used if it does not change the results. |
but for the moment, only used if it does not change the results. |
5854 |
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
5855 |
|
|
5856 |
checkpoint48c_post |
checkpoint48c_post (2003/02/06) |
5857 |
Modifications in treatment of initial flux forcing controls |
Modifications in treatment of initial flux forcing controls |
5858 |
to avoid extra storing of flux fields. |
to avoid extra storing of flux fields. |
5859 |
|
|
5860 |
checkpoint48c_pre |
checkpoint48c_pre (2003/01/21) |
5861 |
o Added tidal_basin_2d experiment (currently 1D!) |
o Added tidal_basin_2d experiment (currently 1D!) |
5862 |
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
5863 |
|
|
5864 |
checkpoint48b_post |
checkpoint48b_post (2003/01/27) |
5865 |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
5866 |
(modification to pressure gradient not yet implemented) |
(modification to pressure gradient not yet implemented) |
5867 |
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
5868 |
(for U & V) that are used for vertical advection of momentum. |
(for U & V) that are used for vertical advection of momentum. |
5869 |
|
|
5870 |
checkpoint48a_post |
checkpoint48a_post (2003/01/24) |
5871 |
o In preparation for r*, use temp. array to compute vertical transport |
o In preparation for r*, use temp. array to compute vertical transport |
5872 |
in flux-form momentum pkg. => change results of few test-exp. |
in flux-form momentum pkg. => change results of few test-exp. |
5873 |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
5874 |
lab_sea, natl_box & plume_on_slope |
lab_sea, natl_box & plume_on_slope |
5875 |
|
|
5876 |
checkpoint48 |
checkpoint48 (2003/01/23) |
5877 |
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
5878 |
|
|
5879 |
checkpoint47j_post |
checkpoint47j_post (2003/01/21) |
5880 |
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
5881 |
o moved adexch from forward_step to addummy_in_stepping |
o moved adexch from forward_step to addummy_in_stepping |
5882 |
o added exch in ctrl_map_... |
o added exch in ctrl_map_... |
5895 |
re-activated full calculation of taperfct for case 'ac02' |
re-activated full calculation of taperfct for case 'ac02' |
5896 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
5897 |
|
|
5898 |
checkpoint47i_post |
checkpoint47i_post (2003/01/13) |
5899 |
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
5900 |
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
5901 |
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
5911 |
S/R gmredi_slope_psi should be cleaned |
S/R gmredi_slope_psi should be cleaned |
5912 |
o verification/carbon now has exactConserv=.TRUE. |
o verification/carbon now has exactConserv=.TRUE. |
5913 |
|
|
5914 |
checkpoint47g_post |
checkpoint47g_post (2003/01/10) |
5915 |
o time-average AIM output: becomes independent from statvars time-average |
o time-average AIM output: becomes independent from statvars time-average |
5916 |
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
5917 |
o After TAF bug fix: |
o After TAF bug fix: |
5937 |
in conjunction with data.gmredi parameters to be checked in |
in conjunction with data.gmredi parameters to be checked in |
5938 |
in a few minutes under verification/carbon/code/ |
in a few minutes under verification/carbon/code/ |
5939 |
|
|
5940 |
checkpoint47f_post |
checkpoint47f_post (2002/12/28) |
5941 |
Merging from release1_p10: |
Merging from release1_p10: |
5942 |
o modifications for using pkg/exf with pkg/seaice |
o modifications for using pkg/exf with pkg/seaice |
5943 |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
5949 |
- verification/lab_sea default experiment now uses |
- verification/lab_sea default experiment now uses |
5950 |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
5951 |
|
|
5952 |
checkpoint47e_post |
checkpoint47e_post (2002/12/27) |
5953 |
o created a tag prior to creating a branch |
o created a tag prior to creating a branch |
5954 |
|
|
5955 |
checkpoint47d_post |
checkpoint47d_post (2002/12/16) |
5956 |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
5957 |
at the bottom boundary had an erroneous half slip boundary condition |
at the bottom boundary had an erroneous half slip boundary condition |
5958 |
o added bottom drag and no slip boundary condition capabilities to |
o added bottom drag and no slip boundary condition capabilities to |
5959 |
oceanic pressure coordinates code |
oceanic pressure coordinates code |
5960 |
o added new verification experiment global_ocean_pressure, this experiment is |
o added new verification experiment global_ocean_pressure, this experiment is |
5961 |
also described in the tutorial section of the manual |
also described in the tutorial section of the manual |
5962 |
checkpoint47d_pre |
checkpoint47d_pre (2002/12/16) |
5963 |
|
|
5964 |
checkpoint47c_post |
checkpoint47c_post (2002/12/16) |
5965 |
o Added a verification experiment for a global cubed-sphere ocean run |
o Added a verification experiment for a global cubed-sphere ocean run |
5966 |
- verification/global_ocean.cubed32x32x30 |
- verification/global_ocean.cubed32x32x30 |
5967 |
- uses pkg/therm_seaice and pkg/bulk_forcing |
- uses pkg/therm_seaice and pkg/bulk_forcing |
5973 |
NOTES: requires option NONLIN_FRSURF to be "#define". |
NOTES: requires option NONLIN_FRSURF to be "#define". |
5974 |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
5975 |
|
|
5976 |
checkpoint47b_post |
checkpoint47b_post (2002/12/05) |
5977 |
Merging from release1_p9: |
Merging from release1_p9: |
5978 |
o pkg/seaice |
o pkg/seaice |
5979 |
- removed GOTO's and added taf directives |
- removed GOTO's and added taf directives |
5990 |
- added missing matlab routines |
- added missing matlab routines |
5991 |
- added test of thermodynamics parallelization |
- added test of thermodynamics parallelization |
5992 |
|
|
5993 |
checkpoint47a_post |
checkpoint47a_post (2002/11/23) |
5994 |
o new pkg: aim_v23 |
o new pkg: aim_v23 |
5995 |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
5996 |
for now, keep the same surface forcing as before. |
for now, keep the same surface forcing as before. |
6007 |
- Two ifdef statements for compile time, |
- Two ifdef statements for compile time, |
6008 |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
6009 |
|
|
6010 |
checkpoint47 |
checkpoint47 (2002/11/15) |
6011 |
differentiable version of checkpoint46n_post |
differentiable version of checkpoint46n_post |
6012 |
o bug fix in quasihydrostaticterms |
o bug fix in quasihydrostaticterms |
6013 |
o * "clean" adjoint code (in terms of extensive recomputations) |
o * "clean" adjoint code (in terms of extensive recomputations) |
6036 |
- #define GM_VISBECK_VARIABLE_K |
- #define GM_VISBECK_VARIABLE_K |
6037 |
- GM_taper_scheme = 'ldd97' |
- GM_taper_scheme = 'ldd97' |
6038 |
|
|
6039 |
checkpoint46n_post |
checkpoint46n_post (2002/11/12) |
6040 |
Merging from release1_p8: |
Merging from release1_p8: |
6041 |
o verification/natl_box: |
o verification/natl_box: |
6042 |
updating new external_fields_load routine |
updating new external_fields_load routine |
6090 |
the exf (and cal) package instead of the |
the exf (and cal) package instead of the |
6091 |
external_fields_load routine (cf README file). |
external_fields_load routine (cf README file). |
6092 |
|
|
6093 |
checkpoint46m_post |
checkpoint46m_post (2002/11/07) |
6094 |
o modified testscript to return -- when there are no lines of "%MON" output |
o modified testscript to return -- when there are no lines of "%MON" output |
6095 |
o added new flag "quasiHydrostatic" for QH mode |
o added new flag "quasiHydrostatic" for QH mode |
6096 |
and new routine quasihydrostaticterms() |
and new routine quasihydrostaticterms() |
6103 |
o removed gravitySign from PARM04 |
o removed gravitySign from PARM04 |
6104 |
o switched to g77/ifc from pgf77 in aim experiments |
o switched to g77/ifc from pgf77 in aim experiments |
6105 |
|
|
6106 |
checkpoint46l_post |
checkpoint46l_post (2002/11/01) |
6107 |
o made convective adjustment work with pressure coordinates: |
o made convective adjustment work with pressure coordinates: |
6108 |
- changed the direction of k-loop in convective_adjustment.F for the |
- changed the direction of k-loop in convective_adjustment.F for the |
6109 |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
6116 |
at the beginning of find_rho, find_alpha, and find_beta, does a |
at the beginning of find_rho, find_alpha, and find_beta, does a |
6117 |
check of the entire slice, if CPP-option |
check of the entire slice, if CPP-option |
6118 |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
6119 |
checkpoint46l_pre |
checkpoint46l_pre (2002/10/23) |
6120 |
|
|
6121 |
checkpoint46k_post |
checkpoint46k_post (2002/10/23) |
6122 |
o fixed the verification/global_ocean.90x40x15 experiment: |
o fixed the verification/global_ocean.90x40x15 experiment: |
6123 |
- new bathymetry (the world according to A., JMC, and M.) |
- new bathymetry (the world according to A., JMC, and M.) |
6124 |
- new initial fields and forcing fields (*.bin files) |
- new initial fields and forcing fields (*.bin files) |
6132 |
- read AIM physics parameters from a file (data.aimphys) |
- read AIM physics parameters from a file (data.aimphys) |
6133 |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
6134 |
|
|
6135 |
checkpoint46j_post |
checkpoint46j_post (2002/10/07) |
6136 |
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
6137 |
o move wVel computation at the end of the time step, in S/R integr_continuity |
o move wVel computation at the end of the time step, in S/R integr_continuity |
6138 |
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
6139 |
o update timeave pkg for wVel diagnostic. |
o update timeave pkg for wVel diagnostic. |
6140 |
checkpoint46j_pre |
checkpoint46j_pre (2002/09/27) |
6141 |
|
|
6142 |
checkpoint46i_post |
checkpoint46i_post (2002/09/25) |
6143 |
o Clean up AIM package (and keep the results unchanged): |
o Clean up AIM package (and keep the results unchanged): |
6144 |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
6145 |
declare all the variables _RL ; use _d 0 for all numerical constants. |
declare all the variables _RL ; use _d 0 for all numerical constants. |
6146 |
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
6147 |
|
|
6148 |
checkpoint46h_post |
checkpoint46h_post (2002/09/25) |
6149 |
o cleaned up the use of rhoNil and rhoConst. |
o cleaned up the use of rhoNil and rhoConst. |
6150 |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
6151 |
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
6155 |
value is 999.8 kg/m^3 |
value is 999.8 kg/m^3 |
6156 |
o cleanup up external_forcing.F and external_forcing_surf.F |
o cleanup up external_forcing.F and external_forcing_surf.F |
6157 |
- can now be used by both OCEANIC and OCEANICP |
- can now be used by both OCEANIC and OCEANICP |
6158 |
checkpoint46h_pre |
checkpoint46h_pre (2002/09/18) |
6159 |
|
|
6160 |
Added code to convert surface volume flux (fresh water) into |
Added code to convert surface volume flux (fresh water) into |
6161 |
a mass flux when using P coordinates in the ocean (OCEANICP). |
a mass flux when using P coordinates in the ocean (OCEANICP). |
6162 |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
6163 |
|
|
6164 |
checkpoint46g_post |
checkpoint46g_post (2002/09/18) |
6165 |
o Include a new diagnostic variable phiHydLow for the ocean model |
o Include a new diagnostic variable phiHydLow for the ocean model |
6166 |
- in z-coordinates, it is the bottom pressure anomaly |
- in z-coordinates, it is the bottom pressure anomaly |
6167 |
- in p-coordinates, it is the sea surface elevation |
- in p-coordinates, it is the sea surface elevation |
6179 |
- removed obsolete 'eqn' from the parameter list. |
- removed obsolete 'eqn' from the parameter list. |
6180 |
o added two new verification experiments: gop and goz |
o added two new verification experiments: gop and goz |
6181 |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
6182 |
checkpoint46g_pre |
checkpoint46g_pre (2002/09/16) |
6183 |
|
|
6184 |
checkpoint46f_post |
checkpoint46f_post (2002/09/16) |
6185 |
o Enable tangent linear (forward mode) gradient checks: |
o Enable tangent linear (forward mode) gradient checks: |
6186 |
- extended active file handling to g_... files |
- extended active file handling to g_... files |
6187 |
- added TANGENT_SIMULATION to theSimulationMode |
- added TANGENT_SIMULATION to theSimulationMode |
6189 |
o added tangent linear setup in verification/carbon/code_ftl |
o added tangent linear setup in verification/carbon/code_ftl |
6190 |
o added adjoint setup in verification/front_relax/code_ad |
o added adjoint setup in verification/front_relax/code_ad |
6191 |
|
|
6192 |
checkpoint46e_post |
checkpoint46e_post (2002/09/05) |
6193 |
o Added new equation of state -> MDJWF |
o Added new equation of state -> MDJWF |
6194 |
- EOS of McDougall et al., 2002, JAOT, submitted |
- EOS of McDougall et al., 2002, JAOT, submitted |
6195 |
- caveat: the equation of state is only valid for a smaller (more |
- caveat: the equation of state is only valid for a smaller (more |
6198 |
- added more check values for density in check_eos (ini_eos.F), some of |
- added more check values for density in check_eos (ini_eos.F), some of |
6199 |
the old check values are out of the range of the MDJWF-eos, so don't |
the old check values are out of the range of the MDJWF-eos, so don't |
6200 |
expect perfect matches for those |
expect perfect matches for those |
6201 |
checkpoint46e_pre |
checkpoint46e_pre (2002/08/19) |
6202 |
|
|
6203 |
checkpoint46d_post |
checkpoint46d_post (2002/08/19) |
6204 |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
6205 |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
6206 |
case of pressure coordinates. eosType='JMD95Z' in |
case of pressure coordinates. eosType='JMD95Z' in |
6207 |
combination with buoyancyRelation='OCEANICP' now causes an error. |
combination with buoyancyRelation='OCEANICP' now causes an error. |
6208 |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
6209 |
in find_alpha/beta. |
in find_alpha/beta. |
6210 |
checkpoint46d_pre |
checkpoint46d_pre (2002/08/15) |
6211 |
|
|
6212 |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
6213 |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
6214 |
|
|
6215 |
checkpoint46c_post |
checkpoint46c_post (2002/08/15) |
6216 |
o Changes necessary for ocean in p-coordinates |
o Changes necessary for ocean in p-coordinates |
6217 |
- Added new buoyancy relation = 'OCEANICP' |
- Added new buoyancy relation = 'OCEANICP' |
6218 |
- Added new parameters = gravitySign (this used to be contained inside |
- Added new parameters = gravitySign (this used to be contained inside |
6219 |
the factor dRdZ which I added when we first switched to R coordinates). |
the factor dRdZ which I added when we first switched to R coordinates). |
6220 |
X GM/Redi is not compatible (yet) |
X GM/Redi is not compatible (yet) |
6221 |
X bottom drag and no-slip need to be debugged. |
X bottom drag and no-slip need to be debugged. |
6222 |
checkpoint46c_pre |
checkpoint46c_pre (2002/08/07) |
6223 |
|
|
6224 |
checkpoint46b_post |
checkpoint46b_post (2002/08/07) |
6225 |
o Added new equation of state -> JMD95Z and JMD95P |
o Added new equation of state -> JMD95Z and JMD95P |
6226 |
- EOS of Jackett and McDougall, 1995, JAOT |
- EOS of Jackett and McDougall, 1995, JAOT |
6227 |
- moved all EOS parameters into EOS.h |
- moved all EOS parameters into EOS.h |
6230 |
in-situ temperature (see JMD95) |
in-situ temperature (see JMD95) |
6231 |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
6232 |
unesco.f to be used with POLY3 |
unesco.f to be used with POLY3 |
6233 |
checkpoint46b_pre |
checkpoint46b_pre (2002/07/31) |
6234 |
|
|
6235 |
checkpoint46a_post |
checkpoint46a_post (2002/07/31) |
6236 |
o Added (atmospheric) pressure loading |
o Added (atmospheric) pressure loading |
6237 |
- new field in FFIELDS.h, etc... |
- new field in FFIELDS.h, etc... |
6238 |
- new cpp flag ATMOSPHERIC_LOADING |
- new cpp flag ATMOSPHERIC_LOADING |
6239 |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
6240 |
o Added SHORTWAVE_HEATING to some files for consistency |
o Added SHORTWAVE_HEATING to some files for consistency |
6241 |
checkpoint46a_pre |
checkpoint46a_pre (2002/07/13) |
6242 |
|
|
6243 |
checkpoint46 |
checkpoint46 (2002/07/13) |
6244 |
further merges from release1_p5 |
further merges from release1_p5 |
6245 |
o new ctrl package |
o new ctrl package |
6246 |
- adopted from ECCO environment to enable optimization |
- adopted from ECCO environment to enable optimization |
6267 |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
6268 |
o incorporated hooks for sponge layer code (external_forcing.F) |
o incorporated hooks for sponge layer code (external_forcing.F) |
6269 |
|
|
6270 |
checkpoint45d_post |
checkpoint45d_post (2002/07/12) |
6271 |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
6272 |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
6273 |
(affects plume_on_slope "cg2d" output) |
(affects plume_on_slope "cg2d" output) |
6281 |
- for each tracer, define internal flag for multiDimAdvection & A-B |
- for each tracer, define internal flag for multiDimAdvection & A-B |
6282 |
o monitor: change definition of KE to check conservation of Energy |
o monitor: change definition of KE to check conservation of Energy |
6283 |
|
|
6284 |
checkpoint45c_post |
checkpoint45c_post (2002/05/30) |
6285 |
o Removed f90 comments ("!") |
o Removed f90 comments ("!") |
6286 |
o Modified initialisations to enable exf package for MITgcm |
o Modified initialisations to enable exf package for MITgcm |
6287 |
(without invoking ECCO_PACKAGE). |
(without invoking ECCO_PACKAGE). |
6289 |
- enable centered differences |
- enable centered differences |
6290 |
- modified format of standard output |
- modified format of standard output |
6291 |
|
|
6292 |
checkpoint45b_post |
checkpoint45b_post (2002/05/30) |
6293 |
o cleaned exchange calls in cg2d |
o cleaned exchange calls in cg2d |
6294 |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
6295 |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
6301 |
(corresponding adjustment of TAF tape initialisation). |
(corresponding adjustment of TAF tape initialisation). |
6302 |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
6303 |
|
|
6304 |
checkpoint45a_post |
checkpoint45a_post (2002/05/01) |
6305 |
o compute Rho over the whole domain (extend iMin,jMin indices) |
o compute Rho over the whole domain (extend iMin,jMin indices) |
6306 |
o specific exchange for X-slice domain (case Ny=1) |
o specific exchange for X-slice domain (case Ny=1) |
6307 |
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
6321 |
(conflict on some platforms, e.g. IBM SP3) |
(conflict on some platforms, e.g. IBM SP3) |
6322 |
o modified carbon verif. |
o modified carbon verif. |
6323 |
|
|
6324 |
checkpoint44h_pre |
checkpoint44h_pre (2002/03/14) |
6325 |
o vertical grid option: allow to put the Interface at the middle between |
o vertical grid option: allow to put the Interface at the middle between |
6326 |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
6327 |
o GM Advective form: Tracers are advected using the residual transport (= |
o GM Advective form: Tracers are advected using the residual transport (= |
6328 |
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
6329 |
|
|
6330 |
checkpoint44g_post |
checkpoint44g_post (2002/03/05) |
6331 |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
6332 |
results) ; ifdef missing in thermodynamics.F |
results) ; ifdef missing in thermodynamics.F |
6333 |
|
|
6392 |
o check parameters & config (chkpt44a_pre,post) |
o check parameters & config (chkpt44a_pre,post) |
6393 |
o OBC and NonLin_FrSurf. |
o OBC and NonLin_FrSurf. |
6394 |
|
|
6395 |
checkpoint44 |
checkpoint44 (2002/01/18) |
6396 |
o fix bug in mom_vi_del2uv |
o fix bug in mom_vi_del2uv |
6397 |
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
6398 |
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
6400 |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
6401 |
o added some stuff for AD |
o added some stuff for AD |
6402 |
|
|
6403 |
checkpoint43 |
checkpoint43 (2001/09/28) |
6404 |
o added two new advection tests |
o added two new advection tests |
6405 |
o added global 4x4 degree ocean test |
o added global 4x4 degree ocean test |
6406 |
o added test of H&S94 with free surface on cube |
o added test of H&S94 with free surface on cube |
6407 |
o some final mods for gradient check, adjoint,... |
o some final mods for gradient check, adjoint,... |
6408 |
|
|
6409 |
checkpoint42 |
checkpoint42 (2001/09/27) |
6410 |
Fixed AD-related problems: |
Fixed AD-related problems: |
6411 |
o Store directives up-to-date with re-arranged Adams-Bashforth |
o Store directives up-to-date with re-arranged Adams-Bashforth |
6412 |
(mainly thermodynamics.F) |
(mainly thermodynamics.F) |
6418 |
for the case ALLOW_KPP |
for the case ALLOW_KPP |
6419 |
o Cleaned argument list for timestep_tracer.F |
o Cleaned argument list for timestep_tracer.F |
6420 |
|
|
6421 |
checkpoint41 |
checkpoint41 (2001/09/27) |
6422 |
o re-formatted/added comments in prologues of key subroutines |
o re-formatted/added comments in prologues of key subroutines |
6423 |
to work with protex |
to work with protex |
6424 |
|
|
6425 |
checkpoint40 |
checkpoint40 (2001/09/27) |
6426 |
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
6427 |
o added FLT (floats) package from Arne along with demo. experiment |
o added FLT (floats) package from Arne along with demo. experiment |
6428 |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
6431 |
o modified multi-dim method to work on cube |
o modified multi-dim method to work on cube |
6432 |
o bug fix in KPP (from DM) |
o bug fix in KPP (from DM) |
6433 |
|
|
6434 |
checkpoint40pre9 |
checkpoint40pre9 (2001/09/27) |
6435 |
o added DST advection schemes |
o added DST advection schemes |
6436 |
o fix MPI bug on SGI's |
o fix MPI bug on SGI's |
6437 |
o modifications for non-linear free-surface |
o modifications for non-linear free-surface |
6441 |
o added/updated many matlab scripts |
o added/updated many matlab scripts |
6442 |
o added multi-dimensional advection method for tracers |
o added multi-dimensional advection method for tracers |
6443 |
|
|
6444 |
checkpoint40pre8 |
checkpoint40pre8 (2001/09/05) |
6445 |
o new package rw/ |
o new package rw/ |
6446 |
Added method for dumping intermediate local arrays: |
Added method for dumping intermediate local arrays: |
6447 |
mdsio_writetile - same as mdsio_writefield except works from inside |
mdsio_writetile - same as mdsio_writefield except works from inside |
6460 |
currently nothing implemented to switch this storing off |
currently nothing implemented to switch this storing off |
6461 |
in case fluxform is used since no CPP flag available). |
in case fluxform is used since no CPP flag available). |
6462 |
|
|
6463 |
checkpoint40pre7 |
checkpoint40pre7 (2001/08/14) |
6464 |
o bug fix in dynamics.F |
o bug fix in dynamics.F |
6465 |
calc_viscosity called before k=1,Nr loop. |
calc_viscosity called before k=1,Nr loop. |
6466 |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
6467 |
o cleaned initialisations in ctrl_map_ini |
o cleaned initialisations in ctrl_map_ini |
6468 |
related to TAF |
related to TAF |
6469 |
|
|
6470 |
checkpoint40pre6 |
checkpoint40pre6 (2001/08/13) |
6471 |
o split dynamics into thermodynamics & dynamics |
o split dynamics into thermodynamics & dynamics |
6472 |
o corresponding split of calc_diffusivity into |
o corresponding split of calc_diffusivity into |
6473 |
calc_diffusivity, calc_viscosity |
calc_diffusivity, calc_viscosity |
6475 |
o Added diffkr, kapgm to control variables |
o Added diffkr, kapgm to control variables |
6476 |
o bug fix in gmredi_slope_limit for ldd97 |
o bug fix in gmredi_slope_limit for ldd97 |
6477 |
|
|
6478 |
checkpoint40pre5 |
checkpoint40pre5 (2001/07/31) |
6479 |
o proper initialization of Adams-Bashforth time stepping |
o proper initialization of Adams-Bashforth time stepping |
6480 |
+ uses forward step for very first step of model (iter=0) |
+ uses forward step for very first step of model (iter=0) |
6481 |
o re-generated *all* output since almost all output is modified by this |
o re-generated *all* output since almost all output is modified by this |
6489 |
+ this uses an alternative form of ini_curvilinear_grid.F which |
+ this uses an alternative form of ini_curvilinear_grid.F which |
6490 |
is not necessarily any better than the current one... |
is not necessarily any better than the current one... |
6491 |
|
|
6492 |
checkpoint40pre4 |
checkpoint40pre4 (2001/07/30) |
6493 |
o added re-initialisations of utrans,vtrans,rtrans in |
o added re-initialisations of utrans,vtrans,rtrans in |
6494 |
calc_common_factors which are crucial for TAF. |
calc_common_factors which are crucial for TAF. |
6495 |
o extended iMin,jMin range for calc_common_factors, |
o extended iMin,jMin range for calc_common_factors, |
6497 |
o added option ALLOW_PASSIVE_TRACER |
o added option ALLOW_PASSIVE_TRACER |
6498 |
o a few minor updates and fixes |
o a few minor updates and fixes |
6499 |
|
|
6500 |
checkpoint40pre3 |
checkpoint40pre3 (2001/07/13) |
6501 |
o created calc_gtr1.F for gad package |
o created calc_gtr1.F for gad package |
6502 |
o split the_main_loop and re-introduced forward_step |
o split the_main_loop and re-introduced forward_step |
6503 |
o some recomputations of nIter0 for TAMC |
o some recomputations of nIter0 for TAMC |
6504 |
|
|
6505 |
checkpoint40pre2 |
checkpoint40pre2 (2001/07/13) |
6506 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
6507 |
o Added gradient check package |
o Added gradient check package |
6508 |
o Added routines for passive tracer handling |
o Added routines for passive tracer handling |
6509 |
o Added carbon sequestration sensitivity experiment |
o Added carbon sequestration sensitivity experiment |
6510 |
|
|
6511 |
checkpoint39 |
checkpoint39 (2001/05/14) |
6512 |
o Modifications and fixes to support TAMC |
o Modifications and fixes to support TAMC |
6513 |
(mainly missing or wrong directives) |
(mainly missing or wrong directives) |
6514 |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
6522 |
(NB: this is not the full ECCO environment) |
(NB: this is not the full ECCO environment) |
6523 |
o disabled some packages by default in genmake |
o disabled some packages by default in genmake |
6524 |
|
|
6525 |
checkpoint38 |
checkpoint38 (2001/04/10) |
6526 |
o see notes_c37_adj.txt |
o see notes_c37_adj.txt |
6527 |
o corrected wrong layer index in external_forcing_t |
o corrected wrong layer index in external_forcing_t |
6528 |
o replaced the_main_loop/forward_step by the_main_loop |
o replaced the_main_loop/forward_step by the_main_loop |
6530 |
(replaced criteria for initial/final state) |
(replaced criteria for initial/final state) |
6531 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
6532 |
|
|
6533 |
checkpoint37 |
checkpoint37 (2001/03/13) |
6534 |
o mdsio.F routine split and packaged in pkg/mdsio |
o mdsio.F routine split and packaged in pkg/mdsio |
6535 |
(mdsio.F and mdsio_gl.F still exist in eesupp/src but are not |
(mdsio.F and mdsio_gl.F still exist in eesupp/src but are not |
6536 |
used unless genmake -disable=mdsio) |
used unless genmake -disable=mdsio) |
6547 |
o Non-Hydrostatic pickup file Pb fixed. |
o Non-Hydrostatic pickup file Pb fixed. |
6548 |
o bug with Rigid-lid version (since c35) fixed. |
o bug with Rigid-lid version (since c35) fixed. |
6549 |
|
|
6550 |
checkpoint36 |
checkpoint36 (2001/02/20) |
6551 |
o implement Crank-Nickelson barotropic time-stepping |
o implement Crank-Nickelson barotropic time-stepping |
6552 |
o recover Time-Average diagnostics |
o recover Time-Average diagnostics |
6553 |
o fix Pb in checkpoint (PR#19) |
o fix Pb in checkpoint (PR#19) |
6554 |
o AIM become a standard package ; clean unused CPP_kees |
o AIM become a standard package ; clean unused CPP_kees |
6555 |
|
|
6556 |
checkpoint35 |
checkpoint35 (2001/02/08) |
6557 |
o subtantial rewrite of dynamics.f |
o subtantial rewrite of dynamics.f |
6558 |
o allows staggered time-stepping |
o allows staggered time-stepping |
6559 |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
6560 |
o added bottom drag (linear + quadratic) |
o added bottom drag (linear + quadratic) |
6561 |
|
|
6562 |
checkpoint34 |
checkpoint34 (2001/01/30) |
6563 |
o Modified exchange routines for correct reverse simulation. |
o Modified exchange routines for correct reverse simulation. |
6564 |
o Added verification output to comply with bug fix in impldiff.F |
o Added verification output to comply with bug fix in impldiff.F |
6565 |
as of c33 (exp2, natl_box). |
as of c33 (exp2, natl_box). |
6570 |
o Added routine GLOBAL_SUM_INT to global_sum.F |
o Added routine GLOBAL_SUM_INT to global_sum.F |
6571 |
o Added mdsio_gl.F for ECCO purposes. |
o Added mdsio_gl.F for ECCO purposes. |
6572 |
|
|
6573 |
checkpoint33 |
checkpoint33 (2000/11/30) |
6574 |
o Fixed bug in lower BC in impldiff.F |
o Fixed bug in lower BC in impldiff.F |
6575 |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
6576 |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
6588 |
possibly use them. |
possibly use them. |
6589 |
o Corrected genmake to delete a temporary file during configuration |
o Corrected genmake to delete a temporary file during configuration |
6590 |
|
|
6591 |
checkpoint32 |
checkpoint32 (2000/11/13) |
6592 |
o Scaling of forcing fields moved from external_forcing.F to |
o Scaling of forcing fields moved from external_forcing.F to |
6593 |
external_fields_scale.F, called directly after loading fields. |
external_fields_scale.F, called directly after loading fields. |
6594 |
o Surface relaxation terms added to surface tendency fields in |
o Surface relaxation terms added to surface tendency fields in |
6599 |
o Modifications and bug fixes in KPP package. |
o Modifications and bug fixes in KPP package. |
6600 |
o Verification experiment for KPP added (verification/nat_box/) |
o Verification experiment for KPP added (verification/nat_box/) |
6601 |
|
|
6602 |
checkpoint31 |
checkpoint31 (2000/09/11) |
6603 |
o Packages interface brought in line with defined standard |
o Packages interface brought in line with defined standard |
6604 |
-> new routines packages_...F |
-> new routines packages_...F |
6605 |
-> changes in initialise_fixed.F, initialise_varia.F |
-> changes in initialise_fixed.F, initialise_varia.F |
6616 |
- not yet tested for GMRedi. |
- not yet tested for GMRedi. |
6617 |
- not yet tested for KPP. |
- not yet tested for KPP. |
6618 |
|
|
6619 |
checkpoint30 |
checkpoint30 (2000/07/13) |
6620 |
o Updates for OBCs |
o Updates for OBCs |
6621 |
o New experiment for test OBCs (internal_wave) |
o New experiment for test OBCs (internal_wave) |
6622 |
o New output.txt in verification/exp4/results/ |
o New output.txt in verification/exp4/results/ |
6625 |
o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.) |
o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.) |
6626 |
and entry for T90 in genmake |
and entry for T90 in genmake |
6627 |
|
|
6628 |
checkpoint29 |
checkpoint29 (2000/06/21) |
6629 |
o packaged KPP and GM/Redi |
o packaged KPP and GM/Redi |
6630 |
|
|
6631 |
checkpoint28 |
checkpoint28 (2000/06/09) |
6632 |
o Corrected initialization of hFacMin for difference vertical coordinates |
o Corrected initialization of hFacMin for difference vertical coordinates |
6633 |
o Modified calculation of partial cell thickness to more robust algorithm |
o Modified calculation of partial cell thickness to more robust algorithm |
6634 |
o config_summary.F: replaced write_1D_... by write_0D_... |
o config_summary.F: replaced write_1D_... by write_0D_... |
6641 |
included store directives and tape key computations required for TAMC. |
included store directives and tape key computations required for TAMC. |
6642 |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
6643 |
|
|
6644 |
checkpoint27 |
checkpoint27 (2000/04/10) |
6645 |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
6646 |
formulation works properly with variable resolution. |
formulation works properly with variable resolution. |
6647 |
o restructured the calling tree between the_model_main() and dynamics() |
o restructured the calling tree between the_model_main() and dynamics() |
6649 |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
6650 |
in new routine ini_psurf() |
in new routine ini_psurf() |
6651 |
|
|
6652 |
checkpoint26 |
checkpoint26 (2000/04/05) |
6653 |
o moved some #ifdef in optional routines to encompass everything |
o moved some #ifdef in optional routines to encompass everything |
6654 |
except the argument declarations. This was using up some memory. |
except the argument declarations. This was using up some memory. |
6655 |
o fixed macros like _ADT to work with both versions of Linux cpp |
o fixed macros like _ADT to work with both versions of Linux cpp |
6659 |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
6660 |
o patch for 2 processor JAM mode |
o patch for 2 processor JAM mode |
6661 |
|
|
6662 |
checkpoint25 |
checkpoint25 (2000/03/15) |
6663 |
o updates for OBCs and NH |
o updates for OBCs and NH |
6664 |
o dramatically reduced memory usage |
o dramatically reduced memory usage |
6665 |
o added "JAM" routines for use on Artic network |
o added "JAM" routines for use on Artic network |
6670 |
an explicit free-surface option) |
an explicit free-surface option) |
6671 |
o initial state input files for U and V |
o initial state input files for U and V |
6672 |
|
|
6673 |
checkpoint24 |
checkpoint24 (1999/08/02) |
6674 |
o Removed some spurious "REAL"s |
o Removed some spurious "REAL"s |
6675 |
o Updated KPP to latest version from JPL |
o Updated KPP to latest version from JPL |
6676 |
o Added a COS(latitude) in horizontal viscosity |
o Added a COS(latitude) in horizontal viscosity |
6677 |
|
|
6678 |
checkpoint23 |
checkpoint23 (1999/05/26) |
6679 |
o Added del^4 diffusion for salt and temperature |
o Added del^4 diffusion for salt and temperature |
6680 |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
6681 |
|
|
6682 |
checkpoint22 |
checkpoint22 (1999/05/18) |
6683 |
o Made many small changes: implicit none, format(i5), etc... |
o Made many small changes: implicit none, format(i5), etc... |
6684 |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
6685 |
|
|
6686 |
checkpoint21 |
checkpoint21 (1999/05/18) |
6687 |
o Introduced new I/O package that supports direct-access records (mdsio.F) |
o Introduced new I/O package that supports direct-access records (mdsio.F) |
6688 |
o Split-up mid-level I/O routines |
o Split-up mid-level I/O routines |
6689 |
o Updated input data for experiments 0,1,2,4 and 5 |
o Updated input data for experiments 0,1,2,4 and 5 |
6690 |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
6691 |
|
|
6692 |
checkpoint20 |
checkpoint20 (1999/03/22) |
6693 |
o Tidied up open-boundaries some more |
o Tidied up open-boundaries some more |
6694 |
o Added non-hydrostatic code |
o Added non-hydrostatic code |
6695 |
o Fixed some input data |
o Fixed some input data |
6696 |
o Modified MPI start-up to work in "coupled" context. |
o Modified MPI start-up to work in "coupled" context. |
6697 |
|
|
6698 |
checkpoint19 |
checkpoint19 (1998/12/15) |
6699 |
o Tidied up directory structure for verification experiments. |
o Tidied up directory structure for verification experiments. |
6700 |
o Added new code for open boundaries. |
o Added new code for open boundaries. |
6701 |
o Corrected advective terms near boundaries. |
o Corrected advective terms near boundaries. |
6703 |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
6704 |
o Split default parameters out of ini_parms.F into set_defaults.F. |
o Split default parameters out of ini_parms.F into set_defaults.F. |
6705 |
|
|
6706 |
checkpoint18 |
checkpoint18 (1998/11/30) |
6707 |
o Further changes for optional code generation with |
o Further changes for optional code generation with |
6708 |
CPP - ugh! |
CPP - ugh! |
6709 |
|
|
6710 |
checkpoint17 |
checkpoint17 (1998/11/03) |
6711 |
o Beginning to incorporating modularity |
o Beginning to incorporating modularity |
6712 |
for supporting atmos. and ocean configs. |
for supporting atmos. and ocean configs. |
6713 |
o Small changes for TAMC complinace |
o Small changes for TAMC complinace |
6714 |
o New ultra simple test case. Barotropic box |
o New ultra simple test case. Barotropic box |
6715 |
configuration "exp0". |
configuration "exp0". |
6716 |
|
|
6717 |
checkpoint16 |
checkpoint16 (1998/10/28) |
6718 |
o Minor changes to exchange routines to support |
o Minor changes to exchange routines to support |
6719 |
accumulation in reverse mode. Adjoint of an |
accumulation in reverse mode. Adjoint of an |
6720 |
assignment is an addition. |
assignment is an addition. |
6722 |
syntax) and by g77 under Linux ( 72 character |
syntax) and by g77 under Linux ( 72 character |
6723 |
limit ). |
limit ). |
6724 |
|
|
6725 |
checkpoint15 |
checkpoint15 (1998/09/29) |
6726 |
Rewrote exchange routines to allow |
Rewrote exchange routines to allow |
6727 |
o General tile <-> tile connectivity. |
o General tile <-> tile connectivity. |
6728 |
o TAMC reverse mode flag ( is this really needed? ) |
o TAMC reverse mode flag ( is this really needed? ) |
6731 |
shmput/shmget, VIA, SYSV shmem and every other cool |
shmput/shmget, VIA, SYSV shmem and every other cool |
6732 |
communication method. |
communication method. |
6733 |
|
|
6734 |
checkpoint14 |
checkpoint14 (1998/09/09) |
6735 |
Consistent isomorphism chages made. These allow dynamical core |
Consistent isomorphism chages made. These allow dynamical core |
6736 |
to support both pressure and meters as a vertical coordinate. |
to support both pressure and meters as a vertical coordinate. |
6737 |
|
|
6738 |
checkpoint13 |
checkpoint13 (1998/07/17) |
6739 |
Release which corrects global_max problem and a couple |
Release which corrects global_max problem and a couple |
6740 |
of KGM time-averaging diagnostic errors. Also contains |
of KGM time-averaging diagnostic errors. Also contains |
6741 |
a double-gyre experiment setup as well as the baseline |
a double-gyre experiment setup as well as the baseline |
6750 |
I don't want to commit the rDot to the main-trunk until |
I don't want to commit the rDot to the main-trunk until |
6751 |
we've actually tested it... |
we've actually tested it... |
6752 |
|
|
6753 |
checkpoint12 |
checkpoint12 (1998/07/08) |
6754 |
Tidy up and added generic genmake script (formerly |
Tidy up and added generic genmake script (formerly |
6755 |
configure script). |
configure script). |
6756 |
Released to testers. |
Released to testers. |
6757 |
|
|
6758 |
checkpoint11 |
checkpoint11 (1998/07/02) |
6759 |
Re-arranged initialise() and introduced ini_vertical_grid() |
Re-arranged initialise() and introduced ini_vertical_grid() |
6760 |
and ini_masks_etc(). |
and ini_masks_etc(). |
6761 |
|
|
6762 |
checkpoint10 |
checkpoint10 (1998/07/01) |
6763 |
Introduced the configure script. |
Introduced the configure script. |
6764 |
Separated out the diags package. |
Separated out the diags package. |
6765 |
Added template for writing time-averages of tile/intermediate quantities. |
Added template for writing time-averages of tile/intermediate quantities. |
6766 |
Updated SIZE.h in exp2 and made the data big-endian. |
Updated SIZE.h in exp2 and made the data big-endian. |
6767 |
|
|
6768 |
checkpoint9 |
checkpoint9 (1998/06/22) |
6769 |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
6770 |
General tidy-up. |
General tidy-up. |
6771 |
SST.bin SSS.bin added to verification/exp2 |
SST.bin SSS.bin added to verification/exp2 |
6772 |
|
|
6773 |
checkpoint8 |
checkpoint8 (1998/06/22) |
6774 |
Inludes time-dependant forcing and time-averaging. |
Inludes time-dependant forcing and time-averaging. |
6775 |
Works at 4x4 and 2.8125x2.8125 global |
Works at 4x4 and 2.8125x2.8125 global |
6776 |
|
|
6780 |
model etc.. |
model etc.. |
6781 |
Configured for verification/exp2 - 4 degree global, two process. |
Configured for verification/exp2 - 4 degree global, two process. |
6782 |
|
|
6783 |
checkpoint7 |
checkpoint7 (1998/06/15) |
6784 |
Created by cnh |
Created by cnh |
6785 |
Simple 4 degree global simulation |
Simple 4 degree global simulation |
6786 |
configuration. |
configuration. |
6788 |
hydrography, bathymetry etc |
hydrography, bathymetry etc |
6789 |
Does not include Heat Flux and E-P |
Does not include Heat Flux and E-P |
6790 |
|
|
6791 |
checkpoint6 |
checkpoint6 (1998/06/08) |
6792 |
Created by cnh |
Created by cnh |
6793 |
merged checkpoint5 with CD and |
merged checkpoint5 with CD and |
6794 |
spherical polar code. |
spherical polar code. |
6795 |
Still some problems with GM Redi |
Still some problems with GM Redi |
6796 |
abd full topography. |
abd full topography. |
6797 |
|
|
6798 |
checkpoint5 |
checkpoint5 (1998/06/08) |
6799 |
Created by AJA |
Created by AJA |
6800 |
contains updates to GM Redi |
contains updates to GM Redi |
6801 |
and reordered timestepping loop |
and reordered timestepping loop |
6802 |
for Implicit Diffusion. |
for Implicit Diffusion. |
6803 |
|
|
6804 |
checkpoint4 |
checkpoint4 (1998/05/30) |
6805 |
Created by cnh |
Created by cnh |
6806 |
Contains memory saving macros ( _rdxc etc..) for when |
Contains memory saving macros ( _rdxc etc..) for when |
6807 |
grid variations are limited. |
grid variations are limited. |
6808 |
Contains polynomial coeffs for EOS and knudsen program |
Contains polynomial coeffs for EOS and knudsen program |
6809 |
for generation. |
for generation. |
6810 |
|
|
6811 |
checkpoint3 |
checkpoint3 (1998/05/26) |
6812 |
Created by cnh |
Created by cnh |
6813 |
Added extra flags for runtime options |
Added extra flags for runtime options |
6814 |
Added this file |
Added this file |