| 2 |
|
|
| 3 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 4 |
============================== |
============================== |
| 5 |
|
|
| 6 |
|
ecco_c44_e27 |
| 7 |
|
o exf: |
| 8 |
|
- Enable initialisation of forcing fields to constant |
| 9 |
|
(runtime) values. |
| 10 |
|
- in exf_getffields.F |
| 11 |
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
| 12 |
|
That also fixes wrong TAF-key computations for key_1, key_2 |
| 13 |
|
with bulf formulae. |
| 14 |
|
- exf_init.F modify #ifdef for exf_init_evap |
| 15 |
|
- exf_getffieldrec.F, ctrl_getrec.F |
| 16 |
|
The following INT-usages are not safe: |
| 17 |
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
| 18 |
|
fldcount = int(fldsecs/fldperiod) + 1 |
| 19 |
|
and were modified. |
| 20 |
|
o grdchk: updated and merged |
| 21 |
|
- has both ADM and TLM checks |
| 22 |
|
- works for single- and multi-proc. |
| 23 |
|
- output cleaned |
| 24 |
|
- worked successfully for parallel DIVA |
| 25 |
|
Needed one update in EEPARAMS.h and updates in ctrl package |
| 26 |
|
More modif's may be necessary for ECCO code to support TLM. |
| 27 |
|
o autodiff: checkpoint_lev... |
| 28 |
|
- updated storing for bulk formulae (some arrays were missing) |
| 29 |
|
- added state for seaice package |
| 30 |
|
- synchronized with main branch |
| 31 |
|
o DIVA: |
| 32 |
|
Modif.s in |
| 33 |
|
- cost_init.F |
| 34 |
|
- cost_averagesfields.F |
| 35 |
|
- ecco_the_main_loop.F |
| 36 |
|
- ecco_the_model_main.F |
| 37 |
|
and added cost_final_restore.F cost_final_store.F |
| 38 |
|
o With these changes, it is possible to fully separate |
| 39 |
|
the first forward run to compute the cost function (mdthe_main_loop) |
| 40 |
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
| 41 |
|
into separate model executions. |
| 42 |
|
This enables better tuning of DIVA to given queue sizes. |
| 43 |
|
o Loss of cost function value in consecutive DIVA runs is |
| 44 |
|
fixed by storing to 'costfinal' file. |
| 45 |
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
| 46 |
|
beginning/end of adjoint integration is accounted for. |
| 47 |
|
The current changes apply to TAF-1.4.26. |
| 48 |
|
TAF has one remaining bug, requiring one manual change |
| 49 |
|
(see MITgcm manual). |
| 50 |
|
o bug fix plus modif for ubar, vbar in cost_averagesfields |
| 51 |
|
|
| 52 |
|
icebear4 |
| 53 |
|
o Added cost_ice for sea-ice volume sensitivity experiment. |
| 54 |
|
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
| 55 |
|
o Reduced derivative singularities in pkg/seaice. |
| 56 |
|
o Updated verification/natl_box_adjoint |
| 57 |
|
|
| 58 |
|
icebear3 |
| 59 |
|
o Removed spurious iikey and idkey |
| 60 |
|
o pkg/exf |
| 61 |
|
- bug fix in treatment of downward radiation |
| 62 |
|
o pkg/seaice |
| 63 |
|
- added initial sea-ice thickness parameter SEAICE_initialHEFF |
| 64 |
|
o updated verification/natl_box_adjoint |
| 65 |
|
|
| 66 |
|
icebear2 |
| 67 |
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
| 68 |
|
kpp_transport_t.F,and ecco_the_main_loop.F |
| 69 |
|
o adjoint-friendly modifications to pkg/seaice |
| 70 |
|
o added verification/lab_sea as per release1_p12_pre |
| 71 |
|
|
| 72 |
|
ecco_c44_e26 |
| 73 |
|
o Merging pkg/exf and pkg/seaice from cvs tag ecco_ice2 |
| 74 |
|
o exf: Modifications to correctly handle evap field for adjoint |
| 75 |
|
o grdchk: |
| 76 |
|
Added code to perform gradient checks for bulk formulae/atmos. state |
| 77 |
|
(atemp, aqh, uwind, vwind). |
| 78 |
|
NOTE: |
| 79 |
|
This package is out of synch with c48 package. |
| 80 |
|
The latter also has the tangent linear gradient checks. |
| 81 |
|
Need to be merged. |
| 82 |
|
o verification/natl_box_adjoint: |
| 83 |
|
* added new setup: code_bulk/, input_bulk, results_bulk |
| 84 |
|
(Experiment 2, described in README) |
| 85 |
|
uses bulk formulae and atmos. state as control instead of |
| 86 |
|
air-sea fluxes. |
| 87 |
|
Performs gradient checks for first 4 elements of atemp control. |
| 88 |
|
* changed standard verification to perform |
| 89 |
|
gradient checks on first 4 elements on hflux control. |
| 90 |
|
* gmredi switched off (will come after merge with c48). |
| 91 |
|
|
| 92 |
|
ecco_c44_e25 |
| 93 |
|
o Merging some GM changes from main trunk (c47) to ecco-branch. |
| 94 |
|
o Updating verif. natl_box_adjoint with GMRedi. |
| 95 |
|
o Adding setup with explicit differentiaton of pressure solver. |
| 96 |
|
o Bug fix: missing OBCS_OPTIONS.h for sponge layer code. |
| 97 |
|
o (Re-?) Commiting old bug fixes in kpp to ecco-branch |
| 98 |
|
(kpp_calc.F, kpp_routines.F) |
| 99 |
|
o exf: |
| 100 |
|
updated external forcing package |
| 101 |
|
- cleaned old exfa stuff |
| 102 |
|
- bug fixes |
| 103 |
|
(missing OBCS_OPTIONS.h in two routines) |
| 104 |
|
- enable easy to use "no forcing". |
| 105 |
|
- added exf I/O for atmospheric loading |
| 106 |
|
- added exf I/O for runoff data |
| 107 |
|
- transfered scaling between exf <-> MITgcm to exf namelist |
| 108 |
|
|
| 109 |
|
ecco_c44_e24 |
| 110 |
|
o modifications to gradient check package (Martin Losch) |
| 111 |
|
- enable centered differences |
| 112 |
|
- modified format of standard output |
| 113 |
|
o bug fix for nwettile contents |
| 114 |
|
so far assumed global sum in first entry (1,1,k), |
| 115 |
|
needed for global control vector |
| 116 |
|
-> introduced new variable nwet[c/w/s]global(nr) |
| 117 |
|
o shifts of calls to cal/exf package to be accessible |
| 118 |
|
in MITgcm stand-alone |
| 119 |
|
o shifted packages_init_variables before convective_adjustment_ini |
| 120 |
|
(corresponding update of TAF tape initialisation). |
| 121 |
|
o removed auxiliary field in impldiff |
| 122 |
|
(caused numerical differences for GMRedi cases) |
| 123 |
|
o updated obcs control part (G. Gebbie) |
| 124 |
|
o removed some f90 comments ("!") |
| 125 |
|
o Bug fixes and updates in cost package |
| 126 |
|
* cost_final: correct multiplier mult_tauv, mult_sflux |
| 127 |
|
* cost_hyd: added call cost_ssh |
| 128 |
|
* cost_init_barfiles.F: replaced arrays by tmpfld's |
| 129 |
|
* cost_readtopexmean.F: ersmask -> tpmeanmask |
| 130 |
|
* cost_weights.F: corrected wtheta[2], wsalt[2] |
| 131 |
|
o cleaned exchanges in cg2d.F |
| 132 |
|
|
| 133 |
|
ecco_c44_e23 |
| 134 |
|
merged patches between release1_p1 and release1_p2: |
| 135 |
|
o fixed array boundary problem for adjoint |
| 136 |
|
(related to partial recomputation within subroutine |
| 137 |
|
related to dynamics -> calc_viscosity -> mom_... |
| 138 |
|
o fixed recomputation in thermodynamics |
| 139 |
|
o prepare (but not complete) recomputation problem in impldiff |
| 140 |
|
o fixed problem for adjoint of global_max |
| 141 |
|
o switched off sponge layer code in external_forcing |
| 142 |
|
Bug fix in ctrl_mask_set_yz (spotted by G. Gebbie) |
| 143 |
|
|
| 144 |
|
ecco_c44_e22 |
| 145 |
|
o Finally, the merges with the Scripps cost function terms: |
| 146 |
|
Various additions, modifications, quality checks. |
| 147 |
|
o Plus: Included switch ALLOW_AUTODIFF_MONITOR to handle |
| 148 |
|
monitoring of adjoint state. |
| 149 |
|
o Plus: removed comm_stats, ini_communication_patterns from diff. list |
| 150 |
|
(no more need to "keep" MPI headers for adjoint generation) |
| 151 |
|
o Plus: exf changes: |
| 152 |
|
o added run-off routine |
| 153 |
|
o additional storing needed for ustress,vstess |
| 154 |
|
because of state-dependent quality check |
| 155 |
|
o added missing initialisations |
| 156 |
|
o Plus: genmake with MAKEDEPEND variable was still missing in ecco-branch |
| 157 |
|
NB: - verification/natl_box_adjoint/ 240 steps run |
| 158 |
|
* looks ok under Linux (twain.lcs.mit.edu) |
| 159 |
|
* looks ok on MIT SUN's (fjord.mit.edu) |
| 160 |
|
* NaN in reverse mode on Scripps SUN's at iter=214 |
| 161 |
|
* NaN in reverse mode on IBM SP3 (BlueHorizon) at iter=204 |
| 162 |
|
- 1 year forward int. global 2x2 deg. produces similar cost functions |
| 163 |
|
* all cost terms of new code are slightly smaller (0.5 to 3%). |
| 164 |
|
|
| 165 |
|
ecco_c44_e21 |
| 166 |
|
o reversed order of ctrl/cost initialisation |
| 167 |
|
o gmredi_slope_psi.F: Inconsistent types in MIN/MAX expressions |
| 168 |
|
o modified to enable ctrl field swapping |
| 169 |
|
o bug fix for global sum of ncvarlength in ctrl_init |
| 170 |
|
o no more call to ctrl_unpack from ctrl_init |
| 171 |
|
o no more write of ctrl vector in ctrl_pack |
| 172 |
|
however, init. of control vector from ctrl_unpack |
| 173 |
|
o various bug fixes & consistent nobcs handling in |
| 174 |
|
ctrl_pack/unpack routines (by G. Gebbie) |
| 175 |
|
o optim package: Added obcs control part for lsopt I/O |
| 176 |
|
(by G. Gebbie) |
| 177 |
|
o missing call to obcs_diags |
| 178 |
|
o moved calls in packages_init_fixed to packages_readparms |
| 179 |
|
because some quantities are needed earlier. |
| 180 |
|
|
| 181 |
|
ecco_c44_e20 |
| 182 |
|
o before major merges from the Scripps setup |
| 183 |
|
here are two small updates: |
| 184 |
|
- field swapping for surface flux controls enabled |
| 185 |
|
(remains t.b.d. for atmos. state plus obcs) |
| 186 |
|
- bug fix in active_file.F for xz-/yz- routines |
| 187 |
|
- added missing xz-/yz- routines to active_file_ad.F |
| 188 |
|
|
| 189 |
|
ecco_c44_e19 |
| 190 |
|
o merged necessary patches: |
| 191 |
|
- AD-related changes for GMRedi |
| 192 |
|
- fixes i KPP (delZ -> drF) |
| 193 |
|
- hook to OBCS songe layer code in external_forcing |
| 194 |
|
- errorMessageUnit non-zero in eeboot.F |
| 195 |
|
- included GMREDI, EXACT_CONSERV to natl_box_adjoint verif. |
| 196 |
|
|
| 197 |
|
ecco_c44_e18 |
| 198 |
|
o sponge layer code for obcs was missing |
| 199 |
|
- added hook in external_forcing.F |
| 200 |
|
- added storing for TAF |
| 201 |
|
o new routine cost_init_barfiles to initialise |
| 202 |
|
adjoint fields adtbar, adsbar, adpsbar |
| 203 |
|
(needed in conjunction with corrected ladinit for active I/O) |
| 204 |
|
o cleaned up and corrected order in packages_readparms, ecco_readparms |
| 205 |
|
o corrected and simplified weights for obcs controls |
| 206 |
|
- weight fields simplified |
| 207 |
|
- bug fix in ctrl_pack |
| 208 |
|
- no more write of control vector in ctrl_pack |
| 209 |
|
o i/j index bug fixes in cost_ssh_mean |
| 210 |
|
|
| 211 |
|
ecco_c44_e17 |
| 212 |
|
o bug fixes in cost package |
| 213 |
|
* wrong identifier for active I/O of monthly mean psbar |
| 214 |
|
(cost_averagesfields, cost_ssh) xx_psbar_dummy |
| 215 |
|
* cleaned all identifier for active I/O of monthly fields |
| 216 |
|
* wrong ladinit in various cost routines |
| 217 |
|
o merge with interval (chkpt44c_post - chkpt44d_post) |
| 218 |
|
* added missing EXCLUDE_MONITOR flags |
| 219 |
|
* changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
| 220 |
|
(incompatible typ in MIN/MAX expressions caused problems |
| 221 |
|
on IBM SP3) |
| 222 |
|
* in genmake added variable MAKEDEPEND |
| 223 |
|
plus resetting for case SunOS |
| 224 |
|
added timer_stats.c routine for IBM SP3 |
| 225 |
|
* removed variables in dynamics |
| 226 |
|
|
| 227 |
|
ecco_c44_e16 |
| 228 |
|
o new ECCO checkpoint, the first since ecco_c43_e15 |
| 229 |
|
which is branched from MITgcm. |
| 230 |
|
All changes were merged in between (see ecco-branch-mod? tags). |
| 231 |
|
o last changes: |
| 232 |
|
* assuming path for TAF and TAMC are known (e.g. in $path) |
| 233 |
|
* genmake: |
| 234 |
|
- added tools/xmakedepend to circumvene shortcoming of |
| 235 |
|
SUN's makedepend (size too small) |
| 236 |
|
- invoking ../tools/xmakedepend instead of makedepend |
| 237 |
|
- changed compiler flags for case SunOS |
| 238 |
|
|
| 239 |
|
ecco-branch-mod5 |
| 240 |
|
o mod's to reproduce open boundary run |
| 241 |
|
o enable field swapping for OB's and climatology |
| 242 |
|
o update store directives for OB control |
| 243 |
|
o added option ALLOW_OBCS_PRESCRIBE |
| 244 |
|
o call of getobcs now out of obcs_calc (param. list modified) |
| 245 |
|
|
| 246 |
|
ecco-branch-mod4 |
| 247 |
|
o this is the second part of changes necessary to reconcile |
| 248 |
|
the natl_box_adjoint verification (with and without grdchk). |
| 249 |
|
>>>!!! CHANGES BETWEEN THE TAGS ecco-branch-mod3 !!!<<< |
| 250 |
|
>>>!!! AND ecco-branch-mod4 !!!<<< |
| 251 |
|
>>>!!! SHOULD BE MERGED INTO THE MAIN TRUNK !!!<<< |
| 252 |
|
- genmake: removed $S64 overwrite for case SunOS |
| 253 |
|
- pkg/exf: update and corrections for field swapping and obcs |
| 254 |
|
- pkg/ecco: parameter lists for the_model_main, the_main_loop |
| 255 |
|
harmonized between ECCO and MITgcm |
| 256 |
|
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice |
| 257 |
|
updated checkpointing_lev... lists for obcs |
| 258 |
|
- model/src: minor changes in forward_step, plot_field |
| 259 |
|
- pkg/mdsio: added mdsio_gl_slice |
| 260 |
|
|
| 261 |
|
ecco-branch-mod3 |
| 262 |
|
o this is the first part of changes necessary to reconcile |
| 263 |
|
natl_box_adjoint verification (with and without grdchk). |
| 264 |
|
This set of changes is relevant for ECCO only. |
| 265 |
|
The next set/tag of changes (ecco-branch-mod4) |
| 266 |
|
should be merged into the main trunk. |
| 267 |
|
- update some options |
| 268 |
|
- parameter lists of ecco_the_model_main and ecco_the_main_loop |
| 269 |
|
differed from those of the MITgcm counterparts. |
| 270 |
|
|
| 271 |
|
ecco-branch-mod2 |
| 272 |
|
o update ecco-branch-mod1 to checkpoint44 |
| 273 |
|
o exclude from updates: |
| 274 |
|
- verification/ |
| 275 |
|
- adjoint/ |
| 276 |
|
- pkg/cost |
| 277 |
|
- pkg/ctrl |
| 278 |
|
- pkg/ecco |
| 279 |
|
- pkg/obcs |
| 280 |
|
- model/src/the_model_main.F |
| 281 |
|
- model/src/the_main_loop.F |
| 282 |
|
|
| 283 |
|
checkpoint44 |
| 284 |
|
o apply Shapiro filter on T&S before calc_PhiHyd (stagger time stepping) |
| 285 |
|
o fix bug in mom_vi_del2uv |
| 286 |
|
o added some stuff for AD |
| 287 |
|
|
| 288 |
|
ecco-branch-mod1 |
| 289 |
|
o based on c43 |
| 290 |
|
o replaced packages cost, ctrl, ecco, obcs |
| 291 |
|
o removed MITgcm verif.'s, added ECCO verif.'s |
| 292 |
|
o added lsopt, optim for line search optimization. |
| 293 |
|
|
| 294 |
|
checkpoint43 |
| 295 |
|
o added two new advection tests |
| 296 |
|
o added global 4x4 degree ocean test |
| 297 |
|
o added test of H&S94 with free surface on cube |
| 298 |
|
o some final mods for gradient check, adjoint,... |
| 299 |
|
|
| 300 |
|
checkpoint42 |
| 301 |
|
Fixed AD-related problems: |
| 302 |
|
o Store directives up-to-date with re-arranged Adams-Bashforth |
| 303 |
|
(mainly thermodynamics.F) |
| 304 |
|
o New store directives for multi-dim. advection schemes |
| 305 |
|
* new CPP flag ALLOW_MULTI_DIM_ADVECTION |
| 306 |
|
* new common block and key passkey |
| 307 |
|
(mainly gad_advection.F) |
| 308 |
|
o Modified store directives for split of dynamics/thermodynamics |
| 309 |
|
for the case ALLOW_KPP |
| 310 |
|
o Cleaned argument list for timestep_tracer.F |
| 311 |
|
|
| 312 |
|
checkpoint41 |
| 313 |
|
o re-formatted/added comments in prologues of key subroutines |
| 314 |
|
to work with protex |
| 315 |
|
|
| 316 |
|
checkpoint40 |
| 317 |
|
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
| 318 |
|
o added FLT (floats) package from Arne along with demo. experiment |
| 319 |
|
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
| 320 |
|
implementation of forward-in-time forcing terms |
| 321 |
|
o more mods for non-linear free-surface including new variable |
| 322 |
|
o modified multi-dim method to work on cube |
| 323 |
|
o bug fix in KPP (from DM) |
| 324 |
|
|
| 325 |
|
checkpoint40pre9 |
| 326 |
|
o added DST advection schemes |
| 327 |
|
o fix MPI bug on SGI's |
| 328 |
|
o modifications for non-linear free-surface |
| 329 |
|
o fixed conditionals for fixed flow/passive tracer only mode |
| 330 |
|
o added tension/strain form of stress tensor |
| 331 |
|
o changes to commenting of arguments for TAF/TAMC |
| 332 |
|
o added/updated many matlab scripts |
| 333 |
|
o added multi-dimensional advection method for tracers |
| 334 |
|
|
| 335 |
|
checkpoint40pre8 |
| 336 |
|
o new package rw/ |
| 337 |
|
Added method for dumping intermediate local arrays: |
| 338 |
|
mdsio_writetile - same as mdsio_writefield except works from inside |
| 339 |
|
bi,bj loop |
| 340 |
|
mdsio_writelocal - same as mdsio_writetile except works for local |
| 341 |
|
arrays |
| 342 |
|
write_local_r? - higher-level wrapper for mdsio_writelocal |
| 343 |
|
Controlled by diagFreq. Defaults to zero (ie. no dumps) |
| 344 |
|
Example given at end of mom_vecinv.F that dumps some local arrays. |
| 345 |
|
o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to |
| 346 |
|
control flux-form versus vector invariant code. |
| 347 |
|
Switch is runtime flag vectorInvariantMomentum (defaults to false) |
| 348 |
|
or genmake -DISABLE ... |
| 349 |
|
o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F |
| 350 |
|
(additional storing is now needed for case vecinv; |
| 351 |
|
currently nothing implemented to switch this storing off |
| 352 |
|
in case fluxform is used since no CPP flag available). |
| 353 |
|
|
| 354 |
|
checkpoint40pre7 |
| 355 |
|
o bug fix in dynamics.F |
| 356 |
|
calc_viscosity called before k=1,Nr loop. |
| 357 |
|
o added some #ifdef's ALLOW_PASSIVE_TRACER |
| 358 |
|
o cleaned initialisations in ctrl_map_ini |
| 359 |
|
related to TAF |
| 360 |
|
|
| 361 |
|
checkpoint40pre6 |
| 362 |
|
o split dynamics into thermodynamics & dynamics |
| 363 |
|
o corresponding split of calc_diffusivity into |
| 364 |
|
calc_diffusivity, calc_viscosity |
| 365 |
|
(kpp_calc_diff, kpp_calc_visc). |
| 366 |
|
o Added diffkr, kapgm to control variables |
| 367 |
|
o bug fix in gmredi_slope_limit for ldd97 |
| 368 |
|
|
| 369 |
|
checkpoint40pre5 |
| 370 |
|
o proper initialization of Adams-Bashforth time stepping |
| 371 |
|
+ uses forward step for very first step of model (iter=0) |
| 372 |
|
o re-generated *all* output since almost all output is modified by this |
| 373 |
|
change (sorry but we've been putting this one off for about 2 years) |
| 374 |
|
+ natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were |
| 375 |
|
*not* regenerated since they are already out of date and I don't |
| 376 |
|
want to create the impression that they are suddenly working. |
| 377 |
|
o removed KAP stuff for DEC's |
| 378 |
|
o modified/added many .cvsignore files in */code and */input |
| 379 |
|
o added new expt "solid-body.cs-32x32x1" |
| 380 |
|
+ this uses an alternative form of ini_curvilinear_grid.F which |
| 381 |
|
is not necessarily any better than the current one... |
| 382 |
|
|
| 383 |
|
checkpoint40pre4 |
| 384 |
|
o added re-initialisations of utrans,vtrans,rtrans in |
| 385 |
|
calc_common_factors which are crucial for TAF. |
| 386 |
|
o extended iMin,jMin range for calc_common_factors, |
| 387 |
|
calc_diffusivity |
| 388 |
|
o added option ALLOW_PASSIVE_TRACER |
| 389 |
|
o a few minor updates and fixes |
| 390 |
|
|
| 391 |
|
checkpoint40pre3 |
| 392 |
|
o created calc_gtr1.F for gad package |
| 393 |
|
o split the_main_loop and re-introduced forward_step |
| 394 |
|
o some recomputations of nIter0 for TAMC |
| 395 |
|
|
| 396 |
checkpoint40pre2 |
checkpoint40pre2 |
| 397 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
| 398 |
o Added gradient check package |
o Added gradient check package |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch