| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
checkpoint64d (2013/02/17) |
| 8 |
|
o pkg/monitor (angular momentum): |
| 9 |
|
- do not add Eta contribution to the total AM if using rigid-lid; |
| 10 |
|
- correct for Adams-Bashforth in zonal-wind part (instead of in AM_eta). |
| 11 |
|
- horizontal discretisation: compute Zonal wind contribution separately for |
| 12 |
|
each component (instead of from cell centered averaged) and use the 4 |
| 13 |
|
grid-cell corner averaged value of Omega*(R*cos_Phi)^2 in AM_eta part. |
| 14 |
|
- Check that AM is conserved with linear dynamics (momAdvection=F and linear |
| 15 |
|
FreeSurf) if using vectorInvariant momentum. |
| 16 |
|
o model/src (horizontal grid): |
| 17 |
|
- move initialisation of all horizontal grid arrays to null value |
| 18 |
|
from specific horizontal grid S/R to main S/R INI_GRID; |
| 19 |
|
- add 2 new arrays to project model C-grid velocity on to zonal direction |
| 20 |
|
(similar to AngleCosC & -AngleSinC but at U and V point location) and |
| 21 |
|
compute them in S/R CALC_GRID_ANGLES. |
| 22 |
|
o pkg/seaice: replace a hard coded parameter by a runtime parameter |
| 23 |
|
SEAICE_JFNK_tolIter |
| 24 |
|
o pkg/seaice: introduce a restricted additive Schwarz (RAS) method in |
| 25 |
|
preconditioner for JFNK (run LSR into the overlaps as far as possible, |
| 26 |
|
i.e OLx/y-2, but overwrite the solution in the overlaps) |
| 27 |
|
- extend loop range in seaice_calc_viscosity |
| 28 |
|
- add new parameters SEAICE_OLx/y (default = OLx/y-2) |
| 29 |
|
- add flexible loop ranges to seaice_preconditioner, seaice_calc_lsr_coeffs |
| 30 |
|
- slightly modify loops in tridiagonal solver lsr-preconditioner |
| 31 |
|
- by default remove the extra exchange in seaice_preconditioner with a |
| 32 |
|
replacement of an undocumented CPP flag by SEAICE_PRECOND_EXTRA_EXCHANGE |
| 33 |
|
- modify offline_exf_seaice so that old results without RAS are reproduced |
| 34 |
|
for output.dyn_jfnk.txt |
| 35 |
|
in seaice_fgmres.F (unrelated to RAS) |
| 36 |
|
- add a cpp-flag option for a re-ordered mapping (potentially more |
| 37 |
|
efficient), but because this changes the results, turn it off by |
| 38 |
|
default |
| 39 |
|
- replace the save statement by local common blocks |
| 40 |
|
o utils/matlab: |
| 41 |
|
- fix tile-offset in rdmnc.m when output was produced using EXCH2. |
| 42 |
|
- update cs_grid/bk_line scripts to use load_grid.m (in utils/matlab) |
| 43 |
|
instead of local script "load_cs.m". |
| 44 |
|
o pkg/seaice: |
| 45 |
|
- fix a serious bug in seaice_fgmres.F, s/r seaice_scalprod, connected |
| 46 |
|
to the scalarProductMetric and the unrolling. By chance this does not |
| 47 |
|
change the verification experiment, because of the particular domain |
| 48 |
|
decomposition |
| 49 |
|
o pkg/diagnostics: |
| 50 |
|
- change default missing_value from UNSET_RL to -999. |
| 51 |
|
o pkg/layers: improve vectorization of layers_fluxcalc.F |
| 52 |
|
- step 1: split loops, make TatU/V 2D arrays. This alone reduces the cpu |
| 53 |
|
time spent in this routine by more than a factor of 3 on an NEC-SX8 |
| 54 |
|
- step 2: replace search algorithm by a bisection algorithm found in |
| 55 |
|
Press et al. Numerical Recipes in Fortran. This algorithm can be |
| 56 |
|
vectorized and finds the correct bin in approx. log2(Nlayers) steps. |
| 57 |
|
For now, use this algorithm only for TARGET_NEC_SX defined. |
| 58 |
|
- moved the search algorithm into a separate subroutine, that is kept |
| 59 |
|
within the same file for automatic inlining. |
| 60 |
|
- modified catching potential errors |
| 61 |
|
o pkg/ecco: |
| 62 |
|
- add compile switches ALLOW_SHALLOW_ALTIMETRY and ALLOW_HIGHLAT_ALTIMETRY. |
| 63 |
|
o model/src, pkg/autodiff, pkg/ctrl, pkg/grdchk : |
| 64 |
|
- modifications for ALLOW_GENTIM2D_CONTROL |
| 65 |
|
-- forward_step.F, the_main_loop.F : pass options and arrays for adjoint tapes. |
| 66 |
|
-- load_fields_driver.F : add call to CTRL_MAP_GENTIM2D( myTime, myIter, myThid ) |
| 67 |
|
-- add xx_gentim2d0/1 in ctrl_ad_check_lev1_dir.h checkpoint_lev1_directives.h etc |
| 68 |
|
-- use ctrl_swapffields.F (new) instead of exf_SwapFFields.F in ctrl_get_gen.F |
| 69 |
|
o model/src: |
| 70 |
|
- account for moist thermodynamics in (dry) potential temperature equation; |
| 71 |
|
update results of experiments: aim.5l_cs (x2), fizhi-cs (std + aqualev) |
| 72 |
|
and cpl_aim+ocn. |
| 73 |
|
- also switch to standard compiler (gfortran, was using ifort previously) |
| 74 |
|
for fizhi-cs experiments reference output. |
| 75 |
|
o pkg/ctrl: |
| 76 |
|
- 1st step toward generic time-varying control variable (2D) via CPP option |
| 77 |
|
ALLOW_GENTIM2D_CONTROL |
| 78 |
|
- note new namelist ctrl_nml_genarr in data.ctrl |
| 79 |
|
o verification/global_ocean.cs32x15: |
| 80 |
|
- switch off OLD_THSICE_CALL_SEQUENCE (both forward and AD code) to use new |
| 81 |
|
thsice calling sequence and update "output.icedyn.txt" output file. |
| 82 |
|
o pkg/ptracers: |
| 83 |
|
- from Ryan A.: code to allow to restart a tracer at regular time interval |
| 84 |
|
specifying a reset frequency and a reset-phase (for each tracers). |
| 85 |
|
o pkg/thsice: |
| 86 |
|
- implement new sequence of calls for thsice+seaice: |
| 87 |
|
previously: ice-Dyn,ice-Advect,ice-Thermo(thsice) |
| 88 |
|
new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect |
| 89 |
|
- allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE" |
| 90 |
|
in CPP_OPTIONS.h) to recover old sequence; |
| 91 |
|
- update diagnostics for Intermediate State thsice diagnostics: now filled |
| 92 |
|
just before advection (instead of just after advection in old sequence); |
| 93 |
|
- update output of experiment offline_exf_seaice (standard test); |
| 94 |
|
- in global_ocean.cs32x15 exp., postpone output.icedyn.txt update |
| 95 |
|
by setting #define OLD_THSICE_CALL_SEQUENCE in CPP_OPTIONS.h |
| 96 |
|
o pkg/aim_v23: |
| 97 |
|
- use tiled array for aim_CO2 and surface wind speed for export to coupler; |
| 98 |
|
- use standard pkg/mdsio routines to read & write CO2 pickup file; |
| 99 |
|
- in-line S/R AIM_AIM2DYN_EXCHANGES in aim_do_physics.F; |
| 100 |
|
- Implement new sequence of calls for seaice advection (with thsice and |
| 101 |
|
seaice diffusion): do ice advection after ice-Thermodynamic (previously |
| 102 |
|
was done before); change aim_do_physics.F (split the bi,bj loops block); |
| 103 |
|
- use same CPP option (OLD_THSICE_CALL_SEQUENCE) to recover old sequence; |
| 104 |
|
o pkg/thsice: |
| 105 |
|
- add a missing EXCH of sIceLoad in thsice_main.F (ocean set-up) for the case |
| 106 |
|
where just seaice diffusion is used without seaice-dynamics. |
| 107 |
|
|
| 108 |
|
checkpoint64c (2013/01/18) |
| 109 |
|
o pkg/seaice: |
| 110 |
|
- add a parameter JFNKres_tFac that can replace JFNKres_t |
| 111 |
|
(= JFNKres_tFac*JFNKresidual before JFNK solver) |
| 112 |
|
- add a line search option to the JFNK solver |
| 113 |
|
- move update of u/vIce and computation of initial residual into a separate |
| 114 |
|
routine (same file); makes the code a little easier to read (?) |
| 115 |
|
- the line search requires computation of the residual and for some reason |
| 116 |
|
I cannot do the update of u/vIce at the beginning of the Newton loop |
| 117 |
|
without changing the results, so we move computation of the new residual |
| 118 |
|
also to the end of the Newton loop, even without the line search |
| 119 |
|
o pkg/mdsio: |
| 120 |
|
- write missing value (corresponding to undefined array value) to meta files; |
| 121 |
|
skip this if missing value is one (UNSET_RL would be a better value for the |
| 122 |
|
case of undefined missing value but it's current the default missing-value); |
| 123 |
|
Also update mdsio_read_meta.F (reading timeInterval & missing-value). |
| 124 |
|
o pkg/exf & thsice: |
| 125 |
|
- for diagnostics purpose, fill-up and update Qsw array (+ fill the |
| 126 |
|
diagnostics) even when SHORTWAVE_HEATING is #undef; |
| 127 |
|
o verification/cfc_example: |
| 128 |
|
- turn on pkg/layers with pkg/diagnostics (to test pkg/layers and to |
| 129 |
|
illustrate how to use it). |
| 130 |
|
o verification/offline_exf_seaice: |
| 131 |
|
in input: add SEAICErestoreUnderIce=.TRUE., and reduce size of forcing |
| 132 |
|
files to only one time-record. |
| 133 |
|
in input.thermo: narrow the 2 bands of low initial ice-concentration near |
| 134 |
|
N & S edges; switch on SEAICErestoreUnderIce=T; use pkg/diagnostics for |
| 135 |
|
snapshot output; same mcPheePiston value as in thsice with |
| 136 |
|
surf-current=0.2m/s. |
| 137 |
|
in input.thsice: similar set-up as in input.thermo (channel with same seaice |
| 138 |
|
initial conditions). |
| 139 |
|
o verification/cfc_example: |
| 140 |
|
- update file "data" with more standard choice (default rotationPeriod, |
| 141 |
|
exactConserv=T, reduce ivdc_kappa to 10, remove multiDimAdvection=F, |
| 142 |
|
set deltaTFreeSurf to deltaTtracer) and update the output. |
| 143 |
|
o pkg/layers: |
| 144 |
|
- fix bolus part so that it compiles with #undef GM_BOLUS_ADVEC; |
| 145 |
|
- ensure that "layers_bolus" is switched to False when useGMRedi=False. |
| 146 |
|
o verification/offline_exf_seaice: |
| 147 |
|
- set all {field}period to zero for constant-in-time forcing (not tested |
| 148 |
|
anywhere else). |
| 149 |
|
o verification/offline_exf_seaice: |
| 150 |
|
- dyn_lsr : use pkg/seaice S/R (instead of pkg/thsice) to advect sea-ice; |
| 151 |
|
- dyn_jfnk : use pkg/thsice S/R (instead of pkg/seaice) to advect sea-ice. |
| 152 |
|
o model/src: |
| 153 |
|
- implement Finite-Volume method for (hydrostatic) presure gradient |
| 154 |
|
from S.-J. Lin (QJRMS 1997), for atmosphere using sigma-coordinate. |
| 155 |
|
o pkg/seaice: implement EVP* by Lemieux et al. (2012). |
| 156 |
|
- In order to be compatible with the default EVP code, this requires changing |
| 157 |
|
the EVP code around a little; and because any small change immediately |
| 158 |
|
breaks the lab_sea.hb87 verification experiment, the reference output is |
| 159 |
|
updated two times (each time the remaining aggrement was only 2 digits): |
| 160 |
|
- after replacing 1/dt by 1*recip_dt with a precomputed recip_dt |
| 161 |
|
- after replacing 1/(1+0.5*dt/tau) by a/(a+1), with a=2*tau/dt |
| 162 |
|
The adjoint test lab_sea.evp also needed to be updated. |
| 163 |
|
- Turn on EVP* by setting SEAICE_deltaTevp as before, and setting |
| 164 |
|
SEAICEuseEVPstar=.true.; for EVP* SEAICE_deltaTevp does not need to be |
| 165 |
|
a factor of SEAICE_deltaTdyn, and you can set the number of EVP steps |
| 166 |
|
explicitly with SEAICEnEVPstarSteps (thereby overriding the default of |
| 167 |
|
INT(SEAICE_deltaTdyn/SEAICE_deltaTevp)). Controlling EVP* is deliberately |
| 168 |
|
kept obscure, because I need to test it a little more. |
| 169 |
|
o pkg/cheapaml: |
| 170 |
|
- fix few incorrect type (_RL/_RS) in subroutine calls. |
| 171 |
|
o pkg/seaice: |
| 172 |
|
- new S/R SEAICE_MAP_RS2VEC (similar to SEAICE_MAP2VEC) to map _RS arrays |
| 173 |
|
to _RL vector; this fixes JFNK code when compiling with "-use_r4" option. |
| 174 |
|
o model/src: |
| 175 |
|
- add a warning if using select_rStar=2 with nonlinFreeSurf <> 4; |
| 176 |
|
change (in input_ad*/data) select_rStar from 2 to 1 for AD verification |
| 177 |
|
experiments global_ocean.cs32x15 & tutorial_tracer_adjsens (+ update output) |
| 178 |
|
o pkg/cheapaml: |
| 179 |
|
- replace "273.1 _d 0" by celsius2K in pkg/cheapaml/cheapaml.F and |
| 180 |
|
update output of experiment cheapAML_box. |
| 181 |
|
- store in CHEAPAML.h coeffs ssq[0:2] for saturation specific humidity, |
| 182 |
|
and set them only in one place (cheapaml_readparms.F). |
| 183 |
|
- replace "273.16 _d 0" by celsius2K & replace "3.14159 _d 0" by constant "PI" |
| 184 |
|
- remove re-setting of main-model parameter "celsius2K" (in cheapaml_readparms) |
| 185 |
|
and re-setting of cheapAML params "lath" & "p0" (in cheapaml_init_varia). |
| 186 |
|
o model/src/the_main_loop.F: |
| 187 |
|
- fix revision 129 : need both ALLOW_ECCO and ALLOW_ECCO_EVOLUTION. |
| 188 |
|
o pkg/seaice: |
| 189 |
|
- remove legacy branch code. |
| 190 |
|
- retire SEAICE_GROWTH_LEGACY and SEAICE_CAP_HEFF accordingly. |
| 191 |
|
o verification/*/code*/SEAICE_OPTIONS.h: |
| 192 |
|
- remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY, |
| 193 |
|
SEAICE_CAP_HEFF). |
| 194 |
|
o pkg/cheapaml: |
| 195 |
|
- use standard routine (S/R GET_PERIODIC_INTERVAL) to decide when it is time |
| 196 |
|
to load new forcing fields. |
| 197 |
|
- add missing "_d 0" where it's needed; + some editing (improve indentation). |
| 198 |
|
- remove switch to "-r8" compiler option (no longer needed) in verification |
| 199 |
|
cheapAML_box, keep same output (small trucation error differences). |
| 200 |
|
o verification/offline_exf_seaice: |
| 201 |
|
- add thermodynamics only test. |
| 202 |
|
o verification/cheapAML_box: |
| 203 |
|
- split the domain in 8 (2x4) tiles; add MPI and multi-threaded test; |
| 204 |
|
keep same output (same 14 digits for cg2d). |
| 205 |
|
- switch on "-r8" compiler option (some numerical values are missing |
| 206 |
|
the "_d 0") and update output (only 6 digits for cg2d were preserved). |
| 207 |
|
|
| 208 |
|
checkpoint64b (2012/12/24) |
| 209 |
|
o pkg/cheapaml: |
| 210 |
|
- remove un-used variables (Qnet,EmPmR) from pickup files. |
| 211 |
|
- store tendency of advected variables into cheapaml pickup file |
| 212 |
|
and fix the AB-2 restart. |
| 213 |
|
o verification/offline_exf_seaice and lab_sea adjoint: |
| 214 |
|
- switch to new code (#undef SEAICE_GROWTH_LEGACY). |
| 215 |
|
- switch to 4 time steps in offline, consistent with lab_sea. |
| 216 |
|
- match parameters from SEAICE_GROWTH_LEGACY branch in data.seaice. |
| 217 |
|
- update results after change of experiment seaice. |
| 218 |
|
o pkg/seaice: |
| 219 |
|
- remove option SEAICE_MULTICATEGORY; has been replaced with run-time |
| 220 |
|
parameter SEAICE_multDim. Issue a warning if SEAICE_MULTICATEGORY is |
| 221 |
|
still defined since SEAICE_multDim needs to be set to MULTDIM value (from |
| 222 |
|
SEAICE_SIZE.h) to recover previous #define SEAICE_MULTICATEGORY default. |
| 223 |
|
o model/src: |
| 224 |
|
- add run-time parameter to select CG2D solver minimum-residual solution |
| 225 |
|
(in case of a poor convergence). |
| 226 |
|
o pkg/seaice/seaice_lsr.F |
| 227 |
|
- move calculation of matrix coefficients into new |
| 228 |
|
S/R SEAICE_CALC_LSR_COEFFS; for now this routine remains in the same |
| 229 |
|
file; the main purpose of this change is to be able to reuse the code |
| 230 |
|
in S/R SEAICE_PRECONDITIONER |
| 231 |
|
- modify the computation of the residual so that the mass of sea-ice |
| 232 |
|
is not used twice; this simplifies the calculations, but since |
| 233 |
|
the residual is never used except when LSR_mixIniGuess.ge.4---and this is |
| 234 |
|
not tested in testreport---this does not affect the testreport results. |
| 235 |
|
o verification/seaice_obcs: |
| 236 |
|
- disable SEAICE_GROWTH_LEGACY; reset input files to match those of |
| 237 |
|
verification/lab_sea/input.salt_plume; changes results/output.txt* |
| 238 |
|
o model/src: |
| 239 |
|
- adapt quasi-hydrostatic formulation to work with p or p* coordinate. |
| 240 |
|
o pkg/seaice: |
| 241 |
|
- improve description of parameters in seaice_fgmres.F and start |
| 242 |
|
cleaning up the code |
| 243 |
|
- change name of SCALPROD to SEAICE_SCALPROD and modify meaning of |
| 244 |
|
second argument |
| 245 |
|
- add a metric based on grid cell area to SEAICE_SCALPROD; update |
| 246 |
|
results of offline_exf_seaice.dyn_jfnk |
| 247 |
|
- compute initial residual norm in seaice_jfnk based on SEAICE_SCALPROD |
| 248 |
|
o pkg/aim_v23: |
| 249 |
|
- fix an other bug in dissipation heating (grid-cell area was missing). |
| 250 |
|
o model/src + pkg/seaice: |
| 251 |
|
- add global (multi-tile) linear solver for pair of tri-diagonal system |
| 252 |
|
along X and Y lines, respectively for U and V component. |
| 253 |
|
Note: 1) MPI and cube-exchange not yet coded. |
| 254 |
|
2) probably not accurate for poorly conditioned / large size problem. |
| 255 |
|
- add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver; |
| 256 |
|
default: not compiled and not used. |
| 257 |
|
o pkg/seaice: |
| 258 |
|
- first attempt at a multi-threaded fgmres solver for the JFNK solver: |
| 259 |
|
introduce bi/bj loops and use global_sum_tile_rl instead of |
| 260 |
|
mpi_allreduce in seaice_fgmres.F |
| 261 |
|
- improve diagnostics output for fgmres solver (seaice_fgmres.F) |
| 262 |
|
- replace a few unnecessary goto statements by if-blocks (seaice_fgmres.F) |
| 263 |
|
- add a verification experiment for JFNK in offline_exf_seaice |
| 264 |
|
o verification: |
| 265 |
|
- change (for now, only fwd test) offline_exf_seaice experiment: |
| 266 |
|
use a re-entrant channel with idealized coastline (trapezoidal shape) |
| 267 |
|
at southern boundary to explore seaice dynamics and thermodynamics |
| 268 |
|
with simple forcing. Main set-up has dynamics+thermo and SST relaxation; |
| 269 |
|
secondary test (input.thsice) use thermodynamics only with SST relaxation. |
| 270 |
|
- add seaice-dynamics only secondary test using LSR and pkg/thsice advection. |
| 271 |
|
o pkg/exf: |
| 272 |
|
- disable "sstExtrapol" when Nr=1 |
| 273 |
|
o verification: |
| 274 |
|
- add new experiment "cheapAML_box" (simple 1 layer set-up from Bruno Deremble) |
| 275 |
|
to test pkg/cheapaml. |
| 276 |
|
o pkg/aim_v23 & pkg/shap_filt: |
| 277 |
|
- fix dissipation heating (erroneous gravity multiplication factor). |
| 278 |
|
o pkg/seaice: |
| 279 |
|
- remove unused field pressPre from jfnk solver |
| 280 |
|
- rename two subroutines in seaice_preconditioner.F |
| 281 |
|
o eesupp/src: |
| 282 |
|
- S/R MDSFINDUNIT avoids reserved unit numbers (scrUnit1, eeDataUnit ...) |
| 283 |
|
o pkg/seaice/seaice_preconditioner.F: fix preconditioner once again |
| 284 |
|
- remove wrong parts of the rhs and the lhs (were in there |
| 285 |
|
because I did not understand the concept of this preconditioner) |
| 286 |
|
- add an exchange between u- and v-sweep. This increases communication |
| 287 |
|
by a factor of two but improves the convergence of jfnk. Ideally, |
| 288 |
|
one would like the u- and v-sweep to be independent. So far within |
| 289 |
|
undocumented ifdefs |
| 290 |
|
- reorganize the extra computations for printing the residuals |
| 291 |
|
o tools/genmake2: |
| 292 |
|
- comment out the "mpif.h" include in NetCDF test programm (for MPI built) |
| 293 |
|
since it's not necessary (and was preventing to use MNC in some cases). |
| 294 |
|
|
| 295 |
|
checkpoint64a (2012/11/16) |
| 296 |
|
o pkg/autodiff: |
| 297 |
|
- improve pkg-internal logical parameter switch (inAd/inFwd mode) so that |
| 298 |
|
autodiff_readparms.F no longer depends on calling order (within |
| 299 |
|
packages_readparms.F) and no longer requires to include ${PKG}_PARMS.h): |
| 300 |
|
rename param turnFreeDriftInAdMode to SEAICEuseFREEDRIFTswitchInAd |
| 301 |
|
and change param SEAICEuseDYNAMICSinAdMode to SEAICEuseDYNAMICSswitchInAd. |
| 302 |
|
o pkg/obcs: |
| 303 |
|
- adding tidal velocity forcing capability to obcs |
| 304 |
|
for usage example, see verification/seaice_obcs/input.tides |
| 305 |
|
o pkg/seaice: |
| 306 |
|
- turn the LSR-relaxation parameters WFAU/V into runtime parameters |
| 307 |
|
SEAICE_LSRrelaxU/V |
| 308 |
|
- introduce runtime parameter SEAICEetaZmethod (=0 by default) |
| 309 |
|
o pkg/aim_v23: |
| 310 |
|
- implement heating from friction (bottom friction and stratospheric drag). |
| 311 |
|
o pkg/shap_filt: |
| 312 |
|
- fix diagnostic "SHAP_dKE" (was 2 time smaller); implement heating from |
| 313 |
|
dissipation but only for Shap_funct=2, active when addFrictionHeating=T. |
| 314 |
|
o model/src: |
| 315 |
|
- move AddMass common block from DYNVARS.h to FFIELDS.h; allow to read-in |
| 316 |
|
time-constant addMass field from file (addMassFile); |
| 317 |
|
- support for heating due to friction (and Kinetic Energy dissipation): |
| 318 |
|
add option, run-time switch and 3-D field array + support code ; each pkg |
| 319 |
|
or S/R can add heating contribution (if there is a sink of KE); the sum is |
| 320 |
|
accounted for as a Temperature tendency term (EXTERNAL_FORCING_T). |
| 321 |
|
o pkg/seaice: |
| 322 |
|
- complete merge of ITD code into seaice_growth.F |
| 323 |
|
from MITgcm_contrib/torge/itd/code/ |
| 324 |
|
no verification so far, but Torge Martin tested |
| 325 |
|
"1-D test case and Beaufort set up; |
| 326 |
|
deliver okay results after 1 model year." |
| 327 |
|
- complete merge of SEAICE_SIZE.h into all relevant routines |
| 328 |
|
- move computation of eta at Z-points into calc_viscosities |
| 329 |
|
+ introduce global field etaZ |
| 330 |
|
+ add different methods for computing etaZ, for now the old |
| 331 |
|
method (simple averages of eta to Z-points) is hardwired |
| 332 |
|
+ replace etaMeanZ by etaZ in seaice_lsr, seaice_calc_residual, |
| 333 |
|
seaice_preconditioner |
| 334 |
|
- simplify computations for SEAICE_ZETA_SMOOTHREG |
| 335 |
|
- seaice_preconditioner: |
| 336 |
|
+ replace one remaining press by pressLoc (mistake) |
| 337 |
|
+ adjust printing of residuals |
| 338 |
|
- improve I/O of diagnostics of JFNK in seaice_jfnk.F: |
| 339 |
|
+ add (SEAICE.h) and rename some counters (initiliased in |
| 340 |
|
seaice_init_fixed.F) |
| 341 |
|
+ add _BEGIN/END_MASTER (myThid) around print statements |
| 342 |
|
+ print total number of iterations and failures over SEAICE_monFreq |
| 343 |
|
interval to STDOUT |
| 344 |
|
- move control over output-messages by fgmres to seaice_jfnk to save |
| 345 |
|
some operations |
| 346 |
|
- move resetting initial guess for fgmres outside of seaice_fgmres_driver |
| 347 |
|
in order to make restarts with sol .ne. zero (fgmres with restarts) |
| 348 |
|
(seaice_jfnk.F, seaice_fgmres.F) |
| 349 |
|
- seaice_calc_l/rhs.F: replace maskW/S by maskInW/S; this fixes |
| 350 |
|
a serious convergence problem when open boundaries are involved |
| 351 |
|
o pkg/ggl90: fix computation of control volumes for the case of |
| 352 |
|
ALLOW_GGL90_HORIZDIFF (probably not used very often): move control volumes |
| 353 |
|
up half a grid cell from C-centered to W-centered (pointed out by C. Eden) |
| 354 |
|
o pkg/seaice: simplify seaice_evp by avoiding use of extra fields u/vIceC |
| 355 |
|
o pkg/autodiff |
| 356 |
|
- Add inAdMode switch for SEAICEuseDYNAMICS: |
| 357 |
|
SEAICEuseDYNAMICSinAdMode |
| 358 |
|
(extend logic in ADAUTODIFF_INADMODE_SET) |
| 359 |
|
o pkg/seaice |
| 360 |
|
- Step 1 of merging ice-thickness distribution (ITD) code from |
| 361 |
|
MITgcm_contrib/torge/itd/ (author: Torge Martin) |
| 362 |
|
The code implements concept laid out in Thorndike et al. (1975); |
| 363 |
|
code is enabled via CPP flag SEAICE_ITD |
| 364 |
|
nITD (in SEAICE_SIZE.h) defines number of ice thickness categories; |
| 365 |
|
code is not complete yet!! |
| 366 |
|
- SEAICE_SIZE.h now included in almost all seaice routines |
| 367 |
|
o verification (using seaice): |
| 368 |
|
- switch back seaice-dynamics (+ lower SOLV_MAX_ITERS) in ADM exp. |
| 369 |
|
global_ocean.cs32x15.seaice ; update results. |
| 370 |
|
- compile B-grid dynamics in FW test exp 1D_ocean_ice_column ; |
| 371 |
|
- compile C-grid dynamics with #define SEAICE_ALLOW_JFNK in FW test exp |
| 372 |
|
offline_exf_seaice (previously compiling B-grid). |
| 373 |
|
o pkg/exf: |
| 374 |
|
- fix some STOP conditions in exf_check.F (from Aug 28, modifs did not allow |
| 375 |
|
to specify neither just 1 comp of wind or wind-stress, nor no surface momentum |
| 376 |
|
forcing): just replace CPP option ALLOW_ATM_WIND with run-time param useAtmWind. |
| 377 |
|
o pkg/layers (adjust changes from Sept 19): |
| 378 |
|
- do snap-shot output and fill diagnostics from inside iLa loop (layers_calc.F) |
| 379 |
|
this allows to remove "layers_maxNum" dimension from all layers arrays. |
| 380 |
|
o pkg/layers (adjust changes from Sept 19): |
| 381 |
|
- remove ALLOW_LAYERS_OUTPUT ; fix snap-shot and time-ave output ; |
| 382 |
|
- snap-shot extended to all type of layers (not just the 1rst type); |
| 383 |
|
- remove layers variables when corresponding CPP option is undef. |
| 384 |
|
o pkg/layers: |
| 385 |
|
- rename pkg/layers variable and add new output (layer exist & un-weighted |
| 386 |
|
velocity in layer) |
| 387 |
|
o pkg/seaice: |
| 388 |
|
- simplify (?) ocean-drag coefficent computations by using |
| 389 |
|
the same routine in all three solvers (saves some code lines) |
| 390 |
|
- remove global fields DRAGA and DRAGS from C-grid code and |
| 391 |
|
declare them locally in lsr.F (the only place where they are |
| 392 |
|
still used) |
| 393 |
|
- update AD output of lab_sea.evp (very sensitive anyway). |
| 394 |
|
o pkg/seaice: add Jacobian-free Newton Krylov solver for ice dynamics |
| 395 |
|
(Lemieux et al. 2010, 2012). Turn on with the usual SEAICE_ALLOW_JFNK |
| 396 |
|
and SEAICEuseJFNK=.true. A few things to note: |
| 397 |
|
- involves a FGMRES, that is parallel but very inefficient, |
| 398 |
|
because of many scalar products (global sums) in the Gram-Schmidt |
| 399 |
|
orthogonalization method. Needs to be replaced. Original code |
| 400 |
|
from J.-F. Lemieux |
| 401 |
|
- preconditioner for FGMRES is a stripped down version of LSOR |
| 402 |
|
- SOLV_MAX_ITERS is now used for LSOR as a solver and as a |
| 403 |
|
preconditioner. For the preconditioner, the default is set to 10. |
| 404 |
|
- Jacobian times vector is computed with finite differences |
| 405 |
|
- marginally related to JFNK-solver: add a smooth regularization for |
| 406 |
|
zeta with tanh that will improve convergence (Lemieux and Tremblay, |
| 407 |
|
2009) for any implicit solver (not implemented for EVP because EVP |
| 408 |
|
does not need this regularization in the first place). Define |
| 409 |
|
SEAICE_ZETA_SMOOTHREG in SEAICE_OPTIONS.h to use. |
| 410 |
|
o eesupp/src: |
| 411 |
|
- check in genmake2 that intrinsic S/R flush is available. |
| 412 |
|
- add S/R to flush IO unit (if intrinsic S/R flush is available) |
| 413 |
|
- flush standard & error msg unit before MPI termination |
| 414 |
|
- if debugMode, flush IO unit after printing msg |
| 415 |
|
o pkg/ctrl: |
| 416 |
|
- ctrl_unpack.F, ALLOW_GENARR3D_CONTROL code: fix missing argument in call |
| 417 |
|
to ctrl_set_unpack_xyz. |
| 418 |
|
|
| 419 |
|
checkpoint64 (2012/10/09) |
| 420 |
|
o pkg/shelfice |
| 421 |
|
- in mom_fluxform.F, mom_vecinv.F: |
| 422 |
|
CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid) |
| 423 |
|
Bug fix KappaRU -> KappaRV |
| 424 |
|
does not change verification/isomip but may change other setups |
| 425 |
|
(presumably constant KappaRU=KappaRV) |
| 426 |
|
- fix diagnostics SHIU/Vdrag (thanks to Tom Millgate) |
| 427 |
|
o pkg/obcs: |
| 428 |
|
- fixed some indexing bugs in obcs_seaice_sponge.F |
| 429 |
|
- added obcs relaxation subroutines for HSALT and HSNOW |
| 430 |
|
- changes verification/seaice_obcs/results/obcs_seaice_sponge.F |
| 431 |
|
o pkg/seaice: |
| 432 |
|
- add "multicategory" parameterization for snow in analogy to ice, |
| 433 |
|
default is off for now. |
| 434 |
|
o pkg/obcs: |
| 435 |
|
- added obcs_seaice_sponge.F for obcs relaxation of seaice variables; |
| 436 |
|
see verification/seaice_obcs/input.seaiceSponge for example application. |
| 437 |
|
- remove local commom bloc "OBCS_GLOBAL" in obcs_readparms.F and do all the OB |
| 438 |
|
index setting by master-thread. This fix multi-threads Pb in previous modifs. |
| 439 |
|
o pkg/layers : |
| 440 |
|
- add diagnostics to pkg/layers |
| 441 |
|
- move the meat of pkg/layers from layers_calc.F to layers_fluxcalc.F |
| 442 |
|
(from R.Tulloch). Layers_calc.F now calls layers_fluxcalc.F accordingly. |
| 443 |
|
o pkg/generic_advdiff/gad_implicit_r.F : |
| 444 |
|
- fix ADVr diagnostics in case of both implicit vertical advection and diffusion. |
| 445 |
|
o pkg/seaice/seaice_growth.F: |
| 446 |
|
- fix SItflux diagnostics in virtual salt flux + balanceEmpmr case. |
| 447 |
|
o pkg/obcs: |
| 448 |
|
- change default setting of OBCS_UVICE_OLD from defined to undef; |
| 449 |
|
- use new parameter OB_indexNone for null index value (instead of hard-coded 0) |
| 450 |
|
in all pkg/obcs code and in other pkgs; remove k loop in obcs_check_depths.F; |
| 451 |
|
- pass OB_indexNone as (new) argument to S/R CTRL_MASK_SET_[X,Y]Z; |
| 452 |
|
- change OB null index value (OB_indexNone) to -99 ; this fix the problem |
| 453 |
|
with Southern & Western OB at a tile edge (at least in a simple set-up). |
| 454 |
|
o pkg/obcs: |
| 455 |
|
- change settings of OB index in case OB coincides with tile edge (shared by |
| 456 |
|
2 tiles), so that common OB location is registered by both tiles (instead of |
| 457 |
|
only 1). However, for Southern and Western OB, index value = 0 is not |
| 458 |
|
recognized as valid OB index (=default null value) and needs to be fixed. |
| 459 |
|
- modify accordingly OBCS_BALANCE_FLOW and OBCS_MONITOR (avoid double counting) |
| 460 |
|
- new parameter "OB_indexNone" for null index value (for now, still zero) |
| 461 |
|
to replace hard-coded null index value of zero. |
| 462 |
|
o pkg/exch2: |
| 463 |
|
- improve W2_USE_E2_SAFEMODE (faster) and W2_E2_DEBUG_ON: |
| 464 |
|
always check buffer-size (but outside the loop); move checking for valid |
| 465 |
|
index from W2_USE_E2_SAFEMODE to W2_E2_DEBUG_ON; in W2_E2_DEBUG_ON, |
| 466 |
|
print each tile and point connection only if |W2_printMsg|>= 2 and 3. |
| 467 |
|
o pkg/ctrl (pack & unpack): |
| 468 |
|
- in ctrl_pack.F & ctrl_unpack.F, use the same local file-name variable |
| 469 |
|
(locally defined) for different variables (+ remove the variable-specific |
| 470 |
|
file name in CTRL_GENARR.h). For now, only implemented for GENARR2/3D_CONTROL |
| 471 |
|
(to be extended to other local file names in ctrl.h). |
| 472 |
|
o pkg/flt: |
| 473 |
|
- add a FLT_Iter0 option (similar to PTRACERS_Iter0). |
| 474 |
|
o pkg/mdsio: |
| 475 |
|
- fix missing STOP in mdsio_readvec_loc.F (case ioUnit=0) when file is missing |
| 476 |
|
o tools/genmake2: |
| 477 |
|
- add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE |
| 478 |
|
(added by Alistair in version 1.51 for building without make depend); |
| 479 |
|
- remove Header files list (H_SRC_FILES) from the dependence of targets |
| 480 |
|
ad_input_code.f & ftl_input_code.f (not clear why it was added in the first |
| 481 |
|
place in version 1.23): this save going through staf when unrelated header |
| 482 |
|
file has been modified. |
| 483 |
|
Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without |
| 484 |
|
"make depend" step, still need to do "make links" before "make adtaf". |
| 485 |
|
o eesupp/src (+ few pkg src files) & genmake2: |
| 486 |
|
- finish to remove ALWAYS_USE_MPI in source code that TAF does not see; |
| 487 |
|
- no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2). |
| 488 |
|
- improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish |
| 489 |
|
upper/lower case ; account for space between "#" and undef/define) |
| 490 |
|
o pkg/flt (with exch2): |
| 491 |
|
- cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F; |
| 492 |
|
- simplify threads synchronisation; fix (many issues) multi-threaded with MPI. |
| 493 |
|
|
| 494 |
|
checkpoint63s (2012/09/05) |
| 495 |
|
o pkg/ecco: |
| 496 |
|
- remove #ifdef ALLOW_SMOOTH_CORREL3D brackets. |
| 497 |
|
- add more relevant #ifdef ALLOW_SMOOTH ones. |
| 498 |
|
- sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D. |
| 499 |
|
o pkg/ctrl: |
| 500 |
|
- CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D, |
| 501 |
|
ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D. |
| 502 |
|
- ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag, |
| 503 |
|
doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and |
| 504 |
|
ctrlSmoothCorrel3D (new). |
| 505 |
|
The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP. |
| 506 |
|
- ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist. |
| 507 |
|
- ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress |
| 508 |
|
controls when useAtmWind, and vice versa. |
| 509 |
|
- ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers. |
| 510 |
|
- ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with |
| 511 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH. |
| 512 |
|
- ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with |
| 513 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH. |
| 514 |
|
- ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F: |
| 515 |
|
replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D. |
| 516 |
|
o pkg/smooth: |
| 517 |
|
- remove un-necessary includes. |
| 518 |
|
- remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets. |
| 519 |
|
Those CPP options were never defined, and not necessary. |
| 520 |
|
o model/src: |
| 521 |
|
- fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi). |
| 522 |
|
- standard treatment of useSMOOTH. |
| 523 |
|
o pkg/autodiff: |
| 524 |
|
- add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode, |
| 525 |
|
useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint. |
| 526 |
|
o pkg/exch2: |
| 527 |
|
- add "if usingMPI" where it was missing (in exch2_rx?_cube*.template) |
| 528 |
|
+ start to remove ALWAYS_USE_MPI in source code that TAF does not see. |
| 529 |
|
- make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag |
| 530 |
|
and tiles to process mapping. |
| 531 |
|
- re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h) |
| 532 |
|
moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h; |
| 533 |
|
rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX |
| 534 |
|
from w2_eeboot.F to w2_readparms.F. |
| 535 |
|
o eesupp/src: |
| 536 |
|
- set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of |
| 537 |
|
ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F; |
| 538 |
|
also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F |
| 539 |
|
- in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI |
| 540 |
|
is defined (remove condition on usingMPI) to match cases where MPI_INIT |
| 541 |
|
has been called. |
| 542 |
|
- fix bug I put in previous modif of exch_sm_3d_rx.template (not much used); |
| 543 |
|
- change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings |
| 544 |
|
(so that on 1 proc, get same myPid independently of usingMPI) |
| 545 |
|
- add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and |
| 546 |
|
useCubedSphereExchange with EXCH-1 (safer). |
| 547 |
|
- add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI). |
| 548 |
|
o pkg/ggl90: |
| 549 |
|
- fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call) |
| 550 |
|
used in ALLOW_GGL90_SMOOTH code. |
| 551 |
|
o pkg/flt: |
| 552 |
|
- fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping |
| 553 |
|
floats at the Southern end of the domain). |
| 554 |
|
o eesupp/inc: |
| 555 |
|
- add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h); |
| 556 |
|
but not used (and not to be used) anywhere, just for documentation. |
| 557 |
|
o pkg/autodiff, exf, ptracers & seaice (AD & TL output): |
| 558 |
|
- comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since: |
| 559 |
|
a) can damage previously written records in any other multi-record files. |
| 560 |
|
b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S. |
| 561 |
|
o tools/genmake2: |
| 562 |
|
- define variable MAKE within Makefile and use it in place of 'make'; |
| 563 |
|
- update AD_CONFIG.h (if needed) before building any of the executable |
| 564 |
|
(forward, adjoint or tangent-lin); this involves a 2nd invocation of make; |
| 565 |
|
and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h; |
| 566 |
|
- always print usual warning comment 'this file is automatically generated' |
| 567 |
|
from script convert_cpp_cmd2defines (+ remove this warning from genmake2). |
| 568 |
|
o pkg/cheapaml: |
| 569 |
|
- updated to correspond to the code used in accepted paper (Nico Wienders). |
| 570 |
|
o pkg/exf: |
| 571 |
|
added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. |
| 572 |
|
ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) |
| 573 |
|
and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). |
| 574 |
|
o pkg/exf, autodiff, ctrl, ecco and seaice: |
| 575 |
|
remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones. |
| 576 |
|
o pkg/ctrl, ecco: |
| 577 |
|
allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL. |
| 578 |
|
Depending on useAtmWind, one is inactive, and the other is active (see |
| 579 |
|
exf_getffields.F/exf_getsurfacefluxes.F). |
| 580 |
|
o tools/genmake2: |
| 581 |
|
- improve error msg when failing in 2nd test of check_for_broken_Ff |
| 582 |
|
- fix option '-makefile' short-name (-mf according to genmake2 -help) |
| 583 |
|
- source local config file "genmake_local" just after processing the genmake2 |
| 584 |
|
command arguments (previously done before processing arg). |
| 585 |
|
o pkg/grdchk: |
| 586 |
|
- add a call to TURNOFF_MODEL_IO for Tangent-Linear run (in this case, call |
| 587 |
|
to this routine from cost_final has been dropped in g_cost_final) |
| 588 |
|
- improve printed information (more explicit msg, no longer using "print *," |
| 589 |
|
fix fcpertminus printed value). |
| 590 |
|
o model/src: |
| 591 |
|
- move call to COST_INIT_VARIA out of packages_init_variables.F directly |
| 592 |
|
into initialise_varia.F (just after calling PACKAGES_INIT_VARIABLES): |
| 593 |
|
this prevents getting cost-funct reset in adinitialise_varia recomputations. |
| 594 |
|
o pkg/dic: |
| 595 |
|
- move initialisation of "freefe" array from from dic_biotic_forcing.F to |
| 596 |
|
fe_chem.F: this prevents TAF from dropping this initialisation in TLM code. |
| 597 |
|
o pkg/grdchk: |
| 598 |
|
- grdchk_main.F : added CALL GLOBAL_SUM_INT( ierr , myThid ) |
| 599 |
|
- grdchk_getadxx.F etc. : omit I/O if ierr.EQ.0 |
| 600 |
|
o pkg/autodiff/ctrl/grdchk : |
| 601 |
|
- attempt to sort out what works and what does not, |
| 602 |
|
with regard to I/O, and to warn/stop accordingly. |
| 603 |
|
o pkg/grdchk: |
| 604 |
|
- attempt to fix grdchk in the case of useSingleCpuIO. |
| 605 |
|
- "if ( myProcId .EQ. grdchkwhichproc .AND. ierr .EQ. 0 )" |
| 606 |
|
statements were moved from grdchk_main.F and into |
| 607 |
|
grdchk_getadxx.F grdchk_getxx.F grdchk_setxx.F. |
| 608 |
|
- a global sum is applied to record numbers icvrec/layer |
| 609 |
|
out of grdchk_loc so that they be passed to I/O routines. |
| 610 |
|
o pkg/smooth: |
| 611 |
|
- fix recomputation that appeared with nlfs : use smooth_recip_hFacC, |
| 612 |
|
smooth_hFacW, smooth_hFacS (copied at init_fixed) in 3d case. |
| 613 |
|
o verification/testreport: |
| 614 |
|
- add option '-tlm' for Tangent-Linear test (-adm,-oad,-tlm are all exclusive); |
| 615 |
|
- can also use compressed (gzip) reference output file; |
| 616 |
|
- change format (in pkg/grdchk) of TLM output (+ add forward gradient) |
| 617 |
|
to be easier to collect by testreport. |
| 618 |
|
- update existing TLM output (half out-of-date by more than 3 yrs). |
| 619 |
|
- report NETCDF & LAPACK settings (from genmake2) in output dir. |
| 620 |
|
- report run-time in each individual summary (previously only for AD test); |
| 621 |
|
for TLM test, add also TAF version. |
| 622 |
|
- add daily TLM test on (old) aces cluster + weekly test on baudelaire. |
| 623 |
|
|
| 624 |
|
checkpoint63r (2012/08/15) |
| 625 |
|
o tools/genmake2: |
| 626 |
|
- fix Makefile for target ftlall (+ update files to clean after make ftlall) |
| 627 |
|
o pkg/ecco/ecco_cost_final.F : |
| 628 |
|
- fix fc print statements (to stdout and costfunction0000) so |
| 629 |
|
that the printed value is always after the global sum. |
| 630 |
|
o pkg/seaice/seaice_dynsolver.F : |
| 631 |
|
- fix ice strength assymptote at SEAICE_area_max<1 |
| 632 |
|
(no change for the standard case of SEAICE_area_max=1) |
| 633 |
|
o some cleaning: |
| 634 |
|
- pkg source files: ensure that all *.F files from each pkg included the |
| 635 |
|
corresponding ${PKG}_OPTIONS.h file (except stand-alone src file which |
| 636 |
|
only includes CPP_EEOPTIONS.h); fix S/R CTRL_SMOOTH ; update AD experiment |
| 637 |
|
code_ad/*.F src files; add new option-file in pkg/admtlm + corresponding |
| 638 |
|
includes; |
| 639 |
|
- model/src: add PACKAGES_CONFIG.h wherever ALLOW_AUTODIFF[_TAMC] is used. |
| 640 |
|
- ALLOW_DIFFKR_CONTROL: add a stop in S/R CTRL_CHECK in case ALLOW_3D_DIFFKR |
| 641 |
|
is undef; also define /DYNVARS_DIFFKR/ common block in DYNVARS.h when |
| 642 |
|
ALLOW_DIFFKR_CONTROL is defined, to allow to compile and reach this stop. |
| 643 |
|
- update option-file CPP_OPTIONS.h of all AD experiments: |
| 644 |
|
* no longer include PACKAGES_CONFIG.h ; |
| 645 |
|
* includes ECCO_CPPOPTIONS.h if PACKAGES_CONFIG.h has been included ; |
| 646 |
|
* def/undef ALLOW_3D_DIFFKR independently of ALLOW_DIFFKR_CONTROL (before |
| 647 |
|
including ECCO_CPPOPTIONS.h). |
| 648 |
|
o pkg/cost, pkg/ctrl, pkg/ecco option-file: |
| 649 |
|
- clean-up and split content of old pkg/ecco/ECCO_CPPOPTIONS.h file into |
| 650 |
|
separated pkg option-file (done according to old doc from ECCO_CPPOPTIONS.h, |
| 651 |
|
not necessary accurate). |
| 652 |
|
- add a template for option-file ECCO_CPPOPTIONS.h, mostly empty, in |
| 653 |
|
pkg/autodiff, i.e., the 1rst pkg to compile for adjoint built, with lines to |
| 654 |
|
deliberately break compilation (a remainder that it needs to be customized) |
| 655 |
|
- in pkg/ecco, includes ECCO_OPTIONS.h instead of COST_OPTIONS.h |
| 656 |
|
- rename COST_CPPOPTIONS.h to COST_OPTIONS.h |
| 657 |
|
- rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h |
| 658 |
|
o tools/genamke2: |
| 659 |
|
- check for lapack. |
| 660 |
|
o pkg/cost and pkg/ecco : attempt to sort out some of the limiting intricacies. |
| 661 |
|
- pkg/cost.cost_final.F : allow for use of pkg/ecco and pkg/cost cost functions |
| 662 |
|
jointly. The exclusive ifdefs were removed, to add costs terms (when defined) |
| 663 |
|
from both packages. |
| 664 |
|
- the fc global sum in pkg/ecco/ecco_cost_final.F was removed accordingly. |
| 665 |
|
- for objf_atl we use either the pkg/ecco or the pkg/cost term depending on CPPs. |
| 666 |
|
- pkg/ecco and model/src : add CPP brackets around pkg/cost and pkg/ctrl includes |
| 667 |
|
of "CTRL_SIZE.h" "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly. |
| 668 |
|
o pkg/cost : add comments to explain special and/or untested setups. |
| 669 |
|
o pkg/exf: |
| 670 |
|
- use EXF_OPTIONS.h to set pkg/exf options except if done in ECCO_CPPOPTIONS.h |
| 671 |
|
(previously, ALLOW_AUTODIFF_TAMC was controling this switch). |
| 672 |
|
o verification/*/code_ad: |
| 673 |
|
mimimal cleaning of AD experiments ECCO_CPPOPTIONS.h option-file: |
| 674 |
|
- reccord when this file is included (define ECCO_CPPOPTIONS_H) |
| 675 |
|
- remove the most obvious obsolete features (e.g., #define ALLOW_COST not |
| 676 |
|
allowed since Oct 2003 in any option-file except in PACKAGES_CONFIG.h) |
| 677 |
|
o pkg/seaice : |
| 678 |
|
- added possibility to change ice strength/PRESS0 relationship to |
| 679 |
|
HEFF, according to the following run time parameters |
| 680 |
|
SEAICEpresPow0 :: HEFF exponent for ice strength below SEAICEpresH0 (integer, >0) |
| 681 |
|
SEAICEpresPow1 :: HEFF exponent for ice strength above SEAICEpresH0 (integer, >0) |
| 682 |
|
SEAICEpresH0 :: HEFF threshold for ice strength (m) |
| 683 |
|
o pkg/ggl90 : |
| 684 |
|
- added run time flag mxlSurfFlag to include the code that ensure |
| 685 |
|
mixing between first and second level (previously included as a comment) |
| 686 |
|
o verification/1D_ocean_ice_column/input_ad/data.autodiff : |
| 687 |
|
- add test of newly added dumpAdByRec=T option where |
| 688 |
|
we write all records to one file per variable. |
| 689 |
|
o verification/global_ocean.cs32x15/code_ad/CPP_OPTIONS.h : |
| 690 |
|
- switch to #define ALLOW_BALANCE_RELAX and ALLOW_BALANCE_FLUXES |
| 691 |
|
to check that this code is ok with taf and compiles in adjoint. |
| 692 |
|
o pkg/autodiff : |
| 693 |
|
- added run time param dumpAdByRec : ad dump format switch. |
| 694 |
|
If true then write all records to one file per variable. |
| 695 |
|
Else write one file per record (remains the default). |
| 696 |
|
- revise seaice_ad_dump.F and exf_adjoint_snapshots_ad.F accordingly. |
| 697 |
|
o pkg/seaice: |
| 698 |
|
- Added SEAICEuseTILT run time switch : if set to |
| 699 |
|
false then omit the tilt term in seaice dynamics. |
| 700 |
|
- Fix free drift calculation. |
| 701 |
|
o pkg/shelfice: |
| 702 |
|
When initializing SHELFICEDragQuadratic, set default to be |
| 703 |
|
consistent with shiCdrag in case SHELFICEuseGammaFrict is used, |
| 704 |
|
but retain option to set it independently |
| 705 |
|
(inconsistenty spotted by Veronique Dansereau) |
| 706 |
|
o eesupp/inc: |
| 707 |
|
- in EEPARAMS.h, add real-type constant for some frequently used simple number |
| 708 |
|
(0,1,2,1/2), with name explicitly referring to RS/RL type. |
| 709 |
|
o model/src: |
| 710 |
|
- move balancing of relaxation terms to new S/R balance_relax.F. |
| 711 |
|
o pkg/autodiff: |
| 712 |
|
re-write active I/O high-level (control) S/R: |
| 713 |
|
- rename S/R ACTIVE_READ/WRITE_RL to ACTIVE_READ/WRITE_3D_RL |
| 714 |
|
- add 1 more argument (useCurrentDir) to replace the "_LOC" 2nd set of S/R. |
| 715 |
|
- use standard pkg/mdsio I/O routines (MDS_READ/WRITE_SEC_XZ/YZ and |
| 716 |
|
MDS_READ/WRITE_FIELD); change loops to multi-threads. |
| 717 |
|
- update and merge active_file_control_slice.flow into active_file_control.flow |
| 718 |
|
- update the calls in lower level S/R (active_file.F, active_file_g.F and |
| 719 |
|
active_file_ad.F) keeping the argument list and function unchanged. |
| 720 |
|
- also update lower-level "_LOC" version (call same S/R with "useCurrentDir |
| 721 |
|
=.TRUE.") and remove high-level (control) _loc version (not called anymore). |
| 722 |
|
- new low-level active I/O routines, one for each type (RL/RS), for active var |
| 723 |
|
of various (XY,XZ,YZ) shape and level number (arguments: arrShape, myNr); |
| 724 |
|
fix ctrl_init_wet.F & ecco_cost_weights.F by calling the new S/R with the |
| 725 |
|
right type. |
| 726 |
|
o autodiff and RS=real*4: |
| 727 |
|
- call the right type (_RS instead of _RL) of S/R in few output S/R (pkg/exf |
| 728 |
|
ad-monitor and snapshots); disable arrType='RS' in mdsio_gl*.F ; |
| 729 |
|
- change argument type of 3-D mask argument to _RS to match type in the call |
| 730 |
|
(in seaice_cost*.F, ctrl_*_gen.F and *ctrl_bound.F); to be continued. |
| 731 |
|
o pkg/thsice: |
| 732 |
|
- re-anable balanceEmPmR when useSEAICE=T with useThSIce=T. |
| 733 |
|
- option to correct ocean fresh-water flux for imbalance of Atmos+Land |
| 734 |
|
fresh-water flux: uniform correction or proportional to local precip. |
| 735 |
|
o pkg/ctrl: |
| 736 |
|
- new header file CTRL_SIZE.h for parameters maxCtrlArr2D, maxCtrlArr3D |
| 737 |
|
- redefine CPP option ALLOW_BOTTOMDRAG_CONTROL to |
| 738 |
|
ALLOW_BOTTOMDRAG_CONTROL_NONGENERIC |
| 739 |
|
- verification/hs94.1x64x5/ tests ALLOW_GENARR{2D,3D}_CONTROL |
| 740 |
|
|
| 741 |
|
checkpoint63q (2012/07/30) |
| 742 |
|
o pkg/autodiff: |
| 743 |
|
note about monitor and snap-shot of ad-variables: |
| 744 |
|
a) need to apply ADEXCH before monitor or output of ad-vars to include |
| 745 |
|
overlap contributions (was done for adjDump but missing for monitor). |
| 746 |
|
b) since ADEXCH implies adding overlap values to interior array, machine |
| 747 |
|
truncation error is expected when adding an ADEXCH call in the middle of |
| 748 |
|
the time-stepping (although mathematically identical). |
| 749 |
|
modifs: |
| 750 |
|
- fix some incorrect type (RL/RS, UV/scalar) in ADEXCH calls and ad-vars |
| 751 |
|
declaration (adEddyPsiX,adEddyPsiY in adcommon.h). |
| 752 |
|
- add new run-time params (dumpAdVarExch & mon_AdVarExch) to select how to |
| 753 |
|
apply ADEXCH before monitor or snap-shot of ad-variables: |
| 754 |
|
=0 : no ADEXCH ; =1 : do ADEXCH ; =2 : apply ADEXCH on a local copy. |
| 755 |
|
- implement new method (copy+adexch) for snap-shot and monitor of main model |
| 756 |
|
ad-vars (initially not used by default -> output unchanged). |
| 757 |
|
- change default (set to 2) to use new method and update few output_adm.txt |
| 758 |
|
with accurate ad-monitor (global_ocean.90x40x15, tutorial_global_oce_biogeo |
| 759 |
|
and both tutorial_tracer_adjsens tests). |
| 760 |
|
- switch 2 global_ocean.cs32x15 AD-tests to AB-2 (seaice_dynmix & thsice) |
| 761 |
|
and turn off momDissip_In_AB in the 2 other (needed for stable AB-3). |
| 762 |
|
o pkg/ctrl: |
| 763 |
|
enable the use of a variable number (maxCtrlArr2D, maxCtrlArr3D) of |
| 764 |
|
generic control variables via |
| 765 |
|
#define ALLOW_GENARR2D_CONTROL and/or #define ALLOW_GENARR3D_CONTROL |
| 766 |
|
Only required customization should be S/R ctrl_map_ini_genarr.F |
| 767 |
|
(routine in repository contains example) |
| 768 |
|
o pkg/exf: |
| 769 |
|
- fix and refine checking of surface-relaxation setting when using EXF |
| 770 |
|
o verification (adjoint exp): |
| 771 |
|
- reduce length of simulation by half for experiment global_ocean.cs32x15 |
| 772 |
|
(std, seaice & seaice_dynmix) and exp tutorial_dic_adjoffline; update output. |
| 773 |
|
o pkg/mom_common (mom_u/v_bottomdrag), pkg/shelfice (shelfice_u/v_drag) |
| 774 |
|
- replace if statements KE.ne.0 with KE.gt.0 to avoid sqrt of negative numbers |
| 775 |
|
of KE that can occur with aggressive optimization |
| 776 |
|
+ put quadratic bottom drag calculation in separated loops (only done if |
| 777 |
|
using bottomDragQuadratic) |
| 778 |
|
o model/src: CG2D_NSA |
| 779 |
|
- clean-up: stop if cg2dNormaliseRHS=T and AUTODIFF |
| 780 |
|
and replace GLOBAL_SUM calls with GLOBAL_SUM_TILE. |
| 781 |
|
- in test-exp that uses CG2D_NSA (bottom_ctrl & tutorial_tracer_adjsens), |
| 782 |
|
change cg2d residual target to be expressed in Wunits (=> do not normalise |
| 783 |
|
RHS ; this fix global_max Pb with TAF); update output. |
| 784 |
|
o verification/tutorial_tracer_adjsens: |
| 785 |
|
improve parameter consistency (and get rid of warnings): |
| 786 |
|
- use deltaTFreeSurf=deltaTtracer (better with NonLin FreeSurf); |
| 787 |
|
- switch Temp Adv Scheme from 81 to 80 (no limiter since theta < 0 is physical) |
| 788 |
|
- use staggerTimeStep (for stability) in som81; use default rotation period. |
| 789 |
|
o pkg/exch2: |
| 790 |
|
- with empty facet: fix compact-format (W2_mapIO=1) definition (was previously |
| 791 |
|
reset to 0 = 1 long line in X) |
| 792 |
|
o pkg/mdsio: |
| 793 |
|
- fix reading of dimensions from meta file for large-size domain |
| 794 |
|
o model/src: |
| 795 |
|
- fix saltIsActiveTr setting for IdealGas eosType (eosType is 6 character long); |
| 796 |
|
- to refine CS-grid check, add logical flag "hasWetCSCorners": true if using |
| 797 |
|
Cubed-Sphere Exch with CS-corners inside the domain; |
| 798 |
|
make new S/R INI_GLOBAL_DOMAIN from code in ini_linear_phisurf.F to calculate |
| 799 |
|
globalArea and to set hasWetCSCorners. |
| 800 |
|
- add warning if usingCurvilinearGrid and momAdvection in flux-form (missing |
| 801 |
|
metric terms); stop if hasWetCSCorners=T and momAdvection in flux-form. |
| 802 |
|
- re-activate the stop if useCDscheme and hasWetCSCorners=T (previously if |
| 803 |
|
useCDscheme and useCubedSphereExchange). |
| 804 |
|
o pkg/seaice/seaice_growth.F : |
| 805 |
|
- compute the SEAICE_DISABLE_HEATCONSFIX term accordingly |
| 806 |
|
for the (.NOT.useRealFreshWaterFlux).OR.(nonlinFreeSurf.EQ.0) |
| 807 |
|
when the previous code was not correct. |
| 808 |
|
- in all cases diagnoze the boundary condition mismatch to SIaaflux |
| 809 |
|
- in the case of useRealFreshWaterFlux.AND.(nonlinFreeSurf.GT.0) add |
| 810 |
|
that term to QNET (essentially to set the melt/freeze water to 0degC). |
| 811 |
|
when SEAICEheatConsFix is true, so that the ocean+ice budget heat is closed. |
| 812 |
|
o verification/global_ocean.cs32x15/input.seaice : |
| 813 |
|
- add SEAICEheatConsFix in data.seaice, ensuring closed ocean+ice heat budget. |
| 814 |
|
- add diagnostics (commented out) for budget test using my matlab codes (gcmfaces). |
| 815 |
|
- update results (output.seaice.txt) accordingly. |
| 816 |
|
o verification/lab_sea/input/data.seaice : |
| 817 |
|
- remove SEAICEheatConsFix, which is now be tested |
| 818 |
|
in global_ocean.cs32x15. The presently coded fix |
| 819 |
|
is only consistent with real fresh water + nlfs. |
| 820 |
|
- update results (output.txt) accordingly. |
| 821 |
|
o pkg/salt_plume: added diagnotic for salt tendency (oceSPtnd). |
| 822 |
|
o AD_CONFIG.h file: |
| 823 |
|
- in genmake2: remove "#undef ALLOW_ECCO_OPTIMIZATION" from AD_CONFIG.h; |
| 824 |
|
- remove #include "AD_CONFIG.h" from all included OPTIONS files and |
| 825 |
|
add it explicitly in each fortran src file where it is needed. |
| 826 |
|
motivation: header file AD_CONFIG.h is generated/modified after "make depend" |
| 827 |
|
thus introducing potentially wrong dependency; therefore, better to include |
| 828 |
|
it only where it's really needed, and after any other included OPTIONS file |
| 829 |
|
(less tempting to bring conditional includes according to ALLOW_ADJOINT_RUN |
| 830 |
|
or ALLOW_TANGENTLINEAR_RUN). |
| 831 |
|
|
| 832 |
|
checkpoint63p (2012/07/06) |
| 833 |
|
o pkg/autodiff: |
| 834 |
|
- rename S/R INI_AUTODIFF to AUTODIFF_INIT_VARIA ; |
| 835 |
|
- create new header file "AUTODIFF_PARAMS.h" for pkg/autodiff parameters |
| 836 |
|
which are now read from new parameter file "data.autodiff" (inAdExact |
| 837 |
|
previously in "data", use{KPP/GMRedi/SEAICE}inAdMode previously in data.pkg) |
| 838 |
|
- add file "data.autodiff" in all verification/*/input_ad/ directories. |
| 839 |
|
- add run-time parameter to turn On/Off SEAICEuseFREEDRIFT in adjoint/forward |
| 840 |
|
mode (used in global_ocean.cs32x15.seaice_dynmix test exp.) |
| 841 |
|
o verification/tutorial_tracer_adjsens/ |
| 842 |
|
- add extra sub-verification which uses "SOM" advection scheme |
| 843 |
|
(2nd Order-Moment Advection Scheme, Prather Limiter) with |
| 844 |
|
#define GAD_ALLOW_TS_SOM_ADV in GAD_OPTIONS.h |
| 845 |
|
and in data: |
| 846 |
|
multiDimAdvection=.TRUE., |
| 847 |
|
tempAdvScheme=81, |
| 848 |
|
saltAdvScheme=81, |
| 849 |
|
o model/src: |
| 850 |
|
- introduce ALLOW_BALANCE_RELAX which allow the removal |
| 851 |
|
of the global mean of relaxation terms by setting |
| 852 |
|
balanceThetaClimRelax and balanceSaltClimRelax |
| 853 |
|
- disable balanceEmPmR and balanceQnet in the case when useSeaice. |
| 854 |
|
This case is now treated appropriately in seaice_growth.F |
| 855 |
|
o pkg/seaice: |
| 856 |
|
- do balanceEmPmR and balanceQnet based on the net fluxes |
| 857 |
|
(SItflux) that enter the ocean+ice system rather than QNET |
| 858 |
|
and EMPMR. Works best in real fresh water. |
| 859 |
|
- SIatmFW, SIatmQnet, and SItflux computations had to be moved |
| 860 |
|
out of the diagnotics bloc, and stored in global arrays. |
| 861 |
|
|
| 862 |
|
checkpoint63o (2012/06/29) |
| 863 |
|
o vertical mixing schemes: |
| 864 |
|
- remove unused S/R CALC_BUOYANCY (left from branch-atmos merging) |
| 865 |
|
- replace computation of density (in Function STATE1, opps_calc.F) by a call |
| 866 |
|
to S/R FIND_RHO_SCALAR |
| 867 |
|
- pass sigmaR to S/R PP81_CALC, MY82_CALC (but not yet used) and to GGL90_CALC |
| 868 |
|
and use it for N^2 calculation in ggl90_calc.F (save 2 density computations); |
| 869 |
|
affects output (vermix.ggl90) at truncation level. |
| 870 |
|
o testreport: |
| 871 |
|
- change adjustment of SIZE.h for mpi+mth testing: preserve enough tiles |
| 872 |
|
(nSx,nSy) for the number of threads (from eedata.mth) |
| 873 |
|
o model/src: |
| 874 |
|
- remove 2nd set of calls at the top of initialise_varia.F (Adjoint part) |
| 875 |
|
related to Non_Lin Free-Surf or Bottom-Control (but not longer necessary). |
| 876 |
o verification/tutorial_tracer_adjsens/ |
o verification/tutorial_tracer_adjsens/ |
| 877 |
- compile with ALLOW_CG2D_NSA |
- compile with ALLOW_CG2D_NSA |
| 878 |
- run with nonlinFreeSurf=3 |
- run with nonlinFreeSurf=3 |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch