4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
checkpoint64g (2013/05/01) |
8 |
|
o pkg/exf ALLOW_RUNOFTEMP |
9 |
|
- if defined, river and glacier runoff temperature can be read-in from |
10 |
|
runoftempfile; runoftempfile needs to have same format as runofffile |
11 |
|
o pkg/thsice (& pkg/bulk_force): |
12 |
|
- In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account |
13 |
|
for energy content of Precip + RunOff & Evap (like with pkg/exf). |
14 |
|
- change computation domain to always be the interior (without overlap). |
15 |
|
- fix bug (wrong overlap) when using EXF and stressReduction > 0. |
16 |
|
o verification/tutorial_global_oce_biogeo: |
17 |
|
- add preliminary OpenAD setup (still has problems) |
18 |
|
o pkg/seaice: |
19 |
|
- turn some parameters for choosing the convergence criterion of |
20 |
|
the inexact Newton method (JFNK) into runtime parameters for convenience |
21 |
|
- clean up seaice_calc_viscosities.F: remove/retire two options for |
22 |
|
SEAICetaZmethod (1,2), introduce area weighting for method 3; this changes |
23 |
|
the results of lab_sea/input because a division has been replaced by |
24 |
|
a multiplication with the reciprocal (sumNorm) |
25 |
|
- modify offline_exf_seaice/input.dyn_jfnk/data.seaice to improve |
26 |
|
convergence of solver (changes results, of course), and to test some |
27 |
|
new features |
28 |
|
o model/src: |
29 |
|
- remove unused (since Aug 2006) S/R SET_WRITE_GLOBAL_PICKUP and its call. |
30 |
|
- remove unused forcing field "dQdT" and associated parameter "dQdTFile". |
31 |
|
- move forcing adjustment (balancing surface forcing) in specific S/R |
32 |
|
where might also be applied exchanges (if needed) to forcing arrays. |
33 |
|
o pkg/shelfice: |
34 |
|
- allow to specify the Ice-Shelf mass per unit area (instead of |
35 |
|
shelficeLoadAnomaly) and do the conversion from one to the other |
36 |
|
- move loading from file of shelficeLoadAnomaly from SHELFICE_INIT_VARIA |
37 |
|
to SHELFICE_INIT_FIXED: (a) avoid some TAF recompution issues and |
38 |
|
(b) will be loaded in time (before calling INI_PRESSURE) in case it is |
39 |
|
needed in phi0surf for initial pressure calculation when useDynP_inEos_Zc |
40 |
|
- update isomip experiment forward output (get machine truncation error |
41 |
|
from conversion shelficeLoadAnomaly -> shelficeMass -> shelficeLoadAnomaly) |
42 |
|
o verification/offline_exf_seaice: |
43 |
|
revise data.seaice in input.thermo and input_ad and update results accordingly |
44 |
|
HO = 0.2, SEAICE_areaLossFormula = 2, |
45 |
|
SEAICE_growMeltByConv = .TRUE., |
46 |
|
SEAICE_doOpenWaterMelt = .TRUE., |
47 |
|
Improve consistency with input.thsice and fix the spurious 500m ice corners |
48 |
|
o verification/global_ocean.cs32x15: |
49 |
|
- set Energy Reference Level to liq. water @ 0 degC: temp_EvPrRn=0., |
50 |
|
in icedyn (thsice+seaice-dyn) test and update output. |
51 |
|
o verification/offline_exf_seaice: |
52 |
|
- adjust list of tested variables (with testreport) and update |
53 |
|
standard test output with better slection of monitored fields. |
54 |
|
o pkg/cd_code: |
55 |
|
- swtich off Adams-Bashforth on the 1rst iteration. Update output of |
56 |
|
experiment lab_sea.hb87 |
57 |
|
o tools/genmake2: |
58 |
|
- change default makedepend from the system default to tools/xmakedepend: |
59 |
|
When no makedepend is specified, select tools/xmakedepend it the test pass, |
60 |
|
otherwise select the system default (if exist and pass the test) or |
61 |
|
try to build cyrus-makedepend ; stop if none of the 3 works. |
62 |
|
o pkg/exf & pkg/thsice: |
63 |
|
- In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account |
64 |
|
for energy content of Precip + RunOff & Evap. Assumes: |
65 |
|
1) Rain has same temp as Air. |
66 |
|
2) Snow has no heat capacity (consistent with seaice & thsice pkgs) |
67 |
|
3) Run-Off comes at the temp of surface water (with same Cp) |
68 |
|
4) Evap over ocean is released to the Atmos @ surf-temp (=SST); should be |
69 |
|
put directly into Latent Heat flux & should use water-vapor heat capacity. |
70 |
|
5) Evap over snow/seaice (pkg/thsice) assumes constant Lf+Lv (consistent |
71 |
|
with snow having no Cp) => water vapor is released to Atmos @ 0^oC (=ERL). |
72 |
|
o pkg/seaice: simplify the use of CPP flags in JFNK-related files |
73 |
|
(compile when SEAICE_ALLOW_JFNK is defined) |
74 |
|
o pkg/thsice: |
75 |
|
- fix oceanic flux diagnostics & timeave (left from new sequence of calls |
76 |
|
implementation): move THSICE_AVE call after the advection (called directly |
77 |
|
from thsice_do_advect.F). |
78 |
|
o verification/global_ocean.90x40x15 and OpenAD: |
79 |
|
New experiment for OpenAD is identical to the one in input_ad except that |
80 |
|
multiDimAdvection=.FALSE., |
81 |
|
There is still an issue with this. |
82 |
|
o pkg/thsice: |
83 |
|
- account for ice velocity (ocean relative velocity) in turbulent heat flux |
84 |
|
at the base of the ice; update output of global_ocean.cs32x15 (icedyn) |
85 |
|
and offline_exf_seaice (main test). |
86 |
|
|
87 |
|
checkpoint64f (2013/03/31) |
88 |
|
o verification/OpenAD: |
89 |
|
- new (smaller, without OAD_DEBUG) output_oadm.txt generated using gfortran. |
90 |
|
o verification/isomip, pkg/shelfice and OpenAD: |
91 |
|
- add OpenAD setup to this exp and make shelfice package work with OpenAD |
92 |
|
o verification/tutorial_global_oce_biogeo: |
93 |
|
- update AD and TLM output after turning off ALLOW_FE (in DIC_OPTIONS.h) |
94 |
|
o verification/offline_exf_seaice: |
95 |
|
- replace adjoint experiment (now similar to fwd input.thermo/ setup). |
96 |
|
o verification/tutorial_tracer_adjsens, pkg/ptracers and OpenAD: |
97 |
|
- add OpenAD setup to this exp and make ptracers package work with OpenAD |
98 |
|
o pkg/seaice/seaice_evp.F: |
99 |
|
mask the asymmetric contribution of the ice-ocean stress (when |
100 |
|
the turningAngle is non-zero) over open water to avoid stripes |
101 |
|
in the EVP-solutions after many EVP-substeps. This does not change |
102 |
|
the verification experiment (because turningAngle=0 in that experiment), |
103 |
|
but will affect other EVP solutions with turningAngle.ne.0 |
104 |
|
o verification, AD & TLM output: |
105 |
|
- new TAF version 2.3.10 (previously 2.3.8) add more parenthesis in multiple |
106 |
|
additions and multiplications which affect results at machine truncation |
107 |
|
level. Update few AD output (1D_ocean_ice_column, bottom_ctrl_5x5, |
108 |
|
lab_sea.noseaicedyn & offline_exf_seaice) and TLM output |
109 |
|
(1D_ocean_ice_column & tutorial_tracer_adjsens.som81) which had only 12 |
110 |
|
digits of matching. |
111 |
|
o pkg/seaice: |
112 |
|
modify lsr-algorithm so that it vectorizes AND converges by using a |
113 |
|
"zebra" method: split vector loop into two with step size 2; this |
114 |
|
solves a general convergence problem for the JFNK solver on a vector |
115 |
|
computer. It has the potential to even improve convergence for |
116 |
|
non-vector machines, but it does change the results so it is turned |
117 |
|
off by default. To turn on define CPP-flags SEAICE_VECTORIZE_LSR and |
118 |
|
SEAICE_VECTORIZE_LSR_ZEBRA in SEAICE_OPTIONS.h |
119 |
|
|
120 |
|
checkpoint64e (2013/03/05) |
121 |
|
o pkg/ecco and several verification experiments: |
122 |
|
Remove special versions of the_model_main.F, the_main_loop.F, forward_step.F |
123 |
|
from ecco package, and revert to unified routine in model/src/ |
124 |
|
Adjust verification experiments accordingly, especially gloal_oce_llc90 |
125 |
|
Should conclude long-standing work by Gael to reconsile the_main_loop with |
126 |
|
ECCO and will enable OpenAD's revolve loop in ECCO setup. |
127 |
|
o pkg/generic_advdiff: |
128 |
|
- implement compressible flow method for multi-dim advection (similar to |
129 |
|
gad_som_advect.F); add new option "GAD_MULTIDIM_COMPRESSIBLE" (since |
130 |
|
TAF generates many recomputations) to use it; no yet coded with implicit |
131 |
|
vertical advection. |
132 |
|
- change experiment advect_cs (new output) and advect_xy (same output) |
133 |
|
to test compressible flow multi-dim advection. |
134 |
|
o pkg/generic_advdiff: |
135 |
|
- fix SOM advection for unusual cases (linear Free-Surf in r*, other |
136 |
|
cases where linear Free-Surf is not @ k=1, e.g., useShelfIce) |
137 |
|
o pkg/seaice: |
138 |
|
- fix bug in the no-slip implementation in seaice_calc_strainrates.F, this |
139 |
|
bug affects two verification experiments (lab_sea and lab_sea.hb87), |
140 |
|
recover old (wrong) results by setting noSlipFac = 2. in |
141 |
|
seaice_calc_strainrates.F; |
142 |
|
- add another averaging method for etaZ (etaZmethod=3), a mix of 2 and 0 |
143 |
|
- add runtime parameter SEAICE_JFNKepsilon for that finite difference |
144 |
|
gradient in the Jacobian times vector operation (s/r seaice_jacvec) |
145 |
|
- fix line search in seaice_jfnk.F (s/r seaice_jfnk_update) |
146 |
|
o pkg/seaice: reorganize seaice_lsr.F to be able to reuse more code: |
147 |
|
- new subroutines seaice_lsr_tridiagu/v |
148 |
|
- introduce loop bounds i/jmin/max to be able to use a restricted |
149 |
|
additive Schwarz method, but not used for now. |
150 |
|
- rename SEAICE_CALC_LSR_COEFFS into SEAICE_LSR_CALC_COEFFS |
151 |
|
- use new subroutines seaice_lsr_tridiagu/v in s/r seaice_preconditioner |
152 |
|
o OpenAD support |
153 |
|
Reorganize S/R call for overall time-stepping loop to facilitate |
154 |
|
OpenAD revolve loop replacement |
155 |
|
(new S/R main_do_loop.F) |
156 |
|
o model/src: |
157 |
|
- add 3-D array 3rd dimension to argument list of S/R ADAMS_BASHFORTH2/3; |
158 |
|
- pkg/cheapaml: remove local S/R ADAMS2d and use instead standard S/R |
159 |
|
ADAMS_BASHFORTH2. |
160 |
|
o pkg/cheapaml: |
161 |
|
- add new parameter (default=F, same as before) to disable full domain |
162 |
|
(including land) periodicity in X & Y dir. |
163 |
|
- new S/R CHEAPAML_COPY_EDGES to copy relaxation field into edges of |
164 |
|
prognostics field ; merge the 2 S/R cycle_2d_tracer and timestep_2d_tracer |
165 |
|
into single S/R CHEAPAML_TIMESTEP. |
166 |
|
|
167 |
o pkg/exf : added run time switch useAtmWind to replace ALLOW_ATM_WIND |
checkpoint64d (2013/02/17) |
168 |
cpp switch. ALLOW_ATM_WIND now just sets the useAtmWind default (see |
o pkg/monitor (angular momentum): |
169 |
exf_readparms.F) and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). |
- do not add Eta contribution to the total AM if using rigid-lid; |
170 |
o pkg/exf, autodiff, ctrl, ecco and seaice : remove ALLOW_ATM_WIND |
- correct for Adams-Bashforth in zonal-wind part (instead of in AM_eta). |
171 |
brackets, or replace them with useAtmWind ones. |
- horizontal discretisation: compute Zonal wind contribution separately for |
172 |
o pkg/ctrl, ecco : allow to compile both ALLOW_U/VSTRESS_CONTROL and |
each component (instead of from cell centered averaged) and use the 4 |
173 |
ALLOW_U/VWIND_CONTROL. Depending on useAtmWind, one is inactive, |
grid-cell corner averaged value of Omega*(R*cos_Phi)^2 in AM_eta part. |
174 |
and the other is active (see exf_getffields.F/exf_getsurfacefluxes.F). |
- Check that AM is conserved with linear dynamics (momAdvection=F and linear |
175 |
|
FreeSurf) if using vectorInvariant momentum. |
176 |
|
o model/src (horizontal grid): |
177 |
|
- move initialisation of all horizontal grid arrays to null value |
178 |
|
from specific horizontal grid S/R to main S/R INI_GRID; |
179 |
|
- add 2 new arrays to project model C-grid velocity on to zonal direction |
180 |
|
(similar to AngleCosC & -AngleSinC but at U and V point location) and |
181 |
|
compute them in S/R CALC_GRID_ANGLES. |
182 |
|
o pkg/seaice: replace a hard coded parameter by a runtime parameter |
183 |
|
SEAICE_JFNK_tolIter |
184 |
|
o pkg/seaice: introduce a restricted additive Schwarz (RAS) method in |
185 |
|
preconditioner for JFNK (run LSR into the overlaps as far as possible, |
186 |
|
i.e OLx/y-2, but overwrite the solution in the overlaps) |
187 |
|
- extend loop range in seaice_calc_viscosity |
188 |
|
- add new parameters SEAICE_OLx/y (default = OLx/y-2) |
189 |
|
- add flexible loop ranges to seaice_preconditioner, seaice_calc_lsr_coeffs |
190 |
|
- slightly modify loops in tridiagonal solver lsr-preconditioner |
191 |
|
- by default remove the extra exchange in seaice_preconditioner with a |
192 |
|
replacement of an undocumented CPP flag by SEAICE_PRECOND_EXTRA_EXCHANGE |
193 |
|
- modify offline_exf_seaice so that old results without RAS are reproduced |
194 |
|
for output.dyn_jfnk.txt |
195 |
|
in seaice_fgmres.F (unrelated to RAS) |
196 |
|
- add a cpp-flag option for a re-ordered mapping (potentially more |
197 |
|
efficient), but because this changes the results, turn it off by |
198 |
|
default |
199 |
|
- replace the save statement by local common blocks |
200 |
|
o utils/matlab: |
201 |
|
- fix tile-offset in rdmnc.m when output was produced using EXCH2. |
202 |
|
- update cs_grid/bk_line scripts to use load_grid.m (in utils/matlab) |
203 |
|
instead of local script "load_cs.m". |
204 |
|
o pkg/seaice: |
205 |
|
- fix a serious bug in seaice_fgmres.F, s/r seaice_scalprod, connected |
206 |
|
to the scalarProductMetric and the unrolling. By chance this does not |
207 |
|
change the verification experiment, because of the particular domain |
208 |
|
decomposition |
209 |
|
o pkg/diagnostics: |
210 |
|
- change default missing_value from UNSET_RL to -999. |
211 |
|
o pkg/layers: improve vectorization of layers_fluxcalc.F |
212 |
|
- step 1: split loops, make TatU/V 2D arrays. This alone reduces the cpu |
213 |
|
time spent in this routine by more than a factor of 3 on an NEC-SX8 |
214 |
|
- step 2: replace search algorithm by a bisection algorithm found in |
215 |
|
Press et al. Numerical Recipes in Fortran. This algorithm can be |
216 |
|
vectorized and finds the correct bin in approx. log2(Nlayers) steps. |
217 |
|
For now, use this algorithm only for TARGET_NEC_SX defined. |
218 |
|
- moved the search algorithm into a separate subroutine, that is kept |
219 |
|
within the same file for automatic inlining. |
220 |
|
- modified catching potential errors |
221 |
|
o pkg/ecco: |
222 |
|
- add compile switches ALLOW_SHALLOW_ALTIMETRY and ALLOW_HIGHLAT_ALTIMETRY. |
223 |
|
o model/src, pkg/autodiff, pkg/ctrl, pkg/grdchk : |
224 |
|
- modifications for ALLOW_GENTIM2D_CONTROL |
225 |
|
-- forward_step.F, the_main_loop.F : pass options and arrays for adjoint tapes. |
226 |
|
-- load_fields_driver.F : add call to CTRL_MAP_GENTIM2D( myTime, myIter, myThid ) |
227 |
|
-- add xx_gentim2d0/1 in ctrl_ad_check_lev1_dir.h checkpoint_lev1_directives.h etc |
228 |
|
-- use ctrl_swapffields.F (new) instead of exf_SwapFFields.F in ctrl_get_gen.F |
229 |
|
o model/src: |
230 |
|
- account for moist thermodynamics in (dry) potential temperature equation; |
231 |
|
update results of experiments: aim.5l_cs (x2), fizhi-cs (std + aqualev) |
232 |
|
and cpl_aim+ocn. |
233 |
|
- also switch to standard compiler (gfortran, was using ifort previously) |
234 |
|
for fizhi-cs experiments reference output. |
235 |
|
o pkg/ctrl: |
236 |
|
- 1st step toward generic time-varying control variable (2D) via CPP option |
237 |
|
ALLOW_GENTIM2D_CONTROL |
238 |
|
- note new namelist ctrl_nml_genarr in data.ctrl |
239 |
|
o verification/global_ocean.cs32x15: |
240 |
|
- switch off OLD_THSICE_CALL_SEQUENCE (both forward and AD code) to use new |
241 |
|
thsice calling sequence and update "output.icedyn.txt" output file. |
242 |
|
o pkg/ptracers: |
243 |
|
- from Ryan A.: code to allow to restart a tracer at regular time interval |
244 |
|
specifying a reset frequency and a reset-phase (for each tracers). |
245 |
|
o pkg/thsice: |
246 |
|
- implement new sequence of calls for thsice+seaice: |
247 |
|
previously: ice-Dyn,ice-Advect,ice-Thermo(thsice) |
248 |
|
new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect |
249 |
|
- allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE" |
250 |
|
in CPP_OPTIONS.h) to recover old sequence; |
251 |
|
- update diagnostics for Intermediate State thsice diagnostics: now filled |
252 |
|
just before advection (instead of just after advection in old sequence); |
253 |
|
- update output of experiment offline_exf_seaice (standard test); |
254 |
|
- in global_ocean.cs32x15 exp., postpone output.icedyn.txt update |
255 |
|
by setting #define OLD_THSICE_CALL_SEQUENCE in CPP_OPTIONS.h |
256 |
|
o pkg/aim_v23: |
257 |
|
- use tiled array for aim_CO2 and surface wind speed for export to coupler; |
258 |
|
- use standard pkg/mdsio routines to read & write CO2 pickup file; |
259 |
|
- in-line S/R AIM_AIM2DYN_EXCHANGES in aim_do_physics.F; |
260 |
|
- Implement new sequence of calls for seaice advection (with thsice and |
261 |
|
seaice diffusion): do ice advection after ice-Thermodynamic (previously |
262 |
|
was done before); change aim_do_physics.F (split the bi,bj loops block); |
263 |
|
- use same CPP option (OLD_THSICE_CALL_SEQUENCE) to recover old sequence; |
264 |
|
o pkg/thsice: |
265 |
|
- add a missing EXCH of sIceLoad in thsice_main.F (ocean set-up) for the case |
266 |
|
where just seaice diffusion is used without seaice-dynamics. |
267 |
|
|
268 |
|
checkpoint64c (2013/01/18) |
269 |
|
o pkg/seaice: |
270 |
|
- add a parameter JFNKres_tFac that can replace JFNKres_t |
271 |
|
(= JFNKres_tFac*JFNKresidual before JFNK solver) |
272 |
|
- add a line search option to the JFNK solver |
273 |
|
- move update of u/vIce and computation of initial residual into a separate |
274 |
|
routine (same file); makes the code a little easier to read (?) |
275 |
|
- the line search requires computation of the residual and for some reason |
276 |
|
I cannot do the update of u/vIce at the beginning of the Newton loop |
277 |
|
without changing the results, so we move computation of the new residual |
278 |
|
also to the end of the Newton loop, even without the line search |
279 |
|
o pkg/mdsio: |
280 |
|
- write missing value (corresponding to undefined array value) to meta files; |
281 |
|
skip this if missing value is one (UNSET_RL would be a better value for the |
282 |
|
case of undefined missing value but it's current the default missing-value); |
283 |
|
Also update mdsio_read_meta.F (reading timeInterval & missing-value). |
284 |
|
o pkg/exf & thsice: |
285 |
|
- for diagnostics purpose, fill-up and update Qsw array (+ fill the |
286 |
|
diagnostics) even when SHORTWAVE_HEATING is #undef; |
287 |
|
o verification/cfc_example: |
288 |
|
- turn on pkg/layers with pkg/diagnostics (to test pkg/layers and to |
289 |
|
illustrate how to use it). |
290 |
|
o verification/offline_exf_seaice: |
291 |
|
in input: add SEAICErestoreUnderIce=.TRUE., and reduce size of forcing |
292 |
|
files to only one time-record. |
293 |
|
in input.thermo: narrow the 2 bands of low initial ice-concentration near |
294 |
|
N & S edges; switch on SEAICErestoreUnderIce=T; use pkg/diagnostics for |
295 |
|
snapshot output; same mcPheePiston value as in thsice with |
296 |
|
surf-current=0.2m/s. |
297 |
|
in input.thsice: similar set-up as in input.thermo (channel with same seaice |
298 |
|
initial conditions). |
299 |
|
o verification/cfc_example: |
300 |
|
- update file "data" with more standard choice (default rotationPeriod, |
301 |
|
exactConserv=T, reduce ivdc_kappa to 10, remove multiDimAdvection=F, |
302 |
|
set deltaTFreeSurf to deltaTtracer) and update the output. |
303 |
|
o pkg/layers: |
304 |
|
- fix bolus part so that it compiles with #undef GM_BOLUS_ADVEC; |
305 |
|
- ensure that "layers_bolus" is switched to False when useGMRedi=False. |
306 |
|
o verification/offline_exf_seaice: |
307 |
|
- set all {field}period to zero for constant-in-time forcing (not tested |
308 |
|
anywhere else). |
309 |
|
o verification/offline_exf_seaice: |
310 |
|
- dyn_lsr : use pkg/seaice S/R (instead of pkg/thsice) to advect sea-ice; |
311 |
|
- dyn_jfnk : use pkg/thsice S/R (instead of pkg/seaice) to advect sea-ice. |
312 |
|
o model/src: |
313 |
|
- implement Finite-Volume method for (hydrostatic) presure gradient |
314 |
|
from S.-J. Lin (QJRMS 1997), for atmosphere using sigma-coordinate. |
315 |
|
o pkg/seaice: implement EVP* by Lemieux et al. (2012). |
316 |
|
- In order to be compatible with the default EVP code, this requires changing |
317 |
|
the EVP code around a little; and because any small change immediately |
318 |
|
breaks the lab_sea.hb87 verification experiment, the reference output is |
319 |
|
updated two times (each time the remaining aggrement was only 2 digits): |
320 |
|
- after replacing 1/dt by 1*recip_dt with a precomputed recip_dt |
321 |
|
- after replacing 1/(1+0.5*dt/tau) by a/(a+1), with a=2*tau/dt |
322 |
|
The adjoint test lab_sea.evp also needed to be updated. |
323 |
|
- Turn on EVP* by setting SEAICE_deltaTevp as before, and setting |
324 |
|
SEAICEuseEVPstar=.true.; for EVP* SEAICE_deltaTevp does not need to be |
325 |
|
a factor of SEAICE_deltaTdyn, and you can set the number of EVP steps |
326 |
|
explicitly with SEAICEnEVPstarSteps (thereby overriding the default of |
327 |
|
INT(SEAICE_deltaTdyn/SEAICE_deltaTevp)). Controlling EVP* is deliberately |
328 |
|
kept obscure, because I need to test it a little more. |
329 |
|
o pkg/cheapaml: |
330 |
|
- fix few incorrect type (_RL/_RS) in subroutine calls. |
331 |
|
o pkg/seaice: |
332 |
|
- new S/R SEAICE_MAP_RS2VEC (similar to SEAICE_MAP2VEC) to map _RS arrays |
333 |
|
to _RL vector; this fixes JFNK code when compiling with "-use_r4" option. |
334 |
|
o model/src: |
335 |
|
- add a warning if using select_rStar=2 with nonlinFreeSurf <> 4; |
336 |
|
change (in input_ad*/data) select_rStar from 2 to 1 for AD verification |
337 |
|
experiments global_ocean.cs32x15 & tutorial_tracer_adjsens (+ update output) |
338 |
|
o pkg/cheapaml: |
339 |
|
- replace "273.1 _d 0" by celsius2K in pkg/cheapaml/cheapaml.F and |
340 |
|
update output of experiment cheapAML_box. |
341 |
|
- store in CHEAPAML.h coeffs ssq[0:2] for saturation specific humidity, |
342 |
|
and set them only in one place (cheapaml_readparms.F). |
343 |
|
- replace "273.16 _d 0" by celsius2K & replace "3.14159 _d 0" by constant "PI" |
344 |
|
- remove re-setting of main-model parameter "celsius2K" (in cheapaml_readparms) |
345 |
|
and re-setting of cheapAML params "lath" & "p0" (in cheapaml_init_varia). |
346 |
|
o model/src/the_main_loop.F: |
347 |
|
- fix revision 129 : need both ALLOW_ECCO and ALLOW_ECCO_EVOLUTION. |
348 |
|
o pkg/seaice: |
349 |
|
- remove legacy branch code. |
350 |
|
- retire SEAICE_GROWTH_LEGACY and SEAICE_CAP_HEFF accordingly. |
351 |
|
o verification/*/code*/SEAICE_OPTIONS.h: |
352 |
|
- remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY, |
353 |
|
SEAICE_CAP_HEFF). |
354 |
|
o pkg/cheapaml: |
355 |
|
- use standard routine (S/R GET_PERIODIC_INTERVAL) to decide when it is time |
356 |
|
to load new forcing fields. |
357 |
|
- add missing "_d 0" where it's needed; + some editing (improve indentation). |
358 |
|
- remove switch to "-r8" compiler option (no longer needed) in verification |
359 |
|
cheapAML_box, keep same output (small trucation error differences). |
360 |
|
o verification/offline_exf_seaice: |
361 |
|
- add thermodynamics only test. |
362 |
|
o verification/cheapAML_box: |
363 |
|
- split the domain in 8 (2x4) tiles; add MPI and multi-threaded test; |
364 |
|
keep same output (same 14 digits for cg2d). |
365 |
|
- switch on "-r8" compiler option (some numerical values are missing |
366 |
|
the "_d 0") and update output (only 6 digits for cg2d were preserved). |
367 |
|
|
368 |
|
checkpoint64b (2012/12/24) |
369 |
|
o pkg/cheapaml: |
370 |
|
- remove un-used variables (Qnet,EmPmR) from pickup files. |
371 |
|
- store tendency of advected variables into cheapaml pickup file |
372 |
|
and fix the AB-2 restart. |
373 |
|
o verification/offline_exf_seaice and lab_sea adjoint: |
374 |
|
- switch to new code (#undef SEAICE_GROWTH_LEGACY). |
375 |
|
- switch to 4 time steps in offline, consistent with lab_sea. |
376 |
|
- match parameters from SEAICE_GROWTH_LEGACY branch in data.seaice. |
377 |
|
- update results after change of experiment seaice. |
378 |
|
o pkg/seaice: |
379 |
|
- remove option SEAICE_MULTICATEGORY; has been replaced with run-time |
380 |
|
parameter SEAICE_multDim. Issue a warning if SEAICE_MULTICATEGORY is |
381 |
|
still defined since SEAICE_multDim needs to be set to MULTDIM value (from |
382 |
|
SEAICE_SIZE.h) to recover previous #define SEAICE_MULTICATEGORY default. |
383 |
|
o model/src: |
384 |
|
- add run-time parameter to select CG2D solver minimum-residual solution |
385 |
|
(in case of a poor convergence). |
386 |
|
o pkg/seaice/seaice_lsr.F |
387 |
|
- move calculation of matrix coefficients into new |
388 |
|
S/R SEAICE_CALC_LSR_COEFFS; for now this routine remains in the same |
389 |
|
file; the main purpose of this change is to be able to reuse the code |
390 |
|
in S/R SEAICE_PRECONDITIONER |
391 |
|
- modify the computation of the residual so that the mass of sea-ice |
392 |
|
is not used twice; this simplifies the calculations, but since |
393 |
|
the residual is never used except when LSR_mixIniGuess.ge.4---and this is |
394 |
|
not tested in testreport---this does not affect the testreport results. |
395 |
|
o verification/seaice_obcs: |
396 |
|
- disable SEAICE_GROWTH_LEGACY; reset input files to match those of |
397 |
|
verification/lab_sea/input.salt_plume; changes results/output.txt* |
398 |
|
o model/src: |
399 |
|
- adapt quasi-hydrostatic formulation to work with p or p* coordinate. |
400 |
|
o pkg/seaice: |
401 |
|
- improve description of parameters in seaice_fgmres.F and start |
402 |
|
cleaning up the code |
403 |
|
- change name of SCALPROD to SEAICE_SCALPROD and modify meaning of |
404 |
|
second argument |
405 |
|
- add a metric based on grid cell area to SEAICE_SCALPROD; update |
406 |
|
results of offline_exf_seaice.dyn_jfnk |
407 |
|
- compute initial residual norm in seaice_jfnk based on SEAICE_SCALPROD |
408 |
|
o pkg/aim_v23: |
409 |
|
- fix an other bug in dissipation heating (grid-cell area was missing). |
410 |
|
o model/src + pkg/seaice: |
411 |
|
- add global (multi-tile) linear solver for pair of tri-diagonal system |
412 |
|
along X and Y lines, respectively for U and V component. |
413 |
|
Note: 1) MPI and cube-exchange not yet coded. |
414 |
|
2) probably not accurate for poorly conditioned / large size problem. |
415 |
|
- add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver; |
416 |
|
default: not compiled and not used. |
417 |
|
o pkg/seaice: |
418 |
|
- first attempt at a multi-threaded fgmres solver for the JFNK solver: |
419 |
|
introduce bi/bj loops and use global_sum_tile_rl instead of |
420 |
|
mpi_allreduce in seaice_fgmres.F |
421 |
|
- improve diagnostics output for fgmres solver (seaice_fgmres.F) |
422 |
|
- replace a few unnecessary goto statements by if-blocks (seaice_fgmres.F) |
423 |
|
- add a verification experiment for JFNK in offline_exf_seaice |
424 |
|
o verification: |
425 |
|
- change (for now, only fwd test) offline_exf_seaice experiment: |
426 |
|
use a re-entrant channel with idealized coastline (trapezoidal shape) |
427 |
|
at southern boundary to explore seaice dynamics and thermodynamics |
428 |
|
with simple forcing. Main set-up has dynamics+thermo and SST relaxation; |
429 |
|
secondary test (input.thsice) use thermodynamics only with SST relaxation. |
430 |
|
- add seaice-dynamics only secondary test using LSR and pkg/thsice advection. |
431 |
|
o pkg/exf: |
432 |
|
- disable "sstExtrapol" when Nr=1 |
433 |
|
o verification: |
434 |
|
- add new experiment "cheapAML_box" (simple 1 layer set-up from Bruno Deremble) |
435 |
|
to test pkg/cheapaml. |
436 |
|
o pkg/aim_v23 & pkg/shap_filt: |
437 |
|
- fix dissipation heating (erroneous gravity multiplication factor). |
438 |
|
o pkg/seaice: |
439 |
|
- remove unused field pressPre from jfnk solver |
440 |
|
- rename two subroutines in seaice_preconditioner.F |
441 |
|
o eesupp/src: |
442 |
|
- S/R MDSFINDUNIT avoids reserved unit numbers (scrUnit1, eeDataUnit ...) |
443 |
|
o pkg/seaice/seaice_preconditioner.F: fix preconditioner once again |
444 |
|
- remove wrong parts of the rhs and the lhs (were in there |
445 |
|
because I did not understand the concept of this preconditioner) |
446 |
|
- add an exchange between u- and v-sweep. This increases communication |
447 |
|
by a factor of two but improves the convergence of jfnk. Ideally, |
448 |
|
one would like the u- and v-sweep to be independent. So far within |
449 |
|
undocumented ifdefs |
450 |
|
- reorganize the extra computations for printing the residuals |
451 |
|
o tools/genmake2: |
452 |
|
- comment out the "mpif.h" include in NetCDF test programm (for MPI built) |
453 |
|
since it's not necessary (and was preventing to use MNC in some cases). |
454 |
|
|
455 |
|
checkpoint64a (2012/11/16) |
456 |
|
o pkg/autodiff: |
457 |
|
- improve pkg-internal logical parameter switch (inAd/inFwd mode) so that |
458 |
|
autodiff_readparms.F no longer depends on calling order (within |
459 |
|
packages_readparms.F) and no longer requires to include ${PKG}_PARMS.h): |
460 |
|
rename param turnFreeDriftInAdMode to SEAICEuseFREEDRIFTswitchInAd |
461 |
|
and change param SEAICEuseDYNAMICSinAdMode to SEAICEuseDYNAMICSswitchInAd. |
462 |
|
o pkg/obcs: |
463 |
|
- adding tidal velocity forcing capability to obcs |
464 |
|
for usage example, see verification/seaice_obcs/input.tides |
465 |
|
o pkg/seaice: |
466 |
|
- turn the LSR-relaxation parameters WFAU/V into runtime parameters |
467 |
|
SEAICE_LSRrelaxU/V |
468 |
|
- introduce runtime parameter SEAICEetaZmethod (=0 by default) |
469 |
|
o pkg/aim_v23: |
470 |
|
- implement heating from friction (bottom friction and stratospheric drag). |
471 |
|
o pkg/shap_filt: |
472 |
|
- fix diagnostic "SHAP_dKE" (was 2 time smaller); implement heating from |
473 |
|
dissipation but only for Shap_funct=2, active when addFrictionHeating=T. |
474 |
|
o model/src: |
475 |
|
- move AddMass common block from DYNVARS.h to FFIELDS.h; allow to read-in |
476 |
|
time-constant addMass field from file (addMassFile); |
477 |
|
- support for heating due to friction (and Kinetic Energy dissipation): |
478 |
|
add option, run-time switch and 3-D field array + support code ; each pkg |
479 |
|
or S/R can add heating contribution (if there is a sink of KE); the sum is |
480 |
|
accounted for as a Temperature tendency term (EXTERNAL_FORCING_T). |
481 |
|
o pkg/seaice: |
482 |
|
- complete merge of ITD code into seaice_growth.F |
483 |
|
from MITgcm_contrib/torge/itd/code/ |
484 |
|
no verification so far, but Torge Martin tested |
485 |
|
"1-D test case and Beaufort set up; |
486 |
|
deliver okay results after 1 model year." |
487 |
|
- complete merge of SEAICE_SIZE.h into all relevant routines |
488 |
|
- move computation of eta at Z-points into calc_viscosities |
489 |
|
+ introduce global field etaZ |
490 |
|
+ add different methods for computing etaZ, for now the old |
491 |
|
method (simple averages of eta to Z-points) is hardwired |
492 |
|
+ replace etaMeanZ by etaZ in seaice_lsr, seaice_calc_residual, |
493 |
|
seaice_preconditioner |
494 |
|
- simplify computations for SEAICE_ZETA_SMOOTHREG |
495 |
|
- seaice_preconditioner: |
496 |
|
+ replace one remaining press by pressLoc (mistake) |
497 |
|
+ adjust printing of residuals |
498 |
|
- improve I/O of diagnostics of JFNK in seaice_jfnk.F: |
499 |
|
+ add (SEAICE.h) and rename some counters (initiliased in |
500 |
|
seaice_init_fixed.F) |
501 |
|
+ add _BEGIN/END_MASTER (myThid) around print statements |
502 |
|
+ print total number of iterations and failures over SEAICE_monFreq |
503 |
|
interval to STDOUT |
504 |
|
- move control over output-messages by fgmres to seaice_jfnk to save |
505 |
|
some operations |
506 |
|
- move resetting initial guess for fgmres outside of seaice_fgmres_driver |
507 |
|
in order to make restarts with sol .ne. zero (fgmres with restarts) |
508 |
|
(seaice_jfnk.F, seaice_fgmres.F) |
509 |
|
- seaice_calc_l/rhs.F: replace maskW/S by maskInW/S; this fixes |
510 |
|
a serious convergence problem when open boundaries are involved |
511 |
|
o pkg/ggl90: fix computation of control volumes for the case of |
512 |
|
ALLOW_GGL90_HORIZDIFF (probably not used very often): move control volumes |
513 |
|
up half a grid cell from C-centered to W-centered (pointed out by C. Eden) |
514 |
|
o pkg/seaice: simplify seaice_evp by avoiding use of extra fields u/vIceC |
515 |
|
o pkg/autodiff |
516 |
|
- Add inAdMode switch for SEAICEuseDYNAMICS: |
517 |
|
SEAICEuseDYNAMICSinAdMode |
518 |
|
(extend logic in ADAUTODIFF_INADMODE_SET) |
519 |
|
o pkg/seaice |
520 |
|
- Step 1 of merging ice-thickness distribution (ITD) code from |
521 |
|
MITgcm_contrib/torge/itd/ (author: Torge Martin) |
522 |
|
The code implements concept laid out in Thorndike et al. (1975); |
523 |
|
code is enabled via CPP flag SEAICE_ITD |
524 |
|
nITD (in SEAICE_SIZE.h) defines number of ice thickness categories; |
525 |
|
code is not complete yet!! |
526 |
|
- SEAICE_SIZE.h now included in almost all seaice routines |
527 |
|
o verification (using seaice): |
528 |
|
- switch back seaice-dynamics (+ lower SOLV_MAX_ITERS) in ADM exp. |
529 |
|
global_ocean.cs32x15.seaice ; update results. |
530 |
|
- compile B-grid dynamics in FW test exp 1D_ocean_ice_column ; |
531 |
|
- compile C-grid dynamics with #define SEAICE_ALLOW_JFNK in FW test exp |
532 |
|
offline_exf_seaice (previously compiling B-grid). |
533 |
|
o pkg/exf: |
534 |
|
- fix some STOP conditions in exf_check.F (from Aug 28, modifs did not allow |
535 |
|
to specify neither just 1 comp of wind or wind-stress, nor no surface momentum |
536 |
|
forcing): just replace CPP option ALLOW_ATM_WIND with run-time param useAtmWind. |
537 |
|
o pkg/layers (adjust changes from Sept 19): |
538 |
|
- do snap-shot output and fill diagnostics from inside iLa loop (layers_calc.F) |
539 |
|
this allows to remove "layers_maxNum" dimension from all layers arrays. |
540 |
|
o pkg/layers (adjust changes from Sept 19): |
541 |
|
- remove ALLOW_LAYERS_OUTPUT ; fix snap-shot and time-ave output ; |
542 |
|
- snap-shot extended to all type of layers (not just the 1rst type); |
543 |
|
- remove layers variables when corresponding CPP option is undef. |
544 |
|
o pkg/layers: |
545 |
|
- rename pkg/layers variable and add new output (layer exist & un-weighted |
546 |
|
velocity in layer) |
547 |
|
o pkg/seaice: |
548 |
|
- simplify (?) ocean-drag coefficent computations by using |
549 |
|
the same routine in all three solvers (saves some code lines) |
550 |
|
- remove global fields DRAGA and DRAGS from C-grid code and |
551 |
|
declare them locally in lsr.F (the only place where they are |
552 |
|
still used) |
553 |
|
- update AD output of lab_sea.evp (very sensitive anyway). |
554 |
|
o pkg/seaice: add Jacobian-free Newton Krylov solver for ice dynamics |
555 |
|
(Lemieux et al. 2010, 2012). Turn on with the usual SEAICE_ALLOW_JFNK |
556 |
|
and SEAICEuseJFNK=.true. A few things to note: |
557 |
|
- involves a FGMRES, that is parallel but very inefficient, |
558 |
|
because of many scalar products (global sums) in the Gram-Schmidt |
559 |
|
orthogonalization method. Needs to be replaced. Original code |
560 |
|
from J.-F. Lemieux |
561 |
|
- preconditioner for FGMRES is a stripped down version of LSOR |
562 |
|
- SOLV_MAX_ITERS is now used for LSOR as a solver and as a |
563 |
|
preconditioner. For the preconditioner, the default is set to 10. |
564 |
|
- Jacobian times vector is computed with finite differences |
565 |
|
- marginally related to JFNK-solver: add a smooth regularization for |
566 |
|
zeta with tanh that will improve convergence (Lemieux and Tremblay, |
567 |
|
2009) for any implicit solver (not implemented for EVP because EVP |
568 |
|
does not need this regularization in the first place). Define |
569 |
|
SEAICE_ZETA_SMOOTHREG in SEAICE_OPTIONS.h to use. |
570 |
|
o eesupp/src: |
571 |
|
- check in genmake2 that intrinsic S/R flush is available. |
572 |
|
- add S/R to flush IO unit (if intrinsic S/R flush is available) |
573 |
|
- flush standard & error msg unit before MPI termination |
574 |
|
- if debugMode, flush IO unit after printing msg |
575 |
|
o pkg/ctrl: |
576 |
|
- ctrl_unpack.F, ALLOW_GENARR3D_CONTROL code: fix missing argument in call |
577 |
|
to ctrl_set_unpack_xyz. |
578 |
|
|
579 |
|
checkpoint64 (2012/10/09) |
580 |
|
o pkg/shelfice |
581 |
|
- in mom_fluxform.F, mom_vecinv.F: |
582 |
|
CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid) |
583 |
|
Bug fix KappaRU -> KappaRV |
584 |
|
does not change verification/isomip but may change other setups |
585 |
|
(presumably constant KappaRU=KappaRV) |
586 |
|
- fix diagnostics SHIU/Vdrag (thanks to Tom Millgate) |
587 |
|
o pkg/obcs: |
588 |
|
- fixed some indexing bugs in obcs_seaice_sponge.F |
589 |
|
- added obcs relaxation subroutines for HSALT and HSNOW |
590 |
|
- changes verification/seaice_obcs/results/obcs_seaice_sponge.F |
591 |
|
o pkg/seaice: |
592 |
|
- add "multicategory" parameterization for snow in analogy to ice, |
593 |
|
default is off for now. |
594 |
|
o pkg/obcs: |
595 |
|
- added obcs_seaice_sponge.F for obcs relaxation of seaice variables; |
596 |
|
see verification/seaice_obcs/input.seaiceSponge for example application. |
597 |
|
- remove local commom bloc "OBCS_GLOBAL" in obcs_readparms.F and do all the OB |
598 |
|
index setting by master-thread. This fix multi-threads Pb in previous modifs. |
599 |
|
o pkg/layers : |
600 |
|
- add diagnostics to pkg/layers |
601 |
|
- move the meat of pkg/layers from layers_calc.F to layers_fluxcalc.F |
602 |
|
(from R.Tulloch). Layers_calc.F now calls layers_fluxcalc.F accordingly. |
603 |
|
o pkg/generic_advdiff/gad_implicit_r.F : |
604 |
|
- fix ADVr diagnostics in case of both implicit vertical advection and diffusion. |
605 |
|
o pkg/seaice/seaice_growth.F: |
606 |
|
- fix SItflux diagnostics in virtual salt flux + balanceEmpmr case. |
607 |
|
o pkg/obcs: |
608 |
|
- change default setting of OBCS_UVICE_OLD from defined to undef; |
609 |
|
- use new parameter OB_indexNone for null index value (instead of hard-coded 0) |
610 |
|
in all pkg/obcs code and in other pkgs; remove k loop in obcs_check_depths.F; |
611 |
|
- pass OB_indexNone as (new) argument to S/R CTRL_MASK_SET_[X,Y]Z; |
612 |
|
- change OB null index value (OB_indexNone) to -99 ; this fix the problem |
613 |
|
with Southern & Western OB at a tile edge (at least in a simple set-up). |
614 |
|
o pkg/obcs: |
615 |
|
- change settings of OB index in case OB coincides with tile edge (shared by |
616 |
|
2 tiles), so that common OB location is registered by both tiles (instead of |
617 |
|
only 1). However, for Southern and Western OB, index value = 0 is not |
618 |
|
recognized as valid OB index (=default null value) and needs to be fixed. |
619 |
|
- modify accordingly OBCS_BALANCE_FLOW and OBCS_MONITOR (avoid double counting) |
620 |
|
- new parameter "OB_indexNone" for null index value (for now, still zero) |
621 |
|
to replace hard-coded null index value of zero. |
622 |
|
o pkg/exch2: |
623 |
|
- improve W2_USE_E2_SAFEMODE (faster) and W2_E2_DEBUG_ON: |
624 |
|
always check buffer-size (but outside the loop); move checking for valid |
625 |
|
index from W2_USE_E2_SAFEMODE to W2_E2_DEBUG_ON; in W2_E2_DEBUG_ON, |
626 |
|
print each tile and point connection only if |W2_printMsg|>= 2 and 3. |
627 |
|
o pkg/ctrl (pack & unpack): |
628 |
|
- in ctrl_pack.F & ctrl_unpack.F, use the same local file-name variable |
629 |
|
(locally defined) for different variables (+ remove the variable-specific |
630 |
|
file name in CTRL_GENARR.h). For now, only implemented for GENARR2/3D_CONTROL |
631 |
|
(to be extended to other local file names in ctrl.h). |
632 |
|
o pkg/flt: |
633 |
|
- add a FLT_Iter0 option (similar to PTRACERS_Iter0). |
634 |
|
o pkg/mdsio: |
635 |
|
- fix missing STOP in mdsio_readvec_loc.F (case ioUnit=0) when file is missing |
636 |
|
o tools/genmake2: |
637 |
|
- add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE |
638 |
|
(added by Alistair in version 1.51 for building without make depend); |
639 |
|
- remove Header files list (H_SRC_FILES) from the dependence of targets |
640 |
|
ad_input_code.f & ftl_input_code.f (not clear why it was added in the first |
641 |
|
place in version 1.23): this save going through staf when unrelated header |
642 |
|
file has been modified. |
643 |
|
Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without |
644 |
|
"make depend" step, still need to do "make links" before "make adtaf". |
645 |
|
o eesupp/src (+ few pkg src files) & genmake2: |
646 |
|
- finish to remove ALWAYS_USE_MPI in source code that TAF does not see; |
647 |
|
- no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2). |
648 |
|
- improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish |
649 |
|
upper/lower case ; account for space between "#" and undef/define) |
650 |
|
o pkg/flt (with exch2): |
651 |
|
- cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F; |
652 |
|
- simplify threads synchronisation; fix (many issues) multi-threaded with MPI. |
653 |
|
|
654 |
|
checkpoint63s (2012/09/05) |
655 |
|
o pkg/ecco: |
656 |
|
- remove #ifdef ALLOW_SMOOTH_CORREL3D brackets. |
657 |
|
- add more relevant #ifdef ALLOW_SMOOTH ones. |
658 |
|
- sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D. |
659 |
|
o pkg/ctrl: |
660 |
|
- CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D, |
661 |
|
ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D. |
662 |
|
- ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag, |
663 |
|
doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and |
664 |
|
ctrlSmoothCorrel3D (new). |
665 |
|
The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP. |
666 |
|
- ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist. |
667 |
|
- ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress |
668 |
|
controls when useAtmWind, and vice versa. |
669 |
|
- ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers. |
670 |
|
- ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with |
671 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH. |
672 |
|
- ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with |
673 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH. |
674 |
|
- ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F: |
675 |
|
replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D. |
676 |
|
o pkg/smooth: |
677 |
|
- remove un-necessary includes. |
678 |
|
- remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets. |
679 |
|
Those CPP options were never defined, and not necessary. |
680 |
|
o model/src: |
681 |
|
- fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi). |
682 |
|
- standard treatment of useSMOOTH. |
683 |
|
o pkg/autodiff: |
684 |
|
- add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode, |
685 |
|
useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint. |
686 |
|
o pkg/exch2: |
687 |
|
- add "if usingMPI" where it was missing (in exch2_rx?_cube*.template) |
688 |
|
+ start to remove ALWAYS_USE_MPI in source code that TAF does not see. |
689 |
|
- make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag |
690 |
|
and tiles to process mapping. |
691 |
|
- re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h) |
692 |
|
moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h; |
693 |
|
rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX |
694 |
|
from w2_eeboot.F to w2_readparms.F. |
695 |
|
o eesupp/src: |
696 |
|
- set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of |
697 |
|
ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F; |
698 |
|
also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F |
699 |
|
- in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI |
700 |
|
is defined (remove condition on usingMPI) to match cases where MPI_INIT |
701 |
|
has been called. |
702 |
|
- fix bug I put in previous modif of exch_sm_3d_rx.template (not much used); |
703 |
|
- change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings |
704 |
|
(so that on 1 proc, get same myPid independently of usingMPI) |
705 |
|
- add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and |
706 |
|
useCubedSphereExchange with EXCH-1 (safer). |
707 |
|
- add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI). |
708 |
|
o pkg/ggl90: |
709 |
|
- fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call) |
710 |
|
used in ALLOW_GGL90_SMOOTH code. |
711 |
|
o pkg/flt: |
712 |
|
- fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping |
713 |
|
floats at the Southern end of the domain). |
714 |
|
o eesupp/inc: |
715 |
|
- add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h); |
716 |
|
but not used (and not to be used) anywhere, just for documentation. |
717 |
|
o pkg/autodiff, exf, ptracers & seaice (AD & TL output): |
718 |
|
- comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since: |
719 |
|
a) can damage previously written records in any other multi-record files. |
720 |
|
b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S. |
721 |
|
o tools/genmake2: |
722 |
|
- define variable MAKE within Makefile and use it in place of 'make'; |
723 |
|
- update AD_CONFIG.h (if needed) before building any of the executable |
724 |
|
(forward, adjoint or tangent-lin); this involves a 2nd invocation of make; |
725 |
|
and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h; |
726 |
|
- always print usual warning comment 'this file is automatically generated' |
727 |
|
from script convert_cpp_cmd2defines (+ remove this warning from genmake2). |
728 |
|
o pkg/cheapaml: |
729 |
|
- updated to correspond to the code used in accepted paper (Nico Wienders). |
730 |
|
o pkg/exf: |
731 |
|
added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. |
732 |
|
ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) |
733 |
|
and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). |
734 |
|
o pkg/exf, autodiff, ctrl, ecco and seaice: |
735 |
|
remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones. |
736 |
|
o pkg/ctrl, ecco: |
737 |
|
allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL. |
738 |
|
Depending on useAtmWind, one is inactive, and the other is active (see |
739 |
|
exf_getffields.F/exf_getsurfacefluxes.F). |
740 |
o tools/genmake2: |
o tools/genmake2: |
741 |
- improve error msg when failing in 2nd test of check_for_broken_Ff |
- improve error msg when failing in 2nd test of check_for_broken_Ff |
742 |
- fix option '-makefile' short-name (-mf according to genmake2 -help) |
- fix option '-makefile' short-name (-mf according to genmake2 -help) |