4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/obcs (with exch2): |
8 |
|
- derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F) |
9 |
|
and remove code (in obcs_readparms.F) which was based on EXCH of indices |
10 |
|
(through buffer) and did not account for exch2 (e.g., CS-grid) topology. |
11 |
|
o pkg/exf and seaice exp: |
12 |
|
- change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0) |
13 |
|
so that switching off area & heff advection flags does not affect results. |
14 |
|
- change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h |
15 |
|
- keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef |
16 |
|
EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update |
17 |
|
results of verification experiments: 1D_ocean_ice_column(fwd), |
18 |
|
global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8) |
19 |
|
and offline_exf_seaice (all 4). |
20 |
|
o pkg/seaice: |
21 |
|
- remove array YNEG, RIVER, TMIX (replaced by local var) from common block; |
22 |
|
remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef. |
23 |
|
- fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY) |
24 |
|
but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and |
25 |
|
not multi-dim advection; |
26 |
|
- fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and |
27 |
|
SHORTWAVE_HEATING #undef. |
28 |
|
o optim: make Makefile more robust (?) |
29 |
|
o pkg/obcs: |
30 |
|
* fix treatment of obcs_read_pickup for TAF |
31 |
|
o pkg/shelfice: |
32 |
|
* add missing initialisation of num_shifwflx |
33 |
|
* new adjoint verification exp. for isomip |
34 |
|
* change Prandtl and Schmidt numbers from generic formulations |
35 |
|
(in terms of model diffus. and visc.) to separate runtime |
36 |
|
parameters, with Holland and Jenkins (1999) default values. |
37 |
|
o pkg/exf (interpolation): |
38 |
|
- extended input field (2 rows) near the N & S poles: |
39 |
|
* fill in with the symetric value (when even Nb of data in longitude) |
40 |
|
* add average value at the poles only for scalar quantities ; for vector |
41 |
|
component interpolation, skip the averaging and keep duplicated values, |
42 |
|
unless the 2 components have same location (uvInterp=T) in which case |
43 |
|
interpolate the 2 components together using S/R EXF_INTERP_UV. |
44 |
|
- new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field |
45 |
|
together: this allows to account properly for local orientation when |
46 |
|
averaging at N & S pole. |
47 |
|
- add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding |
48 |
|
exf-interpolation near N & S poles. Undef by default. |
49 |
|
- add debug check/print on 1rst iter if debugLevel >=2. |
50 |
|
o pkg/exf: |
51 |
|
- change masking flags definition (no longer "parameter"), put them in |
52 |
|
common block and set them in S/R EXF_INIT_FIXED. |
53 |
|
- change recognized masking flag from s,u,v to c,w,s since the mask |
54 |
|
to use (maskC,W,S) depends on position on model grid and has little to |
55 |
|
do with scalar/vector difference; fix masking if using P-coordinates. |
56 |
|
- fix masking of wind-stress (was wrong if interpolated or read on A-grid) |
57 |
|
and update results of exp. global_with_exf (x2). |
58 |
|
- fix setting of zenith-angle table when SHORTWAVE_HEATING is undef. |
59 |
|
o pkg/obcs |
60 |
|
- S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate) |
61 |
|
o pkg/exf (interpolation): |
62 |
|
- assume periodicity in X only if input field cover full longitude range. |
63 |
|
- improve search for lat. index (supposed to be faster, in ~log2(ny) steps, |
64 |
|
and should vectorise). |
65 |
|
- fix input lat of the 2 added row (in case we provide N.pole data). |
66 |
|
|
67 |
|
checkpoint63h (2011/12/30) |
68 |
|
o pkg/seaice: |
69 |
|
- change declaration of UVM from _RL to _RS in order to get B-grid |
70 |
|
uIce,vIce monitor when _RS = real*4 |
71 |
|
o pkg/offline: |
72 |
|
- new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags); |
73 |
|
- compute vertical velocity if not read from file (switch on exactConserv |
74 |
|
& staggerTimeStep); |
75 |
|
- fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq. |
76 |
|
o verification: |
77 |
|
- update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input) |
78 |
|
with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m": |
79 |
|
fix Pb in yG definition @ 2 missing corners (previously yG was averaged); |
80 |
|
- update output of exp. global_ocean.cs32x15.viscA4 after changing |
81 |
|
grid-file angles (used here for coriolis-3d); |
82 |
|
- remove (or gzip) few files not needed to run fizhi-cs experiments. |
83 |
|
o pkg/exf (vector interpolation): |
84 |
|
- rotate vector component toward local grid-axis orientation using grid-angles |
85 |
|
(stored in GRID.h) instead of locally computed rotation angle; keep old code |
86 |
|
available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default). |
87 |
|
o pkg/seaice: |
88 |
|
- allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION |
89 |
|
undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined. |
90 |
|
o pkg/PKG_OPTIONS.h files: |
91 |
|
- move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h", |
92 |
|
outside of the #ifdef ALLOW_THISPKG / #endif block. |
93 |
|
- update verification/*/code/PKG_OPTIONS.h files. |
94 |
|
o add a verification experiment (offline_exf_seaice/input.seaice) that test |
95 |
|
the B-grid LSOR solver |
96 |
|
o pkg/seaice: sort out emissivity and long wave radiation step 2: |
97 |
|
- add emissivity for snow and ice as new run-time parameters |
98 |
|
(unfortunately) that default to the corresponding exf values; this |
99 |
|
changes results in most verification experiments so that for backward |
100 |
|
compatibility these parameter have to be set explicitly to inconsistent |
101 |
|
values (ugly); |
102 |
|
- the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired |
103 |
|
emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp |
104 |
|
until we agree how to handle this bug properly |
105 |
|
o pkg/exf (interpolation): |
106 |
|
- add a set of run-time param ({inputfield}_interpMethod), one for |
107 |
|
each interpolated input field, to select the interpolation method |
108 |
|
with a value of zero switching off the interpolation; |
109 |
|
- print interpolation parameters to standard output; |
110 |
|
- refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined |
111 |
|
(to use instead runoff_interpMethod=0 in data.exf). |
112 |
|
- simplify default setting of interpolation parameters (for all fields, |
113 |
|
set position to match model grid cell-center position, leading to trivial |
114 |
|
interpolation in case of regular Lat-Lon grid) and fix for the case of |
115 |
|
non-uniform delY. |
116 |
|
o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for |
117 |
|
within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1. |
118 |
|
this factor is absolutely required, because the lw exitance (= out-going |
119 |
|
long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown, |
120 |
|
where the reflectivity rho = 1-emissivity for conservation reasons. Once |
121 |
|
this is established, we can remove the CPP-Flag (if we want to). |
122 |
|
o pkg/seaice: |
123 |
|
- qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and |
124 |
|
ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined |
125 |
|
- sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity |
126 |
|
what the name implies (and not emissivity*BoltzmannConstant), this means |
127 |
|
the old default value of 5.5e-8 now means |
128 |
|
5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in |
129 |
|
S/R exf_readparms |
130 |
|
- FV-discretization of the B-grid LSOR solver, turn on with |
131 |
|
SEAICE_LSRBNEW. This new solver also involves a slight re-organization |
132 |
|
of the calling routine dynsolver, so that B and C-grid code look a |
133 |
|
little more alike. |
134 |
|
- fix index bugs in ostres.F (B-grid code) |
135 |
|
o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better |
136 |
|
o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the |
137 |
|
default for SEAICE_emissivity, if useEXF; requires setting a wrong |
138 |
|
parameter value in global_ocean.cs32x15/input.seaice/data.seaice for |
139 |
|
backward compatiblity |
140 |
|
o model/src: use sigmaR in calc_ivdc |
141 |
|
|
142 |
|
checkpoint63g (2011/12/16) |
143 |
|
o pkg/seaice/seaice_growth.F: |
144 |
|
fix heat conservation of the coupled ocean-seaice system. |
145 |
|
when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of |
146 |
|
solid vs liquid water treatment is resolved via QNET. |
147 |
|
o pkg/seaice/seaice_growth.F: |
148 |
|
add missing term for sublimation in saltFlux, which was breaking conservation. |
149 |
|
o pkg/seaice/seaice_model.F: |
150 |
|
Remove this patholigical case treatment in evolution branch, |
151 |
|
where it is un-necessary and breaks conservation. |
152 |
|
Update global_ocean.cs32x15/results accordingly for |
153 |
|
output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt |
154 |
|
o model/src: |
155 |
|
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in |
156 |
|
external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE. |
157 |
|
o pkg/obcs: |
158 |
|
modify Stevens boundary conditions so that S/R obcs_calc_stevens computes |
159 |
|
tendency for temperature and salinity that is then applied to update |
160 |
|
theta and salt in S/R obcs_apply_ts; this requires proper masking of all |
161 |
|
horizontal advection and diffusion contributions on the boundary (in |
162 |
|
S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and |
163 |
|
removing the mask in S/R timestep_tracer. The advantage of this approach is |
164 |
|
that the updated tracer values include contributions from the surface |
165 |
|
forcing and vertical diffusion. |
166 |
|
This modification changes exp4.stevens because of vertical diffusion. |
167 |
|
o model/src: |
168 |
|
change non-curvilinear grid setting to also work with exch2 + blank tiles: |
169 |
|
- move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst |
170 |
|
face dimensions. |
171 |
|
- new S/R INI_LOCAL_GRID to define model tile-local grid (using same units |
172 |
|
as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID |
173 |
|
and INI_SPHERICAL_POLAR_GRID. |
174 |
|
change test-experiment global_ocean.90x40x15: |
175 |
|
- split the domain in many more tiles (9x4 tiles of 10x10 each); |
176 |
|
- switch to exch2 and remove 1 blank-tile (but only for MPI test). |
177 |
|
- update results of both test (std & dwnslp). |
178 |
|
o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in |
179 |
|
tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation |
180 |
|
o model/src: |
181 |
|
- take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS |
182 |
|
and fix initialisation when using sigma-coords. |
183 |
|
o model/src: |
184 |
|
- improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc. |
185 |
|
to their current value at the beginning of forward_step.F": add a new run-time |
186 |
|
switch "doResetHFactors" (default=false) and use it to do (or not) the resetting. |
187 |
|
- set doResetHFactors=T in the following test exp: |
188 |
|
global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS), |
189 |
|
global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS) |
190 |
|
and tutorial_global_oce_in_p (nonLinFS in p) |
191 |
|
o pkg/ecco |
192 |
|
- added IES cost term |
193 |
|
o verification/advect_xz |
194 |
|
- scale down the depth by 1/100 (from 200 km to just 2.km) |
195 |
|
- add secondary test using divergent flow, r-star and implicit vertical advection. |
196 |
|
- add note (check_conserve_TS.txt) and matlab script to check global |
197 |
|
conservation of T & S with NonLin-FreeSurf and Adams-Bashforth. |
198 |
|
o pkg/rbcs: |
199 |
|
- add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F). |
200 |
|
o pkg/obcs (Stevens BCs): |
201 |
|
- fix various problems in the phase speed computations of the Stevens |
202 |
|
boundary conditions: |
203 |
|
- sign error for western and southern boundaries, |
204 |
|
- time tendencies were underestimated by factor of dTracerLev and some just |
205 |
|
zero (for multidim advection schemes) -> now estimate time tendencies |
206 |
|
from difference between previous (n) time level and the one before (n-1); |
207 |
|
this requires storing a field per tracer per boundary, also in the pickup |
208 |
|
files. |
209 |
|
- replace deltaTmom in cflMer/Zon computation with dTracerLev |
210 |
|
- set default phase velocity to cflMer/Zon |
211 |
|
- update verification experiment exp4.stevens |
212 |
|
o pkg/generic_advdiff (implicit_r): |
213 |
|
- fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf |
214 |
|
(remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F); |
215 |
|
- fix implicit vertical diffusion or advection with NonLin FreeSurf |
216 |
|
(was using current recip_hFacC instead of future recip_hFacC): set future |
217 |
|
recip_hFac in thermodynamics.F and pass & use it in all vertical implicit |
218 |
|
solver S/R ; |
219 |
|
- fill diagnostics of vertical advective fluxes (computed from tendency) |
220 |
|
when using implicit vert. advection; |
221 |
|
- update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion: |
222 |
|
global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD), |
223 |
|
tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD) |
224 |
|
and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5. |
225 |
|
o pkg/diagnostics: |
226 |
|
- add diags for T & S tendency which goes through Adams-Bashforth. |
227 |
|
|
228 |
|
checkpoint63f (2011/11/30) |
229 |
|
o pkg/obcs/obcs_calc_stevens.F: |
230 |
|
- join some loops to reduce number of if-statements |
231 |
|
- fix a bug in code for northern and southern boundaries. |
232 |
|
o pkg/seaice/seaice_init_varia.F |
233 |
|
- undo resetting UVM=0 that has slipped in unnoticed in r1.49 and |
234 |
|
caused zero ice-velocities for the B-grid code |
235 |
|
o pkg/seaice/seaice_init_fixed.F |
236 |
|
- fix a bug in the initialisation of the second metric terms |
237 |
|
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0. |
238 |
|
- this affects all seaice configurations with useCurviLinearGrid = .true. |
239 |
|
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms |
240 |
|
= .true. (default) |
241 |
|
- the only verification experiment affected is global_ocean.cs32x15: |
242 |
|
icedyn, seaice, and seaice_dynmix (AD) |
243 |
|
o pkg/thsice/thsice_diagnostics_state.F |
244 |
|
- only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does |
245 |
|
not contain garbage that can lead to surprises in diagstats_calc.F |
246 |
|
o model/src: |
247 |
|
- move bi,bj loops inside INTEGR_CONTINUITY ; |
248 |
|
- call INTEGR_CONTINUITY directly from forward_step.F |
249 |
|
(previously called from momentum_correction_step.F) |
250 |
|
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F, |
251 |
|
forward_step.F and pkg/ecco/the_main_loop.F |
252 |
|
o model/src/do_oceanic_phys.F: |
253 |
|
- reset addMass to zero only if useICEFRONT ; |
254 |
|
- separated k-loop for rhoInSitu calculation ; |
255 |
|
- add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P) |
256 |
|
and at constant T,S (= WdRHOdP); |
257 |
|
NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport |
258 |
|
of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical |
259 |
|
transport of locally-referenced potential density); |
260 |
|
to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP) |
261 |
|
o gluemnc: |
262 |
|
- replace ncrcat with ncks when adding variables to *.glob.nc |
263 |
|
- change the way variables without record dimensions are handled so that |
264 |
|
files that have variables with and without record variables can be glued: |
265 |
|
add a record dimension with a new unique name to be able to differentiate |
266 |
|
between variable with and without a-prior record dimensions. Remove |
267 |
|
this record dimension before adding the variable to the *.glob.nc file. |
268 |
|
This procedure automatically works also for grid.*.nc files that do not |
269 |
|
have any record dimension. |
270 |
|
o verification/cpl_aim+ocn: |
271 |
|
- generate new reference output on baudelaire (gfortran, mpich2) (previously |
272 |
|
from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script. |
273 |
|
o pkg/obcs/obcs_calc_stevens.F: |
274 |
|
- add code for northern and southern boundaries. |
275 |
|
- reorder some loops to save some operations and so that drFBar can be scalar |
276 |
|
o model/src: |
277 |
|
- re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine |
278 |
|
truncation) and add diagnostics for Adams-Bashforth tendency increment. |
279 |
|
- update test-exp. AD output: |
280 |
|
1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl; |
281 |
|
and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20, |
282 |
|
front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5), |
283 |
|
global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4), |
284 |
|
matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre, |
285 |
|
tutorial_global_oce_in_p, tutorial_global_oce_latlon and |
286 |
|
tutorial_plume_on_slope. |
287 |
|
o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX |
288 |
|
that vectorises. This code uses 3 extra 2D fields, F90 array assignments |
289 |
|
and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX |
290 |
|
does not even come with an F77 compiler anymore, this should not be |
291 |
|
a limitation |
292 |
|
|
293 |
|
checkpoint63e (2011/11/06) |
294 |
|
o pkg/seaice adjoint of LSR: |
295 |
|
- substantially rework STORE dirs. |
296 |
|
- add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED |
297 |
|
this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields |
298 |
|
and only perform SOLV_MAX_FIXED adjoint iters. |
299 |
|
If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration |
300 |
|
always goes to same record, meaning that the last forward field will be |
301 |
|
the one used in the adjoint - an approximation. |
302 |
|
- now produces non-zero LSR-related gradients, and acceptable gradients for |
303 |
|
An's zonal (x-z) test case (to be checked in) |
304 |
|
- lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR |
305 |
|
(but these are screwed up by the thermodynamics in the first place); |
306 |
|
reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution; |
307 |
|
output_adm.txt also reflects changes to seaice_lsr |
308 |
|
- global_ocean.cs32x15: |
309 |
|
* the "default" input_ad.seaice has been re-defined to always exclude dynamics |
310 |
|
(output_adm.seaice.txt was updated) |
311 |
|
* new input_ad.seaice_dynmix tests a forward LSR / backward free-drift |
312 |
|
(output_adm.seaice_dynmix.txt) |
313 |
|
o test-exp. exp4+stevens: |
314 |
|
- switch off pTracers and nonHydrostatic (restart problems with NH); update output |
315 |
|
o pkg/seaice (lsr solver): |
316 |
|
- put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only); |
317 |
|
update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15 |
318 |
|
- fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD) |
319 |
|
- new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution |
320 |
|
into initial guess for linearised solver; use weight ~ (1/err)^2,4. |
321 |
|
- compute (with new S/R) and print initial (+ free-driff sol. if available) |
322 |
|
and final residual of linearised system. |
323 |
|
o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity |
324 |
|
(requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F) |
325 |
|
o pkg/obcs: Stevens BCs (still only for east and west) |
326 |
|
- fix Stevens BCs by using intermediate velocities of previous |
327 |
|
time step as "baroclinic" contribution rather velocity of one grid cell |
328 |
|
inside the boundaries; more consistent but makes the entire treatment |
329 |
|
more complicated, requires new pickup files and two new S/Rs: |
330 |
|
obcs_copy_uv_n and obcs_save_uv_n |
331 |
|
keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY |
332 |
|
(undefined by default) |
333 |
|
- silently move computation of some grid factors into separate loops to |
334 |
|
save some recomputations |
335 |
|
- add a hack for non-linear free surface |
336 |
|
- add a verification experiment to exp4 that tests this code |
337 |
|
o make gluemnc/xplodemnc work with (moron) non-GNU shell tools |
338 |
|
|
339 |
|
checkpoint63d (2011/10/25) |
340 |
|
o pkg/obcs + seaice-dynamics: |
341 |
|
- new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before |
342 |
|
solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB |
343 |
|
values (consistent with an implicit method). |
344 |
|
- add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to |
345 |
|
return to older implementation (same results as before); note that none of |
346 |
|
the "experimental" OBCS_SEAICE options are implemented in the new version. |
347 |
|
- switch test exp. seaice_obcs to use new version (update output). |
348 |
|
o pkg/seaice: |
349 |
|
- add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS) |
350 |
|
- add parenthesis in Water-Ice drag calculations (evp & lsr); |
351 |
|
- in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1; |
352 |
|
and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice) |
353 |
|
- update output of test exp lab_sea that uses evp or lsr (fwd+ad) |
354 |
|
and global_ocean.cs32x15 (icedyn & seaice fwd+ad). |
355 |
|
o pkg/layers: |
356 |
|
- Include potential density as new coordinate (Thanks to David Munday) |
357 |
|
o pkg/dic: |
358 |
|
- Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add |
359 |
|
carbonate computation/output to CALC_PCO2_APPROX |
360 |
|
o pkg/generic_advdiff |
361 |
|
- make TAF generate code that vectorizes: |
362 |
|
gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F |
363 |
|
o model/src: |
364 |
|
- improve vectorization also for adjoint code of |
365 |
|
solve_tridiagonal and solve_pentadiagonal. As this requires up to |
366 |
|
5 new 3D-fields, this code is only turned on for the combination of |
367 |
|
ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message |
368 |
|
for singular matrix check (only for TARGET_NEC_SX). |
369 |
|
- remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to |
370 |
|
ALLOW_AUTODIFF. This flag now needs to be set outside of |
371 |
|
solve_tri/pentadiagonal.F |
372 |
|
o pkg/exf: |
373 |
|
- fix previous modif in exf_readparms.F (revision 1.66: treatment of |
374 |
|
optional namelist EXF_NML_OBCS). |
375 |
|
- add many debug-print (to trace down where pkg/cal error msg comes from) |
376 |
|
o pkg/mom_vecinv/mom_vi_hdissip.F |
377 |
|
- rearrange loops so that vectorization is improved and in particular |
378 |
|
the adjoint routine vectorizes. The code is a little longer now, but I |
379 |
|
think easier to read. |
380 |
|
Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested. |
381 |
|
o pkg/seaice: |
382 |
|
- allow to specify initial seaice velocity from files (uIceFile,vIceFile) |
383 |
|
o pkg/exch2: |
384 |
|
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
385 |
|
used as default; keep using matrix version in adjustment.cs-32x32x1. |
386 |
|
o tools/build_options: |
387 |
|
- after merging some MPI and/or multi-threads specific optfiles so that |
388 |
|
the modified default optfile support both built (using genmake2 -mpi |
389 |
|
for the MPI built, using genmake2 -omp for OpenMP built), |
390 |
|
move now obsolete optfiles to tools/build_options/unsupported/ |
391 |
|
(add copy of email sent to support list in doc/optfiles_changes.txt) |
392 |
|
|
393 |
|
checkpoint63c (2011/09/28) |
394 |
|
o pkg/ebm: |
395 |
|
- fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of |
396 |
|
test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d) |
397 |
|
o pkg/seaice (SItracer pickup) |
398 |
|
* Simple code for pickup of SItracer fields (#define ALLOW_SITRACER) |
399 |
|
To be done: |
400 |
|
- thorough testing of missing fields in S/R seaice_read_pickup |
401 |
|
- thorough matching between generic tracers and specific fields used |
402 |
|
(e.g. volume-weighted age, area-weighted age, salinity, ...) |
403 |
|
o pkg/grdchk: |
404 |
|
- all procs calculate and print finite-difference gradient (for testreport) |
405 |
|
- change description output used by testreport; |
406 |
|
- AD testing: also compare and report Finite-difference gradient; |
407 |
|
=> update all output_adm*.txt |
408 |
|
o test exp. global_ocean_ebm: |
409 |
|
- switch back useRealFreshWaterFlux (no problem anymore with run-off); |
410 |
|
and turn on exactConserve; update (fwd) output. |
411 |
|
o pkg/seaice (LSR): |
412 |
|
- print to STDOUT number of solver iterations at SEAICE_monFreq interval. |
413 |
|
- modify solver to deal cleanly with u/v switch at face edges (CS-grid): |
414 |
|
* identical results with non-CS topology (but save up to half of EXCH calls) |
415 |
|
* no much changes in cs-32 verification tests since no ice at face edges |
416 |
|
(differences due to convergence criteria, since nb of iterations changed) |
417 |
|
* expect some differences on lat-lon-cap grid. |
418 |
|
update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice) |
419 |
|
o pkg/exch2: |
420 |
|
- add new CPP option to disable Cumul-Sum matrix (to save storage when using |
421 |
|
many tiles); until alternative coding is added, just add a stop. |
422 |
|
o pkg/kpp: |
423 |
|
- move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F |
424 |
|
to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list). |
425 |
|
o optfiles: |
426 |
|
- merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles |
427 |
|
into corresponding standard one, which now support different build: |
428 |
|
(when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built) |
429 |
|
- add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael) |
430 |
|
o pkg/obcs (seaice): |
431 |
|
- add missing EXCH for uIce,vIce after applying OBCS; |
432 |
|
- remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding |
433 |
|
argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R |
434 |
|
EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F; |
435 |
|
- fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared) |
436 |
|
- verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi |
437 |
|
and eedata.mth for MPI and mutlti-threaded testing. |
438 |
|
o pkg/flt: |
439 |
|
- make FLT EXCH working with multi-threads (and MPI + multi-threads); |
440 |
|
- use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h; |
441 |
|
- fix pickup and trajectories + profiles output with multi-threads; |
442 |
|
- add parameter to select group of fields to write along trajectory and |
443 |
|
profile (default unchanged); |
444 |
|
- only call PORT_RAND* function when flt_noise <> 0; |
445 |
|
- add multi-threaded test for verification exp. flt_example. |
446 |
|
o eesupp/src: |
447 |
|
- fix S/R ALL_PROC_DIE for MPI+multi-threads. |
448 |
|
- USE_OMP_THREADING: check that number of threads (from eedata) matches |
449 |
|
actual number (from env.var. setting). |
450 |
|
o pkg/ebm: |
451 |
|
- fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file. |
452 |
|
- add multi-threaded test for verification exp. global_ocean_ebm |
453 |
|
|
454 |
|
checkpoint63b (2011/08/29) |
455 |
|
o pkg/ebm: |
456 |
|
- fix sign of runoff; |
457 |
|
- update directly forcing fields (Qnet,EmPmR) to use standard |
458 |
|
external_forcing_surf.F (remove ebm_forcing_surf.F); |
459 |
|
- avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F); |
460 |
|
- set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm) |
461 |
|
and apply relaxation towards corresponding SST field (2-D map or ZonAver). |
462 |
|
- update global_ocean_ebm parameters file data and update output (fwd+ad). |
463 |
|
o verification/matrix_example: |
464 |
|
- split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for |
465 |
|
MPI and mutlti-threaded testing. |
466 |
|
o pkg/matrix: |
467 |
|
- change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ; |
468 |
|
- fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter); |
469 |
|
- fix for multi-threaded (remove DATA statement); |
470 |
|
- use standard DIFFERENT_MULTIPLE function; |
471 |
|
- add MATRIX_OPTIONS.h |
472 |
|
o verification/matrix_example: |
473 |
|
To allow to split the domain in several tiles, change the domain size |
474 |
|
from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on |
475 |
|
Western side) of land points. |
476 |
|
o (*_)write_pickup: |
477 |
|
- fix few bugs in mypackage_read/write_pickup.F |
478 |
|
- in MDS_WR_METAFILES calls, replace "myTime" by a local copy into |
479 |
|
array of length 1 (was caught by compiler syntax-check). |
480 |
|
o pkg/diagnostics (velocity potential solver): |
481 |
|
- fix initialisation of main diagonal matrix (for overlap values) |
482 |
|
o tools/build_options: |
483 |
|
- towards single optfile for MPI and non-MPI built: merge few +mpi optfile |
484 |
|
into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11) |
485 |
|
- linux_amd64_gfortran: merge +mpi_generic version into standard optfile: |
486 |
|
* move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ; |
487 |
|
* FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list; |
488 |
|
and use "-devel" testreport option for standard testing on baudelaire. |
489 |
|
o pkg/grdchk: |
490 |
|
- Assume that all gradient-check position are within the same tile |
491 |
|
corresponding to global indices (iGloTile,jGloTile) and that |
492 |
|
positions (i,j indices or nbeg) are local to this tile; |
493 |
|
- set tile local-indices and proc. number according to tile global-indices; |
494 |
|
- remove grdchkwhichproc from namelist (retired param); |
495 |
|
- send adjoint gradient to all procs so that all procs print it to STDOUT; |
496 |
|
- switch on MPI test for global_ocean.90x40x15 AD test experiment. |
497 |
|
o adding package bbl (Bottom Boundary Layer) |
498 |
|
description in MITgcm/pkg/bbl/bbl_description.tex |
499 |
|
example/test experiment in MITgcm_contrib/bbl |
500 |
|
o adjoint verifications |
501 |
|
- changed 5 experiments to multi-tiles |
502 |
|
* global_ocean.90x40x15 |
503 |
|
* obcs_ctrl |
504 |
|
* offline_exf_seaice |
505 |
|
* tutorial_dic_adjoffline |
506 |
|
* tutorial_tracer_adjsens |
507 |
|
changed reference output for those that crossed tile boundaries |
508 |
|
(changed choices of gradient check positions) |
509 |
|
- with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi) |
510 |
|
- temporary bug fix in grdchk_loc.F for obcs |
511 |
|
o genmake2 & testreport |
512 |
|
- add target "obj" (just for OBJFILES files) to Makefile; |
513 |
|
- add option to specify FEXTRAFLAGS on command line. |
514 |
|
o pkg/mypackage: |
515 |
|
- remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS |
516 |
|
|
517 |
|
checkpoint63a (2011/08/02) |
518 |
|
o pkg/diagnostics (velocity potential): |
519 |
|
- fix velocity-potential calculation when using OBCS: balance net inflow |
520 |
|
at each level (new S/R OBCS_DIAG_BALANCE). |
521 |
|
- fix some of the problems with OBCS in stream-function calculation. |
522 |
|
o pkg/exf/exf_readparms.F |
523 |
|
- make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF, |
524 |
|
EXF_NML_OBCS) more consistent, so that you need not have these lists |
525 |
|
in data.exf when they are not used. |
526 |
|
o optim/optim_readdata.F: |
527 |
|
- add some output about obcs variables that might help debugging |
528 |
|
- add a check about nvarlength |
529 |
|
o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec |
530 |
|
o pkg/diagnostics (velocity potential): |
531 |
|
- fix mask for OBCS (still problems in stream-function with OBCS); |
532 |
|
- add specific parameter (default = main code CG2D params) for solver; |
533 |
|
- in case of poor convergence, use solution corresponding to lowest residual. |
534 |
|
o pkg/seaice/seaice_growth.F: small changes that permit vectorizable |
535 |
|
adjoint code. In general statements like tmpscal=fld(i,j) are problematic |
536 |
|
and should be avoided where possible. |
537 |
|
o model/src (rStar): |
538 |
|
- include r* effect on reference-state (PhiRef) in totPhiHyd |
539 |
|
(so that it's really the potential anomaly at the cell center); |
540 |
|
affect solution only if z* with full pressure in EOS. |
541 |
|
- test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and |
542 |
|
update output (because of z* in totPhiHyd and viscA4 changes); |
543 |
|
- keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly |
544 |
|
@ constant r) until interpolation at constant r is implemented. |
545 |
|
o pkg/diagnostics |
546 |
|
- fix RCENTER diagnostics in case cell center is not at interface middle |
547 |
|
o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use |
548 |
|
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies |
549 |
|
that THETA and SALT are "conservative temperature" and "absolute |
550 |
|
salinity" |
551 |
|
o pkg/ctrl |
552 |
|
- fix computation of endrec in s/r ctrl_init_rec |
553 |
|
- ctrl_pack/unpack_*: remove unused variables and some obsolete code |
554 |
|
o pkg/seaice/seaice_growth.F |
555 |
|
- fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code, |
556 |
|
remove then obsolete STORE directives |
557 |
|
- fix STORE directives for tice and tices, so that only the |
558 |
|
appropriate part of the fields are stored (and not the entire |
559 |
|
field); update global_ocean.cs32x15.seaice AD output. |
560 |
|
- cosmetic changes: adjust CPP flags and indentation for better |
561 |
|
legibilty |
562 |
|
o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by |
563 |
|
Chris Wilson) |
564 |
|
o pkg/gmredi: |
565 |
|
Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF), |
566 |
|
and test it in verification exp. "front_relax.bvp" (update output.bvp.txt) |
567 |
|
|
568 |
|
checkpoint63 (2011/07/11) |
569 |
|
o pkg/exch2: |
570 |
|
- rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h |
571 |
|
- exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the |
572 |
|
(2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y |
573 |
|
increments, calculates Cumul-Sum @ tile origin and sends results to each tile. |
574 |
|
o pkg/diagnostics: |
575 |
|
- deal with pairs of post-processed diags which are computed together; in |
576 |
|
particular, re-order list of diags within 1 file to save 2nd computation. |
577 |
|
- add S/R to compute velocity stream-function (called after velocity-potential |
578 |
|
calculation) from divergence free transport -> new diagnostics "PsiVEL". |
579 |
|
- add parameter to select grid-point location where PsiVEL == 0. |
580 |
|
o eesupp/src: |
581 |
|
new S/R to calculate cumulated sum on tiled array, corner grid-cell location |
582 |
|
(specific S/R needed with exch2 topology - for now, just print an error msg) |
583 |
|
o pkg/shelfice |
584 |
|
- Implement friction velocity-dependent transfer coefficients following |
585 |
|
Holland and Jenkins, JPO, 1999 |
586 |
|
Original code by M. Losch with small modifs. |
587 |
|
Enable with CPP option SHI_ALLOW_GAMMAFRICT |
588 |
|
and runtime flag SHELFICEuseGammaFrict |
589 |
|
o verification lab_sea & global_ocean.cs32x15: |
590 |
|
- use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local): |
591 |
|
does not miss some dependencies (but is slower) and also works with many files |
592 |
|
(default makedepend limitation for AD built). |
593 |
|
- use cyrus_makedepend in adjustment.128x64x1 (so that it still tested). |
594 |
|
o pkg/diagnostics: |
595 |
|
- add run-time parameter "useMissingValue" (def=False) to fill land-point |
596 |
|
(i.e., where mask=0) with MissingValue ; used only in MNC output file. |
597 |
|
This replaces CPP-option DIAGNOSTICS_MISSING_VALUE. |
598 |
|
- Extend the use of "missing_value" setting from data.diagnostics for the case |
599 |
|
of counter-diagnostics (where fraction-weight is zero). This applies both to |
600 |
|
MNC and MDS output files. |
601 |
|
o pkg/seaice/seaice_growth.F: |
602 |
|
- add 'a priori' cap of latent heat flux based on actual mass considerations |
603 |
|
when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the |
604 |
|
non-legacy seaice_solve4temp. |
605 |
|
- add diagnostic of the residual sublimation freshwater flux (the freshwater |
606 |
|
flux taken from the ocean if the total actual latent heat fluxes exceed |
607 |
|
the maximum) |
608 |
|
- remove the CPP switch around the *_FWbySublim unit change and move diagnostic |
609 |
|
fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F. |
610 |
|
- add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef |
611 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim). |
612 |
|
- bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET. |
613 |
|
- bug fix : missing part to Martin's r_FWbySublim pathological case fix. |
614 |
|
o verification 1D_ocean_ice_column: |
615 |
|
made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet |
616 |
|
update results |
617 |
|
o pkg/diagnostics: |
618 |
|
- Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P') |
619 |
|
which are not filled-up but computed from other diags ; In this case, the mate |
620 |
|
diag points to the primary (filled-up) diag to used for post processing. |
621 |
|
- Update Velocity-potential computation using post-processed diag framework. |
622 |
|
==> Change the ordering of fields and time-periods in MDS output file |
623 |
|
when using periodic averaging: now writes one time record with the full set |
624 |
|
of fields for this time period, then the next time reccord (it used to be |
625 |
|
one field with the full set of time records then the next field). |
626 |
|
Note: this is now similar to NetCDF (MNC) output file. <== |
627 |
|
|
628 |
|
checkpoint62z (2011/06/21) |
629 |
|
o adjoint monitor: |
630 |
|
- Add adjoint monitor output for packages exf, seaice |
631 |
|
and update relevant testreport output |
632 |
|
o pkg/seaice: |
633 |
|
- re-order diags inits so that they appear in order in available_diagnostics.log |
634 |
|
- added diags: hsnow thermo. rates of change, area preceeding ridiging process, |
635 |
|
area/heff/hsnow preceeding thermodynamic growth/melt. |
636 |
|
- modified diag: SIdA; output actual effect, as the description states. |
637 |
|
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
638 |
|
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
639 |
|
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
640 |
|
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
641 |
|
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
642 |
|
- added diagnostics for seaice generic tracers (SItr*). |
643 |
|
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
644 |
|
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
645 |
|
I. Fenty: 18-Jun-2011: |
646 |
|
Minor changes to seaice package: |
647 |
|
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
648 |
|
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
649 |
|
- Differentiated "regularization variables" from "floor variables" |
650 |
|
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
651 |
|
* hiceMin became SEAICE_hice_reg (old hiceMin) |
652 |
|
(with _reg meaning regularization variable) |
653 |
|
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
654 |
|
so as to ensure energy conservation when going between phases |
655 |
|
- A22 was not used anywhere |
656 |
|
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
657 |
|
well-boundedness and smooth adjoint in seaice_growth.F |
658 |
|
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
659 |
|
because the old regularization always set heffActual >= 0.05 cm |
660 |
|
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
661 |
|
on AREA when HEFF > 0. |
662 |
|
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
663 |
|
requiring that DISABLE_AREA_FLOOR *not* be defined |
664 |
|
Affected verifications: |
665 |
|
- 1D_ocean_ice_column (output.txt output_adm.txt) |
666 |
|
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
667 |
|
o pkg/diagnostics: |
668 |
|
- move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R). |
669 |
|
- rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument |
670 |
|
(was _RL, now integer) with option = 0 to retrieve all levels. |
671 |
|
- add pieces of code to compute velocity potential at each level (new diagnostics |
672 |
|
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
673 |
|
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
674 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
675 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
676 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
677 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
678 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
679 |
|
o model/src (rStar): |
680 |
|
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
681 |
|
affect solution only if z* with full pressure in EOS; |
682 |
|
update output of test-exp global_ocean.90x40x15. |
683 |
|
o pkg/seaice: |
684 |
|
- introduce siEps=1e-5 parameter |
685 |
|
- use areaMax in AREA update (part 4), consistent with ridging step (part 2.5). |
686 |
|
- re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code. |
687 |
|
- introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer. |
688 |
|
For now it covers, and was tested for, ice salinity and age (attached to HEFF), |
689 |
|
as well as ice cover age and ridging index (attached to AREA). |
690 |
|
For now the run time parameters (in data.seaice/SEAICE_PARM03) are |
691 |
|
SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA'). |
692 |
|
Up to SItrMaxNum=3 tracers can be used simultaneously. |
693 |
|
o pkg/salt_plume: |
694 |
|
-introduce SPsalFRAC run time parameter that sets the fraction of the |
695 |
|
salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically) |
696 |
|
that gets vertically redistributed (fluxed down) by pkg/salt_plume. |
697 |
|
o model debug options: |
698 |
|
- Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored |
699 |
|
in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h). |
700 |
|
- Refine debug-msg printing selection (3 new levels): |
701 |
|
debugMode : controls printing of debug messages (sequence of S/R calls). |
702 |
|
debugLevel : controls printing of algorithm-relevant auxiliary/debug messages |
703 |
|
debLevZero = 0 ; /* level of disabled aux. msg printing */ |
704 |
|
debLevA = 1 ; /* level of minimum aux. msg printing */ |
705 |
|
debLevB = 2 ; /* level of low aux. print (report read-file opening)*/ |
706 |
|
debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */ |
707 |
|
debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */ |
708 |
|
debLevE = 5 ; /* level of extensive debug printing */ |
709 |
|
New debugLevel default: with default debugMode value (=F), |
710 |
|
= 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.; |
711 |
|
and if debugMode=T, default debugLevel = 4 (debLevD). |
712 |
|
Relation with previous settings: |
713 |
|
debLevB (=2) corresponds to former debLevA (=1) |
714 |
|
debLevD (=4) corresponds to former debLevB (=2) |
715 |
|
Note: |
716 |
|
a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before); |
717 |
|
b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs); |
718 |
|
to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5) |
719 |
|
- Add new parameter (printResidualFreq, read from PARM02 namelist) to print |
720 |
|
detailed CG solvers convergence; off (=0) by default, except if debugLevel=5. |
721 |
|
o pkg/obcs: |
722 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
723 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
724 |
|
o pkg/thsice: |
725 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
726 |
|
2nd layer seaice sublimation (unlikely to happen) |
727 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
728 |
|
done in gad_advection & seaice_advection). |
729 |
|
o adjoint: |
730 |
|
bug fix spotted by Gael Forget: |
731 |
|
seaice_advection and thsice_advection still had |
732 |
|
legacy CPP options to avoid CS corner updates for adjoint |
733 |
|
o pkg/seaice: |
734 |
|
=> Change some of the defaults (2011/05/29): |
735 |
|
- change SEAICEuseFluxForm default (from False to True) |
736 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
737 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
738 |
|
avection scheme is used without any diffusion. |
739 |
|
also: |
740 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
741 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
742 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
743 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
744 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
745 |
|
update results of test exp.: |
746 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
747 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
748 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
749 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
750 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
751 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
752 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
753 |
|
o pkg/seaice/seaice_growth.F: |
754 |
|
- use Ian Fenty's capping formulas for actual ice |
755 |
|
thickness thoughout EVOLUTION branch. |
756 |
|
- put treatment pathological case #2) in CPP brackets |
757 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
758 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
759 |
|
o pkg/seaice: |
760 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
761 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
762 |
|
also pass fac as a param, which can be 1. (to update the tendency |
763 |
|
field) or the time step (to update the field itself). |
764 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
765 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
766 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
767 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
768 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
769 |
|
o pkg/seaice: |
770 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
771 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
772 |
|
to just compute the laplacian of input-field. |
773 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
774 |
|
- fix flux-form version in diffus.F to conserve tracer. |
775 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
776 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
777 |
|
|
778 |
|
checkpoint62y (2011/05/26) |
779 |
|
o pkg/seaice: |
780 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
781 |
|
a_QSWbyATM_cover in qnet (as it should be). |
782 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
783 |
|
(output.seaice.txt output_adm.seaice.txt). |
784 |
|
o pkg/seaice + obcs: |
785 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
786 |
|
equivalent of assuming no tracer gradient outside the OB region. |
787 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
788 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
789 |
|
after changes above); |
790 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
791 |
|
only at OB location (instead of over a band of OLx width). |
792 |
|
o pkg/seaice: |
793 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
794 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
795 |
|
o pkg/obcs: |
796 |
|
- split header file "OBCS.h" into 4 separated files: |
797 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
798 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
799 |
|
(contain no conditional statement which depends on OBCS options). |
800 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
801 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
802 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
803 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
804 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
805 |
|
o pkg/obcs: |
806 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
807 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
808 |
|
over a band of OLx width) |
809 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
810 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
811 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
812 |
|
o obcs in model/src: |
813 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
814 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
815 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
816 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
817 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
818 |
|
- zero out velocity outside OB interior region: This has no effect on |
819 |
|
the solution but just to prevent unrealistic velocity outside OB. |
820 |
|
o obcs and non-lin free-surf: |
821 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
822 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
823 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
824 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
825 |
|
update results of test-exp. exp4(nlfs). |
826 |
|
o exp4 (nlfs) test-exp: |
827 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
828 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
829 |
|
o obcs and 2d/3d solver norm: |
830 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
831 |
|
and outside OB interior region (will allow to place OB further inside the |
832 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
833 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
834 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
835 |
|
e.g. in tutorial_plume_on_slope. |
836 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
837 |
|
o pkg rbcs: |
838 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
839 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
840 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
841 |
|
o pkg/shelfice/shelfice_init_fixed.F |
842 |
|
fix CPP-flag combinations |
843 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
844 |
|
* update/change/correct ice age calculations |
845 |
|
* add age updates for pathological cases |
846 |
|
Probably needs more testing... |
847 |
|
|
848 |
|
checkpoint62x (2011/05/13) |
849 |
|
o pkg/mom_vecinv: |
850 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
851 |
|
to zero-out (outside OB) gradient of vorticity. |
852 |
|
o verification exp.: |
853 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
854 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
855 |
|
o pkg/obcs: |
856 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
857 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
858 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
859 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
860 |
|
variables needs its own mask. |
861 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
862 |
|
from the first guess (zero) in analogy to other control variables |
863 |
|
o pkg/shelfice: |
864 |
|
- start basic adjoint |
865 |
|
o pkg/ctrl: |
866 |
|
- remove extra 2D field "for good measure" when initializing in |
867 |
|
ctrl_set_globfld_[xy/xz/yz].F |
868 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
869 |
|
- improve error messages in ctrl_set_unpack_* |
870 |
|
o OBC implementation in momentum: |
871 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
872 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
873 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
874 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
875 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
876 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
877 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
878 |
|
Update output of experiment dome and exp4 (+nlfs). |
879 |
|
o exp4 test-exp: |
880 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
881 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
882 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
883 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
884 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
885 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
886 |
|
o pkg/obcs: |
887 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
888 |
|
o model/src: |
889 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
890 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
891 |
|
from the other without ambiguity. |
892 |
|
o seaice_obcs test-exp.: |
893 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
894 |
|
o pkg/obcs: |
895 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
896 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
897 |
|
o pkg/seaice: |
898 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
899 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
900 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
901 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
902 |
|
o fizhi-cs test exp.: |
903 |
|
switch reference output convention for these 2 non-standard test-exp, |
904 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
905 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
906 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
907 |
|
o model/inc: |
908 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
909 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
910 |
|
o pkg/seaice: |
911 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
912 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
913 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
914 |
|
and initial HSALT |
915 |
|
|
916 |
|
checkpoint62w (2011/04/26) |
917 |
|
o pkg/mom_fluxform: |
918 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
919 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
920 |
|
- update output of exp. global_ocean.90x40x15 |
921 |
|
o pkg/mom_vecinv: |
922 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
923 |
|
o update seaice exp.: |
924 |
|
use more consistent parameter values (remove "backward compatability only": |
925 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
926 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
927 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
928 |
|
o update test-exp global_ocean.90x40x15: |
929 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
930 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
931 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
932 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
933 |
|
and update output files: output.txt & output.dwnslp.txt |
934 |
|
o new AD-test experiment: obcs_ctrl |
935 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
936 |
|
o pkg/dic: |
937 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
938 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
939 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
940 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
941 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
942 |
|
at depth and bring the negative heat anomaly to the surface level |
943 |
|
o pkgs _fields_load: |
944 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
945 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
946 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
947 |
|
rbcs to get interpolation weights and time reccord number. |
948 |
|
- fix multi-threading in aim_fields_load.F |
949 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
950 |
|
o external_fields_load: |
951 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
952 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
953 |
|
time-step to convert to integer: |
954 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
955 |
|
(Thanks to Christopher L. Wolfe) |
956 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
957 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
958 |
|
store index of time-record which is currently loaded: |
959 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
960 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
961 |
|
(to be fixed soon) |
962 |
|
|
963 |
|
checkpoint62v (2011/04/02) |
964 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
965 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
966 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
967 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
968 |
|
o pkg/generic_advdiff with OBCS: |
969 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
970 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
971 |
|
This will affect the results if using obcs+biharmonic diffusion. |
972 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
973 |
|
o pkg/obcs: |
974 |
|
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
975 |
|
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
976 |
|
in Interior region. No impact on solution but affects Velocity monitor stats. |
977 |
|
o pkg/ptracers (adjoint) |
978 |
|
New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate |
979 |
|
tape file for each tracer |
980 |
|
o model/inc/src and pkg/autodiff: add parameters that allow to turn |
981 |
|
of parts of the adjoint code at run time. For now, there are only |
982 |
|
useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These |
983 |
|
parameters are set in data.pkg. |
984 |
|
This is the lazy coward's version of doing this, but still useful for |
985 |
|
debugging. In order to do it right, everything needs to be moved to |
986 |
|
pkg/autodiff. |
987 |
|
o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at |
988 |
|
the end; this fixes the adjoint balancing code for open boundaries. |
989 |
|
o pkg/ctrl: |
990 |
|
- change behavior of xx_${varname}period to be analogous to exf-conventions: |
991 |
|
xx_${varname}period = 0., means time-independent control part |
992 |
|
xx_${varname}period = -12., means one-year-periodic monthly control part |
993 |
|
- introduce helper routine ctrl_init_rec (part of ctrl_init.F) to |
994 |
|
clean up ctrl_init a little, remove unused variables |
995 |
|
- ctrl_init: fixed the handling of the start/endrec for obcs-variables |
996 |
|
- move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec |
997 |
|
|
998 |
|
checkpoint62u (2011/03/15) |
999 |
|
o model/src: |
1000 |
|
- for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in |
1001 |
|
h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ; |
1002 |
|
- in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to |
1003 |
|
INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF. |
1004 |
|
o pkg/ctrl/obcs/ecco: |
1005 |
|
- remove obsolete, unused, and partially broken code: |
1006 |
|
ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within |
1007 |
|
ALLOW_CTRL_OBCS_BALANCE |
1008 |
|
- put a stop statement into ecco/cost_obcsvol.F, but also add |
1009 |
|
cost_obcsvol to ecco_ad_diff.list |
1010 |
|
o pkg/ecco: fix counting cost function contributions for obcs (code |
1011 |
|
by Matt M.) and diffkr for diagnostics |
1012 |
|
o pkg/ecco, pkg/ctrl, pkg/grdchk: |
1013 |
|
add cost penalty terms for initial uvel, vvel, eta controls |
1014 |
|
and I/O for prior error files |
1015 |
|
o pkg/mdsio: |
1016 |
|
move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option |
1017 |
|
(new argument) to check for tiled file in mdsioLocalDir : this fix the |
1018 |
|
restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir. |
1019 |
|
o pkg/ctrl: |
1020 |
|
- ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by |
1021 |
|
ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove |
1022 |
|
unused and superfluous variables |
1023 |
|
- ctrl_get_gen_rec.F: catch the case of xx_genperiod=0. |
1024 |
|
o pkg/ecco |
1025 |
|
- enable adjoint of Stevens OB |
1026 |
|
o pkg/ctrl/ecco/grdchk: |
1027 |
|
- remove global declaration of tmpfldx/yz and tmpfldx/yz2. |
1028 |
|
Fortunately, we do not have any tests for the numerous cpp-flagged |
1029 |
|
option of "obcs as control parameters" so we will never know |
1030 |
|
if this is an improvement (but at least now things compile). |
1031 |
|
- remove an obsolete initialization from ecco_cost_init_barfiles.F |
1032 |
|
- fix some problems within never used ifdefs to make the code compile |
1033 |
|
o pkg/obcs: |
1034 |
|
- Refine Interior mask definition to work with more complex OB (e.g. |
1035 |
|
if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to |
1036 |
|
read in Interior mask from file. Check if Interior mask is consistent |
1037 |
|
with OB list of indices. |
1038 |
|
o pkg/seaice |
1039 |
|
- beginning code for a seaice tracer package, |
1040 |
|
but currently only used for seaice age: SEAICE_AGE |
1041 |
|
SEAICE_num = 4 |
1042 |
|
iTracer = 1: area-weighted ice age |
1043 |
|
= 2: volume-weighted ice age |
1044 |
|
= 3, 4: template for one-year vs. multi-year ice |
1045 |
|
data.seaice has new namelist SEAICE_PARM03 for arrays related to |
1046 |
|
SEAICE_num |
1047 |
|
|
1048 |
|
checkpoint62t (2011/03/05) |
1049 |
|
o pkg/obcs: |
1050 |
|
- obcs_apply_uv.F: change to a 2 steps method, first tangential component; |
1051 |
|
then normal component. This ensures that the normal component is set |
1052 |
|
correctly even when it conficts with tangential setting from an other OB. |
1053 |
|
Affects results of test-experiment seaice_obcs: update the output.txt |
1054 |
|
o pkg/obcs: |
1055 |
|
- add code to monitor statistics of dynamical fields at OB. |
1056 |
|
- take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW : |
1057 |
|
- fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection). |
1058 |
|
- change default: balance the Net inflow through all OB (instead of balancing |
1059 |
|
each OB separately); keep the old method if setting OBC_balanceFacX < 0. |
1060 |
|
- switch on useOBCSbalance in dome experiment: only correct Western OB outflow |
1061 |
|
to match Nortern OB inflow (OBCS_balanceFacN=0). |
1062 |
|
o pkg/seaice: |
1063 |
|
- redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL |
1064 |
|
o pkg/seaice (seaice_growth v 1.113): |
1065 |
|
- reverting seaice_growth to v 1.111 in order to have code with exact bit |
1066 |
|
compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge |
1067 |
|
CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced |
1068 |
|
runtime flag SEAICEareaFormula is kept but is inactive |
1069 |
|
o model/src: |
1070 |
|
- add new param to scale curvilinear grid distance and area when using |
1071 |
|
a different sphere radius from the grid-files. |
1072 |
|
- test/check multi-threads EXCH applied to local variable (cg2d_x) |
1073 |
|
o adjoint: |
1074 |
|
- enable adjoint of Stevens OB |
1075 |
|
- add dummy_in_dynamics to enable extraction of ADJrhoinsitu |
1076 |
|
(a bit delicate because of potentially modified adj. common block structure; |
1077 |
|
current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later) |
1078 |
|
|
1079 |
|
checkpoint62s (2011/02/15) |
1080 |
|
o pkg/seaice (seaice_growth v 1.112): |
1081 |
|
- introduce SEAICEareaFormula run time parameter, which selects the recipe for |
1082 |
|
computing the ice cover tendency from effective thickness tendencies. Include |
1083 |
|
Ian Fenty's formula. |
1084 |
|
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using |
1085 |
|
SEAICEareaFormula. |
1086 |
|
- simplify notations for the various d_HEFF/d_AREA terms. |
1087 |
|
o pkg/gmredi: |
1088 |
|
- add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code |
1089 |
|
from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative; |
1090 |
|
add a verification test-run (front_relax.bvp) to test GM_useBVP. |
1091 |
|
o pkg/seaice (seaice_growth v 1.111): |
1092 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
1093 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to |
1094 |
|
also melt ice. |
1095 |
|
o pkg/seaice: |
1096 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
1097 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
1098 |
|
o pkg/cheapaml: |
1099 |
|
- from Nico Wienders: New version of this package. |
1100 |
|
o pkg/flt: |
1101 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
1102 |
|
a periodic domain (default: keep periodicity) |
1103 |
|
o pkg/gmredi: |
1104 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
1105 |
|
(needed for multi-dim advection). |
1106 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
1107 |
|
o model/src: |
1108 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
1109 |
|
o tutorial_tracer_adjsens |
1110 |
|
- extend to NLFS and replace maskC by hFacC |
1111 |
|
(change reference output accordingly) |
1112 |
|
|
1113 |
|
checkpoint62r (2011/01/24) |
1114 |
|
o testreport: |
1115 |
|
- add option -deloutp (-do) to remove output file after successful run |
1116 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
1117 |
|
extract exact list of procs from this file ; adjust COMMAND by |
1118 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
1119 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
1120 |
|
first guess (of obcs) with code by Matt Mazloff |
1121 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
1122 |
|
exf/cal |
1123 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
1124 |
|
and handle case of obcs?period == 0 |
1125 |
|
Not affected by these changes: There is still an inconsistency in |
1126 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
1127 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
1128 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
1129 |
|
ALLOW_CAL is not defined |
1130 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
1131 |
|
S/R exf_swapfields |
1132 |
|
o testreport: |
1133 |
|
allow to test MPI with different number of processors for each experiment: |
1134 |
|
create file "SIZE.h.mpi" in each build dir. |
1135 |
|
Note: update of "-command" argument not yet implemented. |
1136 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
1137 |
|
alleviate the need for additional 3D tapes when using |
1138 |
|
the non-inear free surface in the adjoint. This is done |
1139 |
|
by adding an 'update' of hfacc etc. to their current |
1140 |
|
value at the beginning of forward_step.F. |
1141 |
|
o pkg/seaice |
1142 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
1143 |
|
timestepping loop |
1144 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
1145 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
1146 |
|
of the routine. |
1147 |
|
o pkg/gmredi: |
1148 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
1149 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
1150 |
|
o pkg/seaice: |
1151 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
1152 |
|
o pkg/seaice: |
1153 |
|
reduce memory footprint of seaice mutldim advection tapes, |
1154 |
|
by using a 2D tape independent of the generic_advdiff ones, |
1155 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
1156 |
|
|
1157 |
|
checkpoint62q (2010/12/29) |
1158 |
|
o model/src: |
1159 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
1160 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
1161 |
|
o pkg/flt: |
1162 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
1163 |
|
- precision of input and output files set according to readBinaryPrec |
1164 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
1165 |
|
- initial float position from tiled file was not converted to index space |
1166 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
1167 |
|
o global_ocean.cs32x15: |
1168 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
1169 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
1170 |
|
o model/src: |
1171 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
1172 |
|
ini_mask_etc (call to plot_fieds_xy*). |
1173 |
|
o pkg/thsice: |
1174 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
1175 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
1176 |
|
o pkg/mdsio: |
1177 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
1178 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
1179 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
1180 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
1181 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
1182 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
1183 |
|
o pkg/flt: |
1184 |
|
- add fourth-order Runge-Kutta integration |
1185 |
|
- add basic exch2 support (only 1 facet supported so far!) |
1186 |
|
o pkg/mdsio+rw: |
1187 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
1188 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
1189 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
1190 |
|
that uses pkg/seaice rather than pkg/thsice. |
1191 |
|
(using multidim advection for seaice) |
1192 |
|
o towards more F95 syntax for array specification in namelist: |
1193 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
1194 |
|
of all verification experiments. |
1195 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
1196 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
1197 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
1198 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
1199 |
|
that uses pkg/seaice rather than pkg/thsice. |
1200 |
|
|
1201 |
|
checkpoint62p (2010/12/17) |
1202 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
1203 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
1204 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
1205 |
|
allow for use of multim. advection in seaice adjoint. |
1206 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
1207 |
|
- first attempt to close budgets by taking into account the freshwater |
1208 |
|
flux implied by the sublimation of snow and ice. So far only the |
1209 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
1210 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
1211 |
|
o eesupp/src: |
1212 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
1213 |
|
from F95 standard to commonly accepted extended F77 form. |
1214 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
1215 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
1216 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
1217 |
|
o globalFiles: |
1218 |
|
commented out in parameter file "data" since it's not safe with MPI |
1219 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
1220 |
|
in this case); no longer commented out in restart test (tst_2+2). |
1221 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
1222 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
1223 |
|
and cannot be used together with mdsioLocalDir. |
1224 |
|
o nesting pkgs: |
1225 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
1226 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
1227 |
|
- add parameter files + utils dir + output from short run on beagle. |
1228 |
|
o pkg/seaice: |
1229 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
1230 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
1231 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
1232 |
|
|
1233 |
|
checkpoint62o (2010/11/25) |
1234 |
|
o pkg/exf: |
1235 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
1236 |
|
o pkg/seaice: |
1237 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
1238 |
|
adjoint code |
1239 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
1240 |
|
capping of heff, put contribution into d_HEFFbyNEG |
1241 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
1242 |
|
by something more sensible (parameters that are what their name implies) |
1243 |
|
- change some defaults, so that by default exf-parameters are used for |
1244 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
1245 |
|
to reproduce the old results, many data.seaice now contain funny values |
1246 |
|
for cpAir and latent heat of sublimation |
1247 |
|
o packages_readparms.F: move exf_readparms up in line so that |
1248 |
|
exf-parameters are visible for other packages (e.g. seaice) |
1249 |
|
o debugMode & debugLevel=2: |
1250 |
|
- differentiate between debugMode & debugLevel=2: |
1251 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
1252 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
1253 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
1254 |
|
=> allows to print debug-stats without all sequence of call messages. |
1255 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
1256 |
|
o pkg/obcs (obcs-sponge): |
1257 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
1258 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
1259 |
|
o pkg/generic_advdiff: |
1260 |
|
- record overlap minimum size for each advection scheme; |
1261 |
|
- refine criteria on overlap minimum size; |
1262 |
|
- check and stop (in gad_check) if overlap size is too small. |
1263 |
|
o pkg/obcs: |
1264 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
1265 |
|
once, in ptracers_implicit.F) |
1266 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
1267 |
|
apply OB values when tile has OB) |
1268 |
|
o model/src, coriolis setting: |
1269 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
1270 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
1271 |
|
files (selectCoriMap=3) with any grid. |
1272 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
1273 |
|
o pkg/seaice/seaice_growth.F: |
1274 |
|
a few cosmetic changes that reduce the number of lines of code |
1275 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
1276 |
|
- the code follows old MOM/NAOSIM code |
1277 |
|
- so far it is only implemented for the eastern and western boundaries |
1278 |
|
and NOT for pTracers |
1279 |
|
o pkg/rbcs: |
1280 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
1281 |
|
beginning of the first rbcs forcing period. |
1282 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
1283 |
|
offline package, i.e., one file per time, labeled by iteration number; |
1284 |
|
deltaTrbcs sets the timestep with which the data was generated; |
1285 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
1286 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
1287 |
|
- make arithmetic safe for negative times and odd forcing periods. |
1288 |
|
|
1289 |
|
checkpoint62n (2010/11/09) |
1290 |
|
o pkg/seaice: |
1291 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
1292 |
|
o pkg/obcs: |
1293 |
|
New S/R to copy tracer value from the OB location to narrow band region |
1294 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
1295 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
1296 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
1297 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
1298 |
|
in seaice_advection.F and advect.F. |
1299 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
1300 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
1301 |
|
o tools/genmake2: |
1302 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
1303 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
1304 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
1305 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
1306 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
1307 |
|
an optfile, but otherwise default was just "cpp". |
1308 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
1309 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
1310 |
|
(instead of just setting CC=cc) |
1311 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
1312 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
1313 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
1314 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
1315 |
|
with reference compiler switch from g77 to gfortran) |
1316 |
|
o pkg/seaice: |
1317 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
1318 |
|
seaice_check that stops the model, when the CPP flag is used. |
1319 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
1320 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
1321 |
|
experiments but will change runs where the capping is acutally active |
1322 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
1323 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
1324 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
1325 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
1326 |
|
o tools/genmake2: |
1327 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
1328 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
1329 |
|
- clean previous genmake log files before anything else. |
1330 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
1331 |
|
files only with "CLEAN" target (instead of "Clean"); |
1332 |
|
o pkg/generic_advdiff: |
1333 |
|
Change OBCS in multiDim advection (gad_advection.F): |
1334 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
1335 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
1336 |
|
which were applying future time-step OB values. |
1337 |
|
This way, all explicit calculations use current-time-step OB values |
1338 |
|
(simpler and more consistent). |
1339 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
1340 |
|
update output of experiment seaice_obcs. |
1341 |
|
o pkg/seaice: |
1342 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
1343 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
1344 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
1345 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
1346 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
1347 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
1348 |
|
o pkg aim (2010/10/26): |
1349 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
1350 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
1351 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
1352 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
1353 |
|
o pkg/obcs: |
1354 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
1355 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
1356 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
1357 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
1358 |
|
|
1359 |
|
checkpoint62m (2010/10/21) |
1360 |
|
o pkg/seaice: vectorize seaice_solve4temp.F |
1361 |
|
- move iterations loops outside of i/j-loops |
1362 |
|
- requires 2D arrays for TB and effConduct |
1363 |
|
- add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is |
1364 |
|
modified in this routine |
1365 |
|
- a little bit of clean up, adjusting indentation, etc. |
1366 |
|
- replaced a few TEN**a by exp(a*log(10.)) in new code for better |
1367 |
|
performance and '**TWO' by '**2' (because TWO is a float), |
1368 |
|
replaced ONE, ZERO |
1369 |
|
o eesupp/src: |
1370 |
|
fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube |
1371 |
|
o pkg/seaice/seaice_growth.F |
1372 |
|
Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and |
1373 |
|
merging process. The merged routine has two branches, and one activates the 'evolution' |
1374 |
|
branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now). |
1375 |
|
In summary, here is what the '10/10 revision' did consist of |
1376 |
|
part 1: seaice_growth.F revisions 1.71 to 1.75 |
1377 |
|
- Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged. |
1378 |
|
The emphasis here was on improving readability (e.g. by trying to use meaningful |
1379 |
|
variable names) and modularity (e.g. by adding arrays to store heff etc. updates). |
1380 |
|
part 1.5: |
1381 |
|
- revising the lab_sea experiment to make it a more useful (i.e. stable |
1382 |
|
and representative of an actual model run). This was done by generating a |
1383 |
|
(winter) pickup to start from, switching back the main experiment dynamic |
1384 |
|
solver from evp to lsr, having one of the experiments use the free drift solution. |
1385 |
|
part 2: seaice_growth.F revisions 1.76 to 1.85 |
1386 |
|
- Sorting out hard-coded constants that prevented heat and fresh water conservation. |
1387 |
|
- Sorting out the various fields units and sign (set early on and reset at the end) |
1388 |
|
to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and |
1389 |
|
fresh water stock is 'effective ice meters', and >0 implies more ice/snow. |
1390 |
|
- Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks, |
1391 |
|
and simplifying logical expressions to further improve readibility. |
1392 |
|
part 3: seaice_growth.F revisions 1.86 to 1.89 |
1393 |
|
- Re-organize the blocks of code more logically. |
1394 |
|
- Merging the '_if.F' pieces that add something new. |
1395 |
|
o pkg/thsice: |
1396 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
1397 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
1398 |
|
might also be problematic for TAF |
1399 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
1400 |
|
does not change the verifcation experiment, but will change all |
1401 |
|
experiments that have this flag undefined (not tested in verification); |
1402 |
|
a little reorganization to save a few 2D fields and recomputations |
1403 |
|
- 1st step of revisiting thsice adjoint (major recomp. sorted out) |
1404 |
|
- 2nd step: fix some store dirs |
1405 |
|
o seems to work somewhat, i.e. using ifort but not g77 |
1406 |
|
o likely cause are incomplete init. or recomputation |
1407 |
|
o start verification/global_ocean.cs32x15/input_ad.thsice |
1408 |
|
o pkg/obcs: add support for exch2 |
1409 |
|
- the position of the boundary and prescribed values are specified using |
1410 |
|
a global domain with exch2 facets stacked |
1411 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
1412 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
1413 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
1414 |
|
file layout is as for obcs described above: |
1415 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
1416 |
|
- for y-z sections, facets are stacked in y |
1417 |
|
o pkg/thsice: |
1418 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
1419 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
1420 |
|
not affected, but in particular the latter routine has changed |
1421 |
|
dramatically (not necessarily easier to read now). |
1422 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
1423 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
1424 |
|
o verification/lab_sea: |
1425 |
|
- overhaul of the forward model experiments. The main motivation |
1426 |
|
for this revision is that lab_sea has proven quite fragile (when |
1427 |
|
changing the sea-ice code, and switching platforms) to a point |
1428 |
|
when failures were very hard to attribute to specific code problems. |
1429 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
1430 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
1431 |
|
- the input.lsr experiment thus became obsolete and was removed. |
1432 |
|
- it was replaced with the input.fd experiment that uses an |
1433 |
|
analytical "free drift" solution as the ice velocity field. |
1434 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
1435 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
1436 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
1437 |
|
us to test additional options, along with the salt plume package. |
1438 |
|
- Finally a pickup was generated (at the end of a one year run) to |
1439 |
|
make the tests more representative of an actual model run. Previously |
1440 |
|
the tests starting point was a 1m thickness of ice everywhere. |
1441 |
|
o pkg/seaice: |
1442 |
|
- introducing S\R seaice_freedrift.F that compute the |
1443 |
|
analytical solution to an approximate ice momentum |
1444 |
|
equation (i.e. the simple stress/coriolis balance). |
1445 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
1446 |
|
of the free drift velocity field, and enable its use. |
1447 |
|
To actually use the free drift solution as the model ice |
1448 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
1449 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
1450 |
|
|
1451 |
|
checkpoint62l (2010/10/04) |
1452 |
|
o pkg/seaice: |
1453 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
1454 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
1455 |
|
version (with USE_ORIGINAL_SBI undef); |
1456 |
|
o add hooks for new packages OASIS, the package will follow |
1457 |
|
(hooks exclude the seaice pkg for now) |
1458 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
1459 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
1460 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
1461 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
1462 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
1463 |
|
Option to write/read 2D fields to files including tiles halos. |
1464 |
|
The main purpose is for adjoint related "tape I/O". |
1465 |
|
The secondary purpose is for debugging phases. |
1466 |
|
A word on those rather specifically intended purposes. |
1467 |
|
The code was meant to be stripped down to the bare minimum. |
1468 |
|
Typically, there is a unique and basic mapping to the global |
1469 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
1470 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
1471 |
|
meant to generate user friendly outputs of various shapes and forms. |
1472 |
|
Rather it is intended, for the knowledgeabale developers, |
1473 |
|
to be largely independent of the many mdsio options, to allow |
1474 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
1475 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
1476 |
|
file system behavior. With regard to tuning, most of the potential knobs |
1477 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
1478 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
1479 |
|
are not yet included, and will be added if they prove useful. |
1480 |
|
o pkg/seaice: |
1481 |
|
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
1482 |
|
o pkg/seaice: |
1483 |
|
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
1484 |
|
code (seaice_budget_ice_if.F) which enable to recover old standard |
1485 |
|
code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined. |
1486 |
|
temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F. |
1487 |
|
o model/src (rStar): |
1488 |
|
use simple average (not area weighted) of rStarFac at U,V point when using |
1489 |
|
vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection) |
1490 |
|
update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20. |
1491 |
|
|
1492 |
|
checkpoint62k (2010/09/17) |
1493 |
|
o adjoint |
1494 |
|
* changed verification/global_ocean.cs32x15 ; adjoint now tests |
1495 |
|
Adams-Bashforth 3 + NLFS + RSTAR |
1496 |
|
* some more modifs required for ECCO-GODAE v4 |
1497 |
|
o pkg/seaice |
1498 |
|
add SEAICE_AGE_VOL option to use volume instead of area for |
1499 |
|
integrating SEAICE_AGE |
1500 |
|
o model/src: |
1501 |
|
first check-in of sigma & hybrid-sigma coordinate code ; also includes |
1502 |
|
non-linear free-surface parts ; but pressure-gradient not yet coded. |
1503 |
|
o pkg/ptracers: |
1504 |
|
option for ptracer to convert Salt Relax into additional EmP. |
1505 |
|
tested in exp. global_ocean.90x40x15.dwnslp (update output) |
1506 |
|
|
1507 |
|
checkpoint62j (2010/08/25) |
1508 |
|
o pkg/ggl90: |
1509 |
|
other minor changes: remove 3-D temp array gTKE (+ add argument myIter) |
1510 |
|
o pkg/dic: car_flux.F, phos_flux.F |
1511 |
|
- reduce number of exp-calls in order to improve performance |
1512 |
|
- clean up a little (replace fields by their macros, etc., fix |
1513 |
|
typo in CPP-flag) |
1514 |
|
o pkg/ggl90: minor changes |
1515 |
|
- GGL90diffKrS was removed --> always use GGL90diffKr |
1516 |
|
- GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV |
1517 |
|
- hack of mxlMaxFlag=2 --> ensure mixing between first and second level |
1518 |
|
(commented out for now) |
1519 |
|
- change in max/min operations to ensure that smoothing is ok |
1520 |
|
- smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr) |
1521 |
|
- always use diffKrNrT as background profile (i.e. never use diffKr field) |
1522 |
|
o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj) |
1523 |
|
o pkg/dic: |
1524 |
|
- model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better |
1525 |
|
vectorization |
1526 |
|
- small bug fix in insol for the unlikely case of a cartesian grid |
1527 |
|
- towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F |
1528 |
|
+ now vectorize, which also removes adjoint recomputations; |
1529 |
|
+ replace integer maksp1 by _RL maskp1 |
1530 |
|
+ replace a**x by exp(x*log(a)) in phos_flux.F for speed |
1531 |
|
|
1532 |
|
checkpoint62i (2010/07/21) |
1533 |
|
o pkg/flt: |
1534 |
|
- with OBCS: stop floats which enter the OB region |
1535 |
|
o model/src: |
1536 |
|
- use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones) |
1537 |
|
for implicit vertical advection. |
1538 |
|
o pkg/seaice: |
1539 |
|
- account for melting in seaice age evolution. |
1540 |
|
- remove double counting of seaice ridging effect on seaice age. |
1541 |
|
|
1542 |
|
checkpoint62h (2010/06/18) |
1543 |
|
o pkg/exch2: |
1544 |
|
- remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1). |
1545 |
|
o tools/genmake2 |
1546 |
|
- remove "-pdefault" option: redundant with the use of "packages.conf"; |
1547 |
|
- remove file pkg/pkg_default : set the default as a pkg group |
1548 |
|
("default_pkg_list") defined in pkg/pkg_groups; |
1549 |
|
- fix for case pkg/pkg_depend is missing (was hanging before); |
1550 |
|
- add option "-pgroups" to specify a different pkg_groups than the default. |
1551 |
|
o verification/adjustment.cs-32x32x1: |
1552 |
|
add a "minimal" set-up test (code_min & input_min) which only compiles |
1553 |
|
eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc. |
1554 |
|
o tools/genmake2 |
1555 |
|
- extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg])) |
1556 |
|
- fix details of checking for mnc & profile pkg when NetCDF is unavailable. |
1557 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
1558 |
|
files are nearly the same anyway. |
1559 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
1560 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
1561 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
1562 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
1563 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
1564 |
|
- replace |
1565 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
1566 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
1567 |
|
by |
1568 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
1569 |
|
(changes results) |
1570 |
|
-> exf_bulkformulae v1.22, |
1571 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
1572 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
1573 |
|
output.txt 1.63 |
1574 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
1575 |
|
seaice_obcs: output.txt 1.10) |
1576 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
1577 |
|
-> exf_bulkformulae v1.23, |
1578 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
1579 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
1580 |
|
Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice. |
1581 |
|
o adjoint of exch-1: |
1582 |
|
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
1583 |
|
(note: was already like this when using EXCH-2) and remove flow dir |
1584 |
|
and hand-written AD version of high-level EXCH S/R (pkg/autodiff); |
1585 |
|
- provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow); |
1586 |
|
- update pkg/exch2 diff list. |
1587 |
|
|
1588 |
|
checkpoint62g (2010/05/19) |
1589 |
|
o eesupp/src (exch-1): |
1590 |
|
- split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F) |
1591 |
|
and remove argument "simulationMode"; same thing for all exch_*rx_cube.F |
1592 |
|
(renamed to exch1_*rx_cube.F). |
1593 |
|
- change accordingly exch_*_rx.template and AD version in pkg/autodiff |
1594 |
|
to call new exch1 S/R ; update Makefile and .cvsignore. |
1595 |
|
- replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove |
1596 |
|
exch2_xy_rx later) |
1597 |
|
Note: after updating your code, need to run "make clean" in eesupp/src |
1598 |
|
o test experiment bottom_ctrl_5x5: |
1599 |
|
new output_adm.txt with fewer grdchk & less monitor output. |
1600 |
|
o model/src: |
1601 |
|
remove the call to ini_cori in initialise_varia.F (just keep the usual one |
1602 |
|
in initialise_fixed.F). More consistent with coriolis & horizontal grid |
1603 |
|
beeing treated in the same way (ini_grid is not called a 2nd time). |
1604 |
|
o pkg/exf: |
1605 |
|
- rewrite exf_bulk_largeyeager04.F for better vectorization, changes |
1606 |
|
global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated |
1607 |
|
- fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now) |
1608 |
|
- cosmetic changes to exf_bulkformulae.F to make it look more like |
1609 |
|
exf_bulk_largeyeager04.F |
1610 |
|
o eesupp/src (exch-1): |
1611 |
|
- Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1). |
1612 |
|
- Separate buffer filling and MPI sending: allow EXCH-1 to work for local |
1613 |
|
array (non-shared) when using MPI+MTH. Also reduces number of BARRIER |
1614 |
|
(even without using MPI). |
1615 |
|
- Message mode: move RecvAck setting (indicator of buffer being ready) |
1616 |
|
from send_put to recv_get S/R (was useless before, but not sure if |
1617 |
|
it's much more useful now); |
1618 |
|
- Switch the order of sync: MPI-proc 1rst and then threads; |
1619 |
|
- take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead. |
1620 |
|
- fix AD code for communication mode ='get' (but not used). |
1621 |
|
o model/src: |
1622 |
|
initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does |
1623 |
|
not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp). |
1624 |
|
o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API |
1625 |
|
o pkg/ctrl: require a specific set of control variables and exf-flags for |
1626 |
|
adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied) |
1627 |
|
o model/src: |
1628 |
|
a) 1rst version of a new driver S/R to turn-off output freq and flags after the |
1629 |
|
1rst forward sweep, to avoid over-writing output files during recomputations |
1630 |
|
recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?) |
1631 |
|
b) 2nd version: |
1632 |
|
- add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO); |
1633 |
|
- switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast, |
1634 |
|
writePickupAtEnd) + seaice & ptracers output; |
1635 |
|
- do not switch off MNC flags (otherwise, won't get admonitor netcdf file) |
1636 |
|
o model/src: |
1637 |
|
- new S/R rotate_uv2en_rl (..._rs) that rotates vector fields. |
1638 |
|
o pkg/exch2: |
1639 |
|
- remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ; |
1640 |
|
- add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch). |
1641 |
|
o pkg/autodiff & exch2: |
1642 |
|
process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF |
1643 |
|
(for now, only if ALLOW_EXCH2 is defined). |
1644 |
|
o pkg/autodiff: |
1645 |
|
- include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F |
1646 |
|
(not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly. |
1647 |
|
+ clean-up comments (_RS is not always real*4) |
1648 |
|
- fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R) |
1649 |
|
- add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2: |
1650 |
|
was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs. |
1651 |
|
o testreport (AD-tests): |
1652 |
|
no longer link files from dir "../input" (1rst link files from |
1653 |
|
"../input_ad.[xx]" if secondary test "xx" and then from "../input_ad") |
1654 |
|
|
1655 |
|
checkpoint62f (2010/04/29) |
1656 |
|
o model/src/the_main_loop.F: |
1657 |
|
adjust store directives for seaice evp and multicategory according to |
1658 |
|
pkg/ecco/the_main_loop.F |
1659 |
|
o adjoint: |
1660 |
|
global_sum_ad was incomplete (noted many times by many people ;) |
1661 |
|
nice description by Jean U. as follows: |
1662 |
|
* allreduce(var) in global_sum.F can be interpreted as |
1663 |
|
reduce(sum) followed by broadcast of sum. |
1664 |
|
* The adjoint of that is |
1665 |
|
sum(adjoint) followed by broadcast(summed adjoint value) |
1666 |
|
or in other words, allreduce(sum, adjoint vars) |
1667 |
|
We were missing the sum(adjoint)! |
1668 |
|
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |
1669 |
|
(noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset). |
1670 |
|
The fix should produce 16-digit accuracy between |
1671 |
|
single-CPU multi-tile (e.g. nSx=2, nPx=1) and |
1672 |
|
multi-CPU single-tile (e.g. nSx=1, nPx-2) |
1673 |
|
We'll probably change this yet again shortly |
1674 |
|
o eesupp/src: |
1675 |
|
- fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?) |
1676 |
|
o pkg/icefront |
1677 |
|
- ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving |
1678 |
|
specification of addmass array based on a 2D field, which is added |
1679 |
|
at bottommost wet level at each horizontal location. |
1680 |
|
o model/src: |
1681 |
|
horizontal grid initialisation (other than curvilinear): add code for Exch2 IO |
1682 |
|
layout; (not always compatible with delX,delY setting; commented out for now). |
1683 |
|
o pkg/exch2: |
1684 |
|
change tile to processor setting (case nSy*nPy > 1): allows default model mapping |
1685 |
|
(myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config. |
1686 |
|
|
1687 |
|
checkpoint62e (2010/04/15) |
1688 |
|
o pkg/obcs: |
1689 |
|
- fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert). |
1690 |
|
o pkg/dic: |
1691 |
|
-fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up; |
1692 |
|
(note: not presently tested in any forward verification exp.) |
1693 |
|
update tutorial_global_oce_biogeo AD output file. |
1694 |
|
o pkg/exf: |
1695 |
|
- account for the variation of albedo as a function of zenith angle |
1696 |
|
by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h |
1697 |
|
o build_options: |
1698 |
|
- rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas" |
1699 |
|
o pkg/dic: |
1700 |
|
change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart: |
1701 |
|
- use binary pickup file for restart; |
1702 |
|
- initialise atmos-CO2 box from dic_pCO2 parameter; |
1703 |
|
- fix multi-threaded. |
1704 |
|
o pkg/rbcs: |
1705 |
|
- clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ; |
1706 |
|
change (+ fix IO calls) type of array RBC_mask from _RL to _RS. |
1707 |
|
- add RBCS to exp4 passive tracer 01 (rbcs was previously untested) |
1708 |
|
and update output.txt |
1709 |
|
o pkg/kpp: |
1710 |
|
- add diagnostics for KPP non-local flux of Temp, Salinity and pTracers; |
1711 |
|
- change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS |
1712 |
|
(= ratio of KPP non-local (salt) flux relative to surface-flux) when |
1713 |
|
using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat '); |
1714 |
|
- change pkg/offline to read-in average KPPghat*KPPdiffKzS from file |
1715 |
|
KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile). |
1716 |
|
o pkg/offline: |
1717 |
|
fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor |
1718 |
|
(bug was added in version 1.10 on 2007-08-23). |
1719 |
|
o pkg/offline: |
1720 |
|
- no need to specify periodicExternalForcing, etc ... to use offline pack |
1721 |
|
- offline input files no longer just single prec --> parameter offlineLoadPrec |
1722 |
|
o verification/lab_sea: |
1723 |
|
change AD test to multi-tile setup and update all 4 AD output. |
1724 |
|
NOTE: while cost function values remain very similar, |
1725 |
|
gradients are very different, although gradient checks are self-consistent |
1726 |
|
Should try to get to the bottom of this (cost function summation order?) |
1727 |
|
o pkg/dic: |
1728 |
|
in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid |
1729 |
|
a weakness of TAF that drops part of double precision in log10 derivative. |
1730 |
|
<= changes removed since problem has been fixed in current TAF version 1.9.71 |
1731 |
|
update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo. |
1732 |
|
o pkg/ecco: |
1733 |
|
add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F |
1734 |
|
update all 4 lab_sea AD output. |
1735 |
|
|
1736 |
|
checkpoint62d (2010/03/22) |
1737 |
|
o build_options: |
1738 |
|
remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles. |
1739 |
|
o remove unbalanced quote (single or double) in commented line of source code |
1740 |
|
(may cause some warning with some preprocessor/makedepend versions). |
1741 |
|
o pkg/seaice: |
1742 |
|
fix seaice_model.F for adjoint (gael) and update AD results of experiments |
1743 |
|
lab_sea (std + evp + noseaicedyn) and offline_exf_seaice. |
1744 |
|
o testreport: |
1745 |
|
add option '-runonly' (short: '-ro') to just do the run part (without make). |
1746 |
|
o eesupp: remove JAM communication code (obsolete). |
1747 |
|
o add option to genmake2 & testreport to switch "_RS" type to "real*4" |
1748 |
|
(if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return |
1749 |
|
to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1 |
1750 |
|
(update also the output). |
1751 |
|
|
1752 |
|
checkpoint62c (2010/03/02) |
1753 |
|
o tools/build_options : |
1754 |
|
move (some) old optfiles from build_options/ to build_options/unsupported/ |
1755 |
|
o model/src and pkg/exf |
1756 |
|
surface relaxation -- separating data and data.exf options |
1757 |
|
The point is to ensure that we specify the surface relaxation |
1758 |
|
either in data or in data.exf (but not half and half) and to |
1759 |
|
avoid an accidental relaxation to 0 (which happened if a time |
1760 |
|
scale was specified but the file name was left empty) |
1761 |
|
o model/src model/inc and pkg/mom_common |
1762 |
|
ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity |
1763 |
|
=> addition to the viscosity field as computed by others schemes |
1764 |
|
o tools/build_options: |
1765 |
|
- rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile) |
1766 |
|
but keep the former optfile for few weeks for smooth transition |
1767 |
|
o pkg/ecco |
1768 |
|
- allow user defined cost function contributions |
1769 |
|
CPP: ALLOW_USERCOST_CONTRIBUTION |
1770 |
|
USAGE: compute contributions in cost_usercost_all.F |
1771 |
|
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
1772 |
|
the two options are complementary. |
1773 |
|
o pkg/smooth |
1774 |
|
- migration from contrib to the main repository |
1775 |
|
|
1776 |
|
checkpoint62b (2010/01/26) |
1777 |
|
o pkg/monitor: |
1778 |
|
- change back mon_printstats_rl.F & mon_stats_rl.F and add a stop |
1779 |
|
(in case someone forgot to update customized pieces of code) |
1780 |
|
o nonHydrostatic: |
1781 |
|
- add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested); |
1782 |
|
- add a simple 2-D experiment (short_surf_wave) to test it. |
1783 |
|
o pkg/icefront: |
1784 |
|
adding the shell of, and the hooks to, a new package that |
1785 |
|
will model melting and freezing of vertical glacier ice fronts |
1786 |
|
o momentum: |
1787 |
|
add diagnostics of momentum tendency from Hydrostatic pressure gradient |
1788 |
|
(without surf.pressure term: would need a 2nd filling since implicit term). |
1789 |
|
o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace |
1790 |
|
two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR |
1791 |
|
cannot deal with the former |
1792 |
|
o cleaning: |
1793 |
|
- remove all (except OpenAD) old TLM output from results_ad dirs. |
1794 |
|
- remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R) |
1795 |
|
- comment out maskH definition (replaced by maskInC) |
1796 |
|
o pkg/monitor: |
1797 |
|
- change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl |
1798 |
|
& mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs. |
1799 |
|
|
1800 |
|
checkpoint62a (2010/01/15) |
1801 |
|
o model/src: |
1802 |
|
- bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4) |
1803 |
|
o pkg/diagnostics: |
1804 |
|
- add optional level number diagnostics (i.e., level number to be define |
1805 |
|
explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X". |
1806 |
|
- strictly check for valid parser-code(10) ; |
1807 |
|
- check if adding diag to the list from the right place. |
1808 |
|
o pkg/longstep: |
1809 |
|
- change parameters and fix tracer conservation with rstar/nonlinear free surface |
1810 |
|
o diagnostics: |
1811 |
|
- in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer |
1812 |
|
S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics. |
1813 |
|
o pkg/diagnostics: |
1814 |
|
- Add option for writing vertical integral (sum of selected levels) of an output |
1815 |
|
field instead of writing output field levels. Activate this option on a per |
1816 |
|
output-file basis, by setting the 2nd character of fileflag to 'I'. |
1817 |
|
- Add field-specific information relative to level integral in 3rd postion |
1818 |
|
of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate |
1819 |
|
vertically (x level-thickness x hFac), "r"=same but without hFac. |
1820 |
|
o do_the_model_io: |
1821 |
|
- pass end-of-model-run flag as argument, from forward_step to diagnostics_write: |
1822 |
|
in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before |
1823 |
|
writing pickups and stopping. |
1824 |
|
o pkg/diagnostics (for now, only with mdsio): |
1825 |
|
- write time information to meta file (and modify accordingly rdmds.m) : |
1826 |
|
time-averaged diagnostics output: write starting and ending time of the |
1827 |
|
time-averaging interval ; snap-shot diagnostics output remains unchanged; |
1828 |
|
o pkg/timeave: |
1829 |
|
- S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously |
1830 |
|
always Nr), now assumed to be equal to number of levels of averaged field; |
1831 |
|
only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F |
1832 |
|
o pkg/sbo: |
1833 |
|
- fix ocean bottom pressure global-average & 2-D time-ave output (was |
1834 |
|
neither initialised nor filled). |
1835 |
|
- add starting iteration in suffix of global-average output file |
1836 |
|
(to avoid over-writing the file after a restart) |
1837 |
|
- use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb). |
1838 |
|
o time-average: |
1839 |
|
- use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj) |
1840 |
|
(pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf, |
1841 |
|
ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice) |
1842 |
|
this fix DIC_COST cumulative-time array (previously: bi,bj,k) |
1843 |
|
- fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice) |
1844 |
|
- fix missing accumulation for pkg/opps. |
1845 |
|
- cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0) |
1846 |
|
(pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81); |
1847 |
|
- fix initialisation of time-ave vars and do only full time-step increment |
1848 |
|
(i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81); |
1849 |
|
o pkg/layers: |
1850 |
|
- use standard RW pkg S/R to write the output |
1851 |
|
and remove local write_fld version (which had a problem). |
1852 |
|
- use simple cumulative-time array (no level index) to fix time-ave S/R calls. |
1853 |
|
- fix LAYERS_CALC argument list. |
1854 |
|
o pkg/timeave: |
1855 |
|
- store cumulative-time in a simple tiled array (drop the level index) |
1856 |
|
- add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array. |
1857 |
|
o pkg/ocn,aim_compon_interf |
1858 |
|
- changes for multi-threaded coupled run. (tested with ifort-11 on danton) |
1859 |
|
|
1860 |
|
checkpoint62 (2009/12/23) |
1861 |
|
o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output. |
1862 |
|
(was not previously tested in any other exp.) |
1863 |
|
o pkg/monitor: |
1864 |
|
- clean-up _RL/_RS version: add specific S/R for statistics with mask & volume: |
1865 |
|
mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one |
1866 |
|
(mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics. |
1867 |
|
- use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F). |
1868 |
|
- change del2 calculation. |
1869 |
|
- use interior masks (instead of maskH, <- to be remove). |
1870 |
|
- shorter monitor suffix for forcing stats ("forcing" instead of "extforcing"). |
1871 |
|
o mask & obcs: |
1872 |
|
- define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S). |
1873 |
|
- move global area computation from ini_masks_etc.F to ini_linear_phisurf.F |
1874 |
|
(called after packages_init_fixed) |
1875 |
|
o pkg/obcs: |
1876 |
|
- move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once. |
1877 |
|
Fixes bug in obcs+exf with nSx*nSy.GT.1 |
1878 |
|
- fix multi-tile handling in obcs balance code |
1879 |
|
o nonHydrostatic: |
1880 |
|
- Implement AB-3 for non-hydrostatic vertical momentum ; |
1881 |
|
(change ordering of var. stored in pickup file when using NH) |
1882 |
|
- move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D. |
1883 |
|
- add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x |
1884 |
|
(in prep. for new NH free surface form). |
1885 |
|
o pkg/obcs: |
1886 |
|
add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe |
1887 |
|
o model/src: |
1888 |
|
fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography |
1889 |
|
|
1890 |
|
checkpoint61z (2009/12/01) |
1891 |
|
o nonHydrostatic: |
1892 |
|
Fix missing vertical flux of vert. momentum near surface (k=1). This fixes |
1893 |
|
a spurious source of energy in simple baroclinic adjusment test case. |
1894 |
|
Update all non-hydrostatic exp output. |
1895 |
|
o model/src (3-d solver): |
1896 |
|
Change again 3-D solver free-surface RHS term when exactConserv=T: |
1897 |
|
simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1 |
1898 |
|
(which was not the case with previous formulation). |
1899 |
|
To recover previous version, just reset "oldFreeSurfTerm" to previous value. |
1900 |
|
Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW. |
1901 |
|
o nonHydrostatic: |
1902 |
|
- compatible with implicDiv2Dflow < 1 ; + implement implicit factor |
1903 |
|
for Non-Hydrostatic pressure gradient (similar to implicSurfPress). |
1904 |
|
- change 3-D solver to work with r* (for now, only with linear free-surf.) |
1905 |
|
- add few debug diagnostics (cg3d_x, residual) |
1906 |
|
o model/src: |
1907 |
|
fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b). |
1908 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
1909 |
|
o update output of exp. global_ocean.cs32x15.icedyn after removing |
1910 |
|
#define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h |
1911 |
|
o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
1912 |
|
o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output |
1913 |
|
for complex grids, for now only to "state", "adstate", "adexf", "adseaice" |
1914 |
|
o model: add Christopher Wolfe's implemetation of the single reduction cg2d |
1915 |
|
(d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and |
1916 |
|
runtime flag useSRCGSolver. Modify verification experiment global_with_exf |
1917 |
|
to test this code |
1918 |
|
o pkg/cd_code: |
1919 |
|
Change defaut D-grid time-stepping to get the same for D-grid momentum as for |
1920 |
|
C-grid momentum. D-grid velocity used to be stepped forward in time with |
1921 |
|
Adams-Bashforth only on surface pressure term. Tests show that using AB on |
1922 |
|
D-grid coriolis term improves stability (as expected from CD-scheme paper). |
1923 |
|
To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h). |
1924 |
|
Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2), |
1925 |
|
lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD), |
1926 |
|
tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens. |
1927 |
|
Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2, |
1928 |
|
global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD. |
1929 |
|
o pkg/obcs: |
1930 |
|
- fix bug in initialisation (broken since Oct 1rst modification) |
1931 |
|
for useOBCSprescribe without useEXF. |
1932 |
|
|
1933 |
|
checkpoint61y (2009/11/15) |
1934 |
|
o pkg/seaice |
1935 |
|
- change (once again) the discretization for the evp solver: rather than |
1936 |
|
squaring the averages of strain rates, average the squares to give |
1937 |
|
a better approximation to VP behavior (in simple test); this breaks |
1938 |
|
verification experiments that use EVP (lab_sea and lab_sea.hb87) |
1939 |
|
--> update outputs |
1940 |
|
o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit) |
1941 |
|
to improve vectorization of adjoint code on TARGET_NEC_SX |
1942 |
|
o verification/vermix: |
1943 |
|
- change vermix to a more "classical" 1d column with high vertical |
1944 |
|
resolution, seasonal heat flux forcing and constant wind forcing |
1945 |
|
--> update outputs |
1946 |
|
o pkg/seaice |
1947 |
|
- fix diagnostics of principal stress components for EVP |
1948 |
|
- add optional diagnostics of non-linear convergence for LSOR solver |
1949 |
|
- make maximum zeta a runtime parameter |
1950 |
|
o model/src (3-d solver): |
1951 |
|
Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49), |
1952 |
|
which consisted in removing the Surf. Non-Hydrostatic pressure from the |
1953 |
|
whole column and adding it to Eta (inspired from Casualli, 1999): |
1954 |
|
Only affects 3-D solver initial guess and only if using ExactConserv, |
1955 |
|
but tests did show a degradation of solver convergence. For this reason, |
1956 |
|
decide to disable this piece of code. |
1957 |
|
to recover previous version, just set zeroPsNH = exactConserv (line 78). |
1958 |
|
Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW |
1959 |
|
o pkg/ggl90: |
1960 |
|
- fix previous modif (unfortunatly has not been documented here). |
1961 |
|
o pkg/seaice/autodiff: |
1962 |
|
- add CPP flag to include clipping of zeta in EVP code; |
1963 |
|
although clipping of zeta is not necessary for EVP and not recommended |
1964 |
|
it was done by default, now clipping is disabled by default |
1965 |
|
- modify computation and store zetaC/Z in seaice_evp for TAF |
1966 |
|
- add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default) |
1967 |
|
- change seaice_calc_viscosities/strainrates for better |
1968 |
|
vectorization after AD by TAF |
1969 |
|
- rearrange common blocks in SEAICE.h once again for easier dumps of |
1970 |
|
adjoint output, adjust adcommon.h and g_common.h |
1971 |
|
- change flux form of default advection scheme for better vectorization |
1972 |
|
of adjoint code |
1973 |
|
- modify lab_sea/input.lsr to test the flux form of default advection |
1974 |
|
scheme |
1975 |
|
o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level |
1976 |
|
transition in checkpoint61r) |
1977 |
|
|
1978 |
|
checkpoint61x (2009/10/19) |
1979 |
|
o adjoint: adding two new verification experiments |
1980 |
|
* tutorial_global_biogeo: an online dic sensitivity experiment |
1981 |
|
(work with G. Forget) |
1982 |
|
* tutorial_dic_adjoffline: an offline dic sensitivity experiment |
1983 |
|
(an update of the Dutkiewicz et al., 2006 paper) |
1984 |
|
Both use the same CO2FLUX cost function, but different controls |
1985 |
|
Gradient checks look good, but some recomp. could still be traightened out |
1986 |
|
Should add xx_dic control variable to test at some point |
1987 |
|
o model/src: |
1988 |
|
add run-time parameters to check and/or mask initial Temp & Salt |
1989 |
|
o pkg/ptracers: |
1990 |
|
apply zonal filter (if used) to all passive tracers |
1991 |
|
|
1992 |
|
checkpoint61w (2009/10/12) |
1993 |
|
o adjoint: |
1994 |
|
* update and finish work on adjoint of dic package (G. Forget) |
1995 |
|
* start adjoint of offline package |
1996 |
|
* bug fix for cube-sphere TLM code (active_file_g.F) |
1997 |
|
o tutorial_global_oce_optim: |
1998 |
|
now tested with 4 tiles (change data.grdchk and update output_adm.txt) |
1999 |
|
and add SIZE.h_mpi for MPI testing |
2000 |
|
o pkg autodiff |
2001 |
|
- fix bug in autodiff_restore |
2002 |
|
- make genmake2 remove comments and empty lines from ad_input_code.f in |
2003 |
|
order to reduce file size (new script file remove_comments_sed) |
2004 |
|
o allows to specify vertical profile of vertical viscosity (viscArNr) |
2005 |
|
o pkg autodiff |
2006 |
|
autodiff_ini_model_io: comment out writing of grid information to netcdf |
2007 |
|
files, because at this time the grid fields are a bunch of zeros |
2008 |
|
(this is analogous to ini_mnc_vars.F) |
2009 |
|
o pkg seaice/autodiff: |
2010 |
|
left-over from removing the 3-time-level fields: |
2011 |
|
- small rearrangement of common blocks (SEAICE.h) |
2012 |
|
- fix field declaration in order to get meaningful output in |
2013 |
|
adseaice.*.nc (adcommon.h) |
2014 |
|
o pkg obcs: |
2015 |
|
- go through NH code only if nonHydrostatic=T |
2016 |
|
- fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart) |
2017 |
|
- move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields |
2018 |
|
=> Update output of experiment seaice_obcs |
2019 |
|
- useOBCSbalance: code is wrong with multi-tile / proc: add a stop. |
2020 |
|
- fix NH+Orlanski restart (add wvel OBC value in pickup file) |
2021 |
|
- fix restart for useOBCSprescribe + useEXF |
2022 |
|
o pkg ctrl |
2023 |
|
- make obcs as control parameter work also with useSingleCPUio |
2024 |
|
- replace a few sny and snx by Ny and Nx to be consistent with |
2025 |
|
ctrl_set_globfld_x/yz.F |
2026 |
|
o pkg seaice |
2027 |
|
- re-introduce global field frWtrAtm for the case of |
2028 |
|
ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F) |
2029 |
|
- catch the case of an empty filename in seaice_cost_init_fixed.F |
2030 |
|
o pkg ecco: |
2031 |
|
- small bug fixes in the_main_loop |
2032 |
|
. fix order of monitor arguments |
2033 |
|
. change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY |
2034 |
|
. move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so |
2035 |
|
that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF |
2036 |
|
- replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the |
2037 |
|
imbalance diagnostics for wmean_h/sflux = 0 |
2038 |
|
- add actual values to f_obcsn/s/w/e in ecco_cost_final.F |
2039 |
|
- catch the case of empty filenames in ecco_cost_init_fixed.F |
2040 |
|
and ecco_readparms.F |
2041 |
|
- fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta) |
2042 |
|
to make this statement meaningfull in ecco_cost_weights.F |
2043 |
|
o pkg zonal_filt: |
2044 |
|
- change ZONAL_FILTER S/R interface (allows to filter 2-D fields) |
2045 |
|
- when using rStar, filter uVel*hFacW instead of uVel |
2046 |
|
(tested without topography: fix a Pb of growing instability with NLFS) |
2047 |
|
o pkg/aim/thsice: |
2048 |
|
-Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F |
2049 |
|
(works as SST restoring) |
2050 |
|
o pkg/thsice: |
2051 |
|
-add specific parameter for salt restoring in slab mixed-layer |
2052 |
|
(by default equal to the temperature restoring) |
2053 |
|
|
2054 |
|
checkpoint61v (2009/09/21) |
2055 |
|
o pkg/kpp: |
2056 |
|
-add double diffusive contributions as a hack, turned off by default |
2057 |
|
for now, and the code can be excluded with a CPP-flag |
2058 |
|
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX |
2059 |
|
-add a verification experiments to "vermix" to test this code |
2060 |
|
o pkg/mom_common: |
2061 |
|
Move computation of length scales to mom_init_fixed.F (avoid recomputation |
2062 |
|
at each time-steps*levels). |
2063 |
|
o pkg/layers: |
2064 |
|
Created a new package for computing volume fluxes in temperature or |
2065 |
|
[not yet implemented] density layers, e.g. for calculating residual |
2066 |
|
overturning circulations. |
2067 |
|
o pkg/diagnostics: |
2068 |
|
implement a RS type version for the set of DIAGNOSTICS-FILL subroutines |
2069 |
|
o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option) |
2070 |
|
o pkg/mdsio (& pkg/rw): rework high level S/R interface: |
2071 |
|
To avoid mixing type (RS/RL) of input/output array argument, |
2072 |
|
replace single mixed-type array with a pair from each type (RS/RL). |
2073 |
|
o setting pickupSuff force to start from a pickup (even if nIter0=0): this |
2074 |
|
is now implemented for all pkgs (previously only done for the main pickup) |
2075 |
|
|
2076 |
|
checkpoint61u (2009/08/25) |
2077 |
|
o pkg/obcs: |
2078 |
|
- change OB?eta from _RS to _RL and put them into a separate commen block |
2079 |
|
- add code to read OB?eta from a file via obcs_prescribe_read: the code |
2080 |
|
compiles and does not destroy any other experiments, the data is read |
2081 |
|
properly, but the code is not tested in actual applications |
2082 |
|
o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to |
2083 |
|
create a meaningful unit attribute for the time coordinate variable |
2084 |
o pkg/ebm: add plenty of missing "_d 0" ; |
o pkg/ebm: add plenty of missing "_d 0" ; |
2085 |
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
2086 |
Notes: several pieces of code only works for (very) specific set up |
Notes: several pieces of code only works for (very) specific set up |
2098 |
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
2099 |
2d-fields, for slightly better performance |
2d-fields, for slightly better performance |
2100 |
|
|
2101 |
checkpoint61t |
checkpoint61t (2009/07/22) |
2102 |
o pkg/seaice: |
o pkg/seaice: |
2103 |
- remove unused variables in seaice_evp |
- remove unused variables in seaice_evp |
2104 |
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
2118 |
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
2119 |
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
2120 |
|
|
2121 |
checkpoint61s |
checkpoint61s (2009/06/30) |
2122 |
o pkg/exch2 (exch2_rxN_cube*): |
o pkg/exch2 (exch2_rxN_cube*): |
2123 |
remove last BARRIER (no need to synchronise after getting data from shared |
remove last BARRIER (no need to synchronise after getting data from shared |
2124 |
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
2142 |
o pkg/seaice: |
o pkg/seaice: |
2143 |
fix previous modif (3-level field removed) for old-pickup reading |
fix previous modif (3-level field removed) for old-pickup reading |
2144 |
|
|
2145 |
checkpoint61r |
checkpoint61r (2009/06/25) |
2146 |
o pkg/seaice: |
o pkg/seaice: |
2147 |
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
2148 |
1. introduce fields for time step (N-1) |
1. introduce fields for time step (N-1) |
2156 |
- adjusted adjoint accordingly; |
- adjusted adjoint accordingly; |
2157 |
gradient checks have improved by an order of magnitude! |
gradient checks have improved by an order of magnitude! |
2158 |
|
|
2159 |
checkpoint61q |
checkpoint61q (2009/06/22) |
2160 |
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
2161 |
- the boundary conditions along open boundaries are unclear, because the |
- the boundary conditions along open boundaries are unclear, because the |
2162 |
associated masks are set to zero and are thus treated as closed when |
associated masks are set to zero and are thus treated as closed when |
2181 |
- add diagnostics for surface temperature, atmospheric and oceanic |
- add diagnostics for surface temperature, atmospheric and oceanic |
2182 |
heat flux, and atmospheric and oceanic ice growth |
heat flux, and atmospheric and oceanic ice growth |
2183 |
|
|
2184 |
checkpoint61p |
checkpoint61p (2009/06/10) |
2185 |
o eesupp (global_max & global_sum): |
o eesupp (global_max & global_sum): |
2186 |
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
2187 |
- remove starting & endding barrier (no longer needed) |
- remove starting & endding barrier (no longer needed) |
2243 |
should be called before a "stop" if we know that all process are going |
should be called before a "stop" if we know that all process are going |
2244 |
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
2245 |
|
|
2246 |
checkpoint61o |
checkpoint61o (2009/05/26) |
2247 |
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
2248 |
o model/src/ini_curvilinear_grid.F: |
o model/src/ini_curvilinear_grid.F: |
2249 |
compute angleSin/CosC when they are not read from a file |
compute angleSin/CosC when they are not read from a file |
2284 |
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
2285 |
in utils/exch2/input. |
in utils/exch2/input. |
2286 |
|
|
2287 |
checkpoint61n |
checkpoint61n (2009/05/12) |
2288 |
o eesupp & mdsio (SingleCpuIO): |
o eesupp & mdsio (SingleCpuIO): |
2289 |
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
2290 |
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
2297 |
when using exch2. Add S/R to map global io-buffer to global model array. |
when using exch2. Add S/R to map global io-buffer to global model array. |
2298 |
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
2299 |
|
|
2300 |
checkpoint61m |
checkpoint61m (2009/04/29) |
2301 |
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
2302 |
and add 3 other S/R for other types (R4,R8,RS). |
and add 3 other S/R for other types (R4,R8,RS). |
2303 |
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
2333 |
and keep the original tile numbering. Note: compatible with old |
and keep the original tile numbering. Note: compatible with old |
2334 |
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
2335 |
|
|
2336 |
checkpoint61l |
checkpoint61l (2009/04/07) |
2337 |
o Overlaps had been forgotten in calculating ijk keys : fixed |
o Overlaps had been forgotten in calculating ijk keys : fixed |
2338 |
o fix cyrus makedepend for gcc 4.4 |
o fix cyrus makedepend for gcc 4.4 |
2339 |
o experiment fizhi-cs-aqualev20: |
o experiment fizhi-cs-aqualev20: |
2381 |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
2382 |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
2383 |
|
|
2384 |
checkpoint61k |
checkpoint61k (2009/03/18) |
2385 |
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
2386 |
seaice_lsr: fixed a few metric terms, |
seaice_lsr: fixed a few metric terms, |
2387 |
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
2398 |
updated all relevant verification experiments (except lab_sea//output_adm.txt |
updated all relevant verification experiments (except lab_sea//output_adm.txt |
2399 |
which was left over, but fails at level 7 & 6) |
which was left over, but fails at level 7 & 6) |
2400 |
|
|
2401 |
checkpoint61j |
checkpoint61j (2009/03/17) |
2402 |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
2403 |
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
2404 |
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
2426 |
TAF store directivs "byte" and "kind" seem equivalent; |
TAF store directivs "byte" and "kind" seem equivalent; |
2427 |
Most tamc.h have been updated correspondingly. |
Most tamc.h have been updated correspondingly. |
2428 |
|
|
2429 |
checkpoint61i |
checkpoint61i (2009/02/13) |
2430 |
o autodiff: |
o autodiff: |
2431 |
fix autodiff_sore/_restore indices for obcs |
fix autodiff_sore/_restore indices for obcs |
2432 |
(spotted by I. Hoteit, M. Mazloff) |
(spotted by I. Hoteit, M. Mazloff) |
2461 |
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
2462 |
(maintain temporary backward compatibility, until next checkpoint) |
(maintain temporary backward compatibility, until next checkpoint) |
2463 |
|
|
2464 |
checkpoint61h |
checkpoint61h (2009/01/27) |
2465 |
o pkg/diagnostics with "periodic averaging diagnostics": |
o pkg/diagnostics with "periodic averaging diagnostics": |
2466 |
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
2467 |
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
2485 |
(drop to 4 digits matching for grad). But this test does not look very |
(drop to 4 digits matching for grad). But this test does not look very |
2486 |
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
2487 |
|
|
2488 |
checkpoint61g |
checkpoint61g (2008/12/29) |
2489 |
o pkg/flt: |
o pkg/flt: |
2490 |
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
2491 |
+ make OPTIONS file more standard. |
+ make OPTIONS file more standard. |
2498 |
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
2499 |
a still unfixed compiler/optimization bug |
a still unfixed compiler/optimization bug |
2500 |
|
|
2501 |
checkpoint61f |
checkpoint61f (2008/11/21) |
2502 |
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
2503 |
update results of global_ocean.cs32x15.icedyn test. |
update results of global_ocean.cs32x15.icedyn test. |
2504 |
o move getcon.F from model/src to pkg/fizhi. |
o move getcon.F from model/src to pkg/fizhi. |
2527 |
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
2528 |
(generate new output). |
(generate new output). |
2529 |
|
|
2530 |
checkpoint61e |
checkpoint61e (2008/10/23) |
2531 |
o gmredi (Visbeck-variable-K): |
o gmredi (Visbeck-variable-K): |
2532 |
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
2533 |
- change computation of Visbeck-K where Slope > Smax : |
- change computation of Visbeck-K where Slope > Smax : |
2552 |
scale in ggl90_calc.F |
scale in ggl90_calc.F |
2553 |
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
2554 |
|
|
2555 |
checkpoint61d |
checkpoint61d (2008/09/25) |
2556 |
o adjoint modifs |
o adjoint modifs |
2557 |
- adapt to new field rhoInSitu |
- adapt to new field rhoInSitu |
2558 |
- allow to revert from StoreDynVars2D, StoreDynVars3D |
- allow to revert from StoreDynVars2D, StoreDynVars3D |
2579 |
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
2580 |
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
2581 |
|
|
2582 |
checkpoint61c |
checkpoint61c (2008/08/30) |
2583 |
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
2584 |
to add mass source/sink of fluid in the interior (3-D generalisation |
to add mass source/sink of fluid in the interior (3-D generalisation |
2585 |
of oceanic real-fresh water flux). |
of oceanic real-fresh water flux). |
2597 |
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
2598 |
o new pkg: cheapaml |
o new pkg: cheapaml |
2599 |
|
|
2600 |
checkpoint61b |
checkpoint61b (2008/08/05) |
2601 |
o exch2: |
o exch2: |
2602 |
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
2603 |
- no longer depend on the order sequence (N,S,E,W). |
- no longer depend on the order sequence (N,S,E,W). |
2612 |
more intuitive this way) ; rename/remove some variables. |
more intuitive this way) ; rename/remove some variables. |
2613 |
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
2614 |
|
|
2615 |
checkpoint61a |
checkpoint61a (2008/07/29) |
2616 |
o exch2/matlab-topology-generator: |
o exch2/matlab-topology-generator: |
2617 |
fix bug in index bounds for N-S internal exchange (hard to tell if this |
fix bug in index bounds for N-S internal exchange (hard to tell if this |
2618 |
had any effect on the solution). |
had any effect on the solution). |
2621 |
o testreport: modify syntax of awk, so that it works also with |
o testreport: modify syntax of awk, so that it works also with |
2622 |
awk, and not only with nawk and gawk |
awk, and not only with nawk and gawk |
2623 |
|
|
2624 |
checkpoint61 |
checkpoint61 (2008/06/24) |
2625 |
o autodiff |
o autodiff |
2626 |
Change default for TAF usage by removing argument '-nonew_arg' |
Change default for TAF usage by removing argument '-nonew_arg' |
2627 |
This changes TAF subroutine argument list (ordering of active var.) |
This changes TAF subroutine argument list (ordering of active var.) |
2632 |
Tested TAF version is 1.9.22 |
Tested TAF version is 1.9.22 |
2633 |
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
2634 |
|
|
2635 |
checkpoint60 |
checkpoint60 (2008/06/19) |
2636 |
--->>> This is the last checkpoint for which generating the adjoint |
--->>> This is the last checkpoint for which generating the adjoint |
2637 |
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
2638 |
--->>> by default. |
--->>> by default. |
2657 |
The key modifications are in model/src/taueddy_external_forcing.F |
The key modifications are in model/src/taueddy_external_forcing.F |
2658 |
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
2659 |
|
|
2660 |
checkpoint59r |
checkpoint59r (2008/05/29) |
2661 |
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
2662 |
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
2663 |
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
2688 |
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
2689 |
and requires a fortran 90 compiler |
and requires a fortran 90 compiler |
2690 |
|
|
2691 |
checkpoint59q |
checkpoint59q (2008/05/06) |
2692 |
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
2693 |
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
2694 |
o Refresh tutorial_global_oce_biogeo, notably: |
o Refresh tutorial_global_oce_biogeo, notably: |
2723 |
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
2724 |
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
2725 |
|
|
2726 |
checkpoint59p |
checkpoint59p (2008/04/10) |
2727 |
o gchem / dic / cfc : |
o gchem / dic / cfc : |
2728 |
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
2729 |
- add new parameter files: "data.dic" & "data.cfc" ; |
- add new parameter files: "data.dic" & "data.cfc" ; |
2749 |
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
2750 |
also fix diagnostics VISCAHW & VISCA4W. |
also fix diagnostics VISCAHW & VISCA4W. |
2751 |
|
|
2752 |
checkpoint59o |
checkpoint59o (2008/03/07) |
2753 |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
2754 |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
2755 |
move a few statemens out the main loop into separate loops |
move a few statemens out the main loop into separate loops |
2790 |
introducing a generic routine (ctrl_map_ini_gen.F). |
introducing a generic routine (ctrl_map_ini_gen.F). |
2791 |
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
2792 |
|
|
2793 |
checkpoint59n |
checkpoint59n (2008/02/09) |
2794 |
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
2795 |
number in dedicate array "hdiag": |
number in dedicate array "hdiag": |
2796 |
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
2844 |
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 |
2845 |
#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 |
2846 |
|
|
2847 |
checkpoint59m |
checkpoint59m (2008/01/14) |
2848 |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
2849 |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
2850 |
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 |
2862 |
o pkg/salt_plume: added various options for salt plume depth |
o pkg/salt_plume: added various options for salt plume depth |
2863 |
criterion and for vertical distribution of the salt |
criterion and for vertical distribution of the salt |
2864 |
|
|
2865 |
checkpoint59l |
checkpoint59l (2007/12/18) |
2866 |
o pkg/ptracers: new version of ptracers pickup: |
o pkg/ptracers: new version of ptracers pickup: |
2867 |
read meta file and write only fields which are needed to restart. |
read meta file and write only fields which are needed to restart. |
2868 |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
2884 |
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 |
2885 |
or U/VICE from U/VWIND before computing U/VSTRESS |
or U/VICE from U/VWIND before computing U/VSTRESS |
2886 |
|
|
2887 |
checkpoint59k |
checkpoint59k (2007/11/30) |
2888 |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
2889 |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
2890 |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
2906 |
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). |
2907 |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
2908 |
|
|
2909 |
checkpoint59j |
checkpoint59j (2007/11/09) |
2910 |
o in pkgs: dic, obcs, offline, rbcs: |
o in pkgs: dic, obcs, offline, rbcs: |
2911 |
standard way to compute coeff. for time interpolation between 2 time reccords |
standard way to compute coeff. for time interpolation between 2 time reccords |
2912 |
which retains full precision (& make results less dependent on compiler). |
which retains full precision (& make results less dependent on compiler). |
2949 |
o added open boundary conditions capability for seaice |
o added open boundary conditions capability for seaice |
2950 |
HSNOW, HSALT, UICE, and VICE |
HSNOW, HSALT, UICE, and VICE |
2951 |
|
|
2952 |
checkpoint59i |
checkpoint59i (2007/10/21) |
2953 |
o adjoint: |
o adjoint: |
2954 |
* fix multiDimAdvection adjoint |
* fix multiDimAdvection adjoint |
2955 |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
2990 |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
2991 |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
2992 |
|
|
2993 |
checkpoint59h |
checkpoint59h (2007/09/29) |
2994 |
o pkg/exf: |
o pkg/exf: |
2995 |
- improve vectorization by moving if-statement out of loops in |
- improve vectorization by moving if-statement out of loops in |
2996 |
exf_mapfields, exf_radiation |
exf_mapfields, exf_radiation |
3023 |
o testreport: change AD testing : check against results/output_adm.txt |
o testreport: change AD testing : check against results/output_adm.txt |
3024 |
using same scripts as for forward test. |
using same scripts as for forward test. |
3025 |
|
|
3026 |
checkpoint59g |
checkpoint59g (2007/09/17) |
3027 |
o adjoint testing: in preparation for changing testreport: |
o adjoint testing: in preparation for changing testreport: |
3028 |
- output format: cost and grad written on separated lines |
- output format: cost and grad written on separated lines |
3029 |
- ad output results in directory "results" (instead of "results_ad") |
- ad output results in directory "results" (instead of "results_ad") |
3068 |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
3069 |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
3070 |
|
|
3071 |
checkpoint59f |
checkpoint59f (2007/08/21) |
3072 |
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) |
3073 |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
3074 |
a bounded range (in forward mode) |
a bounded range (in forward mode) |
3099 |
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 |
3100 |
output of global_ocean.cs32x15.thsice . |
output of global_ocean.cs32x15.thsice . |
3101 |
|
|
3102 |
checkpoint59e |
checkpoint59e (2007/07/26) |
3103 |
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: |
3104 |
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 |
3105 |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
3129 |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
3130 |
* applied OBCS T/S mask to HEFFM sea ice mask |
* applied OBCS T/S mask to HEFFM sea ice mask |
3131 |
|
|
3132 |
checkpoint59d |
checkpoint59d (2007/06/21) |
3133 |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
3134 |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
3135 |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
3175 |
It is turned off by default (=-1.), because it changes the results. |
It is turned off by default (=-1.), because it changes the results. |
3176 |
- make it possible to read AREA from a file, too. |
- make it possible to read AREA from a file, too. |
3177 |
|
|
3178 |
checkpoint59c |
checkpoint59c (2007/06/04) |
3179 |
o add S/R and diagnostics for oceanic mixed-layer depth |
o add S/R and diagnostics for oceanic mixed-layer depth |
3180 |
o move GMRedi call after all vertical mixing schemes (including KPP) |
o move GMRedi call after all vertical mixing schemes (including KPP) |
3181 |
o pkg/thsice: |
o pkg/thsice: |
3208 |
Storing is now bundled into large arrays to optimized I/O |
Storing is now bundled into large arrays to optimized I/O |
3209 |
(and second step in cleanup of the_main_loop) |
(and second step in cleanup of the_main_loop) |
3210 |
|
|
3211 |
checkpoint59b |
checkpoint59b (2007/05/16) |
3212 |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
3213 |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
3214 |
o pkg/seaice: |
o pkg/seaice: |
3279 |
o OpenAD |
o OpenAD |
3280 |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
3281 |
|
|
3282 |
checkpoint59a |
checkpoint59a (2007/05/01) |
3283 |
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 |
3284 |
o pkg/thsice: rename run-time parameters: |
o pkg/thsice: rename run-time parameters: |
3285 |
himin -> hIceMin |
himin -> hIceMin |
3321 |
o pkg/kpp: add code to have mixing in shelf ice caverns |
o pkg/kpp: add code to have mixing in shelf ice caverns |
3322 |
- add myThid to all kpp routines (long overdue) |
- add myThid to all kpp routines (long overdue) |
3323 |
|
|
3324 |
checkpoint59 |
checkpoint59 (2007/04/19) |
3325 |
o pkg/exf: |
o pkg/exf: |
3326 |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
3327 |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
3347 |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
3348 |
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.) |
3349 |
|
|
3350 |
checkpoint58y_post |
checkpoint58y_post (2007/04/15) |
3351 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
3352 |
vertical diffusivity, similar to that in MOM4; turned on using |
vertical diffusivity, similar to that in MOM4; turned on using |
3353 |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
3363 |
- better when using non-linear advection scheme (not yet fully tested) |
- better when using non-linear advection scheme (not yet fully tested) |
3364 |
- 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). |
3365 |
|
|
3366 |
checkpoint58x_post |
checkpoint58x_post (2007/04/04) |
3367 |
o IO option for global-file compact format: |
o IO option for global-file compact format: |
3368 |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
3369 |
- add I/O capability (pkg/mdsio). |
- add I/O capability (pkg/mdsio). |
3371 |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
3372 |
o shelfice: add a few diagnostics |
o shelfice: add a few diagnostics |
3373 |
|
|
3374 |
checkpoint58w_post |
checkpoint58w_post (2007/03/13) |
3375 |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
3376 |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
3377 |
(and replace horiVertRatio in NH code). |
(and replace horiVertRatio in NH code). |
3392 |
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 |
3393 |
to all packages |
to all packages |
3394 |
|
|
3395 |
checkpoint58v_post |
checkpoint58v_post (2007/02/08) |
3396 |
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 |
3397 |
useDynP_inEos_Zc tested. |
useDynP_inEos_Zc tested. |
3398 |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
3411 |
- use this scheme for temperature & salinity in 2 advection test exp.: |
- use this scheme for temperature & salinity in 2 advection test exp.: |
3412 |
advect_xy & advect_xz, respectively. |
advect_xy & advect_xz, respectively. |
3413 |
|
|
3414 |
checkpoint58u_post |
checkpoint58u_post (2007/01/12) |
3415 |
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. |
3416 |
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. |
3417 |
o testreport: add option "-skipdir" to skip some test. |
o testreport: add option "-skipdir" to skip some test. |
3426 |
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 |
3427 |
o pkg/thsice: fix reading mnc-pickups |
o pkg/thsice: fix reading mnc-pickups |
3428 |
|
|
3429 |
checkpoint58t_post |
checkpoint58t_post (2006/12/30) |
3430 |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
3431 |
o pkg/mdsio: |
o pkg/mdsio: |
3432 |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
3469 |
- introduce a few local fields to avoid modifying external fields such |
- introduce a few local fields to avoid modifying external fields such |
3470 |
as atemp, etc. |
as atemp, etc. |
3471 |
|
|
3472 |
checkpoint58s_post |
checkpoint58s_post (2006/12/11) |
3473 |
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 |
3474 |
changed exf_set_gen.F so that |
changed exf_set_gen.F so that |
3475 |
genperiod=0 means input file is one time-constant field and |
genperiod=0 means input file is one time-constant field and |
3503 |
as actual snow thickness. It now refers everywhere to effective snow |
as actual snow thickness. It now refers everywhere to effective snow |
3504 |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
3505 |
|
|
3506 |
checkpoint58r_post |
checkpoint58r_post (2006/11/17) |
3507 |
o modifications to pkg/seaice/growth.F, which change results of |
o modifications to pkg/seaice/growth.F, which change results of |
3508 |
lab_sea experiment: fixes pertain to melting snow over open water, to |
lab_sea experiment: fixes pertain to melting snow over open water, to |
3509 |
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 |
3527 |
o ctrl: adding new control variables: |
o ctrl: adding new control variables: |
3528 |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
3529 |
|
|
3530 |
checkpoint58q_post |
checkpoint58q_post (2006/10/20) |
3531 |
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 |
3532 |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
3533 |
high_res_cube configuration by 4% on Columbia. |
high_res_cube configuration by 4% on Columbia. |
3538 |
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 |
3539 |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
3540 |
|
|
3541 |
checkpoint58p_post |
checkpoint58p_post (2006/09/08) |
3542 |
o obcs: stop if obcs is used with useCDscheme = .true. |
o obcs: stop if obcs is used with useCDscheme = .true. |
3543 |
o shelfice: |
o shelfice: |
3544 |
- fix a sign error so that no slip at shelfice interface works |
- fix a sign error so that no slip at shelfice interface works |
3549 |
o added adjoint exch routined for all exch*3d* routines |
o added adjoint exch routined for all exch*3d* routines |
3550 |
and updated flow directives |
and updated flow directives |
3551 |
|
|
3552 |
checkpoint58o_post |
checkpoint58o_post (2006/08/28) |
3553 |
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 ; |
3554 |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
3555 |
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) |
3563 |
- add a simple boundary layer scheme to reduce noise |
- add a simple boundary layer scheme to reduce noise |
3564 |
- 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 |
3565 |
|
|
3566 |
checkpoint58n_post |
checkpoint58n_post (2006/08/14) |
3567 |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
3568 |
local variable (not in common block). |
local variable (not in common block). |
3569 |
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. |
3584 |
and stop cleanly when MAX_NO_THREADS is too small. |
and stop cleanly when MAX_NO_THREADS is too small. |
3585 |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
3586 |
|
|
3587 |
checkpoint58m_post |
checkpoint58m_post (2006/07/17) |
3588 |
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. |
3589 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
3590 |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
3610 |
update rotating_tank results, but not plume_on_slope (affected at |
update rotating_tank results, but not plume_on_slope (affected at |
3611 |
truncation level, 11 digits). |
truncation level, 11 digits). |
3612 |
|
|
3613 |
checkpoint58l_post |
checkpoint58l_post (2006/07/12) |
3614 |
o calc_gw: |
o calc_gw: |
3615 |
- 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 |
3616 |
- 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. |
3628 |
o pkg/rbcs |
o pkg/rbcs |
3629 |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
3630 |
|
|
3631 |
checkpoint58k_post |
checkpoint58k_post (2006/07/06) |
3632 |
o testreport: |
o testreport: |
3633 |
- 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 |
3634 |
& running in input) |
& running in input) |
3661 |
advection subroutine (but still not used within DST advection S/R) |
advection subroutine (but still not used within DST advection S/R) |
3662 |
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) |
3663 |
|
|
3664 |
checkpoint58j_post |
checkpoint58j_post (2006/06/15) |
3665 |
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 |
3666 |
from file (collects calls previously in FORWARD_STEP) |
from file (collects calls previously in FORWARD_STEP) |
3667 |
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 |
3669 |
o genmake2 |
o genmake2 |
3670 |
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. |
3671 |
|
|
3672 |
checkpoint58i_post |
checkpoint58i_post (2006/06/14) |
3673 |
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 |
3674 |
on wind stress (SEAICEstressFactor defaults to 1.) |
on wind stress (SEAICEstressFactor defaults to 1.) |
3675 |
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 |
3683 |
non-EVP pickup files when using SEAICEuseEVP |
non-EVP pickup files when using SEAICEuseEVP |
3684 |
- fix sign error in diffusion in seaice_calc_rhs |
- fix sign error in diffusion in seaice_calc_rhs |
3685 |
|
|
3686 |
checkpoint58h_post |
checkpoint58h_post (2006/06/07) |
3687 |
* Modifications for bottom topography control |
* Modifications for bottom topography control |
3688 |
o replace hFacC by _hFacC at various places |
o replace hFacC by _hFacC at various places |
3689 |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
3693 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
3694 |
* Adding verification for 5x5 box (4-layer) bottom topography control |
* Adding verification for 5x5 box (4-layer) bottom topography control |
3695 |
|
|
3696 |
checkpoint58g_post |
checkpoint58g_post (2006/06/07) |
3697 |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
3698 |
used for mean seasonal cycle, mean diurnal cycle); add an example |
used for mean seasonal cycle, mean diurnal cycle); add an example |
3699 |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
3709 |
o pkg/seaice |
o pkg/seaice |
3710 |
- make (default) second order advection a bit less confusing? |
- make (default) second order advection a bit less confusing? |
3711 |
|
|
3712 |
checkpoint58f_post |
checkpoint58f_post (2006/06/05) |
3713 |
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 |
3714 |
to pkg/seaice): |
to pkg/seaice): |
3715 |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
3740 |
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 |
3741 |
testreport accordingly |
testreport accordingly |
3742 |
|
|
3743 |
checkpoint58e_post |
checkpoint58e_post (2006/05/17) |
3744 |
o SEAICE_CGRID adjoint done |
o SEAICE_CGRID adjoint done |
3745 |
o R_STAR adjoint implemented. |
o R_STAR adjoint implemented. |
3746 |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
3748 |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
3749 |
to be able to use it in pure forward. |
to be able to use it in pure forward. |
3750 |
|
|
3751 |
checkpoint58d_post |
checkpoint58d_post (2006/04/21) |
3752 |
o upgrade simple test-experiment to tutorial example: |
o upgrade simple test-experiment to tutorial example: |
3753 |
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. |
3754 |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
3788 |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
3789 |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
3790 |
|
|
3791 |
checkpoint58c_post |
checkpoint58c_post (2006/03/23) |
3792 |
o adjoint: finish NLFS adjoint and provide reference output in |
o adjoint: finish NLFS adjoint and provide reference output in |
3793 |
verification/global_ocean.90x40x15/results_ad_nlfs |
verification/global_ocean.90x40x15/results_ad_nlfs |
3794 |
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 |
3822 |
+ move computation of the viscosities eta and zeta into a new separate |
+ move computation of the viscosities eta and zeta into a new separate |
3823 |
routine (because I need to recompute them in seaice_ocean_stress.F) |
routine (because I need to recompute them in seaice_ocean_stress.F) |
3824 |
|
|
3825 |
checkpoint58b_post |
checkpoint58b_post (2006/03/13) |
3826 |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
3827 |
update output.txt of exp. aim.5l_cs.thSI |
update output.txt of exp. aim.5l_cs.thSI |
3828 |
o various mnc cleanups and improvements: |
o various mnc cleanups and improvements: |
3885 |
(turn on with SEAICEuseFluxForm) |
(turn on with SEAICEuseFluxForm) |
3886 |
- replace 1 in 3d global fields by kSurface in growth.F |
- replace 1 in 3d global fields by kSurface in growth.F |
3887 |
|
|
3888 |
checkpoint58a_post |
checkpoint58a_post (2006/02/13) |
3889 |
o seaice: |
o seaice: |
3890 |
- bug fix in advect.F |
- bug fix in advect.F |
3891 |
o shelfice: |
o shelfice: |
3938 |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
3939 |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
3940 |
|
|
3941 |
checkpoint58 |
checkpoint58 (2006/01/12) |
3942 |
o add "--embed-source" option to genmake2 which, when the supporting |
o add "--embed-source" option to genmake2 which, when the supporting |
3943 |
tools can be compiled (as determined by genmake2) will turn on the |
tools can be compiled (as determined by genmake2) will turn on the |
3944 |
embed_files package which then embeds the entire MITgcm source code |
embed_files package which then embeds the entire MITgcm source code |
3951 |
* 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) |
3952 |
* Thanks to Tom Haine for testing! |
* Thanks to Tom Haine for testing! |
3953 |
|
|
3954 |
checkpoint57z_post |
checkpoint57z_post (2005/12/31) |
3955 |
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): |
3956 |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
3957 |
o fix the pickup behavior for obcs in combination with ptracers |
o fix the pickup behavior for obcs in combination with ptracers |
3982 |
* Absolute scale somewhat unclear so far |
* Absolute scale somewhat unclear so far |
3983 |
* 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 |
3984 |
|
|
3985 |
checkpoint57y_post |
checkpoint57y_post (2005/12/08) |
3986 |
First step for a NLFS adjoint |
First step for a NLFS adjoint |
3987 |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
3988 |
o new init. routines for calc_r_star, calc_surf_dr |
o new init. routines for calc_r_star, calc_surf_dr |
3989 |
o still need to deal with ini_masks_etc |
o still need to deal with ini_masks_etc |
3990 |
o testreport seemed happy |
o testreport seemed happy |
3991 |
checkpoint57y_pre |
checkpoint57y_pre (2005/12/08) |
3992 |
|
|
3993 |
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. |
3994 |
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) |
3997 |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
3998 |
be in GCHEM_OPTIONS). |
be in GCHEM_OPTIONS). |
3999 |
|
|
4000 |
checkpoint57x_post |
checkpoint57x_post (2005/12/04) |
4001 |
o fix testreport Pb in multiple test experiment. |
o fix testreport Pb in multiple test experiment. |
4002 |
o cleanup our namelist syntax in verification: |
o cleanup our namelist syntax in verification: |
4003 |
- make it more F95 standards compliant (some work still needed) |
- make it more F95 standards compliant (some work still needed) |
4017 |
(there are a number of extensive recomputations) |
(there are a number of extensive recomputations) |
4018 |
* Initialize certain variables needed for adjoint |
* Initialize certain variables needed for adjoint |
4019 |
|
|
4020 |
checkpoint57w_post |
checkpoint57w_post (2005/11/03) |
4021 |
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 |
4022 |
fix the singleCpuIO RS version of MDSWRITEFIELD |
fix the singleCpuIO RS version of MDSWRITEFIELD |
4023 |
and add a WARNING if using globalFiles=T with multi-processors. |
and add a WARNING if using globalFiles=T with multi-processors. |
4034 |
ptracers in a large domain with a constant non-zero value. Also, |
ptracers in a large domain with a constant non-zero value. Also, |
4035 |
untangle ptracers_init.F a little. |
untangle ptracers_init.F a little. |
4036 |
|
|
4037 |
checkpoint57v_post |
checkpoint57v_post (2005/10/13) |
4038 |
o change dome exp. to use variable viscosity in side-drag terms. |
o change dome exp. to use variable viscosity in side-drag terms. |
4039 |
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 |
4040 |
incorporated into tutorial_cfc_offline which has been producing |
incorporated into tutorial_cfc_offline which has been producing |
4075 |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
4076 |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
4077 |
|
|
4078 |
checkpoint57t_post |
checkpoint57t_post (2005/10/03) |
4079 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
4080 |
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 |
4081 |
same truncation, independent of the face number: affects affects several |
same truncation, independent of the face number: affects affects several |
4098 |
Suggested values of viscosity parameters found in mom_calc_visc. |
Suggested values of viscosity parameters found in mom_calc_visc. |
4099 |
Many new viscosity diagnostics available. |
Many new viscosity diagnostics available. |
4100 |
|
|
4101 |
checkpoint57s_post |
checkpoint57s_post (2005/09/20) |
4102 |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
4103 |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
4104 |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
4124 |
and works with both EXCH1 and EXCH2 (but needs more testing) |
and works with both EXCH1 and EXCH2 (but needs more testing) |
4125 |
- writing works for all verification test cases w/ g77 on Linux |
- writing works for all verification test cases w/ g77 on Linux |
4126 |
|
|
4127 |
checkpoint57r_post |
checkpoint57r_post (2005/09/07) |
4128 |
o make MNC variable initialization happen earlier |
o make MNC variable initialization happen earlier |
4129 |
o add diagnostics for (almost) each term of the momentum Eq. |
o add diagnostics for (almost) each term of the momentum Eq. |
4130 |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
4144 |
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 |
4145 |
(see README file) |
(see README file) |
4146 |
|
|
4147 |
checkpoint57q_post |
checkpoint57q_post (2005/08/19) |
4148 |
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) |
4149 |
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 |
4150 |
- bug was reported by Jean-Michel and Ian Fenty |
- bug was reported by Jean-Michel and Ian Fenty |
4161 |
* verification/OpenAD/code/ has necessary scripts and description; |
* verification/OpenAD/code/ has necessary scripts and description; |
4162 |
* converts, compiles and runs successfully; |
* converts, compiles and runs successfully; |
4163 |
|
|
4164 |
checkpoint57p_post |
checkpoint57p_post (2005/08/01) |
4165 |
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 |
4166 |
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 |
4167 |
(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) |
4175 |
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), |
4176 |
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). |
4177 |
|
|
4178 |
checkpoint57o_post |
checkpoint57o_post (2005/07/30) |
4179 |
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 |
4180 |
(2) its ready to be documented during the 20050801 DocFest |
(2) its ready to be documented during the 20050801 DocFest |
4181 |
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 |
4184 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
4185 |
(worth another tag) |
(worth another tag) |
4186 |
|
|
4187 |
checkpoint57n_post |
checkpoint57n_post (2005/07/29) |
4188 |
o adding precip control xx_precip 32 |
o adding precip control xx_precip 32 |
4189 |
o adding swflux control xx_swflux 33 |
o adding swflux control xx_swflux 33 |
4190 |
o Replacing 10 forcing penalty cost routines by 1 generic. |
o Replacing 10 forcing penalty cost routines by 1 generic. |
4200 |
(applies in particular to tapelev I/O) |
(applies in particular to tapelev I/O) |
4201 |
o removed inefficient K-loop in all active_file*control*.F |
o removed inefficient K-loop in all active_file*control*.F |
4202 |
|
|
4203 |
checkpoint57m_post |
checkpoint57m_post (2005/07/28) |
4204 |
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) |
4205 |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
4206 |
o pkg/exch2: filling of face-corner halo regions is optional |
o pkg/exch2: filling of face-corner halo regions is optional |
4207 |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
4208 |
|
|
4209 |
checkpoint57l_post |
checkpoint57l_post (2005/07/14) |
4210 |
tag before updating tutorials (pre-release-2) |
tag before updating tutorials (pre-release-2) |
4211 |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
4212 |
for output and interpolation of input fields onto model grid) |
for output and interpolation of input fields onto model grid) |
4218 |
o add mnc output capability to diagnostics/diagstat and update |
o add mnc output capability to diagnostics/diagstat and update |
4219 |
our cvsignore files for the ACSII output generated |
our cvsignore files for the ACSII output generated |
4220 |
|
|
4221 |
checkpoint57k_post |
checkpoint57k_post (2005/07/02) |
4222 |
o lab_sea now uses diagnostics package and provides a suite of |
o lab_sea now uses diagnostics package and provides a suite of |
4223 |
new EXF diagnostics output. |
new EXF diagnostics output. |
4224 |
|
|
4225 |
checkpoint57j_post |
checkpoint57j_post (2005/06/30) |
4226 |
o exf |
o exf |
4227 |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
4228 |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
4252 |
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) |
4253 |
(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) |
4254 |
|
|
4255 |
checkpoint57i_post |
checkpoint57i_post (2005/06/19) |
4256 |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
4257 |
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) |
4258 |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
4271 |
tested against monitor output (including land & thSIce) on various exp. |
tested against monitor output (including land & thSIce) on various exp. |
4272 |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
4273 |
|
|
4274 |
checkpoint57h_done |
checkpoint57h_done (2005/05/19) |
4275 |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
4276 |
data.diagnostics, data.gchem, data.ptracers) is done. |
data.diagnostics, data.gchem, data.ptracers) is done. |
4277 |
|
|
4280 |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
4281 |
and rename it: DIFFERENT_MULTIPLE |
and rename it: DIFFERENT_MULTIPLE |
4282 |
|
|
4283 |
checkpoint57h_post |
checkpoint57h_post (2005/05/14) |
4284 |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
4285 |
o pkg/diagnostics: change output frequency, now in seconds (instead |
o pkg/diagnostics: change output frequency, now in seconds (instead |
4286 |
of Nb of iterations). This requires to change data.diagnostics. |
of Nb of iterations). This requires to change data.diagnostics. |
4287 |
checkpoint57h_pre |
checkpoint57h_pre (2005/05/12) |
4288 |
|
|
4289 |
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 |
4290 |
and mnc_outdir_num are false |
and mnc_outdir_num are false |
4298 |
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, |
4299 |
not mnc -- this mistake was found by JMC and is now corrected |
not mnc -- this mistake was found by JMC and is now corrected |
4300 |
|
|
4301 |
checkpoint57g_post |
checkpoint57g_post (2005/04/15) |
4302 |
o add Adams-Bashforth 3rd Order time stepping: |
o add Adams-Bashforth 3rd Order time stepping: |
4303 |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
4304 |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
4305 |
checkpoint57g_pre |
checkpoint57g_pre (2005/04/15) |
4306 |
|
|
4307 |
o make lambda[Theta,Salt]ClimRelax spatially varying |
o make lambda[Theta,Salt]ClimRelax spatially varying |
4308 |
(default remains spatially uniform constant based on tau) |
(default remains spatially uniform constant based on tau) |
4312 |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
4313 |
(suggested by G. Forget) |
(suggested by G. Forget) |
4314 |
|
|
4315 |
checkpoint57f_post |
checkpoint57f_post (2005/04/06) |
4316 |
o add parameter "baseTime" = model base time = time at iteration zero |
o add parameter "baseTime" = model base time = time at iteration zero |
4317 |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
4318 |
account for baseTime shift |
account for baseTime shift |
4319 |
o move Coriolis arrays from PARAMS.h to GRID.h |
o move Coriolis arrays from PARAMS.h to GRID.h |
4320 |
checkpoint57f_pre |
checkpoint57f_pre (2005/04/06) |
4321 |
|
|
4322 |
o mnc-ifying the seaice package |
o mnc-ifying the seaice package |
4323 |
o introduced an alternative length scale calculation for use in the limiting |
o introduced an alternative length scale calculation for use in the limiting |
4338 |
* 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 |
4339 |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
4340 |
|
|
4341 |
checkpoint57e_post |
checkpoint57e_post (2005/02/28) |
4342 |
o Adding eddy stress controls a la Ferreira et al. |
o Adding eddy stress controls a la Ferreira et al. |
4343 |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
4344 |
|
|
4356 |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
4357 |
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) |
4358 |
|
|
4359 |
checkpoint57d_post |
checkpoint57d_post (2005/02/11) |
4360 |
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 |
4361 |
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 |
4362 |
output from the diagnostics package |
output from the diagnostics package |
4378 |
(note: still needs some work specially for snap-shot diagnostics) |
(note: still needs some work specially for snap-shot diagnostics) |
4379 |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
4380 |
|
|
4381 |
checkpoint57c_post |
checkpoint57c_post (2005/01/27) |
4382 |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
4383 |
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 |
4384 |
checkpoint57c_pre |
checkpoint57c_pre (2005/01/27) |
4385 |
|
|
4386 |
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); |
4387 |
update output.txt of exp. global_ocean.90x40x15 |
update output.txt of exp. global_ocean.90x40x15 |
4414 |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
4415 |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
4416 |
|
|
4417 |
checkpoint57b_post |
checkpoint57b_post (2004/12/20) |
4418 |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
4419 |
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 |
4420 |
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 |
4460 |
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) |
4461 |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
4462 |
|
|
4463 |
checkpoint57a_post |
checkpoint57a_post (2004/12/10) |
4464 |
o this set of changes restores TAMC compatibility |
o this set of changes restores TAMC compatibility |
4465 |
tested for global_ocean.90x40x15 adjoint on trough |
tested for global_ocean.90x40x15 adjoint on trough |
4466 |
(what a pain) |
(what a pain) |
4467 |
|
|
4468 |
checkpoint57a_pre |
checkpoint57a_pre (2004/12/10) |
4469 |
o some modifs in tools/build_options for sunos |
o some modifs in tools/build_options for sunos |
4470 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
4471 |
|
|
4472 |
checkpoint57 |
checkpoint57 (2004/12/09) |
4473 |
o add horizontal bi-harmonic viscosity for vertical velocity |
o add horizontal bi-harmonic viscosity for vertical velocity |
4474 |
- new parameter viscA4W (defaults to viscA4) |
- new parameter viscA4W (defaults to viscA4) |
4475 |
- affects only non-hydrostatic code |
- affects only non-hydrostatic code |
4487 |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
4488 |
(theta2, salt2 in ecco_cost_weights) |
(theta2, salt2 in ecco_cost_weights) |
4489 |
|
|
4490 |
checkpoint56c_post |
checkpoint56c_post (2004/12/03) |
4491 |
o OBCS as control variables |
o OBCS as control variables |
4492 |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
4493 |
- remove balance of obcs controls from default |
- remove balance of obcs controls from default |
4505 |
o mdsio: |
o mdsio: |
4506 |
- i/o-vector change debugLevel from debLevA to debLevB |
- i/o-vector change debugLevel from debLevA to debLevB |
4507 |
|
|
4508 |
checkpoint56b_post |
checkpoint56b_post (2004/12/01) |
4509 |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
4510 |
is called from DO_THE_MODEL_IO |
is called from DO_THE_MODEL_IO |
4511 |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
4520 |
testreport. |
testreport. |
4521 |
o ptracers_monitor: bug fix for MPI |
o ptracers_monitor: bug fix for MPI |
4522 |
|
|
4523 |
checkpoint56a_post |
checkpoint56a_post (2004/11/28) |
4524 |
o GCHEM: finish reorganizating the package |
o GCHEM: finish reorganizating the package |
4525 |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
4526 |
(introduces another 3D-array for each passive tracer, but only if |
(introduces another 3D-array for each passive tracer, but only if |
4565 |
- cleaning up |
- cleaning up |
4566 |
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 |
4567 |
|
|
4568 |
checkpoint56 |
checkpoint56 (2004/11/17) |
4569 |
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 |
4570 |
o mnc: cleanup "full" files--fixes out-of-memory problem |
o mnc: cleanup "full" files--fixes out-of-memory problem |
4571 |
o ECCO-GODAE |
o ECCO-GODAE |
4595 |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
4596 |
from sign change |
from sign change |
4597 |
|
|
4598 |
checkpoint55j_post |
checkpoint55j_post (2004/11/10) |
4599 |
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. |
4600 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
4601 |
o add consistent build directories and .cvsignore files to verification |
o add consistent build directories and .cvsignore files to verification |
4606 |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
4607 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
4608 |
|
|
4609 |
checkpoint55i_post |
checkpoint55i_post (2004/10/28) |
4610 |
o change arrays for total vertical diffusivity (2.D if explicit, |
o change arrays for total vertical diffusivity (2.D if explicit, |
4611 |
3.D if implicit) ; each ptracer uses its own background value. |
3.D if implicit) ; each ptracer uses its own background value. |
4612 |
o added mnc/NetCDF output capability to ocn_compon_interf |
o added mnc/NetCDF output capability to ocn_compon_interf |
4621 |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
4622 |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
4623 |
|
|
4624 |
checkpoint55h_post |
checkpoint55h_post (2004/10/20) |
4625 |
o add verification test "vermix" |
o add verification test "vermix" |
4626 |
o remove all the *_ioinc flags and replace with the single global |
o remove all the *_ioinc flags and replace with the single global |
4627 |
outputTypesInclusive flag |
outputTypesInclusive flag |
4629 |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
4630 |
o useMNC moved from data.mnc to data.pkg |
o useMNC moved from data.mnc to data.pkg |
4631 |
|
|
4632 |
checkpoint55g_post |
checkpoint55g_post (2004/10/14) |
4633 |
o Renaming carbon AD experiments to comply with testreport conventions |
o Renaming carbon AD experiments to comply with testreport conventions |
4634 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
4635 |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
4639 |
o Updating adjoint output for natl_box_adjoint after |
o Updating adjoint output for natl_box_adjoint after |
4640 |
pkg/ecco has been modified (see taga c55d_post) |
pkg/ecco has been modified (see taga c55d_post) |
4641 |
|
|
4642 |
checkpoint55f_post |
checkpoint55f_post (2004/10/13) |
4643 |
o rename to timeave_init_fixed |
o rename to timeave_init_fixed |
4644 |
|
|
4645 |
checkpoint55e_post |
checkpoint55e_post (2004/10/13) |
4646 |
o some delicate re-shuffle of store directives to avoid one |
o some delicate re-shuffle of store directives to avoid one |
4647 |
extra call of do_oceanic_physics |
extra call of do_oceanic_physics |
4648 |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
4650 |
o NB: this may break global_ocean adjoint temporarily, |
o NB: this may break global_ocean adjoint temporarily, |
4651 |
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. |
4652 |
|
|
4653 |
checkpoint55d_post |
checkpoint55d_post (2004/10/11) |
4654 |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
4655 |
o ecco_cost_weights is modified to 1x1 runs |
o ecco_cost_weights is modified to 1x1 runs |
4656 |
o modifs to allow observations to be read in as |
o modifs to allow observations to be read in as |
4657 |
single file or yearly files |
single file or yearly files |
4658 |
o enable to read exf forcing fields as either |
o enable to read exf forcing fields as either |
4659 |
single file or yearly files (flag useExfYearlyFields) |
single file or yearly files (flag useExfYearlyFields) |
4660 |
checkpoint55d_pre |
checkpoint55d_pre (2004/10/08) |
4661 |
|
|
4662 |
o switch between 2-level and 3-level checkpointing |
o switch between 2-level and 3-level checkpointing |
4663 |
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 |
4705 |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
4706 |
- fixed about 35 bugs in obcs_external_fields_load |
- fixed about 35 bugs in obcs_external_fields_load |
4707 |
|
|
4708 |
checkpoint55c_post |
checkpoint55c_post (2004/09/23) |
4709 |
o obcs stuff |
o obcs stuff |
4710 |
- new runtime flags useOBCSprescribe, useOBCSbalance |
- new runtime flags useOBCSprescribe, useOBCSbalance |
4711 |
- re-arranged obcs_calc |
- re-arranged obcs_calc |
4719 |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
4720 |
which simplifies the calls and passes the ifc check-bounds test |
which simplifies the calls and passes the ifc check-bounds test |
4721 |
|
|
4722 |
checkpoint55b_post |
checkpoint55b_post (2004/09/22) |
4723 |
o add a 2D scalar, Z location, exchange_2 routine. |
o add a 2D scalar, Z location, exchange_2 routine. |
4724 |
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 |
4725 |
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)] |
4730 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
4731 |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
4732 |
|
|
4733 |
checkpoint55a_post |
checkpoint55a_post (2004/09/20) |
4734 |
o merged code to |
o merged code to |
4735 |
* prescribe/read time-dependent open boundaries |
* prescribe/read time-dependent open boundaries |
4736 |
(works in conjunction with exf, cal) |
(works in conjunction with exf, cal) |
4738 |
* each boundary N/S/E/W now has its own CPP option |
* each boundary N/S/E/W now has its own CPP option |
4739 |
(healthy for the adjoint) |
(healthy for the adjoint) |
4740 |
|
|
4741 |
checkpoint55 |
checkpoint55 (2004/09/17) |
4742 |
o up-to-date adjoint of previous breaks |
o up-to-date adjoint of previous breaks |
4743 |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
4744 |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
4748 |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
4749 |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
4750 |
|
|
4751 |
checkpoint54f_post |
checkpoint54f_post (2004/09/16) |
4752 |
o in verification/carbin/ remove experiment related to |
o in verification/carbin/ remove experiment related to |
4753 |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
4754 |
code_ad/ input_ad/ results_ad |
code_ad/ input_ad/ results_ad |
4774 |
- numerous small formatting cleanups for ProTeX |
- numerous small formatting cleanups for ProTeX |
4775 |
o add version info (via BUILD_INFO.h) to MNC and stdout |
o add version info (via BUILD_INFO.h) to MNC and stdout |
4776 |
|
|
4777 |
checkpoint54e_post |
checkpoint54e_post (2004/09/02) |
4778 |
o add two new packages |
o add two new packages |
4779 |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
4780 |
stratification dependent mixing |
stratification dependent mixing |
4788 |
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 |
4789 |
- 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) |
4790 |
|
|
4791 |
checkpoint54d_post |
checkpoint54d_post (2004/07/27) |
4792 |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
4793 |
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, |
4794 |
leading to additional shift by 5 days each year of integration |
leading to additional shift by 5 days each year of integration |
4804 |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
4805 |
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) |
4806 |
|
|
4807 |
checkpoint54c_post |
checkpoint54c_post (2004/07/18) |
4808 |
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 |
4809 |
this affects (truncation error) output.txt of test-exp: |
this affects (truncation error) output.txt of test-exp: |
4810 |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
4815 |
o start to test mnc routinely in exp0 |
o start to test mnc routinely in exp0 |
4816 |
o add sea-ice loading (sIceLoad) as a new forcing field. |
o add sea-ice loading (sIceLoad) as a new forcing field. |
4817 |
|
|
4818 |
checkpoint54b_post |
checkpoint54b_post (2004/07/08) |
4819 |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
4820 |
impressive on Altix and Opteron systems) |
impressive on Altix and Opteron systems) |
4821 |
o diagnostics can now write NetCDF files through the mnc package |
o diagnostics can now write NetCDF files through the mnc package |
4825 |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
4826 |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
4827 |
|
|
4828 |
checkpoint54a_post |
checkpoint54a_post (2004/07/06) |
4829 |
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). |
4830 |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
4831 |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
4832 |
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) |
4833 |
+ internal_wave (shift in writing cg2d_ini_res) |
+ internal_wave (shift in writing cg2d_ini_res) |
4834 |
checkpoint54a_pre |
checkpoint54a_pre (2004/07/05) |
4835 |
|
|
4836 |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
4837 |
- modified verification/lab_sea and natl_box_adjoint accordingly |
- modified verification/lab_sea and natl_box_adjoint accordingly |
4838 |
|
|
4839 |
checkpoint54 |
checkpoint54 (2004/07/02) |
4840 |
checkpoint53g_post |
checkpoint53g_post (2004/07/02) |
4841 |
o prepare splitting of thermodynamics: store convect.counter in common block |
o prepare splitting of thermodynamics: store convect.counter in common block |
4842 |
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) |
4843 |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
4846 |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
4847 |
o restore adjointability |
o restore adjointability |
4848 |
|
|
4849 |
checkpoint53f_post |
checkpoint53f_post (2004/06/25) |
4850 |
o modifications that affect AIM experiment results (update output.txt): |
o modifications that affect AIM experiment results (update output.txt): |
4851 |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
4852 |
- 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) |
4859 |
o added rotating_tank experiment |
o added rotating_tank experiment |
4860 |
checkpoint53e_pre |
checkpoint53e_pre |
4861 |
|
|
4862 |
checkpoint53d_post |
checkpoint53d_post (2004/06/14) |
4863 |
o faulks upgraded: re-generate output.txt that have changed: |
o faulks upgraded: re-generate output.txt that have changed: |
4864 |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
4865 |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
4878 |
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 |
4879 |
of mom_common/ |
of mom_common/ |
4880 |
- simple re-arrangement of instructions within computing loop |
- simple re-arrangement of instructions within computing loop |
4881 |
checkpoint53d_pre |
checkpoint53d_pre (2004/05/21) |
4882 |
|
|
4883 |
checkpoint53c_post |
checkpoint53c_post (2004/05/21) |
4884 |
o new version of coupler for AIM+thSIce and Ocean models |
o new version of coupler for AIM+thSIce and Ocean models |
4885 |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
4886 |
- land: change Evaporation of snow |
- land: change Evaporation of snow |
4897 |
* TLM OK |
* TLM OK |
4898 |
* ADM not sufficient accuracy yet (needs further testing) |
* ADM not sufficient accuracy yet (needs further testing) |
4899 |
|
|
4900 |
checkpoint53b_post |
checkpoint53b_post (2004/05/14) |
4901 |
o Commiting new energy balance model to repository |
o Commiting new energy balance model to repository |
4902 |
* package is pkg/ebm |
* package is pkg/ebm |
4903 |
* verif. is verification/global_ocean_ebm |
* verif. is verification/global_ocean_ebm |
4915 |
C by atmospheric eddy transports. |
C by atmospheric eddy transports. |
4916 |
C J. Climate 7(12), 1870-1882 |
C J. Climate 7(12), 1870-1882 |
4917 |
o Will need long integration testing. |
o Will need long integration testing. |
4918 |
checkpoint53b_pre |
checkpoint53b_pre (2004/05/14) |
4919 |
|
|
4920 |
o created pkg/mom_common in preparation for variable viscosity code |
o created pkg/mom_common in preparation for variable viscosity code |
4921 |
o renamed and split ini_mnc_io |
o renamed and split ini_mnc_io |
4923 |
o AIM using land: soil wetness availability account for snow |
o AIM using land: soil wetness availability account for snow |
4924 |
o added printMapIncludesZeros to EEPARMS namelist |
o added printMapIncludesZeros to EEPARMS namelist |
4925 |
|
|
4926 |
checkpoint53a_post |
checkpoint53a_post (2004/05/11) |
4927 |
o restore TAMC compatiility for exf_constants.h |
o restore TAMC compatiility for exf_constants.h |
4928 |
(no usage of _d in .h) |
(no usage of _d in .h) |
4929 |
o Additional storing in KPP in an attempt to fix |
o Additional storing in KPP in an attempt to fix |
4936 |
and hence gives results closer to that of Experiment 2. |
and hence gives results closer to that of Experiment 2. |
4937 |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
4938 |
|
|
4939 |
checkpoint53 |
checkpoint53 (2004/05/06) |
4940 |
o stable checkpoint with up to date adjoint |
o stable checkpoint with up to date adjoint |
4941 |
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 |
4942 |
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_ |
4946 |
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) |
4947 |
are both still in chaos following their security messes. |
are both still in chaos following their security messes. |
4948 |
|
|
4949 |
checkpoint52n_post |
checkpoint52n_post (2004/05/06) |
4950 |
o various build (mostly genmake2) changes including: |
o various build (mostly genmake2) changes including: |
4951 |
- ability to build/run more easily within Cygwin and MacOS X |
- ability to build/run more easily within Cygwin and MacOS X |
4952 |
- more complicated Makefiles with a stronger dependence on Gnu Make |
- more complicated Makefiles with a stronger dependence on Gnu Make |
4977 |
- maintain snow precipitation unchanged (even if Tsf >=0). |
- maintain snow precipitation unchanged (even if Tsf >=0). |
4978 |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
4979 |
|
|
4980 |
checkpoint52m_post |
checkpoint52m_post (2004/04/18) |
4981 |
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; |
4982 |
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 |
4983 |
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 |
5009 |
o Added functionality to grdchk: |
o Added functionality to grdchk: |
5010 |
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. |
5011 |
|
|
5012 |
checkpoint52l_post |
checkpoint52l_post (2004/03/11) |
5013 |
o new land formulation: |
o new land formulation: |
5014 |
a) use ground enthalpy as prognostic variable to ensure exact |
a) use ground enthalpy as prognostic variable to ensure exact |
5015 |
energy conservation. |
energy conservation. |
5020 |
a) Treat separately land / ocean / sea-ice surface fluxes |
a) Treat separately land / ocean / sea-ice surface fluxes |
5021 |
to allow implicit computation of land & sea-ice surface temp. |
to allow implicit computation of land & sea-ice surface temp. |
5022 |
b) add snow precipitation. |
b) add snow precipitation. |
5023 |
checkpoint52l_pre |
checkpoint52l_pre (2004/03/11) |
5024 |
|
|
5025 |
o fix problem (when 1 tile is empty) in min/max monitor. |
o fix problem (when 1 tile is empty) in min/max monitor. |
5026 |
o fix bug in timeAve (u,vZetatave in common block) |
o fix bug in timeAve (u,vZetatave in common block) |
5033 |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
5034 |
o exf: Adding simple range check routine for exf fields after read |
o exf: Adding simple range check routine for exf fields after read |
5035 |
|
|
5036 |
checkpoint52k_post |
checkpoint52k_post (2004/02/23) |
5037 |
o removed top-level directory "diags" |
o removed top-level directory "diags" |
5038 |
- we migrated these functions to pkg/timeave a long time ago |
- we migrated these functions to pkg/timeave a long time ago |
5039 |
o fixed bug introduced in pkg/monitor |
o fixed bug introduced in pkg/monitor |
5046 |
taveFreq, dumpFreq, pChkptFreq |
taveFreq, dumpFreq, pChkptFreq |
5047 |
o MAIN and ECCO differentiability restored |
o MAIN and ECCO differentiability restored |
5048 |
|
|
5049 |
checkpoint52j_post |
checkpoint52j_post (2004/02/18) |
5050 |
o fix nchklev in tamc.h for global_ocean... |
o fix nchklev in tamc.h for global_ocean... |
5051 |
o Bringing flow and store directives up-to-date |
o Bringing flow and store directives up-to-date |
5052 |
o Really weird thing! |
o Really weird thing! |
5054 |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
5055 |
TAF places a faulty re-call of initialise_varia |
TAF places a faulty re-call of initialise_varia |
5056 |
after cost_final call which should not be there! |
after cost_final call which should not be there! |
5057 |
checkpoint52j_pre |
checkpoint52j_pre (2004/02/03) |
5058 |
|
|
5059 |
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 |
5060 |
error messages |
error messages |
5071 |
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 |
5072 |
o limit timeave output for hi-res integrations |
o limit timeave output for hi-res integrations |
5073 |
|
|
5074 |
checkpoint52i_post |
checkpoint52i_post (2004/01/21) |
5075 |
o removed CPP_EEOPTIONS.h from verification/*/code |
o removed CPP_EEOPTIONS.h from verification/*/code |
5076 |
o updated the tiling for global_ocean_pressure |
o updated the tiling for global_ocean_pressure |
5077 |
checkpoint52i_pre |
checkpoint52i_pre (2004/01/20) |
5078 |
|
|
5079 |
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 |
5080 |
the old pkg/aim). |
the old pkg/aim). |
5081 |
|
|
5082 |
checkpoint52h_pre |
checkpoint52h_pre (2004/01/20) |
5083 |
o shortened offending lines in exch2_send_rx?.template |
o shortened offending lines in exch2_send_rx?.template |
5084 |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
5085 |
o genmake2: add build & execute test for NetCDF code |
o genmake2: add build & execute test for NetCDF code |
5090 |
metric terms are ignored and it is assumed that |
metric terms are ignored and it is assumed that |
5091 |
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. |
5092 |
|
|
5093 |
checkpoint52f_post |
checkpoint52f_post (2004/01/09) |
5094 |
o added exch2 cube routines to pkg/exch2 |
o added exch2 cube routines to pkg/exch2 |
5095 |
o modified hs94.cs-32x32x5 to use it |
o modified hs94.cs-32x32x5 to use it |
5096 |
o added new grid files to hs94.cs-32x32x5 |
o added new grid files to hs94.cs-32x32x5 |
5097 |
checkpoint52f_pre |
checkpoint52f_pre (2004/01/07) |
5098 |
|
|
5099 |
checkpoint52e_post |
checkpoint52e_post (2004/01/07) |
5100 |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
5101 |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
5102 |
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) |
5104 |
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. |
5105 |
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: |
5106 |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
5107 |
checkpoint52e_pre |
checkpoint52e_pre (2004/01/02) |
5108 |
|
|
5109 |
o fix bug in impldiff when Nr=1 or Nr=2. |
o fix bug in impldiff when Nr=1 or Nr=2. |
5110 |
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 |
5115 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
5116 |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
5117 |
|
|
5118 |
checkpoint52d_post |
checkpoint52d_post (2003/12/16) |
5119 |
o re-tiled many expts to allow comparison in multi-processor mode |
o re-tiled many expts to allow comparison in multi-processor mode |
5120 |
- updated output accordingly |
- updated output accordingly |
5121 |
- 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 |
5144 |
o new verification experiment, cpl_aim+ocn: |
o new verification experiment, cpl_aim+ocn: |
5145 |
coupled ocean - AIM atmosphere on cs32 grid. |
coupled ocean - AIM atmosphere on cs32 grid. |
5146 |
|
|
5147 |
checkpoint52d_pre |
checkpoint52d_pre (2003/12/06) |
5148 |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
5149 |
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 |
5150 |
|
|
5151 |
checkpoint52c_post |
checkpoint52c_post (2003/11/25) |
5152 |
o Fixing OPTIONS files for use of exf: |
o Fixing OPTIONS files for use of exf: |
5153 |
- ALLOW_ECCO not needed |
- ALLOW_ECCO not needed |
5154 |
- ECCO_CPPOPTIONS.h should not be included from |
- ECCO_CPPOPTIONS.h should not be included from |
5162 |
o modified STOREs in GAD_ADVECTION |
o modified STOREs in GAD_ADVECTION |
5163 |
o corrected key comp. for passkey |
o corrected key comp. for passkey |
5164 |
|
|
5165 |
checkpoint52b_post |
checkpoint52b_post (2003/11/23) |
5166 |
o new version: "thsice" of thermodynamic sea-ice pkg: |
o new version: "thsice" of thermodynamic sea-ice pkg: |
5167 |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
5168 |
- modify fluxes but do not change theta directly; |
- modify fluxes but do not change theta directly; |
5170 |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
5171 |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
5172 |
o put back grid & coriolis monitor output. |
o put back grid & coriolis monitor output. |
5173 |
checkpoint52b_pre |
checkpoint52b_pre (2003/11/23) |
5174 |
|
|
5175 |
o call "do_the_model_io" at the beginning (=> dump initial state) |
o call "do_the_model_io" at the beginning (=> dump initial state) |
5176 |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
5180 |
o default tamc.h in pkg/autodiff supposed to crash |
o default tamc.h in pkg/autodiff supposed to crash |
5181 |
to ensure proper customization |
to ensure proper customization |
5182 |
|
|
5183 |
checkpoint52a_post |
checkpoint52a_post (2003/11/17) |
5184 |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
5185 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
5186 |
- subroutine FREEZE_SURFACE now limits only surface temperature |
- subroutine FREEZE_SURFACE now limits only surface temperature |
5195 |
snapshot file was missing some ad-variables, |
snapshot file was missing some ad-variables, |
5196 |
but no warning issued by TAF |
but no warning issued by TAF |
5197 |
|
|
5198 |
checkpoint52a_pre |
checkpoint52a_pre (2003/11/12) |
5199 |
o some bug fixes for #undef REAL4_IS_SLOW |
o some bug fixes for #undef REAL4_IS_SLOW |
5200 |
|
|
5201 |
checkpoint52 = ecco_c52_e35 |
checkpoint52 = ecco_c52_e35 |
5202 |
o after testing adjoints of checkpoint51u_post |
o after testing adjoints of checkpoint51u_post |
5203 |
|
|
5204 |
checkpoint51u_post |
checkpoint51u_post (2003/11/06) |
5205 |
o this is the post-merge tag of the ecco-branch |
o this is the post-merge tag of the ecco-branch |
5206 |
(needs another clean checkout and re-testing) |
(needs another clean checkout and re-testing) |
5207 |
o various natl_box_adjoint configs and results |
o various natl_box_adjoint configs and results |
5216 |
(new namelist ecco_cost_nml) |
(new namelist ecco_cost_nml) |
5217 |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
5218 |
|
|
5219 |
checkpoint51t_post |
checkpoint51t_post (2003/11/04) |
5220 |
o this is the pre-merge tag of the ecco-branch |
o this is the pre-merge tag of the ecco-branch |
5221 |
|
|
5222 |
checkpoint51s_post |
checkpoint51s_post (2003/11/04) |
5223 |
o cleanup: removed various obsolete #define-s |
o cleanup: removed various obsolete #define-s |
5224 |
o pkg/grdchk |
o pkg/grdchk |
5225 |
- renamed 'ph-grd 3' to 'grad-res' |
- renamed 'ph-grd 3' to 'grad-res' |
5228 |
- additional high-precision output for testreport |
- additional high-precision output for testreport |
5229 |
(grep for 'precision_grdchk_result') |
(grep for 'precision_grdchk_result') |
5230 |
|
|
5231 |
checkpoint51r_post |
checkpoint51r_post (2003/11/03) |
5232 |
o cleaned up or removed CPP_OPTIONS.h files |
o cleaned up or removed CPP_OPTIONS.h files |
5233 |
o updated results for some of the tests to reflect the new |
o updated results for some of the tests to reflect the new |
5234 |
optfiles (-ieee: -O0 instead of -O3) |
optfiles (-ieee: -O0 instead of -O3) |
5235 |
|
|
5236 |
checkpoint51q_post |
checkpoint51q_post (2003/10/30) |
5237 |
o cd_code: |
o cd_code: |
5238 |
- moved cd_scheme.F -> cd_code_scheme.F |
- moved cd_scheme.F -> cd_code_scheme.F |
5239 |
- separate read_checkpoint from cd_code_ini_vars.F |
- separate read_checkpoint from cd_code_ini_vars.F |
5249 |
- confined inclusion of AD_CONFIG.h to where necessary. |
- confined inclusion of AD_CONFIG.h to where necessary. |
5250 |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
5251 |
|
|
5252 |
checkpoint51p_post |
checkpoint51p_post (2003/10/30) |
5253 |
o create initial cd_code package |
o create initial cd_code package |
5254 |
- WARNING: the initialization of fields within packages |
- WARNING: the initialization of fields within packages |
5255 |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
5264 |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
5265 |
o cleanup testreport |
o cleanup testreport |
5266 |
|
|
5267 |
checkpoint51o_post |
checkpoint51o_post (2003/10/27) |
5268 |
o bringing AD-related verif's up to date with genmake2 |
o bringing AD-related verif's up to date with genmake2 |
5269 |
- carbon/ |
- carbon/ |
5270 |
- global_ocean.90x40x15/ |
- global_ocean.90x40x15/ |
5285 |
o helping TAF to recognize dependency on kUp for |
o helping TAF to recognize dependency on kUp for |
5286 |
fVerU, fVerV |
fVerU, fVerV |
5287 |
o Replacing delZ by delR in pkg/ctrl/ |
o Replacing delZ by delR in pkg/ctrl/ |
5288 |
checkpoint51o_pre |
checkpoint51o_pre (2003/10/24) |
5289 |
|
|
5290 |
o undid all of cp51 pending some cleanups and discussion |
o undid all of cp51 pending some cleanups and discussion |
5291 |
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 |
5293 |
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 |
5294 |
o removed tools/genmake since it no longer works |
o removed tools/genmake since it no longer works |
5295 |
|
|
5296 |
checkpoint51n_post |
checkpoint51n_post (2003/10/23) |
5297 |
o modifications to make FREEZE flux visible to pkg/kpp |
o modifications to make FREEZE flux visible to pkg/kpp |
5298 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
5299 |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
5302 |
global_ocean.cs32x15, and global_with_exf) |
global_ocean.cs32x15, and global_with_exf) |
5303 |
o added surface flux output variables to TIMEAVE_STATVARS |
o added surface flux output variables to TIMEAVE_STATVARS |
5304 |
|
|
5305 |
checkpoint51n_pre |
checkpoint51n_pre (2003/10/23) |
5306 |
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 |
5307 |
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 |
5308 |
defines: |
defines: |
5310 |
- ALLOW_TANGENTLINEAR_RUN |
- ALLOW_TANGENTLINEAR_RUN |
5311 |
- ALLOW_ECCO_OPTIMIZATION |
- ALLOW_ECCO_OPTIMIZATION |
5312 |
|
|
5313 |
checkpoint51m_post |
checkpoint51m_post (2003/10/21) |
5314 |
o incorporating changes to get TAMC/TAF working in genmake2 |
o incorporating changes to get TAMC/TAF working in genmake2 |
5315 |
- added new TAMC/TAF targets to the Makefile |
- added new TAMC/TAF targets to the Makefile |
5316 |
- various cleanups related to package handling |
- various cleanups related to package handling |
5317 |
- these changes should have no impact on the forward model |
- these changes should have no impact on the forward model |
5318 |
|
|
5319 |
checkpoint51l_post |
checkpoint51l_post (2003/10/20) |
5320 |
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 |
5321 |
- faster algorithm for cal_addtime.F |
- faster algorithm for cal_addtime.F |
5322 |
- higher precision arithmetic, where needed |
- higher precision arithmetic, where needed |
5323 |
- pkg/exf *startdate variables changed from calendar date to |
- pkg/exf *startdate variables changed from calendar date to |
5324 |
model integration time |
model integration time |
5325 |
|
|
5326 |
checkpoint51l_pre |
checkpoint51l_pre (2003/10/17) |
5327 |
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) |
5328 |
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. |
5329 |
o update output (external_forcing_surf modif. change truncation errors) |
o update output (external_forcing_surf modif. change truncation errors) |
5330 |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
5331 |
|
|
5332 |
checkpoint51k_post |
checkpoint51k_post (2003/10/16) |
5333 |
o change default to: useNHMTerms=.FALSE. |
o change default to: useNHMTerms=.FALSE. |
5334 |
- 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): |
5335 |
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 |
5343 |
removed the #include "PACKAGES_CONFIG.h" from it |
removed the #include "PACKAGES_CONFIG.h" from it |
5344 |
o fix a bug in mom_fluxform (from chk51j_post) |
o fix a bug in mom_fluxform (from chk51j_post) |
5345 |
|
|
5346 |
checkpoint51j_post |
checkpoint51j_post (2003/10/10) |
5347 |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
5348 |
o adjusted some flow directives (dynamics, thermodynamics) |
o adjusted some flow directives (dynamics, thermodynamics) |
5349 |
o added cubed-sphere case to test cost function |
o added cubed-sphere case to test cost function |
5357 |
- pkg_ad_diff.list |
- pkg_ad_diff.list |
5358 |
- pkg_ad_check_lev?_dir.h |
- pkg_ad_check_lev?_dir.h |
5359 |
|
|
5360 |
checkpoint51i_post |
checkpoint51i_post (2003/10/09) |
5361 |
o merge of the branch-genmake2 |
o merge of the branch-genmake2 |
5362 |
- knowingly breaks the older genmake |
- knowingly breaks the older genmake |
5363 |
- automatic generation of all ALLOW_${PKG_NAME} defines |
- automatic generation of all ALLOW_${PKG_NAME} defines |
5364 |
- new testreport supersedes older testscript |
- new testreport supersedes older testscript |
5365 |
o large number of package inclusion and header cleanups |
o large number of package inclusion and header cleanups |
5366 |
checkpoint51i_pre |
checkpoint51i_pre (2003/10/08) |
5367 |
|
|
5368 |
o new output for adjoin of global ocean vector invariant |
o new output for adjoin of global ocean vector invariant |
5369 |
o fix for checkpoint of thermodynamic seaice and bulk_force |
o fix for checkpoint of thermodynamic seaice and bulk_force |
5375 |
o modifications to clean up dic pkg |
o modifications to clean up dic pkg |
5376 |
o add pkg/cfc |
o add pkg/cfc |
5377 |
|
|
5378 |
checkpoint51g_post |
checkpoint51g_post (2003/10/02) |
5379 |
o provide links for ARPACK and ADM*TLM |
o provide links for ARPACK and ADM*TLM |
5380 |
o start removing verification/vero/ |
o start removing verification/vero/ |
5381 |
o update AD-related stuff |
o update AD-related stuff |
5383 |
o adding to verification/global_ocean.90x40x15/ adjoint of |
o adding to verification/global_ocean.90x40x15/ adjoint of |
5384 |
vector invariant setup |
vector invariant setup |
5385 |
|
|
5386 |
checkpoint51f_post |
checkpoint51f_post (2003/10/02) |
5387 |
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) |
5388 |
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 |
5389 |
of tracer Green's fucntions for ocean inversion project. |
of tracer Green's fucntions for ocean inversion project. |
5390 |
|
|
5391 |
checkpoint51f_pre |
checkpoint51f_pre (2003/08/07) |
5392 |
o Added on-the-fly spatial interpolation capability |
o Added on-the-fly spatial interpolation capability |
5393 |
"USE_EXF_INTERPOLATION" to pkg/exf. |
"USE_EXF_INTERPOLATION" to pkg/exf. |
5394 |
- This is a temporary Cartesian-grid hack until |
- This is a temporary Cartesian-grid hack until |
5400 |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
5401 |
non-local transport term. |
non-local transport term. |
5402 |
|
|
5403 |
checkpoint51e_post |
checkpoint51e_post (2003/08/03) |
5404 |
o pkg/mom_vecinv: |
o pkg/mom_vecinv: |
5405 |
- 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) |
5406 |
- add time-ave diagnostic of vorticity advection. |
- add time-ave diagnostic of vorticity advection. |
5410 |
o land pkg: read initial state from files. |
o land pkg: read initial state from files. |
5411 |
o AIM : add stratospheric drag in the upper level |
o AIM : add stratospheric drag in the upper level |
5412 |
|
|
5413 |
checkpoint51d_post |
checkpoint51d_post (2003/07/18) |
5414 |
o change function ILNBLNK (=> last non-blank char.) to return zero |
o change function ILNBLNK (=> last non-blank char.) to return zero |
5415 |
(instead of the string length) when the string. char is empty |
(instead of the string length) when the string. char is empty |
5416 |
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) |
5423 |
- new active_file_loc... and mdsio_..._loc routines |
- new active_file_loc... and mdsio_..._loc routines |
5424 |
- affected packages: autodiff, ctrl, grdchk, mdsio |
- affected packages: autodiff, ctrl, grdchk, mdsio |
5425 |
|
|
5426 |
checkpoint51c_post |
checkpoint51c_post (2003/07/08) |
5427 |
o introducing integer flag debugLevel |
o introducing integer flag debugLevel |
5428 |
- debLevZero: suppress all output |
- debLevZero: suppress all output |
5429 |
- debLevA: standard |
- debLevA: standard |
5446 |
- checked tapelev/comlev recomputations: OK |
- checked tapelev/comlev recomputations: OK |
5447 |
<<<checkpoint51b_pre |
<<<checkpoint51b_pre |
5448 |
|
|
5449 |
checkpoint51a_post |
checkpoint51a_post (2003/06/25) |
5450 |
o added code for biogeochemistry package |
o added code for biogeochemistry package |
5451 |
- new pkgs: dic, gchem |
- new pkgs: dic, gchem |
5452 |
- new subroutine in ptracers |
- new subroutine in ptracers |
5453 |
o modify code for biogeo packages |
o modify code for biogeo packages |
5454 |
- in model/src and pkg/ptracers |
- in model/src and pkg/ptracers |
5455 |
|
|
5456 |
checkpoint51 |
checkpoint51 (2003/06/24) |
5457 |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
5458 |
- autodiff, ctrl, exf, grdchk, seaice |
- autodiff, ctrl, exf, grdchk, seaice |
5459 |
kept separate packages |
kept separate packages |
5461 |
o updating verification/internal_wave, verification/lab_sea |
o updating verification/internal_wave, verification/lab_sea |
5462 |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
5463 |
|
|
5464 |
checkpoint50i_post |
checkpoint50i_post (2003/06/23) |
5465 |
o Preparing next differentiable checkpoint and sync |
o Preparing next differentiable checkpoint and sync |
5466 |
of MAIN vs. ecco-branch |
of MAIN vs. ecco-branch |
5467 |
- 1st step: this one is differentiable |
- 1st step: this one is differentiable |
5468 |
- 2nd step: next(! not this) checkpoint will have updated packages |
- 2nd step: next(! not this) checkpoint will have updated packages |
5469 |
from ecco-branch) |
from ecco-branch) |
5470 |
|
|
5471 |
checkpoint50h_post |
checkpoint50h_post (2003/06/20) |
5472 |
o new package "land": provide surface BC for AIM. |
o new package "land": provide surface BC for AIM. |
5473 |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
5474 |
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 |
5477 |
o somewhat cleaned package initialisation sequence for |
o somewhat cleaned package initialisation sequence for |
5478 |
ctrl/ cost/ ecco/ in packages_... routines |
ctrl/ cost/ ecco/ in packages_... routines |
5479 |
|
|
5480 |
checkpoint50g_post |
checkpoint50g_post (2003/05/23) |
5481 |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
5482 |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
5483 |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
5484 |
made the default because of faster convergence than ADI |
made the default because of faster convergence than ADI |
5485 |
|
|
5486 |
checkpoint50f_post |
checkpoint50f_post (2003/05/23) |
5487 |
o exf totally restructured |
o exf totally restructured |
5488 |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
5489 |
and made sure it's still differentiable |
and made sure it's still differentiable |
5491 |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
5492 |
- updated adjoint/makefile and relevant verif. accordingly |
- updated adjoint/makefile and relevant verif. accordingly |
5493 |
|
|
5494 |
checkpoint50f_pre |
checkpoint50f_pre (2003/05/23) |
5495 |
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 ; |
5496 |
+ change Evap over land. (update aim.5l_cs output) |
+ change Evap over land. (update aim.5l_cs output) |
5497 |
o added missing .cvsignores and made uniform across expts |
o added missing .cvsignores and made uniform across expts |
5501 |
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 |
5502 |
o removed lots of single quotes from comments |
o removed lots of single quotes from comments |
5503 |
|
|
5504 |
checkpoint50e_post |
checkpoint50e_post (2003/05/14) |
5505 |
o make KPP work with PTRACERS |
o make KPP work with PTRACERS |
5506 |
- 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 |
5507 |
nearly a copy of kpp_transport_s |
nearly a copy of kpp_transport_s |
5508 |
- there is no analogue to SurfaceTendencyS, so I have to use |
- there is no analogue to SurfaceTendencyS, so I have to use |
5509 |
gPtr(of the surface layer) instead |
gPtr(of the surface layer) instead |
5510 |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
5511 |
checkpoint50e_pre |
checkpoint50e_pre (2003/05/13) |
5512 |
|
|
5513 |
checkpoint50d_post |
checkpoint50d_post (2003/05/13) |
5514 |
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 |
5515 |
files analogous to write_state.F |
files analogous to write_state.F |
5516 |
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, |
5517 |
analogous to the cg2d-related output. |
analogous to the cg2d-related output. |
5518 |
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, |
5519 |
so that writing to internal file fn (with length 512) fails. |
so that writing to internal file fn (with length 512) fails. |
5520 |
checkpoint50d_pre |
checkpoint50d_pre (2003/05/12) |
5521 |
|
|
5522 |
checkpoint50c_post |
checkpoint50c_post (2003/05/12) |
5523 |
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) |
5524 |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
5525 |
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. |
5526 |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
5527 |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
5528 |
|
|
5529 |
checkpoint50c_pre |
checkpoint50c_pre (2003/04/30) |
5530 |
Merging from release1_p13: |
Merging from release1_p13: |
5531 |
o bug fix for pkg/seaice dynamic solver |
o bug fix for pkg/seaice dynamic solver |
5532 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
5533 |
|
|
5534 |
checkpoint50b_post |
checkpoint50b_post (2003/04/17) |
5535 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
5536 |
o in order to put the momForcing out of the Adams-Bashforth: |
o in order to put the momForcing out of the Adams-Bashforth: |
5537 |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
5540 |
o re-generate output for highly sensitive test-exp: |
o re-generate output for highly sensitive test-exp: |
5541 |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
5542 |
|
|
5543 |
checkpoint50b_pre |
checkpoint50b_pre (2003/04/17) |
5544 |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
5545 |
o corrected CPP option mismatch in exf_Bulk... functions for case |
o corrected CPP option mismatch in exf_Bulk... functions for case |
5546 |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
5547 |
|
|
5548 |
checkpoint50a_post |
checkpoint50a_post (2003/03/21) |
5549 |
o Bug fix for merging between c50 and KPP. |
o Bug fix for merging between c50 and KPP. |
5550 |
ikey was passed from thermodynamics to kpp_calc via |
ikey was passed from thermodynamics to kpp_calc via |
5551 |
common block rather than being recomputed in kpp_calc, |
common block rather than being recomputed in kpp_calc, |
5552 |
in contradiction with new key itdkey. |
in contradiction with new key itdkey. |
5553 |
New key ikppkey created, and tamc.h headers updated. |
New key ikppkey created, and tamc.h headers updated. |
5554 |
|
|
5555 |
checkpoint50 |
checkpoint50 (2003/03/08) |
5556 |
- 2nd step of merge with ecco-branch: |
- 2nd step of merge with ecco-branch: |
5557 |
merge changes in ecco-branch back into main trunk |
merge changes in ecco-branch back into main trunk |
5558 |
- bug fix in find_alpha |
- bug fix in find_alpha |
5560 |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
5561 |
- merged some sliced AD support routines |
- merged some sliced AD support routines |
5562 |
|
|
5563 |
checkpoint49 |
checkpoint49 (2003/03/06) |
5564 |
merged from ecco-branch: |
merged from ecco-branch: |
5565 |
o exf: |
o exf: |
5566 |
- Enable initialisation of forcing fields to constant |
- Enable initialisation of forcing fields to constant |
5598 |
(see MITgcm manual). |
(see MITgcm manual). |
5599 |
o cal: synchronized between MAIN and ecco-branch |
o cal: synchronized between MAIN and ecco-branch |
5600 |
|
|
5601 |
checkpoint48i_post |
checkpoint48i_post (2003/03/05) |
5602 |
o Changes to restore differentiability of code w.r.t. previous tag |
o Changes to restore differentiability of code w.r.t. previous tag |
5603 |
(mostly adding new routines to make list and replacing |
(mostly adding new routines to make list and replacing |
5604 |
pressure by totPhiHyd). |
pressure by totPhiHyd). |
5616 |
tbar, sbar, psbar, which should not be reinitialised; |
tbar, sbar, psbar, which should not be reinitialised; |
5617 |
only relevant for ecco-branch) |
only relevant for ecco-branch) |
5618 |
|
|
5619 |
checkpoint48h_post |
checkpoint48h_post (2003/02/28) |
5620 |
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 |
5621 |
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 |
5622 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
5623 |
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 |
5624 |
|
|
5625 |
checkpoint48g_post |
checkpoint48g_post (2003/02/18) |
5626 |
--- EOS: |
--- EOS: |
5627 |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
5628 |
store total Potential in totPhyHyd for diagnostics & EOS. |
store total Potential in totPhyHyd for diagnostics & EOS. |
5636 |
( changes results of ideal_2D_oce ) |
( changes results of ideal_2D_oce ) |
5637 |
o includes r* 2nd term in potential gradient. |
o includes r* 2nd term in potential gradient. |
5638 |
|
|
5639 |
checkpoint48f_post |
checkpoint48f_post (2003/02/18) |
5640 |
Merging from release1_p12: |
Merging from release1_p12: |
5641 |
o Modifications for using pkg/exf with pkg/seaice |
o Modifications for using pkg/exf with pkg/seaice |
5642 |
- improved description of the various forcing configurations |
- improved description of the various forcing configurations |
5664 |
- adjoint-friendly modifications |
- adjoint-friendly modifications |
5665 |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
5666 |
|
|
5667 |
checkpoint48e_post |
checkpoint48e_post (2003/02/12) |
5668 |
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) |
5669 |
o dynamics: change definition of computational domain & adapt mom_fluxform |
o dynamics: change definition of computational domain & adapt mom_fluxform |
5670 |
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. |
5675 |
inverted_barometer solid-body.cs-32x32x1 |
inverted_barometer solid-body.cs-32x32x1 |
5676 |
(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) |
5677 |
|
|
5678 |
checkpoint48d_post |
checkpoint48d_post (2003/02/09) |
5679 |
o in preparation for r*: |
o in preparation for r*: |
5680 |
a) use pre-computed gradient of hydrostatic potential: |
a) use pre-computed gradient of hydrostatic potential: |
5681 |
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 |
5683 |
=> affects results of glob_oce_pressure (different truncation error) |
=> affects results of glob_oce_pressure (different truncation error) |
5684 |
update output.txt of ideal_2D_oce & global_ocean_pressure |
update output.txt of ideal_2D_oce & global_ocean_pressure |
5685 |
|
|
5686 |
checkpoint48d_pre |
checkpoint48d_pre (2003/02/08) |
5687 |
o in preparation for r*: |
o in preparation for r*: |
5688 |
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. |
5689 |
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. |
5690 |
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. |
5691 |
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 |
5692 |
|
|
5693 |
checkpoint48c_post |
checkpoint48c_post (2003/02/06) |
5694 |
Modifications in treatment of initial flux forcing controls |
Modifications in treatment of initial flux forcing controls |
5695 |
to avoid extra storing of flux fields. |
to avoid extra storing of flux fields. |
5696 |
|
|
5697 |
checkpoint48c_pre |
checkpoint48c_pre (2003/01/21) |
5698 |
o Added tidal_basin_2d experiment (currently 1D!) |
o Added tidal_basin_2d experiment (currently 1D!) |
5699 |
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) |
5700 |
|
|
5701 |
checkpoint48b_post |
checkpoint48b_post (2003/01/27) |
5702 |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
5703 |
(modification to pressure gradient not yet implemented) |
(modification to pressure gradient not yet implemented) |
5704 |
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 |
5705 |
(for U & V) that are used for vertical advection of momentum. |
(for U & V) that are used for vertical advection of momentum. |
5706 |
|
|
5707 |
checkpoint48a_post |
checkpoint48a_post (2003/01/24) |
5708 |
o In preparation for r*, use temp. array to compute vertical transport |
o In preparation for r*, use temp. array to compute vertical transport |
5709 |
in flux-form momentum pkg. => change results of few test-exp. |
in flux-form momentum pkg. => change results of few test-exp. |
5710 |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
5711 |
lab_sea, natl_box & plume_on_slope |
lab_sea, natl_box & plume_on_slope |
5712 |
|
|
5713 |
checkpoint48 |
checkpoint48 (2003/01/23) |
5714 |
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') |
5715 |
|
|
5716 |
checkpoint47j_post |
checkpoint47j_post (2003/01/21) |
5717 |
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. |
5718 |
o moved adexch from forward_step to addummy_in_stepping |
o moved adexch from forward_step to addummy_in_stepping |
5719 |
o added exch in ctrl_map_... |
o added exch in ctrl_map_... |
5732 |
re-activated full calculation of taperfct for case 'ac02' |
re-activated full calculation of taperfct for case 'ac02' |
5733 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
5734 |
|
|
5735 |
checkpoint47i_post |
checkpoint47i_post (2003/01/13) |
5736 |
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. |
5737 |
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) |
5738 |
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) |
5748 |
S/R gmredi_slope_psi should be cleaned |
S/R gmredi_slope_psi should be cleaned |
5749 |
o verification/carbon now has exactConserv=.TRUE. |
o verification/carbon now has exactConserv=.TRUE. |
5750 |
|
|
5751 |
checkpoint47g_post |
checkpoint47g_post (2003/01/10) |
5752 |
o time-average AIM output: becomes independent from statvars time-average |
o time-average AIM output: becomes independent from statvars time-average |
5753 |
(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) |
5754 |
o After TAF bug fix: |
o After TAF bug fix: |
5774 |
in conjunction with data.gmredi parameters to be checked in |
in conjunction with data.gmredi parameters to be checked in |
5775 |
in a few minutes under verification/carbon/code/ |
in a few minutes under verification/carbon/code/ |
5776 |
|
|
5777 |
checkpoint47f_post |
checkpoint47f_post (2002/12/28) |
5778 |
Merging from release1_p10: |
Merging from release1_p10: |
5779 |
o modifications for using pkg/exf with pkg/seaice |
o modifications for using pkg/exf with pkg/seaice |
5780 |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
5786 |
- verification/lab_sea default experiment now uses |
- verification/lab_sea default experiment now uses |
5787 |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
5788 |
|
|
5789 |
checkpoint47e_post |
checkpoint47e_post (2002/12/27) |
5790 |
o created a tag prior to creating a branch |
o created a tag prior to creating a branch |
5791 |
|
|
5792 |
checkpoint47d_post |
checkpoint47d_post (2002/12/16) |
5793 |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
5794 |
at the bottom boundary had an erroneous half slip boundary condition |
at the bottom boundary had an erroneous half slip boundary condition |
5795 |
o added bottom drag and no slip boundary condition capabilities to |
o added bottom drag and no slip boundary condition capabilities to |
5796 |
oceanic pressure coordinates code |
oceanic pressure coordinates code |
5797 |
o added new verification experiment global_ocean_pressure, this experiment is |
o added new verification experiment global_ocean_pressure, this experiment is |
5798 |
also described in the tutorial section of the manual |
also described in the tutorial section of the manual |
5799 |
checkpoint47d_pre |
checkpoint47d_pre (2002/12/16) |
5800 |
|
|
5801 |
checkpoint47c_post |
checkpoint47c_post (2002/12/16) |
5802 |
o Added a verification experiment for a global cubed-sphere ocean run |
o Added a verification experiment for a global cubed-sphere ocean run |
5803 |
- verification/global_ocean.cubed32x32x30 |
- verification/global_ocean.cubed32x32x30 |
5804 |
- uses pkg/therm_seaice and pkg/bulk_forcing |
- uses pkg/therm_seaice and pkg/bulk_forcing |
5810 |
NOTES: requires option NONLIN_FRSURF to be "#define". |
NOTES: requires option NONLIN_FRSURF to be "#define". |
5811 |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
5812 |
|
|
5813 |
checkpoint47b_post |
checkpoint47b_post (2002/12/05) |
5814 |
Merging from release1_p9: |
Merging from release1_p9: |
5815 |
o pkg/seaice |
o pkg/seaice |
5816 |
- removed GOTO's and added taf directives |
- removed GOTO's and added taf directives |
5827 |
- added missing matlab routines |
- added missing matlab routines |
5828 |
- added test of thermodynamics parallelization |
- added test of thermodynamics parallelization |
5829 |
|
|
5830 |
checkpoint47a_post |
checkpoint47a_post (2002/11/23) |
5831 |
o new pkg: aim_v23 |
o new pkg: aim_v23 |
5832 |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
5833 |
for now, keep the same surface forcing as before. |
for now, keep the same surface forcing as before. |
5844 |
- Two ifdef statements for compile time, |
- Two ifdef statements for compile time, |
5845 |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
5846 |
|
|
5847 |
checkpoint47 |
checkpoint47 (2002/11/15) |
5848 |
differentiable version of checkpoint46n_post |
differentiable version of checkpoint46n_post |
5849 |
o bug fix in quasihydrostaticterms |
o bug fix in quasihydrostaticterms |
5850 |
o * "clean" adjoint code (in terms of extensive recomputations) |
o * "clean" adjoint code (in terms of extensive recomputations) |
5873 |
- #define GM_VISBECK_VARIABLE_K |
- #define GM_VISBECK_VARIABLE_K |
5874 |
- GM_taper_scheme = 'ldd97' |
- GM_taper_scheme = 'ldd97' |
5875 |
|
|
5876 |
checkpoint46n_post |
checkpoint46n_post (2002/11/12) |
5877 |
Merging from release1_p8: |
Merging from release1_p8: |
5878 |
o verification/natl_box: |
o verification/natl_box: |
5879 |
updating new external_fields_load routine |
updating new external_fields_load routine |
5927 |
the exf (and cal) package instead of the |
the exf (and cal) package instead of the |
5928 |
external_fields_load routine (cf README file). |
external_fields_load routine (cf README file). |
5929 |
|
|
5930 |
checkpoint46m_post |
checkpoint46m_post (2002/11/07) |
5931 |
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 |
5932 |
o added new flag "quasiHydrostatic" for QH mode |
o added new flag "quasiHydrostatic" for QH mode |
5933 |
and new routine quasihydrostaticterms() |
and new routine quasihydrostaticterms() |
5940 |
o removed gravitySign from PARM04 |
o removed gravitySign from PARM04 |
5941 |
o switched to g77/ifc from pgf77 in aim experiments |
o switched to g77/ifc from pgf77 in aim experiments |
5942 |
|
|
5943 |
checkpoint46l_post |
checkpoint46l_post (2002/11/01) |
5944 |
o made convective adjustment work with pressure coordinates: |
o made convective adjustment work with pressure coordinates: |
5945 |
- changed the direction of k-loop in convective_adjustment.F for the |
- changed the direction of k-loop in convective_adjustment.F for the |
5946 |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
5953 |
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 |
5954 |
check of the entire slice, if CPP-option |
check of the entire slice, if CPP-option |
5955 |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
5956 |
checkpoint46l_pre |
checkpoint46l_pre (2002/10/23) |
5957 |
|
|
5958 |
checkpoint46k_post |
checkpoint46k_post (2002/10/23) |
5959 |
o fixed the verification/global_ocean.90x40x15 experiment: |
o fixed the verification/global_ocean.90x40x15 experiment: |
5960 |
- new bathymetry (the world according to A., JMC, and M.) |
- new bathymetry (the world according to A., JMC, and M.) |
5961 |
- new initial fields and forcing fields (*.bin files) |
- new initial fields and forcing fields (*.bin files) |
5969 |
- read AIM physics parameters from a file (data.aimphys) |
- read AIM physics parameters from a file (data.aimphys) |
5970 |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
5971 |
|
|
5972 |
checkpoint46j_post |
checkpoint46j_post (2002/10/07) |
5973 |
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 |
5974 |
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 |
5975 |
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) |
5976 |
o update timeave pkg for wVel diagnostic. |
o update timeave pkg for wVel diagnostic. |
5977 |
checkpoint46j_pre |
checkpoint46j_pre (2002/09/27) |
5978 |
|
|
5979 |
checkpoint46i_post |
checkpoint46i_post (2002/09/25) |
5980 |
o Clean up AIM package (and keep the results unchanged): |
o Clean up AIM package (and keep the results unchanged): |
5981 |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
5982 |
declare all the variables _RL ; use _d 0 for all numerical constants. |
declare all the variables _RL ; use _d 0 for all numerical constants. |
5983 |
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 ! |
5984 |
|
|
5985 |
checkpoint46h_post |
checkpoint46h_post (2002/09/25) |
5986 |
o cleaned up the use of rhoNil and rhoConst. |
o cleaned up the use of rhoNil and rhoConst. |
5987 |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
5988 |
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 |
5992 |
value is 999.8 kg/m^3 |
value is 999.8 kg/m^3 |
5993 |
o cleanup up external_forcing.F and external_forcing_surf.F |
o cleanup up external_forcing.F and external_forcing_surf.F |
5994 |
- can now be used by both OCEANIC and OCEANICP |
- can now be used by both OCEANIC and OCEANICP |
5995 |
checkpoint46h_pre |
checkpoint46h_pre (2002/09/18) |
5996 |
|
|
5997 |
Added code to convert surface volume flux (fresh water) into |
Added code to convert surface volume flux (fresh water) into |
5998 |
a mass flux when using P coordinates in the ocean (OCEANICP). |
a mass flux when using P coordinates in the ocean (OCEANICP). |
5999 |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
6000 |
|
|
6001 |
checkpoint46g_post |
checkpoint46g_post (2002/09/18) |
6002 |
o Include a new diagnostic variable phiHydLow for the ocean model |
o Include a new diagnostic variable phiHydLow for the ocean model |
6003 |
- in z-coordinates, it is the bottom pressure anomaly |
- in z-coordinates, it is the bottom pressure anomaly |
6004 |
- in p-coordinates, it is the sea surface elevation |
- in p-coordinates, it is the sea surface elevation |
6016 |
- removed obsolete 'eqn' from the parameter list. |
- removed obsolete 'eqn' from the parameter list. |
6017 |
o added two new verification experiments: gop and goz |
o added two new verification experiments: gop and goz |
6018 |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
6019 |
checkpoint46g_pre |
checkpoint46g_pre (2002/09/16) |
6020 |
|
|
6021 |
checkpoint46f_post |
checkpoint46f_post (2002/09/16) |
6022 |
o Enable tangent linear (forward mode) gradient checks: |
o Enable tangent linear (forward mode) gradient checks: |
6023 |
- extended active file handling to g_... files |
- extended active file handling to g_... files |
6024 |
- added TANGENT_SIMULATION to theSimulationMode |
- added TANGENT_SIMULATION to theSimulationMode |
6026 |
o added tangent linear setup in verification/carbon/code_ftl |
o added tangent linear setup in verification/carbon/code_ftl |
6027 |
o added adjoint setup in verification/front_relax/code_ad |
o added adjoint setup in verification/front_relax/code_ad |
6028 |
|
|
6029 |
checkpoint46e_post |
checkpoint46e_post (2002/09/05) |
6030 |
o Added new equation of state -> MDJWF |
o Added new equation of state -> MDJWF |
6031 |
- EOS of McDougall et al., 2002, JAOT, submitted |
- EOS of McDougall et al., 2002, JAOT, submitted |
6032 |
- caveat: the equation of state is only valid for a smaller (more |
- caveat: the equation of state is only valid for a smaller (more |
6035 |
- 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 |
6036 |
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 |
6037 |
expect perfect matches for those |
expect perfect matches for those |
6038 |
checkpoint46e_pre |
checkpoint46e_pre (2002/08/19) |
6039 |
|
|
6040 |
checkpoint46d_post |
checkpoint46d_post (2002/08/19) |
6041 |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
6042 |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
6043 |
case of pressure coordinates. eosType='JMD95Z' in |
case of pressure coordinates. eosType='JMD95Z' in |
6044 |
combination with buoyancyRelation='OCEANICP' now causes an error. |
combination with buoyancyRelation='OCEANICP' now causes an error. |
6045 |
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) |
6046 |
in find_alpha/beta. |
in find_alpha/beta. |
6047 |
checkpoint46d_pre |
checkpoint46d_pre (2002/08/15) |
6048 |
|
|
6049 |
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) |
6050 |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
6051 |
|
|
6052 |
checkpoint46c_post |
checkpoint46c_post (2002/08/15) |
6053 |
o Changes necessary for ocean in p-coordinates |
o Changes necessary for ocean in p-coordinates |
6054 |
- Added new buoyancy relation = 'OCEANICP' |
- Added new buoyancy relation = 'OCEANICP' |
6055 |
- Added new parameters = gravitySign (this used to be contained inside |
- Added new parameters = gravitySign (this used to be contained inside |
6056 |
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). |
6057 |
X GM/Redi is not compatible (yet) |
X GM/Redi is not compatible (yet) |
6058 |
X bottom drag and no-slip need to be debugged. |
X bottom drag and no-slip need to be debugged. |
6059 |
checkpoint46c_pre |
checkpoint46c_pre (2002/08/07) |
6060 |
|
|
6061 |
checkpoint46b_post |
checkpoint46b_post (2002/08/07) |
6062 |
o Added new equation of state -> JMD95Z and JMD95P |
o Added new equation of state -> JMD95Z and JMD95P |
6063 |
- EOS of Jackett and McDougall, 1995, JAOT |
- EOS of Jackett and McDougall, 1995, JAOT |
6064 |
- moved all EOS parameters into EOS.h |
- moved all EOS parameters into EOS.h |
6067 |
in-situ temperature (see JMD95) |
in-situ temperature (see JMD95) |
6068 |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
6069 |
unesco.f to be used with POLY3 |
unesco.f to be used with POLY3 |
6070 |
checkpoint46b_pre |
checkpoint46b_pre (2002/07/31) |
6071 |
|
|
6072 |
checkpoint46a_post |
checkpoint46a_post (2002/07/31) |
6073 |
o Added (atmospheric) pressure loading |
o Added (atmospheric) pressure loading |
6074 |
- new field in FFIELDS.h, etc... |
- new field in FFIELDS.h, etc... |
6075 |
- new cpp flag ATMOSPHERIC_LOADING |
- new cpp flag ATMOSPHERIC_LOADING |
6076 |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
6077 |
o Added SHORTWAVE_HEATING to some files for consistency |
o Added SHORTWAVE_HEATING to some files for consistency |
6078 |
checkpoint46a_pre |
checkpoint46a_pre (2002/07/13) |
6079 |
|
|
6080 |
checkpoint46 |
checkpoint46 (2002/07/13) |
6081 |
further merges from release1_p5 |
further merges from release1_p5 |
6082 |
o new ctrl package |
o new ctrl package |
6083 |
- adopted from ECCO environment to enable optimization |
- adopted from ECCO environment to enable optimization |
6104 |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
6105 |
o incorporated hooks for sponge layer code (external_forcing.F) |
o incorporated hooks for sponge layer code (external_forcing.F) |
6106 |
|
|
6107 |
checkpoint45d_post |
checkpoint45d_post (2002/07/12) |
6108 |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
6109 |
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 |
6110 |
(affects plume_on_slope "cg2d" output) |
(affects plume_on_slope "cg2d" output) |
6118 |
- for each tracer, define internal flag for multiDimAdvection & A-B |
- for each tracer, define internal flag for multiDimAdvection & A-B |
6119 |
o monitor: change definition of KE to check conservation of Energy |
o monitor: change definition of KE to check conservation of Energy |
6120 |
|
|
6121 |
checkpoint45c_post |
checkpoint45c_post (2002/05/30) |
6122 |
o Removed f90 comments ("!") |
o Removed f90 comments ("!") |
6123 |
o Modified initialisations to enable exf package for MITgcm |
o Modified initialisations to enable exf package for MITgcm |
6124 |
(without invoking ECCO_PACKAGE). |
(without invoking ECCO_PACKAGE). |
6126 |
- enable centered differences |
- enable centered differences |
6127 |
- modified format of standard output |
- modified format of standard output |
6128 |
|
|
6129 |
checkpoint45b_post |
checkpoint45b_post (2002/05/30) |
6130 |
o cleaned exchange calls in cg2d |
o cleaned exchange calls in cg2d |
6131 |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
6132 |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
6138 |
(corresponding adjustment of TAF tape initialisation). |
(corresponding adjustment of TAF tape initialisation). |
6139 |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
6140 |
|
|
6141 |
checkpoint45a_post |
checkpoint45a_post (2002/05/01) |
6142 |
o compute Rho over the whole domain (extend iMin,jMin indices) |
o compute Rho over the whole domain (extend iMin,jMin indices) |
6143 |
o specific exchange for X-slice domain (case Ny=1) |
o specific exchange for X-slice domain (case Ny=1) |
6144 |
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 |
6158 |
(conflict on some platforms, e.g. IBM SP3) |
(conflict on some platforms, e.g. IBM SP3) |
6159 |
o modified carbon verif. |
o modified carbon verif. |
6160 |
|
|
6161 |
checkpoint44h_pre |
checkpoint44h_pre (2002/03/14) |
6162 |
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 |
6163 |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
6164 |
o GM Advective form: Tracers are advected using the residual transport (= |
o GM Advective form: Tracers are advected using the residual transport (= |
6165 |
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. |
6166 |
|
|
6167 |
checkpoint44g_post |
checkpoint44g_post (2002/03/05) |
6168 |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
6169 |
results) ; ifdef missing in thermodynamics.F |
results) ; ifdef missing in thermodynamics.F |
6170 |
|
|
6229 |
o check parameters & config (chkpt44a_pre,post) |
o check parameters & config (chkpt44a_pre,post) |
6230 |
o OBC and NonLin_FrSurf. |
o OBC and NonLin_FrSurf. |
6231 |
|
|
6232 |
checkpoint44 |
checkpoint44 (2002/01/18) |
6233 |
o fix bug in mom_vi_del2uv |
o fix bug in mom_vi_del2uv |
6234 |
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) |
6235 |
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) |
6237 |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
6238 |
o added some stuff for AD |
o added some stuff for AD |
6239 |
|
|
6240 |
checkpoint43 |
checkpoint43 (2001/09/28) |
6241 |
o added two new advection tests |
o added two new advection tests |
6242 |
o added global 4x4 degree ocean test |
o added global 4x4 degree ocean test |
6243 |
o added test of H&S94 with free surface on cube |
o added test of H&S94 with free surface on cube |
6244 |
o some final mods for gradient check, adjoint,... |
o some final mods for gradient check, adjoint,... |
6245 |
|
|
6246 |
checkpoint42 |
checkpoint42 (2001/09/27) |
6247 |
Fixed AD-related problems: |
Fixed AD-related problems: |
6248 |
o Store directives up-to-date with re-arranged Adams-Bashforth |
o Store directives up-to-date with re-arranged Adams-Bashforth |
6249 |
(mainly thermodynamics.F) |
(mainly thermodynamics.F) |
6255 |
for the case ALLOW_KPP |
for the case ALLOW_KPP |
6256 |
o Cleaned argument list for timestep_tracer.F |
o Cleaned argument list for timestep_tracer.F |
6257 |
|
|
6258 |
checkpoint41 |
checkpoint41 (2001/09/27) |
6259 |
o re-formatted/added comments in prologues of key subroutines |
o re-formatted/added comments in prologues of key subroutines |
6260 |
to work with protex |
to work with protex |
6261 |
|
|
6262 |
checkpoint40 |
checkpoint40 (2001/09/27) |
6263 |
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 |
6264 |
o added FLT (floats) package from Arne along with demo. experiment |
o added FLT (floats) package from Arne along with demo. experiment |
6265 |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
6268 |
o modified multi-dim method to work on cube |
o modified multi-dim method to work on cube |
6269 |
o bug fix in KPP (from DM) |
o bug fix in KPP (from DM) |
6270 |
|
|
6271 |
checkpoint40pre9 |
checkpoint40pre9 (2001/09/27) |
6272 |
o added DST advection schemes |
o added DST advection schemes |
6273 |
o fix MPI bug on SGI's |
o fix MPI bug on SGI's |
6274 |
o modifications for non-linear free-surface |
o modifications for non-linear free-surface |
6278 |
o added/updated many matlab scripts |
o added/updated many matlab scripts |
6279 |
o added multi-dimensional advection method for tracers |
o added multi-dimensional advection method for tracers |
6280 |
|
|
6281 |
checkpoint40pre8 |
checkpoint40pre8 (2001/09/05) |
6282 |
o new package rw/ |
o new package rw/ |
6283 |
Added method for dumping intermediate local arrays: |
Added method for dumping intermediate local arrays: |
6284 |
mdsio_writetile - same as mdsio_writefield except works from inside |
mdsio_writetile - same as mdsio_writefield except works from inside |
6297 |
currently nothing implemented to switch this storing off |
currently nothing implemented to switch this storing off |
6298 |
in case fluxform is used since no CPP flag available). |
in case fluxform is used since no CPP flag available). |
6299 |
|
|
6300 |
checkpoint40pre7 |
checkpoint40pre7 (2001/08/14) |
6301 |
o bug fix in dynamics.F |
o bug fix in dynamics.F |
6302 |
calc_viscosity called before k=1,Nr loop. |
calc_viscosity called before k=1,Nr loop. |
6303 |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
6304 |
o cleaned initialisations in ctrl_map_ini |
o cleaned initialisations in ctrl_map_ini |
6305 |
related to TAF |
related to TAF |
6306 |
|
|
6307 |
checkpoint40pre6 |
checkpoint40pre6 (2001/08/13) |
6308 |
o split dynamics into thermodynamics & dynamics |
o split dynamics into thermodynamics & dynamics |
6309 |
o corresponding split of calc_diffusivity into |
o corresponding split of calc_diffusivity into |
6310 |
calc_diffusivity, calc_viscosity |
calc_diffusivity, calc_viscosity |
6312 |
o Added diffkr, kapgm to control variables |
o Added diffkr, kapgm to control variables |
6313 |
o bug fix in gmredi_slope_limit for ldd97 |
o bug fix in gmredi_slope_limit for ldd97 |
6314 |
|
|
6315 |
checkpoint40pre5 |
checkpoint40pre5 (2001/07/31) |
6316 |
o proper initialization of Adams-Bashforth time stepping |
o proper initialization of Adams-Bashforth time stepping |
6317 |
+ uses forward step for very first step of model (iter=0) |
+ uses forward step for very first step of model (iter=0) |
6318 |
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 |
6326 |
+ this uses an alternative form of ini_curvilinear_grid.F which |
+ this uses an alternative form of ini_curvilinear_grid.F which |
6327 |
is not necessarily any better than the current one... |
is not necessarily any better than the current one... |
6328 |
|
|
6329 |
checkpoint40pre4 |
checkpoint40pre4 (2001/07/30) |
6330 |
o added re-initialisations of utrans,vtrans,rtrans in |
o added re-initialisations of utrans,vtrans,rtrans in |
6331 |
calc_common_factors which are crucial for TAF. |
calc_common_factors which are crucial for TAF. |
6332 |
o extended iMin,jMin range for calc_common_factors, |
o extended iMin,jMin range for calc_common_factors, |
6334 |
o added option ALLOW_PASSIVE_TRACER |
o added option ALLOW_PASSIVE_TRACER |
6335 |
o a few minor updates and fixes |
o a few minor updates and fixes |
6336 |
|
|
6337 |
checkpoint40pre3 |
checkpoint40pre3 (2001/07/13) |
6338 |
o created calc_gtr1.F for gad package |
o created calc_gtr1.F for gad package |
6339 |
o split the_main_loop and re-introduced forward_step |
o split the_main_loop and re-introduced forward_step |
6340 |
o some recomputations of nIter0 for TAMC |
o some recomputations of nIter0 for TAMC |
6341 |
|
|
6342 |
checkpoint40pre2 |
checkpoint40pre2 (2001/07/13) |
6343 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
6344 |
o Added gradient check package |
o Added gradient check package |
6345 |
o Added routines for passive tracer handling |
o Added routines for passive tracer handling |
6346 |
o Added carbon sequestration sensitivity experiment |
o Added carbon sequestration sensitivity experiment |
6347 |
|
|
6348 |
checkpoint39 |
checkpoint39 (2001/05/14) |
6349 |
o Modifications and fixes to support TAMC |
o Modifications and fixes to support TAMC |
6350 |
(mainly missing or wrong directives) |
(mainly missing or wrong directives) |
6351 |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
6359 |
(NB: this is not the full ECCO environment) |
(NB: this is not the full ECCO environment) |
6360 |
o disabled some packages by default in genmake |
o disabled some packages by default in genmake |
6361 |
|
|
6362 |
checkpoint38 |
checkpoint38 (2001/04/10) |
6363 |
o see notes_c37_adj.txt |
o see notes_c37_adj.txt |
6364 |
o corrected wrong layer index in external_forcing_t |
o corrected wrong layer index in external_forcing_t |
6365 |
o replaced the_main_loop/forward_step by the_main_loop |
o replaced the_main_loop/forward_step by the_main_loop |
6367 |
(replaced criteria for initial/final state) |
(replaced criteria for initial/final state) |
6368 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
6369 |
|
|
6370 |
checkpoint37 |
checkpoint37 (2001/03/13) |
6371 |
o mdsio.F routine split and packaged in pkg/mdsio |
o mdsio.F routine split and packaged in pkg/mdsio |
6372 |
(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 |
6373 |
used unless genmake -disable=mdsio) |
used unless genmake -disable=mdsio) |
6384 |
o Non-Hydrostatic pickup file Pb fixed. |
o Non-Hydrostatic pickup file Pb fixed. |
6385 |
o bug with Rigid-lid version (since c35) fixed. |
o bug with Rigid-lid version (since c35) fixed. |
6386 |
|
|
6387 |
checkpoint36 |
checkpoint36 (2001/02/20) |
6388 |
o implement Crank-Nickelson barotropic time-stepping |
o implement Crank-Nickelson barotropic time-stepping |
6389 |
o recover Time-Average diagnostics |
o recover Time-Average diagnostics |
6390 |
o fix Pb in checkpoint (PR#19) |
o fix Pb in checkpoint (PR#19) |
6391 |
o AIM become a standard package ; clean unused CPP_kees |
o AIM become a standard package ; clean unused CPP_kees |
6392 |
|
|
6393 |
checkpoint35 |
checkpoint35 (2001/02/08) |
6394 |
o subtantial rewrite of dynamics.f |
o subtantial rewrite of dynamics.f |
6395 |
o allows staggered time-stepping |
o allows staggered time-stepping |
6396 |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
6397 |
o added bottom drag (linear + quadratic) |
o added bottom drag (linear + quadratic) |
6398 |
|
|
6399 |
checkpoint34 |
checkpoint34 (2001/01/30) |
6400 |
o Modified exchange routines for correct reverse simulation. |
o Modified exchange routines for correct reverse simulation. |
6401 |
o Added verification output to comply with bug fix in impldiff.F |
o Added verification output to comply with bug fix in impldiff.F |
6402 |
as of c33 (exp2, natl_box). |
as of c33 (exp2, natl_box). |
6407 |
o Added routine GLOBAL_SUM_INT to global_sum.F |
o Added routine GLOBAL_SUM_INT to global_sum.F |
6408 |
o Added mdsio_gl.F for ECCO purposes. |
o Added mdsio_gl.F for ECCO purposes. |
6409 |
|
|
6410 |
checkpoint33 |
checkpoint33 (2000/11/30) |
6411 |
o Fixed bug in lower BC in impldiff.F |
o Fixed bug in lower BC in impldiff.F |
6412 |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
6413 |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
6425 |
possibly use them. |
possibly use them. |
6426 |
o Corrected genmake to delete a temporary file during configuration |
o Corrected genmake to delete a temporary file during configuration |
6427 |
|
|
6428 |
checkpoint32 |
checkpoint32 (2000/11/13) |
6429 |
o Scaling of forcing fields moved from external_forcing.F to |
o Scaling of forcing fields moved from external_forcing.F to |
6430 |
external_fields_scale.F, called directly after loading fields. |
external_fields_scale.F, called directly after loading fields. |
6431 |
o Surface relaxation terms added to surface tendency fields in |
o Surface relaxation terms added to surface tendency fields in |
6436 |
o Modifications and bug fixes in KPP package. |
o Modifications and bug fixes in KPP package. |
6437 |
o Verification experiment for KPP added (verification/nat_box/) |
o Verification experiment for KPP added (verification/nat_box/) |
6438 |
|
|
6439 |
checkpoint31 |
checkpoint31 (2000/09/11) |
6440 |
o Packages interface brought in line with defined standard |
o Packages interface brought in line with defined standard |
6441 |
-> new routines packages_...F |
-> new routines packages_...F |
6442 |
-> changes in initialise_fixed.F, initialise_varia.F |
-> changes in initialise_fixed.F, initialise_varia.F |
6453 |
- not yet tested for GMRedi. |
- not yet tested for GMRedi. |
6454 |
- not yet tested for KPP. |
- not yet tested for KPP. |
6455 |
|
|
6456 |
checkpoint30 |
checkpoint30 (2000/07/13) |
6457 |
o Updates for OBCs |
o Updates for OBCs |
6458 |
o New experiment for test OBCs (internal_wave) |
o New experiment for test OBCs (internal_wave) |
6459 |
o New output.txt in verification/exp4/results/ |
o New output.txt in verification/exp4/results/ |
6462 |
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.) |
6463 |
and entry for T90 in genmake |
and entry for T90 in genmake |
6464 |
|
|
6465 |
checkpoint29 |
checkpoint29 (2000/06/21) |
6466 |
o packaged KPP and GM/Redi |
o packaged KPP and GM/Redi |
6467 |
|
|
6468 |
checkpoint28 |
checkpoint28 (2000/06/09) |
6469 |
o Corrected initialization of hFacMin for difference vertical coordinates |
o Corrected initialization of hFacMin for difference vertical coordinates |
6470 |
o Modified calculation of partial cell thickness to more robust algorithm |
o Modified calculation of partial cell thickness to more robust algorithm |
6471 |
o config_summary.F: replaced write_1D_... by write_0D_... |
o config_summary.F: replaced write_1D_... by write_0D_... |
6478 |
included store directives and tape key computations required for TAMC. |
included store directives and tape key computations required for TAMC. |
6479 |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
6480 |
|
|
6481 |
checkpoint27 |
checkpoint27 (2000/04/10) |
6482 |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
6483 |
formulation works properly with variable resolution. |
formulation works properly with variable resolution. |
6484 |
o restructured the calling tree between the_model_main() and dynamics() |
o restructured the calling tree between the_model_main() and dynamics() |
6486 |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
6487 |
in new routine ini_psurf() |
in new routine ini_psurf() |
6488 |
|
|
6489 |
checkpoint26 |
checkpoint26 (2000/04/05) |
6490 |
o moved some #ifdef in optional routines to encompass everything |
o moved some #ifdef in optional routines to encompass everything |
6491 |
except the argument declarations. This was using up some memory. |
except the argument declarations. This was using up some memory. |
6492 |
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 |
6496 |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
6497 |
o patch for 2 processor JAM mode |
o patch for 2 processor JAM mode |
6498 |
|
|
6499 |
checkpoint25 |
checkpoint25 (2000/03/15) |
6500 |
o updates for OBCs and NH |
o updates for OBCs and NH |
6501 |
o dramatically reduced memory usage |
o dramatically reduced memory usage |
6502 |
o added "JAM" routines for use on Artic network |
o added "JAM" routines for use on Artic network |
6507 |
an explicit free-surface option) |
an explicit free-surface option) |
6508 |
o initial state input files for U and V |
o initial state input files for U and V |
6509 |
|
|
6510 |
checkpoint24 |
checkpoint24 (1999/08/02) |
6511 |
o Removed some spurious "REAL"s |
o Removed some spurious "REAL"s |
6512 |
o Updated KPP to latest version from JPL |
o Updated KPP to latest version from JPL |
6513 |
o Added a COS(latitude) in horizontal viscosity |
o Added a COS(latitude) in horizontal viscosity |
6514 |
|
|
6515 |
checkpoint23 |
checkpoint23 (1999/05/26) |
6516 |
o Added del^4 diffusion for salt and temperature |
o Added del^4 diffusion for salt and temperature |
6517 |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
6518 |
|
|
6519 |
checkpoint22 |
checkpoint22 (1999/05/18) |
6520 |
o Made many small changes: implicit none, format(i5), etc... |
o Made many small changes: implicit none, format(i5), etc... |
6521 |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
6522 |
|
|
6523 |
checkpoint21 |
checkpoint21 (1999/05/18) |
6524 |
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) |
6525 |
o Split-up mid-level I/O routines |
o Split-up mid-level I/O routines |
6526 |
o Updated input data for experiments 0,1,2,4 and 5 |
o Updated input data for experiments 0,1,2,4 and 5 |
6527 |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
6528 |
|
|
6529 |
checkpoint20 |
checkpoint20 (1999/03/22) |
6530 |
o Tidied up open-boundaries some more |
o Tidied up open-boundaries some more |
6531 |
o Added non-hydrostatic code |
o Added non-hydrostatic code |
6532 |
o Fixed some input data |
o Fixed some input data |
6533 |
o Modified MPI start-up to work in "coupled" context. |
o Modified MPI start-up to work in "coupled" context. |
6534 |
|
|
6535 |
checkpoint19 |
checkpoint19 (1998/12/15) |
6536 |
o Tidied up directory structure for verification experiments. |
o Tidied up directory structure for verification experiments. |
6537 |
o Added new code for open boundaries. |
o Added new code for open boundaries. |
6538 |
o Corrected advective terms near boundaries. |
o Corrected advective terms near boundaries. |
6540 |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
6541 |
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. |
6542 |
|
|
6543 |
checkpoint18 |
checkpoint18 (1998/11/30) |
6544 |
o Further changes for optional code generation with |
o Further changes for optional code generation with |
6545 |
CPP - ugh! |
CPP - ugh! |
6546 |
|
|
6547 |
checkpoint17 |
checkpoint17 (1998/11/03) |
6548 |
o Beginning to incorporating modularity |
o Beginning to incorporating modularity |
6549 |
for supporting atmos. and ocean configs. |
for supporting atmos. and ocean configs. |
6550 |
o Small changes for TAMC complinace |
o Small changes for TAMC complinace |
6551 |
o New ultra simple test case. Barotropic box |
o New ultra simple test case. Barotropic box |
6552 |
configuration "exp0". |
configuration "exp0". |
6553 |
|
|
6554 |
checkpoint16 |
checkpoint16 (1998/10/28) |
6555 |
o Minor changes to exchange routines to support |
o Minor changes to exchange routines to support |
6556 |
accumulation in reverse mode. Adjoint of an |
accumulation in reverse mode. Adjoint of an |
6557 |
assignment is an addition. |
assignment is an addition. |
6559 |
syntax) and by g77 under Linux ( 72 character |
syntax) and by g77 under Linux ( 72 character |
6560 |
limit ). |
limit ). |
6561 |
|
|
6562 |
checkpoint15 |
checkpoint15 (1998/09/29) |
6563 |
Rewrote exchange routines to allow |
Rewrote exchange routines to allow |
6564 |
o General tile <-> tile connectivity. |
o General tile <-> tile connectivity. |
6565 |
o TAMC reverse mode flag ( is this really needed? ) |
o TAMC reverse mode flag ( is this really needed? ) |
6568 |
shmput/shmget, VIA, SYSV shmem and every other cool |
shmput/shmget, VIA, SYSV shmem and every other cool |
6569 |
communication method. |
communication method. |
6570 |
|
|
6571 |
checkpoint14 |
checkpoint14 (1998/09/09) |
6572 |
Consistent isomorphism chages made. These allow dynamical core |
Consistent isomorphism chages made. These allow dynamical core |
6573 |
to support both pressure and meters as a vertical coordinate. |
to support both pressure and meters as a vertical coordinate. |
6574 |
|
|
6575 |
checkpoint13 |
checkpoint13 (1998/07/17) |
6576 |
Release which corrects global_max problem and a couple |
Release which corrects global_max problem and a couple |
6577 |
of KGM time-averaging diagnostic errors. Also contains |
of KGM time-averaging diagnostic errors. Also contains |
6578 |
a double-gyre experiment setup as well as the baseline |
a double-gyre experiment setup as well as the baseline |
6587 |
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 |
6588 |
we've actually tested it... |
we've actually tested it... |
6589 |
|
|
6590 |
checkpoint12 |
checkpoint12 (1998/07/08) |
6591 |
Tidy up and added generic genmake script (formerly |
Tidy up and added generic genmake script (formerly |
6592 |
configure script). |
configure script). |
6593 |
Released to testers. |
Released to testers. |
6594 |
|
|
6595 |
checkpoint11 |
checkpoint11 (1998/07/02) |
6596 |
Re-arranged initialise() and introduced ini_vertical_grid() |
Re-arranged initialise() and introduced ini_vertical_grid() |
6597 |
and ini_masks_etc(). |
and ini_masks_etc(). |
6598 |
|
|
6599 |
checkpoint10 |
checkpoint10 (1998/07/01) |
6600 |
Introduced the configure script. |
Introduced the configure script. |
6601 |
Separated out the diags package. |
Separated out the diags package. |
6602 |
Added template for writing time-averages of tile/intermediate quantities. |
Added template for writing time-averages of tile/intermediate quantities. |
6603 |
Updated SIZE.h in exp2 and made the data big-endian. |
Updated SIZE.h in exp2 and made the data big-endian. |
6604 |
|
|
6605 |
checkpoint9 |
checkpoint9 (1998/06/22) |
6606 |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
6607 |
General tidy-up. |
General tidy-up. |
6608 |
SST.bin SSS.bin added to verification/exp2 |
SST.bin SSS.bin added to verification/exp2 |
6609 |
|
|
6610 |
checkpoint8 |
checkpoint8 (1998/06/22) |
6611 |
Inludes time-dependant forcing and time-averaging. |
Inludes time-dependant forcing and time-averaging. |
6612 |
Works at 4x4 and 2.8125x2.8125 global |
Works at 4x4 and 2.8125x2.8125 global |
6613 |
|
|
6617 |
model etc.. |
model etc.. |
6618 |
Configured for verification/exp2 - 4 degree global, two process. |
Configured for verification/exp2 - 4 degree global, two process. |
6619 |
|
|
6620 |
checkpoint7 |
checkpoint7 (1998/06/15) |
6621 |
Created by cnh |
Created by cnh |
6622 |
Simple 4 degree global simulation |
Simple 4 degree global simulation |
6623 |
configuration. |
configuration. |
6625 |
hydrography, bathymetry etc |
hydrography, bathymetry etc |
6626 |
Does not include Heat Flux and E-P |
Does not include Heat Flux and E-P |
6627 |
|
|
6628 |
checkpoint6 |
checkpoint6 (1998/06/08) |
6629 |
Created by cnh |
Created by cnh |
6630 |
merged checkpoint5 with CD and |
merged checkpoint5 with CD and |
6631 |
spherical polar code. |
spherical polar code. |
6632 |
Still some problems with GM Redi |
Still some problems with GM Redi |
6633 |
abd full topography. |
abd full topography. |
6634 |
|
|
6635 |
checkpoint5 |
checkpoint5 (1998/06/08) |
6636 |
Created by AJA |
Created by AJA |
6637 |
contains updates to GM Redi |
contains updates to GM Redi |
6638 |
and reordered timestepping loop |
and reordered timestepping loop |
6639 |
for Implicit Diffusion. |
for Implicit Diffusion. |
6640 |
|
|
6641 |
checkpoint4 |
checkpoint4 (1998/05/30) |
6642 |
Created by cnh |
Created by cnh |
6643 |
Contains memory saving macros ( _rdxc etc..) for when |
Contains memory saving macros ( _rdxc etc..) for when |
6644 |
grid variations are limited. |
grid variations are limited. |
6645 |
Contains polynomial coeffs for EOS and knudsen program |
Contains polynomial coeffs for EOS and knudsen program |
6646 |
for generation. |
for generation. |
6647 |
|
|
6648 |
checkpoint3 |
checkpoint3 (1998/05/26) |
6649 |
Created by cnh |
Created by cnh |
6650 |
Added extra flags for runtime options |
Added extra flags for runtime options |
6651 |
Added this file |
Added this file |