| 1 |
$Header$ |
$Header$ |
| 2 |
|
$Name$ |
| 3 |
|
|
| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
ecco_c44_e20 |
o OpenAD |
| 8 |
o before major merges from the Scripps setup |
- Adding preliminary ggl90 test to OpenAD verification. |
| 9 |
here are two small updates: |
Config. with ggl90 currently diverges after 64 time steps |
| 10 |
- field swapping for surface flux controls enabled |
so will need more work to become more stable |
| 11 |
(remains t.b.d. for atmos. state plus obcs) |
o pkg/seaice: |
| 12 |
- bug fix in active_file.F for xz-/yz- routines |
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
| 13 |
- added missing xz-/yz- routines to active_file_ad.F |
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
| 14 |
|
delta with a smooth function in s/r seaice_calc_viscosity |
| 15 |
ecco_c44_e19 |
(no effect on EVP) |
| 16 |
o merged necessary patches: |
- rename local suffix "sqr" into "sq" for more consistent variable names |
| 17 |
- AD-related changes for GMRedi |
o pkg/seaice: add new parameter SEAICE_deltaMin that is used ***only*** |
| 18 |
- fixes i KPP (delZ -> drF) |
for regularizing Delta (and nothing else, like the parameter |
| 19 |
- hook to OBCS songe layer code in external_forcing |
which is also used for all sorts of things SEAICE_EPS). Defaults to |
| 20 |
- errorMessageUnit non-zero in eeboot.F |
SEAICE_EPS for backward compatibility only. |
| 21 |
- included GMREDI, EXACT_CONSERV to natl_box_adjoint verif. |
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
| 22 |
|
the wrong key by inialising it before use -> fixes a recomputation |
| 23 |
ecco_c44_e18 |
problem but does not fix the gradient |
| 24 |
o sponge layer code for obcs was missing |
o pkg/layers: |
| 25 |
- added hook in external_forcing.F |
- move resetting of flux arrays to outside the iLa loop |
| 26 |
- added storing for TAF |
(this caused layers_diapycnal to not work with more than one layer coord.) |
| 27 |
o new routine cost_init_barfiles to initialise |
- fix bug in calculation of layers_recip_delta in layers_init_fixed.F |
| 28 |
adjoint fields adtbar, adsbar, adpsbar |
o pkg/layers: |
| 29 |
(needed in conjunction with corrected ladinit for active I/O) |
- remove from common block 3D layers fields (used to diagnose transport |
| 30 |
o cleaned up and corrected order in packages_readparms, ecco_readparms |
in tracer coords) and declare them as local arrays in layers_calc.F |
| 31 |
o corrected and simplified weights for obcs controls |
o pkg/seaice: |
| 32 |
- weight fields simplified |
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
| 33 |
- bug fix in ctrl_pack |
in lab_sea forward experiment (changes results -> updated) |
| 34 |
- no more write of control vector in ctrl_pack |
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
| 35 |
o i/j index bug fixes in cost_ssh_mean |
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
| 36 |
|
computations; for SEAICE_VECTORIZE_LSR |
| 37 |
ecco_c44_e17 |
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
| 38 |
o bug fixes in cost package |
sweep to the outside, |
| 39 |
* wrong identifier for active I/O of monthly mean psbar |
- remove store directives and add "CADJ loop sequential" directives |
| 40 |
(cost_averagesfields, cost_ssh) xx_psbar_dummy |
in analogy to model/src/solve_tridiagonal.F |
| 41 |
* cleaned all identifier for active I/O of monthly fields |
- replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop |
| 42 |
* wrong ladinit in various cost routines |
boundaries to yield more readable code. This has also the charming side |
| 43 |
o merge with interval (chkpt44c_post - chkpt44d_post) |
effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without |
| 44 |
* added missing EXCLUDE_MONITOR flags |
SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in |
| 45 |
* changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
seaice_lsr_tridiagu/v now requires either of these flags, vectorization |
| 46 |
(incompatible typ in MIN/MAX expressions caused problems |
still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as |
| 47 |
on IBM SP3) |
an additional option) |
| 48 |
* in genmake added variable MAKEDEPEND |
The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F |
| 49 |
plus resetting for case SunOS |
but the adjoint gradients (which are affected by this change) still explode. |
| 50 |
added timer_stats.c routine for IBM SP3 |
o coupler (atm & ocn _compon_interf): |
| 51 |
* removed variables in dynamics |
- avoid using Exch2 IO mapping if not suitable. |
| 52 |
|
|
| 53 |
ecco_c44_e16 |
checkpoint65m (2015/06/15) |
| 54 |
o new ECCO checkpoint, the first since ecco_c43_e15 |
o pkg/layers: |
| 55 |
which is branched from MITgcm. |
- clean-up old parameters setting (from Sep 2012): |
| 56 |
All changes were merged in between (see ecco-branch-mod? tags). |
+ remove old parameters setting from common block (declared locally); |
| 57 |
o last changes: |
+ stop if any old parameter is mixed with new parameters; |
| 58 |
* assuming path for TAF and TAMC are known (e.g. in $path) |
+ check for valid or consistent parameter setting (e.g., layers_name) |
| 59 |
* genmake: |
- check that layers_bounds for Pot.Density are in the right range; |
| 60 |
- added tools/xmakedepend to circumvene shortcoming of |
this is supposed to catch un-updated setting after recently shifting |
| 61 |
SUN's makedepend (size too small) |
potential density field "prho" by -1000 (now in "sigma" scale). |
| 62 |
- invoking ../tools/xmakedepend instead of makedepend |
o pkg/layers: |
| 63 |
- changed compiler flags for case SunOS |
- Added missing call to layers_fill for keeping track of tottend in |
| 64 |
|
pkg/diagnostics/diagnostics_fill_state.F |
| 65 |
ecco-branch-mod5 |
o pkg/layers: |
| 66 |
o mod's to reproduce open boundary run |
- added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning |
| 67 |
o enable field swapping for OB's and climatology |
of diapycnal fluxes |
| 68 |
o update store directives for OB control |
o pkg/layers: |
| 69 |
o added option ALLOW_OBCS_PRESCRIBE |
- reverted changes to interpolation to previous treatment; there |
| 70 |
o call of getobcs now out of obcs_calc (param. list modified) |
was never actually a problem |
| 71 |
|
o pkg/layers: |
| 72 |
ecco-branch-mod4 |
- fix interpolation of layers tracers in the presence of partial cells |
| 73 |
o this is the second part of changes necessary to reconcile |
- add lots of new functionality to compute water mass transformation |
| 74 |
the natl_box_adjoint verification (with and without grdchk). |
(enabled by CPP flag LAYERS_THERMODYNAMICS) |
| 75 |
>>>!!! CHANGES BETWEEN THE TAGS ecco-branch-mod3 !!!<<< |
- add new calls from main code (diags_oceanic_surf_flux.F, |
| 76 |
>>>!!! AND ecco-branch-mod4 !!!<<< |
thermodynamics.F, impldiff.F) and gad to save the necessary fields |
| 77 |
>>>!!! SHOULD BE MERGED INTO THE MAIN TRUNK !!!<<< |
for layers_thermodynamics calculations |
| 78 |
|
o pkg/ptracers: |
| 79 |
|
- add capability of stepping a passive tracer forward without advection |
| 80 |
|
by setting PTRACERS_advScheme to 0. |
| 81 |
|
o pkg/diagnostics: |
| 82 |
|
- add few (threads) _BARRIER around any update of "diag_pkgStatus". |
| 83 |
|
o pkg/layers: |
| 84 |
|
- shift potential density field "prho" by -1000 for density layer averaging so |
| 85 |
|
that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000); |
| 86 |
|
Note that density bin boundaries (layers_bounds in data.layers) have |
| 87 |
|
to be set accordingly (i.e., shifted, in sigma scale). |
| 88 |
|
o pkg/layers: |
| 89 |
|
- fix snap-shot output of layer thickness @ V.pt and output of pot.density |
| 90 |
|
- fix calculation of layer non-weighted velocity and layer probability |
| 91 |
|
- add diagnostics for pot.density used for layer averaging |
| 92 |
|
o pkg/seaice: |
| 93 |
|
- seaice_calc_viscosity.F: change computation of deltaC**2 to ensure |
| 94 |
|
positiveness, modify a few comments and improve variable names, |
| 95 |
|
- the changed computation of deltaC affects most seaice-related |
| 96 |
|
experiments at the truncation level. |
| 97 |
|
seaice_itd.thermo is affected by far the most, with |
| 98 |
|
only 7 digits of agreement remaining; update experiments. |
| 99 |
|
|
| 100 |
|
checkpoint65l (2015/05/04) |
| 101 |
|
o pkg/shelfice: |
| 102 |
|
- in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set |
| 103 |
|
factor drKp1 to zero where it is negative (ie. do not use |
| 104 |
|
SHELFICEBoundaryLayer if hFacC>1) |
| 105 |
|
- the same for factor drLoc in shelfice_forcing.F |
| 106 |
|
o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem |
| 107 |
|
with modules in ptracers, when using testreport option "-small_f" |
| 108 |
|
o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD) |
| 109 |
|
- replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1)) |
| 110 |
|
o verification/testreport |
| 111 |
|
- add new option -small_f |
| 112 |
|
with this option testreport first makes the target small_f (*.f files) |
| 113 |
|
before running make (all). This is useful for explicit inlining when |
| 114 |
|
all sources need to be full available. |
| 115 |
|
o pkg/exf/exf_interp.F: |
| 116 |
|
remove previous changes related to reverse (decreasing) input grids latitude |
| 117 |
|
|
| 118 |
|
checkpoint65k (2015/04/01) |
| 119 |
|
o pkg/ecco: |
| 120 |
|
fix missing cosphi initialization; use eccoiter in place of optimcycle; |
| 121 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
| 122 |
|
instead of active read/write |
| 123 |
|
o pkg/ctrl: |
| 124 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
| 125 |
|
instead of active read/write. |
| 126 |
|
o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F |
| 127 |
|
return if .NOT.useAUTODIFF |
| 128 |
|
o pkg/seaice: add CPP brackets (cost function related). |
| 129 |
|
o model/src: |
| 130 |
|
add useAUTODIFF run time switch. |
| 131 |
|
o pkg/exf/exf_interp.F: |
| 132 |
|
add code to allow input grids with latitude starting in the north (i.e. when |
| 133 |
|
j=1 corresponds to northern edge of field); modify global_with_exf to test |
| 134 |
|
this feature. |
| 135 |
|
o verification/testreport: |
| 136 |
|
- replace "grep -A3" with POSIX conformal sed command, because there are |
| 137 |
|
implementations of grep that cannot do contextual searches |
| 138 |
|
- replace "cat -n" by "nl" (two occurrences), because not all implementations |
| 139 |
|
of "cat" have the option "-n" |
| 140 |
|
o model/src: |
| 141 |
|
add new file gsw_teos10.F that contains 3 functions, more or less a copy |
| 142 |
|
of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to |
| 143 |
|
convert from conservative to potential temperature. For now they are not |
| 144 |
|
called anywhere. |
| 145 |
|
o pkg/ggl90: make "useIDEMIX" useful |
| 146 |
|
- re-organize code in s/r ggl90_calc a little to move computations that |
| 147 |
|
are different for idemix into separate loops (changes verification |
| 148 |
|
experiment idemix at truncation level, 12 digits remain -> updated) |
| 149 |
|
- requires 2 new 2D fields KappaM, verticalShear |
| 150 |
|
- make hFacI and recip_hFacI local 3D variables that are passed to |
| 151 |
|
s/r ggl90_idemix |
| 152 |
|
- fix and improve some comments |
| 153 |
|
|
| 154 |
|
checkpoint65j (2015/02/25) |
| 155 |
|
o pkg/openad |
| 156 |
|
- synchronize seawater.F with version in model/src: replace routine |
| 157 |
|
body of sw_temp by calling sw_ptmp and fix/add a few comments. |
| 158 |
|
o pkg/mnc: |
| 159 |
|
- change default value of pickup_read/write_mnc params to FALSE |
| 160 |
|
(since few features are missing in reading MNC pickup files). |
| 161 |
|
o model/src: |
| 162 |
|
- change default (background) vertical diffusivity for salt to be the |
| 163 |
|
temperature (background) vertical diffusivity. |
| 164 |
|
- change background vertical diffusivity in vertical mixing pkgs ggl90, |
| 165 |
|
kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity. |
| 166 |
|
This makes ptracers default diffusivity (that uses salt diffKr) more |
| 167 |
|
consistent with vertical mixing schemes. |
| 168 |
|
o verification/testreport: |
| 169 |
|
- fix typo in "-pcls" option ; |
| 170 |
|
- put temp files in /tmp (instead of in local dir) |
| 171 |
|
- add option "-ncad" to use genmake2 new option "-nocat4ad" |
| 172 |
|
- allow to use "-j" option (for multi-procs make) for AD, OAD and TLM. |
| 173 |
|
o pkg/ggl90 (idemix code): |
| 174 |
|
- apply few fixes ; add some missing "_d 0" ; update output of exp. |
| 175 |
|
global_ocean.90x40x15.idemix |
| 176 |
|
o OpenAD |
| 177 |
|
- enable active file I/O and begin removal of work-around code |
| 178 |
|
for OpenAD for handling control variables (memory vs. active files) |
| 179 |
|
- new CPP options file OPENAD_OPTIONS.h |
| 180 |
|
- revert to genarr2d gradient check for hs94.1x64x5 |
| 181 |
|
- (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens) |
| 182 |
|
- gentim2d works for halfpipe_streamice but not yet hs94.1x64x5 |
| 183 |
|
o tools/genmake2: |
| 184 |
|
- add option for an alternative Makefile (from Martin) where multiple |
| 185 |
|
source files are sent to TAF (instead of all in one file). |
| 186 |
|
o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013) |
| 187 |
|
- code provided by Carsten Eden as an extension of ggl90 |
| 188 |
|
- so far the code is turned on within ggl90 by setting a CPP-flag at |
| 189 |
|
compile time; a runtime flag implementation is not yet complete |
| 190 |
|
- tested in new verification experiment global_ocean.90x40x15.idemix |
| 191 |
|
o verification: |
| 192 |
|
- reduce length of the AD test run by half for experiments |
| 193 |
|
global_ocean.cs32x15 (std + thsice) and isomip |
| 194 |
|
- enable active file I/O for OpenAD, adjust verifications accordingly |
| 195 |
|
- halfpipe_streamice: change gradient check from genarr2d to gentim2d |
| 196 |
|
o verification/testreport: |
| 197 |
|
- fix two non-POSIX sed statements so that there are no error messages |
| 198 |
|
on Mac OS X |
| 199 |
|
- replace hostname -s with hostname | sed 's/\..*$//' |
| 200 |
|
o model/src/seawater.F: |
| 201 |
|
- simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged |
| 202 |
|
(following the matlab code), which would have avoided the bug caught |
| 203 |
|
by Matt (see below) in the first place |
| 204 |
|
o pkg/shelfice: |
| 205 |
|
- implement alternative discretisation of quadratic drag (selectBotDragQuadr) |
| 206 |
|
and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag. |
| 207 |
|
- fix sign of friction tendency (no-slip BC) and fix u,v drag for thin |
| 208 |
|
ice-shelf case (i.e., within surface level). |
| 209 |
|
- add config summary in shelfice_check.F |
| 210 |
|
- remove global variable recip_SHELFICElatentHeat and replace by a local |
| 211 |
|
variable recip_latentHeat |
| 212 |
|
- introduce diagnostics for friction velocity uStar (in case of |
| 213 |
|
SHELFICEuseGammaFrict) |
| 214 |
|
- change verification experiment isomip.htd: |
| 215 |
|
+ start from pickup (as input_ad at nIter0=8640) |
| 216 |
|
+ start from SHELFICEmassFile instead of SHELFICEloadAnomaly file |
| 217 |
|
+ test SHELFICEuseGammaFrict = .TRUE. |
| 218 |
|
+ test SHELFICEadvDiffHeatFlux = .TRUE. |
| 219 |
|
o model/src: |
| 220 |
|
- fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to |
| 221 |
|
in-situ Temp) and in routine SW_TEMP (in pkg/openad); |
| 222 |
|
update output of experiments global_with_exf.yearly and isomip (all 6). |
| 223 |
|
o pkg/shelfice: |
| 224 |
|
- change setting of kTopC to also be zero where there is no ice-shelf. |
| 225 |
|
- zero out surface forcing arrays (for now, for T & S + EmPmR) where |
| 226 |
|
ice-shelf is. |
| 227 |
|
- first attempt to get RealFreshWaterFlux effects: for now, only without |
| 228 |
|
SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping. |
| 229 |
|
o pkg/seaice: add the option to prescribe a fixed thickness PDF |
| 230 |
|
for thermodynamic calculations |
| 231 |
|
- because of divisions of the type 7/7 not exactly equal to 1, this change |
| 232 |
|
affects results of some verification experiments by up to 4 digits: |
| 233 |
|
global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume, |
| 234 |
|
seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides |
| 235 |
|
adjoint: lab_sea, lab_sea.noseaicedyn |
| 236 |
|
-> updated |
| 237 |
|
|
| 238 |
|
checkpoint65i (2015/01/23) |
| 239 |
|
o model/src: |
| 240 |
|
- change units of frictionHeating field from W to W/m^2 |
| 241 |
|
- fix bug in frictional heating from stratospheric drag in |
| 242 |
|
S/R ATM_PHYS_TENDENCY_APPLY_V |
| 243 |
|
- with synchronous time-stepping: move resetting to zero of frictionHeating |
| 244 |
|
field from load_fields_driver.F to thermodynamics.F ; |
| 245 |
|
- add diagnostics for frictional heating. |
| 246 |
|
o model/src & gmredi K3D: |
| 247 |
|
- add frictionHeating field to pickup-files (for synchronous time-stepping) |
| 248 |
|
- move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h |
| 249 |
|
- rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name |
| 250 |
|
and name in pickup file). |
| 251 |
|
- fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F |
| 252 |
|
o model/src: |
| 253 |
|
- move (from ini_forcing.F) initialisation of all arrays in header file |
| 254 |
|
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
| 255 |
|
(since Nov 2012) with option selectAddFluid=1. |
| 256 |
|
o pkg/shelfice: |
| 257 |
|
- change units (+ document) of newly added field "shelfIceMassDynTendency" |
| 258 |
|
- upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays. |
| 259 |
|
o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers |
| 260 |
|
o pkg/seaice: two new runtime parameters: |
| 261 |
|
- SEAICE_cStar replaces the hard wired "20" in the strength formulation, |
| 262 |
|
long overdue |
| 263 |
|
- SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012) |
| 264 |
|
parameterization of tensil stress for fast ice (does not do anything yet) |
| 265 |
|
o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method |
| 266 |
|
for LSR: move checking overlaps out of JFNK-if-block |
| 267 |
|
o pkg/atm_phys: |
| 268 |
|
- move copy of grid and dynamical fields out of atm_phys_driver.F into |
| 269 |
|
new S/R ATM_PHYS_DYN2PHYS. |
| 270 |
|
- fix level height for Linear Free-Surf case (to be consistent with |
| 271 |
|
fixed-in-time pressure levels). |
| 272 |
|
o pkg/mom_common (bottomdrag): |
| 273 |
|
- average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center |
| 274 |
|
to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG; |
| 275 |
|
update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag. |
| 276 |
|
o pkg/shelfice (u/v_drag): |
| 277 |
|
- add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG; |
| 278 |
|
- use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F |
| 279 |
|
(now similar to shelfice_u_drag.F) |
| 280 |
|
- remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG |
| 281 |
|
from mom_vecinv.F (similar to mom_fluxform calls). |
| 282 |
|
o pkg/mom_common (bottomdrag): |
| 283 |
|
- add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG; |
| 284 |
|
- add options for alternative discretisation of velocity norm in quadratic |
| 285 |
|
bottom drag: averaging of grid-cell-center KE to U.point and V.point |
| 286 |
|
(selectBotDragQuadr=0, original code) can produce noisy patterns; this |
| 287 |
|
improves when averaging only the other component (e.g. vVel for U bottom |
| 288 |
|
drag) using wet-point method (selectBotDragQuadr=2) or not (=1). |
| 289 |
|
- add options (bottomVisc_pCell) to account for partial-cell in bottom |
| 290 |
|
friction (no-slip BC) thus getting the true distance from the bottom; |
| 291 |
|
off by default since this also reduces model stability (explicit bottom |
| 292 |
|
friction). Changes produce different machine truncation with linear-drag |
| 293 |
|
+ no-slip BC: update output of experiments exp4.stevens (10 digits) and |
| 294 |
|
front_relax (bvp & mxl, 10 & 11 digits). |
| 295 |
|
o model/src & mom pkgs: |
| 296 |
|
- add one more level to vertical viscosity local arrays (Nr+1, previously Nr) |
| 297 |
|
since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k |
| 298 |
|
- for now and until vertical mixing scheme are updated to fill up level Nr+1, |
| 299 |
|
just copy level Nr value to level Nr+1. |
| 300 |
|
o doc: |
| 301 |
|
- add notes form Abhisek Chakraborty on how to close Heat & Salt budgets. |
| 302 |
|
o pkg/streamice: |
| 303 |
|
- shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F, |
| 304 |
|
SHELFICE.h: move array shelficemass to init_varia, initialise |
| 305 |
|
from array shelficemassinit, which is set in init_fixed and |
| 306 |
|
has option to be set from file; introduce array |
| 307 |
|
shelficeMassDynTend array, set thru file in init_fixed |
| 308 |
|
- NEW FILE: shelfice_step_icemass.F: update shelficemass from either |
| 309 |
|
shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in |
| 310 |
|
pkg/streamice |
| 311 |
|
- shelfice_thermodynamics.F: call shelfice_step_icemass if |
| 312 |
|
SHELFICEMassStepping = .true. |
| 313 |
|
- shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f |
| 314 |
|
|
| 315 |
|
checkpoint65h (2014/12/17) |
| 316 |
|
o verification/global_ocean.90x40x15, global_ocean_ebm: |
| 317 |
|
- update to generic controls. |
| 318 |
|
o pkg/ctrl: |
| 319 |
|
- ctrl_map_ini_genarr.F: test for igen>0 |
| 320 |
|
- ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D. |
| 321 |
|
- move gentim2d part of ctrl_map_ini_genarr.F to |
| 322 |
|
new separate routine : ctrl_map_ini_gentim2d.F |
| 323 |
|
- ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F: |
| 324 |
|
add time variable weights and cyclic controls (time mean, |
| 325 |
|
seasonal cycle, etc) capabilities to gentim2d |
| 326 |
|
o pkg/ecco: |
| 327 |
|
- move reading of error, conversion to weights from |
| 328 |
|
ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei) |
| 329 |
|
o global_oce_llc90, cs32: |
| 330 |
|
- activte sbo. |
| 331 |
|
- CTRL_SIZE.h : add maxCtrlProc. |
| 332 |
|
- activate the new genctrl capabilities. |
| 333 |
|
- update following reorganization of global_oce_input_fields.tar.gz |
| 334 |
|
o pkg/ctrl/ctrl_ad_diff.list: |
| 335 |
|
- add missing ctrl_init_rec.f |
| 336 |
|
o tools/OAD_support/keepOriginal: |
| 337 |
|
- add ctrl_init_rec.F |
| 338 |
|
o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F: |
| 339 |
|
- avoid recomputations of xx_gentim2d_dummy. |
| 340 |
|
o momentum diagnostics: |
| 341 |
|
- move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and |
| 342 |
|
mom_vecinv.F to timestep.F (to include Smag-3D contribution). |
| 343 |
|
o pkg/seaice/seaice_lsr.F: |
| 344 |
|
- fix computation of BU/BV, make sure they are non-zero, only necessary |
| 345 |
|
for cubed sphere exchanges and SEAICE_OLx/y>0. |
| 346 |
|
This makes calling s/r fill_cs_corner_rl obsolete (removed). |
| 347 |
|
o verification/global_ocean.cs32x15/input.seaice |
| 348 |
|
- add test for strong implicit coupling and restricted addtive Schwarz |
| 349 |
|
methods for LSR |
| 350 |
|
- update results/output.seaice.txt |
| 351 |
|
o verification/tutorial_global_oce_biogeo: |
| 352 |
|
- AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up) |
| 353 |
|
and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK); |
| 354 |
|
update output_adm,_oadm,_tlm.txt |
| 355 |
|
o pkg/dic: |
| 356 |
|
- change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h |
| 357 |
|
- add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn |
| 358 |
|
for tracer 1 & 2 is set (to avoid double counting of dilution effect). |
| 359 |
|
o verification/tutorial_global_oce_biogeo: |
| 360 |
|
- AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since |
| 361 |
|
dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ; |
| 362 |
|
update output_adm,_oadm,_tlm.txt |
| 363 |
|
o eesupp/src: |
| 364 |
|
- add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F) |
| 365 |
|
and call it in seaice_lsr when using nonzero SEAICE_OLx/y |
| 366 |
|
o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing |
| 367 |
|
LSR (following Hutchings et al. 2004) |
| 368 |
|
- introduce zetaZ as a global variable (requires adjustments in |
| 369 |
|
seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ |
| 370 |
|
in seaice_calc_viscosities.F |
| 371 |
|
- new flag SEAICEuseStrImpCpl (default off) |
| 372 |
|
- add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the |
| 373 |
|
momentum equations |
| 374 |
|
- JFNK-solver (preconditioner) adjusted to allow using this method |
| 375 |
|
(where it does not have any positive effect) |
| 376 |
|
o pkg/seaice |
| 377 |
|
- add overlap for restrictive additive Schwartz method also to LSR, but |
| 378 |
|
turn it off by default (because it only seems to work for non-cubed |
| 379 |
|
sphere/llc topologies) |
| 380 |
|
o pkg/autodiff |
| 381 |
|
- add extra exchanges in addummy_in_steppging also for mnc output |
| 382 |
|
o pkg/seaice: |
| 383 |
|
- add extra exchanges before dumping adjoint fields in seaice_ad_dump.F |
| 384 |
|
to avoid stripes in the adjoint output (similar to addummy_in_stepping.F) |
| 385 |
|
o pkg/obcs: |
| 386 |
|
- add option to specify domain-connected piece Id along OB though files |
| 387 |
|
(for now, only used to diagnose PhiVel; default =1 -> global correction) |
| 388 |
|
- modify obcs_diag_balance.F to process each connected-part separately; |
| 389 |
|
exclude OB where Id = 0 but keep the full divergence there (-> constant |
| 390 |
|
Psi along this portion of OB and all inflow derived from grad(Phi)) |
| 391 |
|
- add example of OB-conect files in verification/so_box_biogeo/input. |
| 392 |
|
o pkg/diagnostics: |
| 393 |
|
- improve treatment of Open-Boundaries in Velocity-Potential calculation: |
| 394 |
|
a) use non zero matrix element across OB and solve for Phi 1 grid point |
| 395 |
|
outside OB (i.e, where tracer OBCS are applied). |
| 396 |
|
b) global imbalance of inFlow/outFlow across OB: instead of modifying |
| 397 |
|
velocity across OB, spread it uniformly along the OB in the RHS. |
| 398 |
|
|
| 399 |
|
checkpoint65g (2014/11/19) |
| 400 |
|
o pkg/diagnostcis: |
| 401 |
|
- add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param |
| 402 |
|
o pkg/my82,pp81,kl10: |
| 403 |
|
- fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D |
| 404 |
|
field diffKr as background diffusivity to set minimum diffusivity value. |
| 405 |
|
o pkg/seaice: |
| 406 |
|
- add new parameter SEAICEuseEVPrev (for revisited EVP by |
| 407 |
|
Bouillon et al 2013) |
| 408 |
|
- add SEAICE_evpAlpha/Beta to namelist |
| 409 |
|
- modify seaice_evp code to able to use SEAICEuseEVPrev. These changes |
| 410 |
|
involve trivial re-ordering of divisions/multiplications that should not |
| 411 |
|
have any effects, but ... they do change the results of lab_sea.hb87 so |
| 412 |
|
that only 2 digits of agreement remain, in line with the general |
| 413 |
|
instability/fragility of the evp-code. For now, I do not care and just |
| 414 |
|
update the verification experiment |
| 415 |
|
o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc) |
| 416 |
|
- remove xx_genarr2d_numsmooth etc |
| 417 |
|
- use xx_genarr2d_preproc etc instead |
| 418 |
|
- carry out smooth_correl2D at initialization stage rather than during |
| 419 |
|
time stepping. |
| 420 |
|
- get smoothOpNb from xx_gentim2d_preproc |
| 421 |
|
o global_oce_cs32 : |
| 422 |
|
- add test of generic ecco capabilities. |
| 423 |
|
o pkg/exf/exf_getsurfacefluxes.F : |
| 424 |
|
- add to tmpUE/tmpVN rather than re-initializing them (conventional behavior). |
| 425 |
|
o pkg/ctrl,ecco : |
| 426 |
|
- omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED |
| 427 |
|
is defined. |
| 428 |
|
o pkg/seaice: add diagnostics for Delta (deformation parameter) |
| 429 |
|
o model/src: |
| 430 |
|
- when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical |
| 431 |
|
diffusivity (background) is specified but ignored. |
| 432 |
|
o verification: |
| 433 |
|
- in testreport, convert hostname to lower case for default output dir name |
| 434 |
|
o model, pkg : add useCTRL, useECCO parameters (on/off run time switch). |
| 435 |
|
o pkg/dic: add modifications from Hajoon: |
| 436 |
|
- add iron sedimentation flux function of the flux of PO4 out of bottom layer |
| 437 |
|
- light attenuation: add self-shading effect by climatological Chlorophyll |
| 438 |
|
(read from file). |
| 439 |
|
o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also |
| 440 |
|
compiles when SEAICE_ALLOW_DYNAMICS is undefined |
| 441 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate |
| 442 |
|
AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than |
| 443 |
|
ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted, |
| 444 |
|
approach where CPP_OPTIONS.h includes an omnipotent |
| 445 |
|
ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h'). |
| 446 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where |
| 447 |
|
ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong. |
| 448 |
|
o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF |
| 449 |
|
to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included |
| 450 |
|
(it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...) |
| 451 |
|
o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl : |
| 452 |
|
add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed |
| 453 |
|
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h |
| 454 |
|
- AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h |
| 455 |
|
- CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc |
| 456 |
|
o pkg/ctrl,ecco,exf : |
| 457 |
|
- remove variables associated with NON-generic costs, |
| 458 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
| 459 |
|
- remove NON-generic NON-obcs controls, |
| 460 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
| 461 |
|
o pkg/ctrl : added ctrl_local_params.h |
| 462 |
|
o pkg/ecco : added ecco_local_params.h |
| 463 |
|
o verification : added ECCO_CTRL_DEPRECATED to most as and oad |
| 464 |
|
experiments, which will progressively be removed once the |
| 465 |
|
experiments are revised to use only generic controls/costs. |
| 466 |
|
|
| 467 |
|
checkpoint65f (2014/10/13) |
| 468 |
|
o pkg/ctrl, ecco, seaice : minor changes in headers |
| 469 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic |
| 470 |
|
cost function and control capabilities added since checkpoint65c. |
| 471 |
|
o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h. |
| 472 |
|
o pkg/ecco: increase modularity and improve logic |
| 473 |
|
- ecco_toolbox.F (new) : basic operations that are often used, |
| 474 |
|
including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk, |
| 475 |
|
ecco_addcost, ecco_add, ecco_div, ecco_readbar. |
| 476 |
|
- cost_gencal.F (new) : determine filnames and records. |
| 477 |
|
- cost_genread.F, cost_generic.F : condense code using ecco_toolbox. |
| 478 |
|
- cost_generic.F : use spzeroloc rather than hard-coded -9999, |
| 479 |
|
and exploit the above functions leading to more compact code. |
| 480 |
|
- cost_genread.F : rm un-necessary arguments, re-arrange args order. |
| 481 |
|
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, |
| 482 |
|
using_ers, using_gfo, using_mdt is now only defined within gencost) |
| 483 |
|
o pkg/ecco: extend generic cost capabilities |
| 484 |
|
- pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost |
| 485 |
|
capabilities via gencost_preproc (+ _c,_i,_r related params), |
| 486 |
|
gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod, |
| 487 |
|
gencost_outputlevel arguments to cost_generic |
| 488 |
|
- pkg/ecco/cost_genread.F (new) : interface between cost_generic |
| 489 |
|
and active_read, making room for gencost_preproc to take effect. |
| 490 |
|
Added preproc code ('climmon') to replace GENERIC_BAR_MONTH. |
| 491 |
|
- pkg/ecco/cost_generic.F : |
| 492 |
|
compute and store misfit maks*(model-data) in localdif that is |
| 493 |
|
then used in cost and for output, output misfit if outlev.GT.0 |
| 494 |
|
- pkg/ecco/cost_averagesfields.F : depend on gencost_barskip |
| 495 |
|
rather gencost_barfile for deciding whether to write barfile |
| 496 |
|
- pkg/ecco/ecco_cost_driver.F : extract call to cost_profiles from cost_hyd |
| 497 |
|
- pkg/ecco/ecco_cost_init_fixed.F : extract gencost weights from |
| 498 |
|
ecco_cost_weights, re-activate ecco_summary, determine gencost_barskip |
| 499 |
|
- pkg/ecco/ecco_summary.F : report gencost variables |
| 500 |
|
- pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs |
| 501 |
|
o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA |
| 502 |
|
o pkg/ecco: internal re-organization |
| 503 |
|
- resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl |
| 504 |
|
(rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter, |
| 505 |
|
mv relevant variables definition from ecco_cost.h to ecco.h, |
| 506 |
|
make sure gencost routines only include ecco.h) |
| 507 |
|
- throughout : add missing CCP switches, rm unused variables, |
| 508 |
|
and rm un-necessary CPP switches |
| 509 |
|
- throughout gencost routines : replace modelstartdate with |
| 510 |
|
gencost_startdate when needed |
| 511 |
|
- cost_bp_read.F : use arguments, instead of common blocs |
| 512 |
|
so that it can be used also by (new) cost_gencost_bpv4.F |
| 513 |
|
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0 |
| 514 |
|
- ecco_phys.F : compute etanFull |
| 515 |
|
- ecco_readparms.F : rename using_topex as using_tpj, add |
| 516 |
|
bpv4-grace to gencost list, initialize added parameters |
| 517 |
|
- ecco_summary.F : include SIZE.h needed for augmented ecco.h |
| 518 |
|
|
| 519 |
|
checkpoint65e (2014/09/28) |
| 520 |
|
o pkg/obcs: |
| 521 |
|
- replaced the just-added CPP options with run-time variables |
| 522 |
|
(see pkg/obcs/OBCS_PARAMS.h for details) |
| 523 |
|
o pkg/obcs: |
| 524 |
|
- add additional CPP options for sponge boundary layers |
| 525 |
|
(see pkg/obcs/OBCS_OPTIONS.h for details) |
| 526 |
|
o pkg/atm_phys: |
| 527 |
|
- implement simple (obliquity only, assuming circular planet orbit) |
| 528 |
|
seasonal cycle for incoming insolation ; used when run-time parameter |
| 529 |
|
"select_incSW" is set to 1 ; by default (=0), uses old unchanged formula. |
| 530 |
|
o pkg/exf, pkg/ecco, pkg/ctrl: |
| 531 |
|
- add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets |
| 532 |
|
- activate gentim2d for xx_atemp,xx_aqh,xx_swdown,xx_lwdown,xx_precip |
| 533 |
|
- implement gentim2d for xx_tauu, xx_tauv |
| 534 |
|
o pkg/ctrl, pkg/ecco : |
| 535 |
|
- fix and complement the generic controls implementation |
| 536 |
|
o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F, |
| 537 |
|
pkg/shelfice/shelfice_thermodynamics.F, |
| 538 |
|
verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F, |
| 539 |
|
verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F : |
| 540 |
|
- add weight in CTRL_GET_GEN calls |
| 541 |
|
o pkg/ctrl : |
| 542 |
|
- ctrl_get_gen.F : add weight as input parameter, and apply |
| 543 |
|
it directly rather than using smooth_correl2Dw (to be retired). |
| 544 |
|
- ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call |
| 545 |
|
o pkg/ctrl : |
| 546 |
|
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F, |
| 547 |
|
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F) |
| 548 |
|
- re-activate ctrl_summary (call in ctrl_init.F) |
| 549 |
|
o pkg/ctrl/ctrl_cost_gen.F : |
| 550 |
|
- fix CCP brackets, remove un-necessary myiter, mytime |
| 551 |
|
o pkg/ecco, pkg/ctrl : |
| 552 |
|
- remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) |
| 553 |
|
- remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) |
| 554 |
|
- add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F) |
| 555 |
|
- add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F) |
| 556 |
|
|
| 557 |
|
checkpoint65d (2014/09/15) |
| 558 |
|
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F : |
| 559 |
|
- add xx_genarr2d_bounds,xx_genarr3d_bounds, |
| 560 |
|
xx_genarr2d_numsmooth, xx_genarr3d_numsmooth |
| 561 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : |
| 562 |
|
- remove compilation failure |
| 563 |
|
- replace hard coded example |
| 564 |
|
- use ctrl_map_ini_gen2D, 3D |
| 565 |
|
o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F : |
| 566 |
|
- on/off switch based upon xx_genarr2d_weight,3d |
| 567 |
|
o src/packages_init_variables.F : |
| 568 |
|
- regroup pkg/estimation calls |
| 569 |
|
- remove CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
| 570 |
|
(moved to ctrl_init_variables) |
| 571 |
|
o cost/cost_init_varia.F : |
| 572 |
|
- remove ecco_cost_init_varia |
| 573 |
|
(moved to ecco_init_varia) |
| 574 |
|
o ctrl/ctrl_init_variables.F : |
| 575 |
|
- add CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
| 576 |
|
- add CTRL_MAP_INI_GENARR, SEAICE_CTRL_MAP_INI |
| 577 |
|
o ctrl/ctrl_map_ini.F : |
| 578 |
|
- remove ctrl_map_ini_genarr, seaice_ctrl_map_ini |
| 579 |
|
(moved to ctrl_init_variables) |
| 580 |
|
o ctrl/ctrl_map_ini_ecco.F : |
| 581 |
|
- remove ECCO_PHYS (mv to ecco_init_varia) |
| 582 |
|
- remove seaice_ctrl_map_ini (mv to ctrl_init_variables) |
| 583 |
|
o ecco/ecco_ad_diff.list : |
| 584 |
|
- add ecco_init_varia.f |
| 585 |
|
o ecco/ecco_init_varia.F |
| 586 |
|
- new routine |
| 587 |
|
o pkg/streamice: |
| 588 |
|
- move call to STREAMICE_INITIALIZE_PETSC from the_model_main.F |
| 589 |
|
to streamice_init_fixed.F ; fix setting of STREAMICEisOn. |
| 590 |
|
- from model/src, only call pkg/streamice routines if useStreamIce is TRUE. |
| 591 |
|
o pkg/generic_advdiff: |
| 592 |
|
- fix bug causing negatives in GAD_SMOLARKIEWICZ_HACK, introduced 8/8/2014. |
| 593 |
|
o pkg/exf: |
| 594 |
|
- exf_getffields.F : add xxg_atemp, xxg_aqh, xxg_swdown, xxg_lwdown, |
| 595 |
|
xxg_precip capability |
| 596 |
|
- exf_wind.F : no need for ALLOW_WSPEED_CONTROL cpp switch |
| 597 |
|
o pkg/ctrl: |
| 598 |
|
- ctrl_pack.F, ctrl_unpack.F : omit (un)packing of undefined xx_gentim2d |
| 599 |
|
o model/src/load_fields_driver.F : |
| 600 |
|
- move call to CTRL_MAP_GENTIM2D ahead of BULKF_FIELDS_LOAD, EXF_GETFORCING |
| 601 |
|
so xx_gentim2d can be applied to e.g. exf fields in a timely manner. |
| 602 |
|
o OpenAD verification experiments: |
| 603 |
|
- Include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, and CTRL_OPTIONS.h |
| 604 |
|
in src files (to enable to skip the ECCO_CPPOPTIONS.h); |
| 605 |
|
for now, only in pkgs used in OpenAD verification experiments. |
| 606 |
|
- Change all except one (halfpipe_streamice) OpenAD experiments to use pkg |
| 607 |
|
specific option file (AUTODIFF_OPTIONS.h, COST_OPTIONS.h & CTRL_OPTIONS.h) |
| 608 |
|
instead of using ECCO_CPPOPTIONS.h (with all relevant options in it). |
| 609 |
|
This applies to both TAF (*/code_ad/) and OpenAD (*/code_oad/) tests. |
| 610 |
|
o OpenAD verification tests: |
| 611 |
|
- finish removing ALLOW_AUTODIFF_OPENAD (replaced by ALLOW_OPENAD); |
| 612 |
|
- finish replacing ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for |
| 613 |
|
tape/storage which are specific to TAF/TAMC) in pkgs used in OpenAD exp. |
| 614 |
|
- leave ALLOW_AUTODIFF_TAMC undef in OpenAD verification tests (*/code_oad/) |
| 615 |
|
and remove local copy of "tamc.h" (needed only if ALLOW_AUTODIFF_TAMC). |
| 616 |
|
o model/src & generic_advdiff: |
| 617 |
|
- change hard-coded loop-range in S/R APPLY_FORCING_T/S to set T & S |
| 618 |
|
forcing over 0:sNx+1, 0:sNy=1 (instead of just 1:sNx,1:sNy): Model |
| 619 |
|
dynamics requires valid tracer forcing only over tile interior but, for |
| 620 |
|
some diagnostics, may need to extend it over 1 point in tile halo region. |
| 621 |
|
- in gad_calc_rhs.F, update calls to gmredi_x/ytransport to get valid |
| 622 |
|
tendency over i,j_Min,Max range. This allows to simplfy i,j_Min,Max |
| 623 |
|
setting in temp/salt/ptracer_integrate.F |
| 624 |
|
o pkg/dic: |
| 625 |
|
- multiply tracer tendencies by maskInC (if ussing OBCS) before updating |
| 626 |
|
gchem tracers: this allows to skip the 2nd call to OBCS_APPLY_PTRACER |
| 627 |
|
in gchem_forcing_sep.F |
| 628 |
|
o pkg/autodiff & obcs: |
| 629 |
|
- add storage of current OB values for U & V (was already done for T & S). |
| 630 |
|
|
| 631 |
|
checkpoint65c (2014/08/30) |
| 632 |
|
o pkg/dic: |
| 633 |
|
- take out of dic_atmos.F the initialisation part (corresponding to istate=0) |
| 634 |
|
and move it to new S/R DIC_INI_ATMOS ; also simplify the dependencies for |
| 635 |
|
AD compilers (but still a Pb with multi-threading and Ajoint dependencies). |
| 636 |
|
o verification: |
| 637 |
|
- new experiment testing OBCS and DIC pkgs, using params & output from |
| 638 |
|
tutorial_global_oce_biogeo but limited to a sub-domain around Drake |
| 639 |
|
passage: take OBCS from the last year of a 2 yrs simulation and initial |
| 640 |
|
conditions from t=1.yr while keeping the same forcing. |
| 641 |
|
o model/src: |
| 642 |
|
- when allowFreezing=T, only reset below freezing initial Temp to Tfreezing |
| 643 |
|
(at any k) if checkIniTemp is not set to FALSE (default checkIniTemp=T). |
| 644 |
|
o pkg/diagnostics (Stats-Diags): |
| 645 |
|
- re-write S/R DIAGSTATS_CALC (more similar to TARGET_NEC_SX part) to: |
| 646 |
|
a) refine region where stats are computed, excluding where arrhFac=0 ; |
| 647 |
|
b) fix missing interior mask (use with OBCS) in 3-D fields statistics; |
| 648 |
|
c) extend regional stats over the region edges (for U or V pt location). |
| 649 |
|
o pkg/gchem: |
| 650 |
|
- add a (2nd) call to OBCS_APPLY_PTRACER in gchem_forcing_sep.F (needed since |
| 651 |
|
pkg/dic is currently changing/updating ptracers values beyond the OB). |
| 652 |
|
o verification (hs94): |
| 653 |
|
- convert Held & Suarez external_forcing.F (from hs94.cs, with Sigma-coords |
| 654 |
|
bits) to apply_forcing.F and undef USE_OLD_EXTERNAL_FORCING in experiments |
| 655 |
|
hs94.cs-32x32x5 and tutorial_held_suarez_cs ; also use the same version of |
| 656 |
|
apply_forcing.F in 2D hs94 (fwd, ad & oad) but keep LatLon hs94 unchanged. |
| 657 |
|
o pkg/ptracers: |
| 658 |
|
- implement Adams-Bashforth on pTracers (instead of on tracer tendency), |
| 659 |
|
switched on by setting PTRACERS_doAB_onGpTr=F (default set to doAB_onGtGs) |
| 660 |
|
- change exp4 secondary test (input.nlfs) to test AB on T & S & pTracer |
| 661 |
|
with AB-2 code (so that it get tested). |
| 662 |
|
o model/src: |
| 663 |
|
- allow to apply Adams-Bashforth on Temp & Salt (instead of on gT,gS) |
| 664 |
|
with AB-2 code (previously only available with AB-3 code). |
| 665 |
|
Also move the code (call to ADAMS_BASHFORTH S/R) form thermodynamics.F |
| 666 |
|
to temp/salt_integrate.F (since the 2nd part of gt/sNm1 update is done |
| 667 |
|
there, by calling CYCLE_AB_TRACER). |
| 668 |
|
o pkg/generic_advdiff: |
| 669 |
|
- change Tracer argument (drop bi,bj indices) in S/R GAD_CALC_RHS, |
| 670 |
|
GAD_C2_ADV_R, GAD_U3_ADV_R, GAD_C4_ADV_R, GAD_DIFF_R, GAD_BIHARM_R |
| 671 |
|
+ also in GMREDI_X/Y/RTRANSPORT ; and update corresponding calls in |
| 672 |
|
S/R temp/salt/ptracers_integrate.F |
| 673 |
|
o model/src & pkg/ptracers: |
| 674 |
|
- remove common block variables gT,gS (in DYNVARS.h), except when |
| 675 |
|
USE_OLD_EXTERNAL_FORCING is defined; update TAF storage accordingly. |
| 676 |
|
- remove common block variable gPtr. |
| 677 |
|
o model/src & pkgs: |
| 678 |
|
- change gTracer (and/or tracer) argument (drop bi,bj indices) in S/R |
| 679 |
|
ADAMS_BASHFORTH(2&3), CYCLE_(AB_)TRACER, FREESURF_RESCALE_G, |
| 680 |
|
IMPLDIFF, SOLVE_TRIDIAGONAL & _PENTADIAGONAL, GAD_SOM_ADVECT, |
| 681 |
|
GAD_ADVECTION, GAD_CALC_RHS, GAD_IMPLICIT_R, TIMEAVE_CUMUL_DIF_1T |
| 682 |
|
+ change accordingly all calling S/R. |
| 683 |
|
- use local temperature/salinity/ptracer tendency array (without bi,bj) |
| 684 |
|
in S/R temp/salt/ptracers_integrate.F |
| 685 |
|
o pkg/seaice: |
| 686 |
|
- move computation of stress contributions to rhsU/V in s/r seaice_lsr |
| 687 |
|
to separate s/r seaice_lsr_rhsu/v in order to be able to re-use code |
| 688 |
|
- make u/vIceC local variables if SEAICE_CGRID is defined only to be used |
| 689 |
|
in seaice_lsr |
| 690 |
|
- seaice_lsr.F: make local 4D arrays UXX, VYY, etc 2D |
| 691 |
|
in s/r seaice_lsr_calc_coeffs |
| 692 |
|
o pkg/mdsio: |
| 693 |
|
- in MDS_READ/WRITE_FIELD, stop if file-name (+prefix) is too long |
| 694 |
|
(e.g., > MAX_LEN_MBUF -90 ) or, in INI_MODEL_IO, if mdsioLocalDir is |
| 695 |
|
too long (e.g., > MAX_LEN_FNAM/2 ) |
| 696 |
|
|
| 697 |
|
checkpoint65b (2014/08/12) |
| 698 |
|
o pkg/matrix: |
| 699 |
|
- pass, as argument, updated tracer field to S/R MATRIX_STORE_TENDENCY_EXP |
| 700 |
|
o model/src: |
| 701 |
|
- fix initialisation of geothermalFile; compile geothermal-flux code in |
| 702 |
|
natl_box verification experiment. |
| 703 |
|
o model/src & pkg/down_slope: |
| 704 |
|
- push the k loop inside S/R TIMESTEP_TRACER (now called outside the k loop). |
| 705 |
|
- in dwnslp_apply.F, update tracer tendency instead of the future tracer |
| 706 |
|
field and call S/R DWNSLP_APPLY before TIMESTEP_TRACER; this affects |
| 707 |
|
results at machine truncation level: update output of experiments |
| 708 |
|
global_ocean.90x40x15.dwnslp (FWD) and lab_sea.noseaicedyn (AD). |
| 709 |
|
o pkg/diagnostics (Stats-Diags): |
| 710 |
|
- do not cumulate the full volume when DIAGNOSTICS_FILL is |
| 711 |
|
called with bibjFlg < 0 (no increment of the counter for 2D/3D diag); |
| 712 |
|
This fix the mean statistics when DIAGNOSTICS_FILL is called multiple |
| 713 |
|
times (but Min,Max and StD are still wrong). |
| 714 |
|
o model/src: |
| 715 |
|
- add geothermal flux forcing: read in ini_forcing.F as time-constant |
| 716 |
|
field "geothermalFlux" applied in S/R APPLY_FORCING_T (apply_forcing.F) |
| 717 |
|
o model/src: |
| 718 |
|
- move CYCLE_TRACER calls from tracers_correction_step.F to temp/salt/ptracer |
| 719 |
|
_integrate.F so that, when leaving S/R THERMODYANMICS, theta,salt and pTrac |
| 720 |
|
arrays are already updated while adjustments (filters, conv.adjustment) are |
| 721 |
|
still applied later, in S/R TRACERS_CORRECTION_STEP. |
| 722 |
|
o model/src: |
| 723 |
|
- store in common bloc array "rhoInSitu" the virtual potential temperature |
| 724 |
|
anomaly that is used to compute geopotential: this make the atmos code |
| 725 |
|
more similar to ocean code which already uses rhoInSitu in calc_phi_hyd.F |
| 726 |
|
o pkg/seaice/seaice_lsr.F |
| 727 |
|
- rename integer variable ilcall to ipass (that's what it is called |
| 728 |
|
in the residual diagnostics |
| 729 |
|
- change time stepping for NPSEUDOTIMESTEP > 2 (does not change the |
| 730 |
|
default) for improved non-linear convergence of the first few steps |
| 731 |
|
- adjust a few comments and add new ones to explain some of the store |
| 732 |
|
directives |
| 733 |
|
o pkg/generic_advdiff (& ptracers): |
| 734 |
|
- re-work the code to check for valid advection scheme and for minimum |
| 735 |
|
size of overlap (now stored in local common bloc in gad_advscheme.F) |
| 736 |
|
o pkg/seaice: another attempt to make the adjoint work for sea ice dynamics |
| 737 |
|
- re-initialize more variables in seaice_lsr: u/vIceC, u/vIceNm1 |
| 738 |
|
- add an auxilliary variable "bet" and fix store directives and keys in |
| 739 |
|
seaice_lsr_tridiagu/v, this seems to do the trick (i.e. more or |
| 740 |
|
less exact gradients in my tests); but there are still |
| 741 |
|
recomputation warning (although gradients are sort of OK), when |
| 742 |
|
SEAICE_LSR_VECTORIZE is not defined, so this flag and |
| 743 |
|
SEAICE_LSR_VECTORIZE_ZEBRA are recommended for efficiency. |
| 744 |
|
- update verification experiments lab_sea. |
| 745 |
|
- change some comments in S/R seaice_calc_viscosities |
| 746 |
|
o model/src: |
| 747 |
|
- if staggerTimeStep=T, always apply exchange to velocity field in |
| 748 |
|
do_stagger_fields_exchanges.F instead of in do_fields_blocking_exchanges.F |
| 749 |
|
(independent of using multi-dim advection or not); no effect on FWD run |
| 750 |
|
but affects AD results (at machine truncation level): update output of |
| 751 |
|
experiment 1D_ocean_ice_column (ad: 12 digits), hs94.1x64x5 (ad,oad: 13.d) |
| 752 |
|
and isomip (oad: 12.d). |
| 753 |
|
o pkg/generic_advdiff: |
| 754 |
|
- stop if doAB_onGtGs is set to FALSE but ignored |
| 755 |
|
- refine warning related to stability of tracer time-stepping |
| 756 |
|
regarding internal wave dynamics. |
| 757 |
|
- setting of AdamsBashforth_T,S when doAB_onGtGs=F: remove condition |
| 758 |
|
on staggerTimeStep & implicitIntGravWave (will now get a warning |
| 759 |
|
if potentially unstable). |
| 760 |
|
o pkg/kl10: |
| 761 |
|
- add new pkg "kl10" for mixing due to internal wave breaking, from |
| 762 |
|
http://www.sciencedirect.com/science/article/pii/S1463500310000144 |
| 763 |
|
(contribution from Jody Klymak), tested in verification experiment |
| 764 |
|
verification/internal_wave/input.kl10/ |
| 765 |
|
o isomip experiment: |
| 766 |
|
- test pkg/shelfice with Non-Lin Free-Surf in one of the FWD set-up |
| 767 |
|
(input.htd) and update the output. |
| 768 |
|
o cd_code experiments: |
| 769 |
|
- use default cd_code options (#undef CD_CODE_NO_AB_MOMENTUM & |
| 770 |
|
#undef CD_CODE_NO_AB_CORIOLIS) in experiments: cfc_example (fwd) |
| 771 |
|
global_ocean.90x40x15 (ad & oad) and OpenAD (ad & oad) and |
| 772 |
|
update the corresponding output. |
| 773 |
|
o pkg/seaice: |
| 774 |
|
- reduce the number of include files and store directives in |
| 775 |
|
S/R seaice_lsr_tridiagu/v |
| 776 |
|
- change the order of loops in one case in S/R seaice_lsr_tridiagv |
| 777 |
|
(only for SEAICE_VECTORIZE_LSR_ZEBRA defined), which allows me to |
| 778 |
|
get rid off one store directive (a TAF bug?) |
| 779 |
|
- add one more instance of ifdef SEAICE_VECTORIZE_LSR_ZEBRA in |
| 780 |
|
S/R seaice_lsr_tridiagv to change the loop range for consistency |
| 781 |
|
- remove ilcall, m from parameter list of S/R seaice_lsr_tridiagu/v |
| 782 |
|
- fix a bug that affects the JFNK solver: replace sNx/y by i/jMax in |
| 783 |
|
S/R seaice_lsr_tridiagu/v (requires update of |
| 784 |
|
offline_exf_seaice/input.dyn_jfnk) |
| 785 |
|
|
| 786 |
|
checkpoint65a (2014/07/27) |
| 787 |
|
o model/src: |
| 788 |
|
- Non-Lin Free-Surf in p/z coords: allows hFacW,S to be larger than |
| 789 |
|
surrounding hFacC=1 @ edge of a step with different kSurfC on either side |
| 790 |
|
(topo in p-coords, ice-shelf in z-coords); update output of experiments |
| 791 |
|
tutorial_global_oce_in_p and isomip (both AD and OpenAD output). |
| 792 |
|
o model/src: |
| 793 |
|
- collect momentum forcing tendency into local 2-D array (passed as argument |
| 794 |
|
to apply_forcing S/R); this simplifies mom. Forcing diagnostics and CD_CODE |
| 795 |
|
parts in timestep.F (without CD_CODE_NO_AB_MOMENTUM defined = the default); |
| 796 |
|
affects results at machine truncation level (e.g., if using OBCS_SPONGE). |
| 797 |
|
- collect T & S forcing tendency into local 2-D array (passed as argument to |
| 798 |
|
apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency. |
| 799 |
|
affects results at machine truncation level (e.g., ocean: if using |
| 800 |
|
SHORTWAVE_HEATING ; atmos: if using FrictionHeating or (atm_Rq<>0) moist |
| 801 |
|
correction due to vertical advection). |
| 802 |
|
- update output of experiments: fizhi-cs-32x32x40 (13 digits), |
| 803 |
|
global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml: |
| 804 |
|
seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13), |
| 805 |
|
obcs_ctrl (ad & fwd grd @ 12 & 7). |
| 806 |
|
o pkg/ptracers & diagnostics: |
| 807 |
|
- use ptracers (short) name (instead of long one) to make ptracers diagnostics |
| 808 |
|
title (to avoid some unexpected truncation); sort out ptracers diags units. |
| 809 |
|
- collect ptracer forcing tendency into local 2-D array (passed as argument |
| 810 |
|
to apply_forcing S/R); add 3-D diagnostics for ptracers forcing tendency. |
| 811 |
|
|
| 812 |
|
checkpoint65 (2014/07/18) |
| 813 |
|
o pkg/fizhi: |
| 814 |
|
- add parenthesis around fizhi tendencies in fizhi_tendency_apply.F: this |
| 815 |
|
affects results at machine truncation level. Update output of experiments |
| 816 |
|
fizhi-cs-32x32x40 (12 digits for cg2d) & fizhi-cs-aqualev20 (13 digits). |
| 817 |
|
o pkg/seaice: more clean up |
| 818 |
|
- rename TAF common block tapes to be more consistent and remove |
| 819 |
|
unnecessary duplicates |
| 820 |
|
- add store directives to remove more recomputations, but use smaller |
| 821 |
|
tapes (and adjust keys) when SEAICE_LSR_ADJOINT_ITER is undefined. |
| 822 |
|
The idea behind this flag is to reduce the memory footprint when the |
| 823 |
|
adjoint of the LSR is not required. As of now, defining the flag |
| 824 |
|
SEAICE_LSR_ADJOINT_ITER increases 4 common block tapes for 2D field by |
| 825 |
|
a factor of SOLV_MAX_FIXED (=500 by default in SEAICE_SIZE.h). |
| 826 |
|
For experiment offline_exf_seaice, this means on a linux box with gfortran |
| 827 |
|
nearly a factor of 10 (but keep in mind there is mostly seaice code in |
| 828 |
|
this experiment): |
| 829 |
|
> size mitgcmuv_ad |
| 830 |
|
text data bss dec hex |
| 831 |
|
5100659 1216 220458952 225560827 d71c8fb |
| 832 |
|
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
| 833 |
|
but only a moderate increase of 36% for global_ocean.cs32x15: |
| 834 |
|
text data bss dec hex |
| 835 |
|
6695027 1648 1014578664 1021275339 3cdf6ccb |
| 836 |
|
6695203 1648 1382505320 1389202171 52cd8afb (SEAICE_LSR_ADJOINT_ITER) |
| 837 |
|
- note: there are still recomputations in global_ocean.cs32x15 and |
| 838 |
|
offline_exf_seaice and the gradient agreement changes (gets a |
| 839 |
|
little worse) for global_ocean.cs32x15 (-> update output_adm.seaice.txt) |
| 840 |
|
- in general, the AD gradients still are wrong |
| 841 |
|
o OpenAD |
| 842 |
|
- clean up code_oad/ directories somewhat by moving files |
| 843 |
|
dontCompile, dontTransform, keepOriginal to OAD_support/ |
| 844 |
|
o model/src: |
| 845 |
|
- using MOM fluxform and Non-Lin Free-Surf with momDissip_In_AB=F |
| 846 |
|
(not currently tested): add dissipation terms before NLFS rescaling of |
| 847 |
|
tendencies (previously done after). |
| 848 |
|
o pkg/diagnostics: |
| 849 |
|
- write stats-diags in ascii file with more digits (same as in monitor). |
| 850 |
|
o pkg/down_slope: |
| 851 |
|
- drop the bi,bj dimension of argument recip_hFac in S/R DWNSLP_APPLY; with |
| 852 |
|
NLFS (not tested), use new recip_hFac value in order to conserve tracer. |
| 853 |
|
o model/src: |
| 854 |
|
- new file "apply_forcing.F" containing all the code previously in |
| 855 |
|
external_forcing.F, but with new argument list: pass, as new argument, |
| 856 |
|
the current level tendency array to update (instead of a direct update |
| 857 |
|
of the common bloc array). Change the corresponding calls. |
| 858 |
|
- add CPP option USE_OLD_EXTERNAL_FORCING (default is undef) to use |
| 859 |
|
EXTERNAL_FORCING_U,V,T,S subroutines (for backward compatibility). |
| 860 |
|
o pkg/seaice/seaice_lsr, a little bit of clean up |
| 861 |
|
- rearrange some code blocks, so that now all calculations for |
| 862 |
|
setting up the right-hand-sides done within one single block |
| 863 |
|
(I find that easier to read and understand) |
| 864 |
|
- rearrange freedrift-code to reduce the number of ifdefs |
| 865 |
|
- adjust some indentations and comments |
| 866 |
|
|
| 867 |
|
checkpoint64z (2014/07/10) |
| 868 |
|
o model/src and several pkgs: |
| 869 |
|
- change argument list of all S/R called from external_forcing.F and |
| 870 |
|
called from ptracers_forcing.F (renamed to ptracers_apply_forcing.F) |
| 871 |
|
to pass, as argument, the current level tendency array to update |
| 872 |
|
(instead of a direct update of the common bloc array). |
| 873 |
|
- change also (in the same way) argument list of PTRACERS_APPLY_FORCING; |
| 874 |
|
- rename taueddy_external_forcing.f to taueddy_tendency_apply.F |
| 875 |
|
o pkg/seaice/seaice_lsr.F |
| 876 |
|
- always initialize local arrays in seaice_lsr_tridiagu/v |
| 877 |
|
- add more local tapes to seaice_lsr_tridiagu/v |
| 878 |
|
- move storing u/vice(:,:,bi,bj) out of seaice_lsr_tridiagu/v, but |
| 879 |
|
keep it in bi/bj loop; this seems to be essential |
| 880 |
|
- gradients are still wrong but only by 4-7 orders of magnitude |
| 881 |
|
instead of 15 orders of magnitude, lab_sea improves a little |
| 882 |
|
o pkg/seaice |
| 883 |
|
- (pkg/autodiff) remove storing/restoring of seaiceMaskU/V that |
| 884 |
|
generates unnecessary code in seaice_lsr_ad |
| 885 |
|
- add more store directives in seaice_lsr to avoid unnecessary code |
| 886 |
|
in seaice_lsr_ad |
| 887 |
|
- exclude some residual computations in seaice_lsr when |
| 888 |
|
ALLOW_AUTODIFF_TAMC is defined in order to avoid unnecessary code |
| 889 |
|
in seaice_lsr_ad |
| 890 |
|
- add more storing, a new tape (model/src/the_main_loop.F) and |
| 891 |
|
another key for SEAICE_LSR_VECTORIZE_ZEBRA (the local keys ilockey |
| 892 |
|
and klockey should be checked by a specialist) |
| 893 |
|
- modify ( define SEAICE_VECTORIZE_LSR and SEAICE_LSR_ADJOINT_ITER ) |
| 894 |
|
and update lab_sea after previous changes in pkg/seaice below |
| 895 |
|
o pkg/autodiff: |
| 896 |
|
- introduce useSmoothCorrel2DinAdMode, SEAICEapproxLevInAd, and |
| 897 |
|
viscFacInAd : run time parameters allowing for adjoint switches |
| 898 |
|
note : logic for useSmoothCorrel2DinAdMode is in ctrl_readparms.F |
| 899 |
|
o pkg/ecco: |
| 900 |
|
- introduce cost_gencost_boxmean.F that computes a box mean |
| 901 |
|
temperature (for use in adjoint sensitivity studies). |
| 902 |
|
o model/src/set_defaults.F : initialize viscFacAdj to 1. |
| 903 |
|
o pkg/mom_common/mom_calc_visc.F: |
| 904 |
|
- ifdef ALLOW_AUTODIFF then include viscFacAdj factor. |
| 905 |
|
o pkg/seaice/seaice_summary.F: |
| 906 |
|
- statement for SEAICEadjMODE now in autodiff_readparms.F |
| 907 |
|
o pkg/seaice: |
| 908 |
|
- remove some store directives and add new ones in an effort to get |
| 909 |
|
finally rid off the recomputation warnings. This is successful |
| 910 |
|
when SEAICE_VECTORIZE_LSR ***and*** SEAICE_LSR_ADJOINT_ITER are |
| 911 |
|
defined (i.e. no extensive recomputation warnings left), but there |
| 912 |
|
are still too many recomputations on the solver iteration level |
| 913 |
|
- define SEAICE_VECTORISZE_LSR in offline_exf_seaice/code_ad/SEAICE_OPTIONS.h |
| 914 |
|
- move definition of MPSEUDOTIMESTEPS into TAMC-block in |
| 915 |
|
SEAICE_SIZE.h |
| 916 |
|
- add a store directive in S/R seaice_calc_viscosities |
| 917 |
|
o pkg/seaice (ITD code): |
| 918 |
|
- fix definition of Hlimit for multi-threaded case |
| 919 |
|
- use double precision arithmetic to compute Hlimit: this affects results; |
| 920 |
|
update output of experiment seaice_itd. |
| 921 |
|
o replace content of verification/seaice_itd |
| 922 |
|
- instead of a 1D column use the configuration of offline_exf_seaice |
| 923 |
|
to test the ice thickness distribution code with ridging |
| 924 |
|
- this is a first shot at this experiment |
| 925 |
|
- change of some defaults of ridging parameters SEAICEhStar (from |
| 926 |
|
100 to 25) and SEAICEmuRidging (from 5 to 3) in seaice_readparms.F |
| 927 |
|
and lot of new comments. |
| 928 |
|
|
| 929 |
|
checkpoint64y (2014/06/20) |
| 930 |
|
o pkg/seaice/seaice_reg_ridge.F: |
| 931 |
|
- modify the regularization of very small volumes of ice; only check |
| 932 |
|
total volume HEFF, and do not apply correction to individual ice |
| 933 |
|
classes because that leads to funny patterns in the heat and fw-fluxes |
| 934 |
|
into the ocean. Adjust seaice_itd/results/output.txt |
| 935 |
|
- replace nITD by SEAICE_multDim in loop-ranges |
| 936 |
|
o pkg/exf: |
| 937 |
|
- add code to process the case field period = -12. with UV interpolation. |
| 938 |
|
- move debug print (formerly active when exf_verbose=T) from EXF_getFFieldRec |
| 939 |
|
into S/R that calls it (i.e., exf_set_gen.F, exf_set_uv.F & obcs_exf_load.F) |
| 940 |
|
o verification/global_with_exf: |
| 941 |
|
- switch all fields period to -12. (was previously untested) in input/data.exf |
| 942 |
|
(but keep secondary test ".yearly" unchanged); update the reference output. |
| 943 |
|
o pkg/cal: |
| 944 |
|
- new calendar type "noLeapYear" for 365 days calendar without any leap year. |
| 945 |
|
o pkg/exf: |
| 946 |
|
- new integer parameter "exf_debugLev" (default set to main model debugLevel) |
| 947 |
|
to replace logical switch "exf_verbose" |
| 948 |
|
- report in STDOUT when loading a new record (if exf_debugLev >= 3) |
| 949 |
|
o pkg/sbo: |
| 950 |
|
- update from Katherine Quinn: evaluate mass directly from density and SSH |
| 951 |
|
(budget using Finite Volume method) instead of from bottom pressure. |
| 952 |
|
- allow testreport to collect few selected SBO output ; tested in exp. |
| 953 |
|
global_ocean.90x40x15 (after updating the results, to include SBO output). |
| 954 |
|
- fix some multi-threading issues (in output part). |
| 955 |
|
o model/src & most packages: |
| 956 |
|
- always call {PKG}_READPARMS even if corresponding use{PKG}=F; |
| 957 |
|
- in {PKG}_READPARMS, in case use{PKG}=F: add a call to new S/R |
| 958 |
|
PACKAGES_UNUSED_MSG to print a weak warning when parameter file |
| 959 |
|
"data.{pkg}" exist ; and leave the S/R (return) just after. |
| 960 |
|
- more standard LAND pkg interface (land_init_fixed.F, land_check.F). |
| 961 |
|
+ call LAND_READPARMS from packages_readparms.F |
| 962 |
|
o pkg/seaice: |
| 963 |
|
- remove code that resets useThSice in S/R seaice_readparms and |
| 964 |
|
replace it by a warning in S/R seaice_check |
| 965 |
|
- remove parameter MULTDIM, replace with nITD and runtime |
| 966 |
|
parameter SEAICE_multDim (still hard-wired to nITD if |
| 967 |
|
SEAICE_ITD is defined) |
| 968 |
|
|
| 969 |
|
checkpoint64x (2014/05/24) |
| 970 |
|
o verification/lab_sea: |
| 971 |
|
- update adjoint and TLM output following changes to pkg/salt_plume |
| 972 |
|
- un-do the update after putting back local recip_Cp in few places. |
| 973 |
|
o pkg/salt_plume: modifications by An Nguyen: |
| 974 |
|
- add capability to do brine rejection (salt-plume) as function of |
| 975 |
|
volume+tracers (instead of only salinity tracer). |
| 976 |
|
- conserve volume by exchanging volume from each kLev to above to |
| 977 |
|
accommodate in-coming brine volume |
| 978 |
|
- store surface and klev exchanged fraction + volume in 4 new 3-d arrays |
| 979 |
|
- switch KPP surf buoyancy due to brine forcing to 3-d |
| 980 |
|
(3 more 3-d arrays, 2 for SPforcing[T,S], 1 for boplume) |
| 981 |
|
- add salt_plume_volfrac, salt_plume_apply, salt_plume_tendency_apply_t |
| 982 |
|
- unrelatedly, also add ad-hoc capability to vary salt_plume scheme |
| 983 |
|
in East/West Arctic. |
| 984 |
|
o pkg/sbo: |
| 985 |
|
- incorporate modifications from Katherine Quinn to enable the use of sbo |
| 986 |
|
pkg in ECCO-v4 set-up ; remove SBO-TimeAve output ; add monitor-like |
| 987 |
|
output for future testreport verification (unfinished). |
| 988 |
|
o pkg/atm_phys: |
| 989 |
|
- change diagnostics (AtPh_Trf & AtPh_Qrf) of DARGAN_BETTSMILLER S/R: |
| 990 |
|
skip the reseting of t_ref & q_ref to initial t & q ; this preserve the |
| 991 |
|
output of S/R CAPECALCNEW (Parcel temp & q) for diagnostics. |
| 992 |
|
o pkg/seaice |
| 993 |
|
seaice_calc_ice_strength.F: modify expression to avoid divisions |
| 994 |
|
(affects truncation) |
| 995 |
|
seaice_do_ridging.F: clean up the insectarium |
| 996 |
|
- fix a bug that was compensated by areaScaling (-> remove areaScaling code) |
| 997 |
|
- added SEAICEsnowFracRidge to redistributed snow (2nd bug) |
| 998 |
|
- set closing/openingRate to zero where no extra iteration is need (3rd bug) |
| 999 |
|
- add some debugging information and error messages (warnings) |
| 1000 |
|
o model/src: modifications relatd to atmosphere p*: |
| 1001 |
|
- Switch to more accurate p* coordinate slope term (calc_grad_phi_hyd.F) |
| 1002 |
|
- With p* or Sigma-P, use constant reference Pot.Temp (thetaConst) instead |
| 1003 |
|
of vertical profile tRef in geopotential background and anomaly. |
| 1004 |
|
- Acount for true p* correction in theta <-> T conversion in pkg/aim_v23 |
| 1005 |
|
and pkg/atm_phys. |
| 1006 |
|
- Update FWD output of experiments: aim.5l_cs (x2), fizhi-cs-32x32x40, |
| 1007 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, tutorial_held_suarez_cs, cpl_aim+ocn. |
| 1008 |
|
o pkg/seaice: fix a bug in seaice_prepare_ridging.F, forgot a sqrt |
| 1009 |
|
o pkg/ptracers: compute ptracer source/sink due to linear free surface. |
| 1010 |
|
not used right now, but can be used in BGC packages to fix conservation. |
| 1011 |
|
o pkg/dic, pkg/gchem: move tracer_meanarea to gchem, so it can be used by |
| 1012 |
|
other packages too. |
| 1013 |
|
o pkg/seaice/seaice_calc_ice_strength.F: replace SEAICE_rhoSnow by |
| 1014 |
|
SEAICE_rhoIce in the Rothrock (1975)-type strength calculations (bug fix) |
| 1015 |
|
o model/src: |
| 1016 |
|
- since we have several heat capacity (even in model/src), define "recip_Cp" |
| 1017 |
|
as local variable (no longer in common block) to avoid any confusion. |
| 1018 |
|
- add thetaConst in PARAMS.h (to be used with pStar or sigma-P coords). |
| 1019 |
|
o pkg/exf: |
| 1020 |
|
- from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local |
| 1021 |
|
air density as function of air Temp, Humidity and atm pressure. |
| 1022 |
|
|
| 1023 |
|
checkpoint64w (2014/05/02) |
| 1024 |
|
o verification: |
| 1025 |
|
- update output_adm.txt files for experiment global_ocean.cs32x15 (seaice & |
| 1026 |
|
seaice_dynmix) and lab_sea (primary test & noseaicedyn): moving/changing |
| 1027 |
|
code from seaice_growth.F & seaice_advdiff.F to new ridging routines |
| 1028 |
|
seaice_reg_ridge.F seaice_do_ridging.F affects AD gradient |
| 1029 |
|
(down to 8-7 matching digits for global_ocean and 5-6 for lab_sea). |
| 1030 |
|
o model/src: for atmosphere in p* coords: |
| 1031 |
|
- store factor rStarFacC**atm_kappa (= pStarFacK) in common block |
| 1032 |
|
- implement more accurate p* coordinate slope term (in calc_grad_phi_hyd.F), |
| 1033 |
|
but not yet activated. |
| 1034 |
|
o pkg/seaice: fix restart problem for ITD with new ice strength parameterisation: |
| 1035 |
|
- move computation of opnWtrFrac = 1-AREA to before computing ice strength |
| 1036 |
|
- this changes the results (but not for any verification experiment, because |
| 1037 |
|
none tests this), but avoids having an extra field in the restart files |
| 1038 |
|
o pkg/seaice: remove global variable TICE (not needed) |
| 1039 |
|
- replace by TICES or local variable where necessary (cost_seaice_test, |
| 1040 |
|
seaice_diagnostics_state) |
| 1041 |
|
- move copying TICE to TICES from seaice_check_pickup to seaice_read_pickup |
| 1042 |
|
- use specific read/write routines for reading and writing individual leves |
| 1043 |
|
of a multilevel field |
| 1044 |
|
o pkg/ctrl & model/inc: |
| 1045 |
|
- move additional anomaly fields of control vars (related to options: |
| 1046 |
|
ALLOW_KAPGM_CONTROL, ALLOW_KAPREDI_CONTROL and ALLOW_BOTTOMDRAG_CONTROL) |
| 1047 |
|
from DYNVARS.h into new header file: CTRL_FIELDS.h |
| 1048 |
|
o pkg/seaice: some small modifications to the ridging code |
| 1049 |
|
- make fw2ObyRidge a global variable and add the freshwater flux to |
| 1050 |
|
seaice_growth |
| 1051 |
|
- pass actual thickness from seaice_prepare_ridging, so that it is |
| 1052 |
|
computed only in one place and compute it in the same way as in |
| 1053 |
|
seaice_growth |
| 1054 |
|
- initialise more fields in seaice_do_ridging that where cause floating |
| 1055 |
|
point exceptions over land |
| 1056 |
|
o pkg/seaice: preparations for ridging code and first real ridging code |
| 1057 |
|
- move most of "PART 1" of S/R seaice_growth into a new and separate |
| 1058 |
|
S/R seaice_reg_ridge that will both regularize the state variable after |
| 1059 |
|
advection call the actual ridging routine; |
| 1060 |
|
- requires to make 5 fields global fields: d_HEFFbyNEG,d_HSNWbyNEG, |
| 1061 |
|
d_AREAbyRLX,d_HEFFbyRLX,saltFluxAdjust; |
| 1062 |
|
- remove ridging code from seaice_advdiff |
| 1063 |
|
- clean up remaining part 1 of seaice_growth in an attempt to make it |
| 1064 |
|
more readable (this is probably subjective) |
| 1065 |
|
- call seaice_itd_redist once in the initialisation phase to have the initial |
| 1066 |
|
conditions in the correct category |
| 1067 |
|
- finally: add new ridging routine for ITD code |
| 1068 |
|
|
| 1069 |
|
checkpoint64v (2014/04/11) |
| 1070 |
|
o pkg/ecco: |
| 1071 |
|
- add runtime parameters mdt[start,end]date[1,2] |
| 1072 |
|
- rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile" |
| 1073 |
|
o pkg/seaice: |
| 1074 |
|
- make deltaC a global variable, so that it can be used in ridging code |
| 1075 |
|
- first step towards ridging: introduce new routines that compute |
| 1076 |
|
ice strength based on ridging parameters |
| 1077 |
|
- add diagnostic for HSNOWITD |
| 1078 |
|
- add opnWtrFrac as a global variable (required for ridging scheme) |
| 1079 |
|
o pkg/salt_plume + pkg/seaice/seaice_growth.F |
| 1080 |
|
- add SALT_PLUME_IN_LEADS flag to activate pkg/salt_plume only when ice |
| 1081 |
|
AREA exceeds a threshold (code contributed by I.Fenty in 2011) |
| 1082 |
|
o verification/hs94.1x64x5: |
| 1083 |
|
- leave ALLOW_AUTODIFF_TAMC undefined in code_oad/AUTODIFF_OPTIONS.h |
| 1084 |
|
- do not use ECCO_CPPOPTIONS.h anymore for TAF & OpenAD Adjoint tests. |
| 1085 |
|
o autodiff: |
| 1086 |
|
- Start to include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, |
| 1087 |
|
and CTRL_OPTIONS.h in src files (to enable to skip the ECCO_CPPOPTIONS.h) |
| 1088 |
|
For now, only in pkgs used in verification/hs94.1x64x5. |
| 1089 |
|
- Replace ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for tape/storage |
| 1090 |
|
which are specific to TAF/TAMC). |
| 1091 |
|
- Replace ALLOW_AUTODIFF_OPENAD by ALLOW_OPENAD: |
| 1092 |
|
since ALLOW_OPENAD is defined in PACKAGES_CONFIG.h (any time pkg/openad |
| 1093 |
|
is compiled), this simplifies/reduces which *_OPTIONS.h file to include. |
| 1094 |
|
- OpenAD: change Makefile to generate the appropriate AD_CONFIG.h when |
| 1095 |
|
building mitgcmuv_ad (make adAll). |
| 1096 |
|
o pkg/ecco: |
| 1097 |
|
- cost_gencost_seaicev4.F: |
| 1098 |
|
reformulate proxy cost as function of sst and local param SEAICE_freeze |
| 1099 |
|
change cost names from siv4-[sst,vol] to siv4-[deconc,exconc] |
| 1100 |
|
- add stop statement if old names siv4-[sst,vol] are used |
| 1101 |
|
- add snapshots + cost reports for atmospheric longwave |
| 1102 |
|
- remove factor 0.1 in front of wtau[u,v] |
| 1103 |
|
- replace never used flag ALLOW_TMI_COST_CONTRIBUTION with |
| 1104 |
|
ALLOW_TMI_SST_COST_CONTRIBUTION |
| 1105 |
|
o pkg/atm_phys: |
| 1106 |
|
- add some diagnostics for Short-wave and for convection S/R. |
| 1107 |
|
o pkg/seaice/seaice_growth: |
| 1108 |
|
- fix a bug in the lateral melt parameterization for SEAICE_ITD |
| 1109 |
|
in seaice_growth; tempFrz needs to be computed inside the i/j-loop |
| 1110 |
|
- rearrange loop order for better vector code in the same code block |
| 1111 |
|
- rewrite the floeDiameter formula to have fewer divisions |
| 1112 |
|
- (miraculously) none of this changes the results of seaice_itd |
| 1113 |
|
o pkg/smooth: |
| 1114 |
|
- move param smooth2Ddiffnbt to pkg/ecco |
| 1115 |
|
o pkg/salt_plume: |
| 1116 |
|
- salt_plume_frac.F: |
| 1117 |
|
clean up local param names |
| 1118 |
|
reformulate (1-frac) to frac; original 1-frac was based on swfrac code |
| 1119 |
|
o pkg/rw: |
| 1120 |
|
- add RS version of S/R READ_MFLDS_LEV. |
| 1121 |
|
o pkg/streamice: |
| 1122 |
|
- fix the restart test by writing/reading pickup_streamice files. |
| 1123 |
|
o pkg/seaice: |
| 1124 |
|
- refine checks for jfnk-related parameters |
| 1125 |
|
- comment out if statement with SEAICEuseIMEX parameter as long as there |
| 1126 |
|
is no IMEX code to avoid confusion and surprises |
| 1127 |
|
|
| 1128 |
|
checkpoint64u (2014/03/07) |
| 1129 |
|
o verification/MLAdjust: |
| 1130 |
|
- rename secondary test suffix: |
| 1131 |
|
1.leith -> A4FlxF + switch to flux-form & add side-drag |
| 1132 |
|
0.leithD -> AhFlxF + switch to flux-form |
| 1133 |
|
0.smag -> AhVrDv (use Vorticity-Div. visc form) + add side-drag |
| 1134 |
|
0.leith -> AhStTn (use Strain-Tension visc form) + add side-drag |
| 1135 |
|
o pkg/mom_vecinv: |
| 1136 |
|
- remove unused arguments from S/R MOM_VI_HDISSIP & MOM_HDISSIP (as it used |
| 1137 |
|
to be before mom_calc_visc.F) |
| 1138 |
|
- skip the call to MOM_CALC_TENSION & MOM_CALC_STRAIN if not needed. |
| 1139 |
|
- add 2nd copy of vort3 & strain that knows about lateral BC (free/no slip): |
| 1140 |
|
this is simpler for the adjoint and for diagnostics. |
| 1141 |
|
o model/src + pkg/momentum: |
| 1142 |
|
- add input files for 2-D additional Western and Southern cell-edge wall |
| 1143 |
|
(e.g., to add "thin-wall" where it is =1). |
| 1144 |
|
- fix sideDrag option for thin-walls with Non-Lin Free-Surf |
| 1145 |
|
using 2nd hFacZ that is computed from initial (fix domain) hFac |
| 1146 |
|
- known limitations of thin wall implementation: not yet coded for sigma |
| 1147 |
|
coords; not working with CD-scheme neither. |
| 1148 |
|
o pkg/seaice: |
| 1149 |
|
- rename recently introduced parameters from (wrong name) AB to |
| 1150 |
|
BDF (backward difference time discretisation) |
| 1151 |
|
- retire runtime parameters SEAICEuseAB2, SEAICE_abEps |
| 1152 |
|
o tools/adjoint_options: |
| 1153 |
|
- remove setting of "OPENAD=true" (now set by command line "genmake2 -oad") |
| 1154 |
|
|
| 1155 |
|
checkpoint64t (2014/02/01) |
| 1156 |
|
o pkg/ecco |
| 1157 |
|
- add compile flag ALLOW_GENCOST_TIMEVARY_WEIGHT in ECCO_OPTIONS.h and |
| 1158 |
|
runtime logical flag gencost_timevaryweight to read daily sea-ice sigma |
| 1159 |
|
- replace hard-coded record number and period which only work for monthly |
| 1160 |
|
with read-in runtime param that works for other periods (month,day,year) |
| 1161 |
|
o pkg/thsice |
| 1162 |
|
- corrected store directive fixes thsice adjoint gradient checks |
| 1163 |
|
o genmake2 & testreport: |
| 1164 |
|
- add genmake2 option "-oad" to generate a Makefile for OpenAD built and |
| 1165 |
|
in this case, use tools/adjoint_options/adjoint_oad as default AD optfile. |
| 1166 |
|
Update testreport accordingly. No need to set "export OPENAD=true" |
| 1167 |
|
in adjoint_options/adjoint_oad anymore (will be removed later). |
| 1168 |
|
o pkg/shelfice: |
| 1169 |
|
- put T & S shelfice forcing into model surfaceForcing_T,_S (for now, |
| 1170 |
|
only if SHELFICEboundaryLayer=F); Change model/src/external_forcing.F |
| 1171 |
|
so that surface forcing applies to k=kSurf if using pkg/shelfice. |
| 1172 |
|
o pkg/ctrl, pkg/grdchk, pkg/ecco: |
| 1173 |
|
- Changes to make GENARR more modular (i.e. invisible if not used) |
| 1174 |
|
o model/src/temp_integrate.F and salt_integrate.F |
| 1175 |
|
- re-include store directives that were removed on Dec 27th. |
| 1176 |
|
o model/src/external_forcing_surf.F |
| 1177 |
|
- add storage directives for EmPmR and PmEpR to avoid recomputation of |
| 1178 |
|
seaice_model in the adjoint that is problematic when seaice_model is |
| 1179 |
|
turned off in the adjoint. The resolved issue dated back to July when |
| 1180 |
|
EXTERNAL_FORCING_SURF call was moved. |
| 1181 |
|
Update global_ocean.cs32x15/*/output_adm.seaice_dynmix.txt accordingly. |
| 1182 |
|
o pkg/exf/exf_check.F |
| 1183 |
|
- fix a small bug again (originally found by Wentao Liu, now found again) |
| 1184 |
|
- streamline error output |
| 1185 |
|
o pkg/streamice and aim_v23: |
| 1186 |
|
- replace a few "_EXCH_XY_RL (" with "_EXCH_XY_RL(", so that |
| 1187 |
|
Apple's /usr/bin/cpp knows what to do: |
| 1188 |
|
Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
| 1189 |
|
Target: x86_64-apple-darwin13.0.0 |
| 1190 |
|
|
| 1191 |
|
checkpoint64s (2014/01/05) |
| 1192 |
|
o tools/adjoint_options: |
| 1193 |
|
- switch to fastopt.net TAF server (instead of default fastopt.de) for |
| 1194 |
|
AD optfiles adjoint_diva & adjoint_f95 (similar to adjoint_default). |
| 1195 |
|
o model/src: |
| 1196 |
|
- remove some unnecessary TAF storage directives in forward_step.F and |
| 1197 |
|
in dynamics.F (note: not always removed by TAF, e.g., double storage |
| 1198 |
|
of kappaRU,kappaRV in former version of dynamics.F). |
| 1199 |
|
o model/src & pkg/ptracers: |
| 1200 |
|
- call directly GAD_IMPLICIT_R & IMPLDIFF + DWNSLP_APPLY from temp_integrate.F |
| 1201 |
|
salt_integrate.F and ptracers_integrate.F (instead of from thermodynamics.F) |
| 1202 |
|
and remove ptracers_dwnslp_apply.F & ptracers_implicit.F |
| 1203 |
|
- call MATRIX_STORE_TENDENCY_EXP for each tracer (in ptracers_integrate.F) |
| 1204 |
|
- add fZon & fMer as output argument of S/R GAD_CALC_RHS. |
| 1205 |
|
- update TAF AD-output of experiments global_ocean.90x40x15 (13 for AD-grad). |
| 1206 |
|
o useSingleCpuInput separates single-CPU input from single-CPU output; |
| 1207 |
|
for now only implemented for in exf_interp_read.F |
| 1208 |
|
o verification/advect_xy: |
| 1209 |
|
- fix missing EXCH call in local version of ini_salt.F and update output. |
| 1210 |
|
o momentum diagnostics: |
| 1211 |
|
- fix which deltaT is used in Total-Tendency diagnostics. |
| 1212 |
|
- fix typo in diagnostics for momentum tendency from AB. |
| 1213 |
|
o pkg/seaice/seaice_lsr.F: fix an initialisation bug for the |
| 1214 |
|
SEAICE_VECTORIZE_LSR_ZEBRA option that lead to NaNs on a NEC-SX8 |
| 1215 |
|
|
| 1216 |
|
checkpoint64r (2013/12/08) |
| 1217 |
|
o verification/*/results: |
| 1218 |
|
- Update reference output of experiments that were passing with just 13 digits |
| 1219 |
|
(make it easier to detect future changes in results) |
| 1220 |
|
o model/src & pkg/ptracers: |
| 1221 |
|
- move calls to GAD_ADVECTION (Multi-Dim advection) from thermodynamics.F to |
| 1222 |
|
inside temp_integrate.F and salt_integrate.F and from ptracers_advection.F |
| 1223 |
|
to inside ptracers_integrate.F ; remove ptracers_advection.F |
| 1224 |
|
o coupling interface pkgs: |
| 1225 |
|
[atm_compon_interf, ocn_compon_interf & atm_ocn_coupler] |
| 1226 |
|
- change the config check to test the agreement of Ocean Depth |
| 1227 |
|
with ATM land/sea mask (instead of ATM orography); |
| 1228 |
|
- send to coupler the number of coupler time-steps to do for this run: |
| 1229 |
|
this allows to check for consistency and don't need anymore to be |
| 1230 |
|
specified in parameter file "data"; |
| 1231 |
|
in coupler: |
| 1232 |
|
- check consistency of RunOff map versus Ocean Depth and ATM land/sea mask. |
| 1233 |
|
- improve report to log-file of config setting (pass log-file unit to few S/R) |
| 1234 |
|
o pkg/compon_communic: |
| 1235 |
|
- add coupling send/receive for non-tiled integer vector; |
| 1236 |
|
- add S/R to check and stop if any proc has an error (similar to |
| 1237 |
|
eesupp/src/stop_if_error.F but single thread and across Comm_World). |
| 1238 |
|
o pkg/exch2: |
| 1239 |
|
- in exch2*_get_rx[1,2]: use new list "W2_tileIndex" to replace search |
| 1240 |
|
through list of all tiles my proc owns. |
| 1241 |
|
o model/src: |
| 1242 |
|
- AUTODIFF only: in calc_adv_flow.F, recompute rTransKp (instead of copying |
| 1243 |
|
from rTrans) to simplify dependencies (no need to store rTrans anymore in |
| 1244 |
|
calling S/R); this affects AD results at machine truncation level: |
| 1245 |
|
update AD-output (TAF) of experiments: 1D_ocean_ice_column, |
| 1246 |
|
bottom_ctrl_5x5 & obcs_ctrl (12 digits for AD grad, same FWD grad). |
| 1247 |
|
o tools/build_options: |
| 1248 |
|
- simplify Warnings options (-ieee & -devel cases) in linux_amd64_gfortran |
| 1249 |
|
o coupling interface pkgs: |
| 1250 |
|
[compon_communic, atm_compon_interf & ocn_compon_interf] |
| 1251 |
|
- move declaration of local array "ibuf" out of header file "CPLR_SIG.h" |
| 1252 |
|
to each S/R that needs it; remove un-used variables. |
| 1253 |
|
- change component tile registration (cpl_register.F in both compon_interf |
| 1254 |
|
and mitcomponent_tile_register.F) to pass the full list of tiles |
| 1255 |
|
information (including bi,bj) in 1 vector (instead of in a bi,bj matrix). |
| 1256 |
|
- with pkg/exch2: adopt the same convention used for I/O to define mapping |
| 1257 |
|
towards coupler global array (unless W2_useE2ioLayOut=F): |
| 1258 |
|
a) can now use different tiling between atm & ocn comp. |
| 1259 |
|
b) no needs to modify the run-Off map when changing tiling (was needed |
| 1260 |
|
even if using the same tiling between atm & ocn). |
| 1261 |
|
c) will allow to run with blank-tiles in 1 component (e.g., for ocean |
| 1262 |
|
full land tiles); not yet tested. |
| 1263 |
|
- check for valid mapping from comp. tile to coupler global array |
| 1264 |
|
- improve report of tile registration results to log file. |
| 1265 |
|
o pkg/exch2: |
| 1266 |
|
- in eesupp/src/eeboot.F: move call to W2_EEBOOT before Coupler |
| 1267 |
|
tile-registration (CPL_REGISTER); |
| 1268 |
|
- activate (un-comment) definition and setting of "W2_tileIndex" list to |
| 1269 |
|
store the local bi,bj indices of each tile; |
| 1270 |
|
- also print bi,bj in local report to log file; |
| 1271 |
|
- fix pkg/debug/debug_cs_corner_uv.F for the case nSy > 1 (left from |
| 1272 |
|
Jun 2009 modif of pkg/exch2). |
| 1273 |
|
o testing on baudelaire: |
| 1274 |
|
- run 2 tests at a time: no significant slow down (since enough cpu) and |
| 1275 |
|
get the full set of test done earlier |
| 1276 |
|
- switch the ifort test to "-devel" ; run the OpenAD test everyday. |
| 1277 |
|
o model/src/thermodynamics.F and routines called from it: |
| 1278 |
|
- pkg/gmredi: gmredi_residual_flow.F (replacing gmredi_calc_uvflow.F & |
| 1279 |
|
gmredi_calc_wflow.F) to update eulerian velocity (input) into residual |
| 1280 |
|
velocity (outp) by adding bolus velocity. |
| 1281 |
|
- model/src: calc_adv_flow.F (replacing calc_common_factors.F) to compute |
| 1282 |
|
mass transport from velocity + lateral grid cell area |
| 1283 |
|
- rename calc_gt.F to temp_integrate.F (includes call to TIMESTEP_TRACER) |
| 1284 |
|
- rename calc_gs.F to salt_integrate.F (includes call to TIMESTEP_TRACER) |
| 1285 |
|
in thermodynamics.F |
| 1286 |
|
- remove k from thermodynamics.F and move it to temp_integrate.F |
| 1287 |
|
salt_integrate.F and ptracers_integrate.F (now done inside the tracer |
| 1288 |
|
loop). |
| 1289 |
|
- compute locally (in thermodynamics.F) 3-D velocity field that is used to |
| 1290 |
|
advect tracers; pass it as argument to GAD_ADVECTION, GAD_SOM_ADVECT, |
| 1291 |
|
PTRACERS_ADVECTION, TEMP_INTEGRATE, SALT_INTEGRATE, PTRACERS_INTEGRATE, |
| 1292 |
|
GAD_IMPLICIT_R and PTRACERS_IMPLICIT |
| 1293 |
|
- update AD-output (TAF & OAD) of experiments: 1D_ocean_ice_column, |
| 1294 |
|
global_ocean.90x40x15, tutorial_global_oce_biogeo and |
| 1295 |
|
tutorial_tracer_adjsens (+ TLM output). |
| 1296 |
|
o tools/OAD_support and (verification/*/) code_oad: |
| 1297 |
|
- OAD_support/cb2mGetModules.csh: add PACKAGES_CONFIG.h in header file to |
| 1298 |
|
module conversion ; remove unneeded CPP_EEOPTIONS.h. |
| 1299 |
|
- code_oad/CPP_OPTIONS.h: remove PACKAGES_CONFIG.h and use a more standard |
| 1300 |
|
version (closer to model/inc/CPP_OPTIONS.h). |
| 1301 |
|
o model/src: |
| 1302 |
|
- remove parameter "useOldFreezing" from PARAMS.h and push it to the |
| 1303 |
|
retired list of parameters (routine FREEZE has been replace by surface |
| 1304 |
|
freezing (10.yrs ago) and by pkg/frazil (interior freezing). |
| 1305 |
|
o pkg/gmredi: |
| 1306 |
|
- add option (GM_CALC_TRANSP_FROM_VEL) to compute transport directly from |
| 1307 |
|
velocity (same scheme but affects machine truncation) for GM_AdvForm. |
| 1308 |
|
- update output of FWD experiments: front_relax.bvp, |
| 1309 |
|
global_ocean.90x40x15.dwnslp, global_ocean.cs32x15 and ideal_2D_oce. |
| 1310 |
|
|
| 1311 |
|
checkpoint64q (2013/11/17) |
| 1312 |
|
o verification: |
| 1313 |
|
- generate new output on baudelaire (gfortran, -ieee) for OpenAD experiments |
| 1314 |
|
tutorial_global_oce_biogeo and global_ocean.90x40x15. |
| 1315 |
|
- generate new output (growth & melt) for seaice_itd experiment after |
| 1316 |
|
updating the input pickup_seaice files (previously wrong). |
| 1317 |
|
o pkg/cost: |
| 1318 |
|
- define a "final cost function" for each tile, and use GLOBAL_SUM_TILE_RL |
| 1319 |
|
(instead of _GLOBAL_SUM_RL) to get the final cost from all procs & threads: |
| 1320 |
|
o this fixes global-sum value if multi-threads (since GLOBAL_SUM_RL |
| 1321 |
|
cannot be applied to var in common block). |
| 1322 |
|
o allows to get results independent of tile-per-proc setting (if using |
| 1323 |
|
slower GLOBAL_SUM_SEND_RECV option). |
| 1324 |
|
- update accordingly: seaice_cost_final.F, shelfice_cost_final.F, |
| 1325 |
|
thsice_cost_final.F and ecco_cost_final.F (this one affects lab_sea |
| 1326 |
|
forward gradients: update output). |
| 1327 |
|
- update */code_oad/externalDummies.F by adding dummy GLOBAL_SUM_TILE_RL |
| 1328 |
|
S/R and, for most exp., also comment out GLOBAL_SUM_R8. |
| 1329 |
|
o pkg/mom_common: |
| 1330 |
|
- move to pkg/mom_common and model/src (previously in tutorial_deep_convection |
| 1331 |
|
code) 2nd version of isotropic 3-D Smagorinsky code interface: strain and |
| 1332 |
|
viscosity are locally declared in dynmics.F and pass as argument to CALC_GW; |
| 1333 |
|
ensure that all field value that are used are set. |
| 1334 |
|
o tutorial_deep_convection (smag3d): |
| 1335 |
|
- add missing scaling in mom_calc_smag_3d.F; |
| 1336 |
|
- set smag3D_coeff in input.smag3d such that results do not change. |
| 1337 |
|
o pkg/dic: |
| 1338 |
|
- change dic_cost.F to compute cost on each tile first and then apply |
| 1339 |
|
GLOBAL_SUM_TILE_RL: this affects forward gradient of AD experiments |
| 1340 |
|
tutorial_dic_adjoffline & tutorial_global_oce_biogeo; update output. |
| 1341 |
|
- remove kLev argument and use GLOBAL_SUM_TILE_RL in tracer_meanarea. |
| 1342 |
|
o eesupp/src & pkg/mdsio: |
| 1343 |
|
- remove gather/scatter_vector.F (from eesupp) and mdsio_read/writevector.F |
| 1344 |
|
(from pkg/mdsio) since they are no longer used for tape IO. |
| 1345 |
|
- move simple C subroutine "setdir.c" from pkg/compon_communic to eesupp/src |
| 1346 |
|
(+ keep a copy in pkg/atm_ocn_coupler). |
| 1347 |
|
o verification/isomip: |
| 1348 |
|
- split domain in 8 squared tiles (instead of just 2) for FWD, AD & OAD tests. |
| 1349 |
|
o tools/build_options: |
| 1350 |
|
- optfile linux_amd64_ifort11, fast (no ieee) case: |
| 1351 |
|
to get a working restart for all experiments, add "-fp-model source" |
| 1352 |
|
to FOPTIM (also remove "-opt-streaming-stores auto" <- this is the default). |
| 1353 |
|
|
| 1354 |
|
checkpoint64p (2013/10/20) |
| 1355 |
|
o pkg/autodiff: |
| 1356 |
|
- adread_adwrite.F: when type and length do not match ALLOW_AUTODIFF_WHTAPEIO |
| 1357 |
|
criteria, return to simple (default) tape IO format. |
| 1358 |
|
o pkg/mdsio (+ eesupp/src): |
| 1359 |
|
- rewrite/simplify tape-IO S/R (new S/R MDS_READ/WRITE_TAPE replace |
| 1360 |
|
previous MDSREAD/WRITEVECTOR) with 2 array argument from each type (R4/R8); |
| 1361 |
|
- fix globalFile and singleCpuIO options using simpler global mapping. |
| 1362 |
|
- new pairs of scatter/gather vector S/R (one for each type, generated from |
| 1363 |
|
template) corresponding to simpler global mapping. |
| 1364 |
|
- adread_write.F: switch to new S/R (but leave old calls commented) and write |
| 1365 |
|
to globalFile when parameter globalFiles is set to True. |
| 1366 |
|
- switch on useSingleCpuIO in AD experiments: global_ocean.90x40x15 & isomip. |
| 1367 |
|
o pkg/autodiff: |
| 1368 |
|
- adread_adwrite.F: add a hack for RS arrays (when RS=real*4); |
| 1369 |
|
with ALLOW_AUTODIFF_WHTAPEIO defined, since corresponding (real*4) is |
| 1370 |
|
missing, just add a STOP if array type do not match. |
| 1371 |
|
o pkg/exf: |
| 1372 |
|
- to allow to use seaice-fraction from pkg/exf in other pkgs than pkg/seaice: |
| 1373 |
|
rename CPP option EXF_ALLOW_SEAICE_RELAX to EXF_SEAICE_FRACTION |
| 1374 |
|
and rename array obsSIce to exf_iceFraction. |
| 1375 |
|
o tutorial_deep_convection: |
| 1376 |
|
- add 1rst version of isotropic 3-D Smagorinsky code (from Louis-Philippe), |
| 1377 |
|
for now all in this exp. code dir. |
| 1378 |
|
- add secondary test using Smag-3D viscosity (keep very low backgroud visc for |
| 1379 |
|
testing) and flux-limter advection scheme for Temp. (no explicit diffusion). |
| 1380 |
|
o eesupp/src: |
| 1381 |
|
- added SINGLE_DISK_IO option because reading of parameter files on |
| 1382 |
|
very large number of processors did not work with existing set-up |
| 1383 |
|
|
| 1384 |
|
checkpoint64o (2013/09/25) |
| 1385 |
|
o pkg/atm_phys & atm_compon_interf: |
| 1386 |
|
- allows for coupling of gray-atmosphere (atm_phys) with ocean. |
| 1387 |
|
o tools/build_options: |
| 1388 |
|
- switch from "-fPIC" to "-mcmodel=medium" in optfiles: linux_amd64_gfortran |
| 1389 |
|
& linux_amd64_ifort11 and in linux_amd64_g77 & linux_amd64_open64 also |
| 1390 |
|
remove CPP setting (was identical to genmake2 default). |
| 1391 |
|
o pkg/gmredi & model/src: Some updating and work done on the residual model. |
| 1392 |
|
- created new file model/src/calc_eddy_stress.F to calculate the eddy stress. |
| 1393 |
|
- fixed up the calculation of the eddy stress and how it is added to the |
| 1394 |
|
external forcing via taueddy_external_forcing.F |
| 1395 |
|
- at the moment, it is very experimental and only works with the variable eddy |
| 1396 |
|
diffusivity calculated in gmredi_k3d.F |
| 1397 |
|
o pkg/seaice/seaice_check.F: add a check to catch the case of specifying |
| 1398 |
|
lw/swfluxfile instead of lw/swdownfile in data.exf together with pkg/seaice |
| 1399 |
|
o testreport (& tools/do_tst_2+2): |
| 1400 |
|
- for MPI test, set default COMMAND to 'mpirun -v -np TR_NPROC ./{executable}' |
| 1401 |
|
o tools/build_options: linux_amd64_gfortran & linux_amd64_ifort11: |
| 1402 |
|
- remove CPP='cpp -traditional -P' (this is genmake2 default) |
| 1403 |
|
- add switch (for big setups) to use 'medium' memory-model (but leave it |
| 1404 |
|
commented out for now). Note: needed with FC 19 to compile big setups. |
| 1405 |
|
o pkg/atm_compon_interf: |
| 1406 |
|
- regroup per field origin (model & pkgs) the coupling storage routines |
| 1407 |
|
(which accumalate in time each coupling field) |
| 1408 |
|
- move bi,bj loops inside atm_store_my_data.F and store also wind-stress; |
| 1409 |
|
update accordingly + simplify aim_do_physics.F |
| 1410 |
|
|
| 1411 |
|
checkpoint64n (2013/08/26) |
| 1412 |
|
o pkg/bbl: |
| 1413 |
|
- update formulation to reduce dispersion of tracer properties in bbl |
| 1414 |
|
- replaced horizontal and vertical transport parameters with velocities |
| 1415 |
|
- changes results for verification/global_with_exf.yearly |
| 1416 |
|
o verification/halfpipe_streamice: |
| 1417 |
|
- change to matrix construction; update both Fwd & AD output. |
| 1418 |
|
o verification/tutorial_tracer_adjsens: |
| 1419 |
|
- OpenAD test: switch to vector-invariant momentum since fluxform with |
| 1420 |
|
rStar causes problems with OpenAD; update output. |
| 1421 |
|
o tools: |
| 1422 |
|
- genmake2: define a common prefix for all temp-file names ; move them |
| 1423 |
|
to local /tmp disk (but would be easy to move them back); |
| 1424 |
|
- xmakedepend: apply the same switch for temp-files. |
| 1425 |
|
o pkg/offline: |
| 1426 |
|
- changes for use with rStar (NLFS): assume that we continue to provide |
| 1427 |
|
UVELMASS/hFacW_ini & VVELMASS/hFacS_ini (hFacWi,S_ini as written in grid |
| 1428 |
|
output files) and apply r* scaling at each time-step (function of the time |
| 1429 |
|
varying Eta field); use normal pickup files (needed for restart with NLFS). |
| 1430 |
|
o adjoint with OpenAD: |
| 1431 |
|
- move OpenAD-specific files from verification/OpenAD/code_oad_all to a new |
| 1432 |
|
package openad. This package has to be compiled for all runs with OpenAD |
| 1433 |
|
instead of specifying code_oad_all as a modification directory. |
| 1434 |
|
- link the fortran templates from tools/OAD_support to the build directory |
| 1435 |
|
for preprocessing to avoid conflicts between different setups compiled |
| 1436 |
|
simultaneously and simplify cleanup. |
| 1437 |
|
o pkg/exf: |
| 1438 |
|
- in exf_getforcing.F: comment out most of the EXCH calls (fields used by |
| 1439 |
|
main model or other pkgs are exchanged in EXF_MAPFIELDS). |
| 1440 |
|
o model/src: |
| 1441 |
|
- do_stagger_fields_exchanges.F: skip EXCH calls when using pkg/offline |
| 1442 |
|
(similar to do_fields_blocking_exchanges.F). |
| 1443 |
|
o tools/genmake2: |
| 1444 |
|
- remove TAF output src code just before calling staf (when not doing a fresh |
| 1445 |
|
built, will stop if things go wrong with staf). |
| 1446 |
|
- fix target "adobj" (left from TAF version-2 transition) |
| 1447 |
|
o pkg/diagnostics: |
| 1448 |
|
- add a parameter to track the status of pkg/diagnostics activation; |
| 1449 |
|
this replace/extend the use of logical param "settingDiags" (to check |
| 1450 |
|
when adding diag to the list) to also check any DIAGNOSTICS_[]FILL* call. |
| 1451 |
|
New S/R to print error message and stop when pkgStatus is not right. |
| 1452 |
|
- to try: add a warning when "data.diagnostics" exist but useDiagnostics=F. |
| 1453 |
|
|
| 1454 |
|
checkpoint64m (2013/08/13) |
| 1455 |
|
o model/inc: |
| 1456 |
|
- move FCORI_MACROS.h from PARAMS(_MACROS).h to GRID_MACROS.h (left from |
| 1457 |
|
8 yrs ago modif when Coriolis arrays were moved from PARAMS.h to GRID.h) |
| 1458 |
|
o pkg/kpp & aim_v23: |
| 1459 |
|
- only call DIAGNOSTICS_FILL when useDiagnostics=TRUE. |
| 1460 |
|
o pkg/seaice: |
| 1461 |
|
- restore (last time on 2011/12/24) ability to compile pkg/seaice with |
| 1462 |
|
undefined pkg/exf ALLOW_ATM_TEMP or ALLOW_RUNOFF CPP-options. |
| 1463 |
|
- only call DIAGNOSTICS_FILL when useDiagnostics=TRUE. |
| 1464 |
|
o eesupp/src: |
| 1465 |
|
- fix check for overlap-size argument (myOLn.GT.MAX_OLY_EXCH) |
| 1466 |
|
in exch1_rx[_ad].template (thanks to Francois Lefeuvre report). |
| 1467 |
|
o switch to TAF version-2: |
| 1468 |
|
- add flow directives to "freeze" naming convention for ad-routines that |
| 1469 |
|
are used in I/O routines of adjoint state and associated common blocks |
| 1470 |
|
that are used in adcommon.h (backward compatible with version-1) |
| 1471 |
|
- update all ad-optfiles (in tools/adjoint_options + few local to some |
| 1472 |
|
verification exp) to switch to latest TAF version (currently 2.5.5); |
| 1473 |
|
merge "*_mpi" adoptfiles into the corresponding non-mpi (but commented |
| 1474 |
|
out except for diva). |
| 1475 |
|
- the major change with TAF version-2 is that both the differentiated |
| 1476 |
|
routines and the forward routines (new) are returned as part of the TAF |
| 1477 |
|
output source code. Update genmake2 accordingly. |
| 1478 |
|
- new output for AD experiment tutorial_global_oce_biogeo (better AD gradient |
| 1479 |
|
with version-2 when compared to TLM or FWD gradient); other experiments |
| 1480 |
|
output show minor changes (machine truncation level); update the few AD & |
| 1481 |
|
TLM output with 12 matching digits only (some prior to version-2 switch). |
| 1482 |
|
|
| 1483 |
|
checkpoint64l (2013/08/05) |
| 1484 |
|
o model/src: |
| 1485 |
|
- in dynamics.F, skip the call to CALC_VISCOSITY if momViscosity=F |
| 1486 |
|
- main_do_loop.F: no longer includes additional (AUTODIFF) header files |
| 1487 |
|
when using TAF but only if using OpenAD. |
| 1488 |
|
o pkg/mom_common+fluxform+vecinv: |
| 1489 |
|
- always set horiz. viscosity arrays to background value before calling |
| 1490 |
|
MOM_CALC_VISC (in MOM_FLUXFORM & MOM_VECINV) and call S/R MOM_CALC_VISC |
| 1491 |
|
only when using variable horiz. viscosity (useVariableVisc=T); |
| 1492 |
|
- simplify mom_vecinv.F (only 1 block for momViscosity). |
| 1493 |
|
o pkg/mom_common: variable horiz. viscosity in NH code |
| 1494 |
|
- move horiz-viscosity 3-D arrays viscAh_W & viscA4_W (used in calc_gw.F) |
| 1495 |
|
from model/inc/NH_VARS.h to pkg/mom_common/MOM_VISC.h |
| 1496 |
|
- store in common block (in MOM_VISC.h) logical parameters: useHarmonicVisc, |
| 1497 |
|
useBiharmonicVisc & useVariableVisc. |
| 1498 |
|
- fix old bug (already in 1rst implementation of variable horizontal viscosity |
| 1499 |
|
in calc_gw.F, version 1.27, 2006/06/20): |
| 1500 |
|
horizontal bi-harmonic viscosity in gW was missing when wiscA4W=0 |
| 1501 |
|
even if variable bi-harmonic viscosity (e.g., viscA4Grid) was non-zero. |
| 1502 |
|
- change background horiz viscosity in vertical momentum (gW) to always be |
| 1503 |
|
viscAhW,viscA4W (instead of switching to viscAhD, viscA4D when using |
| 1504 |
|
any type of variable viscosity, e.g., viscAh/4Grid) |
| 1505 |
|
- change default value of viscAhW,viscA4W to viscAhD,viscA4D (instead of |
| 1506 |
|
viscAh,viscA4) which default to viscAh,viscA4 : this avoid missing |
| 1507 |
|
horiz. viscosity in W eq when just setting viscAhD/Z,viscA4D/Z (since |
| 1508 |
|
default viscAh,viscA4 is zero). |
| 1509 |
|
o model/src: |
| 1510 |
|
- extend length of drC & recip_drC from Nr to Nr+1. |
| 1511 |
|
o Divided Adjoint (DIVA) with MPI: |
| 1512 |
|
- genmake2: do not create local ./mpi_headers dir when no file to copy into. |
| 1513 |
|
- remove option ALLOW_DIVIDED_ADJOINT_MPI (replaced by ALLOW_DIVIDED_ADJOINT |
| 1514 |
|
and ALLOW_USE_MPI) from model/src code and from ECCO_CPPOPTIONS.h. |
| 1515 |
|
|
| 1516 |
|
checkpoint64k (2013/07/23) |
| 1517 |
|
o tools/OAD_support: |
| 1518 |
|
- avoid the need for file "oadtempflile" in insertTemplateDir.bash |
| 1519 |
|
and remove it from genmake2. |
| 1520 |
|
o tools/build_options: |
| 1521 |
|
- remove MPI_HEADER_FILES_INC setting (no longer used) and comment out |
| 1522 |
|
MPI_HEADER_FILES list (let genmake2 find the missing headers) |
| 1523 |
|
o verification/halfpipe_streamice: |
| 1524 |
|
- change to driving stress formulation; update both Fwd & AD output. |
| 1525 |
|
o tools/genmake2 and Divided Adjoint with MPI: |
| 1526 |
|
- remove default setting of MPIINCLUDEDIR from $MPIHOME (always been broken); |
| 1527 |
|
- only create local ./mpi_headers dir if using MPI and MPIINCLUDEDIR is set; |
| 1528 |
|
- add new variable (LOCAL_MPI_HEADERS, replace MPI_HEADER_FILES_INC) in |
| 1529 |
|
Makefile, which is set by genmake2, and check which mpi-headers are needed. |
| 1530 |
|
Note: need to update adjoint_options/adjoint_diva_mpi accordingly. |
| 1531 |
|
- update target "CLEAN" (to also remove ./mpi_headers/ dir). |
| 1532 |
|
o testreport: |
| 1533 |
|
- changes for Divided Adjoint Run: when file "run_ADM_DIVA" is present, |
| 1534 |
|
perform additional runs (number of additional runs is "add_DIVA_runs" taken |
| 1535 |
|
from file run_ADM_DIVA ; should match "nchklev_3" in file "code_ad/tamc.h"). |
| 1536 |
|
o verification/lab_sea (AD test): |
| 1537 |
|
- change to test Divided Adjoint Run in this set-up (both standard AD test |
| 1538 |
|
and 2 secondary AD test: noseaice + noseaicedyn); drop the evp AD test. |
| 1539 |
|
o pkg atm_ & ocn_compon_interf: |
| 1540 |
|
- remove cpl_earlyExpImpCall=F option (was mainly a hack added for the old |
| 1541 |
|
staggerTimeStep implementation) and disable (retired) corresponding |
| 1542 |
|
parameter. |
| 1543 |
|
o pkg/offline: |
| 1544 |
|
- comment out unused field-array: ICEM, ConvectCount, hflx[01], icem[01]; |
| 1545 |
|
- add S/R OFFLINE_CHECK to print offline parameter summary |
| 1546 |
|
and stop if loading a file that is not used; |
| 1547 |
|
- enable to calculate GMRedi tensor, KPP mixing and convective index |
| 1548 |
|
when the corresponding file(s) is/are not specified (but pkg is used). |
| 1549 |
|
- comment out resetting of monitorFreq (to endTime) since it still useful |
| 1550 |
|
for monitoring CFL numbers and checking offline fields. |
| 1551 |
|
o OpenAD: |
| 1552 |
|
- do not define OAD_DEBUG (in tools/adjoint_options/adjoint_oad) to get |
| 1553 |
|
smaller standard output) and generate new (smaller) output (on baudelaire |
| 1554 |
|
using gfortran with -ieee) for exp. tutorial_tracer_adjsens |
| 1555 |
|
o model/src: |
| 1556 |
|
- call EXTERNAL_FORCING_SURF outside bi,bj loops (in do_oceanic_phys.F), |
| 1557 |
|
(where external_forcing_adjust was called) and change list of arguments; |
| 1558 |
|
- merge external_forcing_adjust.F into external_forcing_surf.F |
| 1559 |
|
- put surface relaxation of SST & SSS in new S/R (forcing_surf_relax.F) |
| 1560 |
|
which also contains balancing surface relaxation (ALLOW_BALANCE_RELAX, |
| 1561 |
|
previously in file "balance_relax.F", now removed); remove corresponding |
| 1562 |
|
arrays in FFIELDS.h. |
| 1563 |
|
- EXTERNAL_FORCING_SURF is now called when using pkg/offline; implement |
| 1564 |
|
a hack for getting back surfaceForcingS (loaded from file) when using |
| 1565 |
|
ALLOW_OLD_VIRTUALFLUX (pkg/dic, in DIC_OPTIONS.h) in offline set-up. |
| 1566 |
|
- update output of AD test experiment global_ocean.cs32x15.seaice_dynmix |
| 1567 |
|
(was getting only 11 digits for AD-grad, due to different truncation |
| 1568 |
|
error in AD code). |
| 1569 |
|
|
| 1570 |
|
checkpoint64j (2013/07/04) |
| 1571 |
|
o pkg/offline: |
| 1572 |
|
- to enable the use of other features with pkg offline (e.g., obcs), |
| 1573 |
|
also call S/R DO_OCEANIC_PHYS in offline run - more modifs to come. |
| 1574 |
|
- comment out "allowFreezing" (now active) in 2 offline testing exp. |
| 1575 |
|
o pkg/exf ALLOW_RUNOFTEMP |
| 1576 |
|
- fix sign and make compatible with temp_EvPrRn .NE. UNSET_RL |
| 1577 |
|
- ahdded RUNOFTEMP test to verification/global_ocean.cs32x15/input.seaice |
| 1578 |
|
- changes verification/global_ocean.cs32x15/results/output.seaice.txt |
| 1579 |
|
o pkg/atm_phys: |
| 1580 |
|
- allows to add some damping on uVel,vVel (strength only function of k). |
| 1581 |
|
o verification, ad-tests: |
| 1582 |
|
- reduce length of the simulation for AD test: global_ocean.cs32x15.seaice, |
| 1583 |
|
global_ocean_ebm and offline_exf_seaice.thsice. |
| 1584 |
|
o verification/halfpipe_streamice: |
| 1585 |
|
- found a bug in s/r pkg/streamice/streamice_advect_thickness which caused |
| 1586 |
|
flux input boundary conditions to be ignored; a fix for this bug changed |
| 1587 |
|
verification results for forward test. |
| 1588 |
|
- add adjoint test. |
| 1589 |
|
o pkg/ptracers: |
| 1590 |
|
- allow to restart without SOM pickup (resetting SOM to zero). |
| 1591 |
|
o pkg/gmredi: |
| 1592 |
|
- New parameterisation for the calculation of K and (GM_PsiX,GM_PsiY) added. |
| 1593 |
|
- It uses mixing length theory and suppression by steering level effects to |
| 1594 |
|
calculate a diffusivity used in the Redi tensor (see Bates et al., submitted |
| 1595 |
|
to JPO, for more details). |
| 1596 |
|
- It also uses the diffusivity to calculate an eddy induced streamfunction |
| 1597 |
|
based on a PV closure (rather than a buoyancy closure as in GM). |
| 1598 |
|
- New files added to pkg/gmredi: |
| 1599 |
|
gmredi_k3d.F calculates the diffusivity for the Redi tensor and the eddy |
| 1600 |
|
induced overturning streamfunction (called from gmredi_calc_tensor) |
| 1601 |
|
gmredi_calc_eigs.F calculates the eigenvalues and eigenvectors required |
| 1602 |
|
for use in gmredi_k3d |
| 1603 |
|
gmredi_calc_urms.F calculates the the rms eddy velocity used to calculate |
| 1604 |
|
the eddy diffusivity |
| 1605 |
|
|
| 1606 |
|
checkpoint64i (2013/06/18) |
| 1607 |
|
o pkg/cheapaml: |
| 1608 |
|
- take src files from MITgcm_contrib/verification_other/offline_cheapaml/code |
| 1609 |
|
that enable the use of seaice (pkg/thsice thermo & pkg/seaice dynamics) |
| 1610 |
|
with pkg/cheapaml. |
| 1611 |
|
o utils/python: add subpackage for cubed sphere function, first example is |
| 1612 |
|
simple cs.pcol to plot 2D fields on a map |
| 1613 |
|
o pkg/streamice: |
| 1614 |
|
- This is a new package in MITgcm, which solves dynamic equations for ice |
| 1615 |
|
sheets and ice streams |
| 1616 |
|
- At the moment it is independent of atmosphere/ocean dynamics, or any |
| 1617 |
|
other physical packages in MITgcm, even ShelfIce (although it is anticipat- |
| 1618 |
|
ed that this will change) |
| 1619 |
|
- There is a new verification exercise that tests it, halfpipe_streamice, |
| 1620 |
|
evolves a 40x80 km ice stream/ice shelf (at coarse resolution) in a |
| 1621 |
|
rectangular embayment |
| 1622 |
|
- halfpipe_streamice is forward-only for now, will have TAF test soon |
| 1623 |
|
- for questions, email dgoldber@mit.edu |
| 1624 |
|
o pkg/thsice: |
| 1625 |
|
- fix filling of snow-precip diagnostic (SIsnwPrc) (left from the removing |
| 1626 |
|
of snowPrc from common bloc, on May 2nd, thsice_step_fwd.F revision 1.40); |
| 1627 |
|
- remove diagnostics 'SI_FrcFx' ( now identical to 'SI_Fract' with new |
| 1628 |
|
call sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect ); |
| 1629 |
|
- allow precip from pkg/cheapaml to make snow over seaice. |
| 1630 |
|
o pkg/cfc: |
| 1631 |
|
- move in separated header file (CFC_ATMOS.h) time-serie arrays of Atmos CFC |
| 1632 |
|
- remove atmos CFC 2-D arrays from common bloc (now local variables) |
| 1633 |
|
- change some hard-coded constant to run time parameter for reading and |
| 1634 |
|
and interpolating atmospheric CFC ; keep same default as previously. |
| 1635 |
|
- more flexible reading of Atmos CFC (number of records no longer hard-coded) |
| 1636 |
|
- put arguments in standard order: myTime, myIter, myThid |
| 1637 |
|
- use standard S/R GET_PERIODIC_INTERVAL for time interpolation of |
| 1638 |
|
atmospheric CFC ; fix for the case myIter < PTRACERS_iter0. |
| 1639 |
|
- fix calculation of surf tendencys for partial-cell and/or Non-Lin Free-Surf |
| 1640 |
|
- new routine to print summary of CFC params and check for consistency. |
| 1641 |
|
o pkg/seaice: add uice/vice to the parameter list of s/r seaice_advdiff, |
| 1642 |
|
similar to thsice_advdiff. |
| 1643 |
|
Note that for the B-grid case the routine parameters uc/vc are overwritten. |
| 1644 |
|
o pkg/cfc: |
| 1645 |
|
- change time interpolation for atmospheric CFC-11 (now same as for CFC-12); |
| 1646 |
|
update output (CFC-11) of experiment cfc_example and tutorial_cfc_offline. |
| 1647 |
|
- fix interpolation of atmphspheric CFC between Sorthern and Northern |
| 1648 |
|
hemisphere value. |
| 1649 |
|
o pkg/seaice: |
| 1650 |
|
- allow to use seaice dynamics without pkg/exf (e.g., using pkg/cheapaml) |
| 1651 |
|
o pkg/seaice: add Adams-Bashforth2 time discretization for ice dynamics; |
| 1652 |
|
so far only for JFNK-solver, turn on with SEAICEuseAB2 = .TRUE. |
| 1653 |
|
- requires an additional time level that is stored in the pickup |
| 1654 |
|
- you can start with AB2 from a pickup without this time level with |
| 1655 |
|
pickupStrictlyMatch = .false. |
| 1656 |
|
|
| 1657 |
|
checkpoint64h (2013/05/26) |
| 1658 |
|
o pkg/cheapaml: |
| 1659 |
|
- replace one ()**.5 with SQRT + use temp var "cdu = tau/Du" (coare3_flux); |
| 1660 |
|
affect machine truncation (but exp cheapAML_box still pass with 13 digits). |
| 1661 |
|
- consistent treatment of uWind,vWind location: assume everywhere in |
| 1662 |
|
pkg/cheapaml that they are on C-grid (@ uVel,vVel location) |
| 1663 |
|
(Note: was already the case for Tair,Qair advection); |
| 1664 |
|
add option (INCONSISTENT_WIND_LOCATION) to recover old results. |
| 1665 |
|
- compute diabatic forcing only in the interior (excluding overlap regions) |
| 1666 |
|
- fill in array "Qsw" (for short-wave heating); |
| 1667 |
|
- add diagnostic for precip ; fill-in diagnostics for cheapAML state vars |
| 1668 |
|
before any update (consistent with MITgcm state var diagnostics); |
| 1669 |
|
- cheapaml_fields_load.F & cheapaml_init_varia.F : only fill outer edges if |
| 1670 |
|
non periodic ; + adjusted for uWind,vWind (C-grid). |
| 1671 |
|
o pkg/seaice: |
| 1672 |
|
- remove dependence of pkg/seaice versus pkg/exf (file: pkg/pkg_depend) and |
| 1673 |
|
add explicitly pkg/exf in experiments that currently use pkg/seaice. |
| 1674 |
|
- allows to compile pkg/seaice without pkg/exf. |
| 1675 |
|
o tools/OAD_support: |
| 1676 |
|
- use a local copy (ourRWCPinBd) to ensure index ourRWCP stays within bounds |
| 1677 |
|
of array "ourStepOf" in function rvNextAction (revolve.F90). |
| 1678 |
|
o pkg/aim_compon_interf renamed to pkg/atm_compon_interf |
| 1679 |
|
- change pkg name (to be used with other atmospheric physics pkg) |
| 1680 |
|
but by-pass CVS when making the new pkg so that we keep the CVS history. |
| 1681 |
|
o pkg/offline: |
| 1682 |
|
- call OFFLINE_FIELDS_LOAD from pkg/offline/offline_init_varia.F |
| 1683 |
|
(previously called from pkg/dic_surfforcing_init.F) |
| 1684 |
|
o model/src: |
| 1685 |
|
- re-order sequence of calls within packages_init_variables.F, using |
| 1686 |
|
standard order, except for: |
| 1687 |
|
DIAGNOSTICS_INIT_VARIA and OFFLINE_INIT_VARIA (called @ the top), |
| 1688 |
|
CTRL_MAP_INI and OBCS_INIT_VARIABLES (called @ the bottom) |
| 1689 |
|
o new pkg: atm_phys |
| 1690 |
|
- add entry point and source code (previously in contrib |
| 1691 |
|
verification_other/atm_gray/code_gray/) for new pkg "atm_phys" |
| 1692 |
|
(atmospheric physics pkg from P. O'Gorman and T. Schneider, JCl, 2008). |
| 1693 |
|
- re-order sequence of calls within packages_readparms.F, |
| 1694 |
|
packages_init_fixed.F and packages_write_pickup.F |
| 1695 |
|
(but skip packages_init_variables.F because of TAF issues). |
| 1696 |
|
- update contrib/*/atm_gray/ experiment. |
| 1697 |
|
o pkg/seaice (ITD code): |
| 1698 |
|
- simplify and fix the writing of pickup-files for ITD case |
| 1699 |
|
o pkg/seaice (ITD code): |
| 1700 |
|
- introduce floe size dependent lateral melt for ITD case; |
| 1701 |
|
- cleaning (avoid division by zero, change to f77 syntax, remove tabs) |
| 1702 |
|
- update seaice_itd experiment main output. |
| 1703 |
|
o pkg/thsice: |
| 1704 |
|
- remove snowPrc from common block THSICE_FLUX, in THSICE_VARS.h and |
| 1705 |
|
declared it locally (without bi,bj) in thsice_main.F & aim_do_physics.F; |
| 1706 |
|
changed accordingly pkg/atm2d. |
| 1707 |
|
|
| 1708 |
|
checkpoint64g (2013/05/01) |
| 1709 |
|
o pkg/exf ALLOW_RUNOFTEMP |
| 1710 |
|
- if defined, river and glacier runoff temperature can be read-in from |
| 1711 |
|
runoftempfile; runoftempfile needs to have same format as runofffile |
| 1712 |
|
o pkg/thsice (& pkg/bulk_force): |
| 1713 |
|
- In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account |
| 1714 |
|
for energy content of Precip + RunOff & Evap (like with pkg/exf). |
| 1715 |
|
- change computation domain to always be the interior (without overlap). |
| 1716 |
|
- fix bug (wrong overlap) when using EXF and stressReduction > 0. |
| 1717 |
|
o verification/tutorial_global_oce_biogeo: |
| 1718 |
|
- add preliminary OpenAD setup (still has problems) |
| 1719 |
|
o pkg/seaice: |
| 1720 |
|
- turn some parameters for choosing the convergence criterion of |
| 1721 |
|
the inexact Newton method (JFNK) into runtime parameters for convenience |
| 1722 |
|
- clean up seaice_calc_viscosities.F: remove/retire two options for |
| 1723 |
|
SEAICetaZmethod (1,2), introduce area weighting for method 3; this changes |
| 1724 |
|
the results of lab_sea/input because a division has been replaced by |
| 1725 |
|
a multiplication with the reciprocal (sumNorm) |
| 1726 |
|
- modify offline_exf_seaice/input.dyn_jfnk/data.seaice to improve |
| 1727 |
|
convergence of solver (changes results, of course), and to test some |
| 1728 |
|
new features |
| 1729 |
|
o model/src: |
| 1730 |
|
- remove unused (since Aug 2006) S/R SET_WRITE_GLOBAL_PICKUP and its call. |
| 1731 |
|
- remove unused forcing field "dQdT" and associated parameter "dQdTFile". |
| 1732 |
|
- move forcing adjustment (balancing surface forcing) in specific S/R |
| 1733 |
|
where might also be applied exchanges (if needed) to forcing arrays. |
| 1734 |
|
o pkg/shelfice: |
| 1735 |
|
- allow to specify the Ice-Shelf mass per unit area (instead of |
| 1736 |
|
shelficeLoadAnomaly) and do the conversion from one to the other |
| 1737 |
|
- move loading from file of shelficeLoadAnomaly from SHELFICE_INIT_VARIA |
| 1738 |
|
to SHELFICE_INIT_FIXED: (a) avoid some TAF recompution issues and |
| 1739 |
|
(b) will be loaded in time (before calling INI_PRESSURE) in case it is |
| 1740 |
|
needed in phi0surf for initial pressure calculation when useDynP_inEos_Zc |
| 1741 |
|
- update isomip experiment forward output (get machine truncation error |
| 1742 |
|
from conversion shelficeLoadAnomaly -> shelficeMass -> shelficeLoadAnomaly) |
| 1743 |
|
o verification/offline_exf_seaice: |
| 1744 |
|
revise data.seaice in input.thermo and input_ad and update results accordingly |
| 1745 |
|
HO = 0.2, SEAICE_areaLossFormula = 2, |
| 1746 |
|
SEAICE_growMeltByConv = .TRUE., |
| 1747 |
|
SEAICE_doOpenWaterMelt = .TRUE., |
| 1748 |
|
Improve consistency with input.thsice and fix the spurious 500m ice corners |
| 1749 |
|
o verification/global_ocean.cs32x15: |
| 1750 |
|
- set Energy Reference Level to liq. water @ 0 degC: temp_EvPrRn=0., |
| 1751 |
|
in icedyn (thsice+seaice-dyn) test and update output. |
| 1752 |
|
o verification/offline_exf_seaice: |
| 1753 |
|
- adjust list of tested variables (with testreport) and update |
| 1754 |
|
standard test output with better slection of monitored fields. |
| 1755 |
|
o pkg/cd_code: |
| 1756 |
|
- swtich off Adams-Bashforth on the 1rst iteration. Update output of |
| 1757 |
|
experiment lab_sea.hb87 |
| 1758 |
|
o tools/genmake2: |
| 1759 |
|
- change default makedepend from the system default to tools/xmakedepend: |
| 1760 |
|
When no makedepend is specified, select tools/xmakedepend it the test pass, |
| 1761 |
|
otherwise select the system default (if exist and pass the test) or |
| 1762 |
|
try to build cyrus-makedepend ; stop if none of the 3 works. |
| 1763 |
|
o pkg/exf & pkg/thsice: |
| 1764 |
|
- In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account |
| 1765 |
|
for energy content of Precip + RunOff & Evap. Assumes: |
| 1766 |
|
1) Rain has same temp as Air. |
| 1767 |
|
2) Snow has no heat capacity (consistent with seaice & thsice pkgs) |
| 1768 |
|
3) Run-Off comes at the temp of surface water (with same Cp) |
| 1769 |
|
4) Evap over ocean is released to the Atmos @ surf-temp (=SST); should be |
| 1770 |
|
put directly into Latent Heat flux & should use water-vapor heat capacity. |
| 1771 |
|
5) Evap over snow/seaice (pkg/thsice) assumes constant Lf+Lv (consistent |
| 1772 |
|
with snow having no Cp) => water vapor is released to Atmos @ 0^oC (=ERL). |
| 1773 |
|
o pkg/seaice: simplify the use of CPP flags in JFNK-related files |
| 1774 |
|
(compile when SEAICE_ALLOW_JFNK is defined) |
| 1775 |
|
o pkg/thsice: |
| 1776 |
|
- fix oceanic flux diagnostics & timeave (left from new sequence of calls |
| 1777 |
|
implementation): move THSICE_AVE call after the advection (called directly |
| 1778 |
|
from thsice_do_advect.F). |
| 1779 |
|
o verification/global_ocean.90x40x15 and OpenAD: |
| 1780 |
|
New experiment for OpenAD is identical to the one in input_ad except that |
| 1781 |
|
multiDimAdvection=.FALSE., |
| 1782 |
|
There is still an issue with this. |
| 1783 |
|
o pkg/thsice: |
| 1784 |
|
- account for ice velocity (ocean relative velocity) in turbulent heat flux |
| 1785 |
|
at the base of the ice; update output of global_ocean.cs32x15 (icedyn) |
| 1786 |
|
and offline_exf_seaice (main test). |
| 1787 |
|
|
| 1788 |
|
checkpoint64f (2013/03/31) |
| 1789 |
|
o verification/OpenAD: |
| 1790 |
|
- new (smaller, without OAD_DEBUG) output_oadm.txt generated using gfortran. |
| 1791 |
|
o verification/isomip, pkg/shelfice and OpenAD: |
| 1792 |
|
- add OpenAD setup to this exp and make shelfice package work with OpenAD |
| 1793 |
|
o verification/tutorial_global_oce_biogeo: |
| 1794 |
|
- update AD and TLM output after turning off ALLOW_FE (in DIC_OPTIONS.h) |
| 1795 |
|
o verification/offline_exf_seaice: |
| 1796 |
|
- replace adjoint experiment (now similar to fwd input.thermo/ setup). |
| 1797 |
|
o verification/tutorial_tracer_adjsens, pkg/ptracers and OpenAD: |
| 1798 |
|
- add OpenAD setup to this exp and make ptracers package work with OpenAD |
| 1799 |
|
o pkg/seaice/seaice_evp.F: |
| 1800 |
|
mask the asymmetric contribution of the ice-ocean stress (when |
| 1801 |
|
the turningAngle is non-zero) over open water to avoid stripes |
| 1802 |
|
in the EVP-solutions after many EVP-substeps. This does not change |
| 1803 |
|
the verification experiment (because turningAngle=0 in that experiment), |
| 1804 |
|
but will affect other EVP solutions with turningAngle.ne.0 |
| 1805 |
|
o verification, AD & TLM output: |
| 1806 |
|
- new TAF version 2.3.10 (previously 2.3.8) add more parenthesis in multiple |
| 1807 |
|
additions and multiplications which affect results at machine truncation |
| 1808 |
|
level. Update few AD output (1D_ocean_ice_column, bottom_ctrl_5x5, |
| 1809 |
|
lab_sea.noseaicedyn & offline_exf_seaice) and TLM output |
| 1810 |
|
(1D_ocean_ice_column & tutorial_tracer_adjsens.som81) which had only 12 |
| 1811 |
|
digits of matching. |
| 1812 |
|
o pkg/seaice: |
| 1813 |
|
modify lsr-algorithm so that it vectorizes AND converges by using a |
| 1814 |
|
"zebra" method: split vector loop into two with step size 2; this |
| 1815 |
|
solves a general convergence problem for the JFNK solver on a vector |
| 1816 |
|
computer. It has the potential to even improve convergence for |
| 1817 |
|
non-vector machines, but it does change the results so it is turned |
| 1818 |
|
off by default. To turn on define CPP-flags SEAICE_VECTORIZE_LSR and |
| 1819 |
|
SEAICE_VECTORIZE_LSR_ZEBRA in SEAICE_OPTIONS.h |
| 1820 |
|
|
| 1821 |
|
checkpoint64e (2013/03/05) |
| 1822 |
|
o pkg/ecco and several verification experiments: |
| 1823 |
|
Remove special versions of the_model_main.F, the_main_loop.F, forward_step.F |
| 1824 |
|
from ecco package, and revert to unified routine in model/src/ |
| 1825 |
|
Adjust verification experiments accordingly, especially gloal_oce_llc90 |
| 1826 |
|
Should conclude long-standing work by Gael to reconsile the_main_loop with |
| 1827 |
|
ECCO and will enable OpenAD's revolve loop in ECCO setup. |
| 1828 |
|
o pkg/generic_advdiff: |
| 1829 |
|
- implement compressible flow method for multi-dim advection (similar to |
| 1830 |
|
gad_som_advect.F); add new option "GAD_MULTIDIM_COMPRESSIBLE" (since |
| 1831 |
|
TAF generates many recomputations) to use it; no yet coded with implicit |
| 1832 |
|
vertical advection. |
| 1833 |
|
- change experiment advect_cs (new output) and advect_xy (same output) |
| 1834 |
|
to test compressible flow multi-dim advection. |
| 1835 |
|
o pkg/generic_advdiff: |
| 1836 |
|
- fix SOM advection for unusual cases (linear Free-Surf in r*, other |
| 1837 |
|
cases where linear Free-Surf is not @ k=1, e.g., useShelfIce) |
| 1838 |
|
o pkg/seaice: |
| 1839 |
|
- fix bug in the no-slip implementation in seaice_calc_strainrates.F, this |
| 1840 |
|
bug affects two verification experiments (lab_sea and lab_sea.hb87), |
| 1841 |
|
recover old (wrong) results by setting noSlipFac = 2. in |
| 1842 |
|
seaice_calc_strainrates.F; |
| 1843 |
|
- add another averaging method for etaZ (etaZmethod=3), a mix of 2 and 0 |
| 1844 |
|
- add runtime parameter SEAICE_JFNKepsilon for that finite difference |
| 1845 |
|
gradient in the Jacobian times vector operation (s/r seaice_jacvec) |
| 1846 |
|
- fix line search in seaice_jfnk.F (s/r seaice_jfnk_update) |
| 1847 |
|
o pkg/seaice: reorganize seaice_lsr.F to be able to reuse more code: |
| 1848 |
|
- new subroutines seaice_lsr_tridiagu/v |
| 1849 |
|
- introduce loop bounds i/jmin/max to be able to use a restricted |
| 1850 |
|
additive Schwarz method, but not used for now. |
| 1851 |
|
- rename SEAICE_CALC_LSR_COEFFS into SEAICE_LSR_CALC_COEFFS |
| 1852 |
|
- use new subroutines seaice_lsr_tridiagu/v in s/r seaice_preconditioner |
| 1853 |
|
o OpenAD support |
| 1854 |
|
Reorganize S/R call for overall time-stepping loop to facilitate |
| 1855 |
|
OpenAD revolve loop replacement |
| 1856 |
|
(new S/R main_do_loop.F) |
| 1857 |
|
o model/src: |
| 1858 |
|
- add 3-D array 3rd dimension to argument list of S/R ADAMS_BASHFORTH2/3; |
| 1859 |
|
- pkg/cheapaml: remove local S/R ADAMS2d and use instead standard S/R |
| 1860 |
|
ADAMS_BASHFORTH2. |
| 1861 |
|
o pkg/cheapaml: |
| 1862 |
|
- add new parameter (default=F, same as before) to disable full domain |
| 1863 |
|
(including land) periodicity in X & Y dir. |
| 1864 |
|
- new S/R CHEAPAML_COPY_EDGES to copy relaxation field into edges of |
| 1865 |
|
prognostics field ; merge the 2 S/R cycle_2d_tracer and timestep_2d_tracer |
| 1866 |
|
into single S/R CHEAPAML_TIMESTEP. |
| 1867 |
|
|
| 1868 |
|
checkpoint64d (2013/02/17) |
| 1869 |
|
o pkg/monitor (angular momentum): |
| 1870 |
|
- do not add Eta contribution to the total AM if using rigid-lid; |
| 1871 |
|
- correct for Adams-Bashforth in zonal-wind part (instead of in AM_eta). |
| 1872 |
|
- horizontal discretisation: compute Zonal wind contribution separately for |
| 1873 |
|
each component (instead of from cell centered averaged) and use the 4 |
| 1874 |
|
grid-cell corner averaged value of Omega*(R*cos_Phi)^2 in AM_eta part. |
| 1875 |
|
- Check that AM is conserved with linear dynamics (momAdvection=F and linear |
| 1876 |
|
FreeSurf) if using vectorInvariant momentum. |
| 1877 |
|
o model/src (horizontal grid): |
| 1878 |
|
- move initialisation of all horizontal grid arrays to null value |
| 1879 |
|
from specific horizontal grid S/R to main S/R INI_GRID; |
| 1880 |
|
- add 2 new arrays to project model C-grid velocity on to zonal direction |
| 1881 |
|
(similar to AngleCosC & -AngleSinC but at U and V point location) and |
| 1882 |
|
compute them in S/R CALC_GRID_ANGLES. |
| 1883 |
|
o pkg/seaice: replace a hard coded parameter by a runtime parameter |
| 1884 |
|
SEAICE_JFNK_tolIter |
| 1885 |
|
o pkg/seaice: introduce a restricted additive Schwarz (RAS) method in |
| 1886 |
|
preconditioner for JFNK (run LSR into the overlaps as far as possible, |
| 1887 |
|
i.e OLx/y-2, but overwrite the solution in the overlaps) |
| 1888 |
|
- extend loop range in seaice_calc_viscosity |
| 1889 |
|
- add new parameters SEAICE_OLx/y (default = OLx/y-2) |
| 1890 |
|
- add flexible loop ranges to seaice_preconditioner, seaice_calc_lsr_coeffs |
| 1891 |
|
- slightly modify loops in tridiagonal solver lsr-preconditioner |
| 1892 |
|
- by default remove the extra exchange in seaice_preconditioner with a |
| 1893 |
|
replacement of an undocumented CPP flag by SEAICE_PRECOND_EXTRA_EXCHANGE |
| 1894 |
|
- modify offline_exf_seaice so that old results without RAS are reproduced |
| 1895 |
|
for output.dyn_jfnk.txt |
| 1896 |
|
in seaice_fgmres.F (unrelated to RAS) |
| 1897 |
|
- add a cpp-flag option for a re-ordered mapping (potentially more |
| 1898 |
|
efficient), but because this changes the results, turn it off by |
| 1899 |
|
default |
| 1900 |
|
- replace the save statement by local common blocks |
| 1901 |
|
o utils/matlab: |
| 1902 |
|
- fix tile-offset in rdmnc.m when output was produced using EXCH2. |
| 1903 |
|
- update cs_grid/bk_line scripts to use load_grid.m (in utils/matlab) |
| 1904 |
|
instead of local script "load_cs.m". |
| 1905 |
|
o pkg/seaice: |
| 1906 |
|
- fix a serious bug in seaice_fgmres.F, s/r seaice_scalprod, connected |
| 1907 |
|
to the scalarProductMetric and the unrolling. By chance this does not |
| 1908 |
|
change the verification experiment, because of the particular domain |
| 1909 |
|
decomposition |
| 1910 |
|
o pkg/diagnostics: |
| 1911 |
|
- change default missing_value from UNSET_RL to -999. |
| 1912 |
|
o pkg/layers: improve vectorization of layers_fluxcalc.F |
| 1913 |
|
- step 1: split loops, make TatU/V 2D arrays. This alone reduces the cpu |
| 1914 |
|
time spent in this routine by more than a factor of 3 on an NEC-SX8 |
| 1915 |
|
- step 2: replace search algorithm by a bisection algorithm found in |
| 1916 |
|
Press et al. Numerical Recipes in Fortran. This algorithm can be |
| 1917 |
|
vectorized and finds the correct bin in approx. log2(Nlayers) steps. |
| 1918 |
|
For now, use this algorithm only for TARGET_NEC_SX defined. |
| 1919 |
|
- moved the search algorithm into a separate subroutine, that is kept |
| 1920 |
|
within the same file for automatic inlining. |
| 1921 |
|
- modified catching potential errors |
| 1922 |
|
o pkg/ecco: |
| 1923 |
|
- add compile switches ALLOW_SHALLOW_ALTIMETRY and ALLOW_HIGHLAT_ALTIMETRY. |
| 1924 |
|
o model/src, pkg/autodiff, pkg/ctrl, pkg/grdchk : |
| 1925 |
|
- modifications for ALLOW_GENTIM2D_CONTROL |
| 1926 |
|
-- forward_step.F, the_main_loop.F : pass options and arrays for adjoint tapes. |
| 1927 |
|
-- load_fields_driver.F : add call to CTRL_MAP_GENTIM2D( myTime, myIter, myThid ) |
| 1928 |
|
-- add xx_gentim2d0/1 in ctrl_ad_check_lev1_dir.h checkpoint_lev1_directives.h etc |
| 1929 |
|
-- use ctrl_swapffields.F (new) instead of exf_SwapFFields.F in ctrl_get_gen.F |
| 1930 |
|
o model/src: |
| 1931 |
|
- account for moist thermodynamics in (dry) potential temperature equation; |
| 1932 |
|
update results of experiments: aim.5l_cs (x2), fizhi-cs (std + aqualev) |
| 1933 |
|
and cpl_aim+ocn. |
| 1934 |
|
- also switch to standard compiler (gfortran, was using ifort previously) |
| 1935 |
|
for fizhi-cs experiments reference output. |
| 1936 |
|
o pkg/ctrl: |
| 1937 |
|
- 1st step toward generic time-varying control variable (2D) via CPP option |
| 1938 |
|
ALLOW_GENTIM2D_CONTROL |
| 1939 |
|
- note new namelist ctrl_nml_genarr in data.ctrl |
| 1940 |
|
o verification/global_ocean.cs32x15: |
| 1941 |
|
- switch off OLD_THSICE_CALL_SEQUENCE (both forward and AD code) to use new |
| 1942 |
|
thsice calling sequence and update "output.icedyn.txt" output file. |
| 1943 |
|
o pkg/ptracers: |
| 1944 |
|
- from Ryan A.: code to allow to restart a tracer at regular time interval |
| 1945 |
|
specifying a reset frequency and a reset-phase (for each tracers). |
| 1946 |
|
o pkg/thsice: |
| 1947 |
|
- implement new sequence of calls for thsice+seaice: |
| 1948 |
|
previously: ice-Dyn,ice-Advect,ice-Thermo(thsice) |
| 1949 |
|
new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect |
| 1950 |
|
- allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE" |
| 1951 |
|
in CPP_OPTIONS.h) to recover old sequence; |
| 1952 |
|
- update diagnostics for Intermediate State thsice diagnostics: now filled |
| 1953 |
|
just before advection (instead of just after advection in old sequence); |
| 1954 |
|
- update output of experiment offline_exf_seaice (standard test); |
| 1955 |
|
- in global_ocean.cs32x15 exp., postpone output.icedyn.txt update |
| 1956 |
|
by setting #define OLD_THSICE_CALL_SEQUENCE in CPP_OPTIONS.h |
| 1957 |
|
o pkg/aim_v23: |
| 1958 |
|
- use tiled array for aim_CO2 and surface wind speed for export to coupler; |
| 1959 |
|
- use standard pkg/mdsio routines to read & write CO2 pickup file; |
| 1960 |
|
- in-line S/R AIM_AIM2DYN_EXCHANGES in aim_do_physics.F; |
| 1961 |
|
- Implement new sequence of calls for seaice advection (with thsice and |
| 1962 |
|
seaice diffusion): do ice advection after ice-Thermodynamic (previously |
| 1963 |
|
was done before); change aim_do_physics.F (split the bi,bj loops block); |
| 1964 |
|
- use same CPP option (OLD_THSICE_CALL_SEQUENCE) to recover old sequence; |
| 1965 |
|
o pkg/thsice: |
| 1966 |
|
- add a missing EXCH of sIceLoad in thsice_main.F (ocean set-up) for the case |
| 1967 |
|
where just seaice diffusion is used without seaice-dynamics. |
| 1968 |
|
|
| 1969 |
|
checkpoint64c (2013/01/18) |
| 1970 |
|
o pkg/seaice: |
| 1971 |
|
- add a parameter JFNKres_tFac that can replace JFNKres_t |
| 1972 |
|
(= JFNKres_tFac*JFNKresidual before JFNK solver) |
| 1973 |
|
- add a line search option to the JFNK solver |
| 1974 |
|
- move update of u/vIce and computation of initial residual into a separate |
| 1975 |
|
routine (same file); makes the code a little easier to read (?) |
| 1976 |
|
- the line search requires computation of the residual and for some reason |
| 1977 |
|
I cannot do the update of u/vIce at the beginning of the Newton loop |
| 1978 |
|
without changing the results, so we move computation of the new residual |
| 1979 |
|
also to the end of the Newton loop, even without the line search |
| 1980 |
|
o pkg/mdsio: |
| 1981 |
|
- write missing value (corresponding to undefined array value) to meta files; |
| 1982 |
|
skip this if missing value is one (UNSET_RL would be a better value for the |
| 1983 |
|
case of undefined missing value but it's current the default missing-value); |
| 1984 |
|
Also update mdsio_read_meta.F (reading timeInterval & missing-value). |
| 1985 |
|
o pkg/exf & thsice: |
| 1986 |
|
- for diagnostics purpose, fill-up and update Qsw array (+ fill the |
| 1987 |
|
diagnostics) even when SHORTWAVE_HEATING is #undef; |
| 1988 |
|
o verification/cfc_example: |
| 1989 |
|
- turn on pkg/layers with pkg/diagnostics (to test pkg/layers and to |
| 1990 |
|
illustrate how to use it). |
| 1991 |
|
o verification/offline_exf_seaice: |
| 1992 |
|
in input: add SEAICErestoreUnderIce=.TRUE., and reduce size of forcing |
| 1993 |
|
files to only one time-record. |
| 1994 |
|
in input.thermo: narrow the 2 bands of low initial ice-concentration near |
| 1995 |
|
N & S edges; switch on SEAICErestoreUnderIce=T; use pkg/diagnostics for |
| 1996 |
|
snapshot output; same mcPheePiston value as in thsice with |
| 1997 |
|
surf-current=0.2m/s. |
| 1998 |
|
in input.thsice: similar set-up as in input.thermo (channel with same seaice |
| 1999 |
|
initial conditions). |
| 2000 |
|
o verification/cfc_example: |
| 2001 |
|
- update file "data" with more standard choice (default rotationPeriod, |
| 2002 |
|
exactConserv=T, reduce ivdc_kappa to 10, remove multiDimAdvection=F, |
| 2003 |
|
set deltaTFreeSurf to deltaTtracer) and update the output. |
| 2004 |
|
o pkg/layers: |
| 2005 |
|
- fix bolus part so that it compiles with #undef GM_BOLUS_ADVEC; |
| 2006 |
|
- ensure that "layers_bolus" is switched to False when useGMRedi=False. |
| 2007 |
|
o verification/offline_exf_seaice: |
| 2008 |
|
- set all {field}period to zero for constant-in-time forcing (not tested |
| 2009 |
|
anywhere else). |
| 2010 |
|
o verification/offline_exf_seaice: |
| 2011 |
|
- dyn_lsr : use pkg/seaice S/R (instead of pkg/thsice) to advect sea-ice; |
| 2012 |
|
- dyn_jfnk : use pkg/thsice S/R (instead of pkg/seaice) to advect sea-ice. |
| 2013 |
|
o model/src: |
| 2014 |
|
- implement Finite-Volume method for (hydrostatic) presure gradient |
| 2015 |
|
from S.-J. Lin (QJRMS 1997), for atmosphere using sigma-coordinate. |
| 2016 |
|
o pkg/seaice: implement EVP* by Lemieux et al. (2012). |
| 2017 |
|
- In order to be compatible with the default EVP code, this requires changing |
| 2018 |
|
the EVP code around a little; and because any small change immediately |
| 2019 |
|
breaks the lab_sea.hb87 verification experiment, the reference output is |
| 2020 |
|
updated two times (each time the remaining aggrement was only 2 digits): |
| 2021 |
|
- after replacing 1/dt by 1*recip_dt with a precomputed recip_dt |
| 2022 |
|
- after replacing 1/(1+0.5*dt/tau) by a/(a+1), with a=2*tau/dt |
| 2023 |
|
The adjoint test lab_sea.evp also needed to be updated. |
| 2024 |
|
- Turn on EVP* by setting SEAICE_deltaTevp as before, and setting |
| 2025 |
|
SEAICEuseEVPstar=.true.; for EVP* SEAICE_deltaTevp does not need to be |
| 2026 |
|
a factor of SEAICE_deltaTdyn, and you can set the number of EVP steps |
| 2027 |
|
explicitly with SEAICEnEVPstarSteps (thereby overriding the default of |
| 2028 |
|
INT(SEAICE_deltaTdyn/SEAICE_deltaTevp)). Controlling EVP* is deliberately |
| 2029 |
|
kept obscure, because I need to test it a little more. |
| 2030 |
|
o pkg/cheapaml: |
| 2031 |
|
- fix few incorrect type (_RL/_RS) in subroutine calls. |
| 2032 |
|
o pkg/seaice: |
| 2033 |
|
- new S/R SEAICE_MAP_RS2VEC (similar to SEAICE_MAP2VEC) to map _RS arrays |
| 2034 |
|
to _RL vector; this fixes JFNK code when compiling with "-use_r4" option. |
| 2035 |
|
o model/src: |
| 2036 |
|
- add a warning if using select_rStar=2 with nonlinFreeSurf <> 4; |
| 2037 |
|
change (in input_ad*/data) select_rStar from 2 to 1 for AD verification |
| 2038 |
|
experiments global_ocean.cs32x15 & tutorial_tracer_adjsens (+ update output) |
| 2039 |
|
o pkg/cheapaml: |
| 2040 |
|
- replace "273.1 _d 0" by celsius2K in pkg/cheapaml/cheapaml.F and |
| 2041 |
|
update output of experiment cheapAML_box. |
| 2042 |
|
- store in CHEAPAML.h coeffs ssq[0:2] for saturation specific humidity, |
| 2043 |
|
and set them only in one place (cheapaml_readparms.F). |
| 2044 |
|
- replace "273.16 _d 0" by celsius2K & replace "3.14159 _d 0" by constant "PI" |
| 2045 |
|
- remove re-setting of main-model parameter "celsius2K" (in cheapaml_readparms) |
| 2046 |
|
and re-setting of cheapAML params "lath" & "p0" (in cheapaml_init_varia). |
| 2047 |
|
o model/src/the_main_loop.F: |
| 2048 |
|
- fix revision 129 : need both ALLOW_ECCO and ALLOW_ECCO_EVOLUTION. |
| 2049 |
|
o pkg/seaice: |
| 2050 |
|
- remove legacy branch code. |
| 2051 |
|
- retire SEAICE_GROWTH_LEGACY and SEAICE_CAP_HEFF accordingly. |
| 2052 |
|
o verification/*/code*/SEAICE_OPTIONS.h: |
| 2053 |
|
- remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY, |
| 2054 |
|
SEAICE_CAP_HEFF). |
| 2055 |
|
o pkg/cheapaml: |
| 2056 |
|
- use standard routine (S/R GET_PERIODIC_INTERVAL) to decide when it is time |
| 2057 |
|
to load new forcing fields. |
| 2058 |
|
- add missing "_d 0" where it's needed; + some editing (improve indentation). |
| 2059 |
|
- remove switch to "-r8" compiler option (no longer needed) in verification |
| 2060 |
|
cheapAML_box, keep same output (small trucation error differences). |
| 2061 |
|
o verification/offline_exf_seaice: |
| 2062 |
|
- add thermodynamics only test. |
| 2063 |
|
o verification/cheapAML_box: |
| 2064 |
|
- split the domain in 8 (2x4) tiles; add MPI and multi-threaded test; |
| 2065 |
|
keep same output (same 14 digits for cg2d). |
| 2066 |
|
- switch on "-r8" compiler option (some numerical values are missing |
| 2067 |
|
the "_d 0") and update output (only 6 digits for cg2d were preserved). |
| 2068 |
|
|
| 2069 |
|
checkpoint64b (2012/12/24) |
| 2070 |
|
o pkg/cheapaml: |
| 2071 |
|
- remove un-used variables (Qnet,EmPmR) from pickup files. |
| 2072 |
|
- store tendency of advected variables into cheapaml pickup file |
| 2073 |
|
and fix the AB-2 restart. |
| 2074 |
|
o verification/offline_exf_seaice and lab_sea adjoint: |
| 2075 |
|
- switch to new code (#undef SEAICE_GROWTH_LEGACY). |
| 2076 |
|
- switch to 4 time steps in offline, consistent with lab_sea. |
| 2077 |
|
- match parameters from SEAICE_GROWTH_LEGACY branch in data.seaice. |
| 2078 |
|
- update results after change of experiment seaice. |
| 2079 |
|
o pkg/seaice: |
| 2080 |
|
- remove option SEAICE_MULTICATEGORY; has been replaced with run-time |
| 2081 |
|
parameter SEAICE_multDim. Issue a warning if SEAICE_MULTICATEGORY is |
| 2082 |
|
still defined since SEAICE_multDim needs to be set to MULTDIM value (from |
| 2083 |
|
SEAICE_SIZE.h) to recover previous #define SEAICE_MULTICATEGORY default. |
| 2084 |
|
o model/src: |
| 2085 |
|
- add run-time parameter to select CG2D solver minimum-residual solution |
| 2086 |
|
(in case of a poor convergence). |
| 2087 |
|
o pkg/seaice/seaice_lsr.F |
| 2088 |
|
- move calculation of matrix coefficients into new |
| 2089 |
|
S/R SEAICE_CALC_LSR_COEFFS; for now this routine remains in the same |
| 2090 |
|
file; the main purpose of this change is to be able to reuse the code |
| 2091 |
|
in S/R SEAICE_PRECONDITIONER |
| 2092 |
|
- modify the computation of the residual so that the mass of sea-ice |
| 2093 |
|
is not used twice; this simplifies the calculations, but since |
| 2094 |
|
the residual is never used except when LSR_mixIniGuess.ge.4---and this is |
| 2095 |
|
not tested in testreport---this does not affect the testreport results. |
| 2096 |
|
o verification/seaice_obcs: |
| 2097 |
|
- disable SEAICE_GROWTH_LEGACY; reset input files to match those of |
| 2098 |
|
verification/lab_sea/input.salt_plume; changes results/output.txt* |
| 2099 |
|
o model/src: |
| 2100 |
|
- adapt quasi-hydrostatic formulation to work with p or p* coordinate. |
| 2101 |
|
o pkg/seaice: |
| 2102 |
|
- improve description of parameters in seaice_fgmres.F and start |
| 2103 |
|
cleaning up the code |
| 2104 |
|
- change name of SCALPROD to SEAICE_SCALPROD and modify meaning of |
| 2105 |
|
second argument |
| 2106 |
|
- add a metric based on grid cell area to SEAICE_SCALPROD; update |
| 2107 |
|
results of offline_exf_seaice.dyn_jfnk |
| 2108 |
|
- compute initial residual norm in seaice_jfnk based on SEAICE_SCALPROD |
| 2109 |
|
o pkg/aim_v23: |
| 2110 |
|
- fix an other bug in dissipation heating (grid-cell area was missing). |
| 2111 |
|
o model/src + pkg/seaice: |
| 2112 |
|
- add global (multi-tile) linear solver for pair of tri-diagonal system |
| 2113 |
|
along X and Y lines, respectively for U and V component. |
| 2114 |
|
Note: 1) MPI and cube-exchange not yet coded. |
| 2115 |
|
2) probably not accurate for poorly conditioned / large size problem. |
| 2116 |
|
- add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver; |
| 2117 |
|
default: not compiled and not used. |
| 2118 |
|
o pkg/seaice: |
| 2119 |
|
- first attempt at a multi-threaded fgmres solver for the JFNK solver: |
| 2120 |
|
introduce bi/bj loops and use global_sum_tile_rl instead of |
| 2121 |
|
mpi_allreduce in seaice_fgmres.F |
| 2122 |
|
- improve diagnostics output for fgmres solver (seaice_fgmres.F) |
| 2123 |
|
- replace a few unnecessary goto statements by if-blocks (seaice_fgmres.F) |
| 2124 |
|
- add a verification experiment for JFNK in offline_exf_seaice |
| 2125 |
|
o verification: |
| 2126 |
|
- change (for now, only fwd test) offline_exf_seaice experiment: |
| 2127 |
|
use a re-entrant channel with idealized coastline (trapezoidal shape) |
| 2128 |
|
at southern boundary to explore seaice dynamics and thermodynamics |
| 2129 |
|
with simple forcing. Main set-up has dynamics+thermo and SST relaxation; |
| 2130 |
|
secondary test (input.thsice) use thermodynamics only with SST relaxation. |
| 2131 |
|
- add seaice-dynamics only secondary test using LSR and pkg/thsice advection. |
| 2132 |
|
o pkg/exf: |
| 2133 |
|
- disable "sstExtrapol" when Nr=1 |
| 2134 |
|
o verification: |
| 2135 |
|
- add new experiment "cheapAML_box" (simple 1 layer set-up from Bruno Deremble) |
| 2136 |
|
to test pkg/cheapaml. |
| 2137 |
|
o pkg/aim_v23 & pkg/shap_filt: |
| 2138 |
|
- fix dissipation heating (erroneous gravity multiplication factor). |
| 2139 |
|
o pkg/seaice: |
| 2140 |
|
- remove unused field pressPre from jfnk solver |
| 2141 |
|
- rename two subroutines in seaice_preconditioner.F |
| 2142 |
|
o eesupp/src: |
| 2143 |
|
- S/R MDSFINDUNIT avoids reserved unit numbers (scrUnit1, eeDataUnit ...) |
| 2144 |
|
o pkg/seaice/seaice_preconditioner.F: fix preconditioner once again |
| 2145 |
|
- remove wrong parts of the rhs and the lhs (were in there |
| 2146 |
|
because I did not understand the concept of this preconditioner) |
| 2147 |
|
- add an exchange between u- and v-sweep. This increases communication |
| 2148 |
|
by a factor of two but improves the convergence of jfnk. Ideally, |
| 2149 |
|
one would like the u- and v-sweep to be independent. So far within |
| 2150 |
|
undocumented ifdefs |
| 2151 |
|
- reorganize the extra computations for printing the residuals |
| 2152 |
|
o tools/genmake2: |
| 2153 |
|
- comment out the "mpif.h" include in NetCDF test programm (for MPI built) |
| 2154 |
|
since it's not necessary (and was preventing to use MNC in some cases). |
| 2155 |
|
|
| 2156 |
|
checkpoint64a (2012/11/16) |
| 2157 |
|
o pkg/autodiff: |
| 2158 |
|
- improve pkg-internal logical parameter switch (inAd/inFwd mode) so that |
| 2159 |
|
autodiff_readparms.F no longer depends on calling order (within |
| 2160 |
|
packages_readparms.F) and no longer requires to include ${PKG}_PARMS.h): |
| 2161 |
|
rename param turnFreeDriftInAdMode to SEAICEuseFREEDRIFTswitchInAd |
| 2162 |
|
and change param SEAICEuseDYNAMICSinAdMode to SEAICEuseDYNAMICSswitchInAd. |
| 2163 |
|
o pkg/obcs: |
| 2164 |
|
- adding tidal velocity forcing capability to obcs |
| 2165 |
|
for usage example, see verification/seaice_obcs/input.tides |
| 2166 |
|
o pkg/seaice: |
| 2167 |
|
- turn the LSR-relaxation parameters WFAU/V into runtime parameters |
| 2168 |
|
SEAICE_LSRrelaxU/V |
| 2169 |
|
- introduce runtime parameter SEAICEetaZmethod (=0 by default) |
| 2170 |
|
o pkg/aim_v23: |
| 2171 |
|
- implement heating from friction (bottom friction and stratospheric drag). |
| 2172 |
|
o pkg/shap_filt: |
| 2173 |
|
- fix diagnostic "SHAP_dKE" (was 2 time smaller); implement heating from |
| 2174 |
|
dissipation but only for Shap_funct=2, active when addFrictionHeating=T. |
| 2175 |
|
o model/src: |
| 2176 |
|
- move AddMass common block from DYNVARS.h to FFIELDS.h; allow to read-in |
| 2177 |
|
time-constant addMass field from file (addMassFile); |
| 2178 |
|
- support for heating due to friction (and Kinetic Energy dissipation): |
| 2179 |
|
add option, run-time switch and 3-D field array + support code ; each pkg |
| 2180 |
|
or S/R can add heating contribution (if there is a sink of KE); the sum is |
| 2181 |
|
accounted for as a Temperature tendency term (EXTERNAL_FORCING_T). |
| 2182 |
|
o pkg/seaice: |
| 2183 |
|
- complete merge of ITD code into seaice_growth.F |
| 2184 |
|
from MITgcm_contrib/torge/itd/code/ |
| 2185 |
|
no verification so far, but Torge Martin tested |
| 2186 |
|
"1-D test case and Beaufort set up; |
| 2187 |
|
deliver okay results after 1 model year." |
| 2188 |
|
- complete merge of SEAICE_SIZE.h into all relevant routines |
| 2189 |
|
- move computation of eta at Z-points into calc_viscosities |
| 2190 |
|
+ introduce global field etaZ |
| 2191 |
|
+ add different methods for computing etaZ, for now the old |
| 2192 |
|
method (simple averages of eta to Z-points) is hardwired |
| 2193 |
|
+ replace etaMeanZ by etaZ in seaice_lsr, seaice_calc_residual, |
| 2194 |
|
seaice_preconditioner |
| 2195 |
|
- simplify computations for SEAICE_ZETA_SMOOTHREG |
| 2196 |
|
- seaice_preconditioner: |
| 2197 |
|
+ replace one remaining press by pressLoc (mistake) |
| 2198 |
|
+ adjust printing of residuals |
| 2199 |
|
- improve I/O of diagnostics of JFNK in seaice_jfnk.F: |
| 2200 |
|
+ add (SEAICE.h) and rename some counters (initiliased in |
| 2201 |
|
seaice_init_fixed.F) |
| 2202 |
|
+ add _BEGIN/END_MASTER (myThid) around print statements |
| 2203 |
|
+ print total number of iterations and failures over SEAICE_monFreq |
| 2204 |
|
interval to STDOUT |
| 2205 |
|
- move control over output-messages by fgmres to seaice_jfnk to save |
| 2206 |
|
some operations |
| 2207 |
|
- move resetting initial guess for fgmres outside of seaice_fgmres_driver |
| 2208 |
|
in order to make restarts with sol .ne. zero (fgmres with restarts) |
| 2209 |
|
(seaice_jfnk.F, seaice_fgmres.F) |
| 2210 |
|
- seaice_calc_l/rhs.F: replace maskW/S by maskInW/S; this fixes |
| 2211 |
|
a serious convergence problem when open boundaries are involved |
| 2212 |
|
o pkg/ggl90: fix computation of control volumes for the case of |
| 2213 |
|
ALLOW_GGL90_HORIZDIFF (probably not used very often): move control volumes |
| 2214 |
|
up half a grid cell from C-centered to W-centered (pointed out by C. Eden) |
| 2215 |
|
o pkg/seaice: simplify seaice_evp by avoiding use of extra fields u/vIceC |
| 2216 |
|
o pkg/autodiff |
| 2217 |
|
- Add inAdMode switch for SEAICEuseDYNAMICS: |
| 2218 |
|
SEAICEuseDYNAMICSinAdMode |
| 2219 |
|
(extend logic in ADAUTODIFF_INADMODE_SET) |
| 2220 |
|
o pkg/seaice |
| 2221 |
|
- Step 1 of merging ice-thickness distribution (ITD) code from |
| 2222 |
|
MITgcm_contrib/torge/itd/ (author: Torge Martin) |
| 2223 |
|
The code implements concept laid out in Thorndike et al. (1975); |
| 2224 |
|
code is enabled via CPP flag SEAICE_ITD |
| 2225 |
|
nITD (in SEAICE_SIZE.h) defines number of ice thickness categories; |
| 2226 |
|
code is not complete yet!! |
| 2227 |
|
- SEAICE_SIZE.h now included in almost all seaice routines |
| 2228 |
|
o verification (using seaice): |
| 2229 |
|
- switch back seaice-dynamics (+ lower SOLV_MAX_ITERS) in ADM exp. |
| 2230 |
|
global_ocean.cs32x15.seaice ; update results. |
| 2231 |
|
- compile B-grid dynamics in FW test exp 1D_ocean_ice_column ; |
| 2232 |
|
- compile C-grid dynamics with #define SEAICE_ALLOW_JFNK in FW test exp |
| 2233 |
|
offline_exf_seaice (previously compiling B-grid). |
| 2234 |
|
o pkg/exf: |
| 2235 |
|
- fix some STOP conditions in exf_check.F (from Aug 28, modifs did not allow |
| 2236 |
|
to specify neither just 1 comp of wind or wind-stress, nor no surface momentum |
| 2237 |
|
forcing): just replace CPP option ALLOW_ATM_WIND with run-time param useAtmWind. |
| 2238 |
|
o pkg/layers (adjust changes from Sept 19): |
| 2239 |
|
- do snap-shot output and fill diagnostics from inside iLa loop (layers_calc.F) |
| 2240 |
|
this allows to remove "layers_maxNum" dimension from all layers arrays. |
| 2241 |
|
o pkg/layers (adjust changes from Sept 19): |
| 2242 |
|
- remove ALLOW_LAYERS_OUTPUT ; fix snap-shot and time-ave output ; |
| 2243 |
|
- snap-shot extended to all type of layers (not just the 1rst type); |
| 2244 |
|
- remove layers variables when corresponding CPP option is undef. |
| 2245 |
|
o pkg/layers: |
| 2246 |
|
- rename pkg/layers variable and add new output (layer exist & un-weighted |
| 2247 |
|
velocity in layer) |
| 2248 |
|
o pkg/seaice: |
| 2249 |
|
- simplify (?) ocean-drag coefficent computations by using |
| 2250 |
|
the same routine in all three solvers (saves some code lines) |
| 2251 |
|
- remove global fields DRAGA and DRAGS from C-grid code and |
| 2252 |
|
declare them locally in lsr.F (the only place where they are |
| 2253 |
|
still used) |
| 2254 |
|
- update AD output of lab_sea.evp (very sensitive anyway). |
| 2255 |
|
o pkg/seaice: add Jacobian-free Newton Krylov solver for ice dynamics |
| 2256 |
|
(Lemieux et al. 2010, 2012). Turn on with the usual SEAICE_ALLOW_JFNK |
| 2257 |
|
and SEAICEuseJFNK=.true. A few things to note: |
| 2258 |
|
- involves a FGMRES, that is parallel but very inefficient, |
| 2259 |
|
because of many scalar products (global sums) in the Gram-Schmidt |
| 2260 |
|
orthogonalization method. Needs to be replaced. Original code |
| 2261 |
|
from J.-F. Lemieux |
| 2262 |
|
- preconditioner for FGMRES is a stripped down version of LSOR |
| 2263 |
|
- SOLV_MAX_ITERS is now used for LSOR as a solver and as a |
| 2264 |
|
preconditioner. For the preconditioner, the default is set to 10. |
| 2265 |
|
- Jacobian times vector is computed with finite differences |
| 2266 |
|
- marginally related to JFNK-solver: add a smooth regularization for |
| 2267 |
|
zeta with tanh that will improve convergence (Lemieux and Tremblay, |
| 2268 |
|
2009) for any implicit solver (not implemented for EVP because EVP |
| 2269 |
|
does not need this regularization in the first place). Define |
| 2270 |
|
SEAICE_ZETA_SMOOTHREG in SEAICE_OPTIONS.h to use. |
| 2271 |
|
o eesupp/src: |
| 2272 |
|
- check in genmake2 that intrinsic S/R flush is available. |
| 2273 |
|
- add S/R to flush IO unit (if intrinsic S/R flush is available) |
| 2274 |
|
- flush standard & error msg unit before MPI termination |
| 2275 |
|
- if debugMode, flush IO unit after printing msg |
| 2276 |
|
o pkg/ctrl: |
| 2277 |
|
- ctrl_unpack.F, ALLOW_GENARR3D_CONTROL code: fix missing argument in call |
| 2278 |
|
to ctrl_set_unpack_xyz. |
| 2279 |
|
|
| 2280 |
|
checkpoint64 (2012/10/09) |
| 2281 |
|
o pkg/shelfice |
| 2282 |
|
- in mom_fluxform.F, mom_vecinv.F: |
| 2283 |
|
CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid) |
| 2284 |
|
Bug fix KappaRU -> KappaRV |
| 2285 |
|
does not change verification/isomip but may change other setups |
| 2286 |
|
(presumably constant KappaRU=KappaRV) |
| 2287 |
|
- fix diagnostics SHIU/Vdrag (thanks to Tom Millgate) |
| 2288 |
|
o pkg/obcs: |
| 2289 |
|
- fixed some indexing bugs in obcs_seaice_sponge.F |
| 2290 |
|
- added obcs relaxation subroutines for HSALT and HSNOW |
| 2291 |
|
- changes verification/seaice_obcs/results/obcs_seaice_sponge.F |
| 2292 |
|
o pkg/seaice: |
| 2293 |
|
- add "multicategory" parameterization for snow in analogy to ice, |
| 2294 |
|
default is off for now. |
| 2295 |
|
o pkg/obcs: |
| 2296 |
|
- added obcs_seaice_sponge.F for obcs relaxation of seaice variables; |
| 2297 |
|
see verification/seaice_obcs/input.seaiceSponge for example application. |
| 2298 |
|
- remove local commom bloc "OBCS_GLOBAL" in obcs_readparms.F and do all the OB |
| 2299 |
|
index setting by master-thread. This fix multi-threads Pb in previous modifs. |
| 2300 |
|
o pkg/layers : |
| 2301 |
|
- add diagnostics to pkg/layers |
| 2302 |
|
- move the meat of pkg/layers from layers_calc.F to layers_fluxcalc.F |
| 2303 |
|
(from R.Tulloch). Layers_calc.F now calls layers_fluxcalc.F accordingly. |
| 2304 |
|
o pkg/generic_advdiff/gad_implicit_r.F : |
| 2305 |
|
- fix ADVr diagnostics in case of both implicit vertical advection and diffusion. |
| 2306 |
|
o pkg/seaice/seaice_growth.F: |
| 2307 |
|
- fix SItflux diagnostics in virtual salt flux + balanceEmpmr case. |
| 2308 |
|
o pkg/obcs: |
| 2309 |
|
- change default setting of OBCS_UVICE_OLD from defined to undef; |
| 2310 |
|
- use new parameter OB_indexNone for null index value (instead of hard-coded 0) |
| 2311 |
|
in all pkg/obcs code and in other pkgs; remove k loop in obcs_check_depths.F; |
| 2312 |
|
- pass OB_indexNone as (new) argument to S/R CTRL_MASK_SET_[X,Y]Z; |
| 2313 |
|
- change OB null index value (OB_indexNone) to -99 ; this fix the problem |
| 2314 |
|
with Southern & Western OB at a tile edge (at least in a simple set-up). |
| 2315 |
|
o pkg/obcs: |
| 2316 |
|
- change settings of OB index in case OB coincides with tile edge (shared by |
| 2317 |
|
2 tiles), so that common OB location is registered by both tiles (instead of |
| 2318 |
|
only 1). However, for Southern and Western OB, index value = 0 is not |
| 2319 |
|
recognized as valid OB index (=default null value) and needs to be fixed. |
| 2320 |
|
- modify accordingly OBCS_BALANCE_FLOW and OBCS_MONITOR (avoid double counting) |
| 2321 |
|
- new parameter "OB_indexNone" for null index value (for now, still zero) |
| 2322 |
|
to replace hard-coded null index value of zero. |
| 2323 |
|
o pkg/exch2: |
| 2324 |
|
- improve W2_USE_E2_SAFEMODE (faster) and W2_E2_DEBUG_ON: |
| 2325 |
|
always check buffer-size (but outside the loop); move checking for valid |
| 2326 |
|
index from W2_USE_E2_SAFEMODE to W2_E2_DEBUG_ON; in W2_E2_DEBUG_ON, |
| 2327 |
|
print each tile and point connection only if |W2_printMsg|>= 2 and 3. |
| 2328 |
|
o pkg/ctrl (pack & unpack): |
| 2329 |
|
- in ctrl_pack.F & ctrl_unpack.F, use the same local file-name variable |
| 2330 |
|
(locally defined) for different variables (+ remove the variable-specific |
| 2331 |
|
file name in CTRL_GENARR.h). For now, only implemented for GENARR2/3D_CONTROL |
| 2332 |
|
(to be extended to other local file names in ctrl.h). |
| 2333 |
|
o pkg/flt: |
| 2334 |
|
- add a FLT_Iter0 option (similar to PTRACERS_Iter0). |
| 2335 |
|
o pkg/mdsio: |
| 2336 |
|
- fix missing STOP in mdsio_readvec_loc.F (case ioUnit=0) when file is missing |
| 2337 |
|
o tools/genmake2: |
| 2338 |
|
- add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE |
| 2339 |
|
(added by Alistair in version 1.51 for building without make depend); |
| 2340 |
|
- remove Header files list (H_SRC_FILES) from the dependence of targets |
| 2341 |
|
ad_input_code.f & ftl_input_code.f (not clear why it was added in the first |
| 2342 |
|
place in version 1.23): this save going through staf when unrelated header |
| 2343 |
|
file has been modified. |
| 2344 |
|
Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without |
| 2345 |
|
"make depend" step, still need to do "make links" before "make adtaf". |
| 2346 |
|
o eesupp/src (+ few pkg src files) & genmake2: |
| 2347 |
|
- finish to remove ALWAYS_USE_MPI in source code that TAF does not see; |
| 2348 |
|
- no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2). |
| 2349 |
|
- improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish |
| 2350 |
|
upper/lower case ; account for space between "#" and undef/define) |
| 2351 |
|
o pkg/flt (with exch2): |
| 2352 |
|
- cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F; |
| 2353 |
|
- simplify threads synchronisation; fix (many issues) multi-threaded with MPI. |
| 2354 |
|
|
| 2355 |
|
checkpoint63s (2012/09/05) |
| 2356 |
|
o pkg/ecco: |
| 2357 |
|
- remove #ifdef ALLOW_SMOOTH_CORREL3D brackets. |
| 2358 |
|
- add more relevant #ifdef ALLOW_SMOOTH ones. |
| 2359 |
|
- sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D. |
| 2360 |
|
o pkg/ctrl: |
| 2361 |
|
- CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D, |
| 2362 |
|
ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D. |
| 2363 |
|
- ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag, |
| 2364 |
|
doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and |
| 2365 |
|
ctrlSmoothCorrel3D (new). |
| 2366 |
|
The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP. |
| 2367 |
|
- ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist. |
| 2368 |
|
- ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress |
| 2369 |
|
controls when useAtmWind, and vice versa. |
| 2370 |
|
- ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers. |
| 2371 |
|
- ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with |
| 2372 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH. |
| 2373 |
|
- ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with |
| 2374 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH. |
| 2375 |
|
- ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F: |
| 2376 |
|
replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D. |
| 2377 |
|
o pkg/smooth: |
| 2378 |
|
- remove un-necessary includes. |
| 2379 |
|
- remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets. |
| 2380 |
|
Those CPP options were never defined, and not necessary. |
| 2381 |
|
o model/src: |
| 2382 |
|
- fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi). |
| 2383 |
|
- standard treatment of useSMOOTH. |
| 2384 |
|
o pkg/autodiff: |
| 2385 |
|
- add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode, |
| 2386 |
|
useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint. |
| 2387 |
|
o pkg/exch2: |
| 2388 |
|
- add "if usingMPI" where it was missing (in exch2_rx?_cube*.template) |
| 2389 |
|
+ start to remove ALWAYS_USE_MPI in source code that TAF does not see. |
| 2390 |
|
- make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag |
| 2391 |
|
and tiles to process mapping. |
| 2392 |
|
- re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h) |
| 2393 |
|
moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h; |
| 2394 |
|
rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX |
| 2395 |
|
from w2_eeboot.F to w2_readparms.F. |
| 2396 |
|
o eesupp/src: |
| 2397 |
|
- set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of |
| 2398 |
|
ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F; |
| 2399 |
|
also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F |
| 2400 |
|
- in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI |
| 2401 |
|
is defined (remove condition on usingMPI) to match cases where MPI_INIT |
| 2402 |
|
has been called. |
| 2403 |
|
- fix bug I put in previous modif of exch_sm_3d_rx.template (not much used); |
| 2404 |
|
- change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings |
| 2405 |
|
(so that on 1 proc, get same myPid independently of usingMPI) |
| 2406 |
|
- add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and |
| 2407 |
|
useCubedSphereExchange with EXCH-1 (safer). |
| 2408 |
|
- add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI). |
| 2409 |
|
o pkg/ggl90: |
| 2410 |
|
- fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call) |
| 2411 |
|
used in ALLOW_GGL90_SMOOTH code. |
| 2412 |
|
o pkg/flt: |
| 2413 |
|
- fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping |
| 2414 |
|
floats at the Southern end of the domain). |
| 2415 |
|
o eesupp/inc: |
| 2416 |
|
- add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h); |
| 2417 |
|
but not used (and not to be used) anywhere, just for documentation. |
| 2418 |
|
o pkg/autodiff, exf, ptracers & seaice (AD & TL output): |
| 2419 |
|
- comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since: |
| 2420 |
|
a) can damage previously written records in any other multi-record files. |
| 2421 |
|
b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S. |
| 2422 |
|
o tools/genmake2: |
| 2423 |
|
- define variable MAKE within Makefile and use it in place of 'make'; |
| 2424 |
|
- update AD_CONFIG.h (if needed) before building any of the executable |
| 2425 |
|
(forward, adjoint or tangent-lin); this involves a 2nd invocation of make; |
| 2426 |
|
and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h; |
| 2427 |
|
- always print usual warning comment 'this file is automatically generated' |
| 2428 |
|
from script convert_cpp_cmd2defines (+ remove this warning from genmake2). |
| 2429 |
|
o pkg/cheapaml: |
| 2430 |
|
- updated to correspond to the code used in accepted paper (Nico Wienders). |
| 2431 |
|
o pkg/exf: |
| 2432 |
|
added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. |
| 2433 |
|
ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) |
| 2434 |
|
and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h). |
| 2435 |
|
o pkg/exf, autodiff, ctrl, ecco and seaice: |
| 2436 |
|
remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones. |
| 2437 |
|
o pkg/ctrl, ecco: |
| 2438 |
|
allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL. |
| 2439 |
|
Depending on useAtmWind, one is inactive, and the other is active (see |
| 2440 |
|
exf_getffields.F/exf_getsurfacefluxes.F). |
| 2441 |
|
o tools/genmake2: |
| 2442 |
|
- improve error msg when failing in 2nd test of check_for_broken_Ff |
| 2443 |
|
- fix option '-makefile' short-name (-mf according to genmake2 -help) |
| 2444 |
|
- source local config file "genmake_local" just after processing the genmake2 |
| 2445 |
|
command arguments (previously done before processing arg). |
| 2446 |
|
o pkg/grdchk: |
| 2447 |
|
- add a call to TURNOFF_MODEL_IO for Tangent-Linear run (in this case, call |
| 2448 |
|
to this routine from cost_final has been dropped in g_cost_final) |
| 2449 |
|
- improve printed information (more explicit msg, no longer using "print *," |
| 2450 |
|
fix fcpertminus printed value). |
| 2451 |
|
o model/src: |
| 2452 |
|
- move call to COST_INIT_VARIA out of packages_init_variables.F directly |
| 2453 |
|
into initialise_varia.F (just after calling PACKAGES_INIT_VARIABLES): |
| 2454 |
|
this prevents getting cost-funct reset in adinitialise_varia recomputations. |
| 2455 |
|
o pkg/dic: |
| 2456 |
|
- move initialisation of "freefe" array from from dic_biotic_forcing.F to |
| 2457 |
|
fe_chem.F: this prevents TAF from dropping this initialisation in TLM code. |
| 2458 |
|
o pkg/grdchk: |
| 2459 |
|
- grdchk_main.F : added CALL GLOBAL_SUM_INT( ierr , myThid ) |
| 2460 |
|
- grdchk_getadxx.F etc. : omit I/O if ierr.EQ.0 |
| 2461 |
|
o pkg/autodiff/ctrl/grdchk : |
| 2462 |
|
- attempt to sort out what works and what does not, |
| 2463 |
|
with regard to I/O, and to warn/stop accordingly. |
| 2464 |
|
o pkg/grdchk: |
| 2465 |
|
- attempt to fix grdchk in the case of useSingleCpuIO. |
| 2466 |
|
- "if ( myProcId .EQ. grdchkwhichproc .AND. ierr .EQ. 0 )" |
| 2467 |
|
statements were moved from grdchk_main.F and into |
| 2468 |
|
grdchk_getadxx.F grdchk_getxx.F grdchk_setxx.F. |
| 2469 |
|
- a global sum is applied to record numbers icvrec/layer |
| 2470 |
|
out of grdchk_loc so that they be passed to I/O routines. |
| 2471 |
|
o pkg/smooth: |
| 2472 |
|
- fix recomputation that appeared with nlfs : use smooth_recip_hFacC, |
| 2473 |
|
smooth_hFacW, smooth_hFacS (copied at init_fixed) in 3d case. |
| 2474 |
|
o verification/testreport: |
| 2475 |
|
- add option '-tlm' for Tangent-Linear test (-adm,-oad,-tlm are all exclusive); |
| 2476 |
|
- can also use compressed (gzip) reference output file; |
| 2477 |
|
- change format (in pkg/grdchk) of TLM output (+ add forward gradient) |
| 2478 |
|
to be easier to collect by testreport. |
| 2479 |
|
- update existing TLM output (half out-of-date by more than 3 yrs). |
| 2480 |
|
- report NETCDF & LAPACK settings (from genmake2) in output dir. |
| 2481 |
|
- report run-time in each individual summary (previously only for AD test); |
| 2482 |
|
for TLM test, add also TAF version. |
| 2483 |
|
- add daily TLM test on (old) aces cluster + weekly test on baudelaire. |
| 2484 |
|
|
| 2485 |
|
checkpoint63r (2012/08/15) |
| 2486 |
|
o tools/genmake2: |
| 2487 |
|
- fix Makefile for target ftlall (+ update files to clean after make ftlall) |
| 2488 |
|
o pkg/ecco/ecco_cost_final.F : |
| 2489 |
|
- fix fc print statements (to stdout and costfunction0000) so |
| 2490 |
|
that the printed value is always after the global sum. |
| 2491 |
|
o pkg/seaice/seaice_dynsolver.F : |
| 2492 |
|
- fix ice strength assymptote at SEAICE_area_max<1 |
| 2493 |
|
(no change for the standard case of SEAICE_area_max=1) |
| 2494 |
|
o some cleaning: |
| 2495 |
|
- pkg source files: ensure that all *.F files from each pkg included the |
| 2496 |
|
corresponding ${PKG}_OPTIONS.h file (except stand-alone src file which |
| 2497 |
|
only includes CPP_EEOPTIONS.h); fix S/R CTRL_SMOOTH ; update AD experiment |
| 2498 |
|
code_ad/*.F src files; add new option-file in pkg/admtlm + corresponding |
| 2499 |
|
includes; |
| 2500 |
|
- model/src: add PACKAGES_CONFIG.h wherever ALLOW_AUTODIFF[_TAMC] is used. |
| 2501 |
|
- ALLOW_DIFFKR_CONTROL: add a stop in S/R CTRL_CHECK in case ALLOW_3D_DIFFKR |
| 2502 |
|
is undef; also define /DYNVARS_DIFFKR/ common block in DYNVARS.h when |
| 2503 |
|
ALLOW_DIFFKR_CONTROL is defined, to allow to compile and reach this stop. |
| 2504 |
|
- update option-file CPP_OPTIONS.h of all AD experiments: |
| 2505 |
|
* no longer include PACKAGES_CONFIG.h ; |
| 2506 |
|
* includes ECCO_CPPOPTIONS.h if PACKAGES_CONFIG.h has been included ; |
| 2507 |
|
* def/undef ALLOW_3D_DIFFKR independently of ALLOW_DIFFKR_CONTROL (before |
| 2508 |
|
including ECCO_CPPOPTIONS.h). |
| 2509 |
|
o pkg/cost, pkg/ctrl, pkg/ecco option-file: |
| 2510 |
|
- clean-up and split content of old pkg/ecco/ECCO_CPPOPTIONS.h file into |
| 2511 |
|
separated pkg option-file (done according to old doc from ECCO_CPPOPTIONS.h, |
| 2512 |
|
not necessary accurate). |
| 2513 |
|
- add a template for option-file ECCO_CPPOPTIONS.h, mostly empty, in |
| 2514 |
|
pkg/autodiff, i.e., the 1rst pkg to compile for adjoint built, with lines to |
| 2515 |
|
deliberately break compilation (a remainder that it needs to be customized) |
| 2516 |
|
- in pkg/ecco, includes ECCO_OPTIONS.h instead of COST_OPTIONS.h |
| 2517 |
|
- rename COST_CPPOPTIONS.h to COST_OPTIONS.h |
| 2518 |
|
- rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h |
| 2519 |
|
o tools/genamke2: |
| 2520 |
|
- check for lapack. |
| 2521 |
|
o pkg/cost and pkg/ecco : attempt to sort out some of the limiting intricacies. |
| 2522 |
|
- pkg/cost.cost_final.F : allow for use of pkg/ecco and pkg/cost cost functions |
| 2523 |
|
jointly. The exclusive ifdefs were removed, to add costs terms (when defined) |
| 2524 |
|
from both packages. |
| 2525 |
|
- the fc global sum in pkg/ecco/ecco_cost_final.F was removed accordingly. |
| 2526 |
|
- for objf_atl we use either the pkg/ecco or the pkg/cost term depending on CPPs. |
| 2527 |
|
- pkg/ecco and model/src : add CPP brackets around pkg/cost and pkg/ctrl includes |
| 2528 |
|
of "CTRL_SIZE.h" "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly. |
| 2529 |
|
o pkg/cost : add comments to explain special and/or untested setups. |
| 2530 |
|
o pkg/exf: |
| 2531 |
|
- use EXF_OPTIONS.h to set pkg/exf options except if done in ECCO_CPPOPTIONS.h |
| 2532 |
|
(previously, ALLOW_AUTODIFF_TAMC was controling this switch). |
| 2533 |
|
o verification/*/code_ad: |
| 2534 |
|
mimimal cleaning of AD experiments ECCO_CPPOPTIONS.h option-file: |
| 2535 |
|
- reccord when this file is included (define ECCO_CPPOPTIONS_H) |
| 2536 |
|
- remove the most obvious obsolete features (e.g., #define ALLOW_COST not |
| 2537 |
|
allowed since Oct 2003 in any option-file except in PACKAGES_CONFIG.h) |
| 2538 |
|
o pkg/seaice : |
| 2539 |
|
- added possibility to change ice strength/PRESS0 relationship to |
| 2540 |
|
HEFF, according to the following run time parameters |
| 2541 |
|
SEAICEpresPow0 :: HEFF exponent for ice strength below SEAICEpresH0 (integer, >0) |
| 2542 |
|
SEAICEpresPow1 :: HEFF exponent for ice strength above SEAICEpresH0 (integer, >0) |
| 2543 |
|
SEAICEpresH0 :: HEFF threshold for ice strength (m) |
| 2544 |
|
o pkg/ggl90 : |
| 2545 |
|
- added run time flag mxlSurfFlag to include the code that ensure |
| 2546 |
|
mixing between first and second level (previously included as a comment) |
| 2547 |
|
o verification/1D_ocean_ice_column/input_ad/data.autodiff : |
| 2548 |
|
- add test of newly added dumpAdByRec=T option where |
| 2549 |
|
we write all records to one file per variable. |
| 2550 |
|
o verification/global_ocean.cs32x15/code_ad/CPP_OPTIONS.h : |
| 2551 |
|
- switch to #define ALLOW_BALANCE_RELAX and ALLOW_BALANCE_FLUXES |
| 2552 |
|
to check that this code is ok with taf and compiles in adjoint. |
| 2553 |
|
o pkg/autodiff : |
| 2554 |
|
- added run time param dumpAdByRec : ad dump format switch. |
| 2555 |
|
If true then write all records to one file per variable. |
| 2556 |
|
Else write one file per record (remains the default). |
| 2557 |
|
- revise seaice_ad_dump.F and exf_adjoint_snapshots_ad.F accordingly. |
| 2558 |
|
o pkg/seaice: |
| 2559 |
|
- Added SEAICEuseTILT run time switch : if set to |
| 2560 |
|
false then omit the tilt term in seaice dynamics. |
| 2561 |
|
- Fix free drift calculation. |
| 2562 |
|
o pkg/shelfice: |
| 2563 |
|
When initializing SHELFICEDragQuadratic, set default to be |
| 2564 |
|
consistent with shiCdrag in case SHELFICEuseGammaFrict is used, |
| 2565 |
|
but retain option to set it independently |
| 2566 |
|
(inconsistenty spotted by Veronique Dansereau) |
| 2567 |
|
o eesupp/inc: |
| 2568 |
|
- in EEPARAMS.h, add real-type constant for some frequently used simple number |
| 2569 |
|
(0,1,2,1/2), with name explicitly referring to RS/RL type. |
| 2570 |
|
o model/src: |
| 2571 |
|
- move balancing of relaxation terms to new S/R balance_relax.F. |
| 2572 |
|
o pkg/autodiff: |
| 2573 |
|
re-write active I/O high-level (control) S/R: |
| 2574 |
|
- rename S/R ACTIVE_READ/WRITE_RL to ACTIVE_READ/WRITE_3D_RL |
| 2575 |
|
- add 1 more argument (useCurrentDir) to replace the "_LOC" 2nd set of S/R. |
| 2576 |
|
- use standard pkg/mdsio I/O routines (MDS_READ/WRITE_SEC_XZ/YZ and |
| 2577 |
|
MDS_READ/WRITE_FIELD); change loops to multi-threads. |
| 2578 |
|
- update and merge active_file_control_slice.flow into active_file_control.flow |
| 2579 |
|
- update the calls in lower level S/R (active_file.F, active_file_g.F and |
| 2580 |
|
active_file_ad.F) keeping the argument list and function unchanged. |
| 2581 |
|
- also update lower-level "_LOC" version (call same S/R with "useCurrentDir |
| 2582 |
|
=.TRUE.") and remove high-level (control) _loc version (not called anymore). |
| 2583 |
|
- new low-level active I/O routines, one for each type (RL/RS), for active var |
| 2584 |
|
of various (XY,XZ,YZ) shape and level number (arguments: arrShape, myNr); |
| 2585 |
|
fix ctrl_init_wet.F & ecco_cost_weights.F by calling the new S/R with the |
| 2586 |
|
right type. |
| 2587 |
|
o autodiff and RS=real*4: |
| 2588 |
|
- call the right type (_RS instead of _RL) of S/R in few output S/R (pkg/exf |
| 2589 |
|
ad-monitor and snapshots); disable arrType='RS' in mdsio_gl*.F ; |
| 2590 |
|
- change argument type of 3-D mask argument to _RS to match type in the call |
| 2591 |
|
(in seaice_cost*.F, ctrl_*_gen.F and *ctrl_bound.F); to be continued. |
| 2592 |
|
o pkg/thsice: |
| 2593 |
|
- re-anable balanceEmPmR when useSEAICE=T with useThSIce=T. |
| 2594 |
|
- option to correct ocean fresh-water flux for imbalance of Atmos+Land |
| 2595 |
|
fresh-water flux: uniform correction or proportional to local precip. |
| 2596 |
|
o pkg/ctrl: |
| 2597 |
|
- new header file CTRL_SIZE.h for parameters maxCtrlArr2D, maxCtrlArr3D |
| 2598 |
|
- redefine CPP option ALLOW_BOTTOMDRAG_CONTROL to |
| 2599 |
|
ALLOW_BOTTOMDRAG_CONTROL_NONGENERIC |
| 2600 |
|
- verification/hs94.1x64x5/ tests ALLOW_GENARR{2D,3D}_CONTROL |
| 2601 |
|
|
| 2602 |
|
checkpoint63q (2012/07/30) |
| 2603 |
|
o pkg/autodiff: |
| 2604 |
|
note about monitor and snap-shot of ad-variables: |
| 2605 |
|
a) need to apply ADEXCH before monitor or output of ad-vars to include |
| 2606 |
|
overlap contributions (was done for adjDump but missing for monitor). |
| 2607 |
|
b) since ADEXCH implies adding overlap values to interior array, machine |
| 2608 |
|
truncation error is expected when adding an ADEXCH call in the middle of |
| 2609 |
|
the time-stepping (although mathematically identical). |
| 2610 |
|
modifs: |
| 2611 |
|
- fix some incorrect type (RL/RS, UV/scalar) in ADEXCH calls and ad-vars |
| 2612 |
|
declaration (adEddyPsiX,adEddyPsiY in adcommon.h). |
| 2613 |
|
- add new run-time params (dumpAdVarExch & mon_AdVarExch) to select how to |
| 2614 |
|
apply ADEXCH before monitor or snap-shot of ad-variables: |
| 2615 |
|
=0 : no ADEXCH ; =1 : do ADEXCH ; =2 : apply ADEXCH on a local copy. |
| 2616 |
|
- implement new method (copy+adexch) for snap-shot and monitor of main model |
| 2617 |
|
ad-vars (initially not used by default -> output unchanged). |
| 2618 |
|
- change default (set to 2) to use new method and update few output_adm.txt |
| 2619 |
|
with accurate ad-monitor (global_ocean.90x40x15, tutorial_global_oce_biogeo |
| 2620 |
|
and both tutorial_tracer_adjsens tests). |
| 2621 |
|
- switch 2 global_ocean.cs32x15 AD-tests to AB-2 (seaice_dynmix & thsice) |
| 2622 |
|
and turn off momDissip_In_AB in the 2 other (needed for stable AB-3). |
| 2623 |
|
o pkg/ctrl: |
| 2624 |
|
enable the use of a variable number (maxCtrlArr2D, maxCtrlArr3D) of |
| 2625 |
|
generic control variables via |
| 2626 |
|
#define ALLOW_GENARR2D_CONTROL and/or #define ALLOW_GENARR3D_CONTROL |
| 2627 |
|
Only required customization should be S/R ctrl_map_ini_genarr.F |
| 2628 |
|
(routine in repository contains example) |
| 2629 |
|
o pkg/exf: |
| 2630 |
|
- fix and refine checking of surface-relaxation setting when using EXF |
| 2631 |
|
o verification (adjoint exp): |
| 2632 |
|
- reduce length of simulation by half for experiment global_ocean.cs32x15 |
| 2633 |
|
(std, seaice & seaice_dynmix) and exp tutorial_dic_adjoffline; update output. |
| 2634 |
|
o pkg/mom_common (mom_u/v_bottomdrag), pkg/shelfice (shelfice_u/v_drag) |
| 2635 |
|
- replace if statements KE.ne.0 with KE.gt.0 to avoid sqrt of negative numbers |
| 2636 |
|
of KE that can occur with aggressive optimization |
| 2637 |
|
+ put quadratic bottom drag calculation in separated loops (only done if |
| 2638 |
|
using bottomDragQuadratic) |
| 2639 |
|
o model/src: CG2D_NSA |
| 2640 |
|
- clean-up: stop if cg2dNormaliseRHS=T and AUTODIFF |
| 2641 |
|
and replace GLOBAL_SUM calls with GLOBAL_SUM_TILE. |
| 2642 |
|
- in test-exp that uses CG2D_NSA (bottom_ctrl & tutorial_tracer_adjsens), |
| 2643 |
|
change cg2d residual target to be expressed in Wunits (=> do not normalise |
| 2644 |
|
RHS ; this fix global_max Pb with TAF); update output. |
| 2645 |
|
o verification/tutorial_tracer_adjsens: |
| 2646 |
|
improve parameter consistency (and get rid of warnings): |
| 2647 |
|
- use deltaTFreeSurf=deltaTtracer (better with NonLin FreeSurf); |
| 2648 |
|
- switch Temp Adv Scheme from 81 to 80 (no limiter since theta < 0 is physical) |
| 2649 |
|
- use staggerTimeStep (for stability) in som81; use default rotation period. |
| 2650 |
|
o pkg/exch2: |
| 2651 |
|
- with empty facet: fix compact-format (W2_mapIO=1) definition (was previously |
| 2652 |
|
reset to 0 = 1 long line in X) |
| 2653 |
|
o pkg/mdsio: |
| 2654 |
|
- fix reading of dimensions from meta file for large-size domain |
| 2655 |
|
o model/src: |
| 2656 |
|
- fix saltIsActiveTr setting for IdealGas eosType (eosType is 6 character long); |
| 2657 |
|
- to refine CS-grid check, add logical flag "hasWetCSCorners": true if using |
| 2658 |
|
Cubed-Sphere Exch with CS-corners inside the domain; |
| 2659 |
|
make new S/R INI_GLOBAL_DOMAIN from code in ini_linear_phisurf.F to calculate |
| 2660 |
|
globalArea and to set hasWetCSCorners. |
| 2661 |
|
- add warning if usingCurvilinearGrid and momAdvection in flux-form (missing |
| 2662 |
|
metric terms); stop if hasWetCSCorners=T and momAdvection in flux-form. |
| 2663 |
|
- re-activate the stop if useCDscheme and hasWetCSCorners=T (previously if |
| 2664 |
|
useCDscheme and useCubedSphereExchange). |
| 2665 |
|
o pkg/seaice/seaice_growth.F : |
| 2666 |
|
- compute the SEAICE_DISABLE_HEATCONSFIX term accordingly |
| 2667 |
|
for the (.NOT.useRealFreshWaterFlux).OR.(nonlinFreeSurf.EQ.0) |
| 2668 |
|
when the previous code was not correct. |
| 2669 |
|
- in all cases diagnoze the boundary condition mismatch to SIaaflux |
| 2670 |
|
- in the case of useRealFreshWaterFlux.AND.(nonlinFreeSurf.GT.0) add |
| 2671 |
|
that term to QNET (essentially to set the melt/freeze water to 0degC). |
| 2672 |
|
when SEAICEheatConsFix is true, so that the ocean+ice budget heat is closed. |
| 2673 |
|
o verification/global_ocean.cs32x15/input.seaice : |
| 2674 |
|
- add SEAICEheatConsFix in data.seaice, ensuring closed ocean+ice heat budget. |
| 2675 |
|
- add diagnostics (commented out) for budget test using my matlab codes (gcmfaces). |
| 2676 |
|
- update results (output.seaice.txt) accordingly. |
| 2677 |
|
o verification/lab_sea/input/data.seaice : |
| 2678 |
|
- remove SEAICEheatConsFix, which is now be tested |
| 2679 |
|
in global_ocean.cs32x15. The presently coded fix |
| 2680 |
|
is only consistent with real fresh water + nlfs. |
| 2681 |
|
- update results (output.txt) accordingly. |
| 2682 |
|
o pkg/salt_plume: added diagnotic for salt tendency (oceSPtnd). |
| 2683 |
|
o AD_CONFIG.h file: |
| 2684 |
|
- in genmake2: remove "#undef ALLOW_ECCO_OPTIMIZATION" from AD_CONFIG.h; |
| 2685 |
|
- remove #include "AD_CONFIG.h" from all included OPTIONS files and |
| 2686 |
|
add it explicitly in each fortran src file where it is needed. |
| 2687 |
|
motivation: header file AD_CONFIG.h is generated/modified after "make depend" |
| 2688 |
|
thus introducing potentially wrong dependency; therefore, better to include |
| 2689 |
|
it only where it's really needed, and after any other included OPTIONS file |
| 2690 |
|
(less tempting to bring conditional includes according to ALLOW_ADJOINT_RUN |
| 2691 |
|
or ALLOW_TANGENTLINEAR_RUN). |
| 2692 |
|
|
| 2693 |
|
checkpoint63p (2012/07/06) |
| 2694 |
|
o pkg/autodiff: |
| 2695 |
|
- rename S/R INI_AUTODIFF to AUTODIFF_INIT_VARIA ; |
| 2696 |
|
- create new header file "AUTODIFF_PARAMS.h" for pkg/autodiff parameters |
| 2697 |
|
which are now read from new parameter file "data.autodiff" (inAdExact |
| 2698 |
|
previously in "data", use{KPP/GMRedi/SEAICE}inAdMode previously in data.pkg) |
| 2699 |
|
- add file "data.autodiff" in all verification/*/input_ad/ directories. |
| 2700 |
|
- add run-time parameter to turn On/Off SEAICEuseFREEDRIFT in adjoint/forward |
| 2701 |
|
mode (used in global_ocean.cs32x15.seaice_dynmix test exp.) |
| 2702 |
|
o verification/tutorial_tracer_adjsens/ |
| 2703 |
|
- add extra sub-verification which uses "SOM" advection scheme |
| 2704 |
|
(2nd Order-Moment Advection Scheme, Prather Limiter) with |
| 2705 |
|
#define GAD_ALLOW_TS_SOM_ADV in GAD_OPTIONS.h |
| 2706 |
|
and in data: |
| 2707 |
|
multiDimAdvection=.TRUE., |
| 2708 |
|
tempAdvScheme=81, |
| 2709 |
|
saltAdvScheme=81, |
| 2710 |
|
o model/src: |
| 2711 |
|
- introduce ALLOW_BALANCE_RELAX which allow the removal |
| 2712 |
|
of the global mean of relaxation terms by setting |
| 2713 |
|
balanceThetaClimRelax and balanceSaltClimRelax |
| 2714 |
|
- disable balanceEmPmR and balanceQnet in the case when useSeaice. |
| 2715 |
|
This case is now treated appropriately in seaice_growth.F |
| 2716 |
|
o pkg/seaice: |
| 2717 |
|
- do balanceEmPmR and balanceQnet based on the net fluxes |
| 2718 |
|
(SItflux) that enter the ocean+ice system rather than QNET |
| 2719 |
|
and EMPMR. Works best in real fresh water. |
| 2720 |
|
- SIatmFW, SIatmQnet, and SItflux computations had to be moved |
| 2721 |
|
out of the diagnotics bloc, and stored in global arrays. |
| 2722 |
|
|
| 2723 |
|
checkpoint63o (2012/06/29) |
| 2724 |
|
o vertical mixing schemes: |
| 2725 |
|
- remove unused S/R CALC_BUOYANCY (left from branch-atmos merging) |
| 2726 |
|
- replace computation of density (in Function STATE1, opps_calc.F) by a call |
| 2727 |
|
to S/R FIND_RHO_SCALAR |
| 2728 |
|
- pass sigmaR to S/R PP81_CALC, MY82_CALC (but not yet used) and to GGL90_CALC |
| 2729 |
|
and use it for N^2 calculation in ggl90_calc.F (save 2 density computations); |
| 2730 |
|
affects output (vermix.ggl90) at truncation level. |
| 2731 |
|
o testreport: |
| 2732 |
|
- change adjustment of SIZE.h for mpi+mth testing: preserve enough tiles |
| 2733 |
|
(nSx,nSy) for the number of threads (from eedata.mth) |
| 2734 |
|
o model/src: |
| 2735 |
|
- remove 2nd set of calls at the top of initialise_varia.F (Adjoint part) |
| 2736 |
|
related to Non_Lin Free-Surf or Bottom-Control (but not longer necessary). |
| 2737 |
|
o verification/tutorial_tracer_adjsens/ |
| 2738 |
|
- compile with ALLOW_CG2D_NSA |
| 2739 |
|
- run with nonlinFreeSurf=3 |
| 2740 |
|
- update reference output_adm.txt |
| 2741 |
|
o tools/genmake2: |
| 2742 |
|
- add "-DHAVE_NETCDF" to the DEFINES list when NetCDF is available ; |
| 2743 |
|
refine usePROFILES switching off (only when NetCDF is not available). |
| 2744 |
|
o verification (atmospheric set-up): |
| 2745 |
|
- change eosType='IDEALGAS' to eosType='IDEALG' to match variable declaration |
| 2746 |
|
o pkg/profiles : refine profiles and files handling. |
| 2747 |
|
o model/src and pkg/ecco : introduce run-time switch usePROFILES. |
| 2748 |
|
o model/src/the_main_loop.F, forward_step.F and pkg/exf/EXF_OPTIONS.h : |
| 2749 |
|
- changes to use model/src/the_main_loop.F rather than the ecco version |
| 2750 |
|
in ecco type adjoint runs. |
| 2751 |
|
o model/src: |
| 2752 |
|
- move computation of recip of grid distance & area from INI_MASKS_ETC to INI_GRID |
| 2753 |
|
- move setting of h0Fac[C,W,S] from INI_LINEAR_PHISURF to INI_MASKS_ETC |
| 2754 |
|
- update_masks_etc.F: rename SMOOTH*_R4,R8 function to the corresponding type (RS,RL) |
| 2755 |
|
o model/src: |
| 2756 |
|
- fix S/R UPDATE_CG2D for ALLOW_DEPTH_CONTROL case (was empty before); |
| 2757 |
|
update output of test experiment bottom_ctrl_5x5. |
| 2758 |
|
o pkg/generic_advdiff: |
| 2759 |
|
- implement vertical bi-harmonic diffusion (for now, only for T & S and |
| 2760 |
|
only explicitly). |
| 2761 |
|
o verification/bottom_ctrl_5x5/ |
| 2762 |
|
update reference output (results changed quite some time ago, |
| 2763 |
|
not sure when; but new reference results look ok in terms of grdchk) |
| 2764 |
|
o verification/1D_ocean_ice_column/ |
| 2765 |
|
For verification purposes, the exact adjoint rather than an approx. |
| 2766 |
|
should be used (e.g., to comare against F.D. or TLM). |
| 2767 |
|
removed autodiff_inadmode*_ad.F routines in code_ad/ |
| 2768 |
|
Update results/ accordingly. |
| 2769 |
|
o pkg/cal: |
| 2770 |
|
- change cal_getdate.F so that output date is function of input time only |
| 2771 |
|
(less ambiguous, not mixed up with input iteration number). |
| 2772 |
|
- fix calendarDumps for non-zero phase-lag (S/R CAL_TIME2DUMP). |
| 2773 |
|
o pkg/diagnostics: |
| 2774 |
|
- implement calendarDumps also for stats-diags |
| 2775 |
|
- implement calendarDumps also for snap-shot output (negative freq) |
| 2776 |
|
- for now, ignores calendarDumps if non-zero phase-lag. |
| 2777 |
|
|
| 2778 |
|
checkpoint63n (2012/06/04) |
| 2779 |
|
o model/src: |
| 2780 |
|
- recompute rSurfW & S to ensure consistent column thickness (needed for rStar) |
| 2781 |
|
between Sum_k(hFac*drF) and rSurf-rLow, for now only when using pkg/shelfice; |
| 2782 |
|
- use h0FacC, W & S to compute hFac_surfC, W & S in calc_surf_dr.F (more |
| 2783 |
|
similar to calc_r_star.F); update results of experiment internal_wave and |
| 2784 |
|
tutorial_global_oce_in_p (affected @ truncation level). |
| 2785 |
|
o pkg/shelfice: |
| 2786 |
|
- add parameterisation of advective-diffusive flux into the ice shelf |
| 2787 |
|
according to Holland and Jenkins (1999), eq.22-33, as suggested by Jan De Ryd |
| 2788 |
|
- simply eps3/3a computation |
| 2789 |
|
o eesupp: |
| 2790 |
|
- add new CPP option (DISCONNECTED_TILES) to disconnect tiles (no exchange |
| 2791 |
|
between tiles, just fill-in edges assuming locally periodic subdomain) and |
| 2792 |
|
add corresponding exchange subroutines (EXCH0); |
| 2793 |
|
- new CG-solver version (_EX0) for disconnected-tiles special case. |
| 2794 |
|
o model/src (CG-solvers): |
| 2795 |
|
- modify Single-Reduction version (CG2D_SR) in case cg2dMaxIters is reached |
| 2796 |
|
(similar final residual output and max-Iter number as with standard version); |
| 2797 |
|
- allows to store and use lowest-residual solution (standard & _SR versions); |
| 2798 |
|
- cleaning up (remove old, commented out code, LETS_MAKE_JAM ...). |
| 2799 |
|
- by default, also compile CG2D_SR version (define ALLOW_SRCG in CPP_OPTIONS.h) |
| 2800 |
|
o eesup/src: |
| 2801 |
|
- global_vec_sum.F cleaning: add a BARRIER ; update comments ; remove ndef |
| 2802 |
|
ALWAYS_USE_MPI (no longer needed after fixing usingMPI settings - March 2012) |
| 2803 |
|
o pkg/salt_plume added to lab_sea/input_ad.noseaicedyn |
| 2804 |
|
|
| 2805 |
|
checkpoint63m (2012/04/27) |
| 2806 |
|
o pkg/shelfice: |
| 2807 |
|
- account for partical cells in surface level below ice-shelf for hydrostatic |
| 2808 |
|
pressure calculion (set uniformFreeSurfLev to F); update isomip experiments. |
| 2809 |
|
o ad test experiments: |
| 2810 |
|
- update and rename to "ad_optfile.local" local AD-optfile specific to a |
| 2811 |
|
particular adjoint verification experiment (in verification/*/code_ad/) |
| 2812 |
|
o pkg/seaice & pkg/exf: |
| 2813 |
|
- Part two of ECCO-CLIVAR code merges. |
| 2814 |
|
Completes merge of seaice area relax. code. |
| 2815 |
|
Requires unified CPP option EXF_ALLOW_SEAICE_RELAX |
| 2816 |
|
to be set in EXF_OPTIONS.h since this pkg controls its I/O |
| 2817 |
|
(and avoids second CPP option in SEAICE_OPTIONS.h) |
| 2818 |
|
- change default value of costIceStart & costIceEnd to a valid date. |
| 2819 |
|
- add snowPrecip to HSNOW in seaice_growth |
| 2820 |
|
o pkg/ptracers: |
| 2821 |
|
- move ptracers summary and setup check into separated S/R ; add a check for |
| 2822 |
|
valid PTRACERS_Iter0 value (error+stop or just warning). |
| 2823 |
|
o pkg/cal (+ pkg/ecco): |
| 2824 |
|
- avoid calling a S/R with 2 times the same arg (FWD: unless both are only used |
| 2825 |
|
as input; and for AD, unless both are not differentiable (e.g., k index)). |
| 2826 |
|
o model/src: |
| 2827 |
|
- define internal flag "uniformFreeSurfLev" (=T when free-surface level-index |
| 2828 |
|
is everywhere k=1) to speed-up some calculations (by pass kSurf reference); |
| 2829 |
|
temporary set to usingZCoords value (to be changed to F when using shelfice). |
| 2830 |
|
- hydrostatic pressure: implement partial cell near the surface also for |
| 2831 |
|
Z-coordinates (for the case where uniformFreeSurfLev=F); replace test on |
| 2832 |
|
usingZCoords with test on uniformFreeSurfLev where needed (in NonHyd code). |
| 2833 |
|
o pkg/ctrl/ctrl_init.F: |
| 2834 |
|
- add a formal parameter to s/r ctrl_init_rec to print |
| 2835 |
|
xx_$(ctrl_valiable)_file for easier debugging |
| 2836 |
|
- move call of cal_* routines into the if-block where they are really |
| 2837 |
|
needed so that xx_$(ctrl_variable)_period can be 0 or -12 without having |
| 2838 |
|
to specify a startdate |
| 2839 |
|
o pkg/seaice: |
| 2840 |
|
- update comments in SEAICE_OPTIONS.h (+ similar update of lab_sea/code and |
| 2841 |
|
global_ocean.cs32x15/code versions). |
| 2842 |
|
- turn on seaice Multi-category (in data.seaice, SEAICE_multDim=7) for |
| 2843 |
|
verification experiment global_ocean.cs32x15.seaice and update results. |
| 2844 |
|
o pkg/exf: |
| 2845 |
|
- new S/R EXF_GETFIELD_START to return starting-time of a forcing field |
| 2846 |
|
(according to useExfYearlyFields). |
| 2847 |
|
o pkg/cal: |
| 2848 |
|
- move calendar setting & summary (previously in cal_readparams.F) into new |
| 2849 |
|
S/R CAL_INIT_FIXED to be called later in the initialisation process, once |
| 2850 |
|
length of the simulation is set (after SET_PARMS call); This is an attempt |
| 2851 |
|
to fix Pb when, e.g.: pkg/longstep, modifies the length of the run. |
| 2852 |
|
- For safety: keep a record of pkg/cal parameter settings status |
| 2853 |
|
to allow to STOP if one pkg/cal S/R is called too early. |
| 2854 |
|
- add a stop in all basic pkg/cal subroutines if called before setting is done. |
| 2855 |
|
- modify cal_getdate.F: stop when nothing was returned; |
| 2856 |
|
if called with myIter=-1, simply retrun modelBaseDate (1,2 = startDate_1,_2); |
| 2857 |
|
this allows to remove "cal.h" from seaice_read_parms.F & init_mnc_vars.F. |
| 2858 |
|
|
| 2859 |
|
checkpoint63l (2012/04/04) |
| 2860 |
|
o pkg/bbl: |
| 2861 |
|
- fix call to FIND_RHO_2D in bbl_calc_rho.F (case multi-tiles per proc); |
| 2862 |
|
update global_with_exf output.yearly.txt file. |
| 2863 |
|
o pkg/cal: |
| 2864 |
|
- start to clean-up cal_set.F ; fix for the case where baseTime is non-zero. |
| 2865 |
|
- remove 2 unsused and very short (1 line only) functions ; |
| 2866 |
|
- remove unsused subroutines from AD-Diff list. |
| 2867 |
|
o model/src: |
| 2868 |
|
- start to implement clean wait to stop in initialization S/R (config_check.F, |
| 2869 |
|
packages_check.F, ini_parms.F and pkg/obcs/obcs_check.F + pkg/mypackage) |
| 2870 |
|
o folowing PRINT_MESSAGE changes: |
| 2871 |
|
- remove reminder multiple print to the same file (STDOUT) when multi-threads. |
| 2872 |
|
o pkg/bbl: |
| 2873 |
|
- modification so it can work with z* |
| 2874 |
|
- replace deltaT with dTtracerLev(k) for asynchronous time stepping |
| 2875 |
|
- global_with_exf/input.yearly verification; changes output.yearly.txt |
| 2876 |
|
o eesupp/src: |
| 2877 |
|
- PRINT_MESSAGE: use OpenMP critical instruction (similar to PRINT_ERROR); |
| 2878 |
|
writing to unit 0 (if unit=errorMessageUnit) extended to the case myThid=1 |
| 2879 |
|
- CHECK_THREADS: specific code if using OpenMP threading: improve checking of |
| 2880 |
|
# of threads across processors (e.g., different env OMP_NUM_THREADS setting) |
| 2881 |
|
- improve special preliminary call to EESET_PARMS (if eedata is read 2 times). |
| 2882 |
|
- when using MPI, always set usingMPI=T ; set default accordingly and stop |
| 2883 |
|
if not consistent. |
| 2884 |
|
- ALL_PROC_DIE: add a BARRIER after MPI_FINALIZE call ; skip this when thread |
| 2885 |
|
argument is zero (in case called within single-thread section). |
| 2886 |
|
o pkg/fizhi: |
| 2887 |
|
clean-up turbulence cold-start switch: decided in fizhi_init_vars.F, stored |
| 2888 |
|
in common bloc (fizhi_coms.h) and then passed as argument up to S/R TURBIO. |
| 2889 |
|
o pkg/exch2: |
| 2890 |
|
- add argument "updateCorners" to S/R exch2_get_uv_bounds (enable to |
| 2891 |
|
activate EXCH_IGNORE_CORNERS in vector EXCH S/R). |
| 2892 |
|
- switch 1rst EXCH call to IGNORE_CORNERS (instead of UPDATE_CORNERS) |
| 2893 |
|
but keep the 2nd with UPDATE_CORNERS: this prevents overwriting good data |
| 2894 |
|
with bad ones coming from a not-yet-updated halo. |
| 2895 |
|
This should fix the problem when sNx <> sNy and GCD(sNx,sNy) < 2*Olx. |
| 2896 |
|
o pkg/frazil: |
| 2897 |
|
move FrzForcT diag from frazil_diagnostics_state.F to frazil_calc_rhs.F |
| 2898 |
|
http://mitgcm.org/pipermail/mitgcm-devel/2012-March/005384.html |
| 2899 |
|
o model/src/config_check.F: add a check for OLx>sNx/OLy>sNy |
| 2900 |
|
o verification/lab_sea |
| 2901 |
|
* #undef SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING |
| 2902 |
|
* #define ALLOW_SST_CONTROL & ALLOW_SST_CONTROL |
| 2903 |
|
* nTimeSteps 3 -> 4 |
| 2904 |
|
* changed reference output accordingly |
| 2905 |
|
o pkg/ctrl: |
| 2906 |
|
* fix ctrl_get_gen for xx_sst, xx_sss |
| 2907 |
|
o pkg/fizhi: |
| 2908 |
|
- fix 2 calls to S/R GRD2MSC (argument igrd) in update_earth_exports.F |
| 2909 |
|
update results of exp. fizhi-cs-32x32x40 (fail with only 6 digits for cg2d) |
| 2910 |
|
- by default, use new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE); |
| 2911 |
|
fix few out-of-bounds indices in referencing vars (initialise igrd to 1); |
| 2912 |
|
clean-up fizhi_turb.F (remove unused & uninitialised qdiaglsm array). |
| 2913 |
|
o pkg/gmredi: |
| 2914 |
|
- add diagnostic of Redi (main diagnonal) vertical diffusive flux of Temp |
| 2915 |
|
o pkg/fizhi: |
| 2916 |
|
- fix few initialisation and multi-tile Pb: aqualev & gridalt now pass the |
| 2917 |
|
(old)aces open64 tuv test. |
| 2918 |
|
o pkg/icefront: fix bug and reorder loop in icefront_init_varia.F |
| 2919 |
|
o pkg/mom_vecinv: |
| 2920 |
|
- fix 1 loop range in mom_vecinv.F to be like all the other loops which |
| 2921 |
|
set/update gu,gv/Diss (fix Pb of uninitialised fVerUkp in admom_vecinv |
| 2922 |
|
with non-lin free-surf). |
| 2923 |
|
o model/src: move k-loop outside of i/j-loops when (re-)computing R_low |
| 2924 |
|
in ini/update_masks_etc.F in order to avoid -O3 optimization problems with |
| 2925 |
|
some compilers (gfortran 4.6.0 on MacOS) |
| 2926 |
|
o momentum: |
| 2927 |
|
- separate fVer?(:,:,kUp) & fVer?(:,:,kDown) in argument list of MOM_FLUXFORM |
| 2928 |
|
& MOM_VECINV subroutines (to help TAF). This fixes Pb of uninitialised |
| 2929 |
|
fVer?(kUp) in admom_fluxform with non-lin free-surf or bottom control. |
| 2930 |
|
|
| 2931 |
|
checkpoint63k (2012/03/17) |
| 2932 |
|
o model/src: |
| 2933 |
|
- selectAddFluid (ALLOW_ADDFLUID): add missing term in horizontal momentum |
| 2934 |
|
flux-form (mom_fluxform.F) and vertical momentum (calc_gw.F) equations. |
| 2935 |
|
- SOLVE_DIAGONAL: switch default to use adjoinable & vectorized version |
| 2936 |
|
(#undef SOLVE_DIAGONAL_LOWMEMORY); update output of exp. front_relax.bvp. |
| 2937 |
|
o model/src: solve_*diagonal.F |
| 2938 |
|
- replace division with multiplication by inverse (similar to original version) |
| 2939 |
|
update output of AD exp. global_ocean.90x40x15. |
| 2940 |
|
- fix pkg/gmredi/gmredi_calc_psi_bvp.F & pkg/ggl90/ggl90_calc.F |
| 2941 |
|
to enable the use of the vectorized & differentiable solve_tridiagonal.F |
| 2942 |
|
- test exp. global_ocean.90x40x15/input_ad: switch to advection scheme 20 for |
| 2943 |
|
vertical advection (to get solve_tridiagonal tested in AD mode). |
| 2944 |
|
o pkg/seaice: ECCO-CLIVAR merge: |
| 2945 |
|
1. seaice AREA relaxation |
| 2946 |
|
* CPP option: SEAICE_ALLOW_AREA_RELAXATION |
| 2947 |
|
* runtime flag: SEAICE_tauAreaObsRelax |
| 2948 |
|
2. modified global mean cost imbalance code: CPP option |
| 2949 |
|
ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION |
| 2950 |
|
o another iteration on solve_*diagonal.F |
| 2951 |
|
Make choices independent of AUTODIFF |
| 2952 |
|
Default will be the adjoinable vectorized version. |
| 2953 |
|
Alternative choices are: |
| 2954 |
|
* non-adjoinable original version with low memory footprint: |
| 2955 |
|
#define SOLVE_DIAGONAL_LOWMEMORY |
| 2956 |
|
* still adjoinable but does not vectorize (k as inner-most loop): |
| 2957 |
|
#define SOLVE_DIAGONAL_KINNER (keeping SOLVE_DIAGONAL_LOWMEMORY undef) |
| 2958 |
|
o testreport |
| 2959 |
|
- add option to use a home made wrapper around "make" |
| 2960 |
|
- remove MITGCM_IEEE env. variable (no longer active) |
| 2961 |
|
o pkg/shelfice |
| 2962 |
|
- improve computation of friction velocity for velocity dependent |
| 2963 |
|
exchange coefficients: include velocities into SHELFICEBoundaryLayer |
| 2964 |
|
block to average velocities vertically |
| 2965 |
|
- add TAF store directives for SHI_ALLOW_GAMMAFRICT |
| 2966 |
|
o Modify diagonal solvers, now three versions (upon request): |
| 2967 |
|
#ifndef SOLVE_DIAGONAL_AUTODIFF |
| 2968 |
|
1. default version (dating back a while ago) |
| 2969 |
|
#else /* def SOLVE_DIAGONAL_AUTODIFF */ |
| 2970 |
|
# ifdef SOLVE_DIAGONAL_KINNER |
| 2971 |
|
2. adjoinable version with k-innermost loop (G. Forget) |
| 2972 |
|
# else |
| 2973 |
|
3. adjoinable vectorized version of 2. |
| 2974 |
|
# endif |
| 2975 |
|
#endif /* SOLVE_DIAGONAL_AUTODIFF */ |
| 2976 |
|
All flags are currently set within routines, but could/should be moved to CPP-options. |
| 2977 |
|
Array bounds for 1. are as before, for 2.,3. cover the entire domain |
| 2978 |
|
(could be changed for 1. too). |
| 2979 |
|
o verification/lab_sea (fwd): |
| 2980 |
|
- update the 4 fwd lab_sea test experiment: no longer SEAICE_GROWTH_LEGACY, |
| 2981 |
|
use 7 categories (except hb87), new solve4temp params (except salt_plume), |
| 2982 |
|
constant salinity (=4) or variable salinity (salt_plume) done through |
| 2983 |
|
SItracer. |
| 2984 |
|
o pkg/seaice: |
| 2985 |
|
- rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0; |
| 2986 |
|
- remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t, |
| 2987 |
|
SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz) |
| 2988 |
|
from SEAICE_PARMS.h ; still need to fix seaice_cost_sst.F (broken when |
| 2989 |
|
SEAICE_freeze got retired) but already better than previously with |
| 2990 |
|
SEAICE_freeze=123456.7 deg.C; |
| 2991 |
|
- move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS |
| 2992 |
|
(safer multi-threaded setting); always set SEAICEuseEVP; |
| 2993 |
|
- setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to |
| 2994 |
|
SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report); |
| 2995 |
|
stop if multiple specifications for the same coeff; make sure default |
| 2996 |
|
SEAICE_mcPheePiston is compatible with drF(1) & deltaT. |
| 2997 |
|
o pkg/obcs: |
| 2998 |
|
- allow to switch to upwind 1rst order advection scheme for the advective |
| 2999 |
|
flux computation at the open-boundary; disabled for adjoint built. |
| 3000 |
|
o pkg/ptracers: |
| 3001 |
|
- rename PTRACERS_RESTART.h -> PTRACERS_START.h |
| 3002 |
|
- rename ptracers_fields_blocking_exchanges.F -> ptracers_fields_blocking_exch.F |
| 3003 |
|
- add parameter to decide when to start a tracer; use internal flag to |
| 3004 |
|
know which tracer to step-forward; switch this internal flag at the top |
| 3005 |
|
of forward_step.F (new S/R PTRACERS_SWITCH_ONOFF); for now, not enabled |
| 3006 |
|
for adjoint built. |
| 3007 |
|
o pkg/seaice: |
| 3008 |
|
- add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ; |
| 3009 |
|
- move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ; |
| 3010 |
|
- keep experiment offline_exf_seaice truly single category (set MULTDIM=1). |
| 3011 |
|
o pkg/ecco: |
| 3012 |
|
- fix writing of output file DiagnosCost_ClimSalt/Theta |
| 3013 |
|
and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc). |
| 3014 |
|
o pkg/seaice: |
| 3015 |
|
- add missing initialisation of COR_ICE array in dynsolver.F |
| 3016 |
|
- merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is |
| 3017 |
|
compiled either way, and is tested in all exps (multidim was only tested |
| 3018 |
|
in lab_sea ad before). |
| 3019 |
|
- cosmetic change to prepare for future addition of ITD. no change to results. |
| 3020 |
|
no defaults change. |
| 3021 |
|
- added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise). |
| 3022 |
|
- by lack of adequate verification experiments, I further used custom versions |
| 3023 |
|
of global_ocean.cs32x15 to test multicat or not, with pickup or not. All |
| 3024 |
|
should be correct. |
| 3025 |
|
- avoid recomputations in ad. |
| 3026 |
|
o array initialisation in adjoint mode: |
| 3027 |
|
1) pkg/mom_common/mom_calc_ke.F: |
| 3028 |
|
add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC): |
| 3029 |
|
The S/R which calls MOM_CALC_KE initialises KE but in some recomputation |
| 3030 |
|
part this initialisation is gone, resulting in Floating Point Exception |
| 3031 |
|
(caught by open64 compiler with debug option). |
| 3032 |
|
2) model/src/convective_weights.F |
| 3033 |
|
set output convectCount over the full array range (instead of doing |
| 3034 |
|
an update): this fix a similar issue when called within recomputation (adjoint) |
| 3035 |
|
which could by-pass the initialisation (normally done in the caller S/R). |
| 3036 |
|
o pkg/seaice: |
| 3037 |
|
- final version of turbulent flux params, as agreed at MIT ice meet: |
| 3038 |
|
SEAICE_mcPheePiston (default is ~ 0.000875) |
| 3039 |
|
SEAICE_mcPheeTaper (default is 0.) |
| 3040 |
|
SEAICE_frazilFrac (defualt is 1.) |
| 3041 |
|
SEAICE_mcPheeStepFunc (default is false) |
| 3042 |
|
- changes results at trunction error level |
| 3043 |
|
- ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo |
| 3044 |
|
o added pkg/frazil: |
| 3045 |
|
- see frazil_description.tex for details |
| 3046 |
|
- verification experiment is global_with_exf/input.yearly; changes output.yearly.txt |
| 3047 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
| 3048 |
|
- fix exponents for velocity dependent exchange coefficients: change |
| 3049 |
|
from 2/3(=0) to 0.66666666666666667 |
| 3050 |
|
- move computation of velocity dependent exchange coefficients into |
| 3051 |
|
separate loop, so that it applies to both thermodynamics |
| 3052 |
|
- move some divisions by constants out of loops |
| 3053 |
|
|
| 3054 |
|
checkpoint63j (2012/02/16) |
| 3055 |
|
o pkg/seaice: |
| 3056 |
|
- overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc. |
| 3057 |
|
- SItracer: added run time params, and allow coupling to ocn salinity. |
| 3058 |
|
o pkg/seaice: remove (almost) all divisions by constants within loops |
| 3059 |
|
in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d |
| 3060 |
|
results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only |
| 3061 |
|
those, caused by 1/QI -> recip_QI) -> update output.seaice.txt, |
| 3062 |
|
output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt |
| 3063 |
|
o pkg/seaice : |
| 3064 |
|
- simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula |
| 3065 |
|
= 1 or 2, using newly added run time parameter SEAICE_availHeatTaper. |
| 3066 |
|
- fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148. |
| 3067 |
|
- add permanent SItflux diag that corresponds to TFLUX but includes |
| 3068 |
|
ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget. |
| 3069 |
|
- allow activation/testing of a fix for suspected missing term in |
| 3070 |
|
ocn-ice heat budget (to be confirmed). To test this, you want to |
| 3071 |
|
undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param |
| 3072 |
|
SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic. |
| 3073 |
|
- no change in results, fwd or ad. |
| 3074 |
|
o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below: |
| 3075 |
|
- switch to variable freezing point. |
| 3076 |
|
Results change : cg2d -> 1 digits; ad -> 3-6-6 digits. |
| 3077 |
|
- bug fix : the sublimation term that was missing is now activated. |
| 3078 |
|
Results change : cg2d -> 2 digits; ad -> 8-6-6 digits. |
| 3079 |
|
- bug fix : flooding sign term for SIsal0.NE.0. |
| 3080 |
|
Result change : cg2d -> 8 digits; ad -> 11-12-9 digits. |
| 3081 |
|
o pkg/seaice: |
| 3082 |
|
- unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT |
| 3083 |
|
is now the default, and the old default constant freezing point is recovered |
| 3084 |
|
with SEAICE_tempFrz0 = -1.96, |
| 3085 |
|
SEAICE_dTempFrz_dS = 0., |
| 3086 |
|
- retire SEAICE_freeze (= the old way of specifycing the constant freezing point) |
| 3087 |
|
- remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there. |
| 3088 |
|
- bug fix (thanks to M. Losch) : the sublimation term that was missing is now |
| 3089 |
|
activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM. |
| 3090 |
|
- bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211) |
| 3091 |
|
was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail). |
| 3092 |
|
- bug fix (thanks to O. Jahn) : area loss for melting got messed up in |
| 3093 |
|
seaice_growth r149 for legacy branch (no results change). |
| 3094 |
|
- introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code |
| 3095 |
|
from I. Fenty). |
| 3096 |
|
- results did not change except for global_ocean.cs32x15, mostly due to the |
| 3097 |
|
switch to variable freezing point (see above item for detail). |
| 3098 |
|
o pkg/thsice: |
| 3099 |
|
- fix and simplify interface to salt_plume pkg ; diagnose directly amount of |
| 3100 |
|
seawater freezing in thsice_calc_thickn (not used). |
| 3101 |
|
o pkg/seaice: turbulent flux term specification via run time params. |
| 3102 |
|
- replace CPP switches with run time switches to facilitate testing |
| 3103 |
|
- retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX, |
| 3104 |
|
GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR |
| 3105 |
|
- added runtime parameter : SEAICEturbFluxFormula |
| 3106 |
|
- move Mcphee constants to SEAICE_PARAMS.h |
| 3107 |
|
- seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula; |
| 3108 |
|
SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply); |
| 3109 |
|
remove seaice_summary call (moved to seaice_init_fixed) |
| 3110 |
|
- seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on |
| 3111 |
|
SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms) |
| 3112 |
|
- seaice_summary.F : add missing report of read turbulent flux term set up |
| 3113 |
|
and SITRACER. |
| 3114 |
|
- seaice_check.F : check range; inform and stop if retired CPPs are used |
| 3115 |
|
(incl. SEAICE_AGE). |
| 3116 |
|
- seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without |
| 3117 |
|
CPP switch, same computation as before for the different options. |
| 3118 |
|
- change results at the truncation level. |
| 3119 |
|
o pkg/seaice: |
| 3120 |
|
- remove un-used parameters LAD & MAX_TICE ; add new run-time parameters: |
| 3121 |
|
useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and |
| 3122 |
|
SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY. |
| 3123 |
|
- update verification/*/input*/data.seaice: |
| 3124 |
|
to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY |
| 3125 |
|
code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ; |
| 3126 |
|
and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code, |
| 3127 |
|
set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0. |
| 3128 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY): |
| 3129 |
|
- remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same |
| 3130 |
|
algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0); |
| 3131 |
|
difference in results only due to machine truncation. |
| 3132 |
|
- remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using |
| 3133 |
|
MaykutPolySatVap; keep MIN_LWDOWN. |
| 3134 |
|
- adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation. |
| 3135 |
|
- update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87, |
| 3136 |
|
+ 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits). |
| 3137 |
|
o pkg/salt_plume: |
| 3138 |
|
- isolate saltPlumeFlux array exch into a specific S/R called from |
| 3139 |
|
do_oceanic_phys.F |
| 3140 |
|
- add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice. |
| 3141 |
|
o verification: |
| 3142 |
|
- move untested set-up to MITgcm_contrib/verification_other. |
| 3143 |
|
o pkg/seaice: |
| 3144 |
|
- retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER. |
| 3145 |
|
o pkg/seaice: |
| 3146 |
|
- seaice_solve4temp.F (keeping results unchanged): |
| 3147 |
|
* add 2 future run-time params to select which saturation vapor pressure |
| 3148 |
|
formula is used and how post-iteration fluxes are set. |
| 3149 |
|
Temporary set these 2 params according to option SOLVE4TEMP_LEGACY; |
| 3150 |
|
* New piece of code (not used) to update surf. atmos. heat flux F_ia using |
| 3151 |
|
the linearized expression to stay consistent with tsurf finding. |
| 3152 |
|
- seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x |
| 3153 |
|
can be < 0. |
| 3154 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef): |
| 3155 |
|
- remove from F_ia (and from it's derivative dFiDTs1) the contribution of |
| 3156 |
|
conductive heat flux F_c , and add it explicitly when updating tsurf as |
| 3157 |
|
solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf |
| 3158 |
|
so that now F_ia has a consistent meaning through the entire routine. |
| 3159 |
|
This causes differences at truncation level: update output of fwd exp. |
| 3160 |
|
global_ocean.cs32x15.seaice. |
| 3161 |
|
o pkg/seaice: |
| 3162 |
|
- lots of editing/cleaning in seaice_solve4temp.F + better documentation |
| 3163 |
|
of arrays, sign/direction of fluxes; no effect on results. |
| 3164 |
|
- replace hard coded 273.16 (=previous value of celsius2K) by celsius2K |
| 3165 |
|
in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part); |
| 3166 |
|
note: this should have been done before changing celsius2K default. |
| 3167 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
| 3168 |
|
exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs |
| 3169 |
|
- replace hard coded seawater freezing temp in seaice_solve4temp.F (part |
| 3170 |
|
SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default |
| 3171 |
|
value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater |
| 3172 |
|
freezing temp is consistent with value in seaice_growth.F ; this causes |
| 3173 |
|
differences at machine truncation level: update lab_sea AD output (3/4). |
| 3174 |
|
o pkg/seaice: |
| 3175 |
|
- mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask |
| 3176 |
|
and climsst/sss even when using seaice (to prevent calculation that might |
| 3177 |
|
use SST on land); does not affect any verification exp. |
| 3178 |
|
- apply mask to taux,tauy (in seaice_get_dynforcing.F); update output |
| 3179 |
|
of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix. |
| 3180 |
|
o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness |
| 3181 |
|
over land (non-legacy code) |
| 3182 |
|
o vectorize salt_plume package: |
| 3183 |
|
- add extra code to salt_plume_frac and salt_plume_tendency_apply_s |
| 3184 |
|
- this code computes plumebk everywhere (also over land), thus requires |
| 3185 |
|
code to avoid divisions by zero and catch the case of kLev=Nr. |
| 3186 |
|
- efficiency of salt_plume_frac is still sub-optimal |
| 3187 |
|
o tools (genmake2): |
| 3188 |
|
- fix makefile NAME specification (option: -makefile NAME) by adding |
| 3189 |
|
"-f $MAKEFILE" in few places where it was missing including makedepend |
| 3190 |
|
command (contribution from Paul). |
| 3191 |
|
|
| 3192 |
|
checkpoint63i (2012/01/24) |
| 3193 |
|
o model/src: |
| 3194 |
|
- add factorized versions of some EOS code to find_rho.F, |
| 3195 |
|
define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX) |
| 3196 |
|
o model/src: |
| 3197 |
|
- add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h; |
| 3198 |
|
- change default celsius2K from 273.16 to 273.15 |
| 3199 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
| 3200 |
|
exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd), |
| 3201 |
|
global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm). |
| 3202 |
|
o model/src: add a little initialisation trick to find_rho.F and find_alpha.F |
| 3203 |
|
to make TAF generate vectorizable code |
| 3204 |
|
o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows. |
| 3205 |
|
Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers |
| 3206 |
|
have flags that do this more efficiently. |
| 3207 |
|
o pkg/diagnostics/diagstats_calc.F |
| 3208 |
|
- for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact |
| 3209 |
|
o pkg/obcs (with exch2): |
| 3210 |
|
- derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F) |
| 3211 |
|
and remove code (in obcs_readparms.F) which was based on EXCH of indices |
| 3212 |
|
(through buffer) and did not account for exch2 (e.g., CS-grid) topology. |
| 3213 |
|
o pkg/exf and seaice exp: |
| 3214 |
|
- change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0) |
| 3215 |
|
so that switching off area & heff advection flags does not affect results. |
| 3216 |
|
- change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h |
| 3217 |
|
- keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef |
| 3218 |
|
EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update |
| 3219 |
|
results of verification experiments: 1D_ocean_ice_column(fwd), |
| 3220 |
|
global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8) |
| 3221 |
|
and offline_exf_seaice (all 4). |
| 3222 |
|
o pkg/seaice: |
| 3223 |
|
- remove array YNEG, RIVER, TMIX (replaced by local var) from common block; |
| 3224 |
|
remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef. |
| 3225 |
|
- fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY) |
| 3226 |
|
but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and |
| 3227 |
|
not multi-dim advection; |
| 3228 |
|
- fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and |
| 3229 |
|
SHORTWAVE_HEATING #undef. |
| 3230 |
|
o optim: make Makefile more robust (?) |
| 3231 |
|
o pkg/obcs: |
| 3232 |
|
* fix treatment of obcs_read_pickup for TAF |
| 3233 |
|
o pkg/shelfice: |
| 3234 |
|
* add missing initialisation of num_shifwflx |
| 3235 |
|
* new adjoint verification exp. for isomip |
| 3236 |
|
* change Prandtl and Schmidt numbers from generic formulations |
| 3237 |
|
(in terms of model diffus. and visc.) to separate runtime |
| 3238 |
|
parameters, with Holland and Jenkins (1999) default values. |
| 3239 |
|
o pkg/exf (interpolation): |
| 3240 |
|
- extended input field (2 rows) near the N & S poles: |
| 3241 |
|
* fill in with the symetric value (when even Nb of data in longitude) |
| 3242 |
|
* add average value at the poles only for scalar quantities ; for vector |
| 3243 |
|
component interpolation, skip the averaging and keep duplicated values, |
| 3244 |
|
unless the 2 components have same location (uvInterp=T) in which case |
| 3245 |
|
interpolate the 2 components together using S/R EXF_INTERP_UV. |
| 3246 |
|
- new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field |
| 3247 |
|
together: this allows to account properly for local orientation when |
| 3248 |
|
averaging at N & S pole. |
| 3249 |
|
- add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding |
| 3250 |
|
exf-interpolation near N & S poles. Undef by default. |
| 3251 |
|
- add debug check/print on 1rst iter if debugLevel >=2. |
| 3252 |
|
o pkg/exf: |
| 3253 |
|
- change masking flags definition (no longer "parameter"), put them in |
| 3254 |
|
common block and set them in S/R EXF_INIT_FIXED. |
| 3255 |
|
- change recognized masking flag from s,u,v to c,w,s since the mask |
| 3256 |
|
to use (maskC,W,S) depends on position on model grid and has little to |
| 3257 |
|
do with scalar/vector difference; fix masking if using P-coordinates. |
| 3258 |
|
- fix masking of wind-stress (was wrong if interpolated or read on A-grid) |
| 3259 |
|
and update results of exp. global_with_exf (x2). |
| 3260 |
|
- fix setting of zenith-angle table when SHORTWAVE_HEATING is undef. |
| 3261 |
|
o pkg/obcs |
| 3262 |
|
- S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate) |
| 3263 |
|
o pkg/exf (interpolation): |
| 3264 |
|
- assume periodicity in X only if input field cover full longitude range. |
| 3265 |
|
- improve search for lat. index (supposed to be faster, in ~log2(ny) steps, |
| 3266 |
|
and should vectorise). |
| 3267 |
|
- fix input lat of the 2 added row (in case we provide N.pole data). |
| 3268 |
|
|
| 3269 |
|
checkpoint63h (2011/12/30) |
| 3270 |
|
o pkg/seaice: |
| 3271 |
|
- change declaration of UVM from _RL to _RS in order to get B-grid |
| 3272 |
|
uIce,vIce monitor when _RS = real*4 |
| 3273 |
|
o pkg/offline: |
| 3274 |
|
- new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags); |
| 3275 |
|
- compute vertical velocity if not read from file (switch on exactConserv |
| 3276 |
|
& staggerTimeStep); |
| 3277 |
|
- fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq. |
| 3278 |
|
o verification: |
| 3279 |
|
- update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input) |
| 3280 |
|
with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m": |
| 3281 |
|
fix Pb in yG definition @ 2 missing corners (previously yG was averaged); |
| 3282 |
|
- update output of exp. global_ocean.cs32x15.viscA4 after changing |
| 3283 |
|
grid-file angles (used here for coriolis-3d); |
| 3284 |
|
- remove (or gzip) few files not needed to run fizhi-cs experiments. |
| 3285 |
|
o pkg/exf (vector interpolation): |
| 3286 |
|
- rotate vector component toward local grid-axis orientation using grid-angles |
| 3287 |
|
(stored in GRID.h) instead of locally computed rotation angle; keep old code |
| 3288 |
|
available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default). |
| 3289 |
|
o pkg/seaice: |
| 3290 |
|
- allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION |
| 3291 |
|
undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined. |
| 3292 |
|
o pkg/PKG_OPTIONS.h files: |
| 3293 |
|
- move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h", |
| 3294 |
|
outside of the #ifdef ALLOW_THISPKG / #endif block. |
| 3295 |
|
- update verification/*/code/PKG_OPTIONS.h files. |
| 3296 |
|
o add a verification experiment (offline_exf_seaice/input.seaice) that test |
| 3297 |
|
the B-grid LSOR solver |
| 3298 |
|
o pkg/seaice: sort out emissivity and long wave radiation step 2: |
| 3299 |
|
- add emissivity for snow and ice as new run-time parameters |
| 3300 |
|
(unfortunately) that default to the corresponding exf values; this |
| 3301 |
|
changes results in most verification experiments so that for backward |
| 3302 |
|
compatibility these parameter have to be set explicitly to inconsistent |
| 3303 |
|
values (ugly); |
| 3304 |
|
- the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired |
| 3305 |
|
emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp |
| 3306 |
|
until we agree how to handle this bug properly |
| 3307 |
|
o pkg/exf (interpolation): |
| 3308 |
|
- add a set of run-time param ({inputfield}_interpMethod), one for |
| 3309 |
|
each interpolated input field, to select the interpolation method |
| 3310 |
|
with a value of zero switching off the interpolation; |
| 3311 |
|
- print interpolation parameters to standard output; |
| 3312 |
|
- refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined |
| 3313 |
|
(to use instead runoff_interpMethod=0 in data.exf). |
| 3314 |
|
- simplify default setting of interpolation parameters (for all fields, |
| 3315 |
|
set position to match model grid cell-center position, leading to trivial |
| 3316 |
|
interpolation in case of regular Lat-Lon grid) and fix for the case of |
| 3317 |
|
non-uniform delY. |
| 3318 |
|
o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for |
| 3319 |
|
within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1. |
| 3320 |
|
this factor is absolutely required, because the lw exitance (= out-going |
| 3321 |
|
long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown, |
| 3322 |
|
where the reflectivity rho = 1-emissivity for conservation reasons. Once |
| 3323 |
|
this is established, we can remove the CPP-Flag (if we want to). |
| 3324 |
|
o pkg/seaice: |
| 3325 |
|
- qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and |
| 3326 |
|
ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined |
| 3327 |
|
- sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity |
| 3328 |
|
what the name implies (and not emissivity*BoltzmannConstant), this means |
| 3329 |
|
the old default value of 5.5e-8 now means |
| 3330 |
|
5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in |
| 3331 |
|
S/R exf_readparms |
| 3332 |
|
- FV-discretization of the B-grid LSOR solver, turn on with |
| 3333 |
|
SEAICE_LSRBNEW. This new solver also involves a slight re-organization |
| 3334 |
|
of the calling routine dynsolver, so that B and C-grid code look a |
| 3335 |
|
little more alike. |
| 3336 |
|
- fix index bugs in ostres.F (B-grid code) |
| 3337 |
|
o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better |
| 3338 |
|
o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the |
| 3339 |
|
default for SEAICE_emissivity, if useEXF; requires setting a wrong |
| 3340 |
|
parameter value in global_ocean.cs32x15/input.seaice/data.seaice for |
| 3341 |
|
backward compatiblity |
| 3342 |
|
o model/src: use sigmaR in calc_ivdc |
| 3343 |
|
|
| 3344 |
|
checkpoint63g (2011/12/16) |
| 3345 |
|
o pkg/seaice/seaice_growth.F: |
| 3346 |
|
fix heat conservation of the coupled ocean-seaice system. |
| 3347 |
|
when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of |
| 3348 |
|
solid vs liquid water treatment is resolved via QNET. |
| 3349 |
|
o pkg/seaice/seaice_growth.F: |
| 3350 |
|
add missing term for sublimation in saltFlux, which was breaking conservation. |
| 3351 |
|
o pkg/seaice/seaice_model.F: |
| 3352 |
|
Remove this patholigical case treatment in evolution branch, |
| 3353 |
|
where it is un-necessary and breaks conservation. |
| 3354 |
|
Update global_ocean.cs32x15/results accordingly for |
| 3355 |
|
output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt |
| 3356 |
|
o model/src: |
| 3357 |
|
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in |
| 3358 |
|
external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE. |
| 3359 |
|
o pkg/obcs: |
| 3360 |
|
modify Stevens boundary conditions so that S/R obcs_calc_stevens computes |
| 3361 |
|
tendency for temperature and salinity that is then applied to update |
| 3362 |
|
theta and salt in S/R obcs_apply_ts; this requires proper masking of all |
| 3363 |
|
horizontal advection and diffusion contributions on the boundary (in |
| 3364 |
|
S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and |
| 3365 |
|
removing the mask in S/R timestep_tracer. The advantage of this approach is |
| 3366 |
|
that the updated tracer values include contributions from the surface |
| 3367 |
|
forcing and vertical diffusion. |
| 3368 |
|
This modification changes exp4.stevens because of vertical diffusion. |
| 3369 |
|
o model/src: |
| 3370 |
|
change non-curvilinear grid setting to also work with exch2 + blank tiles: |
| 3371 |
|
- move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst |
| 3372 |
|
face dimensions. |
| 3373 |
|
- new S/R INI_LOCAL_GRID to define model tile-local grid (using same units |
| 3374 |
|
as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID |
| 3375 |
|
and INI_SPHERICAL_POLAR_GRID. |
| 3376 |
|
change test-experiment global_ocean.90x40x15: |
| 3377 |
|
- split the domain in many more tiles (9x4 tiles of 10x10 each); |
| 3378 |
|
- switch to exch2 and remove 1 blank-tile (but only for MPI test). |
| 3379 |
|
- update results of both test (std & dwnslp). |
| 3380 |
|
o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in |
| 3381 |
|
tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation |
| 3382 |
|
o model/src: |
| 3383 |
|
- take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS |
| 3384 |
|
and fix initialisation when using sigma-coords. |
| 3385 |
|
o model/src: |
| 3386 |
|
- improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc. |
| 3387 |
|
to their current value at the beginning of forward_step.F": add a new run-time |
| 3388 |
|
switch "doResetHFactors" (default=false) and use it to do (or not) the resetting. |
| 3389 |
|
- set doResetHFactors=T in the following test exp: |
| 3390 |
|
global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS), |
| 3391 |
|
global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS) |
| 3392 |
|
and tutorial_global_oce_in_p (nonLinFS in p) |
| 3393 |
|
o pkg/ecco |
| 3394 |
|
- added IES cost term |
| 3395 |
|
o verification/advect_xz |
| 3396 |
|
- scale down the depth by 1/100 (from 200 km to just 2.km) |
| 3397 |
|
- add secondary test using divergent flow, r-star and implicit vertical advection. |
| 3398 |
|
- add note (check_conserve_TS.txt) and matlab script to check global |
| 3399 |
|
conservation of T & S with NonLin-FreeSurf and Adams-Bashforth. |
| 3400 |
|
o pkg/rbcs: |
| 3401 |
|
- add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F). |
| 3402 |
|
o pkg/obcs (Stevens BCs): |
| 3403 |
|
- fix various problems in the phase speed computations of the Stevens |
| 3404 |
|
boundary conditions: |
| 3405 |
|
- sign error for western and southern boundaries, |
| 3406 |
|
- time tendencies were underestimated by factor of dTracerLev and some just |
| 3407 |
|
zero (for multidim advection schemes) -> now estimate time tendencies |
| 3408 |
|
from difference between previous (n) time level and the one before (n-1); |
| 3409 |
|
this requires storing a field per tracer per boundary, also in the pickup |
| 3410 |
|
files. |
| 3411 |
|
- replace deltaTmom in cflMer/Zon computation with dTracerLev |
| 3412 |
|
- set default phase velocity to cflMer/Zon |
| 3413 |
|
- update verification experiment exp4.stevens |
| 3414 |
|
o pkg/generic_advdiff (implicit_r): |
| 3415 |
|
- fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf |
| 3416 |
|
(remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F); |
| 3417 |
|
- fix implicit vertical diffusion or advection with NonLin FreeSurf |
| 3418 |
|
(was using current recip_hFacC instead of future recip_hFacC): set future |
| 3419 |
|
recip_hFac in thermodynamics.F and pass & use it in all vertical implicit |
| 3420 |
|
solver S/R ; |
| 3421 |
|
- fill diagnostics of vertical advective fluxes (computed from tendency) |
| 3422 |
|
when using implicit vert. advection; |
| 3423 |
|
- update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion: |
| 3424 |
|
global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD), |
| 3425 |
|
tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD) |
| 3426 |
|
and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5. |
| 3427 |
|
o pkg/diagnostics: |
| 3428 |
|
- add diags for T & S tendency which goes through Adams-Bashforth. |
| 3429 |
|
|
| 3430 |
|
checkpoint63f (2011/11/30) |
| 3431 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 3432 |
|
- join some loops to reduce number of if-statements |
| 3433 |
|
- fix a bug in code for northern and southern boundaries. |
| 3434 |
|
o pkg/seaice/seaice_init_varia.F |
| 3435 |
|
- undo resetting UVM=0 that has slipped in unnoticed in r1.49 and |
| 3436 |
|
caused zero ice-velocities for the B-grid code |
| 3437 |
|
o pkg/seaice/seaice_init_fixed.F |
| 3438 |
|
- fix a bug in the initialisation of the second metric terms |
| 3439 |
|
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0. |
| 3440 |
|
- this affects all seaice configurations with useCurviLinearGrid = .true. |
| 3441 |
|
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms |
| 3442 |
|
= .true. (default) |
| 3443 |
|
- the only verification experiment affected is global_ocean.cs32x15: |
| 3444 |
|
icedyn, seaice, and seaice_dynmix (AD) |
| 3445 |
|
o pkg/thsice/thsice_diagnostics_state.F |
| 3446 |
|
- only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does |
| 3447 |
|
not contain garbage that can lead to surprises in diagstats_calc.F |
| 3448 |
|
o model/src: |
| 3449 |
|
- move bi,bj loops inside INTEGR_CONTINUITY ; |
| 3450 |
|
- call INTEGR_CONTINUITY directly from forward_step.F |
| 3451 |
|
(previously called from momentum_correction_step.F) |
| 3452 |
|
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F, |
| 3453 |
|
forward_step.F and pkg/ecco/the_main_loop.F |
| 3454 |
|
o model/src/do_oceanic_phys.F: |
| 3455 |
|
- reset addMass to zero only if useICEFRONT ; |
| 3456 |
|
- separated k-loop for rhoInSitu calculation ; |
| 3457 |
|
- add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P) |
| 3458 |
|
and at constant T,S (= WdRHOdP); |
| 3459 |
|
NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport |
| 3460 |
|
of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical |
| 3461 |
|
transport of locally-referenced potential density); |
| 3462 |
|
to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP) |
| 3463 |
|
o gluemnc: |
| 3464 |
|
- replace ncrcat with ncks when adding variables to *.glob.nc |
| 3465 |
|
- change the way variables without record dimensions are handled so that |
| 3466 |
|
files that have variables with and without record variables can be glued: |
| 3467 |
|
add a record dimension with a new unique name to be able to differentiate |
| 3468 |
|
between variable with and without a-prior record dimensions. Remove |
| 3469 |
|
this record dimension before adding the variable to the *.glob.nc file. |
| 3470 |
|
This procedure automatically works also for grid.*.nc files that do not |
| 3471 |
|
have any record dimension. |
| 3472 |
|
o verification/cpl_aim+ocn: |
| 3473 |
|
- generate new reference output on baudelaire (gfortran, mpich2) (previously |
| 3474 |
|
from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script. |
| 3475 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 3476 |
|
- add code for northern and southern boundaries. |
| 3477 |
|
- reorder some loops to save some operations and so that drFBar can be scalar |
| 3478 |
|
o model/src: |
| 3479 |
|
- re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine |
| 3480 |
|
truncation) and add diagnostics for Adams-Bashforth tendency increment. |
| 3481 |
|
- update test-exp. AD output: |
| 3482 |
|
1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl; |
| 3483 |
|
and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20, |
| 3484 |
|
front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5), |
| 3485 |
|
global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4), |
| 3486 |
|
matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre, |
| 3487 |
|
tutorial_global_oce_in_p, tutorial_global_oce_latlon and |
| 3488 |
|
tutorial_plume_on_slope. |
| 3489 |
|
o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX |
| 3490 |
|
that vectorises. This code uses 3 extra 2D fields, F90 array assignments |
| 3491 |
|
and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX |
| 3492 |
|
does not even come with an F77 compiler anymore, this should not be |
| 3493 |
|
a limitation |
| 3494 |
|
|
| 3495 |
|
checkpoint63e (2011/11/06) |
| 3496 |
|
o pkg/seaice adjoint of LSR: |
| 3497 |
|
- substantially rework STORE dirs. |
| 3498 |
|
- add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED |
| 3499 |
|
this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields |
| 3500 |
|
and only perform SOLV_MAX_FIXED adjoint iters. |
| 3501 |
|
If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration |
| 3502 |
|
always goes to same record, meaning that the last forward field will be |
| 3503 |
|
the one used in the adjoint - an approximation. |
| 3504 |
|
- now produces non-zero LSR-related gradients, and acceptable gradients for |
| 3505 |
|
An's zonal (x-z) test case (to be checked in) |
| 3506 |
|
- lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR |
| 3507 |
|
(but these are screwed up by the thermodynamics in the first place); |
| 3508 |
|
reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution; |
| 3509 |
|
output_adm.txt also reflects changes to seaice_lsr |
| 3510 |
|
- global_ocean.cs32x15: |
| 3511 |
|
* the "default" input_ad.seaice has been re-defined to always exclude dynamics |
| 3512 |
|
(output_adm.seaice.txt was updated) |
| 3513 |
|
* new input_ad.seaice_dynmix tests a forward LSR / backward free-drift |
| 3514 |
|
(output_adm.seaice_dynmix.txt) |
| 3515 |
|
o test-exp. exp4+stevens: |
| 3516 |
|
- switch off pTracers and nonHydrostatic (restart problems with NH); update output |
| 3517 |
|
o pkg/seaice (lsr solver): |
| 3518 |
|
- put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only); |
| 3519 |
|
update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15 |
| 3520 |
|
- fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD) |
| 3521 |
|
- new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution |
| 3522 |
|
into initial guess for linearised solver; use weight ~ (1/err)^2,4. |
| 3523 |
|
- compute (with new S/R) and print initial (+ free-driff sol. if available) |
| 3524 |
|
and final residual of linearised system. |
| 3525 |
|
o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity |
| 3526 |
|
(requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F) |
| 3527 |
|
o pkg/obcs: Stevens BCs (still only for east and west) |
| 3528 |
|
- fix Stevens BCs by using intermediate velocities of previous |
| 3529 |
|
time step as "baroclinic" contribution rather velocity of one grid cell |
| 3530 |
|
inside the boundaries; more consistent but makes the entire treatment |
| 3531 |
|
more complicated, requires new pickup files and two new S/Rs: |
| 3532 |
|
obcs_copy_uv_n and obcs_save_uv_n |
| 3533 |
|
keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY |
| 3534 |
|
(undefined by default) |
| 3535 |
|
- silently move computation of some grid factors into separate loops to |
| 3536 |
|
save some recomputations |
| 3537 |
|
- add a hack for non-linear free surface |
| 3538 |
|
- add a verification experiment to exp4 that tests this code |
| 3539 |
|
o make gluemnc/xplodemnc work with (moron) non-GNU shell tools |
| 3540 |
|
|
| 3541 |
|
checkpoint63d (2011/10/25) |
| 3542 |
|
o pkg/obcs + seaice-dynamics: |
| 3543 |
|
- new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before |
| 3544 |
|
solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB |
| 3545 |
|
values (consistent with an implicit method). |
| 3546 |
|
- add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to |
| 3547 |
|
return to older implementation (same results as before); note that none of |
| 3548 |
|
the "experimental" OBCS_SEAICE options are implemented in the new version. |
| 3549 |
|
- switch test exp. seaice_obcs to use new version (update output). |
| 3550 |
|
o pkg/seaice: |
| 3551 |
|
- add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS) |
| 3552 |
|
- add parenthesis in Water-Ice drag calculations (evp & lsr); |
| 3553 |
|
- in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1; |
| 3554 |
|
and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice) |
| 3555 |
|
- update output of test exp lab_sea that uses evp or lsr (fwd+ad) |
| 3556 |
|
and global_ocean.cs32x15 (icedyn & seaice fwd+ad). |
| 3557 |
|
o pkg/layers: |
| 3558 |
|
- Include potential density as new coordinate (Thanks to David Munday) |
| 3559 |
|
o pkg/dic: |
| 3560 |
|
- Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add |
| 3561 |
|
carbonate computation/output to CALC_PCO2_APPROX |
| 3562 |
|
o pkg/generic_advdiff |
| 3563 |
|
- make TAF generate code that vectorizes: |
| 3564 |
|
gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F |
| 3565 |
|
o model/src: |
| 3566 |
|
- improve vectorization also for adjoint code of |
| 3567 |
|
solve_tridiagonal and solve_pentadiagonal. As this requires up to |
| 3568 |
|
5 new 3D-fields, this code is only turned on for the combination of |
| 3569 |
|
ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message |
| 3570 |
|
for singular matrix check (only for TARGET_NEC_SX). |
| 3571 |
|
- remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to |
| 3572 |
|
ALLOW_AUTODIFF. This flag now needs to be set outside of |
| 3573 |
|
solve_tri/pentadiagonal.F |
| 3574 |
|
o pkg/exf: |
| 3575 |
|
- fix previous modif in exf_readparms.F (revision 1.66: treatment of |
| 3576 |
|
optional namelist EXF_NML_OBCS). |
| 3577 |
|
- add many debug-print (to trace down where pkg/cal error msg comes from) |
| 3578 |
|
o pkg/mom_vecinv/mom_vi_hdissip.F |
| 3579 |
|
- rearrange loops so that vectorization is improved and in particular |
| 3580 |
|
the adjoint routine vectorizes. The code is a little longer now, but I |
| 3581 |
|
think easier to read. |
| 3582 |
|
Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested. |
| 3583 |
|
o pkg/seaice: |
| 3584 |
|
- allow to specify initial seaice velocity from files (uIceFile,vIceFile) |
| 3585 |
|
o pkg/exch2: |
| 3586 |
|
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
| 3587 |
|
used as default; keep using matrix version in adjustment.cs-32x32x1. |
| 3588 |
|
o tools/build_options: |
| 3589 |
|
- after merging some MPI and/or multi-threads specific optfiles so that |
| 3590 |
|
the modified default optfile support both built (using genmake2 -mpi |
| 3591 |
|
for the MPI built, using genmake2 -omp for OpenMP built), |
| 3592 |
|
move now obsolete optfiles to tools/build_options/unsupported/ |
| 3593 |
|
(add copy of email sent to support list in doc/optfiles_changes.txt) |
| 3594 |
|
|
| 3595 |
|
checkpoint63c (2011/09/28) |
| 3596 |
|
o pkg/ebm: |
| 3597 |
|
- fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of |
| 3598 |
|
test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d) |
| 3599 |
|
o pkg/seaice (SItracer pickup) |
| 3600 |
|
* Simple code for pickup of SItracer fields (#define ALLOW_SITRACER) |
| 3601 |
|
To be done: |
| 3602 |
|
- thorough testing of missing fields in S/R seaice_read_pickup |
| 3603 |
|
- thorough matching between generic tracers and specific fields used |
| 3604 |
|
(e.g. volume-weighted age, area-weighted age, salinity, ...) |
| 3605 |
|
o pkg/grdchk: |
| 3606 |
|
- all procs calculate and print finite-difference gradient (for testreport) |
| 3607 |
|
- change description output used by testreport; |
| 3608 |
|
- AD testing: also compare and report Finite-difference gradient; |
| 3609 |
|
=> update all output_adm*.txt |
| 3610 |
|
o test exp. global_ocean_ebm: |
| 3611 |
|
- switch back useRealFreshWaterFlux (no problem anymore with run-off); |
| 3612 |
|
and turn on exactConserve; update (fwd) output. |
| 3613 |
|
o pkg/seaice (LSR): |
| 3614 |
|
- print to STDOUT number of solver iterations at SEAICE_monFreq interval. |
| 3615 |
|
- modify solver to deal cleanly with u/v switch at face edges (CS-grid): |
| 3616 |
|
* identical results with non-CS topology (but save up to half of EXCH calls) |
| 3617 |
|
* no much changes in cs-32 verification tests since no ice at face edges |
| 3618 |
|
(differences due to convergence criteria, since nb of iterations changed) |
| 3619 |
|
* expect some differences on lat-lon-cap grid. |
| 3620 |
|
update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice) |
| 3621 |
|
o pkg/exch2: |
| 3622 |
|
- add new CPP option to disable Cumul-Sum matrix (to save storage when using |
| 3623 |
|
many tiles); until alternative coding is added, just add a stop. |
| 3624 |
|
o pkg/kpp: |
| 3625 |
|
- move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F |
| 3626 |
|
to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list). |
| 3627 |
|
o optfiles: |
| 3628 |
|
- merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles |
| 3629 |
|
into corresponding standard one, which now support different build: |
| 3630 |
|
(when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built) |
| 3631 |
|
- add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael) |
| 3632 |
|
o pkg/obcs (seaice): |
| 3633 |
|
- add missing EXCH for uIce,vIce after applying OBCS; |
| 3634 |
|
- remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding |
| 3635 |
|
argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R |
| 3636 |
|
EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F; |
| 3637 |
|
- fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared) |
| 3638 |
|
- verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi |
| 3639 |
|
and eedata.mth for MPI and mutlti-threaded testing. |
| 3640 |
|
o pkg/flt: |
| 3641 |
|
- make FLT EXCH working with multi-threads (and MPI + multi-threads); |
| 3642 |
|
- use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h; |
| 3643 |
|
- fix pickup and trajectories + profiles output with multi-threads; |
| 3644 |
|
- add parameter to select group of fields to write along trajectory and |
| 3645 |
|
profile (default unchanged); |
| 3646 |
|
- only call PORT_RAND* function when flt_noise <> 0; |
| 3647 |
|
- add multi-threaded test for verification exp. flt_example. |
| 3648 |
|
o eesupp/src: |
| 3649 |
|
- fix S/R ALL_PROC_DIE for MPI+multi-threads. |
| 3650 |
|
- USE_OMP_THREADING: check that number of threads (from eedata) matches |
| 3651 |
|
actual number (from env.var. setting). |
| 3652 |
|
o pkg/ebm: |
| 3653 |
|
- fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file. |
| 3654 |
|
- add multi-threaded test for verification exp. global_ocean_ebm |
| 3655 |
|
|
| 3656 |
|
checkpoint63b (2011/08/29) |
| 3657 |
|
o pkg/ebm: |
| 3658 |
|
- fix sign of runoff; |
| 3659 |
|
- update directly forcing fields (Qnet,EmPmR) to use standard |
| 3660 |
|
external_forcing_surf.F (remove ebm_forcing_surf.F); |
| 3661 |
|
- avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F); |
| 3662 |
|
- set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm) |
| 3663 |
|
and apply relaxation towards corresponding SST field (2-D map or ZonAver). |
| 3664 |
|
- update global_ocean_ebm parameters file data and update output (fwd+ad). |
| 3665 |
|
o verification/matrix_example: |
| 3666 |
|
- split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for |
| 3667 |
|
MPI and mutlti-threaded testing. |
| 3668 |
|
o pkg/matrix: |
| 3669 |
|
- change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ; |
| 3670 |
|
- fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter); |
| 3671 |
|
- fix for multi-threaded (remove DATA statement); |
| 3672 |
|
- use standard DIFFERENT_MULTIPLE function; |
| 3673 |
|
- add MATRIX_OPTIONS.h |
| 3674 |
|
o verification/matrix_example: |
| 3675 |
|
To allow to split the domain in several tiles, change the domain size |
| 3676 |
|
from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on |
| 3677 |
|
Western side) of land points. |
| 3678 |
|
o (*_)write_pickup: |
| 3679 |
|
- fix few bugs in mypackage_read/write_pickup.F |
| 3680 |
|
- in MDS_WR_METAFILES calls, replace "myTime" by a local copy into |
| 3681 |
|
array of length 1 (was caught by compiler syntax-check). |
| 3682 |
|
o pkg/diagnostics (velocity potential solver): |
| 3683 |
|
- fix initialisation of main diagonal matrix (for overlap values) |
| 3684 |
|
o tools/build_options: |
| 3685 |
|
- towards single optfile for MPI and non-MPI built: merge few +mpi optfile |
| 3686 |
|
into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11) |
| 3687 |
|
- linux_amd64_gfortran: merge +mpi_generic version into standard optfile: |
| 3688 |
|
* move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ; |
| 3689 |
|
* FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list; |
| 3690 |
|
and use "-devel" testreport option for standard testing on baudelaire. |
| 3691 |
|
o pkg/grdchk: |
| 3692 |
|
- Assume that all gradient-check position are within the same tile |
| 3693 |
|
corresponding to global indices (iGloTile,jGloTile) and that |
| 3694 |
|
positions (i,j indices or nbeg) are local to this tile; |
| 3695 |
|
- set tile local-indices and proc. number according to tile global-indices; |
| 3696 |
|
- remove grdchkwhichproc from namelist (retired param); |
| 3697 |
|
- send adjoint gradient to all procs so that all procs print it to STDOUT; |
| 3698 |
|
- switch on MPI test for global_ocean.90x40x15 AD test experiment. |
| 3699 |
|
o adding package bbl (Bottom Boundary Layer) |
| 3700 |
|
description in MITgcm/pkg/bbl/bbl_description.tex |
| 3701 |
|
example/test experiment in MITgcm_contrib/bbl |
| 3702 |
|
o adjoint verifications |
| 3703 |
|
- changed 5 experiments to multi-tiles |
| 3704 |
|
* global_ocean.90x40x15 |
| 3705 |
|
* obcs_ctrl |
| 3706 |
|
* offline_exf_seaice |
| 3707 |
|
* tutorial_dic_adjoffline |
| 3708 |
|
* tutorial_tracer_adjsens |
| 3709 |
|
changed reference output for those that crossed tile boundaries |
| 3710 |
|
(changed choices of gradient check positions) |
| 3711 |
|
- with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi) |
| 3712 |
|
- temporary bug fix in grdchk_loc.F for obcs |
| 3713 |
|
o genmake2 & testreport |
| 3714 |
|
- add target "obj" (just for OBJFILES files) to Makefile; |
| 3715 |
|
- add option to specify FEXTRAFLAGS on command line. |
| 3716 |
|
o pkg/mypackage: |
| 3717 |
|
- remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS |
| 3718 |
|
|
| 3719 |
|
checkpoint63a (2011/08/02) |
| 3720 |
|
o pkg/diagnostics (velocity potential): |
| 3721 |
|
- fix velocity-potential calculation when using OBCS: balance net inflow |
| 3722 |
|
at each level (new S/R OBCS_DIAG_BALANCE). |
| 3723 |
|
- fix some of the problems with OBCS in stream-function calculation. |
| 3724 |
|
o pkg/exf/exf_readparms.F |
| 3725 |
|
- make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF, |
| 3726 |
|
EXF_NML_OBCS) more consistent, so that you need not have these lists |
| 3727 |
|
in data.exf when they are not used. |
| 3728 |
|
o optim/optim_readdata.F: |
| 3729 |
|
- add some output about obcs variables that might help debugging |
| 3730 |
|
- add a check about nvarlength |
| 3731 |
|
o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec |
| 3732 |
|
o pkg/diagnostics (velocity potential): |
| 3733 |
|
- fix mask for OBCS (still problems in stream-function with OBCS); |
| 3734 |
|
- add specific parameter (default = main code CG2D params) for solver; |
| 3735 |
|
- in case of poor convergence, use solution corresponding to lowest residual. |
| 3736 |
|
o pkg/seaice/seaice_growth.F: small changes that permit vectorizable |
| 3737 |
|
adjoint code. In general statements like tmpscal=fld(i,j) are problematic |
| 3738 |
|
and should be avoided where possible. |
| 3739 |
|
o model/src (rStar): |
| 3740 |
|
- include r* effect on reference-state (PhiRef) in totPhiHyd |
| 3741 |
|
(so that it's really the potential anomaly at the cell center); |
| 3742 |
|
affect solution only if z* with full pressure in EOS. |
| 3743 |
|
- test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and |
| 3744 |
|
update output (because of z* in totPhiHyd and viscA4 changes); |
| 3745 |
|
- keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly |
| 3746 |
|
@ constant r) until interpolation at constant r is implemented. |
| 3747 |
|
o pkg/diagnostics |
| 3748 |
|
- fix RCENTER diagnostics in case cell center is not at interface middle |
| 3749 |
|
o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use |
| 3750 |
|
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies |
| 3751 |
|
that THETA and SALT are "conservative temperature" and "absolute |
| 3752 |
|
salinity" |
| 3753 |
|
o pkg/ctrl |
| 3754 |
|
- fix computation of endrec in s/r ctrl_init_rec |
| 3755 |
|
- ctrl_pack/unpack_*: remove unused variables and some obsolete code |
| 3756 |
|
o pkg/seaice/seaice_growth.F |
| 3757 |
|
- fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code, |
| 3758 |
|
remove then obsolete STORE directives |
| 3759 |
|
- fix STORE directives for tice and tices, so that only the |
| 3760 |
|
appropriate part of the fields are stored (and not the entire |
| 3761 |
|
field); update global_ocean.cs32x15.seaice AD output. |
| 3762 |
|
- cosmetic changes: adjust CPP flags and indentation for better |
| 3763 |
|
legibilty |
| 3764 |
|
o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by |
| 3765 |
|
Chris Wilson) |
| 3766 |
|
o pkg/gmredi: |
| 3767 |
|
Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF), |
| 3768 |
|
and test it in verification exp. "front_relax.bvp" (update output.bvp.txt) |
| 3769 |
|
|
| 3770 |
|
checkpoint63 (2011/07/11) |
| 3771 |
|
o pkg/exch2: |
| 3772 |
|
- rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h |
| 3773 |
|
- exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the |
| 3774 |
|
(2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y |
| 3775 |
|
increments, calculates Cumul-Sum @ tile origin and sends results to each tile. |
| 3776 |
|
o pkg/diagnostics: |
| 3777 |
|
- deal with pairs of post-processed diags which are computed together; in |
| 3778 |
|
particular, re-order list of diags within 1 file to save 2nd computation. |
| 3779 |
|
- add S/R to compute velocity stream-function (called after velocity-potential |
| 3780 |
|
calculation) from divergence free transport -> new diagnostics "PsiVEL". |
| 3781 |
|
- add parameter to select grid-point location where PsiVEL == 0. |
| 3782 |
|
o eesupp/src: |
| 3783 |
|
new S/R to calculate cumulated sum on tiled array, corner grid-cell location |
| 3784 |
|
(specific S/R needed with exch2 topology - for now, just print an error msg) |
| 3785 |
|
o pkg/shelfice |
| 3786 |
|
- Implement friction velocity-dependent transfer coefficients following |
| 3787 |
|
Holland and Jenkins, JPO, 1999 |
| 3788 |
|
Original code by M. Losch with small modifs. |
| 3789 |
|
Enable with CPP option SHI_ALLOW_GAMMAFRICT |
| 3790 |
|
and runtime flag SHELFICEuseGammaFrict |
| 3791 |
|
o verification lab_sea & global_ocean.cs32x15: |
| 3792 |
|
- use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local): |
| 3793 |
|
does not miss some dependencies (but is slower) and also works with many files |
| 3794 |
|
(default makedepend limitation for AD built). |
| 3795 |
|
- use cyrus_makedepend in adjustment.128x64x1 (so that it still tested). |
| 3796 |
|
o pkg/diagnostics: |
| 3797 |
|
- add run-time parameter "useMissingValue" (def=False) to fill land-point |
| 3798 |
|
(i.e., where mask=0) with MissingValue ; used only in MNC output file. |
| 3799 |
|
This replaces CPP-option DIAGNOSTICS_MISSING_VALUE. |
| 3800 |
|
- Extend the use of "missing_value" setting from data.diagnostics for the case |
| 3801 |
|
of counter-diagnostics (where fraction-weight is zero). This applies both to |
| 3802 |
|
MNC and MDS output files. |
| 3803 |
|
o pkg/seaice/seaice_growth.F: |
| 3804 |
|
- add 'a priori' cap of latent heat flux based on actual mass considerations |
| 3805 |
|
when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the |
| 3806 |
|
non-legacy seaice_solve4temp. |
| 3807 |
|
- add diagnostic of the residual sublimation freshwater flux (the freshwater |
| 3808 |
|
flux taken from the ocean if the total actual latent heat fluxes exceed |
| 3809 |
|
the maximum) |
| 3810 |
|
- remove the CPP switch around the *_FWbySublim unit change and move diagnostic |
| 3811 |
|
fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F. |
| 3812 |
|
- add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef |
| 3813 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim). |
| 3814 |
|
- bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET. |
| 3815 |
|
- bug fix : missing part to Martin's r_FWbySublim pathological case fix. |
| 3816 |
|
o verification 1D_ocean_ice_column: |
| 3817 |
|
made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet |
| 3818 |
|
update results |
| 3819 |
|
o pkg/diagnostics: |
| 3820 |
|
- Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P') |
| 3821 |
|
which are not filled-up but computed from other diags ; In this case, the mate |
| 3822 |
|
diag points to the primary (filled-up) diag to used for post processing. |
| 3823 |
|
- Update Velocity-potential computation using post-processed diag framework. |
| 3824 |
|
==> Change the ordering of fields and time-periods in MDS output file |
| 3825 |
|
when using periodic averaging: now writes one time record with the full set |
| 3826 |
|
of fields for this time period, then the next time reccord (it used to be |
| 3827 |
|
one field with the full set of time records then the next field). |
| 3828 |
|
Note: this is now similar to NetCDF (MNC) output file. <== |
| 3829 |
|
|
| 3830 |
|
checkpoint62z (2011/06/21) |
| 3831 |
|
o adjoint monitor: |
| 3832 |
|
- Add adjoint monitor output for packages exf, seaice |
| 3833 |
|
and update relevant testreport output |
| 3834 |
|
o pkg/seaice: |
| 3835 |
|
- re-order diags inits so that they appear in order in available_diagnostics.log |
| 3836 |
|
- added diags: hsnow thermo. rates of change, area preceeding ridiging process, |
| 3837 |
|
area/heff/hsnow preceeding thermodynamic growth/melt. |
| 3838 |
|
- modified diag: SIdA; output actual effect, as the description states. |
| 3839 |
|
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
| 3840 |
|
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
| 3841 |
|
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
| 3842 |
|
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
| 3843 |
|
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
| 3844 |
|
- added diagnostics for seaice generic tracers (SItr*). |
| 3845 |
|
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
| 3846 |
|
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
| 3847 |
|
I. Fenty: 18-Jun-2011: |
| 3848 |
|
Minor changes to seaice package: |
| 3849 |
|
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
| 3850 |
|
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
| 3851 |
|
- Differentiated "regularization variables" from "floor variables" |
| 3852 |
|
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
| 3853 |
|
* hiceMin became SEAICE_hice_reg (old hiceMin) |
| 3854 |
|
(with _reg meaning regularization variable) |
| 3855 |
|
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
| 3856 |
|
so as to ensure energy conservation when going between phases |
| 3857 |
|
- A22 was not used anywhere |
| 3858 |
|
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
| 3859 |
|
well-boundedness and smooth adjoint in seaice_growth.F |
| 3860 |
|
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
| 3861 |
|
because the old regularization always set heffActual >= 0.05 cm |
| 3862 |
|
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
| 3863 |
|
on AREA when HEFF > 0. |
| 3864 |
|
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
| 3865 |
|
requiring that DISABLE_AREA_FLOOR *not* be defined |
| 3866 |
|
Affected verifications: |
| 3867 |
|
- 1D_ocean_ice_column (output.txt output_adm.txt) |
| 3868 |
|
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
| 3869 |
|
o pkg/diagnostics: |
| 3870 |
|
- move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R). |
| 3871 |
|
- rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument |
| 3872 |
|
(was _RL, now integer) with option = 0 to retrieve all levels. |
| 3873 |
|
- add pieces of code to compute velocity potential at each level (new diagnostics |
| 3874 |
|
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
| 3875 |
|
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
| 3876 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
| 3877 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
| 3878 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
| 3879 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
| 3880 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
| 3881 |
|
o model/src (rStar): |
| 3882 |
|
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
| 3883 |
|
affect solution only if z* with full pressure in EOS; |
| 3884 |
|
update output of test-exp global_ocean.90x40x15. |
| 3885 |
|
o pkg/seaice: |
| 3886 |
|
- introduce siEps=1e-5 parameter |
| 3887 |
|
- use areaMax in AREA update (part 4), consistent with ridging step (part 2.5). |
| 3888 |
|
- re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code. |
| 3889 |
|
- introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer. |
| 3890 |
|
For now it covers, and was tested for, ice salinity and age (attached to HEFF), |
| 3891 |
|
as well as ice cover age and ridging index (attached to AREA). |
| 3892 |
|
For now the run time parameters (in data.seaice/SEAICE_PARM03) are |
| 3893 |
|
SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA'). |
| 3894 |
|
Up to SItrMaxNum=3 tracers can be used simultaneously. |
| 3895 |
|
o pkg/salt_plume: |
| 3896 |
|
-introduce SPsalFRAC run time parameter that sets the fraction of the |
| 3897 |
|
salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically) |
| 3898 |
|
that gets vertically redistributed (fluxed down) by pkg/salt_plume. |
| 3899 |
|
o model debug options: |
| 3900 |
|
- Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored |
| 3901 |
|
in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h). |
| 3902 |
|
- Refine debug-msg printing selection (3 new levels): |
| 3903 |
|
debugMode : controls printing of debug messages (sequence of S/R calls). |
| 3904 |
|
debugLevel : controls printing of algorithm-relevant auxiliary/debug messages |
| 3905 |
|
debLevZero = 0 ; /* level of disabled aux. msg printing */ |
| 3906 |
|
debLevA = 1 ; /* level of minimum aux. msg printing */ |
| 3907 |
|
debLevB = 2 ; /* level of low aux. print (report read-file opening)*/ |
| 3908 |
|
debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */ |
| 3909 |
|
debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */ |
| 3910 |
|
debLevE = 5 ; /* level of extensive debug printing */ |
| 3911 |
|
New debugLevel default: with default debugMode value (=F), |
| 3912 |
|
= 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.; |
| 3913 |
|
and if debugMode=T, default debugLevel = 4 (debLevD). |
| 3914 |
|
Relation with previous settings: |
| 3915 |
|
debLevB (=2) corresponds to former debLevA (=1) |
| 3916 |
|
debLevD (=4) corresponds to former debLevB (=2) |
| 3917 |
|
Note: |
| 3918 |
|
a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before); |
| 3919 |
|
b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs); |
| 3920 |
|
to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5) |
| 3921 |
|
- Add new parameter (printResidualFreq, read from PARM02 namelist) to print |
| 3922 |
|
detailed CG solvers convergence; off (=0) by default, except if debugLevel=5. |
| 3923 |
|
o pkg/obcs: |
| 3924 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
| 3925 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
| 3926 |
|
o pkg/thsice: |
| 3927 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
| 3928 |
|
2nd layer seaice sublimation (unlikely to happen) |
| 3929 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
| 3930 |
|
done in gad_advection & seaice_advection). |
| 3931 |
|
o adjoint: |
| 3932 |
|
bug fix spotted by Gael Forget: |
| 3933 |
|
seaice_advection and thsice_advection still had |
| 3934 |
|
legacy CPP options to avoid CS corner updates for adjoint |
| 3935 |
|
o pkg/seaice: |
| 3936 |
|
=> Change some of the defaults (2011/05/29): |
| 3937 |
|
- change SEAICEuseFluxForm default (from False to True) |
| 3938 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
| 3939 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
| 3940 |
|
avection scheme is used without any diffusion. |
| 3941 |
|
also: |
| 3942 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
| 3943 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
| 3944 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
| 3945 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
| 3946 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
| 3947 |
|
update results of test exp.: |
| 3948 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
| 3949 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
| 3950 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
| 3951 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
| 3952 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
| 3953 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
| 3954 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
| 3955 |
|
o pkg/seaice/seaice_growth.F: |
| 3956 |
|
- use Ian Fenty's capping formulas for actual ice |
| 3957 |
|
thickness thoughout EVOLUTION branch. |
| 3958 |
|
- put treatment pathological case #2) in CPP brackets |
| 3959 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
| 3960 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
| 3961 |
|
o pkg/seaice: |
| 3962 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
| 3963 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
| 3964 |
|
also pass fac as a param, which can be 1. (to update the tendency |
| 3965 |
|
field) or the time step (to update the field itself). |
| 3966 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
| 3967 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
| 3968 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
| 3969 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
| 3970 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
| 3971 |
|
o pkg/seaice: |
| 3972 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
| 3973 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
| 3974 |
|
to just compute the laplacian of input-field. |
| 3975 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
| 3976 |
|
- fix flux-form version in diffus.F to conserve tracer. |
| 3977 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
| 3978 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
| 3979 |
|
|
| 3980 |
|
checkpoint62y (2011/05/26) |
| 3981 |
|
o pkg/seaice: |
| 3982 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
| 3983 |
|
a_QSWbyATM_cover in qnet (as it should be). |
| 3984 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
| 3985 |
|
(output.seaice.txt output_adm.seaice.txt). |
| 3986 |
|
o pkg/seaice + obcs: |
| 3987 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
| 3988 |
|
equivalent of assuming no tracer gradient outside the OB region. |
| 3989 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
| 3990 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
| 3991 |
|
after changes above); |
| 3992 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
| 3993 |
|
only at OB location (instead of over a band of OLx width). |
| 3994 |
|
o pkg/seaice: |
| 3995 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
| 3996 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
| 3997 |
|
o pkg/obcs: |
| 3998 |
|
- split header file "OBCS.h" into 4 separated files: |
| 3999 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
| 4000 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
| 4001 |
|
(contain no conditional statement which depends on OBCS options). |
| 4002 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
| 4003 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
| 4004 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
| 4005 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
| 4006 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
| 4007 |
|
o pkg/obcs: |
| 4008 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
| 4009 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
| 4010 |
|
over a band of OLx width) |
| 4011 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
| 4012 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
| 4013 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
| 4014 |
|
o obcs in model/src: |
| 4015 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
| 4016 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
| 4017 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
| 4018 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
| 4019 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
| 4020 |
|
- zero out velocity outside OB interior region: This has no effect on |
| 4021 |
|
the solution but just to prevent unrealistic velocity outside OB. |
| 4022 |
|
o obcs and non-lin free-surf: |
| 4023 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
| 4024 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
| 4025 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
| 4026 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
| 4027 |
|
update results of test-exp. exp4(nlfs). |
| 4028 |
|
o exp4 (nlfs) test-exp: |
| 4029 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
| 4030 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
| 4031 |
|
o obcs and 2d/3d solver norm: |
| 4032 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
| 4033 |
|
and outside OB interior region (will allow to place OB further inside the |
| 4034 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
| 4035 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
| 4036 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
| 4037 |
|
e.g. in tutorial_plume_on_slope. |
| 4038 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
| 4039 |
|
o pkg rbcs: |
| 4040 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
| 4041 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
| 4042 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
| 4043 |
|
o pkg/shelfice/shelfice_init_fixed.F |
| 4044 |
|
fix CPP-flag combinations |
| 4045 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
| 4046 |
|
* update/change/correct ice age calculations |
| 4047 |
|
* add age updates for pathological cases |
| 4048 |
|
Probably needs more testing... |
| 4049 |
|
|
| 4050 |
|
checkpoint62x (2011/05/13) |
| 4051 |
|
o pkg/mom_vecinv: |
| 4052 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
| 4053 |
|
to zero-out (outside OB) gradient of vorticity. |
| 4054 |
|
o verification exp.: |
| 4055 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
| 4056 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
| 4057 |
|
o pkg/obcs: |
| 4058 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
| 4059 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
| 4060 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 4061 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
| 4062 |
|
variables needs its own mask. |
| 4063 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 4064 |
|
from the first guess (zero) in analogy to other control variables |
| 4065 |
|
o pkg/shelfice: |
| 4066 |
|
- start basic adjoint |
| 4067 |
|
o pkg/ctrl: |
| 4068 |
|
- remove extra 2D field "for good measure" when initializing in |
| 4069 |
|
ctrl_set_globfld_[xy/xz/yz].F |
| 4070 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
| 4071 |
|
- improve error messages in ctrl_set_unpack_* |
| 4072 |
|
o OBC implementation in momentum: |
| 4073 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
| 4074 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
| 4075 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
| 4076 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
| 4077 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
| 4078 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
| 4079 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
| 4080 |
|
Update output of experiment dome and exp4 (+nlfs). |
| 4081 |
|
o exp4 test-exp: |
| 4082 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
| 4083 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
| 4084 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
| 4085 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
| 4086 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
| 4087 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
| 4088 |
|
o pkg/obcs: |
| 4089 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
| 4090 |
|
o model/src: |
| 4091 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
| 4092 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
| 4093 |
|
from the other without ambiguity. |
| 4094 |
|
o seaice_obcs test-exp.: |
| 4095 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
| 4096 |
|
o pkg/obcs: |
| 4097 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
| 4098 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
| 4099 |
|
o pkg/seaice: |
| 4100 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
| 4101 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
| 4102 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
| 4103 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
| 4104 |
|
o fizhi-cs test exp.: |
| 4105 |
|
switch reference output convention for these 2 non-standard test-exp, |
| 4106 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
| 4107 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
| 4108 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
| 4109 |
|
o model/inc: |
| 4110 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
| 4111 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
| 4112 |
|
o pkg/seaice: |
| 4113 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
| 4114 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
| 4115 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
| 4116 |
|
and initial HSALT |
| 4117 |
|
|
| 4118 |
|
checkpoint62w (2011/04/26) |
| 4119 |
|
o pkg/mom_fluxform: |
| 4120 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
| 4121 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
| 4122 |
|
- update output of exp. global_ocean.90x40x15 |
| 4123 |
|
o pkg/mom_vecinv: |
| 4124 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
| 4125 |
|
o update seaice exp.: |
| 4126 |
|
use more consistent parameter values (remove "backward compatability only": |
| 4127 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
| 4128 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
| 4129 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
| 4130 |
|
o update test-exp global_ocean.90x40x15: |
| 4131 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
| 4132 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
| 4133 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
| 4134 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
| 4135 |
|
and update output files: output.txt & output.dwnslp.txt |
| 4136 |
|
o new AD-test experiment: obcs_ctrl |
| 4137 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
| 4138 |
|
o pkg/dic: |
| 4139 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
| 4140 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
| 4141 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
| 4142 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
| 4143 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
| 4144 |
|
at depth and bring the negative heat anomaly to the surface level |
| 4145 |
|
o pkgs _fields_load: |
| 4146 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
| 4147 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
| 4148 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
| 4149 |
|
rbcs to get interpolation weights and time reccord number. |
| 4150 |
|
- fix multi-threading in aim_fields_load.F |
| 4151 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
| 4152 |
|
o external_fields_load: |
| 4153 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
| 4154 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
| 4155 |
|
time-step to convert to integer: |
| 4156 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
| 4157 |
|
(Thanks to Christopher L. Wolfe) |
| 4158 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
| 4159 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
| 4160 |
|
store index of time-record which is currently loaded: |
| 4161 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
| 4162 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
| 4163 |
|
(to be fixed soon) |
| 4164 |
|
|
| 4165 |
|
checkpoint62v (2011/04/02) |
| 4166 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
| 4167 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
| 4168 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
| 4169 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
| 4170 |
|
o pkg/generic_advdiff with OBCS: |
| 4171 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
| 4172 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
| 4173 |
|
This will affect the results if using obcs+biharmonic diffusion. |
| 4174 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
| 4175 |
|
o pkg/obcs: |
| 4176 |
|
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
| 4177 |
|
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
| 4178 |
|
in Interior region. No impact on solution but affects Velocity monitor stats. |
| 4179 |
|
o pkg/ptracers (adjoint) |
| 4180 |
|
New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate |
| 4181 |
|
tape file for each tracer |
| 4182 |
|
o model/inc/src and pkg/autodiff: add parameters that allow to turn |
| 4183 |
|
of parts of the adjoint code at run time. For now, there are only |
| 4184 |
|
useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These |
| 4185 |
|
parameters are set in data.pkg. |
| 4186 |
|
This is the lazy coward's version of doing this, but still useful for |
| 4187 |
|
debugging. In order to do it right, everything needs to be moved to |
| 4188 |
|
pkg/autodiff. |
| 4189 |
|
o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at |
| 4190 |
|
the end; this fixes the adjoint balancing code for open boundaries. |
| 4191 |
|
o pkg/ctrl: |
| 4192 |
|
- change behavior of xx_${varname}period to be analogous to exf-conventions: |
| 4193 |
|
xx_${varname}period = 0., means time-independent control part |
| 4194 |
|
xx_${varname}period = -12., means one-year-periodic monthly control part |
| 4195 |
|
- introduce helper routine ctrl_init_rec (part of ctrl_init.F) to |
| 4196 |
|
clean up ctrl_init a little, remove unused variables |
| 4197 |
|
- ctrl_init: fixed the handling of the start/endrec for obcs-variables |
| 4198 |
|
- move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec |
| 4199 |
|
|
| 4200 |
|
checkpoint62u (2011/03/15) |
| 4201 |
|
o model/src: |
| 4202 |
|
- for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in |
| 4203 |
|
h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ; |
| 4204 |
|
- in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to |
| 4205 |
|
INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF. |
| 4206 |
|
o pkg/ctrl/obcs/ecco: |
| 4207 |
|
- remove obsolete, unused, and partially broken code: |
| 4208 |
|
ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within |
| 4209 |
|
ALLOW_CTRL_OBCS_BALANCE |
| 4210 |
|
- put a stop statement into ecco/cost_obcsvol.F, but also add |
| 4211 |
|
cost_obcsvol to ecco_ad_diff.list |
| 4212 |
|
o pkg/ecco: fix counting cost function contributions for obcs (code |
| 4213 |
|
by Matt M.) and diffkr for diagnostics |
| 4214 |
|
o pkg/ecco, pkg/ctrl, pkg/grdchk: |
| 4215 |
|
add cost penalty terms for initial uvel, vvel, eta controls |
| 4216 |
|
and I/O for prior error files |
| 4217 |
|
o pkg/mdsio: |
| 4218 |
|
move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option |
| 4219 |
|
(new argument) to check for tiled file in mdsioLocalDir : this fix the |
| 4220 |
|
restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir. |
| 4221 |
|
o pkg/ctrl: |
| 4222 |
|
- ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by |
| 4223 |
|
ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove |
| 4224 |
|
unused and superfluous variables |
| 4225 |
|
- ctrl_get_gen_rec.F: catch the case of xx_genperiod=0. |
| 4226 |
|
o pkg/ecco |
| 4227 |
|
- enable adjoint of Stevens OB |
| 4228 |
|
o pkg/ctrl/ecco/grdchk: |
| 4229 |
|
- remove global declaration of tmpfldx/yz and tmpfldx/yz2. |
| 4230 |
|
Fortunately, we do not have any tests for the numerous cpp-flagged |
| 4231 |
|
option of "obcs as control parameters" so we will never know |
| 4232 |
|
if this is an improvement (but at least now things compile). |
| 4233 |
|
- remove an obsolete initialization from ecco_cost_init_barfiles.F |
| 4234 |
|
- fix some problems within never used ifdefs to make the code compile |
| 4235 |
|
o pkg/obcs: |
| 4236 |
|
- Refine Interior mask definition to work with more complex OB (e.g. |
| 4237 |
|
if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to |
| 4238 |
|
read in Interior mask from file. Check if Interior mask is consistent |
| 4239 |
|
with OB list of indices. |
| 4240 |
|
o pkg/seaice |
| 4241 |
|
- beginning code for a seaice tracer package, |
| 4242 |
|
but currently only used for seaice age: SEAICE_AGE |
| 4243 |
|
SEAICE_num = 4 |
| 4244 |
|
iTracer = 1: area-weighted ice age |
| 4245 |
|
= 2: volume-weighted ice age |
| 4246 |
|
= 3, 4: template for one-year vs. multi-year ice |
| 4247 |
|
data.seaice has new namelist SEAICE_PARM03 for arrays related to |
| 4248 |
|
SEAICE_num |
| 4249 |
|
|
| 4250 |
|
checkpoint62t (2011/03/05) |
| 4251 |
|
o pkg/obcs: |
| 4252 |
|
- obcs_apply_uv.F: change to a 2 steps method, first tangential component; |
| 4253 |
|
then normal component. This ensures that the normal component is set |
| 4254 |
|
correctly even when it conficts with tangential setting from an other OB. |
| 4255 |
|
Affects results of test-experiment seaice_obcs: update the output.txt |
| 4256 |
|
o pkg/obcs: |
| 4257 |
|
- add code to monitor statistics of dynamical fields at OB. |
| 4258 |
|
- take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW : |
| 4259 |
|
- fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection). |
| 4260 |
|
- change default: balance the Net inflow through all OB (instead of balancing |
| 4261 |
|
each OB separately); keep the old method if setting OBC_balanceFacX < 0. |
| 4262 |
|
- switch on useOBCSbalance in dome experiment: only correct Western OB outflow |
| 4263 |
|
to match Nortern OB inflow (OBCS_balanceFacN=0). |
| 4264 |
|
o pkg/seaice: |
| 4265 |
|
- redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL |
| 4266 |
|
o pkg/seaice (seaice_growth v 1.113): |
| 4267 |
|
- reverting seaice_growth to v 1.111 in order to have code with exact bit |
| 4268 |
|
compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge |
| 4269 |
|
CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced |
| 4270 |
|
runtime flag SEAICEareaFormula is kept but is inactive |
| 4271 |
|
o model/src: |
| 4272 |
|
- add new param to scale curvilinear grid distance and area when using |
| 4273 |
|
a different sphere radius from the grid-files. |
| 4274 |
|
- test/check multi-threads EXCH applied to local variable (cg2d_x) |
| 4275 |
|
o adjoint: |
| 4276 |
|
- enable adjoint of Stevens OB |
| 4277 |
|
- add dummy_in_dynamics to enable extraction of ADJrhoinsitu |
| 4278 |
|
(a bit delicate because of potentially modified adj. common block structure; |
| 4279 |
|
current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later) |
| 4280 |
|
|
| 4281 |
|
checkpoint62s (2011/02/15) |
| 4282 |
|
o pkg/seaice (seaice_growth v 1.112): |
| 4283 |
|
- introduce SEAICEareaFormula run time parameter, which selects the recipe for |
| 4284 |
|
computing the ice cover tendency from effective thickness tendencies. Include |
| 4285 |
|
Ian Fenty's formula. |
| 4286 |
|
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using |
| 4287 |
|
SEAICEareaFormula. |
| 4288 |
|
- simplify notations for the various d_HEFF/d_AREA terms. |
| 4289 |
|
o pkg/gmredi: |
| 4290 |
|
- add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code |
| 4291 |
|
from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative; |
| 4292 |
|
add a verification test-run (front_relax.bvp) to test GM_useBVP. |
| 4293 |
|
o pkg/seaice (seaice_growth v 1.111): |
| 4294 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
| 4295 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to |
| 4296 |
|
also melt ice. |
| 4297 |
|
o pkg/seaice: |
| 4298 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
| 4299 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
| 4300 |
|
o pkg/cheapaml: |
| 4301 |
|
- from Nico Wienders: New version of this package. |
| 4302 |
|
o pkg/flt: |
| 4303 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
| 4304 |
|
a periodic domain (default: keep periodicity) |
| 4305 |
|
o pkg/gmredi: |
| 4306 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
| 4307 |
|
(needed for multi-dim advection). |
| 4308 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
| 4309 |
|
o model/src: |
| 4310 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
| 4311 |
|
o tutorial_tracer_adjsens |
| 4312 |
|
- extend to NLFS and replace maskC by hFacC |
| 4313 |
|
(change reference output accordingly) |
| 4314 |
|
|
| 4315 |
|
checkpoint62r (2011/01/24) |
| 4316 |
|
o testreport: |
| 4317 |
|
- add option -deloutp (-do) to remove output file after successful run |
| 4318 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
| 4319 |
|
extract exact list of procs from this file ; adjust COMMAND by |
| 4320 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
| 4321 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
| 4322 |
|
first guess (of obcs) with code by Matt Mazloff |
| 4323 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
| 4324 |
|
exf/cal |
| 4325 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
| 4326 |
|
and handle case of obcs?period == 0 |
| 4327 |
|
Not affected by these changes: There is still an inconsistency in |
| 4328 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
| 4329 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
| 4330 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
| 4331 |
|
ALLOW_CAL is not defined |
| 4332 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
| 4333 |
|
S/R exf_swapfields |
| 4334 |
|
o testreport: |
| 4335 |
|
allow to test MPI with different number of processors for each experiment: |
| 4336 |
|
create file "SIZE.h.mpi" in each build dir. |
| 4337 |
|
Note: update of "-command" argument not yet implemented. |
| 4338 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
| 4339 |
|
alleviate the need for additional 3D tapes when using |
| 4340 |
|
the non-inear free surface in the adjoint. This is done |
| 4341 |
|
by adding an 'update' of hfacc etc. to their current |
| 4342 |
|
value at the beginning of forward_step.F. |
| 4343 |
|
o pkg/seaice |
| 4344 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
| 4345 |
|
timestepping loop |
| 4346 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
| 4347 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
| 4348 |
|
of the routine. |
| 4349 |
|
o pkg/gmredi: |
| 4350 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
| 4351 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
| 4352 |
|
o pkg/seaice: |
| 4353 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
| 4354 |
|
o pkg/seaice: |
| 4355 |
|
reduce memory footprint of seaice mutldim advection tapes, |
| 4356 |
|
by using a 2D tape independent of the generic_advdiff ones, |
| 4357 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
| 4358 |
|
|
| 4359 |
|
checkpoint62q (2010/12/29) |
| 4360 |
|
o model/src: |
| 4361 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
| 4362 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
| 4363 |
|
o pkg/flt: |
| 4364 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
| 4365 |
|
- precision of input and output files set according to readBinaryPrec |
| 4366 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
| 4367 |
|
- initial float position from tiled file was not converted to index space |
| 4368 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
| 4369 |
|
o global_ocean.cs32x15: |
| 4370 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
| 4371 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
| 4372 |
|
o model/src: |
| 4373 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
| 4374 |
|
ini_mask_etc (call to plot_fieds_xy*). |
| 4375 |
|
o pkg/thsice: |
| 4376 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
| 4377 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
| 4378 |
|
o pkg/mdsio: |
| 4379 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
| 4380 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
| 4381 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
| 4382 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
| 4383 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
| 4384 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
| 4385 |
|
o pkg/flt: |
| 4386 |
|
- add fourth-order Runge-Kutta integration |
| 4387 |
|
- add basic exch2 support (only 1 facet supported so far!) |
| 4388 |
|
o pkg/mdsio+rw: |
| 4389 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
| 4390 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
| 4391 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
| 4392 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 4393 |
|
(using multidim advection for seaice) |
| 4394 |
|
o towards more F95 syntax for array specification in namelist: |
| 4395 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
| 4396 |
|
of all verification experiments. |
| 4397 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
| 4398 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
| 4399 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
| 4400 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
| 4401 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 4402 |
|
|
| 4403 |
|
checkpoint62p (2010/12/17) |
| 4404 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
| 4405 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
| 4406 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
| 4407 |
|
allow for use of multim. advection in seaice adjoint. |
| 4408 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
| 4409 |
|
- first attempt to close budgets by taking into account the freshwater |
| 4410 |
|
flux implied by the sublimation of snow and ice. So far only the |
| 4411 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
| 4412 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
| 4413 |
|
o eesupp/src: |
| 4414 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
| 4415 |
|
from F95 standard to commonly accepted extended F77 form. |
| 4416 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
| 4417 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
| 4418 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
| 4419 |
|
o globalFiles: |
| 4420 |
|
commented out in parameter file "data" since it's not safe with MPI |
| 4421 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
| 4422 |
|
in this case); no longer commented out in restart test (tst_2+2). |
| 4423 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
| 4424 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
| 4425 |
|
and cannot be used together with mdsioLocalDir. |
| 4426 |
|
o nesting pkgs: |
| 4427 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
| 4428 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 4429 |
|
- add parameter files + utils dir + output from short run on beagle. |
| 4430 |
|
o pkg/seaice: |
| 4431 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
| 4432 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
| 4433 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
| 4434 |
|
|
| 4435 |
|
checkpoint62o (2010/11/25) |
| 4436 |
|
o pkg/exf: |
| 4437 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
| 4438 |
|
o pkg/seaice: |
| 4439 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
| 4440 |
|
adjoint code |
| 4441 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
| 4442 |
|
capping of heff, put contribution into d_HEFFbyNEG |
| 4443 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
| 4444 |
|
by something more sensible (parameters that are what their name implies) |
| 4445 |
|
- change some defaults, so that by default exf-parameters are used for |
| 4446 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
| 4447 |
|
to reproduce the old results, many data.seaice now contain funny values |
| 4448 |
|
for cpAir and latent heat of sublimation |
| 4449 |
|
o packages_readparms.F: move exf_readparms up in line so that |
| 4450 |
|
exf-parameters are visible for other packages (e.g. seaice) |
| 4451 |
|
o debugMode & debugLevel=2: |
| 4452 |
|
- differentiate between debugMode & debugLevel=2: |
| 4453 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
| 4454 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
| 4455 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
| 4456 |
|
=> allows to print debug-stats without all sequence of call messages. |
| 4457 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
| 4458 |
|
o pkg/obcs (obcs-sponge): |
| 4459 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
| 4460 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
| 4461 |
|
o pkg/generic_advdiff: |
| 4462 |
|
- record overlap minimum size for each advection scheme; |
| 4463 |
|
- refine criteria on overlap minimum size; |
| 4464 |
|
- check and stop (in gad_check) if overlap size is too small. |
| 4465 |
|
o pkg/obcs: |
| 4466 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
| 4467 |
|
once, in ptracers_implicit.F) |
| 4468 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
| 4469 |
|
apply OB values when tile has OB) |
| 4470 |
|
o model/src, coriolis setting: |
| 4471 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
| 4472 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
| 4473 |
|
files (selectCoriMap=3) with any grid. |
| 4474 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
| 4475 |
|
o pkg/seaice/seaice_growth.F: |
| 4476 |
|
a few cosmetic changes that reduce the number of lines of code |
| 4477 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
| 4478 |
|
- the code follows old MOM/NAOSIM code |
| 4479 |
|
- so far it is only implemented for the eastern and western boundaries |
| 4480 |
|
and NOT for pTracers |
| 4481 |
|
o pkg/rbcs: |
| 4482 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
| 4483 |
|
beginning of the first rbcs forcing period. |
| 4484 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
| 4485 |
|
offline package, i.e., one file per time, labeled by iteration number; |
| 4486 |
|
deltaTrbcs sets the timestep with which the data was generated; |
| 4487 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
| 4488 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
| 4489 |
|
- make arithmetic safe for negative times and odd forcing periods. |
| 4490 |
|
|
| 4491 |
|
checkpoint62n (2010/11/09) |
| 4492 |
|
o pkg/seaice: |
| 4493 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
| 4494 |
|
o pkg/obcs: |
| 4495 |
|
New S/R to copy tracer value from the OB location to narrow band region |
| 4496 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
| 4497 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
| 4498 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
| 4499 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
| 4500 |
|
in seaice_advection.F and advect.F. |
| 4501 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
| 4502 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
| 4503 |
|
o tools/genmake2: |
| 4504 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
| 4505 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
| 4506 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
| 4507 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
| 4508 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
| 4509 |
|
an optfile, but otherwise default was just "cpp". |
| 4510 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
| 4511 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
| 4512 |
|
(instead of just setting CC=cc) |
| 4513 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
| 4514 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
| 4515 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
| 4516 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
| 4517 |
|
with reference compiler switch from g77 to gfortran) |
| 4518 |
|
o pkg/seaice: |
| 4519 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
| 4520 |
|
seaice_check that stops the model, when the CPP flag is used. |
| 4521 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
| 4522 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
| 4523 |
|
experiments but will change runs where the capping is acutally active |
| 4524 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
| 4525 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
| 4526 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
| 4527 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
| 4528 |
|
o tools/genmake2: |
| 4529 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
| 4530 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
| 4531 |
|
- clean previous genmake log files before anything else. |
| 4532 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
| 4533 |
|
files only with "CLEAN" target (instead of "Clean"); |
| 4534 |
|
o pkg/generic_advdiff: |
| 4535 |
|
Change OBCS in multiDim advection (gad_advection.F): |
| 4536 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
| 4537 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
| 4538 |
|
which were applying future time-step OB values. |
| 4539 |
|
This way, all explicit calculations use current-time-step OB values |
| 4540 |
|
(simpler and more consistent). |
| 4541 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
| 4542 |
|
update output of experiment seaice_obcs. |
| 4543 |
|
o pkg/seaice: |
| 4544 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 4545 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 4546 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
| 4547 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
| 4548 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
| 4549 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
| 4550 |
|
o pkg aim (2010/10/26): |
| 4551 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
| 4552 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
| 4553 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
| 4554 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
| 4555 |
|
o pkg/obcs: |
| 4556 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
| 4557 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
| 4558 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
| 4559 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
| 4560 |
|
|
| 4561 |
|
checkpoint62m (2010/10/21) |
| 4562 |
|
o pkg/seaice: vectorize seaice_solve4temp.F |
| 4563 |
|
- move iterations loops outside of i/j-loops |
| 4564 |
|
- requires 2D arrays for TB and effConduct |
| 4565 |
|
- add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is |
| 4566 |
|
modified in this routine |
| 4567 |
|
- a little bit of clean up, adjusting indentation, etc. |
| 4568 |
|
- replaced a few TEN**a by exp(a*log(10.)) in new code for better |
| 4569 |
|
performance and '**TWO' by '**2' (because TWO is a float), |
| 4570 |
|
replaced ONE, ZERO |
| 4571 |
|
o eesupp/src: |
| 4572 |
|
fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube |
| 4573 |
|
o pkg/seaice/seaice_growth.F |
| 4574 |
|
Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and |
| 4575 |
|
merging process. The merged routine has two branches, and one activates the 'evolution' |
| 4576 |
|
branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now). |
| 4577 |
|
In summary, here is what the '10/10 revision' did consist of |
| 4578 |
|
part 1: seaice_growth.F revisions 1.71 to 1.75 |
| 4579 |
|
- Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged. |
| 4580 |
|
The emphasis here was on improving readability (e.g. by trying to use meaningful |
| 4581 |
|
variable names) and modularity (e.g. by adding arrays to store heff etc. updates). |
| 4582 |
|
part 1.5: |
| 4583 |
|
- revising the lab_sea experiment to make it a more useful (i.e. stable |
| 4584 |
|
and representative of an actual model run). This was done by generating a |
| 4585 |
|
(winter) pickup to start from, switching back the main experiment dynamic |
| 4586 |
|
solver from evp to lsr, having one of the experiments use the free drift solution. |
| 4587 |
|
part 2: seaice_growth.F revisions 1.76 to 1.85 |
| 4588 |
|
- Sorting out hard-coded constants that prevented heat and fresh water conservation. |
| 4589 |
|
- Sorting out the various fields units and sign (set early on and reset at the end) |
| 4590 |
|
to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and |
| 4591 |
|
fresh water stock is 'effective ice meters', and >0 implies more ice/snow. |
| 4592 |
|
- Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks, |
| 4593 |
|
and simplifying logical expressions to further improve readibility. |
| 4594 |
|
part 3: seaice_growth.F revisions 1.86 to 1.89 |
| 4595 |
|
- Re-organize the blocks of code more logically. |
| 4596 |
|
- Merging the '_if.F' pieces that add something new. |
| 4597 |
|
o pkg/thsice: |
| 4598 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
| 4599 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
| 4600 |
|
might also be problematic for TAF |
| 4601 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
| 4602 |
|
does not change the verifcation experiment, but will change all |
| 4603 |
|
experiments that have this flag undefined (not tested in verification); |
| 4604 |
|
a little reorganization to save a few 2D fields and recomputations |
| 4605 |
|
- 1st step of revisiting thsice adjoint (major recomp. sorted out) |
| 4606 |
|
- 2nd step: fix some store dirs |
| 4607 |
|
o seems to work somewhat, i.e. using ifort but not g77 |
| 4608 |
|
o likely cause are incomplete init. or recomputation |
| 4609 |
|
o start verification/global_ocean.cs32x15/input_ad.thsice |
| 4610 |
|
o pkg/obcs: add support for exch2 |
| 4611 |
|
- the position of the boundary and prescribed values are specified using |
| 4612 |
|
a global domain with exch2 facets stacked |
| 4613 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
| 4614 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
| 4615 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
| 4616 |
|
file layout is as for obcs described above: |
| 4617 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
| 4618 |
|
- for y-z sections, facets are stacked in y |
| 4619 |
|
o pkg/thsice: |
| 4620 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
| 4621 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
| 4622 |
|
not affected, but in particular the latter routine has changed |
| 4623 |
|
dramatically (not necessarily easier to read now). |
| 4624 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
| 4625 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
| 4626 |
|
o verification/lab_sea: |
| 4627 |
|
- overhaul of the forward model experiments. The main motivation |
| 4628 |
|
for this revision is that lab_sea has proven quite fragile (when |
| 4629 |
|
changing the sea-ice code, and switching platforms) to a point |
| 4630 |
|
when failures were very hard to attribute to specific code problems. |
| 4631 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
| 4632 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
| 4633 |
|
- the input.lsr experiment thus became obsolete and was removed. |
| 4634 |
|
- it was replaced with the input.fd experiment that uses an |
| 4635 |
|
analytical "free drift" solution as the ice velocity field. |
| 4636 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
| 4637 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
| 4638 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
| 4639 |
|
us to test additional options, along with the salt plume package. |
| 4640 |
|
- Finally a pickup was generated (at the end of a one year run) to |
| 4641 |
|
make the tests more representative of an actual model run. Previously |
| 4642 |
|
the tests starting point was a 1m thickness of ice everywhere. |
| 4643 |
|
o pkg/seaice: |
| 4644 |
|
- introducing S\R seaice_freedrift.F that compute the |
| 4645 |
|
analytical solution to an approximate ice momentum |
| 4646 |
|
equation (i.e. the simple stress/coriolis balance). |
| 4647 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
| 4648 |
|
of the free drift velocity field, and enable its use. |
| 4649 |
|
To actually use the free drift solution as the model ice |
| 4650 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
| 4651 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
| 4652 |
|
|
| 4653 |
|
checkpoint62l (2010/10/04) |
| 4654 |
|
o pkg/seaice: |
| 4655 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
| 4656 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
| 4657 |
|
version (with USE_ORIGINAL_SBI undef); |
| 4658 |
|
o add hooks for new packages OASIS, the package will follow |
| 4659 |
|
(hooks exclude the seaice pkg for now) |
| 4660 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
| 4661 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
| 4662 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
| 4663 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
| 4664 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
| 4665 |
|
Option to write/read 2D fields to files including tiles halos. |
| 4666 |
|
The main purpose is for adjoint related "tape I/O". |
| 4667 |
|
The secondary purpose is for debugging phases. |
| 4668 |
|
A word on those rather specifically intended purposes. |
| 4669 |
|
The code was meant to be stripped down to the bare minimum. |
| 4670 |
|
Typically, there is a unique and basic mapping to the global |
| 4671 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
| 4672 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
| 4673 |
|
meant to generate user friendly outputs of various shapes and forms. |
| 4674 |
|
Rather it is intended, for the knowledgeabale developers, |
| 4675 |
|
to be largely independent of the many mdsio options, to allow |
| 4676 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
| 4677 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
| 4678 |
|
file system behavior. With regard to tuning, most of the potential knobs |
| 4679 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
| 4680 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
| 4681 |
|
are not yet included, and will be added if they prove useful. |
| 4682 |
|
o pkg/seaice: |
| 4683 |
|
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
| 4684 |
|
o pkg/seaice: |
| 4685 |
|
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
| 4686 |
|
code (seaice_budget_ice_if.F) which enable to recover old standard |
| 4687 |
|
code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined. |
| 4688 |
|
temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F. |
| 4689 |
|
o model/src (rStar): |
| 4690 |
|
use simple average (not area weighted) of rStarFac at U,V point when using |
| 4691 |
|
vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection) |
| 4692 |
|
update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20. |
| 4693 |
|
|
| 4694 |
|
checkpoint62k (2010/09/17) |
| 4695 |
|
o adjoint |
| 4696 |
|
* changed verification/global_ocean.cs32x15 ; adjoint now tests |
| 4697 |
|
Adams-Bashforth 3 + NLFS + RSTAR |
| 4698 |
|
* some more modifs required for ECCO-GODAE v4 |
| 4699 |
|
o pkg/seaice |
| 4700 |
|
add SEAICE_AGE_VOL option to use volume instead of area for |
| 4701 |
|
integrating SEAICE_AGE |
| 4702 |
|
o model/src: |
| 4703 |
|
first check-in of sigma & hybrid-sigma coordinate code ; also includes |
| 4704 |
|
non-linear free-surface parts ; but pressure-gradient not yet coded. |
| 4705 |
|
o pkg/ptracers: |
| 4706 |
|
option for ptracer to convert Salt Relax into additional EmP. |
| 4707 |
|
tested in exp. global_ocean.90x40x15.dwnslp (update output) |
| 4708 |
|
|
| 4709 |
|
checkpoint62j (2010/08/25) |
| 4710 |
|
o pkg/ggl90: |
| 4711 |
|
other minor changes: remove 3-D temp array gTKE (+ add argument myIter) |
| 4712 |
|
o pkg/dic: car_flux.F, phos_flux.F |
| 4713 |
|
- reduce number of exp-calls in order to improve performance |
| 4714 |
|
- clean up a little (replace fields by their macros, etc., fix |
| 4715 |
|
typo in CPP-flag) |
| 4716 |
|
o pkg/ggl90: minor changes |
| 4717 |
|
- GGL90diffKrS was removed --> always use GGL90diffKr |
| 4718 |
|
- GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV |
| 4719 |
|
- hack of mxlMaxFlag=2 --> ensure mixing between first and second level |
| 4720 |
|
(commented out for now) |
| 4721 |
|
- change in max/min operations to ensure that smoothing is ok |
| 4722 |
|
- smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr) |
| 4723 |
|
- always use diffKrNrT as background profile (i.e. never use diffKr field) |
| 4724 |
|
o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj) |
| 4725 |
|
o pkg/dic: |
| 4726 |
|
- model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better |
| 4727 |
|
vectorization |
| 4728 |
|
- small bug fix in insol for the unlikely case of a cartesian grid |
| 4729 |
|
- towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F |
| 4730 |
|
+ now vectorize, which also removes adjoint recomputations; |
| 4731 |
|
+ replace integer maksp1 by _RL maskp1 |
| 4732 |
|
+ replace a**x by exp(x*log(a)) in phos_flux.F for speed |
| 4733 |
|
|
| 4734 |
|
checkpoint62i (2010/07/21) |
| 4735 |
|
o pkg/flt: |
| 4736 |
|
- with OBCS: stop floats which enter the OB region |
| 4737 |
|
o model/src: |
| 4738 |
|
- use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones) |
| 4739 |
|
for implicit vertical advection. |
| 4740 |
|
o pkg/seaice: |
| 4741 |
|
- account for melting in seaice age evolution. |
| 4742 |
|
- remove double counting of seaice ridging effect on seaice age. |
| 4743 |
|
|
| 4744 |
|
checkpoint62h (2010/06/18) |
| 4745 |
|
o pkg/exch2: |
| 4746 |
|
- remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1). |
| 4747 |
|
o tools/genmake2 |
| 4748 |
|
- remove "-pdefault" option: redundant with the use of "packages.conf"; |
| 4749 |
|
- remove file pkg/pkg_default : set the default as a pkg group |
| 4750 |
|
("default_pkg_list") defined in pkg/pkg_groups; |
| 4751 |
|
- fix for case pkg/pkg_depend is missing (was hanging before); |
| 4752 |
|
- add option "-pgroups" to specify a different pkg_groups than the default. |
| 4753 |
|
o verification/adjustment.cs-32x32x1: |
| 4754 |
|
add a "minimal" set-up test (code_min & input_min) which only compiles |
| 4755 |
|
eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc. |
| 4756 |
|
o tools/genmake2 |
| 4757 |
|
- extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg])) |
| 4758 |
|
- fix details of checking for mnc & profile pkg when NetCDF is unavailable. |
| 4759 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
| 4760 |
|
files are nearly the same anyway. |
| 4761 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
| 4762 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
| 4763 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
| 4764 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
| 4765 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
| 4766 |
|
- replace |
| 4767 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
| 4768 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
| 4769 |
|
by |
| 4770 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
| 4771 |
|
(changes results) |
| 4772 |
|
-> exf_bulkformulae v1.22, |
| 4773 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
| 4774 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
| 4775 |
|
output.txt 1.63 |
| 4776 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
| 4777 |
|
seaice_obcs: output.txt 1.10) |
| 4778 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
| 4779 |
|
-> exf_bulkformulae v1.23, |
| 4780 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
| 4781 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
| 4782 |
|
Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice. |
| 4783 |
|
o adjoint of exch-1: |
| 4784 |
|
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
| 4785 |
|
(note: was already like this when using EXCH-2) and remove flow dir |
| 4786 |
|
and hand-written AD version of high-level EXCH S/R (pkg/autodiff); |
| 4787 |
|
- provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow); |
| 4788 |
|
- update pkg/exch2 diff list. |
| 4789 |
|
|
| 4790 |
|
checkpoint62g (2010/05/19) |
| 4791 |
|
o eesupp/src (exch-1): |
| 4792 |
|
- split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F) |
| 4793 |
|
and remove argument "simulationMode"; same thing for all exch_*rx_cube.F |
| 4794 |
|
(renamed to exch1_*rx_cube.F). |
| 4795 |
|
- change accordingly exch_*_rx.template and AD version in pkg/autodiff |
| 4796 |
|
to call new exch1 S/R ; update Makefile and .cvsignore. |
| 4797 |
|
- replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove |
| 4798 |
|
exch2_xy_rx later) |
| 4799 |
|
Note: after updating your code, need to run "make clean" in eesupp/src |
| 4800 |
|
o test experiment bottom_ctrl_5x5: |
| 4801 |
|
new output_adm.txt with fewer grdchk & less monitor output. |
| 4802 |
|
o model/src: |
| 4803 |
|
remove the call to ini_cori in initialise_varia.F (just keep the usual one |
| 4804 |
|
in initialise_fixed.F). More consistent with coriolis & horizontal grid |
| 4805 |
|
beeing treated in the same way (ini_grid is not called a 2nd time). |
| 4806 |
|
o pkg/exf: |
| 4807 |
|
- rewrite exf_bulk_largeyeager04.F for better vectorization, changes |
| 4808 |
|
global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated |
| 4809 |
|
- fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now) |
| 4810 |
|
- cosmetic changes to exf_bulkformulae.F to make it look more like |
| 4811 |
|
exf_bulk_largeyeager04.F |
| 4812 |
|
o eesupp/src (exch-1): |
| 4813 |
|
- Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1). |
| 4814 |
|
- Separate buffer filling and MPI sending: allow EXCH-1 to work for local |
| 4815 |
|
array (non-shared) when using MPI+MTH. Also reduces number of BARRIER |
| 4816 |
|
(even without using MPI). |
| 4817 |
|
- Message mode: move RecvAck setting (indicator of buffer being ready) |
| 4818 |
|
from send_put to recv_get S/R (was useless before, but not sure if |
| 4819 |
|
it's much more useful now); |
| 4820 |
|
- Switch the order of sync: MPI-proc 1rst and then threads; |
| 4821 |
|
- take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead. |
| 4822 |
|
- fix AD code for communication mode ='get' (but not used). |
| 4823 |
|
o model/src: |
| 4824 |
|
initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does |
| 4825 |
|
not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp). |
| 4826 |
|
o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API |
| 4827 |
|
o pkg/ctrl: require a specific set of control variables and exf-flags for |
| 4828 |
|
adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied) |
| 4829 |
|
o model/src: |
| 4830 |
|
a) 1rst version of a new driver S/R to turn-off output freq and flags after the |
| 4831 |
|
1rst forward sweep, to avoid over-writing output files during recomputations |
| 4832 |
|
recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?) |
| 4833 |
|
b) 2nd version: |
| 4834 |
|
- add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO); |
| 4835 |
|
- switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast, |
| 4836 |
|
writePickupAtEnd) + seaice & ptracers output; |
| 4837 |
|
- do not switch off MNC flags (otherwise, won't get admonitor netcdf file) |
| 4838 |
|
o model/src: |
| 4839 |
|
- new S/R rotate_uv2en_rl (..._rs) that rotates vector fields. |
| 4840 |
|
o pkg/exch2: |
| 4841 |
|
- remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ; |
| 4842 |
|
- add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch). |
| 4843 |
|
o pkg/autodiff & exch2: |
| 4844 |
|
process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF |
| 4845 |
|
(for now, only if ALLOW_EXCH2 is defined). |
| 4846 |
|
o pkg/autodiff: |
| 4847 |
|
- include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F |
| 4848 |
|
(not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly. |
| 4849 |
|
+ clean-up comments (_RS is not always real*4) |
| 4850 |
|
- fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R) |
| 4851 |
|
- add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2: |
| 4852 |
|
was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs. |
| 4853 |
|
o testreport (AD-tests): |
| 4854 |
|
no longer link files from dir "../input" (1rst link files from |
| 4855 |
|
"../input_ad.[xx]" if secondary test "xx" and then from "../input_ad") |
| 4856 |
|
|
| 4857 |
|
checkpoint62f (2010/04/29) |
| 4858 |
|
o model/src/the_main_loop.F: |
| 4859 |
|
adjust store directives for seaice evp and multicategory according to |
| 4860 |
|
pkg/ecco/the_main_loop.F |
| 4861 |
|
o adjoint: |
| 4862 |
|
global_sum_ad was incomplete (noted many times by many people ;) |
| 4863 |
|
nice description by Jean U. as follows: |
| 4864 |
|
* allreduce(var) in global_sum.F can be interpreted as |
| 4865 |
|
reduce(sum) followed by broadcast of sum. |
| 4866 |
|
* The adjoint of that is |
| 4867 |
|
sum(adjoint) followed by broadcast(summed adjoint value) |
| 4868 |
|
or in other words, allreduce(sum, adjoint vars) |
| 4869 |
|
We were missing the sum(adjoint)! |
| 4870 |
|
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |
| 4871 |
|
(noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset). |
| 4872 |
|
The fix should produce 16-digit accuracy between |
| 4873 |
|
single-CPU multi-tile (e.g. nSx=2, nPx=1) and |
| 4874 |
|
multi-CPU single-tile (e.g. nSx=1, nPx-2) |
| 4875 |
|
We'll probably change this yet again shortly |
| 4876 |
|
o eesupp/src: |
| 4877 |
|
- fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?) |
| 4878 |
|
o pkg/icefront |
| 4879 |
|
- ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving |
| 4880 |
|
specification of addmass array based on a 2D field, which is added |
| 4881 |
|
at bottommost wet level at each horizontal location. |
| 4882 |
|
o model/src: |
| 4883 |
|
horizontal grid initialisation (other than curvilinear): add code for Exch2 IO |
| 4884 |
|
layout; (not always compatible with delX,delY setting; commented out for now). |
| 4885 |
|
o pkg/exch2: |
| 4886 |
|
change tile to processor setting (case nSy*nPy > 1): allows default model mapping |
| 4887 |
|
(myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config. |
| 4888 |
|
|
| 4889 |
|
checkpoint62e (2010/04/15) |
| 4890 |
|
o pkg/obcs: |
| 4891 |
|
- fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert). |
| 4892 |
|
o pkg/dic: |
| 4893 |
|
-fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up; |
| 4894 |
|
(note: not presently tested in any forward verification exp.) |
| 4895 |
|
update tutorial_global_oce_biogeo AD output file. |
| 4896 |
|
o pkg/exf: |
| 4897 |
|
- account for the variation of albedo as a function of zenith angle |
| 4898 |
|
by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h |
| 4899 |
|
o build_options: |
| 4900 |
|
- rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas" |
| 4901 |
|
o pkg/dic: |
| 4902 |
|
change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart: |
| 4903 |
|
- use binary pickup file for restart; |
| 4904 |
|
- initialise atmos-CO2 box from dic_pCO2 parameter; |
| 4905 |
|
- fix multi-threaded. |
| 4906 |
|
o pkg/rbcs: |
| 4907 |
|
- clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ; |
| 4908 |
|
change (+ fix IO calls) type of array RBC_mask from _RL to _RS. |
| 4909 |
|
- add RBCS to exp4 passive tracer 01 (rbcs was previously untested) |
| 4910 |
|
and update output.txt |
| 4911 |
|
o pkg/kpp: |
| 4912 |
|
- add diagnostics for KPP non-local flux of Temp, Salinity and pTracers; |
| 4913 |
|
- change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS |
| 4914 |
|
(= ratio of KPP non-local (salt) flux relative to surface-flux) when |
| 4915 |
|
using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat '); |
| 4916 |
|
- change pkg/offline to read-in average KPPghat*KPPdiffKzS from file |
| 4917 |
|
KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile). |
| 4918 |
|
o pkg/offline: |
| 4919 |
|
fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor |
| 4920 |
|
(bug was added in version 1.10 on 2007-08-23). |
| 4921 |
|
o pkg/offline: |
| 4922 |
|
- no need to specify periodicExternalForcing, etc ... to use offline pack |
| 4923 |
|
- offline input files no longer just single prec --> parameter offlineLoadPrec |
| 4924 |
|
o verification/lab_sea: |
| 4925 |
|
change AD test to multi-tile setup and update all 4 AD output. |
| 4926 |
|
NOTE: while cost function values remain very similar, |
| 4927 |
|
gradients are very different, although gradient checks are self-consistent |
| 4928 |
|
Should try to get to the bottom of this (cost function summation order?) |
| 4929 |
|
o pkg/dic: |
| 4930 |
|
in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid |
| 4931 |
|
a weakness of TAF that drops part of double precision in log10 derivative. |
| 4932 |
|
<= changes removed since problem has been fixed in current TAF version 1.9.71 |
| 4933 |
|
update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo. |
| 4934 |
|
o pkg/ecco: |
| 4935 |
|
add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F |
| 4936 |
|
update all 4 lab_sea AD output. |
| 4937 |
|
|
| 4938 |
|
checkpoint62d (2010/03/22) |
| 4939 |
|
o build_options: |
| 4940 |
|
remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles. |
| 4941 |
|
o remove unbalanced quote (single or double) in commented line of source code |
| 4942 |
|
(may cause some warning with some preprocessor/makedepend versions). |
| 4943 |
|
o pkg/seaice: |
| 4944 |
|
fix seaice_model.F for adjoint (gael) and update AD results of experiments |
| 4945 |
|
lab_sea (std + evp + noseaicedyn) and offline_exf_seaice. |
| 4946 |
|
o testreport: |
| 4947 |
|
add option '-runonly' (short: '-ro') to just do the run part (without make). |
| 4948 |
|
o eesupp: remove JAM communication code (obsolete). |
| 4949 |
|
o add option to genmake2 & testreport to switch "_RS" type to "real*4" |
| 4950 |
|
(if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return |
| 4951 |
|
to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1 |
| 4952 |
|
(update also the output). |
| 4953 |
|
|
| 4954 |
|
checkpoint62c (2010/03/02) |
| 4955 |
|
o tools/build_options : |
| 4956 |
|
move (some) old optfiles from build_options/ to build_options/unsupported/ |
| 4957 |
|
o model/src and pkg/exf |
| 4958 |
|
surface relaxation -- separating data and data.exf options |
| 4959 |
|
The point is to ensure that we specify the surface relaxation |
| 4960 |
|
either in data or in data.exf (but not half and half) and to |
| 4961 |
|
avoid an accidental relaxation to 0 (which happened if a time |
| 4962 |
|
scale was specified but the file name was left empty) |
| 4963 |
|
o model/src model/inc and pkg/mom_common |
| 4964 |
|
ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity |
| 4965 |
|
=> addition to the viscosity field as computed by others schemes |
| 4966 |
|
o tools/build_options: |
| 4967 |
|
- rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile) |
| 4968 |
|
but keep the former optfile for few weeks for smooth transition |
| 4969 |
|
o pkg/ecco |
| 4970 |
|
- allow user defined cost function contributions |
| 4971 |
|
CPP: ALLOW_USERCOST_CONTRIBUTION |
| 4972 |
|
USAGE: compute contributions in cost_usercost_all.F |
| 4973 |
|
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
| 4974 |
|
the two options are complementary. |
| 4975 |
|
o pkg/smooth |
| 4976 |
|
- migration from contrib to the main repository |
| 4977 |
|
|
| 4978 |
|
checkpoint62b (2010/01/26) |
| 4979 |
|
o pkg/monitor: |
| 4980 |
|
- change back mon_printstats_rl.F & mon_stats_rl.F and add a stop |
| 4981 |
|
(in case someone forgot to update customized pieces of code) |
| 4982 |
|
o nonHydrostatic: |
| 4983 |
|
- add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested); |
| 4984 |
|
- add a simple 2-D experiment (short_surf_wave) to test it. |
| 4985 |
|
o pkg/icefront: |
| 4986 |
|
adding the shell of, and the hooks to, a new package that |
| 4987 |
|
will model melting and freezing of vertical glacier ice fronts |
| 4988 |
|
o momentum: |
| 4989 |
|
add diagnostics of momentum tendency from Hydrostatic pressure gradient |
| 4990 |
|
(without surf.pressure term: would need a 2nd filling since implicit term). |
| 4991 |
|
o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace |
| 4992 |
|
two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR |
| 4993 |
|
cannot deal with the former |
| 4994 |
|
o cleaning: |
| 4995 |
|
- remove all (except OpenAD) old TLM output from results_ad dirs. |
| 4996 |
|
- remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R) |
| 4997 |
|
- comment out maskH definition (replaced by maskInC) |
| 4998 |
|
o pkg/monitor: |
| 4999 |
|
- change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl |
| 5000 |
|
& mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs. |
| 5001 |
|
|
| 5002 |
|
checkpoint62a (2010/01/15) |
| 5003 |
|
o model/src: |
| 5004 |
|
- bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4) |
| 5005 |
|
o pkg/diagnostics: |
| 5006 |
|
- add optional level number diagnostics (i.e., level number to be define |
| 5007 |
|
explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X". |
| 5008 |
|
- strictly check for valid parser-code(10) ; |
| 5009 |
|
- check if adding diag to the list from the right place. |
| 5010 |
|
o pkg/longstep: |
| 5011 |
|
- change parameters and fix tracer conservation with rstar/nonlinear free surface |
| 5012 |
|
o diagnostics: |
| 5013 |
|
- in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer |
| 5014 |
|
S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics. |
| 5015 |
|
o pkg/diagnostics: |
| 5016 |
|
- Add option for writing vertical integral (sum of selected levels) of an output |
| 5017 |
|
field instead of writing output field levels. Activate this option on a per |
| 5018 |
|
output-file basis, by setting the 2nd character of fileflag to 'I'. |
| 5019 |
|
- Add field-specific information relative to level integral in 3rd postion |
| 5020 |
|
of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate |
| 5021 |
|
vertically (x level-thickness x hFac), "r"=same but without hFac. |
| 5022 |
|
o do_the_model_io: |
| 5023 |
|
- pass end-of-model-run flag as argument, from forward_step to diagnostics_write: |
| 5024 |
|
in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before |
| 5025 |
|
writing pickups and stopping. |
| 5026 |
|
o pkg/diagnostics (for now, only with mdsio): |
| 5027 |
|
- write time information to meta file (and modify accordingly rdmds.m) : |
| 5028 |
|
time-averaged diagnostics output: write starting and ending time of the |
| 5029 |
|
time-averaging interval ; snap-shot diagnostics output remains unchanged; |
| 5030 |
|
o pkg/timeave: |
| 5031 |
|
- S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously |
| 5032 |
|
always Nr), now assumed to be equal to number of levels of averaged field; |
| 5033 |
|
only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F |
| 5034 |
|
o pkg/sbo: |
| 5035 |
|
- fix ocean bottom pressure global-average & 2-D time-ave output (was |
| 5036 |
|
neither initialised nor filled). |
| 5037 |
|
- add starting iteration in suffix of global-average output file |
| 5038 |
|
(to avoid over-writing the file after a restart) |
| 5039 |
|
- use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb). |
| 5040 |
|
o time-average: |
| 5041 |
|
- use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj) |
| 5042 |
|
(pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf, |
| 5043 |
|
ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice) |
| 5044 |
|
this fix DIC_COST cumulative-time array (previously: bi,bj,k) |
| 5045 |
|
- fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice) |
| 5046 |
|
- fix missing accumulation for pkg/opps. |
| 5047 |
|
- cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0) |
| 5048 |
|
(pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81); |
| 5049 |
|
- fix initialisation of time-ave vars and do only full time-step increment |
| 5050 |
|
(i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81); |
| 5051 |
|
o pkg/layers: |
| 5052 |
|
- use standard RW pkg S/R to write the output |
| 5053 |
|
and remove local write_fld version (which had a problem). |
| 5054 |
|
- use simple cumulative-time array (no level index) to fix time-ave S/R calls. |
| 5055 |
|
- fix LAYERS_CALC argument list. |
| 5056 |
|
o pkg/timeave: |
| 5057 |
|
- store cumulative-time in a simple tiled array (drop the level index) |
| 5058 |
|
- add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array. |
| 5059 |
|
o pkg/ocn,aim_compon_interf |
| 5060 |
|
- changes for multi-threaded coupled run. (tested with ifort-11 on danton) |
| 5061 |
|
|
| 5062 |
|
checkpoint62 (2009/12/23) |
| 5063 |
|
o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output. |
| 5064 |
|
(was not previously tested in any other exp.) |
| 5065 |
|
o pkg/monitor: |
| 5066 |
|
- clean-up _RL/_RS version: add specific S/R for statistics with mask & volume: |
| 5067 |
|
mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one |
| 5068 |
|
(mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics. |
| 5069 |
|
- use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F). |
| 5070 |
|
- change del2 calculation. |
| 5071 |
|
- use interior masks (instead of maskH, <- to be remove). |
| 5072 |
|
- shorter monitor suffix for forcing stats ("forcing" instead of "extforcing"). |
| 5073 |
|
o mask & obcs: |
| 5074 |
|
- define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S). |
| 5075 |
|
- move global area computation from ini_masks_etc.F to ini_linear_phisurf.F |
| 5076 |
|
(called after packages_init_fixed) |
| 5077 |
|
o pkg/obcs: |
| 5078 |
|
- move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once. |
| 5079 |
|
Fixes bug in obcs+exf with nSx*nSy.GT.1 |
| 5080 |
|
- fix multi-tile handling in obcs balance code |
| 5081 |
|
o nonHydrostatic: |
| 5082 |
|
- Implement AB-3 for non-hydrostatic vertical momentum ; |
| 5083 |
|
(change ordering of var. stored in pickup file when using NH) |
| 5084 |
|
- move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D. |
| 5085 |
|
- add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x |
| 5086 |
|
(in prep. for new NH free surface form). |
| 5087 |
|
o pkg/obcs: |
| 5088 |
|
add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe |
| 5089 |
|
o model/src: |
| 5090 |
|
fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography |
| 5091 |
|
|
| 5092 |
|
checkpoint61z (2009/12/01) |
| 5093 |
|
o nonHydrostatic: |
| 5094 |
|
Fix missing vertical flux of vert. momentum near surface (k=1). This fixes |
| 5095 |
|
a spurious source of energy in simple baroclinic adjusment test case. |
| 5096 |
|
Update all non-hydrostatic exp output. |
| 5097 |
|
o model/src (3-d solver): |
| 5098 |
|
Change again 3-D solver free-surface RHS term when exactConserv=T: |
| 5099 |
|
simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1 |
| 5100 |
|
(which was not the case with previous formulation). |
| 5101 |
|
To recover previous version, just reset "oldFreeSurfTerm" to previous value. |
| 5102 |
|
Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW. |
| 5103 |
|
o nonHydrostatic: |
| 5104 |
|
- compatible with implicDiv2Dflow < 1 ; + implement implicit factor |
| 5105 |
|
for Non-Hydrostatic pressure gradient (similar to implicSurfPress). |
| 5106 |
|
- change 3-D solver to work with r* (for now, only with linear free-surf.) |
| 5107 |
|
- add few debug diagnostics (cg3d_x, residual) |
| 5108 |
|
o model/src: |
| 5109 |
|
fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b). |
| 5110 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
| 5111 |
|
o update output of exp. global_ocean.cs32x15.icedyn after removing |
| 5112 |
|
#define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h |
| 5113 |
|
o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 5114 |
|
o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output |
| 5115 |
|
for complex grids, for now only to "state", "adstate", "adexf", "adseaice" |
| 5116 |
|
o model: add Christopher Wolfe's implemetation of the single reduction cg2d |
| 5117 |
|
(d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and |
| 5118 |
|
runtime flag useSRCGSolver. Modify verification experiment global_with_exf |
| 5119 |
|
to test this code |
| 5120 |
|
o pkg/cd_code: |
| 5121 |
|
Change defaut D-grid time-stepping to get the same for D-grid momentum as for |
| 5122 |
|
C-grid momentum. D-grid velocity used to be stepped forward in time with |
| 5123 |
|
Adams-Bashforth only on surface pressure term. Tests show that using AB on |
| 5124 |
|
D-grid coriolis term improves stability (as expected from CD-scheme paper). |
| 5125 |
|
To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h). |
| 5126 |
|
Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2), |
| 5127 |
|
lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD), |
| 5128 |
|
tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens. |
| 5129 |
|
Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2, |
| 5130 |
|
global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD. |
| 5131 |
|
o pkg/obcs: |
| 5132 |
|
- fix bug in initialisation (broken since Oct 1rst modification) |
| 5133 |
|
for useOBCSprescribe without useEXF. |
| 5134 |
|
|
| 5135 |
|
checkpoint61y (2009/11/15) |
| 5136 |
|
o pkg/seaice |
| 5137 |
|
- change (once again) the discretization for the evp solver: rather than |
| 5138 |
|
squaring the averages of strain rates, average the squares to give |
| 5139 |
|
a better approximation to VP behavior (in simple test); this breaks |
| 5140 |
|
verification experiments that use EVP (lab_sea and lab_sea.hb87) |
| 5141 |
|
--> update outputs |
| 5142 |
|
o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit) |
| 5143 |
|
to improve vectorization of adjoint code on TARGET_NEC_SX |
| 5144 |
|
o verification/vermix: |
| 5145 |
|
- change vermix to a more "classical" 1d column with high vertical |
| 5146 |
|
resolution, seasonal heat flux forcing and constant wind forcing |
| 5147 |
|
--> update outputs |
| 5148 |
|
o pkg/seaice |
| 5149 |
|
- fix diagnostics of principal stress components for EVP |
| 5150 |
|
- add optional diagnostics of non-linear convergence for LSOR solver |
| 5151 |
|
- make maximum zeta a runtime parameter |
| 5152 |
|
o model/src (3-d solver): |
| 5153 |
|
Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49), |
| 5154 |
|
which consisted in removing the Surf. Non-Hydrostatic pressure from the |
| 5155 |
|
whole column and adding it to Eta (inspired from Casualli, 1999): |
| 5156 |
|
Only affects 3-D solver initial guess and only if using ExactConserv, |
| 5157 |
|
but tests did show a degradation of solver convergence. For this reason, |
| 5158 |
|
decide to disable this piece of code. |
| 5159 |
|
to recover previous version, just set zeroPsNH = exactConserv (line 78). |
| 5160 |
|
Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW |
| 5161 |
|
o pkg/ggl90: |
| 5162 |
|
- fix previous modif (unfortunatly has not been documented here). |
| 5163 |
|
o pkg/seaice/autodiff: |
| 5164 |
|
- add CPP flag to include clipping of zeta in EVP code; |
| 5165 |
|
although clipping of zeta is not necessary for EVP and not recommended |
| 5166 |
|
it was done by default, now clipping is disabled by default |
| 5167 |
|
- modify computation and store zetaC/Z in seaice_evp for TAF |
| 5168 |
|
- add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default) |
| 5169 |
|
- change seaice_calc_viscosities/strainrates for better |
| 5170 |
|
vectorization after AD by TAF |
| 5171 |
|
- rearrange common blocks in SEAICE.h once again for easier dumps of |
| 5172 |
|
adjoint output, adjust adcommon.h and g_common.h |
| 5173 |
|
- change flux form of default advection scheme for better vectorization |
| 5174 |
|
of adjoint code |
| 5175 |
|
- modify lab_sea/input.lsr to test the flux form of default advection |
| 5176 |
|
scheme |
| 5177 |
|
o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level |
| 5178 |
|
transition in checkpoint61r) |
| 5179 |
|
|
| 5180 |
|
checkpoint61x (2009/10/19) |
| 5181 |
|
o adjoint: adding two new verification experiments |
| 5182 |
|
* tutorial_global_biogeo: an online dic sensitivity experiment |
| 5183 |
|
(work with G. Forget) |
| 5184 |
|
* tutorial_dic_adjoffline: an offline dic sensitivity experiment |
| 5185 |
|
(an update of the Dutkiewicz et al., 2006 paper) |
| 5186 |
|
Both use the same CO2FLUX cost function, but different controls |
| 5187 |
|
Gradient checks look good, but some recomp. could still be traightened out |
| 5188 |
|
Should add xx_dic control variable to test at some point |
| 5189 |
|
o model/src: |
| 5190 |
|
add run-time parameters to check and/or mask initial Temp & Salt |
| 5191 |
|
o pkg/ptracers: |
| 5192 |
|
apply zonal filter (if used) to all passive tracers |
| 5193 |
|
|
| 5194 |
|
checkpoint61w (2009/10/12) |
| 5195 |
|
o adjoint: |
| 5196 |
|
* update and finish work on adjoint of dic package (G. Forget) |
| 5197 |
|
* start adjoint of offline package |
| 5198 |
|
* bug fix for cube-sphere TLM code (active_file_g.F) |
| 5199 |
|
o tutorial_global_oce_optim: |
| 5200 |
|
now tested with 4 tiles (change data.grdchk and update output_adm.txt) |
| 5201 |
|
and add SIZE.h_mpi for MPI testing |
| 5202 |
|
o pkg autodiff |
| 5203 |
|
- fix bug in autodiff_restore |
| 5204 |
|
- make genmake2 remove comments and empty lines from ad_input_code.f in |
| 5205 |
|
order to reduce file size (new script file remove_comments_sed) |
| 5206 |
|
o allows to specify vertical profile of vertical viscosity (viscArNr) |
| 5207 |
|
o pkg autodiff |
| 5208 |
|
autodiff_ini_model_io: comment out writing of grid information to netcdf |
| 5209 |
|
files, because at this time the grid fields are a bunch of zeros |
| 5210 |
|
(this is analogous to ini_mnc_vars.F) |
| 5211 |
|
o pkg seaice/autodiff: |
| 5212 |
|
left-over from removing the 3-time-level fields: |
| 5213 |
|
- small rearrangement of common blocks (SEAICE.h) |
| 5214 |
|
- fix field declaration in order to get meaningful output in |
| 5215 |
|
adseaice.*.nc (adcommon.h) |
| 5216 |
|
o pkg obcs: |
| 5217 |
|
- go through NH code only if nonHydrostatic=T |
| 5218 |
|
- fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart) |
| 5219 |
|
- move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields |
| 5220 |
|
=> Update output of experiment seaice_obcs |
| 5221 |
|
- useOBCSbalance: code is wrong with multi-tile / proc: add a stop. |
| 5222 |
|
- fix NH+Orlanski restart (add wvel OBC value in pickup file) |
| 5223 |
|
- fix restart for useOBCSprescribe + useEXF |
| 5224 |
|
o pkg ctrl |
| 5225 |
|
- make obcs as control parameter work also with useSingleCPUio |
| 5226 |
|
- replace a few sny and snx by Ny and Nx to be consistent with |
| 5227 |
|
ctrl_set_globfld_x/yz.F |
| 5228 |
|
o pkg seaice |
| 5229 |
|
- re-introduce global field frWtrAtm for the case of |
| 5230 |
|
ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F) |
| 5231 |
|
- catch the case of an empty filename in seaice_cost_init_fixed.F |
| 5232 |
|
o pkg ecco: |
| 5233 |
|
- small bug fixes in the_main_loop |
| 5234 |
|
. fix order of monitor arguments |
| 5235 |
|
. change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY |
| 5236 |
|
. move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so |
| 5237 |
|
that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF |
| 5238 |
|
- replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the |
| 5239 |
|
imbalance diagnostics for wmean_h/sflux = 0 |
| 5240 |
|
- add actual values to f_obcsn/s/w/e in ecco_cost_final.F |
| 5241 |
|
- catch the case of empty filenames in ecco_cost_init_fixed.F |
| 5242 |
|
and ecco_readparms.F |
| 5243 |
|
- fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta) |
| 5244 |
|
to make this statement meaningfull in ecco_cost_weights.F |
| 5245 |
|
o pkg zonal_filt: |
| 5246 |
|
- change ZONAL_FILTER S/R interface (allows to filter 2-D fields) |
| 5247 |
|
- when using rStar, filter uVel*hFacW instead of uVel |
| 5248 |
|
(tested without topography: fix a Pb of growing instability with NLFS) |
| 5249 |
|
o pkg/aim/thsice: |
| 5250 |
|
-Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F |
| 5251 |
|
(works as SST restoring) |
| 5252 |
|
o pkg/thsice: |
| 5253 |
|
-add specific parameter for salt restoring in slab mixed-layer |
| 5254 |
|
(by default equal to the temperature restoring) |
| 5255 |
|
|
| 5256 |
|
checkpoint61v (2009/09/21) |
| 5257 |
|
o pkg/kpp: |
| 5258 |
|
-add double diffusive contributions as a hack, turned off by default |
| 5259 |
|
for now, and the code can be excluded with a CPP-flag |
| 5260 |
|
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX |
| 5261 |
|
-add a verification experiments to "vermix" to test this code |
| 5262 |
|
o pkg/mom_common: |
| 5263 |
|
Move computation of length scales to mom_init_fixed.F (avoid recomputation |
| 5264 |
|
at each time-steps*levels). |
| 5265 |
|
o pkg/layers: |
| 5266 |
|
Created a new package for computing volume fluxes in temperature or |
| 5267 |
|
[not yet implemented] density layers, e.g. for calculating residual |
| 5268 |
|
overturning circulations. |
| 5269 |
|
o pkg/diagnostics: |
| 5270 |
|
implement a RS type version for the set of DIAGNOSTICS-FILL subroutines |
| 5271 |
|
o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option) |
| 5272 |
|
o pkg/mdsio (& pkg/rw): rework high level S/R interface: |
| 5273 |
|
To avoid mixing type (RS/RL) of input/output array argument, |
| 5274 |
|
replace single mixed-type array with a pair from each type (RS/RL). |
| 5275 |
|
o setting pickupSuff force to start from a pickup (even if nIter0=0): this |
| 5276 |
|
is now implemented for all pkgs (previously only done for the main pickup) |
| 5277 |
|
|
| 5278 |
|
checkpoint61u (2009/08/25) |
| 5279 |
|
o pkg/obcs: |
| 5280 |
|
- change OB?eta from _RS to _RL and put them into a separate commen block |
| 5281 |
|
- add code to read OB?eta from a file via obcs_prescribe_read: the code |
| 5282 |
|
compiles and does not destroy any other experiments, the data is read |
| 5283 |
|
properly, but the code is not tested in actual applications |
| 5284 |
|
o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to |
| 5285 |
|
create a meaningful unit attribute for the time coordinate variable |
| 5286 |
|
o pkg/ebm: add plenty of missing "_d 0" ; |
| 5287 |
|
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
| 5288 |
|
Notes: several pieces of code only works for (very) specific set up |
| 5289 |
|
(domain size, lat range, etc ...); should be documented & stop if one |
| 5290 |
|
of those assumptions is not meet. |
| 5291 |
|
o pkg/seaice: add missing "_d 0" in HSNOW initialisation |
| 5292 |
|
update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests) |
| 5293 |
|
and offline_exf_seaice (seaicetd + adjoint). |
| 5294 |
|
o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC): |
| 5295 |
|
update results of experiments: lab_sea (4 fwd tests + 3 adjoint), |
| 5296 |
|
seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2). |
| 5297 |
|
o few changes to pass when compiling with strick checking of arguments |
| 5298 |
|
across S/R (allow to find few bugs in S/R calls). |
| 5299 |
|
o pkg/seaice: |
| 5300 |
|
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
| 5301 |
|
2d-fields, for slightly better performance |
| 5302 |
|
|
| 5303 |
|
checkpoint61t (2009/07/22) |
| 5304 |
|
o pkg/seaice: |
| 5305 |
|
- remove unused variables in seaice_evp |
| 5306 |
|
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
| 5307 |
|
o eeset_parms.F, open_copy_data_file.F & ini_parms.F: |
| 5308 |
|
named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT): |
| 5309 |
|
each processor opens a different file (a fix from Matt). |
| 5310 |
|
o cg2d: |
| 5311 |
|
use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F : |
| 5312 |
|
this reduces number of EXCH calls by 2 when using exch2. |
| 5313 |
|
For now, keep previous size array for gc2d_nsa.F to avoid Pb with store |
| 5314 |
|
directives and missing simple EXCH (exch_s3d_rx) adjoint code. |
| 5315 |
|
o pkg/thsice: |
| 5316 |
|
add code for Near Infra-Red albedo (from Jeff) |
| 5317 |
|
(turned on with run-time flag: thSIce_calc_albNIR, in data.ice). |
| 5318 |
|
o ini_model_io: |
| 5319 |
|
move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F |
| 5320 |
|
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
| 5321 |
|
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
| 5322 |
|
|
| 5323 |
|
checkpoint61s (2009/06/30) |
| 5324 |
|
o pkg/exch2 (exch2_rxN_cube*): |
| 5325 |
|
remove last BARRIER (no need to synchronise after getting data from shared |
| 5326 |
|
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
| 5327 |
|
o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH |
| 5328 |
|
and generate new output (for the 2 tests) using default rotationPeriod. |
| 5329 |
|
o pkg/exch2: |
| 5330 |
|
- always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F |
| 5331 |
|
(was already the case with AUTODIFF_EXCH2 defined) |
| 5332 |
|
- add bj in exch2 arrays and S/R. |
| 5333 |
|
- can now use pkg/exch2 for regular (non CS) set-up; switch test experiment |
| 5334 |
|
MLAdjust to exch2 (identical results except with MPI -> truncation diff); |
| 5335 |
|
o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep |
| 5336 |
|
- adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY |
| 5337 |
|
GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT |
| 5338 |
|
- verification experiment natl_box.longstep |
| 5339 |
|
o build_options: ifort+mpi_aces optfile (following Constantinos advise): |
| 5340 |
|
allow different versions of ifort (8 or 9) and different versions |
| 5341 |
|
of mpi (mpich or mpich2) to be used with the same optfile. |
| 5342 |
|
requires to load a netcdf module and set MPI_INC_DIR (see comments inside |
| 5343 |
|
optfile). Change testing scripts (example_scripts/ACESgrid) accordingly. |
| 5344 |
|
o pkg/seaice: |
| 5345 |
|
fix previous modif (3-level field removed) for old-pickup reading |
| 5346 |
|
|
| 5347 |
|
checkpoint61r (2009/06/25) |
| 5348 |
|
o pkg/seaice: |
| 5349 |
|
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
| 5350 |
|
1. introduce fields for time step (N-1) |
| 5351 |
|
2. do not use levels 2 and 3 anymore (but keep them) |
| 5352 |
|
3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This |
| 5353 |
|
includes changes to pkg/thsice/thsice_get_velocity.F, |
| 5354 |
|
model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and |
| 5355 |
|
pkg/obcs/obcs_apply_uvice.F. |
| 5356 |
|
- completely remove code for leap-frog time stepping for second order |
| 5357 |
|
advection |
| 5358 |
|
- adjusted adjoint accordingly; |
| 5359 |
|
gradient checks have improved by an order of magnitude! |
| 5360 |
|
|
| 5361 |
|
checkpoint61q (2009/06/22) |
| 5362 |
|
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
| 5363 |
|
- the boundary conditions along open boundaries are unclear, because the |
| 5364 |
|
associated masks are set to zero and are thus treated as closed when |
| 5365 |
|
applying the slip-boundary conditions. |
| 5366 |
|
- move initialisation of grid variables from seaice_init_varia to _fixed |
| 5367 |
|
o adding doc/diags_changes.txt |
| 5368 |
|
o model/src: |
| 5369 |
|
do_the_model_io: rename few pkg S/R which are called from do_the_model_io, |
| 5370 |
|
to avoid "_diags" naming if no relation to pkg/diagnostics. |
| 5371 |
|
ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF |
| 5372 |
|
file and only call PLOT_FIELD_XYZ if debugMode=T. |
| 5373 |
|
remove few PLOT_FIELD_XY calls outside initialisation. |
| 5374 |
|
remove few unnecessary BARRIER. |
| 5375 |
|
o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling |
| 5376 |
|
of salt_plume package in Southern Ocean |
| 5377 |
|
o pkg/thsice: |
| 5378 |
|
- fix hOceMxL in overlap (needed for sea-ice advection); |
| 5379 |
|
update output of experiment global_ocean.cs32x15.icedyn. |
| 5380 |
|
o pkg/seaice: |
| 5381 |
|
- make the (placeholder-)tracer IceAge a little more meaningful |
| 5382 |
|
by avoiding ridging of age due to convergent ice flow |
| 5383 |
|
- add diagnostics for surface temperature, atmospheric and oceanic |
| 5384 |
|
heat flux, and atmospheric and oceanic ice growth |
| 5385 |
|
|
| 5386 |
|
checkpoint61p (2009/06/10) |
| 5387 |
|
o eesupp (global_max & global_sum): |
| 5388 |
|
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
| 5389 |
|
- remove starting & endding barrier (no longer needed) |
| 5390 |
|
o pkg/mdsio, writelocal: |
| 5391 |
|
works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined |
| 5392 |
|
(remove the STOP): uses shared buffer IO to store data from all threads |
| 5393 |
|
and then let master-thread write nThreads tiles. |
| 5394 |
|
o pkg/mdsio (read/write field): |
| 5395 |
|
- tiled IO done in 1 piece (all levels at a time); |
| 5396 |
|
- new header file "MDSIO_BUFF_3D.h" with 3-D buffers. |
| 5397 |
|
- multi-threaded: allow to read/write local (non-shared) array |
| 5398 |
|
(was already working with singleCpuIO ; now works also without); |
| 5399 |
|
=> no longer needs barrier call after reading a file (added inside |
| 5400 |
|
mds_read/write field). |
| 5401 |
|
- move barrier calls outside gather/scatter_2d to mds_read/write_field |
| 5402 |
|
o pkg/obcs/exf |
| 5403 |
|
- exf_getffieldrec.F: add a few ". _d 0" and |
| 5404 |
|
add code to catch the case fldperiod = 0. |
| 5405 |
|
- obcs_precribe_read.F: change if statements so that they match |
| 5406 |
|
the variable type (_RL) |
| 5407 |
|
- add a separate exf_iprec_obcs to exf_set_obcs (by default equal to |
| 5408 |
|
exf_iprec) as part of namelist EXF_NML_01 |
| 5409 |
|
o pkg/mdsio: |
| 5410 |
|
- read/write tiled (local) files: read/write 1-level tile chunk at a time |
| 5411 |
|
(instead of segment of length sNx); expected to speed up tiled IO. |
| 5412 |
|
o pkg/exch2: |
| 5413 |
|
- take buffer copy from/to array out of S/R exch2_send/recv into new |
| 5414 |
|
S/R exch2_put/get ; Exch of local variable now works with MPI+MTH |
| 5415 |
|
(tested by removing commom block statement in SOLVE_FOR_PRESSURE.h). |
| 5416 |
|
- ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get) |
| 5417 |
|
- simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds |
| 5418 |
|
(which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by |
| 5419 |
|
including Topology header file (and common blocks). |
| 5420 |
|
- implement EXCH_IGNORE_CORNERS in scalar exchange (rx1); |
| 5421 |
|
remove 2nd exch call in exch2_s3d_rx (no longer needed). |
| 5422 |
|
- document S/R arg. list (+ update some comments) |
| 5423 |
|
o pkg/seaice: |
| 5424 |
|
- added SEAICE_CLIM_AIR code, which permits modulation of surface air |
| 5425 |
|
temperature and humidity over sea ice based on climatological values. |
| 5426 |
|
- clean up computation of Hibler+Bryan (1987) stress coupling for the case |
| 5427 |
|
of LSR (this change is expected to change the results slightly because now |
| 5428 |
|
it uses slightly difference moduli from the second last LSR solution, but |
| 5429 |
|
that is more consistent with the stress computations; this part of the code |
| 5430 |
|
is not tested in the verification experiments) |
| 5431 |
|
- fix diagnostics for flux of ice in case of B-grid |
| 5432 |
|
- turn strain rates eij and press into global fields within global |
| 5433 |
|
common block in SEAICE.h for more straighforward diagnostics |
| 5434 |
|
- fix diagnostics for principal stress components, press, zeta, eta |
| 5435 |
|
to give something meaning full |
| 5436 |
|
o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate |
| 5437 |
|
new output (all 4 tests) using default rotationPeriod. |
| 5438 |
|
o pkg KPP: |
| 5439 |
|
- add flag (LimitHblStable) to avoid limiting BL depth under stable conditions |
| 5440 |
|
- fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1 |
| 5441 |
|
and normal grid from 1 to Nr) |
| 5442 |
|
o Fix computations of L4rdt in mom_calc_visc.F |
| 5443 |
|
o eesupp: |
| 5444 |
|
new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg): |
| 5445 |
|
should be called before a "stop" if we know that all process are going |
| 5446 |
|
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
| 5447 |
|
|
| 5448 |
|
checkpoint61o (2009/05/26) |
| 5449 |
|
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
| 5450 |
|
o model/src/ini_curvilinear_grid.F: |
| 5451 |
|
compute angleSin/CosC when they are not read from a file |
| 5452 |
|
o pkg/seaice: |
| 5453 |
|
add pseudo time stepping for LSOR |
| 5454 |
|
o pkg/exch2: |
| 5455 |
|
temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW |
| 5456 |
|
o pkg/seaice: |
| 5457 |
|
Adding separate sea ice albedo, drag coefficients, and HO in Southern |
| 5458 |
|
Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h |
| 5459 |
|
o SingleCpuIO: |
| 5460 |
|
fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used. |
| 5461 |
|
o pkg/seaice: |
| 5462 |
|
put exchanged variable in (local) common block for MPI+Multi-Threads |
| 5463 |
|
to work (necessary with exch1, and for now with exch2 too). |
| 5464 |
|
o verification: to get more experiments tested with mpi, mth and mpi+mth, |
| 5465 |
|
change tiling of: |
| 5466 |
|
aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15, |
| 5467 |
|
hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope |
| 5468 |
|
update output of exp: |
| 5469 |
|
exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5), |
| 5470 |
|
tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod) |
| 5471 |
|
+ ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU |
| 5472 |
|
(note: output.txt generated on faulks using only 1 tile) |
| 5473 |
|
o eesupp & mdsio (SingleCpuIO): |
| 5474 |
|
- remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time |
| 5475 |
|
parameter "W2_useE2ioLayOut" (read from file "data.exch2"). |
| 5476 |
|
Note: was not effective for globalFile & useSingleCpuIO=F; now fixed. |
| 5477 |
|
- move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc). |
| 5478 |
|
- fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same |
| 5479 |
|
gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array). |
| 5480 |
|
o pkg/exch2: |
| 5481 |
|
- new code to set-up W2-Exch2 topology (replace matlab-topology-generator): |
| 5482 |
|
read parameter file "data.exch2" if it exists; otherwise try default regular |
| 5483 |
|
cube without blank-tile; new header file "W2_EXCH2_SIZE.h"; |
| 5484 |
|
- update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible |
| 5485 |
|
with new code (not to be used, just as a backup solution). |
| 5486 |
|
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
| 5487 |
|
in utils/exch2/input. |
| 5488 |
|
|
| 5489 |
|
checkpoint61n (2009/05/12) |
| 5490 |
|
o eesupp & mdsio (SingleCpuIO): |
| 5491 |
|
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
| 5492 |
|
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
| 5493 |
|
receive real*4 array (instead of real*8) to read/write 32.bit files. |
| 5494 |
|
(new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S |
| 5495 |
|
and remove new mapping S/R) |
| 5496 |
|
o pkg/mdsio: in preparation for topology-generator within pkg/exch2: |
| 5497 |
|
- Change declaration of SingleCpuIO buffer, reduced to only 1 dim.: |
| 5498 |
|
xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h |
| 5499 |
|
when using exch2. Add S/R to map global io-buffer to global model array. |
| 5500 |
|
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
| 5501 |
|
|
| 5502 |
|
checkpoint61m (2009/04/29) |
| 5503 |
|
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
| 5504 |
|
and add 3 other S/R for other types (R4,R8,RS). |
| 5505 |
|
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
| 5506 |
|
o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros): |
| 5507 |
|
- ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ; |
| 5508 |
|
- reduce number of macro definitions (keep only those which are used); |
| 5509 |
|
can always call directly the corrresponding S/R if needed. |
| 5510 |
|
- everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix |
| 5511 |
|
_R4/_R8 to _RS/_RL when applied to _RS/_RL variable. |
| 5512 |
|
Fixed wrong type of arg in: |
| 5513 |
|
atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F |
| 5514 |
|
ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F |
| 5515 |
|
To fix: global_sum of var in common block is wrong (multi-threaded) in: |
| 5516 |
|
dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F |
| 5517 |
|
To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops) |
| 5518 |
|
o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd |
| 5519 |
|
"nlfs" mpi test is going to stop when checking for unconnected tile egdes. |
| 5520 |
|
o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error |
| 5521 |
|
o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile |
| 5522 |
|
edges are closed (zero depth); might happen with "blank tiles"; |
| 5523 |
|
for now, disabled if using OBCS. |
| 5524 |
|
o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi": |
| 5525 |
|
link *_mpi files from "MODS" dir) to return to a strait-forward behavior. |
| 5526 |
|
o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D) |
| 5527 |
|
to reduce length of 1.D array print in STDOUT. |
| 5528 |
|
o adjustment.cs-32x32x1: changed to oceanic test with 1 continent |
| 5529 |
|
+ use 48 tiles (16x8): this will allow to test "blank tiles". |
| 5530 |
|
o start to test MPI + multi-threaded (change testreport to skip tests |
| 5531 |
|
where number of tiles do not match). |
| 5532 |
|
o genmake2: add option "-omp" to turn on Open-MP ; |
| 5533 |
|
passed to testreport (if using -mth) ; merge few (*+mth) optfiles. |
| 5534 |
|
o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them) |
| 5535 |
|
and keep the original tile numbering. Note: compatible with old |
| 5536 |
|
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
| 5537 |
|
|
| 5538 |
|
checkpoint61l (2009/04/07) |
| 5539 |
|
o Overlaps had been forgotten in calculating ijk keys : fixed |
| 5540 |
|
o fix cyrus makedepend for gcc 4.4 |
| 5541 |
|
o experiment fizhi-cs-aqualev20: |
| 5542 |
|
switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE) |
| 5543 |
|
and generate new output. Note: new output is much closer to the old |
| 5544 |
|
one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from |
| 5545 |
|
the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007. |
| 5546 |
|
o pkg/fizhi: |
| 5547 |
|
- change to avoid indices going deliberately over array-bounds |
| 5548 |
|
- remove unnecessary MPI stuff |
| 5549 |
|
- perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY" |
| 5550 |
|
- new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE: |
| 5551 |
|
does not go over array-bounds and therefore returns reliable output. |
| 5552 |
|
- in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls: |
| 5553 |
|
this S/R has 4 output arguments, which are used inside "get_alarm"; |
| 5554 |
|
when it is called with the same variable "ndum" in place of several |
| 5555 |
|
output arguments, this produces weird side effect inside "get_alarm" |
| 5556 |
|
(e.g., datein=dates(n) is overwritten by timein=times(n) since both |
| 5557 |
|
datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum" |
| 5558 |
|
address) and produces error. |
| 5559 |
|
o tools/gemake2: (March 27-29 2009) |
| 5560 |
|
with option "-mpi": link *_mpi files from "MODS" dir (this is what |
| 5561 |
|
testreport does). |
| 5562 |
|
o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output |
| 5563 |
|
o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F: |
| 5564 |
|
update lab_sea.lsr & lab_sea.salt_plume results |
| 5565 |
|
o pkg/seaice: |
| 5566 |
|
Major overhaul of the LSOR solver: change discretization from original |
| 5567 |
|
finite differences to finite volume. The old routine is still in the |
| 5568 |
|
file seaice_lsr.F and can be turned on with the CPP-flag |
| 5569 |
|
SEAICE_OLD_AND_BAD_DISCRETIZATION |
| 5570 |
|
Along with this change, the discretization of the strain rates is changed. |
| 5571 |
|
The same flag turns on the old discretization in seaice_calc_strainrates.F |
| 5572 |
|
All verification experiments with seaice are affected (except for |
| 5573 |
|
seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old |
| 5574 |
|
results by setting the above flag. |
| 5575 |
|
Further changes involve changes in defaults: |
| 5576 |
|
- ALLOW_FLOODING is defined and turned on by default |
| 5577 |
|
- SEAICEadvSnow = .true. is now the default |
| 5578 |
|
- SEAICEadvSalt = .true. is now the default |
| 5579 |
|
- SEAICEadvAge = .true. is now the default |
| 5580 |
|
- SEAICE_clipVelocities = .false. is now the default |
| 5581 |
|
(as per J. Zhang's recommendation) |
| 5582 |
|
- B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE |
| 5583 |
|
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
| 5584 |
|
- seaice_growth: replace computation of UG by a simple copy from wspeed |
| 5585 |
|
|
| 5586 |
|
checkpoint61k (2009/03/18) |
| 5587 |
|
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
| 5588 |
|
seaice_lsr: fixed a few metric terms, |
| 5589 |
|
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
| 5590 |
|
add more debugging diagnostics |
| 5591 |
|
seaice_evp: removed superfluous many metric terms of FV discretization |
| 5592 |
|
of stress divergence |
| 5593 |
|
affects lab_sea, lab_sea.hb87 |
| 5594 |
|
seaice_ocean_stress: removed superfluous many metric terms of FV discretization |
| 5595 |
|
of stress divergence for non-evp solver |
| 5596 |
|
(this part is not tested anywhere) |
| 5597 |
|
seaice_calc_strainrates: fixed a bug in no-slip boundary conditions, |
| 5598 |
|
they were effectively only half slip |
| 5599 |
|
affects lab_sea.hb87 |
| 5600 |
|
updated all relevant verification experiments (except lab_sea//output_adm.txt |
| 5601 |
|
which was left over, but fails at level 7 & 6) |
| 5602 |
|
|
| 5603 |
|
checkpoint61j (2009/03/17) |
| 5604 |
|
o pkg/seaice: turn a few hard wired parameters into run time parameters |
| 5605 |
|
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
| 5606 |
|
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
| 5607 |
|
o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids |
| 5608 |
|
that are not cubed-sphere grids |
| 5609 |
|
o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR |
| 5610 |
|
o pkg/ctrl: |
| 5611 |
|
fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low) |
| 5612 |
|
o non-hydrostatic (calc_gw.F): |
| 5613 |
|
fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec |
| 5614 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
| 5615 |
|
o remove backward compatibility for thetaMin,phiMin |
| 5616 |
|
(replaced by xgOrigin,ygOrigin on Jan 27, 2009) |
| 5617 |
|
o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the |
| 5618 |
|
interpolated wind field not only for curvilineargrid=.true., but also |
| 5619 |
|
for a rotated grid (rotateGrid=.true.) |
| 5620 |
|
o pkg/exf: add capability to bypass interpolation for runoff |
| 5621 |
|
by setting yet another CPP-flag |
| 5622 |
|
o eesupp/src, B-grid exchange: |
| 5623 |
|
add simple (6 tiles, non MPI) CS exch + standard interface S/R. |
| 5624 |
|
o autodiff |
| 5625 |
|
new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV |
| 5626 |
|
allows to switch to single-prec common blocks; |
| 5627 |
|
corresponding switch occurs in tamc.h, integer isbyte |
| 5628 |
|
TAF store directivs "byte" and "kind" seem equivalent; |
| 5629 |
|
Most tamc.h have been updated correspondingly. |
| 5630 |
|
|
| 5631 |
|
checkpoint61i (2009/02/13) |
| 5632 |
|
o autodiff: |
| 5633 |
|
fix autodiff_sore/_restore indices for obcs |
| 5634 |
|
(spotted by I. Hoteit, M. Mazloff) |
| 5635 |
|
o pkg/autodiff, pkg/ctrl: |
| 5636 |
|
Add flag to reduce all tapelev I/O to single-prec. |
| 5637 |
|
In data.ctrl set |
| 5638 |
|
doSinglePrecTapelev = .TRUE. |
| 5639 |
|
o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2: |
| 5640 |
|
check in hack for SX8 compiler (for dxV, dyU); remove it afterwards. |
| 5641 |
|
o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for |
| 5642 |
|
real fresh water flux (not yet) |
| 5643 |
|
o pkg/mdsio & rw: |
| 5644 |
|
- add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta) |
| 5645 |
|
- add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX. |
| 5646 |
|
o pkg/flt: |
| 5647 |
|
- replace FLT_INIT by 3-steps standard initialization S/R: readparms, |
| 5648 |
|
init_fixed & ini_varia. |
| 5649 |
|
- clean-up & simplify linear interpolation S/R: |
| 5650 |
|
move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid. |
| 5651 |
|
- fix some indices (mainly vertical index) ; add IMPLICIT NONE. |
| 5652 |
|
- more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R. |
| 5653 |
|
- add vert. coordinate & horiz. indices to output files. |
| 5654 |
|
- change vertical position in initial condition, from index to depth [m]. |
| 5655 |
|
- store horizontal (decimal) indices i,j in common block (instead of coord. x,y) |
| 5656 |
|
(easier to get to a curvilinear grid) ; delX,delY no longer used. |
| 5657 |
|
o pkg/ggl90: a few modifications: |
| 5658 |
|
- fix bottom boundary condition, and interpolation of KappaE |
| 5659 |
|
near top and bottom |
| 5660 |
|
- use same set of viscosity/diffusivity for TKE/momnetum/tracer |
| 5661 |
|
- add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH) |
| 5662 |
|
- add a few options for mixing-length upper limit (--> mxlMaxFlag) |
| 5663 |
|
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
| 5664 |
|
(maintain temporary backward compatibility, until next checkpoint) |
| 5665 |
|
|
| 5666 |
|
checkpoint61h (2009/01/27) |
| 5667 |
|
o pkg/diagnostics with "periodic averaging diagnostics": |
| 5668 |
|
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
| 5669 |
|
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
| 5670 |
|
o pkg/obcs: fix loop ranges for balancing code |
| 5671 |
|
o pkg/flt: |
| 5672 |
|
- improve criteria for finding which tile owns a float. |
| 5673 |
|
- fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case. |
| 5674 |
|
o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg |
| 5675 |
|
aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling |
| 5676 |
|
with ocean biogeo) |
| 5677 |
|
o pkg/flt: |
| 5678 |
|
- do some cleaning and fix the restart ; |
| 5679 |
|
- add output.txt in flt_example/results to get this pkg tested. |
| 5680 |
|
o genmake2: add an EXTENDED_SRC option and flag. |
| 5681 |
|
for now, cannot be turned on on command line (only through genmake_local) |
| 5682 |
|
o pkg/mdsio: read/write vector: |
| 5683 |
|
- singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS |
| 5684 |
|
- singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR |
| 5685 |
|
& MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS. |
| 5686 |
|
- affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO) |
| 5687 |
|
(drop to 4 digits matching for grad). But this test does not look very |
| 5688 |
|
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
| 5689 |
|
|
| 5690 |
|
checkpoint61g (2008/12/29) |
| 5691 |
|
o pkg/flt: |
| 5692 |
|
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
| 5693 |
|
+ make OPTIONS file more standard. |
| 5694 |
|
- rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name) |
| 5695 |
|
- fix _BYTESWAPIO CPP-Flag |
| 5696 |
|
- standard reading of file-parameter "data.flt" |
| 5697 |
|
- fix argument list of S/R FLT_RESTART |
| 5698 |
|
still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F |
| 5699 |
|
o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell |
| 5700 |
|
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
| 5701 |
|
a still unfixed compiler/optimization bug |
| 5702 |
|
|
| 5703 |
|
checkpoint61f (2008/11/21) |
| 5704 |
|
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
| 5705 |
|
update results of global_ocean.cs32x15.icedyn test. |
| 5706 |
|
o move getcon.F from model/src to pkg/fizhi. |
| 5707 |
|
o pkg/exf: add parameter for extrapolation of temp up to the surface |
| 5708 |
|
and option to prevent negative evap (in bulk_largeyeager04 only). |
| 5709 |
|
o Prather Advection scheme: fix tracer conservation for divergent flow |
| 5710 |
|
(e.g., when using NonLin Free-Surface). |
| 5711 |
|
o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead |
| 5712 |
|
o gmredi (Visbeck-variable-K): |
| 5713 |
|
- add more parameters to Visbeck-variable-K. |
| 5714 |
|
- use a 5 points average for dSigmaR in Visbeck-K calculation |
| 5715 |
|
(more "homogenous": same stencil and same weights as in dSigmaH) |
| 5716 |
|
- update output of ideal_2D_oce experiment. |
| 5717 |
|
o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4 |
| 5718 |
|
(#undef REAL4_IS_SLOW) |
| 5719 |
|
- pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4 |
| 5720 |
|
coordinate variable |
| 5721 |
|
- pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables |
| 5722 |
|
(surface forcing fields), removes some of the functionality |
| 5723 |
|
- model/src/write_grid.F: write _RS variables as RS-netcdf variables |
| 5724 |
|
- model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but |
| 5725 |
|
probably not all: copy _RS surface flux fields to RL field before |
| 5726 |
|
calling DIAGNOSTICS_FILL |
| 5727 |
|
- model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into |
| 5728 |
|
real*4 (CALL EXCH_*_RS) versions. |
| 5729 |
|
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
| 5730 |
|
(generate new output). |
| 5731 |
|
|
| 5732 |
|
checkpoint61e (2008/10/23) |
| 5733 |
|
o gmredi (Visbeck-variable-K): |
| 5734 |
|
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
| 5735 |
|
- change computation of Visbeck-K where Slope > Smax : |
| 5736 |
|
now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct) |
| 5737 |
|
previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output. |
| 5738 |
|
o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic |
| 5739 |
|
to be the same as with Z-coord. (i.e., m/s & no-units respectively). |
| 5740 |
|
o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc) |
| 5741 |
|
o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz |
| 5742 |
|
does not become too large (to avoid precision problems in implicit-diffusion |
| 5743 |
|
solver); update ideal_2D_oce output. |
| 5744 |
|
o pkg ggl90: |
| 5745 |
|
- in ggl90_cal.F: compute only one set of visc/diff, used to |
| 5746 |
|
step forward TKE/T/S/momentum |
| 5747 |
|
- default value of GGL90viscMax/GGL90diffMax larger and equal (to |
| 5748 |
|
have Prandlt =1) |
| 5749 |
|
o gmredi (fm07): |
| 5750 |
|
- add lower limit on Transition layer thickness + lower limit on 1/lambda |
| 5751 |
|
- allow to set few more params from data.gmredi |
| 5752 |
|
o pkg ggl90: |
| 5753 |
|
- add missing sqrt(2) factor in computation of mixing length |
| 5754 |
|
scale in ggl90_calc.F |
| 5755 |
|
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
| 5756 |
|
|
| 5757 |
|
checkpoint61d (2008/09/25) |
| 5758 |
|
o adjoint modifs |
| 5759 |
|
- adapt to new field rhoInSitu |
| 5760 |
|
- allow to revert from StoreDynVars2D, StoreDynVars3D |
| 5761 |
|
to individual fields |
| 5762 |
|
(switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D) |
| 5763 |
|
o store 3-D (in-situ) density in commom block (DYNVARS.h) |
| 5764 |
|
- save 1 rho computation. |
| 5765 |
|
- no longer modify T & S inland when using down_slope pkg. |
| 5766 |
|
o gad_som : allow to switch to SOM advection for T & S without corresponding |
| 5767 |
|
pickup files (using new S/R: MDS_CHECK4FILE). |
| 5768 |
|
o keep removing _BEGIN/_END_MASTER between MDSIO S/R call |
| 5769 |
|
(for useSingleCpuIO to work in multi-threaded) |
| 5770 |
|
o pkg/shelfice: |
| 5771 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
| 5772 |
|
with SHELFICEtopoFile in data.shelfice |
| 5773 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
| 5774 |
|
subroutines of the shelfice package |
| 5775 |
|
- separate initialisation of "fixed" and "variable" variables |
| 5776 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
| 5777 |
|
o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
| 5778 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
| 5779 |
|
and rename: |
| 5780 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
| 5781 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
| 5782 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
| 5783 |
|
|
| 5784 |
|
checkpoint61c (2008/08/30) |
| 5785 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
| 5786 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
| 5787 |
|
of oceanic real-fresh water flux). |
| 5788 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
| 5789 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
| 5790 |
|
o new pkg: down_slope |
| 5791 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
| 5792 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
| 5793 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
| 5794 |
|
- implementation for ocean in P-coords not tested. |
| 5795 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
| 5796 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
| 5797 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
| 5798 |
|
o change FIND_RHO to FIND_RHO_2D : |
| 5799 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
| 5800 |
|
o new pkg: cheapaml |
| 5801 |
|
|
| 5802 |
|
checkpoint61b (2008/08/05) |
| 5803 |
|
o exch2: |
| 5804 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
| 5805 |
|
- no longer depend on the order sequence (N,S,E,W). |
| 5806 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
| 5807 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
| 5808 |
|
- exch_UV_A-grid readily available (but not yet tested). |
| 5809 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
| 5810 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
| 5811 |
|
get truncation error differences with adjoint exch. |
| 5812 |
|
o exch2: |
| 5813 |
|
- change index-bounds storage (moved from target to local tile, |
| 5814 |
|
more intuitive this way) ; rename/remove some variables. |
| 5815 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
| 5816 |
|
|
| 5817 |
|
checkpoint61a (2008/07/29) |
| 5818 |
|
o exch2/matlab-topology-generator: |
| 5819 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
| 5820 |
|
had any effect on the solution). |
| 5821 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
| 5822 |
|
is exceeded |
| 5823 |
|
o testreport: modify syntax of awk, so that it works also with |
| 5824 |
|
awk, and not only with nawk and gawk |
| 5825 |
|
|
| 5826 |
|
checkpoint61 (2008/06/24) |
| 5827 |
|
o autodiff |
| 5828 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
| 5829 |
|
This changes TAF subroutine argument list (ordering of active var.) |
| 5830 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
| 5831 |
|
To restore TAMC-compatibility, need following modifs: |
| 5832 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
| 5833 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
| 5834 |
|
Tested TAF version is 1.9.22 |
| 5835 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
| 5836 |
|
|
| 5837 |
|
checkpoint60 (2008/06/19) |
| 5838 |
|
--->>> This is the last checkpoint for which generating the adjoint |
| 5839 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
| 5840 |
|
--->>> by default. |
| 5841 |
|
--->>> Future checkpoints will ommit this flag by default. |
| 5842 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
| 5843 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
| 5844 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
| 5845 |
|
o pkg/autodiff: more flexibility in zeroadj. |
| 5846 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
| 5847 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
| 5848 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
| 5849 |
|
special setup of gmredi for which the adjoint is stable |
| 5850 |
|
enough for parameter optimization. |
| 5851 |
|
o bridging the gap between eddy stress and GM. |
| 5852 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
| 5853 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
| 5854 |
|
-> when using GM w/ GM_AdvForm: |
| 5855 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
| 5856 |
|
is applied either in the tracer Eq. or in momentum Eq. |
| 5857 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
| 5858 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
| 5859 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
| 5860 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
| 5861 |
|
|
| 5862 |
|
checkpoint59r (2008/05/29) |
| 5863 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
| 5864 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
| 5865 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
| 5866 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
| 5867 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
| 5868 |
|
mass points, when using mnc for output |
| 5869 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
| 5870 |
|
default (which is the value of getcon('UNDEF')) |
| 5871 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
| 5872 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
| 5873 |
|
initialisation of never used fields |
| 5874 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
| 5875 |
|
versions |
| 5876 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
| 5877 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
| 5878 |
|
are missing. |
| 5879 |
|
o move from external_forcing_surf.F to ini_forcing.F |
| 5880 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
| 5881 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
| 5882 |
|
o Freshen up a bit hs94.1x64x5, notably: |
| 5883 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
| 5884 |
|
exactConserv=.TRUE. |
| 5885 |
|
o pkg/generic_advdiff: |
| 5886 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
| 5887 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
| 5888 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
| 5889 |
|
this uses a dynamically allocated internal state data structure |
| 5890 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
| 5891 |
|
and requires a fortran 90 compiler |
| 5892 |
|
|
| 5893 |
|
checkpoint59q (2008/05/06) |
| 5894 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
| 5895 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
| 5896 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
| 5897 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
| 5898 |
|
- change EOS (POLY3 --> JMD95Z) |
| 5899 |
|
- use Bryan-Lewis vertical diffusivity |
| 5900 |
|
- use multidimensional advection |
| 5901 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
| 5902 |
|
- change a couple of parameters in dic pkg |
| 5903 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
| 5904 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
| 5905 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
| 5906 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
| 5907 |
|
o implementation of TAF directives for gchem,cfc,dic |
| 5908 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
| 5909 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
| 5910 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
| 5911 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
| 5912 |
|
--> changes results in exp4, seaice_obcs |
| 5913 |
|
o tutorial_deep_convection : |
| 5914 |
|
update the set-up and increase resolution and domain size ; start |
| 5915 |
|
from pseudo initial conditions = output at t=120mn in order to see |
| 5916 |
|
something happening when running testreport. |
| 5917 |
|
o pkg/seaice: add os7mp as an advection scheme |
| 5918 |
|
add check for advection schemes |
| 5919 |
|
add a flag for restoring T and S underneath sea ice |
| 5920 |
|
o pkg/my82: add netcdf-support and diagnostics |
| 5921 |
|
o thsice pkg: |
| 5922 |
|
- Now hsMax limits snow height by turning it into ice following |
| 5923 |
|
flooding scheme (and now conserving energy) |
| 5924 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
| 5925 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
| 5926 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
| 5927 |
|
|
| 5928 |
|
checkpoint59p (2008/04/10) |
| 5929 |
|
o gchem / dic / cfc : |
| 5930 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
| 5931 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
| 5932 |
|
- various re-arrangement in initialisation & header file ; |
| 5933 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
| 5934 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
| 5935 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
| 5936 |
|
before) providing pickupStrictlyMatch is set to False. |
| 5937 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
| 5938 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
| 5939 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
| 5940 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
| 5941 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
| 5942 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
| 5943 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
| 5944 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
| 5945 |
|
scheme to use for vorticty-term ; |
| 5946 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
| 5947 |
|
(with default selectVortScheme, return to original discretisation) |
| 5948 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
| 5949 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
| 5950 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
| 5951 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
| 5952 |
|
also fix diagnostics VISCAHW & VISCA4W. |
| 5953 |
|
|
| 5954 |
|
checkpoint59o (2008/03/07) |
| 5955 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
| 5956 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
| 5957 |
|
move a few statemens out the main loop into separate loops |
| 5958 |
|
o pkg/shelfice: |
| 5959 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
| 5960 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
| 5961 |
|
rhoConstFresh=rhoConst (by accident) |
| 5962 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
| 5963 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
| 5964 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
| 5965 |
|
- convert potential temperature into in-situ temperature. This changes the |
| 5966 |
|
isomip tests => update tests |
| 5967 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
| 5968 |
|
writing a pickup at the last timestep |
| 5969 |
|
o tools/mpack-1.6 : |
| 5970 |
|
- disable automake (not working) and autoconf (not needed). |
| 5971 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
| 5972 |
|
also cleaner with much less compilation warnings. |
| 5973 |
|
o pkg/profiles: |
| 5974 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
| 5975 |
|
(for "less than 32 characters name" compiler requirement) |
| 5976 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
| 5977 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
| 5978 |
|
o pkg/diagnostics (stats-diags): |
| 5979 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
| 5980 |
|
o genmake2: replace (4 times) |
| 5981 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
| 5982 |
|
with |
| 5983 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
| 5984 |
|
echo $COMM >> genmake_warnings |
| 5985 |
|
$COMM >> genmake_warnings 2>&1 |
| 5986 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
| 5987 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
| 5988 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
| 5989 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
| 5990 |
|
o pkg/ctrl: |
| 5991 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
| 5992 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
| 5993 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
| 5994 |
|
|
| 5995 |
|
checkpoint59n (2008/02/09) |
| 5996 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
| 5997 |
|
number in dedicate array "hdiag": |
| 5998 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
| 5999 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
| 6000 |
|
- many small changes (integer format) for large number of diagnostics |
| 6001 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
| 6002 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
| 6003 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
| 6004 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
| 6005 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
| 6006 |
|
geographical coordinates according to the inverse of the rotation defined |
| 6007 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
| 6008 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
| 6009 |
|
Naturally, this feature does not work with all packages, so some |
| 6010 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
| 6011 |
|
profiles), because there the coordinates are assumed to be regular |
| 6012 |
|
spherical grid coordinates. |
| 6013 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
| 6014 |
|
- introduce isopycnal diffusion coefficient control. |
| 6015 |
|
o tools/adjoint_options: |
| 6016 |
|
- additional control vector components. |
| 6017 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
| 6018 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
| 6019 |
|
o pkg/mypackage: |
| 6020 |
|
- add example of read/write pickup for state-var ; |
| 6021 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
| 6022 |
|
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
| 6023 |
|
transitions for useExfYearlyFields |
| 6024 |
|
- add new subroutine that determines the file to read from for |
| 6025 |
|
use*YearlyFields = .TRUE. and .FALSE. |
| 6026 |
|
- add a verification experiment to global_with_exf that tests |
| 6027 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
| 6028 |
|
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
| 6029 |
|
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
| 6030 |
|
subroutines (which could be generated from a template, because they are |
| 6031 |
|
almost identical), for now they are included in obcs_prescribe_read.F for |
| 6032 |
|
simplicity |
| 6033 |
|
o pkg/exf: |
| 6034 |
|
- add a little more diagnostic to exf_interp_read (in analogy to |
| 6035 |
|
mds_read_field, can be turned off with debugLevel < debugLevA=1) |
| 6036 |
|
- improve vectorizability of exf_interp for TARGET_NEC_SX, makes code |
| 6037 |
|
ugly but fast by unrolling short inner loops, inserting a unroll=8 |
| 6038 |
|
directive in routine lagran, and splitting a loop and making do while the |
| 6039 |
|
outermost loop (the latter requires the intoduction of index arrays) |
| 6040 |
|
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice |
| 6041 |
|
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver |
| 6042 |
|
http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html |
| 6043 |
|
o verification/seaice_obcs: updated for restart test and latest options |
| 6044 |
|
o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different |
| 6045 |
|
ice rheology (so-called truncated ellipse, that gets rid of tensile stress); |
| 6046 |
|
for now this is only available for the C-grid code and also within |
| 6047 |
|
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
| 6048 |
|
|
| 6049 |
|
checkpoint59m (2008/01/14) |
| 6050 |
|
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
| 6051 |
|
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
| 6052 |
|
o gad_som : fix flux output (& diagnostics) to have same units as other |
| 6053 |
|
advection scheme fluxes (was previously multiplied by deltaT). |
| 6054 |
|
o added verification/seaice_obcs both to test seaice open boundaries |
| 6055 |
|
and to provide an example matlab scrpt for generating them |
| 6056 |
|
o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume |
| 6057 |
|
o pkg/salt_plume: clean up salt_plume_frac.F to |
| 6058 |
|
remove redundancy in PlumeMethod 1 and 4 |
| 6059 |
|
o pkg/kpp: added saltplume diagnostics |
| 6060 |
|
o pkg/obcs and pkg/seaice: |
| 6061 |
|
- do not set uice and vice to zero when OB*icefile are unspecified |
| 6062 |
|
- OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default |
| 6063 |
|
- moved seaice tracer obcs after call to seaice_growth |
| 6064 |
|
o pkg/salt_plume: added various options for salt plume depth |
| 6065 |
|
criterion and for vertical distribution of the salt |
| 6066 |
|
|
| 6067 |
|
checkpoint59l (2007/12/18) |
| 6068 |
|
o pkg/ptracers: new version of ptracers pickup: |
| 6069 |
|
read meta file and write only fields which are needed to restart. |
| 6070 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 6071 |
|
o pkg/seaice: |
| 6072 |
|
- add timescale for melting due to warm mixed layer as a means of |
| 6073 |
|
setting SEAICE_availHeatFrac more conveniently |
| 6074 |
|
- add a CPP-flag/runtime parameter check for flooding algorithm |
| 6075 |
|
- reformulated availHeat in seaice_growth.F to be independent of AREA |
| 6076 |
|
o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent |
| 6077 |
|
unit changes |
| 6078 |
|
o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint |
| 6079 |
|
o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC |
| 6080 |
|
SX vector computer. |
| 6081 |
|
o pkg/seaice: |
| 6082 |
|
- removed SEAICE_FFIELDS.h and seaice_get_forcing.F |
| 6083 |
|
seaice forcing fields can now be read only through pkg/exf |
| 6084 |
|
- removed some unused halos |
| 6085 |
|
o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP |
| 6086 |
|
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
| 6087 |
|
or U/VICE from U/VWIND before computing U/VSTRESS |
| 6088 |
|
|
| 6089 |
|
checkpoint59k (2007/11/30) |
| 6090 |
|
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
| 6091 |
|
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
| 6092 |
|
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
| 6093 |
|
all experiments pass when compile with un-initialised var. checking option. |
| 6094 |
|
o added pkg/salt_plume |
| 6095 |
|
o script to test restart (for now, in MITgcm_contrib/jmc_script) |
| 6096 |
|
o pkg/seaice: new read/write pickup version. |
| 6097 |
|
read meta file and write only fields which are needed to restart. |
| 6098 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 6099 |
|
o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates) |
| 6100 |
|
o lab_sea.hb87: modify the domain & update output.hb87.txt : |
| 6101 |
|
lat-long grid & no-slip BC in seaice-dynamics produce different sigma12 |
| 6102 |
|
at j=1 & j=Ny+1 : this case is not treated correctly in the restart |
| 6103 |
|
process. Fixed here by closing the domain at the Northern boundary. |
| 6104 |
|
o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD. |
| 6105 |
|
o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing |
| 6106 |
|
a set of consecutive levels in/from a 3-D array. |
| 6107 |
|
o pkg/ptracers: |
| 6108 |
|
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
| 6109 |
|
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
| 6110 |
|
|
| 6111 |
|
checkpoint59j (2007/11/09) |
| 6112 |
|
o in pkgs: dic, obcs, offline, rbcs: |
| 6113 |
|
standard way to compute coeff. for time interpolation between 2 time reccords |
| 6114 |
|
which retains full precision (& make results less dependent on compiler). |
| 6115 |
|
update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo. |
| 6116 |
|
o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those |
| 6117 |
|
packages instead of reading ice cover and wind speed separately |
| 6118 |
|
o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h |
| 6119 |
|
(keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad |
| 6120 |
|
to allow to compile customized code before the update) |
| 6121 |
|
o cleaning-up: |
| 6122 |
|
- fix CPP instruction syntax in pkg/obcs |
| 6123 |
|
- replace (some) call to MDSIO S/R with call to RW interface S/R ; and |
| 6124 |
|
add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio) |
| 6125 |
|
- fix some threads issue in IO parts. |
| 6126 |
|
o pkg/dic: |
| 6127 |
|
- add tons of "_d 0" (--> much better testreports !) |
| 6128 |
|
and then update outputs of tutorial_global_oce_biogeo |
| 6129 |
|
o pkg/mom_fluxform: |
| 6130 |
|
add a special version of momentum advection intended to conserve momentum |
| 6131 |
|
next to a bathymetry step or a coastline edge. (default = off = #undef) |
| 6132 |
|
o new read/write pickup version: |
| 6133 |
|
- for now, only implemented for main (mdsio) pickup file. |
| 6134 |
|
- write out only what is needed to restart; merge pickup_nh , pickup_ph |
| 6135 |
|
and main pickup together. |
| 6136 |
|
- read meta file; read only what is needed to restart; stop if a field |
| 6137 |
|
is missing (if pickupStrictlyMatch=T, = the default) or try to restart |
| 6138 |
|
if it make sense (even if the restart is not perfect). |
| 6139 |
|
- if no meta file, assume that pickup to read corresponds exactly to |
| 6140 |
|
a pickup that would currently be written. |
| 6141 |
|
- read pickup written in the old format (until checkpoint59i) if it |
| 6142 |
|
recognizes an old meta file (no field-list). |
| 6143 |
|
- add a meta file in exp. which starts from a pickup: 2 cases: |
| 6144 |
|
a) minimal meta file (with just file precision) + pickupStrictlyMatch=F |
| 6145 |
|
e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta |
| 6146 |
|
b) a meta file describing the content of the associated pickup file |
| 6147 |
|
e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta |
| 6148 |
|
o pkg/mdsio & pkg/rw: |
| 6149 |
|
- new routine to read a meta file ; new set of routine to read |
| 6150 |
|
Multiple-fields file (with meta file). |
| 6151 |
|
o added open boundary conditions capability for seaice |
| 6152 |
|
HSNOW, HSALT, UICE, and VICE |
| 6153 |
|
|
| 6154 |
|
checkpoint59i (2007/10/21) |
| 6155 |
|
o adjoint: |
| 6156 |
|
* fix multiDimAdvection adjoint |
| 6157 |
|
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
| 6158 |
|
and comlev1 size definition (maxpass vs. max. number of tracers) |
| 6159 |
|
* verification/global_ocean.90x45x15 adjoint now tests |
| 6160 |
|
NLFS and multiDimAdvection using DST3 (=30) |
| 6161 |
|
* verification/lab_sea now tests multiDimAdvection using DST3 (=30) |
| 6162 |
|
o pkg/kpp: add "_d 0" to real constant (if missing); |
| 6163 |
|
update output of exp: natl_box (10.digits); vermix (std, 7.digits) |
| 6164 |
|
and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits). |
| 6165 |
|
o prepare for "clever pickup" implementation: add new header file "RESTART.h" |
| 6166 |
|
for internal parameters related to restart process (formerly from PARAMS.h) |
| 6167 |
|
and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2. |
| 6168 |
|
o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed |
| 6169 |
|
as argument. (only atm2d & obcs write_pickup have not yet been updated) |
| 6170 |
|
o pkg/monitor: |
| 6171 |
|
- use GLOBAL_SUM_TILE instead of _GLOBAL_SUM |
| 6172 |
|
- fix mon_stats_rs (statistics over the full domain, even where field is zero) |
| 6173 |
|
- account for deep Atmosphere factor and density factor (anelastic) |
| 6174 |
|
o added open boundary conditions capability for seaice HEFF and AREA |
| 6175 |
|
o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989) |
| 6176 |
|
thermodynamics |
| 6177 |
|
- requires a little reorganization, which affects the testreport results |
| 6178 |
|
of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment, |
| 6179 |
|
so that now the conservative form is tested |
| 6180 |
|
- add a few comments |
| 6181 |
|
o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code* |
| 6182 |
|
o add a little bit of code to gad_os7mp_adv_?.F to help vectorization |
| 6183 |
|
o add new diagnostics to seaice: advective, diffusive fluxes (only for |
| 6184 |
|
multidim-advection, for scheme 2 they are not filled) and transports, |
| 6185 |
|
thermodynamic growth rates |
| 6186 |
|
o change units of EmPmR (inside the code, + within coupling interface) |
| 6187 |
|
from m/s to kg/m2/s (mass flux) but leave input file unchanged. |
| 6188 |
|
Affects results @ truncation level (cg2d match) and update output of |
| 6189 |
|
experiments: lab_sea(6), global_ocean.90x40x15(10), |
| 6190 |
|
global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11) |
| 6191 |
|
+ adjoint results: global_ocean_ebm(11) and lab_sea (12). |
| 6192 |
|
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
| 6193 |
|
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
| 6194 |
|
|
| 6195 |
|
checkpoint59h (2007/09/29) |
| 6196 |
|
o pkg/exf: |
| 6197 |
|
- improve vectorization by moving if-statement out of loops in |
| 6198 |
|
exf_mapfields, exf_radiation |
| 6199 |
|
- exf_bulkformulae.F: introduce 2D fields and vectorize code |
| 6200 |
|
o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package |
| 6201 |
|
o testreport: |
| 6202 |
|
- allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE |
| 6203 |
|
monitor & update offline_exf_seaice exp. output. |
| 6204 |
|
- AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost) |
| 6205 |
|
o pkg/seaice: |
| 6206 |
|
- bug fix in the evp solver: boundary conditions were affected be |
| 6207 |
|
masking of zMax/zMin (changes results) |
| 6208 |
|
- minor bug fix in boundary conditions in seaice_calc_strainrates |
| 6209 |
|
(changes results for no_slip) |
| 6210 |
|
- seaice_lsr.F: make interpolation of eta dependent on boundaries |
| 6211 |
|
- replace hardcoded lower limit for zeta (zMin) by runtime parameter |
| 6212 |
|
- add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean |
| 6213 |
|
stress formulation and no-slip boundary conditions |
| 6214 |
|
o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP |
| 6215 |
|
in gad_calc_rhs.F ; add few safety stops in initialisation phase. |
| 6216 |
|
o pkg/seaice: a first HSALT time stepping equation has been checked in |
| 6217 |
|
o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV |
| 6218 |
|
in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem |
| 6219 |
|
without requiring DO-IF statements |
| 6220 |
|
o pkg/thsice: |
| 6221 |
|
use continuous power-law function for partition of energy between lateral |
| 6222 |
|
melting/freezing and thinning/thickening ; old code using step function |
| 6223 |
|
still available with #undef THSICE_FRACEN_POWERLAW |
| 6224 |
|
update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice |
| 6225 |
|
o testreport: change AD testing : check against results/output_adm.txt |
| 6226 |
|
using same scripts as for forward test. |
| 6227 |
|
|
| 6228 |
|
checkpoint59g (2007/09/17) |
| 6229 |
|
o adjoint testing: in preparation for changing testreport: |
| 6230 |
|
- output format: cost and grad written on separated lines |
| 6231 |
|
- ad output results in directory "results" (instead of "results_ad") |
| 6232 |
|
o pkg/seaice: adding ice salinity HSALT as a prognostic variable |
| 6233 |
|
o pkg/seaice: changes for using pkg/seaice with pkg/obcs |
| 6234 |
|
o pkg/ecco: allow user defined cost function contributions |
| 6235 |
|
o testreport: |
| 6236 |
|
Allow to choose (per experiment) the list of tested output variables |
| 6237 |
|
and the main variable (used to issue a pass/FAIL ) ; |
| 6238 |
|
- for now, done by adding the specific list in file: [exp]/input/tr_checklist |
| 6239 |
|
- default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ; |
| 6240 |
|
Also modify printing of summary: |
| 6241 |
|
a) ">" NN "<" indicates the "main" variable (used for pass/FAIL) |
| 6242 |
|
b) echo the list of tested variables in the individual summary.txt of |
| 6243 |
|
each experiment. |
| 6244 |
|
o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of |
| 6245 |
|
threads and number of processes (with #define GLOBAL_SUM_SEND_RECV) |
| 6246 |
|
(but still depend on the tile decompostion of the domain). |
| 6247 |
|
o pkg/seaice: change a discretization detail to make the B-grid code |
| 6248 |
|
"more symmetric". This change is likely to remove all "ridges/leads" that |
| 6249 |
|
where quasi-aligned with the grid in B-grid solutions. It may also be |
| 6250 |
|
the solution to the stress coupling issues with the B-grid. |
| 6251 |
|
o each tested exp: add a "run" directory with a standard ".cvsignore" file ; |
| 6252 |
|
remove .cvsignore from input dir. (since testreport no longer run here). |
| 6253 |
|
o pkg/thsice: |
| 6254 |
|
- cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h" |
| 6255 |
|
- fix reshaping of sea-ice just after advection: |
| 6256 |
|
melt all the ice only if ice-volume is too small. |
| 6257 |
|
- re-visit lateral/thinning repartition of melting (modifs from May 04, 2007): |
| 6258 |
|
prevent lateral melting if sea-ice fraction is too close to iceMaskMin ; |
| 6259 |
|
and update experiment global_ocean.cs32x15.icedyn (+start from pickup files). |
| 6260 |
|
o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water |
| 6261 |
|
tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged. |
| 6262 |
|
o define mass2rUnit & rUnit2mass as units conversion factor, used for surface |
| 6263 |
|
forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit |
| 6264 |
|
(z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse; |
| 6265 |
|
and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error |
| 6266 |
|
of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16 |
| 6267 |
|
-> update output.txt |
| 6268 |
|
o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME): |
| 6269 |
|
this affects truncation error: -> update output.txt of exp: |
| 6270 |
|
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
| 6271 |
|
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
| 6272 |
|
|
| 6273 |
|
checkpoint59f (2007/08/21) |
| 6274 |
|
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
| 6275 |
|
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
| 6276 |
|
a bounded range (in forward mode) |
| 6277 |
|
o pkg/ecco, ctrl, autodiff and mom_common: |
| 6278 |
|
internal parameter controls, completements of implementations |
| 6279 |
|
o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy. |
| 6280 |
|
o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ; |
| 6281 |
|
(not seem any difference in testing results). |
| 6282 |
|
o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains |
| 6283 |
|
at face corners. |
| 6284 |
|
o pkg/generic_advdiff: |
| 6285 |
|
- in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR) |
| 6286 |
|
loop range indices for computing vertical advection tendency |
| 6287 |
|
and do the calculation in the interior only (no overlap) ; |
| 6288 |
|
for now, only implemented for SOM advection (to save CPU time). |
| 6289 |
|
- add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment) |
| 6290 |
|
o exch2 adjoint |
| 6291 |
|
First set of changes: |
| 6292 |
|
- add exch2 hand-written adjoint templates |
| 6293 |
|
- exch2 hand-written no longer use TAF-flag 'nownew_arg' |
| 6294 |
|
This will require cleanup in pkg/autodiff/*.F |
| 6295 |
|
(changed routines currently kept separate in verif. code/) |
| 6296 |
|
- Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC |
| 6297 |
|
that used to hide exch2 or cubed-sphere specific code |
| 6298 |
|
(commented via 'cph-exch2') |
| 6299 |
|
o pkg/seaice |
| 6300 |
|
- Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE. |
| 6301 |
|
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
| 6302 |
|
output of global_ocean.cs32x15.thsice . |
| 6303 |
|
|
| 6304 |
|
checkpoint59e (2007/07/26) |
| 6305 |
|
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
| 6306 |
|
for B-grid vector (not yet tested) and C-grid vector (<- only used |
| 6307 |
|
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
| 6308 |
|
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme |
| 6309 |
|
(#ifdef ALLOW_SALT_PLUME) |
| 6310 |
|
o gather_2d/scatter_2d: removed halo regions |
| 6311 |
|
o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007 |
| 6312 |
|
scheme and the corresponding test case (under front_relax dir). For now, |
| 6313 |
|
only available with Skew-flux form and not yet tested in realistic set-up. |
| 6314 |
|
adjoint: store directives updated, but gradient checks deteriorated, |
| 6315 |
|
so maybe GM/Redi adjoint is now broken. |
| 6316 |
|
o seaice adjoint |
| 6317 |
|
* add AREA, HEFF, HSNOW as control variable |
| 6318 |
|
(should not change lab_sea results) |
| 6319 |
|
* CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40 |
| 6320 |
|
o pkg/seaice: |
| 6321 |
|
* added computation of saltFlux in seaice_growth; |
| 6322 |
|
For time being, sea ice salinity is assumed constant |
| 6323 |
|
contribution of snow flooding to freshening of sea ice is neglected. |
| 6324 |
|
SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it |
| 6325 |
|
defaults to 0.0 in order to maintain backward compatibility. |
| 6326 |
|
Typical values for SEAICE_salinity are 4 to 10 g/kg. |
| 6327 |
|
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F |
| 6328 |
|
* added SEAICE_availHeatFrac, which specifies fraction of surface level |
| 6329 |
|
heat content used to melt or grow ice |
| 6330 |
|
* commented out cap of HICE: it helps keep ice thinner |
| 6331 |
|
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
| 6332 |
|
* applied OBCS T/S mask to HEFFM sea ice mask |
| 6333 |
|
|
| 6334 |
|
checkpoint59d (2007/06/21) |
| 6335 |
|
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
| 6336 |
|
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
| 6337 |
|
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
| 6338 |
|
o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0" |
| 6339 |
|
and change default value of parameter "GM_Small_Number"; |
| 6340 |
|
update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15, |
| 6341 |
|
global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf, |
| 6342 |
|
tutorial_global_oce_biogeo, tutorial_global_oce_latlon |
| 6343 |
|
o pkg/ecco: cost function when applying pkg/smooth to controls |
| 6344 |
|
o pkg/ctrl: add forcingPrecond run time parameter |
| 6345 |
|
o pkg/seaice: |
| 6346 |
|
- replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code |
| 6347 |
|
- fix bug in metric terms of u-equation in LSR solver (implicit part), |
| 6348 |
|
changes verification/lab_sea |
| 6349 |
|
- rearrange implicit part of u-equation in LSR solver to make it easier to |
| 6350 |
|
read, understand, and debug. This causes changes at the truncation level. |
| 6351 |
|
- fix (serious) bug in the boundary conditions (sign error in the implicit |
| 6352 |
|
part) of the LSR solver. Changes all LSR results. |
| 6353 |
|
- fixed problem with HSNOW initialization to avoid thick snow when AREA |
| 6354 |
|
is initilized with small values - does not change lab_sea results. |
| 6355 |
|
- added HsnowFile initialization capability |
| 6356 |
|
o pkg/smooth: addition to model/src and pkg/ctrl so allow |
| 6357 |
|
initialization of pkg/smooth and application to control vector |
| 6358 |
|
o pkg/seaice: fix another bug in the LSR no-slip boundary conditons |
| 6359 |
|
o dependencies: pkg/profiles requires pkg/cal |
| 6360 |
|
o pkg/profiles: |
| 6361 |
|
- added option ALLOW_PROFILES_GENERICGRID |
| 6362 |
|
-> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming |
| 6363 |
|
that interpolation information (grid points and coefficients) is provided |
| 6364 |
|
within the netcdf input files. |
| 6365 |
|
-> sample matlab scripts can be found in MITgcm_contrib/gael |
| 6366 |
|
that allow you to prepare netcdf input files. |
| 6367 |
|
- also modified: cleaner include statements, cleaner error print statements, |
| 6368 |
|
cleaner stops when error, and more tests of the netcdf input files consistency. |
| 6369 |
|
o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs. |
| 6370 |
|
o pkg/seaice: |
| 6371 |
|
- move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this |
| 6372 |
|
requires a new routine: seaice_diagnostics_fill.F |
| 6373 |
|
- make sure that seaice does not move if not forced (pressure replacement |
| 6374 |
|
method, Hibler and Ip, 1995), changes results |
| 6375 |
|
- and new damping criterion for EVP solver according to Hunke, JCP, 2001 |
| 6376 |
|
- SEAICE_evpDampC = > 0. turns it on (615. is the recommended value). |
| 6377 |
|
It is turned off by default (=-1.), because it changes the results. |
| 6378 |
|
- make it possible to read AREA from a file, too. |
| 6379 |
|
|
| 6380 |
|
checkpoint59c (2007/06/04) |
| 6381 |
|
o add S/R and diagnostics for oceanic mixed-layer depth |
| 6382 |
|
o move GMRedi call after all vertical mixing schemes (including KPP) |
| 6383 |
|
o pkg/thsice: |
| 6384 |
|
- ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs |
| 6385 |
|
(melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice |
| 6386 |
|
o pkg/obcs: |
| 6387 |
|
- bug fix for balance code |
| 6388 |
|
o pkg/seaice: |
| 6389 |
|
- allow values of SEAICE_elasticParm > 1 |
| 6390 |
|
- add new parameter SEAICE_evpTauRelax as an alternative |
| 6391 |
|
to SEAICE_elasticParm |
| 6392 |
|
- make lsr boundary conditions free slip (by default), changes result |
| 6393 |
|
- add code for no slip boundary conditions for lsr |
| 6394 |
|
- set minimum of zeta to zero (and not 4e8) (changes results) |
| 6395 |
|
- add a cap on AREA after advecting AREA if seaice_growth is not called |
| 6396 |
|
o change calculation of Visbeck K: |
| 6397 |
|
- no longer depend on tapering scheme; instead, compute slope (limited |
| 6398 |
|
by GM_maxSlope). this is equivalent to what was comuted before with |
| 6399 |
|
clipping or linear tappering. |
| 6400 |
|
- fix vertical averaging (wrong by 1/2 level) |
| 6401 |
|
- leave the old version (but will not be maintained) within |
| 6402 |
|
#ifdef OLD_VISBECK_CALC / #endif |
| 6403 |
|
- update output of exp. ideal_2D_oce |
| 6404 |
|
o change error catch in calc_r_star to improve vectorization |
| 6405 |
|
o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and |
| 6406 |
|
add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf). |
| 6407 |
|
o adjoint: |
| 6408 |
|
Re-organized adjoint checkpointing according to Matt Mazloff |
| 6409 |
|
(but with modifs/completions/cleanups) |
| 6410 |
|
Storing is now bundled into large arrays to optimized I/O |
| 6411 |
|
(and second step in cleanup of the_main_loop) |
| 6412 |
|
|
| 6413 |
|
checkpoint59b (2007/05/16) |
| 6414 |
|
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
| 6415 |
|
- export/import (between ocean & coupler) fields needed for ocean DIC. |
| 6416 |
|
o pkg/seaice: |
| 6417 |
|
- get rid of three more exchanges seaice_calc_viscosities (required |
| 6418 |
|
different loop boundaries in seaice_lsr and seaice_ocean_stress) |
| 6419 |
|
- bug fix in seaice_ocean_stress (update of lab_sea required) |
| 6420 |
|
- reduce loop boundaries to necessary minimum also in seaice_evp |
| 6421 |
|
- go back to the old way of computing deltaC/Z as the adjoint likes that |
| 6422 |
|
better |
| 6423 |
|
o Refresh of tutorial_global_oce_latlon (includes changing salinity-like |
| 6424 |
|
passive tracer to an Age Tracer) + update output.txt |
| 6425 |
|
o pkg/exf: |
| 6426 |
|
- implement A-grid / C-grid selection for wind-stress input files. |
| 6427 |
|
- clean-up exf_wind.F (remove us, use wspeed instead ; add wStress) |
| 6428 |
|
for now, in exf_bulk_largeyeager04.F only : |
| 6429 |
|
- change implementation for case where windspeed + 2. components wind-stress |
| 6430 |
|
are read-in. AND use rhoConstFresh to convert evap. |
| 6431 |
|
o pkg/seaice: |
| 6432 |
|
- use correct EXCH_UV for wind-forcing (on A-grid). |
| 6433 |
|
- change SEAICE_OPTIONS.h to limit the number of option combinations (regarding |
| 6434 |
|
SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops. |
| 6435 |
|
o pkg/exf: |
| 6436 |
|
- default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) |
| 6437 |
|
EXF_INTERPOLATION: |
| 6438 |
|
- merge global_with_exf/code version of exf_interp_read.F |
| 6439 |
|
to the main code ; |
| 6440 |
|
- Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when |
| 6441 |
|
reading the file ; Important: This options needs to be defined to recover |
| 6442 |
|
previous code. |
| 6443 |
|
otherwise, use fixed size array to read in (size=exf_interp_bufferSize). |
| 6444 |
|
- no longer loose real*8 precision along the way when using exf_iprec=64. |
| 6445 |
|
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
| 6446 |
|
- change discretisation of evp-solver in order to avoid another exchange |
| 6447 |
|
(changes lab_sea) and clean up a little |
| 6448 |
|
- replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS) |
| 6449 |
|
help the adjoint (this also changes the results slightly) |
| 6450 |
|
- add a few "_d 0" where they had been missing in seaice_evp.F |
| 6451 |
|
- cleaning up: remove unused seaice_calc_rhs.F |
| 6452 |
|
o pkg/exf: some cleaning-up: |
| 6453 |
|
- change various "constants" into runtime parameters |
| 6454 |
|
- cleaned-up Large&Yeager04 routine which should eventually |
| 6455 |
|
replace exf_bulkformulae.F (changed names of S/R and CPP) |
| 6456 |
|
and merged various ALLOW_ATM_WIND options |
| 6457 |
|
only used with thsice pkg (in thsice_get_exf.F): |
| 6458 |
|
- implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04) |
| 6459 |
|
which are used when useStabilityFct_overIce=TRUE (= the default) |
| 6460 |
|
- change default values of ice & snow emissivity and scale downward LW |
| 6461 |
|
by ice & snow emissivity. |
| 6462 |
|
o pkg/thsice: |
| 6463 |
|
fix few little problems, in thsice_calc_thickn.F: |
| 6464 |
|
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
| 6465 |
|
- melt only laterally if hIce < hThinIce (as the comments say) |
| 6466 |
|
and in thsice_extend.F: |
| 6467 |
|
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
| 6468 |
|
- start to form ice as soon as the minimum ice-volume is reachable. |
| 6469 |
|
update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice), |
| 6470 |
|
and cpl_aim+ocn |
| 6471 |
|
o pkg/kpp |
| 6472 |
|
- move computation of surface related input fields to KPP into a new |
| 6473 |
|
subroutine kpp_forcing_surf.F |
| 6474 |
|
- remove wrong (within bi,bj loops) EXCH calls. |
| 6475 |
|
- little cleaning (add argument myThid in last position, cvs header ...) |
| 6476 |
|
- for now, fix conservation problem by exchanging KPPviscAz (may not |
| 6477 |
|
be the best fix) |
| 6478 |
|
o pkg/seaice |
| 6479 |
|
- check for inconsistent evp parameter/cpp-flag combination |
| 6480 |
|
- remove leftover errIO flat for obsolete name list error handling |
| 6481 |
|
o OpenAD |
| 6482 |
|
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
| 6483 |
|
|
| 6484 |
|
checkpoint59a (2007/05/01) |
| 6485 |
|
o pkg/seaice: some parameter clarifications and a little bit of clean up |
| 6486 |
|
o pkg/thsice: rename run-time parameters: |
| 6487 |
|
himin -> hIceMin |
| 6488 |
|
himin0 -> hThinIce |
| 6489 |
|
hihig -> hThickIce |
| 6490 |
|
i0 -> i0swFrac |
| 6491 |
|
transCoef -> bMeltCoef |
| 6492 |
|
frac_energy -> fracMelting |
| 6493 |
|
add new parameters: hNewIceMax, fracFreezing, dhSnowLin |
| 6494 |
|
with default values (for now) that do not change the results. |
| 6495 |
|
remove old version of thsice vars advection in pkg/seaice. |
| 6496 |
|
o in FFIELDS.h: |
| 6497 |
|
- replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD |
| 6498 |
|
- make pLoad & sIceLoad always available (but still only used if |
| 6499 |
|
ATMOSPHERIC_LOADING is #define). |
| 6500 |
|
o pkg/kpp: replaced _KPP_RL with _RL |
| 6501 |
|
o bug fixes for vertical diffusivity computations when both KPP and |
| 6502 |
|
3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F |
| 6503 |
|
are no longer updating the vertical diffusivity array |
| 6504 |
|
(passed as argument) but are (re-) setting those arrays. |
| 6505 |
|
o pkg/seaice: fix bug in evp solver, while doing that |
| 6506 |
|
- change (improve?) discretization of stress computations for both |
| 6507 |
|
cgrid-lsr and evp solver |
| 6508 |
|
- add a new routine to compute strain rates |
| 6509 |
|
- the above changes lab_sea results |
| 6510 |
|
- add no slip conditions for evp solver (off by default), lsr-version |
| 6511 |
|
may follow |
| 6512 |
|
- fix exchange for shear at Z-points (does not change lab_sea) |
| 6513 |
|
- retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp |
| 6514 |
|
(to force the user to pick a time step since there is not "safe" way |
| 6515 |
|
of choosing it) |
| 6516 |
|
- add principal stress diagnostics |
| 6517 |
|
- rearrange fields for evp a little to avoid having to call a: too many |
| 6518 |
|
exchanges and b: exchanges for stress trensor components which we do |
| 6519 |
|
not have. |
| 6520 |
|
- modify Hibler+Bryan (1987) stress coupling so that it reuses information |
| 6521 |
|
of evp, complete rewrite for lsr case (latter is does not yet work |
| 6522 |
|
in all cases) |
| 6523 |
|
o pkg/kpp: add code to have mixing in shelf ice caverns |
| 6524 |
|
- add myThid to all kpp routines (long overdue) |
| 6525 |
|
|
| 6526 |
|
checkpoint59 (2007/04/19) |
| 6527 |
|
o pkg/exf: |
| 6528 |
|
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
| 6529 |
|
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
| 6530 |
|
- move exf header files from lower_case.h to UPPER_CASE.h ; |
| 6531 |
|
add missing cvs Header & Name |
| 6532 |
|
- add adjoint routines and flow dirs for newly used exch_uv_agrid routines |
| 6533 |
|
- add namelist param. selectStressGridPosition, exf_monFreq |
| 6534 |
|
- retire many _CLIM routines, and remove data.exf_clim |
| 6535 |
|
+ params moved to data.exf |
| 6536 |
|
+ climsst, climsss now handled by exf_set_gen, i.e. |
| 6537 |
|
climss?period=0 refers to constant field, |
| 6538 |
|
climss?period=-12 to monthly forcing |
| 6539 |
|
- split up namelists in data.exf |
| 6540 |
|
o pkg/seaice: |
| 6541 |
|
- remove seaice_exch and seaice_exch_uv |
| 6542 |
|
- remove superfluous exchange of theta |
| 6543 |
|
- add myThid to seaice_budget_ocean/ice |
| 6544 |
|
- add new interface for atmospheric wind forcing (C-grid only) |
| 6545 |
|
+ new routine |
| 6546 |
|
+ two new field (taux, tauy for stress over ice) |
| 6547 |
|
+ removed one global field (DAIRN) for C-grid case only |
| 6548 |
|
o pkg/thsise |
| 6549 |
|
- 2nd set of modifs for thsice adjoint in conjunction with exf |
| 6550 |
|
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
| 6551 |
|
|
| 6552 |
|
checkpoint58y_post (2007/04/15) |
| 6553 |
|
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
| 6554 |
|
vertical diffusivity, similar to that in MOM4; turned on using |
| 6555 |
|
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
| 6556 |
|
diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file. |
| 6557 |
|
o Added capability for 3D specification of background vertical diffusion |
| 6558 |
|
coefficient. This is done by (i) #define ALLOW_3D_DIFFKR |
| 6559 |
|
in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime |
| 6560 |
|
"data" file that contains the 3D vertical diffusivity coefficients. |
| 6561 |
|
o ice dynamics (pkg/seaice) with thsice thermodynamics: |
| 6562 |
|
- add code within pkg thsice to advect & diffuse sea-ice fields |
| 6563 |
|
similar to (and will replace) what has been added in seaice_advdiff.F, |
| 6564 |
|
but: - conserving Mass, Heat & Salt. |
| 6565 |
|
- better when using non-linear advection scheme (not yet fully tested) |
| 6566 |
|
- can also be used in atmospheric set-up (for now, only the diffusion). |
| 6567 |
|
|
| 6568 |
|
checkpoint58x_post (2007/04/04) |
| 6569 |
|
o IO option for global-file compact format: |
| 6570 |
|
- add options when generating topology (utils/exch2/matlab-topology-generator) |
| 6571 |
|
- add I/O capability (pkg/mdsio). |
| 6572 |
|
- adapt utils/matlab/rdmds.m to read this format. |
| 6573 |
|
for now long-line format not yet supported by pkg/mdsio (& exch2). |
| 6574 |
|
o shelfice: add a few diagnostics |
| 6575 |
|
|
| 6576 |
|
checkpoint58w_post (2007/03/13) |
| 6577 |
|
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
| 6578 |
|
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
| 6579 |
|
(and replace horiVertRatio in NH code). |
| 6580 |
|
Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !) |
| 6581 |
|
and tutorial_plume_on_slope (sensitive to truncation) |
| 6582 |
|
o seaice: if ALLOW_ATM_WIND is undefined use wind stress |
| 6583 |
|
directly to drive seaice model (C-grid only) |
| 6584 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND): |
| 6585 |
|
- reintroduce computation of wind from stress, |
| 6586 |
|
- compute tau (in exf_bulkformulae.F) from windstress averaged to |
| 6587 |
|
mass points to avoid tau = 0 |
| 6588 |
|
- fix serious bug: (1/3) in Fortran is not the same as (1./3.) |
| 6589 |
|
o rdmnc.m: make it work with "global" files created with gluemnc |
| 6590 |
|
o rdmnc.m : some improvements in dealing with singleton dimension |
| 6591 |
|
(tested on all testreport mnc output files). |
| 6592 |
|
o genmake2: disable pkg/profiles if netcdf test fails. |
| 6593 |
|
o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output. |
| 6594 |
|
o move call to cal_readparms up to make calendar parameters/variable available |
| 6595 |
|
to all packages |
| 6596 |
|
|
| 6597 |
|
checkpoint58v_post (2007/02/08) |
| 6598 |
|
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
| 6599 |
|
useDynP_inEos_Zc tested. |
| 6600 |
|
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
| 6601 |
|
o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields |
| 6602 |
|
and portions thereof. See read_cs.txt for description and examples. |
| 6603 |
|
o utils/matlab/cs_grid/bk_line: to compute transport through passages, |
| 6604 |
|
add a script (grt_circ_bkl.m) to generate broken-line between 2 points, |
| 6605 |
|
following the great-circle arc between those 2 points. |
| 6606 |
|
o trap un-initialized variable with pathscale compiler on weddell.mit.edu |
| 6607 |
|
(thanks to Constantinos): fix few problems and get (almost) all exp to pass. |
| 6608 |
|
o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in |
| 6609 |
|
- enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h) |
| 6610 |
|
- used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81) |
| 6611 |
|
- still needs work (not working with some options ; efficiency to improve) |
| 6612 |
|
and serious testing. |
| 6613 |
|
- use this scheme for temperature & salinity in 2 advection test exp.: |
| 6614 |
|
advect_xy & advect_xz, respectively. |
| 6615 |
|
|
| 6616 |
|
checkpoint58u_post (2007/01/12) |
| 6617 |
|
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
| 6618 |
|
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
| 6619 |
|
o testreport: add option "-skipdir" to skip some test. |
| 6620 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent |
| 6621 |
|
momentum calculation. |
| 6622 |
|
o gad_advection: fix vertAdvecScheme (if different from advectionScheme) |
| 6623 |
|
o some cleaning: usePickupBeforeC35 no longer supported ; remove this option. |
| 6624 |
|
remove checkpoint.F and the_correction_step.F (no longer used); |
| 6625 |
|
do the k loop inside CYCLE_TRACER (supposed to be more efficient). |
| 6626 |
|
o add option (linFSConserveTr) to correct for tracer source/sink due to |
| 6627 |
|
Linear Free surface |
| 6628 |
|
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
| 6629 |
|
o pkg/thsice: fix reading mnc-pickups |
| 6630 |
|
|
| 6631 |
|
checkpoint58t_post (2006/12/30) |
| 6632 |
|
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
| 6633 |
|
o pkg/mdsio: |
| 6634 |
|
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
| 6635 |
|
move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) & |
| 6636 |
|
mdsio_write_field.F (S/R MDS_WRITE_FIELD); |
| 6637 |
|
- fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD |
| 6638 |
|
- collect old S/R in one file: mdsio_rw_field.F (now just a call to |
| 6639 |
|
either MDS_READ_FIELD or MDS_WRITE_FIELD ) |
| 6640 |
|
- new S/R (to replace MDSWRITEMETA), which allows to write more |
| 6641 |
|
informations (variable names, time ...) to meta files. |
| 6642 |
|
- modify rdmds.m to give back the meta file content. |
| 6643 |
|
o pkg/diagnostics: change vertical interpolation to be safer, and more |
| 6644 |
|
flexible (define p-levels to interpolate to in data.diagnostics); |
| 6645 |
|
add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right |
| 6646 |
|
diagnostic pointer. |
| 6647 |
|
o pkg/seaice: more cleaning up of seaice_growth, added many comments |
| 6648 |
|
o pkg/exf: put runoff0 and runoff1 into the appropriate common block |
| 6649 |
|
o fix multi-category seaice: |
| 6650 |
|
- change cpp flag SEAICE_MULTILEVEL to more meaningful name: |
| 6651 |
|
SEAICE_MULTICATEGORY |
| 6652 |
|
- fix short wave heat flux |
| 6653 |
|
o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics |
| 6654 |
|
and allow to use EVP solver. Change forward lab_sea: test both EVP |
| 6655 |
|
solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint) |
| 6656 |
|
o Initial check-in of lab_sea adjoint |
| 6657 |
|
(very similar to natl_box_adjoint/code_seaice) |
| 6658 |
|
* used C-grid and EVP solver |
| 6659 |
|
* used KPP, GM/Redi |
| 6660 |
|
* uses inAdExact=.TRUE. |
| 6661 |
|
* gradient checks fail for both ADM and TLM |
| 6662 |
|
due to sensitive snow melt code in seaice_grwoth (look for "JZ") |
| 6663 |
|
f.d. gradients actually seem more problematic than ADM, TLM gradients; |
| 6664 |
|
issue is related to forward mismatch between g77 an ifort |
| 6665 |
|
o pkg/seaice: overhaul of thermodynamics |
| 6666 |
|
- growth.F and groatb.F are replaced by new routine seaice_growth.F |
| 6667 |
|
- budget.F is replaced by two new routines seaice_budget_ocean/ice.F |
| 6668 |
|
- move a few global fields out of SEAICE.h into seaice_growth.F and |
| 6669 |
|
make them 2D (FICE/QNETO/ ...) |
| 6670 |
|
- remove FO (it is the same as QNETO) |
| 6671 |
|
- introduce a few local fields to avoid modifying external fields such |
| 6672 |
|
as atemp, etc. |
| 6673 |
|
|
| 6674 |
|
checkpoint58s_post (2006/12/11) |
| 6675 |
|
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
| 6676 |
|
changed exf_set_gen.F so that |
| 6677 |
|
genperiod=0 means input file is one time-constant field and |
| 6678 |
|
genperiod=-12 means input file contains 12 monthly means |
| 6679 |
|
o CG2D: use pre-computed solver main-diagonal (stored in common block); |
| 6680 |
|
this affects truncation error ; generate new output file for exp. which |
| 6681 |
|
fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d), |
| 6682 |
|
global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d), |
| 6683 |
|
ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d), |
| 6684 |
|
MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d), |
| 6685 |
|
tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d), |
| 6686 |
|
vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d) |
| 6687 |
|
o start implementation of deep-atmosphere and anelastic formulation |
| 6688 |
|
o verification: remove 2nd copy of input files and use script "prepare_run" |
| 6689 |
|
to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M) |
| 6690 |
|
o mom_common/vecinv/fluxform: fix a few initialisation isssues |
| 6691 |
|
o profiles: fix for multithreaded case |
| 6692 |
|
|
| 6693 |
|
o diagnostics: rename few diags: |
| 6694 |
|
s/'PRESSURE'/'RCENTER '/g |
| 6695 |
|
s/'TICE '/'oceFreez'/g |
| 6696 |
|
s/'TAUX '/'oceTAUX '/g |
| 6697 |
|
s/'TAUY '/'oceTAUY '/g |
| 6698 |
|
s/'SWFLUX '/'oceQsw '/g |
| 6699 |
|
s/DIFx/DFxE/g |
| 6700 |
|
s/DIFy/DFyE/g |
| 6701 |
|
and add few ocean-forcing diagnostics: |
| 6702 |
|
atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS |
| 6703 |
|
o modifications to pkg/seaice/growth.F and budget.F, which change results of |
| 6704 |
|
lab_sea experiment: HSNOW was sometimes treated as effective and sometimes |
| 6705 |
|
as actual snow thickness. It now refers everywhere to effective snow |
| 6706 |
|
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
| 6707 |
|
|
| 6708 |
|
checkpoint58r_post (2006/11/17) |
| 6709 |
|
o modifications to pkg/seaice/growth.F, which change results of |
| 6710 |
|
lab_sea experiment: fixes pertain to melting snow over open water, to |
| 6711 |
|
masking EVAP under sea ice, and to using the correct AREA variable for |
| 6712 |
|
computations of EVAP, PRECIP, HSNOW, and GHEFF |
| 6713 |
|
o add ability to read bathy, salt, and theta using MNC (off by def) |
| 6714 |
|
o add flooding algorithm and advection of HSNOW for pkg/seaice; |
| 6715 |
|
both are turned off by default and do no change any results |
| 6716 |
|
o seaice advection with pkg/thsice: a step toward the use of non-linear |
| 6717 |
|
advection scheme, but #ifdef or commented out for now (requires more EXCH). |
| 6718 |
|
o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens |
| 6719 |
|
(identical results) and the standard version of EXTERNAL_FIELDS_LOAD |
| 6720 |
|
in natl_box (affects results @ truncation level: update output.txt) |
| 6721 |
|
o multi-threading and IO: |
| 6722 |
|
- replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R. |
| 6723 |
|
- remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls |
| 6724 |
|
(needed to work with SingleCpuIO): tested in all verif. exp. |
| 6725 |
|
o GAD: use simpler DST3 formulation as default (old version left within #ifdef) |
| 6726 |
|
affects the results (but none of the verification test uses this scheme). |
| 6727 |
|
o Adding some pkg/diagnostics capability to pkg/seaice |
| 6728 |
|
(will certainly be subject to changes) |
| 6729 |
|
o ctrl: adding new control variables: |
| 6730 |
|
lwflux, lwdown, evap, snowprecip, apressure, runoff |
| 6731 |
|
|
| 6732 |
|
checkpoint58q_post (2006/10/20) |
| 6733 |
|
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
| 6734 |
|
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
| 6735 |
|
high_res_cube configuration by 4% on Columbia. |
| 6736 |
|
o clean-up multi-threaded problems (reported by debugger tcheck on ACES); |
| 6737 |
|
add (in global_with_exf/code) a version of EXF_INTERP_READ without |
| 6738 |
|
dynamical allocation (seems to work in multi-threaded). |
| 6739 |
|
o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using |
| 6740 |
|
single CPU io) so that TAF does not have to see EESUPPORT.h |
| 6741 |
|
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
| 6742 |
|
|
| 6743 |
|
checkpoint58p_post (2006/09/08) |
| 6744 |
|
o obcs: stop if obcs is used with useCDscheme = .true. |
| 6745 |
|
o shelfice: |
| 6746 |
|
- fix a sign error so that no slip at shelfice interface works |
| 6747 |
|
- remove stop for combination non-hydrostatic code and shelfice. That does |
| 6748 |
|
not mean, that the results are correct, but at least they are numerically |
| 6749 |
|
stable |
| 6750 |
|
o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted) |
| 6751 |
|
o added adjoint exch routined for all exch*3d* routines |
| 6752 |
|
and updated flow directives |
| 6753 |
|
|
| 6754 |
|
checkpoint58o_post (2006/08/28) |
| 6755 |
|
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
| 6756 |
|
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
| 6757 |
|
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
| 6758 |
|
and clean-up reading/writing of pickup files. |
| 6759 |
|
o fix local version of read/write pickup (NH part) in rotating_tank/code |
| 6760 |
|
o simplify EXCH interface: |
| 6761 |
|
- change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list) |
| 6762 |
|
- not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version |
| 6763 |
|
o added the regrid package |
| 6764 |
|
o shelfice: |
| 6765 |
|
- add a simple boundary layer scheme to reduce noise |
| 6766 |
|
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
| 6767 |
|
|
| 6768 |
|
checkpoint58n_post (2006/08/14) |
| 6769 |
|
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
| 6770 |
|
local variable (not in common block). |
| 6771 |
|
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
| 6772 |
|
- still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more); |
| 6773 |
|
- still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls |
| 6774 |
|
to work with SingleCpuIO. |
| 6775 |
|
o add "_d 0" to real constant of pkg/cfc subroutines ; |
| 6776 |
|
update exp. cfc_exemple & tutorial_cfc_offline output files. |
| 6777 |
|
o multi-threading and IO: |
| 6778 |
|
- all threads call READ_FLD S/R (needed if using SingleCpuIO): |
| 6779 |
|
(no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R. |
| 6780 |
|
- barrier before and after reading. |
| 6781 |
|
- stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE) |
| 6782 |
|
- avoid using MDS_WRITELOCAL for LAND pkg output. |
| 6783 |
|
- new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics |
| 6784 |
|
common-block variables ; Allows multi-threading with master-thread IO. |
| 6785 |
|
o change default MAX_NO_THREADS from 32 to 4 ; |
| 6786 |
|
and stop cleanly when MAX_NO_THREADS is too small. |
| 6787 |
|
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
| 6788 |
|
|
| 6789 |
|
checkpoint58m_post (2006/07/17) |
| 6790 |
|
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
| 6791 |
|
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
| 6792 |
|
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
| 6793 |
|
keep global_ocean.90x40x15 (for AD testing) with former secondary test |
| 6794 |
|
(".qshyd") as the main test (mv output.qshyd.txt to output.txt) |
| 6795 |
|
o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos; |
| 6796 |
|
add MITgcm_tutorials (= code + all the tutorials) |
| 6797 |
|
o ecco, option to compute cost for total ssh (mean+anom) |
| 6798 |
|
o consistent with addition of ptracer and ssh in pkg/profiles |
| 6799 |
|
o profiles: adding ptracer and ssh |
| 6800 |
|
o testreport: change multi-test output-file name |
| 6801 |
|
(from output.txt.{name} to output.{name}.txt) |
| 6802 |
|
o profiles: now ok for mutli-tiles case |
| 6803 |
|
o seaice: add 4 parameters for different advection schemes for area, |
| 6804 |
|
(effective) seaice thickness, enthalphy, and snow height. Their default |
| 6805 |
|
is the standard parameter SEAICEadvScheme |
| 6806 |
|
o calc_gw: |
| 6807 |
|
- add cosFacU in zonal viscous flux (harmonic.visc.). |
| 6808 |
|
- put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt. |
| 6809 |
|
of tutorial_plume_on_slope. |
| 6810 |
|
o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria). |
| 6811 |
|
o calc_gw: true flux-form, account for horizontal grid spacing. |
| 6812 |
|
update rotating_tank results, but not plume_on_slope (affected at |
| 6813 |
|
truncation level, 11 digits). |
| 6814 |
|
|
| 6815 |
|
checkpoint58l_post (2006/07/12) |
| 6816 |
|
o calc_gw: |
| 6817 |
|
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
| 6818 |
|
- remove side-drag for now (need to fix it); update plume_on_slope results. |
| 6819 |
|
- fix for partial-cell & non-uniform dz; update plume_on_slope results. |
| 6820 |
|
o commit code to make SST/SSS weights spatially variable |
| 6821 |
|
(based on either variable in-situ or variable initial T/S weights) |
| 6822 |
|
o pkg/ecco: |
| 6823 |
|
* commit code to relax deviations of xx_theta, xx_salt to 5*sigma, |
| 6824 |
|
now based on horizontally varying weights wthetaLev, wsaltLev |
| 6825 |
|
* cost_averagesflags now returns year indices in addition to day, month |
| 6826 |
|
* sflux balance is performed on annual basis |
| 6827 |
|
(sflxumm, sfluxmm2, bal_sfluxmm) |
| 6828 |
|
* for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO, |
| 6829 |
|
including separate counting and multipliers |
| 6830 |
|
o pkg/rbcs |
| 6831 |
|
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
| 6832 |
|
|
| 6833 |
|
checkpoint58k_post (2006/07/06) |
| 6834 |
|
o testreport: |
| 6835 |
|
- always build in dir. "build" (if not there, mkdir build instead of building |
| 6836 |
|
& running in input) |
| 6837 |
|
- run in dir run (if it exists), in build otherwise. |
| 6838 |
|
- call prepare_run (if input/prepare_run exists) |
| 6839 |
|
- run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists. |
| 6840 |
|
o pkg/exf modifications to interpolation and rotation routines for more |
| 6841 |
|
reasonable treatment of North Pole singularity: for tracers North Pole |
| 6842 |
|
value is set to northernmost zonal-mean value, for zonal velocity it is |
| 6843 |
|
set to zero, and for meridional velocity it is set to northernmost value. |
| 6844 |
|
o pkg/exf/exf_check_range.F |
| 6845 |
|
- add tile index to diagnostics and move stop statement to the very |
| 6846 |
|
end of the routine. |
| 6847 |
|
o pkg/diagnostics: (diagnostics_main_init.F) |
| 6848 |
|
define title of isomorphic variables according to the current config. |
| 6849 |
|
o pkg/thsice with pkg/seaice dynamics: |
| 6850 |
|
- fix domain of computation (interior only, required for exf) and do exchanges |
| 6851 |
|
- seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient |
| 6852 |
|
o towards a standard way of dealing with multi-threading in MONITOR |
| 6853 |
|
and ${PKG}_MONITOR (all except ptracers_monitor) subroutines. |
| 6854 |
|
o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith) |
| 6855 |
|
to W momentum equation in nonhydrostatic and quasihydrostatic runs. |
| 6856 |
|
o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor. |
| 6857 |
|
o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block) |
| 6858 |
|
o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL |
| 6859 |
|
(problems ? with gradient check in bottom_ctrl_5x5 adjoint test) |
| 6860 |
|
o tracer advection: |
| 6861 |
|
- clean-up and simplify calc_common_factors.F |
| 6862 |
|
- make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer |
| 6863 |
|
advection subroutine (but still not used within DST advection S/R) |
| 6864 |
|
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
| 6865 |
|
|
| 6866 |
|
checkpoint58j_post (2006/06/15) |
| 6867 |
|
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
| 6868 |
|
from file (collects calls previously in FORWARD_STEP) |
| 6869 |
|
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
| 6870 |
|
o adjoint store dir. adjusted accordingly |
| 6871 |
|
o genmake2 |
| 6872 |
|
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
| 6873 |
|
|
| 6874 |
|
checkpoint58i_post (2006/06/14) |
| 6875 |
|
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
| 6876 |
|
on wind stress (SEAICEstressFactor defaults to 1.) |
| 6877 |
|
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
| 6878 |
|
in the_main_loop.F to avoid Pb (e.g., when running fizhi test) |
| 6879 |
|
o vector_invariant: fix highOrderVorticity(=4.th.Order) advection |
| 6880 |
|
on CS-grid: no longer loosing mass. |
| 6881 |
|
o exf & curvilinear-grid: no longer modify longitude xC & xG. |
| 6882 |
|
o pkg/ggl90: fix sloppy output and fix a bug |
| 6883 |
|
o pkg/seaice: added SEAICEuseEVPpickup parameter |
| 6884 |
|
- Set to false in order to start EVP solver with |
| 6885 |
|
non-EVP pickup files when using SEAICEuseEVP |
| 6886 |
|
- fix sign error in diffusion in seaice_calc_rhs |
| 6887 |
|
|
| 6888 |
|
checkpoint58h_post (2006/06/07) |
| 6889 |
|
* Modifications for bottom topography control |
| 6890 |
|
o replace hFacC by _hFacC at various places |
| 6891 |
|
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
| 6892 |
|
o add non-self-adjoint cg2d_nsa |
| 6893 |
|
o update autodiff support routines |
| 6894 |
|
o re-initialise hfac after ctrl_depth_ini |
| 6895 |
|
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
| 6896 |
|
* Adding verification for 5x5 box (4-layer) bottom topography control |
| 6897 |
|
|
| 6898 |
|
checkpoint58g_post (2006/06/07) |
| 6899 |
|
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
| 6900 |
|
used for mean seasonal cycle, mean diurnal cycle); add an example |
| 6901 |
|
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
| 6902 |
|
o pkg/ggl90: |
| 6903 |
|
- add parameter (minimum surface kinetic energy) |
| 6904 |
|
- fix bug (avoiding division by zero) |
| 6905 |
|
o couple pkg/thsice to pkg/seaice: |
| 6906 |
|
- modify advection in seaice to accomodate new scalar fields to be advected |
| 6907 |
|
- only muliDimAdection scheme work with seaice/thsice |
| 6908 |
|
- mapping of thsice-variables to seaice-variables, back and forth |
| 6909 |
|
- does not break the verification experiments, but does not give the |
| 6910 |
|
desired results either |
| 6911 |
|
o pkg/seaice |
| 6912 |
|
- make (default) second order advection a bit less confusing? |
| 6913 |
|
|
| 6914 |
|
checkpoint58f_post (2006/06/05) |
| 6915 |
|
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
| 6916 |
|
to pkg/seaice): |
| 6917 |
|
- new routines thsice_map_exf and thsice_get_exf provide the interface |
| 6918 |
|
- add an additional formal parameter to thsice_solve4temp |
| 6919 |
|
o pkg/exf: |
| 6920 |
|
- add new fields wspeed, snowprecip (to be able to couple to thsice) |
| 6921 |
|
- correct Stefan-Boltzmann constant |
| 6922 |
|
- new parameter for longwave surface emittance |
| 6923 |
|
- separate some stuff from exf_bulkformulae into new routines |
| 6924 |
|
exf_radiation, exf_wind |
| 6925 |
|
- add new parameters and constants: longwave emissivity for ocean, ice |
| 6926 |
|
and snow, evaporation parameters over ice |
| 6927 |
|
- decouple wind/stress computation from ALLOW_BULKFORMULA: always compute |
| 6928 |
|
either wind from stress or stress from wind |
| 6929 |
|
o pkg/thSIce: |
| 6930 |
|
- split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F |
| 6931 |
|
- put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND |
| 6932 |
|
and THSICE_CALC_THICKN |
| 6933 |
|
- for now, call to THSICE_GET_BULKF remains inside i,j loops. |
| 6934 |
|
- add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h |
| 6935 |
|
to make debugging easier. |
| 6936 |
|
- affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output |
| 6937 |
|
o pkg/bulk_force: |
| 6938 |
|
- clean-up comments and parameters ; |
| 6939 |
|
- add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ; |
| 6940 |
|
o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched; |
| 6941 |
|
generate new output for test-experiment: aim.5l_cs.thSI |
| 6942 |
|
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
| 6943 |
|
testreport accordingly |
| 6944 |
|
|
| 6945 |
|
checkpoint58e_post (2006/05/17) |
| 6946 |
|
o SEAICE_CGRID adjoint done |
| 6947 |
|
o R_STAR adjoint implemented. |
| 6948 |
|
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
| 6949 |
|
* need to sort out init. of h0facc, etc. |
| 6950 |
|
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
| 6951 |
|
to be able to use it in pure forward. |
| 6952 |
|
|
| 6953 |
|
checkpoint58d_post (2006/04/21) |
| 6954 |
|
o upgrade simple test-experiment to tutorial example: |
| 6955 |
|
step.1: duplicate the experiment and (step.2) will remove the old copy. |
| 6956 |
|
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
| 6957 |
|
tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere) |
| 6958 |
|
tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation) |
| 6959 |
|
tutorial_global_oce_biogeo <- copy of dic_example |
| 6960 |
|
tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection) |
| 6961 |
|
tutorial_plume_on_slope <- copy of plume_on_slope |
| 6962 |
|
tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity) |
| 6963 |
|
tutorial_global_oce_optim <- empty for now (David ?) |
| 6964 |
|
tutorial_global_oce_in_p <- copy of global_ocean_pressure |
| 6965 |
|
some tutorials (R1) were already checked-in under tutorial_examples in release1_branch |
| 6966 |
|
o correct a sign problem in cost_scat.F |
| 6967 |
|
o obcs and ptracers: fix boundary conditions for advections schemes |
| 6968 |
|
with larger stencil |
| 6969 |
|
o thsice adjoint: start |
| 6970 |
|
o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for |
| 6971 |
|
completeness |
| 6972 |
|
o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING |
| 6973 |
|
and COSINEMETH_III, add comments in default CPP_OPTIONS.h |
| 6974 |
|
o ptracers adjoint: |
| 6975 |
|
* avoid extensive recomputatations |
| 6976 |
|
* fix missing re-init. of gptr (missed by TAF) |
| 6977 |
|
o obcs: add a flag (OBCSprintDiags, defaults is true) that allows |
| 6978 |
|
me to turn off the excessive output to STDOUT that this package produces |
| 6979 |
|
o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common |
| 6980 |
|
and add those terms in Vector-Invariant formulation. |
| 6981 |
|
o in ctrl pkg, if ALLOW_CAL, use monthly mean controls |
| 6982 |
|
if the control period (xx_hfluxperiod etc) is 0 |
| 6983 |
|
o in profiles pkg, clean routines and fix details |
| 6984 |
|
o in ecco pkg, reading ssh data: |
| 6985 |
|
fix problem in case the model does not start at iter0=0 |
| 6986 |
|
o fix mnc-pickup/restart for ptracers |
| 6987 |
|
o new package prifiles: |
| 6988 |
|
code to compute profile-based cost by Gael Forget |
| 6989 |
|
(modifs in ecco, ctrl, autodiff) |
| 6990 |
|
o Benign bug fix in initialization (spotted by M. Mazloff) of |
| 6991 |
|
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
| 6992 |
|
|
| 6993 |
|
checkpoint58c_post (2006/03/23) |
| 6994 |
|
o adjoint: finish NLFS adjoint and provide reference output in |
| 6995 |
|
verification/global_ocean.90x40x15/results_ad_nlfs |
| 6996 |
|
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
| 6997 |
|
documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in |
| 6998 |
|
SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only |
| 6999 |
|
with SEAICE_CGRID defined. |
| 7000 |
|
o move calendarDumps from "data" to "data.cal" and clean-up the code |
| 7001 |
|
with a simple call to pkg/cal S/R: CAL_TIME2WRITE |
| 7002 |
|
o add useEXF & useCAL flags (for now, set in hard-coded way) |
| 7003 |
|
o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum |
| 7004 |
|
(were missing in NH mode, and wrong in quasihydrostatic mode). |
| 7005 |
|
waiting for Chris updated version of calc_gw to add those CALLs. |
| 7006 |
|
o fix bug in quasihydrostatic S/R ; |
| 7007 |
|
add a test for this option: global_ocean.90x40x15.qshyd |
| 7008 |
|
o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs. |
| 7009 |
|
(called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS) |
| 7010 |
|
o add on/off flag useOffLine for package OFFLINE |
| 7011 |
|
o seaice: |
| 7012 |
|
- modify advection so that it works also on the C-grid |
| 7013 |
|
- extend loop ranges in seaice_lsr and seaice_dynsolver; fixes |
| 7014 |
|
problem in multi-tile runs with C-grid |
| 7015 |
|
- add flags for clipping ice velocities and/or masking solver forcing |
| 7016 |
|
- fix drag (ocean on ice) formulation and a bug that caused noise in the |
| 7017 |
|
C-grid solver |
| 7018 |
|
- added a few comments to seaice_diffusion.F |
| 7019 |
|
- separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V |
| 7020 |
|
are now exclusive) |
| 7021 |
|
- add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which |
| 7022 |
|
required re-ordering the code a little: |
| 7023 |
|
+ make DAIRN global variable (defined in SEAICE) |
| 7024 |
|
+ move computation of the viscosities eta and zeta into a new separate |
| 7025 |
|
routine (because I need to recompute them in seaice_ocean_stress.F) |
| 7026 |
|
|
| 7027 |
|
checkpoint58b_post (2006/03/13) |
| 7028 |
|
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
| 7029 |
|
update output.txt of exp. aim.5l_cs.thSI |
| 7030 |
|
o various mnc cleanups and improvements: |
| 7031 |
|
+ shrink lookup tables by factor of ~4 |
| 7032 |
|
+ better error reporting when running out of lookup space |
| 7033 |
|
+ able to handle longer path/file names (up to 500 chars) |
| 7034 |
|
o adjoint: |
| 7035 |
|
- Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations. |
| 7036 |
|
- TBD: "hidden" mom_vecinv recomp. in dynamics |
| 7037 |
|
o change forcing_In_AB to affects both T,S forcing and Momentum forcing |
| 7038 |
|
(allow to differentiate between forcing components using new integer flags: |
| 7039 |
|
momForcingOutAB=1/0 & tracForcingOutAB=1/0) |
| 7040 |
|
and add new flag to put Dissipation tendency out of Adams-Bashforth. |
| 7041 |
|
o ecco |
| 7042 |
|
- enable trend removal from SSH anomaly obs. |
| 7043 |
|
o adjoint |
| 7044 |
|
- a fix for PmEpR when #undef EXACT_CONSERV |
| 7045 |
|
- fix of "hidden" recomp. in thermodynamics (no TAF warnings) |
| 7046 |
|
- try to fix "hidden" recomp. in forward_step for NLFS |
| 7047 |
|
(NLFS seems broken sometimes after I checked it in) |
| 7048 |
|
o seaice: |
| 7049 |
|
- add c-grid version of the dynamic solver: |
| 7050 |
|
+ three new routines that are the c-grid substitute lsr, dynsolver |
| 7051 |
|
and ostres |
| 7052 |
|
+ put a few fields that were local to dynsolver into global common |
| 7053 |
|
blocks, so that I can move the computation of stresses etc into |
| 7054 |
|
seaice_lsr (saves coding but may break the adjoint). |
| 7055 |
|
- replace more hardwired parameters by runtime parameters |
| 7056 |
|
- add ice masks that mask the rhs of the implicit solvers where there |
| 7057 |
|
is no ice (commented out in seaice_dynsolver, because i am not sure |
| 7058 |
|
if this works properly), eventually this should replace the clipping |
| 7059 |
|
of ice velocities in seaice_dynsolver to +/-40cm/s. |
| 7060 |
|
o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly |
| 7061 |
|
include it only where its needed |
| 7062 |
|
o move balancing of fluxes before the call of external_forcing_surf |
| 7063 |
|
o seaice: |
| 7064 |
|
- correct units of turning angles (now they are really in degrees) |
| 7065 |
|
- move computation of GWATX/Y out of main routine into dynsolver |
| 7066 |
|
- initialize GWATX/Y in seaice_init |
| 7067 |
|
o Apply mask on Fresh-Water flux (needed for SSH forcing). |
| 7068 |
|
update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual) |
| 7069 |
|
o seaice: add runtime flags for turning angles (default to zero) |
| 7070 |
|
o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean |
| 7071 |
|
and trend from exf forcing and ctrl control adjustments |
| 7072 |
|
o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF |
| 7073 |
|
(since checkpoint57x_post) |
| 7074 |
|
o change the default rotation period to 86164.s = the Earth rotation |
| 7075 |
|
o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T) |
| 7076 |
|
and based on a reference stratification. Tested within hs94.cs-32x32x5. |
| 7077 |
|
o seaice advection: add code for choosing between the default (2nd order |
| 7078 |
|
central differences) and multiDim advection schemes provided by |
| 7079 |
|
pkg/generic_advdiff |
| 7080 |
|
o seaice: |
| 7081 |
|
- removed all references to SEAICE_GRID.h fields from |
| 7082 |
|
dynsolver, advect, diffus, lsr, without changing the results of lab_sea |
| 7083 |
|
(cubed-sphere configuration will change a little) |
| 7084 |
|
- grid computations in seaice_init are obsolete now. |
| 7085 |
|
- cleaned up code a little so that is easier to read (hopefully). |
| 7086 |
|
- added new (better?) discretizations of default advection and diffusion |
| 7087 |
|
(turn on with SEAICEuseFluxForm) |
| 7088 |
|
- replace 1 in 3d global fields by kSurface in growth.F |
| 7089 |
|
|
| 7090 |
|
checkpoint58a_post (2006/02/13) |
| 7091 |
|
o seaice: |
| 7092 |
|
- bug fix in advect.F |
| 7093 |
|
o shelfice: |
| 7094 |
|
- separate shelfice load anomaly from pload (breaks with time |
| 7095 |
|
dependent forcing), => introduce constant field shelficeLoadAnomaly. |
| 7096 |
|
Its default is 0., but it may be computed more cleverly from (unknown) |
| 7097 |
|
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be |
| 7098 |
|
done offline. A good approximation of the pressure load anomaly is |
| 7099 |
|
necessary to avoid large initial adjustment processes underneath |
| 7100 |
|
deep-reaching shelfice. |
| 7101 |
|
- small fix in ISOMIP shelfice_thermodynamics |
| 7102 |
|
- add more sophisticated thermodynamics of Hellmer (1989), this is |
| 7103 |
|
now the default |
| 7104 |
|
- give a few constants more intuitive names |
| 7105 |
|
o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful |
| 7106 |
|
if bulk formulae are used in long integration (especially EmPmR). Turn |
| 7107 |
|
on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01 |
| 7108 |
|
if balancePrintMean, the imbalance that is substracted is printed to |
| 7109 |
|
STDOUT. |
| 7110 |
|
o fix bug (typo) in obcs_apply_eta.F |
| 7111 |
|
o add a new package shelfice which enables us to model the circulation |
| 7112 |
|
underneath shelf-ice with draughts of hundreds of meters. |
| 7113 |
|
- works |
| 7114 |
|
- to do: + include improved thermodynamics |
| 7115 |
|
+ check whether kSurfC (from model/inc/SURFACE.h) can be used |
| 7116 |
|
instead of new field kTopC |
| 7117 |
|
+ can we use topoFile, Ro_surf and existing code in ini_depth.F |
| 7118 |
|
instead of new field R_shelfIce and new code in ini_depth.F |
| 7119 |
|
and ini_mask_etc.F? |
| 7120 |
|
+ adjust vertical mixing schemes? |
| 7121 |
|
o seaice pkg: |
| 7122 |
|
- add a cpp-flag to include a simple formula for a salinity dependent |
| 7123 |
|
freezing point of sea water at the surface |
| 7124 |
|
- change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and |
| 7125 |
|
meridional stresses are now different (and hopefully correct) |
| 7126 |
|
o AIM pkg: change threshold on large-scale condensation to conserve Heat. |
| 7127 |
|
update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics |
| 7128 |
|
and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG) |
| 7129 |
|
o pkg/diagnostics: add options and parameters for regional-statistics |
| 7130 |
|
diagnostics ; define regions by reading a region-mask from a file |
| 7131 |
|
(might add other options later) |
| 7132 |
|
o pkg/bulk_force: |
| 7133 |
|
- add option and parameters to use AIM surface-flux formulae. |
| 7134 |
|
- Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ; |
| 7135 |
|
others forcing fields (defined in PARM05, parameter file "data") are loaded |
| 7136 |
|
from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F). |
| 7137 |
|
- initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F |
| 7138 |
|
- use the right EXCH call for uwind,vwind (to work on CS-grid). |
| 7139 |
|
- re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h) |
| 7140 |
|
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
| 7141 |
|
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
| 7142 |
|
|
| 7143 |
|
checkpoint58 (2006/01/12) |
| 7144 |
|
o add "--embed-source" option to genmake2 which, when the supporting |
| 7145 |
|
tools can be compiled (as determined by genmake2) will turn on the |
| 7146 |
|
embed_files package which then embeds the entire MITgcm source code |
| 7147 |
|
(*.[fFhc] + Makefile) used for the build within the executable |
| 7148 |
|
- requested by CNH but off by default |
| 7149 |
|
- adds a paltry <9MB to the mitgcmuv executable in most cases |
| 7150 |
|
- only writes the output when useEMBEDSRC in eedata is true |
| 7151 |
|
o clean up 3-dim. relaxation codes: |
| 7152 |
|
* Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec |
| 7153 |
|
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
| 7154 |
|
* Thanks to Tom Haine for testing! |
| 7155 |
|
|
| 7156 |
|
checkpoint57z_post (2005/12/31) |
| 7157 |
|
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
| 7158 |
|
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
| 7159 |
|
o fix the pickup behavior for obcs in combination with ptracers |
| 7160 |
|
o fix a bug in ptracers_external_fields_load |
| 7161 |
|
o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...) |
| 7162 |
|
affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!) |
| 7163 |
|
o transfered surface NH pressure to eta field (if exactConserv). |
| 7164 |
|
o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign) |
| 7165 |
|
and update lab_sea output.txt file. |
| 7166 |
|
o completing 3-dim. relaxation code: additional term |
| 7167 |
|
1/tau*( theta(i,j,k) - thetaStar(i,j,k) ) |
| 7168 |
|
in S/R EXTERNAL_FORCING_T (file external_forcing.F) |
| 7169 |
|
* At compile time, in "EXF_OPTIONS.h" set |
| 7170 |
|
#define ALLOW_CLIMTEMP_RELAXATION |
| 7171 |
|
#define ALLOW_CLIMSALT_RELAXATION |
| 7172 |
|
* At runtime in "data", under &PARM03 set (e.g., units in seconds) |
| 7173 |
|
tauThetaClimRelax3Dim = 15552000.0, |
| 7174 |
|
tauSaltClimRelax3Dim = 15552000.0, |
| 7175 |
|
* 3 cases: |
| 7176 |
|
1) Use a constant-in-time 3-dim. field |
| 7177 |
|
2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec. |
| 7178 |
|
3) Real-time relax. to time-evolving prescribed field |
| 7179 |
|
o Adding Laplacian-type smoothness constraint on |
| 7180 |
|
initial and boundary (forcing) controls (ic, bc) |
| 7181 |
|
* enable at compile-time via |
| 7182 |
|
ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION |
| 7183 |
|
* enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1 |
| 7184 |
|
* Absolute scale somewhat unclear so far |
| 7185 |
|
* no area weighting was included since no other cost term does so far |
| 7186 |
|
|
| 7187 |
|
checkpoint57y_post (2005/12/08) |
| 7188 |
|
First step for a NLFS adjoint |
| 7189 |
|
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
| 7190 |
|
o new init. routines for calc_r_star, calc_surf_dr |
| 7191 |
|
o still need to deal with ini_masks_etc |
| 7192 |
|
o testreport seemed happy |
| 7193 |
|
checkpoint57y_pre (2005/12/08) |
| 7194 |
|
|
| 7195 |
|
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
| 7196 |
|
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
| 7197 |
|
o add new offset feature to offline pkg (plus minor cleanup) |
| 7198 |
|
o cfc fixes for final year of integration |
| 7199 |
|
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
| 7200 |
|
be in GCHEM_OPTIONS). |
| 7201 |
|
|
| 7202 |
|
checkpoint57x_post (2005/12/04) |
| 7203 |
|
o fix testreport Pb in multiple test experiment. |
| 7204 |
|
o cleanup our namelist syntax in verification: |
| 7205 |
|
- make it more F95 standards compliant (some work still needed) |
| 7206 |
|
- allows the vast majority of our tests to work with gfortran |
| 7207 |
|
o Non-Hydrostatic: |
| 7208 |
|
- put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h |
| 7209 |
|
- fix exchange calls for CS-grid using the new EXCH_S3D_RL. |
| 7210 |
|
o Allow to apply AB on T,S rather than on AB(gT,gS): |
| 7211 |
|
- implemented within #ifdef ALLOW_ADAMSBASHFORTH_3 |
| 7212 |
|
- use the same arrays (gtNm,gsNm) to hold tracer field at previous |
| 7213 |
|
time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)). |
| 7214 |
|
- need a "clever" read_pickup to restart from the other AB formulation |
| 7215 |
|
o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h |
| 7216 |
|
o remove some unused variables (reduces number of compiler warnings) |
| 7217 |
|
o adjoint |
| 7218 |
|
* Disable useVariableViscosity for adjoint for time being |
| 7219 |
|
(there are a number of extensive recomputations) |
| 7220 |
|
* Initialize certain variables needed for adjoint |
| 7221 |
|
|
| 7222 |
|
checkpoint57w_post (2005/11/03) |
| 7223 |
|
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
| 7224 |
|
fix the singleCpuIO RS version of MDSWRITEFIELD |
| 7225 |
|
and add a WARNING if using globalFiles=T with multi-processors. |
| 7226 |
|
o write grid-file(s) in only one format (MDS or MNC): default=MNC (if |
| 7227 |
|
using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc |
| 7228 |
|
o tracer advection scheme: |
| 7229 |
|
add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get |
| 7230 |
|
those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile, |
| 7231 |
|
was not very convenient). |
| 7232 |
|
add implicit version for DST-3 & DST3_Flux_Limit vertical advection; |
| 7233 |
|
(further tests needed for the implicit DST & Flux-Limiter schemes). |
| 7234 |
|
o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef |
| 7235 |
|
and sRef for convenience, handy, when you want to initialize |
| 7236 |
|
ptracers in a large domain with a constant non-zero value. Also, |
| 7237 |
|
untangle ptracers_init.F a little. |
| 7238 |
|
|
| 7239 |
|
checkpoint57v_post (2005/10/13) |
| 7240 |
|
o change dome exp. to use variable viscosity in side-drag terms. |
| 7241 |
|
o remove all the files from the cfc_offline test since they are now |
| 7242 |
|
incorporated into tutorial_cfc_offline which has been producing |
| 7243 |
|
identical results for a few days of testing |
| 7244 |
|
o add new parameter: sideDragFactor to enable half-slip-side BC |
| 7245 |
|
and change side-drag S/R to use viscosity from mom_calc_visc |
| 7246 |
|
(can switch back by setting sideDragFactor=0.); affects results at |
| 7247 |
|
truncation level; regenerate output for exp.: global_ocean.cs32x10(x3), |
| 7248 |
|
global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5). |
| 7249 |
|
o vorticity & strain are now computed without masking, to account for |
| 7250 |
|
no-slip-side BC in variable viscosity calculation ; mask is applied |
| 7251 |
|
anyway later on, before computing advection/coriolis terms. |
| 7252 |
|
o modify exp4 to test new obcs support for reading from external files |
| 7253 |
|
and for passive tracers |
| 7254 |
|
o fix behavior of ptracers_monitor when monitor output is written to a |
| 7255 |
|
netcdf-file; still not independent of monitor.F (writes in the same |
| 7256 |
|
file). |
| 7257 |
|
o change default value of tRef (put a uniform, meaningful value for ocean |
| 7258 |
|
& atmos) and initialize sRef (was missing, as Martin mentioned). |
| 7259 |
|
o Redefine viscC?Leith*. Change the coefficients of Leith viscosity |
| 7260 |
|
to be proportional to enstrophy dissipation length. Thus, |
| 7261 |
|
viscC?leith?_new=pi*(viscC?leith?_old)^(1/3) |
| 7262 |
|
This is now consistent with Smagorinsky and with the manual. |
| 7263 |
|
|
| 7264 |
|
checkpoint57u_post |
| 7265 |
|
o OBCS and PTRACERS: add open boundary support for passive tracers |
| 7266 |
|
- either use homogenous (pseudo) v.Neumann conditions or prescribe |
| 7267 |
|
OB-values from file; this is not different from the way theta and salinity |
| 7268 |
|
are treated |
| 7269 |
|
- however, Orlanski-radiation conditions are not supported, and the model |
| 7270 |
|
will stop if you use pTracers and Orlanski at the same time. |
| 7271 |
|
- beefed up the rountine obcs_external_fields_load: now only those open |
| 7272 |
|
boundary values are overwritten with values from files for which there |
| 7273 |
|
are really files, otherwise the OB-fields remain untouched. This makes |
| 7274 |
|
it possible to use different OBs at different ends of the domain (as |
| 7275 |
|
with EXF) |
| 7276 |
|
o reduce number of exch calls in shap_filt (s2). |
| 7277 |
|
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
| 7278 |
|
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
| 7279 |
|
|
| 7280 |
|
checkpoint57t_post (2005/10/03) |
| 7281 |
|
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
| 7282 |
|
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
| 7283 |
|
same truncation, independent of the face number: affects affects several |
| 7284 |
|
test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5). |
| 7285 |
|
o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times); |
| 7286 |
|
note that biharmonic viscosity + no-slip was not tested in any experiment. |
| 7287 |
|
o fix bug in non-linear free-surf side-drag ; generate new output for |
| 7288 |
|
global_ocean.cs32x15(+.thsice) & global_ocean_pressure. |
| 7289 |
|
o make mnc honor the writeBinaryPrec flag for most kinds of output |
| 7290 |
|
o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum |
| 7291 |
|
o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation |
| 7292 |
|
error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5). |
| 7293 |
|
o add brackets in multi-terms sum to get same truncation, independent of |
| 7294 |
|
the face number (manage to get exactly same value of gU,gV at the cs-edge) |
| 7295 |
|
affects several test. exp. Update global_ocean.cs32x15 (+.thsice). |
| 7296 |
|
o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax |
| 7297 |
|
and viscA4Remax, which allow one to limit the minimum viscosity by specifying |
| 7298 |
|
a maximum grid-scale Reynolds number. Also, changes all length calculations |
| 7299 |
|
in the case of grid anisotropy to geometric mean of dx**2 and dy**2. |
| 7300 |
|
Suggested values of viscosity parameters found in mom_calc_visc. |
| 7301 |
|
Many new viscosity diagnostics available. |
| 7302 |
|
|
| 7303 |
|
checkpoint57s_post (2005/09/20) |
| 7304 |
|
o Add clearing-house for viscosity calculations, mom_calc_visc and |
| 7305 |
|
correct numerous bugs in LeithD and Smagorinsky discretizations. |
| 7306 |
|
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
| 7307 |
|
used simultaneously, and to be used in mom_vecinv and mom_fluxform. |
| 7308 |
|
Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F) |
| 7309 |
|
and with Strain-Tension viscous term calculation (mom_hdissip.F). |
| 7310 |
|
The Strain-Tension form is now called with useStrainTensonVisc=.true. |
| 7311 |
|
ViscAhStrain and viscAhTension are now retired. |
| 7312 |
|
o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4". |
| 7313 |
|
o In response to JMC's bug report, genmake2 now ignores any soft-links |
| 7314 |
|
that it finds in the *current* directory when searching for files. |
| 7315 |
|
Soft-links found in any other source directories will still work as |
| 7316 |
|
they did before. |
| 7317 |
|
o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls |
| 7318 |
|
a C routine to unlimit the stack size |
| 7319 |
|
o mnc-ify pkg/aim snapshot vars |
| 7320 |
|
o mnc-ify pkg/land as requested by Daniel |
| 7321 |
|
o various changes to mnc including: |
| 7322 |
|
- all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format |
| 7323 |
|
- output can now be grouped so that all files within a group |
| 7324 |
|
change the ITER portion of their names in lock-step together |
| 7325 |
|
- can now read ("global") PER-FACE (in addition to PER-TILE) files |
| 7326 |
|
and works with both EXCH1 and EXCH2 (but needs more testing) |
| 7327 |
|
- writing works for all verification test cases w/ g77 on Linux |
| 7328 |
|
|
| 7329 |
|
checkpoint57r_post (2005/09/07) |
| 7330 |
|
o make MNC variable initialization happen earlier |
| 7331 |
|
o add diagnostics for (almost) each term of the momentum Eq. |
| 7332 |
|
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
| 7333 |
|
o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups) |
| 7334 |
|
o remove MINIMAL_TAVE_OUTPUT option ; |
| 7335 |
|
add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT). |
| 7336 |
|
o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src |
| 7337 |
|
allows to compile without pkg/mdsio (& test successfully hs94.1x64x5) |
| 7338 |
|
o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice) |
| 7339 |
|
o add time-dependent SST, SSS control |
| 7340 |
|
o cost terms in ecco/ modularized (new cost_generic.F) |
| 7341 |
|
o cost_averages routines are modularized (new cost_averagesgeneric.F) |
| 7342 |
|
o new infrastructure for seaice model vs. obs misfits in seaice/ |
| 7343 |
|
* driver from the_main_loop.F is seaice_cost_driver.F |
| 7344 |
|
* first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA) |
| 7345 |
|
* gradient check in Exp. 6a of natl_box_adjoint/ |
| 7346 |
|
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
| 7347 |
|
(see README file) |
| 7348 |
|
|
| 7349 |
|
checkpoint57q_post (2005/08/19) |
| 7350 |
|
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
| 7351 |
|
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
| 7352 |
|
- bug was reported by Jean-Michel and Ian Fenty |
| 7353 |
|
o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F) |
| 7354 |
|
update exp. cpl_aim+ocn output. |
| 7355 |
|
o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT |
| 7356 |
|
Needed for high-res. runs with large global files |
| 7357 |
|
to be able to limit tapelev size |
| 7358 |
|
o Changed some tests for adjoint: |
| 7359 |
|
* carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT |
| 7360 |
|
* natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT |
| 7361 |
|
* global_ocean.90x40x15/ back to default 3-level checkpointing |
| 7362 |
|
o Modifications to enable scripted COMMON to MODULE conversion |
| 7363 |
|
* verification/OpenAD/code/ has necessary scripts and description; |
| 7364 |
|
* converts, compiles and runs successfully; |
| 7365 |
|
|
| 7366 |
|
checkpoint57p_post (2005/08/01) |
| 7367 |
|
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
| 7368 |
|
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
| 7369 |
|
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
| 7370 |
|
o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP) |
| 7371 |
|
o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F |
| 7372 |
|
(was already the case for dissipation with mom_vecinv, |
| 7373 |
|
and also the case for grad.PhiHyd when staggered-timeStep) |
| 7374 |
|
This will allow to put dissipation out-off the AB time-stepping. |
| 7375 |
|
Unfortunately, affects truncation error. Update output of exp. that "fails" |
| 7376 |
|
(cg2d matching number) and leave the others for later: front_relax(10), |
| 7377 |
|
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
| 7378 |
|
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
| 7379 |
|
|
| 7380 |
|
checkpoint57o_post (2005/07/30) |
| 7381 |
|
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
| 7382 |
|
(2) its ready to be documented during the 20050801 DocFest |
| 7383 |
|
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
| 7384 |
|
for ideal_2D_oce and lab_sea on linux_ia32_g77 |
| 7385 |
|
o set to #undef CTRL_SET_OLD_MAXCVARS_30 |
| 7386 |
|
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
| 7387 |
|
(worth another tag) |
| 7388 |
|
|
| 7389 |
|
checkpoint57n_post (2005/07/29) |
| 7390 |
|
o adding precip control xx_precip 32 |
| 7391 |
|
o adding swflux control xx_swflux 33 |
| 7392 |
|
o Replacing 10 forcing penalty cost routines by 1 generic. |
| 7393 |
|
o Implementing partitioning in time-mean and variable adjustment |
| 7394 |
|
for atmos. state. |
| 7395 |
|
o Time-mean constant error is now read in data.ecco (instead of hard-coded) |
| 7396 |
|
o in natl_box_adjoint: |
| 7397 |
|
* updated exp 1 to 10 |
| 7398 |
|
(but does not have time-mean vs. variable split results yet) |
| 7399 |
|
o updated global1x1/*_seaice_adj/ |
| 7400 |
|
to incorporate latest changes |
| 7401 |
|
o enable useSingleCpuIO for mdsio vector routines |
| 7402 |
|
(applies in particular to tapelev I/O) |
| 7403 |
|
o removed inefficient K-loop in all active_file*control*.F |
| 7404 |
|
|
| 7405 |
|
checkpoint57m_post (2005/07/28) |
| 7406 |
|
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
| 7407 |
|
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
| 7408 |
|
o pkg/exch2: filling of face-corner halo regions is optional |
| 7409 |
|
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
| 7410 |
|
|
| 7411 |
|
checkpoint57l_post (2005/07/14) |
| 7412 |
|
tag before updating tutorials (pre-release-2) |
| 7413 |
|
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
| 7414 |
|
for output and interpolation of input fields onto model grid) |
| 7415 |
|
o fix radius in mom_v_metric_cylinder.F (wrong by dy/2). |
| 7416 |
|
Affects results of exp. rotating_tank ; update output.txt. |
| 7417 |
|
o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor |
| 7418 |
|
and taking the square quantity and/or using a fraction-weight field. |
| 7419 |
|
o fix aim_diagnostics_init.F mate numbers. |
| 7420 |
|
o add mnc output capability to diagnostics/diagstat and update |
| 7421 |
|
our cvsignore files for the ACSII output generated |
| 7422 |
|
|
| 7423 |
|
checkpoint57k_post (2005/07/02) |
| 7424 |
|
o lab_sea now uses diagnostics package and provides a suite of |
| 7425 |
|
new EXF diagnostics output. |
| 7426 |
|
|
| 7427 |
|
checkpoint57j_post (2005/06/30) |
| 7428 |
|
o exf |
| 7429 |
|
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
| 7430 |
|
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
| 7431 |
|
terms -2*ATAN(x) + pi/2 were added to both stable and unstable case. |
| 7432 |
|
* extended diagnostics output |
| 7433 |
|
- now includes all EXF variables |
| 7434 |
|
- hs, hl moved to common block |
| 7435 |
|
- separate S/R for diagnostics, called after ctrl vector is added |
| 7436 |
|
- name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet |
| 7437 |
|
- EXFqnet contains true Qnet (i.e. includes qsw) |
| 7438 |
|
* updated verif. lab_sea, global_with_exf |
| 7439 |
|
* Rearranging hflux (exf_mapfields -> exf_getforcing) |
| 7440 |
|
to ensure that diagnostics sees a true EXFqnet |
| 7441 |
|
o add matlab scripts for CS-grid vectors (in utils/cs_grid) |
| 7442 |
|
o diagnostics pkg: change pointers so that 1 diagnostic can be used |
| 7443 |
|
several times with different frequencies. |
| 7444 |
|
o mnc-ify the thsice package as requested by Daniel Enderton |
| 7445 |
|
- the monitor--MNC output needs work |
| 7446 |
|
- many attributes need to be added (most are currently blank) |
| 7447 |
|
o mnc-ify theaim_v23 package as requested by Daniel Enderton |
| 7448 |
|
- many attributes need to be added (most are currently blank) |
| 7449 |
|
o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign) |
| 7450 |
|
o add Sadourny like discretization to the 4th.O vorticity advection scheme |
| 7451 |
|
o fix bug in rStar code (calc_r_star.F) when used with topo/bathy. |
| 7452 |
|
update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn, |
| 7453 |
|
fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice). |
| 7454 |
|
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
| 7455 |
|
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
| 7456 |
|
|
| 7457 |
|
checkpoint57i_post (2005/06/19) |
| 7458 |
|
o Diagnostics package was changed: diagnostic allocation is now deactivated |
| 7459 |
|
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
| 7460 |
|
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
| 7461 |
|
add 1rst Order upwind vertical Shear. |
| 7462 |
|
o add a quick fix for A/B checkpointing in OFFLINE mode |
| 7463 |
|
o add IGNORE_TIME define and -ignore_time option to genmake2 as an |
| 7464 |
|
end-run around the C/Fortran linking horror in eesup/src/timers.F |
| 7465 |
|
o added pkg/runclock: allows user to terminate run based on wall clock |
| 7466 |
|
o added non-hydrostatic scaling parameter: nh_am2 |
| 7467 |
|
o pkg/my82: futile attempt to make results compiler-independent by adding |
| 7468 |
|
some "_d 0", etc. no effect. |
| 7469 |
|
o for mnc output, fill the 'T' coordinate var with myTime and create a |
| 7470 |
|
separate 'iter' variable for iteration count |
| 7471 |
|
o pkg/diagnostics: |
| 7472 |
|
add new capability: output of Global/Regional & per-level statistics ; |
| 7473 |
|
tested against monitor output (including land & thSIce) on various exp. |
| 7474 |
|
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
| 7475 |
|
|
| 7476 |
|
checkpoint57h_done (2005/05/19) |
| 7477 |
|
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
| 7478 |
|
data.diagnostics, data.gchem, data.ptracers) is done. |
| 7479 |
|
|
| 7480 |
|
o pkg/diagnostics: prepare for Global/Regional statistics. |
| 7481 |
|
add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h |
| 7482 |
|
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
| 7483 |
|
and rename it: DIFFERENT_MULTIPLE |
| 7484 |
|
|
| 7485 |
|
checkpoint57h_post (2005/05/14) |
| 7486 |
|
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
| 7487 |
|
o pkg/diagnostics: change output frequency, now in seconds (instead |
| 7488 |
|
of Nb of iterations). This requires to change data.diagnostics. |
| 7489 |
|
checkpoint57h_pre (2005/05/12) |
| 7490 |
|
|
| 7491 |
|
o in mnc, let the user create the output dir if both mnc_outdir_date |
| 7492 |
|
and mnc_outdir_num are false |
| 7493 |
|
o add fflags() to pkg/diagnostics which allows one to specify, on a |
| 7494 |
|
per-file basis, the file precision [default behavior is unchanged] |
| 7495 |
|
o added diagnostics to pkg/kpp, including computation of mixed layer |
| 7496 |
|
depth based on a temperature/density criterion |
| 7497 |
|
o updated verification/natl_box to test the new pkg/kpp diagnostics |
| 7498 |
|
o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T) |
| 7499 |
|
o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4) |
| 7500 |
|
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
| 7501 |
|
not mnc -- this mistake was found by JMC and is now corrected |
| 7502 |
|
|
| 7503 |
|
checkpoint57g_post (2005/04/15) |
| 7504 |
|
o add Adams-Bashforth 3rd Order time stepping: |
| 7505 |
|
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
| 7506 |
|
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
| 7507 |
|
checkpoint57g_pre (2005/04/15) |
| 7508 |
|
|
| 7509 |
|
o make lambda[Theta,Salt]ClimRelax spatially varying |
| 7510 |
|
(default remains spatially uniform constant based on tau) |
| 7511 |
|
o added new control variables |
| 7512 |
|
* init. uVel, vVel, etanN |
| 7513 |
|
* lambda[Theta,Salt]ClimRelax |
| 7514 |
|
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
| 7515 |
|
(suggested by G. Forget) |
| 7516 |
|
|
| 7517 |
|
checkpoint57f_post (2005/04/06) |
| 7518 |
|
o add parameter "baseTime" = model base time = time at iteration zero |
| 7519 |
|
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
| 7520 |
|
account for baseTime shift |
| 7521 |
|
o move Coriolis arrays from PARAMS.h to GRID.h |
| 7522 |
|
checkpoint57f_pre (2005/04/06) |
| 7523 |
|
|
| 7524 |
|
o mnc-ifying the seaice package |
| 7525 |
|
o introduced an alternative length scale calculation for use in the limiting |
| 7526 |
|
maximum viscosity (off by default, see mom_vi_hdissip.F for details) |
| 7527 |
|
o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S |
| 7528 |
|
o added modified Leith scheme with viscosity proportional to grad(Hdiv) |
| 7529 |
|
as well as grad(vort3). Made it compatible with both approximate form |
| 7530 |
|
for the cubed sphere and full form of these gradients. Added flag |
| 7531 |
|
useFullLeith to select between approximate and full form. |
| 7532 |
|
o add "d0" in getcon.F to reduce differences between compilers/platforms |
| 7533 |
|
update output.txt of exp. fizhi-gridalt-hs |
| 7534 |
|
o change port_rand funtion to allow to set the seed. |
| 7535 |
|
o fix obscure MNC bug involving conversion between reals and integers |
| 7536 |
|
- it caused no problems with certain (eg. gcc, ifc) compilers but the |
| 7537 |
|
new version is now more standards-compliant |
| 7538 |
|
o adjoint-related modifications |
| 7539 |
|
* gad_dst3_adv_?: to be able to use advscheme=30 in adjoint |
| 7540 |
|
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
| 7541 |
|
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
| 7542 |
|
|
| 7543 |
|
checkpoint57e_post (2005/02/28) |
| 7544 |
|
o Adding eddy stress controls a la Ferreira et al. |
| 7545 |
|
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
| 7546 |
|
|
| 7547 |
|
o fizhi pkg: fix AtoC and CtoA when called with same input & output array |
| 7548 |
|
update output.txt of exp. fizhi-gridalt-hs |
| 7549 |
|
o add more "Z" dimensions and associated coordinate vars to MNC |
| 7550 |
|
o pkg/exf: added twoDigitYear capability for option useExfYearlyFields |
| 7551 |
|
o parameter calendarDumps: when set, approximate months (30-31 days) and years |
| 7552 |
|
(360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq, |
| 7553 |
|
KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar |
| 7554 |
|
months and years. Requires pkg/cal. |
| 7555 |
|
o diagnostics: add pickup functionality |
| 7556 |
|
- off by default for backwards compatibility |
| 7557 |
|
- current version only uses MDSIO -- MNC will be added |
| 7558 |
|
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
| 7559 |
|
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
| 7560 |
|
|
| 7561 |
|
checkpoint57d_post (2005/02/11) |
| 7562 |
|
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
| 7563 |
|
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
| 7564 |
|
output from the diagnostics package |
| 7565 |
|
o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up |
| 7566 |
|
o make genmake2 more portable by using ".$FS" instead of ".f" for more |
| 7567 |
|
of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys) |
| 7568 |
|
o add coordinate variables to the MNC output from the diagnostics package |
| 7569 |
|
o change MNC-flags default value: true when useMNC=TRUE |
| 7570 |
|
o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F |
| 7571 |
|
the ability (off by default) to read the grid information using MNC |
| 7572 |
|
o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt |
| 7573 |
|
o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging |
| 7574 |
|
o do snap-shot diagnostics at the middle of the time-interval (instead of |
| 7575 |
|
at the end). |
| 7576 |
|
o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add |
| 7577 |
|
new test for AIM with thSIce + slab-ocean |
| 7578 |
|
o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h) |
| 7579 |
|
o move state variable diagnostics to the beginning of the time step ; |
| 7580 |
|
(note: still needs some work specially for snap-shot diagnostics) |
| 7581 |
|
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
| 7582 |
|
|
| 7583 |
|
checkpoint57c_post (2005/01/27) |
| 7584 |
|
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
| 7585 |
|
o generate new output.txt files on faulks with g77 & the new -ieee option |
| 7586 |
|
checkpoint57c_pre (2005/01/27) |
| 7587 |
|
|
| 7588 |
|
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
| 7589 |
|
update output.txt of exp. global_ocean.90x40x15 |
| 7590 |
|
o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer |
| 7591 |
|
results; update global_ocean_pressure & global_ocean.cs32x15 output.txt |
| 7592 |
|
o add saltFlux(+File) forcing capability with periodicExternalForcing |
| 7593 |
|
o allow to use pkg diagnostics for GM-Redi & ThSIce output |
| 7594 |
|
o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc. |
| 7595 |
|
o improvements for the MNC output from DIAGNOSTICS: |
| 7596 |
|
- correct handling of the unlimitied dimension |
| 7597 |
|
- all dims now have associated coordinate variables |
| 7598 |
|
- variables located at U, V, and Corner ("Z") points are now written |
| 7599 |
|
with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that |
| 7600 |
|
*all* data points are output |
| 7601 |
|
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice |
| 7602 |
|
o added pkg/seaice/seaice_monitor.F |
| 7603 |
|
o mdsio_readfield.F can now read files visible only to master MPI process. |
| 7604 |
|
o pkg/seaice: some test code for ice-modified ocean stress |
| 7605 |
|
o exf_getffields interpolation defaults to bilinear for all scalar forcing |
| 7606 |
|
fields (remains bicubic for wind velocity and stress). This avoids, e.g., |
| 7607 |
|
spurious negative numbers for precipitation and humidity. Will cause |
| 7608 |
|
some small numerical differences for integrations using pkg/exf/exf_interp.F. |
| 7609 |
|
o pkg/ctrl/ |
| 7610 |
|
* Add ctrlvec diagnostics in pack/unpack for nondimensional I/O |
| 7611 |
|
May be enabled via doPackDiag |
| 7612 |
|
* introduce z-scaling of |
| 7613 |
|
+ gradient (doZscalePack) and |
| 7614 |
|
+ control (doZscaleUnpack) |
| 7615 |
|
o pkg/mdsio/ |
| 7616 |
|
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
| 7617 |
|
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
| 7618 |
|
|
| 7619 |
|
checkpoint57b_post (2004/12/20) |
| 7620 |
|
o simplify options in diagnostics_fill arguments (remove weird combinations) |
| 7621 |
|
o fix MNC coordinate variables so that they now contain per-face index |
| 7622 |
|
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
| 7623 |
|
general, EXCH2 grids are only aligned to a "local" coordinate system |
| 7624 |
|
o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput) |
| 7625 |
|
o Implement instantaneous output within pkg diagnostics: |
| 7626 |
|
setting a negative frequency in data.diagnostics produces |
| 7627 |
|
"snap-shot" output (as opposed to time-average if freq > 0) |
| 7628 |
|
o move out off EQUIVALENCE all diagnostics that fizhi does not use ; |
| 7629 |
|
NOTE: change ptracer diagnostics name: use 2 characters to work with |
| 7630 |
|
more than 9 tracers. Add also diagnostics of advect & diffus flux. |
| 7631 |
|
o more CF compliance: convert all MNC 'iter' variables to 'T' so that it |
| 7632 |
|
becomes the coordinate variable for the 'T' dimension |
| 7633 |
|
o add CF-style coordinate variables to MNC |
| 7634 |
|
- just a first cut: numbers are meaningless on the cubesphere and |
| 7635 |
|
missing along the T axis but otherwise it works! |
| 7636 |
|
o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX |
| 7637 |
|
o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC. |
| 7638 |
|
o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon) |
| 7639 |
|
this is based directly on what the model compute, so that the content of |
| 7640 |
|
each diagnostics might be affected by switching options (e.g., implicitDiffusion) |
| 7641 |
|
o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F) |
| 7642 |
|
o clean up build options files for SunOS, in particular |
| 7643 |
|
- remove -traditional from xmakedepend |
| 7644 |
|
- change -xarch=v9 to -xarch=native for f77 |
| 7645 |
|
- restore use of make (not gmake) |
| 7646 |
|
- add CC=gcc if using g77 |
| 7647 |
|
o changes per discussion of AM, JMC, & EH3 today: |
| 7648 |
|
- move redundant "grid" variables out of "state" -- in preparation of |
| 7649 |
|
creating proper CF-style coordinate variables and in recognition |
| 7650 |
|
that any/all grid variables can be easily copied (eg. w/NCO) from |
| 7651 |
|
the grid files into any of the other NetCDF files |
| 7652 |
|
- *always* output grid variables with MDSIO (this will eventually be |
| 7653 |
|
changed) |
| 7654 |
|
- output MNC grid file if useMNC is true |
| 7655 |
|
o every instance of _END_MASTER() has been found and replaced with |
| 7656 |
|
_END_MASTER( myThid ) in order to satisfy certain picky Sun |
| 7657 |
|
preprocessors |
| 7658 |
|
o re-arrange diagnostics pkg initialisation: |
| 7659 |
|
- allow each package to extend the available diagnostics list |
| 7660 |
|
- add some checking and fix small problems (multi-threaded, ...) |
| 7661 |
|
- new S/R diagnostics_fill (replace fill_diagnostics): |
| 7662 |
|
look through the short list of active diag. (instead of the long list) |
| 7663 |
|
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
| 7664 |
|
|
| 7665 |
|
checkpoint57a_post (2004/12/10) |
| 7666 |
|
o this set of changes restores TAMC compatibility |
| 7667 |
|
tested for global_ocean.90x40x15 adjoint on trough |
| 7668 |
|
(what a pain) |
| 7669 |
|
|
| 7670 |
|
checkpoint57a_pre (2004/12/10) |
| 7671 |
|
o some modifs in tools/build_options for sunos |
| 7672 |
|
o call ctrl_pack for ctrl at end for optimcycle=0 |
| 7673 |
|
|
| 7674 |
|
checkpoint57 (2004/12/09) |
| 7675 |
|
o add horizontal bi-harmonic viscosity for vertical velocity |
| 7676 |
|
- new parameter viscA4W (defaults to viscA4) |
| 7677 |
|
- affects only non-hydrostatic code |
| 7678 |
|
- to be done: no-slip lateral boundary conditions |
| 7679 |
|
o switch back to "sflux = sflux - runoff" in exf_getforcing.F |
| 7680 |
|
o implement Implicit Vertical advection for pTracers |
| 7681 |
|
o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k) |
| 7682 |
|
(implemented also for implicit vertical diffusion & advection) |
| 7683 |
|
o OBCS: extend application of tracer open boundary conditions |
| 7684 |
|
to a strip beyond the boundary of width Olx/Oly |
| 7685 |
|
o add call monitor to TAF set of required calls (flow directives) |
| 7686 |
|
and include in natl_box_adjoint |
| 7687 |
|
o untangle a few ifdefs related to cost, ctrl, autodiff |
| 7688 |
|
untangel a few ALLOW_ECCO_OPTIMIZATION |
| 7689 |
|
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
| 7690 |
|
(theta2, salt2 in ecco_cost_weights) |
| 7691 |
|
|
| 7692 |
|
checkpoint56c_post (2004/12/03) |
| 7693 |
|
o OBCS as control variables |
| 7694 |
|
- update ctrl_ad_diff.list, obcs_ad_diff.list |
| 7695 |
|
- remove balance of obcs controls from default |
| 7696 |
|
- fix index bug nobcs in ctrl_init |
| 7697 |
|
- fix dummy fields filen in ctrl_pack |
| 7698 |
|
- add dummy weights for obcs |
| 7699 |
|
o lsopt: comment out fort.94 output |
| 7700 |
|
o optim: |
| 7701 |
|
- remove unnecessary header files |
| 7702 |
|
- adjusted namelists |
| 7703 |
|
- add xerbla.F to Makefile |
| 7704 |
|
o exf: |
| 7705 |
|
- multiple modifications of exf_check_range |
| 7706 |
|
- unit change in exf_init_runoff from [m/year] to [m/s] |
| 7707 |
|
o mdsio: |
| 7708 |
|
- i/o-vector change debugLevel from debLevA to debLevB |
| 7709 |
|
|
| 7710 |
|
checkpoint56b_post (2004/12/01) |
| 7711 |
|
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
| 7712 |
|
is called from DO_THE_MODEL_IO |
| 7713 |
|
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
| 7714 |
|
- introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq) |
| 7715 |
|
- clean up PTRACERS_WRITE_TIMEAVE a little |
| 7716 |
|
o add another verification experiment that tests both the cfc-pkg and |
| 7717 |
|
the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with |
| 7718 |
|
reactive tendencies treated inline with regular timestepping |
| 7719 |
|
o testreport previously did a lousy job of comparing small numbers, so |
| 7720 |
|
we (Ed and Martin) changed the way the cut-off of 1.e-12 is |
| 7721 |
|
implemented in the little c-progam tmp_cmpnum.c which is embedded in |
| 7722 |
|
testreport. |
| 7723 |
|
o ptracers_monitor: bug fix for MPI |
| 7724 |
|
|
| 7725 |
|
checkpoint56a_post (2004/11/28) |
| 7726 |
|
o GCHEM: finish reorganizating the package |
| 7727 |
|
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
| 7728 |
|
(introduces another 3D-array for each passive tracer, but only if |
| 7729 |
|
GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING |
| 7730 |
|
gchemTendency is not needed because the timestep is done separately) |
| 7731 |
|
- gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY |
| 7732 |
|
- GCHEM is now---more or less cleanly---separate from PTRACERS |
| 7733 |
|
- to bo done: handling of surfaceForcingPtr that is needed for KPP not |
| 7734 |
|
so clear to me how that should be done in a general way. |
| 7735 |
|
o CFC: improve formatting of output in CFC_ATMOS |
| 7736 |
|
o PTRACERS: |
| 7737 |
|
- rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so |
| 7738 |
|
that ALL experiments with ptracers enable can be checked. This makes |
| 7739 |
|
GCHEM_MONITOR obsolete. |
| 7740 |
|
- include a runtime parameter PTRACERS_monitorFreq that defaults to |
| 7741 |
|
monitorFreq |
| 7742 |
|
- set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true |
| 7743 |
|
o add PTRACERS (PTR0[1-5]) to testreport output |
| 7744 |
|
o exf_check_range: |
| 7745 |
|
* default changed to .TRUE. |
| 7746 |
|
* will check values for niter0 if debLevA, every timestep if debLevB |
| 7747 |
|
* STOP in exf_check_range if 'out of range' |
| 7748 |
|
* range chosen generous to allow for potential extema |
| 7749 |
|
TBD: a version with stricter range |
| 7750 |
|
permitted range would be runtime parameters |
| 7751 |
|
o GMredi: |
| 7752 |
|
- fix ldd97 slope limit ; extend valid domain of Psi-Bolus ; |
| 7753 |
|
- change S/R GRAD_SIGMA to be valid in the overlap on CS-grid. |
| 7754 |
|
- change the default GMREDI_OPTIONS.h: compile everything except Visbeck |
| 7755 |
|
o GCHEM: |
| 7756 |
|
- move call to GCHEM_FORCING_SEP, so that it is now called before |
| 7757 |
|
the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP |
| 7758 |
|
- introduced a useGCHEM runtime flag and applied it everywhere. |
| 7759 |
|
- renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING; |
| 7760 |
|
this flag is now only visible within GCHEM-pkg routines. |
| 7761 |
|
- moved gchem_forcing_int temporarily into ptracers_forcing, this will |
| 7762 |
|
be replaced by a 3D array that is computed before thermodynamics; for |
| 7763 |
|
this, the tracer ID iTracer had to be included into the parameter list |
| 7764 |
|
of ptracers_forcing |
| 7765 |
|
- set up forward_step to call gchem_forcing, that will replace |
| 7766 |
|
gchem_forcing_int in ptracers_forcing |
| 7767 |
|
- cleaning up |
| 7768 |
|
o small cleaning of exch2: remove files that are also in eesupp/src |
| 7769 |
|
|
| 7770 |
|
checkpoint56 (2004/11/17) |
| 7771 |
|
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
| 7772 |
|
o mnc: cleanup "full" files--fixes out-of-memory problem |
| 7773 |
|
o ECCO-GODAE |
| 7774 |
|
* model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup |
| 7775 |
|
* fully merged and updated from SIO code |
| 7776 |
|
windstress sign change affects |
| 7777 |
|
- exf_inscal_[u/v]stress |
| 7778 |
|
- sign of xx_tau[u/v] adjustments |
| 7779 |
|
- signs in cost_scat |
| 7780 |
|
* ctrl_get_gen: avoid update of tau[u/v] for first few days |
| 7781 |
|
* natl_box_adjoint updated and compressed |
| 7782 |
|
* 2-level checkpoint switch added |
| 7783 |
|
(tested in EXP. 1 of natl_box_adjoint) |
| 7784 |
|
* new switch doInitXX to avoid init. of xx_... in optimcycle=0 |
| 7785 |
|
o SVD |
| 7786 |
|
* first complete, non-hacked version for SVD calculations |
| 7787 |
|
* all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_... |
| 7788 |
|
performed via direct access files admtlm_vector.it???? |
| 7789 |
|
(via ctrl_[un]pack) |
| 7790 |
|
* optimcycle is used for ARPACK iteration counter |
| 7791 |
|
(note: adxx_... is iterated, rather than xx_...; latter is constant!) |
| 7792 |
|
* EV problem ok w.r.t. L2-norm in tangent space; need to check other norms |
| 7793 |
|
and add linear transforms where necessary |
| 7794 |
|
* controls are initial/final SST, SSS (can be extended; need to check |
| 7795 |
|
ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F |
| 7796 |
|
o mdsio: filename info to both stderr, stdout |
| 7797 |
|
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
| 7798 |
|
from sign change |
| 7799 |
|
|
| 7800 |
|
checkpoint55j_post (2004/11/10) |
| 7801 |
|
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
| 7802 |
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 7803 |
|
o add consistent build directories and .cvsignore files to verification |
| 7804 |
|
o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity |
| 7805 |
|
o make all subroutines 30 or less characters in length for certain older |
| 7806 |
|
compilers to work (a thorough search only turns up two routines in |
| 7807 |
|
pkg/ptracers) |
| 7808 |
|
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
| 7809 |
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 7810 |
|
|
| 7811 |
|
checkpoint55i_post (2004/10/28) |
| 7812 |
|
o change arrays for total vertical diffusivity (2.D if explicit, |
| 7813 |
|
3.D if implicit) ; each ptracer uses its own background value. |
| 7814 |
|
o added mnc/NetCDF output capability to ocn_compon_interf |
| 7815 |
|
- added bits to verification/cpl_aim+ocn so that it can run on |
| 7816 |
|
ITRDA and other clusters without the mpirun "-wd" option |
| 7817 |
|
o fixed wayward endif in mom_fluxform.F that messed up cyclindrical |
| 7818 |
|
configuration |
| 7819 |
|
o give MNC the ability to create additional files rather than |
| 7820 |
|
exceeding a specified file size limit "MNC_MAX_FILESIZE" |
| 7821 |
|
- the default is just less than 2GB which is a practical limit |
| 7822 |
|
on many systems |
| 7823 |
|
o Compute the non-local term using either KPP vertical diffusivity (=default) |
| 7824 |
|
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
| 7825 |
|
|
| 7826 |
|
checkpoint55h_post (2004/10/20) |
| 7827 |
|
o add verification test "vermix" |
| 7828 |
|
o remove all the *_ioinc flags and replace with the single global |
| 7829 |
|
outputTypesInclusive flag |
| 7830 |
|
o allow to set a vertical profile of vertical diffusivity for T & S |
| 7831 |
|
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
| 7832 |
|
o useMNC moved from data.mnc to data.pkg |
| 7833 |
|
|
| 7834 |
|
checkpoint55g_post (2004/10/14) |
| 7835 |
|
o Renaming carbon AD experiments to comply with testreport conventions |
| 7836 |
|
o Updating adjoint of Held-Suarez hs94.1x64x5 |
| 7837 |
|
o Fixing directives for non-ECCO forward_step, after ECCO directives |
| 7838 |
|
have been fixed to avoid recomp. of do_oceanic_phys |
| 7839 |
|
Works well for global_ocean.90x40x15, |
| 7840 |
|
but recomp. issue remains for carbon |
| 7841 |
|
o Updating adjoint output for natl_box_adjoint after |
| 7842 |
|
pkg/ecco has been modified (see taga c55d_post) |
| 7843 |
|
|
| 7844 |
|
checkpoint55f_post (2004/10/13) |
| 7845 |
|
o rename to timeave_init_fixed |
| 7846 |
|
|
| 7847 |
|
checkpoint55e_post (2004/10/13) |
| 7848 |
|
o some delicate re-shuffle of store directives to avoid one |
| 7849 |
|
extra call of do_oceanic_physics |
| 7850 |
|
affects ecco_the_main_loop.F, do_oceanic_physics.F |
| 7851 |
|
checkpoint_lev1_directives.h |
| 7852 |
|
o NB: this may break global_ocean adjoint temporarily, |
| 7853 |
|
but it is clear how to fix it. Will do later, need this now. |
| 7854 |
|
|
| 7855 |
|
checkpoint55d_post (2004/10/11) |
| 7856 |
|
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
| 7857 |
|
o ecco_cost_weights is modified to 1x1 runs |
| 7858 |
|
o modifs to allow observations to be read in as |
| 7859 |
|
single file or yearly files |
| 7860 |
|
o enable to read exf forcing fields as either |
| 7861 |
|
single file or yearly files (flag useExfYearlyFields) |
| 7862 |
|
checkpoint55d_pre (2004/10/08) |
| 7863 |
|
|
| 7864 |
|
o switch between 2-level and 3-level checkpointing |
| 7865 |
|
o add ability of MNC to write local and "partial" (eg. 2D slices where |
| 7866 |
|
the full 3D field is never actually stored) arrays to NetCDF files |
| 7867 |
|
with the correct (that is, the complete multi-dimensional) set of |
| 7868 |
|
array indicies |
| 7869 |
|
- used in mom_vecinv() to write the diagFreq output |
| 7870 |
|
- tested (demonstrated) in verification/aim.5l_cs |
| 7871 |
|
o further mnc-ification |
| 7872 |
|
- add verification/lab_sea to the list with mnc setups |
| 7873 |
|
- fix undefined mnc v-names in cd_code |
| 7874 |
|
- add kpp to mnc output (both snapshot and timeave) |
| 7875 |
|
o non-hydrostatic code |
| 7876 |
|
- added horizontal viscosity parameter viscAhW for w, that replaces viscAh |
| 7877 |
|
in calc_gw.F |
| 7878 |
|
- defaults to viscAh |
| 7879 |
|
- this is useful, when I want to use viscAh=0 (e.g., only biharmonic |
| 7880 |
|
friction or Leith) in non-hydrostatic mode, as long as there is |
| 7881 |
|
no biharmonic friction and/or Leigth or equivalent for vertical velocity. |
| 7882 |
|
o pkg/cost |
| 7883 |
|
extend simple cost functions to treat time mean quantities |
| 7884 |
|
(T,U,V) via cost_accumulate_state from cost_tile |
| 7885 |
|
o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to |
| 7886 |
|
be 2 times larger than the minimum size the advection scheme requires. |
| 7887 |
|
now get a perfect conservation of salt in advect_cs test-exp (updated) |
| 7888 |
|
o GGL90 (Gaspar's TKE mixed layer) |
| 7889 |
|
- add horizontal diffusion of TKE, requires exchanges in |
| 7890 |
|
do_fields_blocking_exchanges, horizontal diffusivity is zero by |
| 7891 |
|
default. In OPA there is no horizontal diffusion of TKE but the |
| 7892 |
|
mixing coefficients are computed from a horizontal average of TKE of |
| 7893 |
|
6 points or so. I think that diffusion has a little more physical |
| 7894 |
|
justification. |
| 7895 |
|
- clean up ggl90_calc in the hope of reducing memory usage (this hope |
| 7896 |
|
was in vain) |
| 7897 |
|
- mask tke-variable in ggl90_init |
| 7898 |
|
o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass) |
| 7899 |
|
o fix biharmonic diffusion on CS-grid. |
| 7900 |
|
o more obcs stuff |
| 7901 |
|
- added obcs_external_fields_load as an alternative to the EXF-pkg option |
| 7902 |
|
for reading boundary values. This routine is called from |
| 7903 |
|
obcs_prescribe_read |
| 7904 |
|
- updated obcs_check |
| 7905 |
|
- changed sponge layer relaxation parameter units for days to seconds |
| 7906 |
|
- turned off sponge layer by default |
| 7907 |
|
- changed argument list of OBCS_CALC to myTime+deltaTclock |
| 7908 |
|
- fixed about 35 bugs in obcs_external_fields_load |
| 7909 |
|
|
| 7910 |
|
checkpoint55c_post (2004/09/23) |
| 7911 |
|
o obcs stuff |
| 7912 |
|
- new runtime flags useOBCSprescribe, useOBCSbalance |
| 7913 |
|
- re-arranged obcs_calc |
| 7914 |
|
- moved exf_getobcs to obcs_prescibe_read |
| 7915 |
|
obcs_prescibe_read is called after ORLANSKI stuff |
| 7916 |
|
and independent of it (executable can contain all). |
| 7917 |
|
- updated obcs_check |
| 7918 |
|
- added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE. |
| 7919 |
|
These may be necessary only if tangential velocities are |
| 7920 |
|
prescribed at OB, not sure, needs testing. |
| 7921 |
|
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
| 7922 |
|
which simplifies the calls and passes the ifc check-bounds test |
| 7923 |
|
|
| 7924 |
|
checkpoint55b_post (2004/09/22) |
| 7925 |
|
o add a 2D scalar, Z location, exchange_2 routine. |
| 7926 |
|
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
| 7927 |
|
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
| 7928 |
|
affects advect_cs results (for the wrong reason): update output.txt |
| 7929 |
|
o use a more standard discretization for biharmonic viscosity ; |
| 7930 |
|
(original version still available with #define MOM_VI_ORIGINAL_VISCA4 ) |
| 7931 |
|
affects results of dome set-up: update output.txt |
| 7932 |
|
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
| 7933 |
|
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
| 7934 |
|
|
| 7935 |
|
checkpoint55a_post (2004/09/20) |
| 7936 |
|
o merged code to |
| 7937 |
|
* prescribe/read time-dependent open boundaries |
| 7938 |
|
(works in conjunction with exf, cal) |
| 7939 |
|
* sponge layer code for open boundaries |
| 7940 |
|
* each boundary N/S/E/W now has its own CPP option |
| 7941 |
|
(healthy for the adjoint) |
| 7942 |
|
|
| 7943 |
|
checkpoint55 (2004/09/17) |
| 7944 |
|
o up-to-date adjoint of previous breaks |
| 7945 |
|
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
| 7946 |
|
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
| 7947 |
|
- global_ocean.90x40x15: extended GMREDI_OPTIONS.h |
| 7948 |
|
- carbon: * remove tr1-related adjoint verification |
| 7949 |
|
* add ptracer as control variable |
| 7950 |
|
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
| 7951 |
|
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
| 7952 |
|
|
| 7953 |
|
checkpoint54f_post (2004/09/16) |
| 7954 |
|
o in verification/carbin/ remove experiment related to |
| 7955 |
|
ALLOW_PASSIVE_TRACER (array tr1 etc) |
| 7956 |
|
code_ad/ input_ad/ results_ad |
| 7957 |
|
|
| 7958 |
|
o add two new packages |
| 7959 |
|
- ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993) |
| 7960 |
|
+ subject to optimization (memory) |
| 7961 |
|
- opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997) |
| 7962 |
|
+ subject to reordering (many GOTOs in the original code) |
| 7963 |
|
+ so far opps is called for every (i,j) point, and then operates in |
| 7964 |
|
the vertical; one may want to reorder the scheme in order operate in |
| 7965 |
|
horizontal slabs at the cost of (a lot of) memory, at least ten new 3D |
| 7966 |
|
fields) |
| 7967 |
|
o overhaul of IO so that we now have flags for MDSIO and/or MNC |
| 7968 |
|
- all verification tests compile and run with linux_ia32_g77 |
| 7969 |
|
- defaults are compatible with current input files--nothing |
| 7970 |
|
should change if you were not previously using MNC |
| 7971 |
|
- MNC output has been added in numerous places (eg. timeave) |
| 7972 |
|
but there are still a few writes not yet do-able with MNC |
| 7973 |
|
(this is in progress) |
| 7974 |
|
- flags now allow for either/or/both use of MDSIO and MNC and |
| 7975 |
|
documentation will soon follow |
| 7976 |
|
- numerous small formatting cleanups for ProTeX |
| 7977 |
|
o add version info (via BUILD_INFO.h) to MNC and stdout |
| 7978 |
|
|
| 7979 |
|
checkpoint54e_post (2004/09/02) |
| 7980 |
|
o add two new packages |
| 7981 |
|
- pp81 (Packanowski and Philander, 1981), Richardson number and |
| 7982 |
|
stratification dependent mixing |
| 7983 |
|
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
| 7984 |
|
- these scheme operate in a similar manner as KPP (without ghat, of |
| 7985 |
|
course), however there is only one diffusivity that is used for both |
| 7986 |
|
temperature and salinity (and passive tracers) |
| 7987 |
|
o add offline package |
| 7988 |
|
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
| 7989 |
|
provided by Stephanie Dutkiewicz |
| 7990 |
|
o genmake2: add ability to search for C compilers and cleanup test output |
| 7991 |
|
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
| 7992 |
|
|
| 7993 |
|
checkpoint54d_post (2004/07/27) |
| 7994 |
|
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
| 7995 |
|
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
| 7996 |
|
leading to additional shift by 5 days each year of integration |
| 7997 |
|
(i.e. leading to considerable offset over the years) |
| 7998 |
|
o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep |
| 7999 |
|
o start with no AB and no initial filtering (staggerTimeStep): |
| 8000 |
|
change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5 |
| 8001 |
|
o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F |
| 8002 |
|
(external loading & cpl import/export stay in forward_step.F) |
| 8003 |
|
o update coupling interface to work with new staggerTimeStep |
| 8004 |
|
o change MDSIO ptracers_pickup. |
| 8005 |
|
o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F); |
| 8006 |
|
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
| 8007 |
|
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
| 8008 |
|
|
| 8009 |
|
checkpoint54c_post (2004/07/18) |
| 8010 |
|
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
| 8011 |
|
this affects (truncation error) output.txt of test-exp: |
| 8012 |
|
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
| 8013 |
|
o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array) |
| 8014 |
|
o change Qnet to always be the net heat flux, (+upward). |
| 8015 |
|
affects (truncation error) output of natl_box exp.: updated |
| 8016 |
|
o define the max number of passive tracers in PTRACERS_SIZE.h |
| 8017 |
|
o start to test mnc routinely in exp0 |
| 8018 |
|
o add sea-ice loading (sIceLoad) as a new forcing field. |
| 8019 |
|
|
| 8020 |
|
checkpoint54b_post (2004/07/08) |
| 8021 |
|
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
| 8022 |
|
impressive on Altix and Opteron systems) |
| 8023 |
|
o diagnostics can now write NetCDF files through the mnc package |
| 8024 |
|
o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output |
| 8025 |
|
o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added |
| 8026 |
|
o staggerTimeStep & NLFS: rescale T & S surface tendencies. |
| 8027 |
|
affects (truncation error) output of lab_sea & natl_box exp.: updated |
| 8028 |
|
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
| 8029 |
|
|
| 8030 |
|
checkpoint54a_post (2004/07/06) |
| 8031 |
|
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
| 8032 |
|
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
| 8033 |
|
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
| 8034 |
|
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
| 8035 |
|
+ internal_wave (shift in writing cg2d_ini_res) |
| 8036 |
|
checkpoint54a_pre (2004/07/05) |
| 8037 |
|
|
| 8038 |
|
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
| 8039 |
|
- modified verification/lab_sea and natl_box_adjoint accordingly |
| 8040 |
|
|
| 8041 |
|
checkpoint54 (2004/07/02) |
| 8042 |
|
checkpoint53g_post (2004/07/02) |
| 8043 |
|
o prepare splitting of thermodynamics: store convect.counter in common block |
| 8044 |
|
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
| 8045 |
|
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
| 8046 |
|
o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection |
| 8047 |
|
o new parameter "nShapS": allow to treat differently S from T (nShapT) |
| 8048 |
|
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
| 8049 |
|
o restore adjointability |
| 8050 |
|
|
| 8051 |
|
checkpoint53f_post (2004/06/25) |
| 8052 |
|
o modifications that affect AIM experiment results (update output.txt): |
| 8053 |
|
- no advection of S at top interface Nr (pkg/generic_advdiff) |
| 8054 |
|
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
| 8055 |
|
o AIM pkg: |
| 8056 |
|
- include stability function into surf.Flux derivative relative to Tsurf |
| 8057 |
|
- calculate clear-sky radiation & surface temp. change (for diagnostics) |
| 8058 |
|
|
| 8059 |
|
checkpoint53e_post |
| 8060 |
|
o merged cylindrical coord configuration |
| 8061 |
|
o added rotating_tank experiment |
| 8062 |
|
checkpoint53e_pre |
| 8063 |
|
|
| 8064 |
|
checkpoint53d_post (2004/06/14) |
| 8065 |
|
o faulks upgraded: re-generate output.txt that have changed: |
| 8066 |
|
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
| 8067 |
|
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
| 8068 |
|
o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing. |
| 8069 |
|
o added Sadourny discretization of Coriolis |
| 8070 |
|
- moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h |
| 8071 |
|
- re-enabled use of omega3 (useAbsVorticity) |
| 8072 |
|
o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for |
| 8073 |
|
vector-invariant equations |
| 8074 |
|
- note: does *NOT* yet use same variable visc. for no-slip BC's. |
| 8075 |
|
o recoded the lateral boundary conditions for non-hydrostatic w, this time |
| 8076 |
|
hopefully without new bugs |
| 8077 |
|
- still to do: biharmonic friction for non-hydrostatic w |
| 8078 |
|
o bug fix for mom_*_sidedrag: rA -> rAs,rAw |
| 8079 |
|
o regenerated output for global_ocean_ebm (using -ieee) |
| 8080 |
|
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
| 8081 |
|
of mom_common/ |
| 8082 |
|
- simple re-arrangement of instructions within computing loop |
| 8083 |
|
checkpoint53d_pre (2004/05/21) |
| 8084 |
|
|
| 8085 |
|
checkpoint53c_post (2004/05/21) |
| 8086 |
|
o new version of coupler for AIM+thSIce and Ocean models |
| 8087 |
|
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
| 8088 |
|
- land: change Evaporation of snow |
| 8089 |
|
- aim with thSIce: fix bug in snow-precip. |
| 8090 |
|
o changes to calc_gw.F |
| 8091 |
|
- bug fix for w^2 term near the bottom boundary |
| 8092 |
|
- (hopefully) improve the lateral slip boundary condtions for use with |
| 8093 |
|
partial/looped cells |
| 8094 |
|
- because the bug fix changes two verification experiments anyway (exp5 |
| 8095 |
|
and plume on slope), change the lateral boundary condition from half slip |
| 8096 |
|
to the value of no_slip_sides |
| 8097 |
|
o ebm package wasnt quite up to the parallel task. Fixed that. |
| 8098 |
|
o Adjoint of EBM package + verification |
| 8099 |
|
* TLM OK |
| 8100 |
|
* ADM not sufficient accuracy yet (needs further testing) |
| 8101 |
|
|
| 8102 |
|
checkpoint53b_post (2004/05/14) |
| 8103 |
|
o Commiting new energy balance model to repository |
| 8104 |
|
* package is pkg/ebm |
| 8105 |
|
* verif. is verification/global_ocean_ebm |
| 8106 |
|
* references are in ebm_driver.F |
| 8107 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 8108 |
|
C Global thermohaline circulation. Part I: |
| 8109 |
|
C Sensitivity to atmospheric moisture transport. |
| 8110 |
|
C J. Climate 12(1), 71-82 |
| 8111 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 8112 |
|
C Global thermohaline circulation. Part II: |
| 8113 |
|
C Sensitivity with interactive transport. |
| 8114 |
|
C J. Climate 12(1), 83-91 |
| 8115 |
|
C * M. Nakamura, P. Stone and J. Marotzke, 1994: |
| 8116 |
|
C Destabilization of the thermohaline circulation |
| 8117 |
|
C by atmospheric eddy transports. |
| 8118 |
|
C J. Climate 7(12), 1870-1882 |
| 8119 |
|
o Will need long integration testing. |
| 8120 |
|
checkpoint53b_pre (2004/05/14) |
| 8121 |
|
|
| 8122 |
|
o created pkg/mom_common in preparation for variable viscosity code |
| 8123 |
|
o renamed and split ini_mnc_io |
| 8124 |
|
o pkg/land: only liquid water can diffuse or run-off |
| 8125 |
|
o AIM using land: soil wetness availability account for snow |
| 8126 |
|
o added printMapIncludesZeros to EEPARMS namelist |
| 8127 |
|
|
| 8128 |
|
checkpoint53a_post (2004/05/11) |
| 8129 |
|
o restore TAMC compatiility for exf_constants.h |
| 8130 |
|
(no usage of _d in .h) |
| 8131 |
|
o Additional storing in KPP in an attempt to fix |
| 8132 |
|
TAMC problem with adjoint of KPP code. |
| 8133 |
|
(no success...) |
| 8134 |
|
Identical code works fine with TAF. |
| 8135 |
|
o Fixed verification/natl_box_adjoint experiments. |
| 8136 |
|
Initial conditions for Experiments 4 and 5 are now |
| 8137 |
|
set to "SEAICE_initialHEFF=0", which is more reasonable, |
| 8138 |
|
and hence gives results closer to that of Experiment 2. |
| 8139 |
|
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
| 8140 |
|
|
| 8141 |
|
checkpoint53 (2004/05/06) |
| 8142 |
|
o stable checkpoint with up to date adjoint |
| 8143 |
|
TLM tests only run for 1st grdchk at the moment. Its unclear if |
| 8144 |
|
this is a code problem or a problem with resetting code for g_ |
| 8145 |
|
variables that is being autogenerated wrong. |
| 8146 |
|
Otherwise: |
| 8147 |
|
o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix. |
| 8148 |
|
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
| 8149 |
|
are both still in chaos following their security messes. |
| 8150 |
|
|
| 8151 |
|
checkpoint52n_post (2004/05/06) |
| 8152 |
|
o various build (mostly genmake2) changes including: |
| 8153 |
|
- ability to build/run more easily within Cygwin and MacOS X |
| 8154 |
|
- more complicated Makefiles with a stronger dependence on Gnu Make |
| 8155 |
|
o pkg/seaice modifications |
| 8156 |
|
- added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost |
| 8157 |
|
of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer |
| 8158 |
|
and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm |
| 8159 |
|
- changed proxy for geostrophic velocity and updated |
| 8160 |
|
verification/lab_sea/results/* accordingly |
| 8161 |
|
- removed ADI dynamic solver from pkg/seaice |
| 8162 |
|
- replaced all occurrences of 1/CSTICE or 1/CSUICE |
| 8163 |
|
they caused a segmentation fault under certain circumstances |
| 8164 |
|
- removed unused field WATR |
| 8165 |
|
o bug fix in exf-package: |
| 8166 |
|
- u/vwind are defined at tracer/pressure points. The values of u/vwindmask |
| 8167 |
|
now reflect that. |
| 8168 |
|
o small fixes in the cal-package: |
| 8169 |
|
- set reference date to first of January for the 'model'-calendar |
| 8170 |
|
- failing of cal_CheckDate in cal_FullDate now actually results in a |
| 8171 |
|
warning |
| 8172 |
|
o small modifications in exf-package to increase flexibility: |
| 8173 |
|
- change climtempfreeze from a constant to a runtime parameter that |
| 8174 |
|
is specified in data.exf_clim (default = -1.9) |
| 8175 |
|
- introduce runtime parameter windstressmax (default = 2.0) that is |
| 8176 |
|
specified in data.exf |
| 8177 |
|
o fix in pkg/thsice: |
| 8178 |
|
- update Evap (Tsf changes) to be consistent with Latent heat flux |
| 8179 |
|
- maintain snow precipitation unchanged (even if Tsf >=0). |
| 8180 |
|
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
| 8181 |
|
|
| 8182 |
|
checkpoint52m_post (2004/04/18) |
| 8183 |
|
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
| 8184 |
|
this does not change any of the results, because myIter=0 in swfrac always |
| 8185 |
|
lead to jwtype=2 (the default anyway), but the call makes little sense |
| 8186 |
|
as a default |
| 8187 |
|
o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated |
| 8188 |
|
o re-work pkg/thsice interface with ocean & bulk_force pkg to allow |
| 8189 |
|
atmospheric model (AIM) to use it ; add a "slab ocean" component. |
| 8190 |
|
o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice) |
| 8191 |
|
o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice |
| 8192 |
|
o extending useSingleCpuIO option to work with new exch2 I/O format |
| 8193 |
|
- old-style, missing-tile I/O is still accessible by defining CPP |
| 8194 |
|
option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h |
| 8195 |
|
o monitor package can write to NetCDF files and/or STDOUT |
| 8196 |
|
o fix re-definition bug in MNC_GRID_INIT_ALL() |
| 8197 |
|
o doc/api_reference added |
| 8198 |
|
- a framework for building an API Reference Manual using all |
| 8199 |
|
the "protex" comments embedded in the code |
| 8200 |
|
- see pkg/generic_advdiff, pkg/mnc for examples |
| 8201 |
|
o MNC: |
| 8202 |
|
- make myThid the last argument for all subroutines |
| 8203 |
|
- new default for the grid files: NO halos |
| 8204 |
|
- add useMNC and other run-time flags |
| 8205 |
|
- separate per-file-group handling of the unlimited dimension |
| 8206 |
|
- early initialization of MNC w/ flags read at the eeboot stage |
| 8207 |
|
and lookup tables set in initialize_fixed |
| 8208 |
|
- write all MNC output to a freshly-created directory |
| 8209 |
|
o thermodynamics sea-ice (thsice) is now tested with testreport. |
| 8210 |
|
o test exp. advect_cs: use the standard cs32 grid ; update output. |
| 8211 |
|
o Added functionality to grdchk: |
| 8212 |
|
pick global i,j,k position (or nearest wet) where to perform check. |
| 8213 |
|
|
| 8214 |
|
checkpoint52l_post (2004/03/11) |
| 8215 |
|
o new land formulation: |
| 8216 |
|
a) use ground enthalpy as prognostic variable to ensure exact |
| 8217 |
|
energy conservation. |
| 8218 |
|
b) account for water temperature and for latent heat of freezing |
| 8219 |
|
in all processes (rain, run-off, ground storage) |
| 8220 |
|
c) compute surface and ground temperature implicitly. |
| 8221 |
|
o aim_v23 modification for new land model: |
| 8222 |
|
a) Treat separately land / ocean / sea-ice surface fluxes |
| 8223 |
|
to allow implicit computation of land & sea-ice surface temp. |
| 8224 |
|
b) add snow precipitation. |
| 8225 |
|
checkpoint52l_pre (2004/03/11) |
| 8226 |
|
|
| 8227 |
|
o fix problem (when 1 tile is empty) in min/max monitor. |
| 8228 |
|
o fix bug in timeAve (u,vZetatave in common block) |
| 8229 |
|
o no restoring terms under ice for pkg/seaice |
| 8230 |
|
o moved SEAICE_DO_DIAGS to S/R do_the_model_io |
| 8231 |
|
o bug fix for pkg/seaice pickups |
| 8232 |
|
o change MNC call locations and add coordinate attributes |
| 8233 |
|
o mask vorticity at the corner ; affects global_ocean.cs output |
| 8234 |
|
o fix ini_curvilinear_grid ; test CS experiments with mpi |
| 8235 |
|
o aim.5l_cs: modify sea-ice fraction input file ; update output |
| 8236 |
|
o exf: Adding simple range check routine for exf fields after read |
| 8237 |
|
|
| 8238 |
|
checkpoint52k_post (2004/02/23) |
| 8239 |
|
o removed top-level directory "diags" |
| 8240 |
|
- we migrated these functions to pkg/timeave a long time ago |
| 8241 |
|
o fixed bug introduced in pkg/monitor |
| 8242 |
|
o accuracy ctrlprec = 32 insuffient for gradient checks using |
| 8243 |
|
averaged fields (I/O via cost_averages) |
| 8244 |
|
-> use ctrl.h in active_file*.F to control I/O precision. |
| 8245 |
|
o paramter list of CALL ADTHE_MAIN_LOOP |
| 8246 |
|
o added initial do_the_model_io to ecco |
| 8247 |
|
o set all ...Freq to zero after cost_final |
| 8248 |
|
taveFreq, dumpFreq, pChkptFreq |
| 8249 |
|
o MAIN and ECCO differentiability restored |
| 8250 |
|
|
| 8251 |
|
checkpoint52j_post (2004/02/18) |
| 8252 |
|
o fix nchklev in tamc.h for global_ocean... |
| 8253 |
|
o Bringing flow and store directives up-to-date |
| 8254 |
|
o Really weird thing! |
| 8255 |
|
call do_the_model_io from the_main_loop with parameters |
| 8256 |
|
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
| 8257 |
|
TAF places a faulty re-call of initialise_varia |
| 8258 |
|
after cost_final call which should not be there! |
| 8259 |
|
checkpoint52j_pre (2004/02/03) |
| 8260 |
|
|
| 8261 |
|
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
| 8262 |
|
error messages |
| 8263 |
|
o fix errorMessageUnit problem. remove old version of mdsio from eesup/src |
| 8264 |
|
o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating |
| 8265 |
|
debug output |
| 8266 |
|
o modfied mdsio_writefield.F to handle non-global files under exch2 |
| 8267 |
|
o update AIM Cubed-Sphere exp (aim.5l_cs): |
| 8268 |
|
use land, p*, and Franco.M forcing fields with fractional land-sea mask. |
| 8269 |
|
o update AIM Equatorial Channel exp: |
| 8270 |
|
use standard aim_v23 pkg and change the SST fields to be more realistic. |
| 8271 |
|
o globalFile now works with exch2 |
| 8272 |
|
o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and |
| 8273 |
|
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
| 8274 |
|
o limit timeave output for hi-res integrations |
| 8275 |
|
|
| 8276 |
|
checkpoint52i_post (2004/01/21) |
| 8277 |
|
o removed CPP_EEOPTIONS.h from verification/*/code |
| 8278 |
|
o updated the tiling for global_ocean_pressure |
| 8279 |
|
checkpoint52i_pre (2004/01/20) |
| 8280 |
|
|
| 8281 |
|
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
| 8282 |
|
the old pkg/aim). |
| 8283 |
|
|
| 8284 |
|
checkpoint52h_pre (2004/01/20) |
| 8285 |
|
o shortened offending lines in exch2_send_rx?.template |
| 8286 |
|
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
| 8287 |
|
o genmake2: add build & execute test for NetCDF code |
| 8288 |
|
o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed |
| 8289 |
|
old grid files, moved CPP_EEMACROS.h to pkg/exch2 |
| 8290 |
|
o added useSingleCPUIO flag to monitor.F and mon_out.F |
| 8291 |
|
o added temporary hack for sea-ice dynamics on the cube: |
| 8292 |
|
metric terms are ignored and it is assumed that |
| 8293 |
|
there is no sea-ice on cube faces 1, 2, 4, and 5. |
| 8294 |
|
|
| 8295 |
|
checkpoint52f_post (2004/01/09) |
| 8296 |
|
o added exch2 cube routines to pkg/exch2 |
| 8297 |
|
o modified hs94.cs-32x32x5 to use it |
| 8298 |
|
o added new grid files to hs94.cs-32x32x5 |
| 8299 |
|
checkpoint52f_pre (2004/01/07) |
| 8300 |
|
|
| 8301 |
|
checkpoint52e_post (2004/01/07) |
| 8302 |
|
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
| 8303 |
|
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
| 8304 |
|
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
| 8305 |
|
to work with implicit vertical advection and AB ; |
| 8306 |
|
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
| 8307 |
|
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
| 8308 |
|
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
| 8309 |
|
checkpoint52e_pre (2004/01/02) |
| 8310 |
|
|
| 8311 |
|
o fix bug in impldiff when Nr=1 or Nr=2. |
| 8312 |
|
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
| 8313 |
|
o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test. |
| 8314 |
|
o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2 |
| 8315 |
|
ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure |
| 8316 |
|
o added exf_offset_atemp for Celsius to Kelvin conversion of atemp |
| 8317 |
|
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
| 8318 |
|
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
| 8319 |
|
|
| 8320 |
|
checkpoint52d_post (2003/12/16) |
| 8321 |
|
o re-tiled many expts to allow comparison in multi-processor mode |
| 8322 |
|
- updated output accordingly |
| 8323 |
|
- changed hs94.128x64x5 to use intial T from file rather than use the |
| 8324 |
|
random number generator |
| 8325 |
|
o add infrastructure in model routines for fizhi and gridalt packages |
| 8326 |
|
o change global_ocean.cs32x15 because of Pb with GM on CS-grid. |
| 8327 |
|
o changes to permit hi-res, cubed-sphere, configuration |
| 8328 |
|
- added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F |
| 8329 |
|
- added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F |
| 8330 |
|
- added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation |
| 8331 |
|
of surface winds for the cube |
| 8332 |
|
(A verification experiment, based on global_ocean.cs32x15, but with |
| 8333 |
|
pkg/seaice turned on and with on-the-fly interpolation from the NCEP |
| 8334 |
|
Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice, |
| 8335 |
|
complete with example surface forcing files and matlab scripts to look |
| 8336 |
|
at the output and compare it with that of global_ocean.cs32x15.) |
| 8337 |
|
o packages pickup: $PKG_write_pickup called from packages_write_pickup ; |
| 8338 |
|
but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code |
| 8339 |
|
to conform to the common rule. |
| 8340 |
|
o check-in the first version of the coupler + interfaces for multi-components |
| 8341 |
|
set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI. |
| 8342 |
|
- imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD). |
| 8343 |
|
- atmosphere: use pkg aim_v23 ; no sea-ice for now. |
| 8344 |
|
- ocean and atmos. share the same horizontal grid (no interpolation). |
| 8345 |
|
- exchanges between component and coupler is done in forward_step |
| 8346 |
|
o new verification experiment, cpl_aim+ocn: |
| 8347 |
|
coupled ocean - AIM atmosphere on cs32 grid. |
| 8348 |
|
|
| 8349 |
|
checkpoint52d_pre (2003/12/06) |
| 8350 |
|
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
| 8351 |
|
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
| 8352 |
|
|
| 8353 |
|
checkpoint52c_post (2003/11/25) |
| 8354 |
|
o Fixing OPTIONS files for use of exf: |
| 8355 |
|
- ALLOW_ECCO not needed |
| 8356 |
|
- ECCO_CPPOPTIONS.h should not be included from |
| 8357 |
|
EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h |
| 8358 |
|
as has been the case in the past |
| 8359 |
|
- All cal/exf related options are currently set in |
| 8360 |
|
single header file. Should remain so until we |
| 8361 |
|
agree on a consistent new policy. |
| 8362 |
|
o Removed all CPP options for cal package. |
| 8363 |
|
cal has no more CPP options. |
| 8364 |
|
o modified STOREs in GAD_ADVECTION |
| 8365 |
|
o corrected key comp. for passkey |
| 8366 |
|
|
| 8367 |
|
checkpoint52b_post (2003/11/23) |
| 8368 |
|
o new version: "thsice" of thermodynamic sea-ice pkg: |
| 8369 |
|
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
| 8370 |
|
- modify fluxes but do not change theta directly; |
| 8371 |
|
- light cleaning of bulk_force pkg (still needed with thsice). |
| 8372 |
|
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
| 8373 |
|
+ output_thsice.txt to test thsice & bulk_force pkgs. |
| 8374 |
|
o put back grid & coriolis monitor output. |
| 8375 |
|
checkpoint52b_pre (2003/11/23) |
| 8376 |
|
|
| 8377 |
|
o call "do_the_model_io" at the beginning (=> dump initial state) |
| 8378 |
|
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
| 8379 |
|
o sort out interplay between tamc.h and PTRACERS_OPTIONS.h |
| 8380 |
|
(need info on NUMBER_OF_PTRACERS) |
| 8381 |
|
o missing PTRACERS headers in some routines |
| 8382 |
|
o default tamc.h in pkg/autodiff supposed to crash |
| 8383 |
|
to ensure proper customization |
| 8384 |
|
|
| 8385 |
|
checkpoint52a_post (2003/11/17) |
| 8386 |
|
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
| 8387 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 8388 |
|
- subroutine FREEZE_SURFACE now limits only surface temperature |
| 8389 |
|
and is called in FORWARD_STEP (if allowFreezing=.TRUE.) |
| 8390 |
|
=> new output.txt for global_ocean.cs32x15 & global_with_exf |
| 8391 |
|
- keep the old version of FREEZE for backward compatibility; |
| 8392 |
|
global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE. |
| 8393 |
|
- corresponding modifs for TAF directives |
| 8394 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 8395 |
|
o time-averaged output for pkg/ptracers |
| 8396 |
|
o fix problem with ECCO-related divided adjoint |
| 8397 |
|
snapshot file was missing some ad-variables, |
| 8398 |
|
but no warning issued by TAF |
| 8399 |
|
|
| 8400 |
|
checkpoint52a_pre (2003/11/12) |
| 8401 |
|
o some bug fixes for #undef REAL4_IS_SLOW |
| 8402 |
|
|
| 8403 |
|
checkpoint52 = ecco_c52_e35 |
| 8404 |
|
o after testing adjoints of checkpoint51u_post |
| 8405 |
|
|
| 8406 |
|
checkpoint51u_post (2003/11/06) |
| 8407 |
|
o this is the post-merge tag of the ecco-branch |
| 8408 |
|
(needs another clean checkout and re-testing) |
| 8409 |
|
o various natl_box_adjoint configs and results |
| 8410 |
|
but no input fields |
| 8411 |
|
o obcs adjoint not yet merged! |
| 8412 |
|
o adding ECCO global 1x1 and 2x2 degree configs |
| 8413 |
|
o updated/extended some store directives for seaice |
| 8414 |
|
o pkg/ecco now containes ecco-specific part of cost function |
| 8415 |
|
o top level routines the_main_loop, forward_step |
| 8416 |
|
supersede those in model/src/ |
| 8417 |
|
previous input data.cost now in data.ecco |
| 8418 |
|
(new namelist ecco_cost_nml) |
| 8419 |
|
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
| 8420 |
|
|
| 8421 |
|
checkpoint51t_post (2003/11/04) |
| 8422 |
|
o this is the pre-merge tag of the ecco-branch |
| 8423 |
|
|
| 8424 |
|
checkpoint51s_post (2003/11/04) |
| 8425 |
|
o cleanup: removed various obsolete #define-s |
| 8426 |
|
o pkg/grdchk |
| 8427 |
|
- renamed 'ph-grd 3' to 'grad-res' |
| 8428 |
|
- merged from ecco-branch |
| 8429 |
|
(remaining bug fixes for obcs gradient checks) |
| 8430 |
|
- additional high-precision output for testreport |
| 8431 |
|
(grep for 'precision_grdchk_result') |
| 8432 |
|
|
| 8433 |
|
checkpoint51r_post (2003/11/03) |
| 8434 |
|
o cleaned up or removed CPP_OPTIONS.h files |
| 8435 |
|
o updated results for some of the tests to reflect the new |
| 8436 |
|
optfiles (-ieee: -O0 instead of -O3) |
| 8437 |
|
|
| 8438 |
|
checkpoint51q_post (2003/10/30) |
| 8439 |
|
o cd_code: |
| 8440 |
|
- moved cd_scheme.F -> cd_code_scheme.F |
| 8441 |
|
- separate read_checkpoint from cd_code_ini_vars.F |
| 8442 |
|
- separated cd_code part from write_checkpoint |
| 8443 |
|
- updated AD_SOURCE, generated .flow |
| 8444 |
|
- added CD_CODE_VARS.h to the_main_loop |
| 8445 |
|
- Moving cd_code specific store dir.s to pkg/cd_code |
| 8446 |
|
o ctrl package totally restructured |
| 8447 |
|
- pack/unpack now optional and decoupled from |
| 8448 |
|
xx_/adxx_ I/O |
| 8449 |
|
- ctrl_pack/unpack cleaned |
| 8450 |
|
(new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F) |
| 8451 |
|
- confined inclusion of AD_CONFIG.h to where necessary. |
| 8452 |
|
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
| 8453 |
|
|
| 8454 |
|
checkpoint51p_post (2003/10/30) |
| 8455 |
|
o create initial cd_code package |
| 8456 |
|
- WARNING: the initialization of fields within packages |
| 8457 |
|
is broken because INI_FIELDS (where READ_CHECKPOINT is |
| 8458 |
|
called) is called *before* PACKAGES_INIT_VARIABLES. |
| 8459 |
|
This seems to be backwards since |
| 8460 |
|
1) its important to initially zero the entire field including |
| 8461 |
|
the "halo" region |
| 8462 |
|
2) zeroing needs to be done *before* reading pickup info |
| 8463 |
|
and the pickup call might or might not happen in any |
| 8464 |
|
particular run |
| 8465 |
|
- this needs an overhaul for R2 |
| 8466 |
|
o cleanup verification/*/code/GMREDI_OPTIONS.h |
| 8467 |
|
o cleanup testreport |
| 8468 |
|
|
| 8469 |
|
checkpoint51o_post (2003/10/27) |
| 8470 |
|
o bringing AD-related verif's up to date with genmake2 |
| 8471 |
|
- carbon/ |
| 8472 |
|
- global_ocean.90x40x15/ |
| 8473 |
|
- hs.94.1x64x5/ |
| 8474 |
|
- (front_relax/ ) |
| 8475 |
|
o (more) consistent directory structure for AD-related verif.'s |
| 8476 |
|
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK |
| 8477 |
|
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF |
| 8478 |
|
o bug fix in find_alpha.F for MDJWF: |
| 8479 |
|
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for |
| 8480 |
|
change rho -> rho-rhoConst |
| 8481 |
|
- replace call find_rho to find_rhonum |
| 8482 |
|
o initialisation of rFlx extended to full array (required by TAF) |
| 8483 |
|
and shifted to thermodynamics |
| 8484 |
|
o removed PTRACERS.h in ptracers routine |
| 8485 |
|
o added surfacetendencyPtr to S/R parameter list pracers_forcing |
| 8486 |
|
o Correcting initialisations for fVerU, fVerV. |
| 8487 |
|
o helping TAF to recognize dependency on kUp for |
| 8488 |
|
fVerU, fVerV |
| 8489 |
|
o Replacing delZ by delR in pkg/ctrl/ |
| 8490 |
|
checkpoint51o_pre (2003/10/24) |
| 8491 |
|
|
| 8492 |
|
o undid all of cp51 pending some cleanups and discussion |
| 8493 |
|
o added the [#include "AD_CONFIG.h"] statement to all files that need |
| 8494 |
|
it for adjoint/tl #defines |
| 8495 |
|
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
| 8496 |
|
o removed tools/genmake since it no longer works |
| 8497 |
|
|
| 8498 |
|
checkpoint51n_post (2003/10/23) |
| 8499 |
|
o modifications to make FREEZE flux visible to pkg/kpp |
| 8500 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 8501 |
|
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
| 8502 |
|
- subroutine FREEZE now limits only surface temperature |
| 8503 |
|
(this means new output.txt for global_ocean.90x40x15, |
| 8504 |
|
global_ocean.cs32x15, and global_with_exf) |
| 8505 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 8506 |
|
|
| 8507 |
|
checkpoint51n_pre (2003/10/23) |
| 8508 |
|
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
| 8509 |
|
o added [#include "AD_CONFIG.h"] to all files that use the following |
| 8510 |
|
defines: |
| 8511 |
|
- ALLOW_ADJOINT_RUN |
| 8512 |
|
- ALLOW_TANGENTLINEAR_RUN |
| 8513 |
|
- ALLOW_ECCO_OPTIMIZATION |
| 8514 |
|
|
| 8515 |
|
checkpoint51m_post (2003/10/21) |
| 8516 |
|
o incorporating changes to get TAMC/TAF working in genmake2 |
| 8517 |
|
- added new TAMC/TAF targets to the Makefile |
| 8518 |
|
- various cleanups related to package handling |
| 8519 |
|
- these changes should have no impact on the forward model |
| 8520 |
|
|
| 8521 |
|
checkpoint51l_post (2003/10/20) |
| 8522 |
|
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
| 8523 |
|
- faster algorithm for cal_addtime.F |
| 8524 |
|
- higher precision arithmetic, where needed |
| 8525 |
|
- pkg/exf *startdate variables changed from calendar date to |
| 8526 |
|
model integration time |
| 8527 |
|
|
| 8528 |
|
checkpoint51l_pre (2003/10/17) |
| 8529 |
|
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
| 8530 |
|
o enable to apply restoring on S & T only in a latitude band. |
| 8531 |
|
o update output (external_forcing_surf modif. change truncation errors) |
| 8532 |
|
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
| 8533 |
|
|
| 8534 |
|
checkpoint51k_post (2003/10/16) |
| 8535 |
|
o change default to: useNHMTerms=.FALSE. |
| 8536 |
|
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
| 8537 |
|
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
| 8538 |
|
- new output.txt for idealized oceanic exp (NHMTerms are now turned off): |
| 8539 |
|
exp1, ideal_2D_oce |
| 8540 |
|
- change data file of oceanic exp (leave the results unchanged for now) |
| 8541 |
|
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box |
| 8542 |
|
o set gravitySign automatically according to the vertical coordinate used |
| 8543 |
|
(and change sign: back to "logical" value: +1 when R increases downward) |
| 8544 |
|
o added an include barrier to the default CPP_OPTIONS.h and |
| 8545 |
|
removed the #include "PACKAGES_CONFIG.h" from it |
| 8546 |
|
o fix a bug in mom_fluxform (from chk51j_post) |
| 8547 |
|
|
| 8548 |
|
checkpoint51j_post (2003/10/10) |
| 8549 |
|
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
| 8550 |
|
o adjusted some flow directives (dynamics, thermodynamics) |
| 8551 |
|
o added cubed-sphere case to test cost function |
| 8552 |
|
o heckpoint_lev?_directives.h now include |
| 8553 |
|
pkg-specific directives, whenever those are enabled. |
| 8554 |
|
o Moving pkg-specific flow directives to corresponding pkg |
| 8555 |
|
Moving pkg-specific differentiation list to corresponding pkg |
| 8556 |
|
Moving pkg-specific checkpoint-lev storing to corresponding pkg |
| 8557 |
|
---> conventions are |
| 8558 |
|
- pkg_ad.flow |
| 8559 |
|
- pkg_ad_diff.list |
| 8560 |
|
- pkg_ad_check_lev?_dir.h |
| 8561 |
|
|
| 8562 |
|
checkpoint51i_post (2003/10/09) |
| 8563 |
|
o merge of the branch-genmake2 |
| 8564 |
|
- knowingly breaks the older genmake |
| 8565 |
|
- automatic generation of all ALLOW_${PKG_NAME} defines |
| 8566 |
|
- new testreport supersedes older testscript |
| 8567 |
|
o large number of package inclusion and header cleanups |
| 8568 |
|
checkpoint51i_pre (2003/10/08) |
| 8569 |
|
|
| 8570 |
|
o new output for adjoin of global ocean vector invariant |
| 8571 |
|
o fix for checkpoint of thermodynamic seaice and bulk_force |
| 8572 |
|
o Steph gchem various cleanups |
| 8573 |
|
|
| 8574 |
|
checkpoint 51h_pre |
| 8575 |
|
o fixed some single quotes |
| 8576 |
|
o modify gchem pkg to be more versatile |
| 8577 |
|
o modifications to clean up dic pkg |
| 8578 |
|
o add pkg/cfc |
| 8579 |
|
|
| 8580 |
|
checkpoint51g_post (2003/10/02) |
| 8581 |
|
o provide links for ARPACK and ADM*TLM |
| 8582 |
|
o start removing verification/vero/ |
| 8583 |
|
o update AD-related stuff |
| 8584 |
|
(in particular some IF-statements in model/src/ routines) |
| 8585 |
|
o adding to verification/global_ocean.90x40x15/ adjoint of |
| 8586 |
|
vector invariant setup |
| 8587 |
|
|
| 8588 |
|
checkpoint51f_post (2003/10/02) |
| 8589 |
|
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
| 8590 |
|
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
| 8591 |
|
of tracer Green's fucntions for ocean inversion project. |
| 8592 |
|
|
| 8593 |
|
checkpoint51f_pre (2003/08/07) |
| 8594 |
|
o Added on-the-fly spatial interpolation capability |
| 8595 |
|
"USE_EXF_INTERPOLATION" to pkg/exf. |
| 8596 |
|
- This is a temporary Cartesian-grid hack until |
| 8597 |
|
the super-duper ESMF coupler becomes available. |
| 8598 |
|
- See verification/global_with_exf/README for usage example. |
| 8599 |
|
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid |
| 8600 |
|
flags and modified pkg/seaice accordingly. |
| 8601 |
|
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F, |
| 8602 |
|
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
| 8603 |
|
non-local transport term. |
| 8604 |
|
|
| 8605 |
|
checkpoint51e_post (2003/08/03) |
| 8606 |
|
o pkg/mom_vecinv: |
| 8607 |
|
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
| 8608 |
|
- add time-ave diagnostic of vorticity advection. |
| 8609 |
|
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV. |
| 8610 |
|
o atmospheric geopotential: - include water vapor effect; |
| 8611 |
|
- use p^kappa in p* scaling. |
| 8612 |
|
o land pkg: read initial state from files. |
| 8613 |
|
o AIM : add stratospheric drag in the upper level |
| 8614 |
|
|
| 8615 |
|
checkpoint51d_post (2003/07/18) |
| 8616 |
|
o change function ILNBLNK (=> last non-blank char.) to return zero |
| 8617 |
|
(instead of the string length) when the string. char is empty |
| 8618 |
|
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
| 8619 |
|
o modif's to restore TAMC compatibility |
| 8620 |
|
- avoid "_d" constructs in PARAMETER declarations |
| 8621 |
|
- avoid interrupting lines by comment lines |
| 8622 |
|
o Use cluster local disks for purely local I/O |
| 8623 |
|
vs. globally visible disks needed for ctrl stuff |
| 8624 |
|
(merged from ecco-branch) |
| 8625 |
|
- new active_file_loc... and mdsio_..._loc routines |
| 8626 |
|
- affected packages: autodiff, ctrl, grdchk, mdsio |
| 8627 |
|
|
| 8628 |
|
checkpoint51c_post (2003/07/08) |
| 8629 |
|
o introducing integer flag debugLevel |
| 8630 |
|
- debLevZero: suppress all output |
| 8631 |
|
- debLevA: standard |
| 8632 |
|
- debLevB: equivalent to current debugMode=.TRUE. |
| 8633 |
|
o introducing pathname variable mdsioLocalDir for mdsio |
| 8634 |
|
that can be specified at runtime |
| 8635 |
|
(relevant for cluster I/O to local disk) |
| 8636 |
|
` |
| 8637 |
|
>>>checkpoint51b_post |
| 8638 |
|
adjoint of ptracers |
| 8639 |
|
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM |
| 8640 |
|
o extended state in checkpoint_lev?, etc. |
| 8641 |
|
o alternative ctrl/cost with tr1 or ptracer |
| 8642 |
|
o new comlev1_bibj_ptracers |
| 8643 |
|
o new ptracers.flow |
| 8644 |
|
o made ptracers_forcing same as external_forcing_s |
| 8645 |
|
o added verification for adjoint with ptracers |
| 8646 |
|
- adm. grdchk fail so far |
| 8647 |
|
- tlm. grdchk OK |
| 8648 |
|
- checked tapelev/comlev recomputations: OK |
| 8649 |
|
<<<checkpoint51b_pre |
| 8650 |
|
|
| 8651 |
|
checkpoint51a_post (2003/06/25) |
| 8652 |
|
o added code for biogeochemistry package |
| 8653 |
|
- new pkgs: dic, gchem |
| 8654 |
|
- new subroutine in ptracers |
| 8655 |
|
o modify code for biogeo packages |
| 8656 |
|
- in model/src and pkg/ptracers |
| 8657 |
|
|
| 8658 |
|
checkpoint51 (2003/06/24) |
| 8659 |
|
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
| 8660 |
|
- autodiff, ctrl, exf, grdchk, seaice |
| 8661 |
|
kept separate packages |
| 8662 |
|
- cost, ecco, obcs |
| 8663 |
|
o updating verification/internal_wave, verification/lab_sea |
| 8664 |
|
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
| 8665 |
|
|
| 8666 |
|
checkpoint50i_post (2003/06/23) |
| 8667 |
|
o Preparing next differentiable checkpoint and sync |
| 8668 |
|
of MAIN vs. ecco-branch |
| 8669 |
|
- 1st step: this one is differentiable |
| 8670 |
|
- 2nd step: next(! not this) checkpoint will have updated packages |
| 8671 |
|
from ecco-branch) |
| 8672 |
|
|
| 8673 |
|
checkpoint50h_post (2003/06/20) |
| 8674 |
|
o new package "land": provide surface BC for AIM. |
| 8675 |
|
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
| 8676 |
|
o AIM: use true log-P extrapolation for near surface temp (= as in |
| 8677 |
|
F.Molteni paper) ; update aim.5l_cs output. |
| 8678 |
|
o New variable in PARM03 for more flexible pickups |
| 8679 |
|
o somewhat cleaned package initialisation sequence for |
| 8680 |
|
ctrl/ cost/ ecco/ in packages_... routines |
| 8681 |
|
|
| 8682 |
|
checkpoint50g_post (2003/05/23) |
| 8683 |
|
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
| 8684 |
|
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
| 8685 |
|
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
| 8686 |
|
made the default because of faster convergence than ADI |
| 8687 |
|
|
| 8688 |
|
checkpoint50f_post (2003/05/23) |
| 8689 |
|
o exf totally restructured |
| 8690 |
|
- replaced all exf_set_ routines by one generic exf_set_gen.F |
| 8691 |
|
and made sure it's still differentiable |
| 8692 |
|
- split exf_getffields.F into new exf_bulkformulae.F |
| 8693 |
|
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
| 8694 |
|
- updated adjoint/makefile and relevant verif. accordingly |
| 8695 |
|
|
| 8696 |
|
checkpoint50f_pre (2003/05/23) |
| 8697 |
|
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
| 8698 |
|
+ change Evap over land. (update aim.5l_cs output) |
| 8699 |
|
o added missing .cvsignores and made uniform across expts |
| 8700 |
|
o changed configuration of tidal_basin_2d expt |
| 8701 |
|
o added pkg/debug functions for tracing code in fatal crashes |
| 8702 |
|
o tidied pkg/monitor to use MONITOR_OPTIONS.h |
| 8703 |
|
o new fn in pkg/monitor to stop model if solution grows too big |
| 8704 |
|
o removed lots of single quotes from comments |
| 8705 |
|
|
| 8706 |
|
checkpoint50e_post (2003/05/14) |
| 8707 |
|
o make KPP work with PTRACERS |
| 8708 |
|
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
| 8709 |
|
nearly a copy of kpp_transport_s |
| 8710 |
|
- there is no analogue to SurfaceTendencyS, so I have to use |
| 8711 |
|
gPtr(of the surface layer) instead |
| 8712 |
|
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
| 8713 |
|
checkpoint50e_pre (2003/05/13) |
| 8714 |
|
|
| 8715 |
|
checkpoint50d_post (2003/05/13) |
| 8716 |
|
o change kpp output from multiple-record state files to single-record state |
| 8717 |
|
files analogous to write_state.F |
| 8718 |
|
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
| 8719 |
|
analogous to the cg2d-related output. |
| 8720 |
|
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
| 8721 |
|
so that writing to internal file fn (with length 512) fails. |
| 8722 |
|
checkpoint50d_pre (2003/05/12) |
| 8723 |
|
|
| 8724 |
|
checkpoint50c_post (2003/05/12) |
| 8725 |
|
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
| 8726 |
|
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
| 8727 |
|
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
| 8728 |
|
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
| 8729 |
|
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
| 8730 |
|
|
| 8731 |
|
checkpoint50c_pre (2003/04/30) |
| 8732 |
|
Merging from release1_p13: |
| 8733 |
|
o bug fix for pkg/seaice dynamic solver |
| 8734 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 8735 |
|
|
| 8736 |
|
checkpoint50b_post (2003/04/17) |
| 8737 |
|
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
| 8738 |
|
o in order to put the momForcing out of the Adams-Bashforth: |
| 8739 |
|
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
| 8740 |
|
to timestep.F |
| 8741 |
|
o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays |
| 8742 |
|
o re-generate output for highly sensitive test-exp: |
| 8743 |
|
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
| 8744 |
|
|
| 8745 |
|
checkpoint50b_pre (2003/04/17) |
| 8746 |
|
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
| 8747 |
|
o corrected CPP option mismatch in exf_Bulk... functions for case |
| 8748 |
|
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
| 8749 |
|
|
| 8750 |
|
checkpoint50a_post (2003/03/21) |
| 8751 |
|
o Bug fix for merging between c50 and KPP. |
| 8752 |
|
ikey was passed from thermodynamics to kpp_calc via |
| 8753 |
|
common block rather than being recomputed in kpp_calc, |
| 8754 |
|
in contradiction with new key itdkey. |
| 8755 |
|
New key ikppkey created, and tamc.h headers updated. |
| 8756 |
|
|
| 8757 |
|
checkpoint50 (2003/03/08) |
| 8758 |
|
- 2nd step of merge with ecco-branch: |
| 8759 |
|
merge changes in ecco-branch back into main trunk |
| 8760 |
|
- bug fix in find_alpha |
| 8761 |
|
- more storing in gmredi_calc_tensor.F, kpp_routines.F |
| 8762 |
|
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
| 8763 |
|
- merged some sliced AD support routines |
| 8764 |
|
|
| 8765 |
|
checkpoint49 (2003/03/06) |
| 8766 |
|
merged from ecco-branch: |
| 8767 |
|
o exf: |
| 8768 |
|
- Enable initialisation of forcing fields to constant |
| 8769 |
|
(runtime) values. |
| 8770 |
|
- in exf_getffields.F |
| 8771 |
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
| 8772 |
|
That also fixes wrong TAF-key computations for key_1, key_2 |
| 8773 |
|
with bulf formulae. |
| 8774 |
|
- exf_init.F modify #ifdef for exf_init_evap |
| 8775 |
|
- exf_getffieldrec.F, ctrl_getrec.F |
| 8776 |
|
The following INT-usages are not safe: |
| 8777 |
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
| 8778 |
|
fldcount = int(fldsecs/fldperiod) + 1 |
| 8779 |
|
and were modified. |
| 8780 |
|
o autodiff: checkpoint_lev... |
| 8781 |
|
- updated storing for bulk formulae (some arrays were missing) |
| 8782 |
|
- added state for seaice package |
| 8783 |
|
- synchronized with main branch |
| 8784 |
|
o DIVA: |
| 8785 |
|
Modif.s in |
| 8786 |
|
- the_main_loop.F |
| 8787 |
|
- the_model_main.F |
| 8788 |
|
and added cost_final_restore.F cost_final_store.F |
| 8789 |
|
o With these changes, it is possible to fully separate |
| 8790 |
|
the first forward run to compute the cost function (mdthe_main_loop) |
| 8791 |
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
| 8792 |
|
into separate model executions. |
| 8793 |
|
This enables better tuning of DIVA to given queue sizes. |
| 8794 |
|
o Loss of cost function value in consecutive DIVA runs is |
| 8795 |
|
fixed by storing to 'costfinal' file. |
| 8796 |
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
| 8797 |
|
beginning/end of adjoint integration is accounted for. |
| 8798 |
|
The current changes apply to TAF-1.4.26. |
| 8799 |
|
TAF has one remaining bug, requiring one manual change |
| 8800 |
|
(see MITgcm manual). |
| 8801 |
|
o cal: synchronized between MAIN and ecco-branch |
| 8802 |
|
|
| 8803 |
|
checkpoint48i_post (2003/03/05) |
| 8804 |
|
o Changes to restore differentiability of code w.r.t. previous tag |
| 8805 |
|
(mostly adding new routines to make list and replacing |
| 8806 |
|
pressure by totPhiHyd). |
| 8807 |
|
o Updated and merged grdchk package |
| 8808 |
|
- has both ADM and TLM checks |
| 8809 |
|
- works for single- and multi-proc. |
| 8810 |
|
- output cleaned |
| 8811 |
|
- worked successfully for parallel DIVA |
| 8812 |
|
o genmake: |
| 8813 |
|
- Adding -platform=SP4 |
| 8814 |
|
- Modif. for DEC Alpha (many don't have makedepend; use mkdep instead). |
| 8815 |
|
o Modif. for DIVA: |
| 8816 |
|
ctrl_unpack should not be called in intermediate DIVA interval. |
| 8817 |
|
(similar thing would apply for active files such as |
| 8818 |
|
tbar, sbar, psbar, which should not be reinitialised; |
| 8819 |
|
only relevant for ecco-branch) |
| 8820 |
|
|
| 8821 |
|
checkpoint48h_post (2003/02/28) |
| 8822 |
|
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
| 8823 |
|
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
| 8824 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 8825 |
|
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
| 8826 |
|
|
| 8827 |
|
checkpoint48g_post (2003/02/18) |
| 8828 |
|
--- EOS: |
| 8829 |
|
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
| 8830 |
|
store total Potential in totPhyHyd for diagnostics & EOS. |
| 8831 |
|
o fix restart and overlap Pb when using Z-coord and EOS funct. of P |
| 8832 |
|
--- Pressure/geopotential gradient: |
| 8833 |
|
o use Ro_surf & R_low instead of hFac in cal_phi_hyd: |
| 8834 |
|
o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind |
| 8835 |
|
( changes results of global_ocean_pressure ) |
| 8836 |
|
o NLFS + z-coord.: add eta*Rho' contribution. |
| 8837 |
|
o accurate phiHyd when using interface-W at the middle between 2 centers |
| 8838 |
|
( changes results of ideal_2D_oce ) |
| 8839 |
|
o includes r* 2nd term in potential gradient. |
| 8840 |
|
|
| 8841 |
|
checkpoint48f_post (2003/02/18) |
| 8842 |
|
Merging from release1_p12: |
| 8843 |
|
o Modifications for using pkg/exf with pkg/seaice |
| 8844 |
|
- improved description of the various forcing configurations |
| 8845 |
|
- added basic radiation bulk formulae to pkg/exf |
| 8846 |
|
- units/sign fix for evap computation in exf_getffields.F |
| 8847 |
|
- updated verification/global_with_exf/results/output.txt |
| 8848 |
|
o Added pkg/sbo for computing IERS Special Bureau for the Oceans |
| 8849 |
|
(SBO) core products, including oceanic mass, center-of-mass, |
| 8850 |
|
angular, and bottom pressure (see pkg/sbo/README.sbo). |
| 8851 |
|
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F |
| 8852 |
|
to avoid negative values in shallow regions. |
| 8853 |
|
- updated verification/natl_box/results/output.txt |
| 8854 |
|
- updated verification/lab_sea/results/output.txt |
| 8855 |
|
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F |
| 8856 |
|
o Added useSingleCpuIO option (see PARAMS.h). |
| 8857 |
|
o Updated useSingleCpuIO option in mdsio_writefield.F to |
| 8858 |
|
work with multi-field files, e.g., for single-file pickup. |
| 8859 |
|
o pkg/seaice: |
| 8860 |
|
- bug fix in growth.F: QNET for no shortwave case |
| 8861 |
|
- added HeffFile for specifying initial sea-ice thickness |
| 8862 |
|
- changed SEAICE_EXTERNAL_FLUXES wind stress implementation |
| 8863 |
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
| 8864 |
|
kpp_transport_t.F, forward_step.F, and the_main_loop.F |
| 8865 |
|
o pkg/seaice: |
| 8866 |
|
- adjoint-friendly modifications |
| 8867 |
|
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
| 8868 |
|
|
| 8869 |
|
checkpoint48e_post (2003/02/12) |
| 8870 |
|
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
| 8871 |
|
o dynamics: change definition of computational domain & adapt mom_fluxform |
| 8872 |
|
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
| 8873 |
|
o following exp works with Olx=Oly=2 (and pass through checkbounds option): |
| 8874 |
|
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1 |
| 8875 |
|
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5 |
| 8876 |
|
global_ocean.90x40x15 global_with_exf global_ocean_pressure |
| 8877 |
|
inverted_barometer solid-body.cs-32x32x1 |
| 8878 |
|
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
| 8879 |
|
|
| 8880 |
|
checkpoint48d_post (2003/02/09) |
| 8881 |
|
o in preparation for r*: |
| 8882 |
|
a) use pre-computed gradient of hydrostatic potential: |
| 8883 |
|
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
| 8884 |
|
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd: |
| 8885 |
|
=> affects results of glob_oce_pressure (different truncation error) |
| 8886 |
|
update output.txt of ideal_2D_oce & global_ocean_pressure |
| 8887 |
|
|
| 8888 |
|
checkpoint48d_pre (2003/02/08) |
| 8889 |
|
o in preparation for r*: |
| 8890 |
|
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
| 8891 |
|
pass the 2 comp. of the grad. as arguments to momentum S/R. |
| 8892 |
|
but for the moment, only used if it does not change the results. |
| 8893 |
|
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
| 8894 |
|
|
| 8895 |
|
checkpoint48c_post (2003/02/06) |
| 8896 |
|
Modifications in treatment of initial flux forcing controls |
| 8897 |
|
to avoid extra storing of flux fields. |
| 8898 |
|
|
| 8899 |
|
checkpoint48c_pre (2003/01/21) |
| 8900 |
|
o Added tidal_basin_2d experiment (currently 1D!) |
| 8901 |
|
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
| 8902 |
|
|
| 8903 |
|
checkpoint48b_post (2003/01/27) |
| 8904 |
|
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
| 8905 |
|
(modification to pressure gradient not yet implemented) |
| 8906 |
|
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
| 8907 |
|
(for U & V) that are used for vertical advection of momentum. |
| 8908 |
|
|
| 8909 |
|
checkpoint48a_post (2003/01/24) |
| 8910 |
|
o In preparation for r*, use temp. array to compute vertical transport |
| 8911 |
|
in flux-form momentum pkg. => change results of few test-exp. |
| 8912 |
|
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
| 8913 |
|
lab_sea, natl_box & plume_on_slope |
| 8914 |
|
|
| 8915 |
|
checkpoint48 (2003/01/23) |
| 8916 |
|
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
| 8917 |
|
|
| 8918 |
|
checkpoint47j_post (2003/01/21) |
| 8919 |
|
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
| 8920 |
|
o moved adexch from forward_step to addummy_in_stepping |
| 8921 |
|
o added exch in ctrl_map_... |
| 8922 |
|
o aveFreq.=0. at end of cost_final to avoid overwrite in |
| 8923 |
|
reverse checkpointing loop |
| 8924 |
|
o Yet more changes in gmredi: |
| 8925 |
|
* adgmredi_calc_tensor |
| 8926 |
|
avoiding all recomputation of gmredi_slope_limit |
| 8927 |
|
* adgmredi_x/y/rtransport |
| 8928 |
|
added flag for excessive storing to avoid recomp. of |
| 8929 |
|
u/v/rtans, dTdx/y/z |
| 8930 |
|
-> this is not really necessary and very memory-consuming |
| 8931 |
|
* adgmredi_slope_psi: |
| 8932 |
|
consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff |
| 8933 |
|
* gmredi_slope_limit |
| 8934 |
|
re-activated full calculation of taperfct for case 'ac02' |
| 8935 |
|
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
| 8936 |
|
|
| 8937 |
|
checkpoint47i_post (2003/01/13) |
| 8938 |
|
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
| 8939 |
|
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
| 8940 |
|
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
| 8941 |
|
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf) |
| 8942 |
|
o gmredi: fix few bugs. |
| 8943 |
|
|
| 8944 |
|
checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48) |
| 8945 |
|
This will be a good checkpoint to plug into the ecco-branch. |
| 8946 |
|
o few modif.'s to get latest version adjointed |
| 8947 |
|
(mainly kick out code in ini_linear_phisurf) |
| 8948 |
|
o modif's to run adjoint with exactConserv |
| 8949 |
|
o case GM_BOLUS_ADVEC should be cleaned |
| 8950 |
|
S/R gmredi_slope_psi should be cleaned |
| 8951 |
|
o verification/carbon now has exactConserv=.TRUE. |
| 8952 |
|
|
| 8953 |
|
checkpoint47g_post (2003/01/10) |
| 8954 |
|
o time-average AIM output: becomes independent from statvars time-average |
| 8955 |
|
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
| 8956 |
|
o After TAF bug fix: |
| 8957 |
|
Tested adjoint of gmredi package. |
| 8958 |
|
Tests were done with checkpoint47 rather than with latest |
| 8959 |
|
checkpoint47f_post since the latter is broken for the adjoint |
| 8960 |
|
verification/carbon/ contains both ADM and TLM gradient checks. |
| 8961 |
|
Here they are, before they get changed/lost/stolen. |
| 8962 |
|
Mostly modif.'s to fix numerical sensitivities. |
| 8963 |
|
Gradient checks OK for |
| 8964 |
|
- GM_taper_scheme: |
| 8965 |
|
* clipping |
| 8966 |
|
* ac02 |
| 8967 |
|
* linear |
| 8968 |
|
* glw91 |
| 8969 |
|
* dm95 |
| 8970 |
|
* ldd97 |
| 8971 |
|
- GMREDI_OPTIONS: |
| 8972 |
|
* GM_VISBECK_VARIABLE_K |
| 8973 |
|
* GM_NON_UNITY_DIAGONAL |
| 8974 |
|
* GM_EXTRA_DIAGONAL |
| 8975 |
|
* GM_BOLUS_ADVEC |
| 8976 |
|
in conjunction with data.gmredi parameters to be checked in |
| 8977 |
|
in a few minutes under verification/carbon/code/ |
| 8978 |
|
|
| 8979 |
|
checkpoint47f_post (2002/12/28) |
| 8980 |
|
Merging from release1_p10: |
| 8981 |
|
o modifications for using pkg/exf with pkg/seaice |
| 8982 |
|
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
| 8983 |
|
and SEAICE_EXTERNAL_FLUXES |
| 8984 |
|
- pkg/exf CPP options EXF_READ_EVAP and |
| 8985 |
|
EXF_NO_BULK_COMPUTATIONS |
| 8986 |
|
- usage examples are Experiments 8 and 9 in |
| 8987 |
|
verification/lab_sea/README |
| 8988 |
|
- verification/lab_sea default experiment now uses |
| 8989 |
|
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
| 8990 |
|
|
| 8991 |
|
checkpoint47e_post (2002/12/27) |
| 8992 |
|
o created a tag prior to creating a branch |
| 8993 |
|
|
| 8994 |
|
checkpoint47d_post (2002/12/16) |
| 8995 |
|
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
| 8996 |
|
at the bottom boundary had an erroneous half slip boundary condition |
| 8997 |
|
o added bottom drag and no slip boundary condition capabilities to |
| 8998 |
|
oceanic pressure coordinates code |
| 8999 |
|
o added new verification experiment global_ocean_pressure, this experiment is |
| 9000 |
|
also described in the tutorial section of the manual |
| 9001 |
|
checkpoint47d_pre (2002/12/16) |
| 9002 |
|
|
| 9003 |
|
checkpoint47c_post (2002/12/16) |
| 9004 |
|
o Added a verification experiment for a global cubed-sphere ocean run |
| 9005 |
|
- verification/global_ocean.cubed32x32x30 |
| 9006 |
|
- uses pkg/therm_seaice and pkg/bulk_forcing |
| 9007 |
|
|
| 9008 |
|
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) |
| 9009 |
|
o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) |
| 9010 |
|
when using P-coordinate; only implemented for atmospheric config. |
| 9011 |
|
o OCEANICP & realFreshWater: include P-E direct effect on wVel ; |
| 9012 |
|
NOTES: requires option NONLIN_FRSURF to be "#define". |
| 9013 |
|
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
| 9014 |
|
|
| 9015 |
|
checkpoint47b_post (2002/12/05) |
| 9016 |
|
Merging from release1_p9: |
| 9017 |
|
o pkg/seaice |
| 9018 |
|
- removed GOTO's and added taf directives |
| 9019 |
|
- double precision constants to reduce the g77 (Linux) |
| 9020 |
|
to F77 (SGI) differences reported in release1_p8 |
| 9021 |
|
o tools/genmake |
| 9022 |
|
- added SGI options |
| 9023 |
|
o verification/testscript |
| 9024 |
|
- updated to that of checkpoint47a_post |
| 9025 |
|
o verification/global_ocean.90x40x15/input/eedata |
| 9026 |
|
- modified for SGI f77 compatibility |
| 9027 |
|
o verification/lab_sea |
| 9028 |
|
- added description of sea-ice model |
| 9029 |
|
- added missing matlab routines |
| 9030 |
|
- added test of thermodynamics parallelization |
| 9031 |
|
|
| 9032 |
|
checkpoint47a_post (2002/11/23) |
| 9033 |
|
o new pkg: aim_v23 |
| 9034 |
|
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
| 9035 |
|
for now, keep the same surface forcing as before. |
| 9036 |
|
- Part-Cell implemented into AIM; check that Heat & Water are conserved |
| 9037 |
|
- aim.5l_cs: use new aim pkg (run 10yr & get better results than before) |
| 9038 |
|
- aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg |
| 9039 |
|
o add diagnostic of surface correction term in monitor output |
| 9040 |
|
|
| 9041 |
|
o bulk_force and therm_seaice |
| 9042 |
|
- Two packages: bulk_force (Bulk forcing) |
| 9043 |
|
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2 |
| 9044 |
|
- Earlier integration from Stephaine Dutkiewicz |
| 9045 |
|
and Patrick Heimbach. |
| 9046 |
|
- Two ifdef statements for compile time, |
| 9047 |
|
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
| 9048 |
|
|
| 9049 |
|
checkpoint47 (2002/11/15) |
| 9050 |
|
differentiable version of checkpoint46n_post |
| 9051 |
|
o bug fix in quasihydrostaticterms |
| 9052 |
|
o * "clean" adjoint code (in terms of extensive recomputations) |
| 9053 |
|
can now be obtained for all GMREDI options (i.e. for |
| 9054 |
|
- GM_VISBECK_VARIABLE_K |
| 9055 |
|
- GM_NON_UNITY_DIAGONAL |
| 9056 |
|
- GM_EXTRA_DIAGONAL |
| 9057 |
|
- GM_BOLUS_ADVEC ) |
| 9058 |
|
* However, wrong gradient check problem remains unsolved. |
| 9059 |
|
* New CPP options have been introduced for different |
| 9060 |
|
tapering schemes |
| 9061 |
|
o external_fields_load now part of differentiation list |
| 9062 |
|
o pressure needs multiple storing; |
| 9063 |
|
would be nice to have store_pressure at beginning or |
| 9064 |
|
end of forward_step, e.g. by having phiHyd global (5-dim.) |
| 9065 |
|
(NB: pressure is needed for certain cases in find_rho, |
| 9066 |
|
which is also invoked through convective_adjustment). |
| 9067 |
|
o recomputations in find_rho for cases |
| 9068 |
|
'JMD95'/'UNESCO' or 'MDJWF' are OK. |
| 9069 |
|
o #define ATMOSPHERIC_LOADING should be differentiable |
| 9070 |
|
o ini_forcing shifted to begining of initialise_varia |
| 9071 |
|
o Incorporating QNVS line search routines into MITgcm |
| 9072 |
|
(this is separate code, and therefore not under pkg) |
| 9073 |
|
lsopt/, optim/ |
| 9074 |
|
o Updated verification/carbon/ |
| 9075 |
|
- #define GM_VISBECK_VARIABLE_K |
| 9076 |
|
- GM_taper_scheme = 'ldd97' |
| 9077 |
|
|
| 9078 |
|
checkpoint46n_post (2002/11/12) |
| 9079 |
|
Merging from release1_p8: |
| 9080 |
|
o verification/natl_box: |
| 9081 |
|
updating new external_fields_load routine |
| 9082 |
|
o New package: pkg/seaice |
| 9083 |
|
Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle). |
| 9084 |
|
The sea-ice code is based on Hibler (1979-1980). |
| 9085 |
|
Two sea-ice dynamic solvers, ADI and LSR, are included. |
| 9086 |
|
In addition to computing prognostic sea-ice variables and diagnosing |
| 9087 |
|
the forcing/external data fields that drive the ocean model, |
| 9088 |
|
SEAICE_MODEL also sets theta to the freezing point under sea-ice. |
| 9089 |
|
The implied surface heat flux is then stored in variable |
| 9090 |
|
surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and |
| 9091 |
|
kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the |
| 9092 |
|
non-local transport term. Because this call precedes model |
| 9093 |
|
thermodynamics, temperature under sea-ice may not be "exactly" at |
| 9094 |
|
the freezing point by the time theta is dumped or time-averaged. |
| 9095 |
|
N.B.: fairly large differences in accuracy occur across |
| 9096 |
|
different platforms/compilers; comparison between |
| 9097 |
|
g77 (Linux) and F77 (SGI Origin 2000/MIPSpro) |
| 9098 |
|
generated output gives: |
| 9099 |
|
T S U V |
| 9100 |
|
C D M c m s m s m s m s |
| 9101 |
|
n p a R g m m e . m m e . m m e . m m e . |
| 9102 |
|
f n k u 2 i a a d i a a d i a a d i a a d |
| 9103 |
|
g d e n d n x n . n x n . n x n . n x n . |
| 9104 |
|
|
| 9105 |
|
Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea |
| 9106 |
|
o GAD: |
| 9107 |
|
- generated new common blocks to account for call of |
| 9108 |
|
same gad routines with differing traceridentities |
| 9109 |
|
(needed to modify tracerIdentity indices in GAD.h) |
| 9110 |
|
- generated separate common blocks for case useCubedSphereExchange |
| 9111 |
|
(Department of Futurology) |
| 9112 |
|
- parameter lists to gmredi_?transport: added tracerIdentity |
| 9113 |
|
- added new key indices to tamc.h |
| 9114 |
|
o external_fields_load: |
| 9115 |
|
- added this routine to TAF list |
| 9116 |
|
- needed to make some common blocks global and additional storing |
| 9117 |
|
along the same lines as exf package (checkpoint_lev?_directives.h) |
| 9118 |
|
o exf: |
| 9119 |
|
updated external forcing package |
| 9120 |
|
- bug fixes carried over from ecco-branch |
| 9121 |
|
(missing OBCS_OPTIONS.h in two routines) |
| 9122 |
|
- enable easy to use "no forcing". |
| 9123 |
|
- added exf I/O for atmospheric loading |
| 9124 |
|
- added exf I/O for runoff data |
| 9125 |
|
- transfered scaling between exf <-> MITgcm to exf namelist |
| 9126 |
|
o Adding new verification experiment global_with_exf. |
| 9127 |
|
This verification experiment is almost identical to the |
| 9128 |
|
global_ocean.90x40x15 experiment, except that it uses |
| 9129 |
|
the exf (and cal) package instead of the |
| 9130 |
|
external_fields_load routine (cf README file). |
| 9131 |
|
|
| 9132 |
|
checkpoint46m_post (2002/11/07) |
| 9133 |
|
o modified testscript to return -- when there are no lines of "%MON" output |
| 9134 |
|
o added new flag "quasiHydrostatic" for QH mode |
| 9135 |
|
and new routine quasihydrostaticterms() |
| 9136 |
|
o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term) |
| 9137 |
|
New routine: mom_u_coriolis_nh() |
| 9138 |
|
o fixed sign of non-hydrostatic metric terms in u and v equations. |
| 9139 |
|
Depend on correct sign of gravitySign. |
| 9140 |
|
o added work.pc* to .cvsignore in aim directories using ifc |
| 9141 |
|
o introduced flag for controllin non-hydrostatic metric terms |
| 9142 |
|
o removed gravitySign from PARM04 |
| 9143 |
|
o switched to g77/ifc from pgf77 in aim experiments |
| 9144 |
|
|
| 9145 |
|
checkpoint46l_post (2002/11/01) |
| 9146 |
|
o made convective adjustment work with pressure coordinates: |
| 9147 |
|
- changed the direction of k-loop in convective_adjustment.F for the |
| 9148 |
|
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
| 9149 |
|
- adjusted the reference pressure k-index in convective_adjustment.F |
| 9150 |
|
- adjusted the convection condition in convect.F (in analogy to |
| 9151 |
|
calc_ivdc.F) |
| 9152 |
|
- convective_adjustment no longer computes anything on the halos |
| 9153 |
|
- removed the warnings about negative salinity from find_rho.F and |
| 9154 |
|
find_alpha.F; instead the new routine look_for_neg_salinity, called |
| 9155 |
|
at the beginning of find_rho, find_alpha, and find_beta, does a |
| 9156 |
|
check of the entire slice, if CPP-option |
| 9157 |
|
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
| 9158 |
|
checkpoint46l_pre (2002/10/23) |
| 9159 |
|
|
| 9160 |
|
checkpoint46k_post (2002/10/23) |
| 9161 |
|
o fixed the verification/global_ocean.90x40x15 experiment: |
| 9162 |
|
- new bathymetry (the world according to A., JMC, and M.) |
| 9163 |
|
- new initial fields and forcing fields (*.bin files) |
| 9164 |
|
- new POLY3.COEFFS (for the next release one should switch to a full |
| 9165 |
|
equation of state: JMD95P or MDJWF) |
| 9166 |
|
- fixed several errors and redundancies in the data file |
| 9167 |
|
- experiment uses looped cells |
| 9168 |
|
- added matlab directory with diagnostic scripts for plotting of output |
| 9169 |
|
|
| 9170 |
|
o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: |
| 9171 |
|
- read AIM physics parameters from a file (data.aimphys) |
| 9172 |
|
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
| 9173 |
|
|
| 9174 |
|
checkpoint46j_post (2002/10/07) |
| 9175 |
|
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
| 9176 |
|
o move wVel computation at the end of the time step, in S/R integr_continuity |
| 9177 |
|
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
| 9178 |
|
o update timeave pkg for wVel diagnostic. |
| 9179 |
|
checkpoint46j_pre (2002/09/27) |
| 9180 |
|
|
| 9181 |
|
checkpoint46i_post (2002/09/25) |
| 9182 |
|
o Clean up AIM package (and keep the results unchanged): |
| 9183 |
|
include CPP_OPTION and use IMPLICT NONE in all routines ; |
| 9184 |
|
declare all the variables _RL ; use _d 0 for all numerical constants. |
| 9185 |
|
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
| 9186 |
|
|
| 9187 |
|
checkpoint46h_post (2002/09/25) |
| 9188 |
|
o cleaned up the use of rhoNil and rhoConst. |
| 9189 |
|
- rhoNil should only appear in the LINEAR equation of state, everywhere |
| 9190 |
|
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
| 9191 |
|
and the dynamical equations are all divided by rhoConst |
| 9192 |
|
o introduced new parameter rhoConstFresh, a reference density of fresh |
| 9193 |
|
water, to remove the fresh water flux's dependence on rhoNil. The default |
| 9194 |
|
value is 999.8 kg/m^3 |
| 9195 |
|
o cleanup up external_forcing.F and external_forcing_surf.F |
| 9196 |
|
- can now be used by both OCEANIC and OCEANICP |
| 9197 |
|
checkpoint46h_pre (2002/09/18) |
| 9198 |
|
|
| 9199 |
|
Added code to convert surface volume flux (fresh water) into |
| 9200 |
|
a mass flux when using P coordinates in the ocean (OCEANICP). |
| 9201 |
|
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
| 9202 |
|
|
| 9203 |
|
checkpoint46g_post (2002/09/18) |
| 9204 |
|
o Include a new diagnostic variable phiHydLow for the ocean model |
| 9205 |
|
- in z-coordinates, it is the bottom pressure anomaly |
| 9206 |
|
- in p-coordinates, it is the sea surface elevation |
| 9207 |
|
- in both cases, these variable have global drift, reflecting the mass |
| 9208 |
|
drift in z-coordinates and the volume drift in p-coordinates |
| 9209 |
|
- included time averaging for phiHydLow, be aware of the drift! |
| 9210 |
|
o depth-dependent computation of Bo_surf for pressure coordinates |
| 9211 |
|
in the ocean (buoyancyRelation='OCEANICP') |
| 9212 |
|
- requires a new routine (FIND_RHO_SCALAR) to compute density with only |
| 9213 |
|
Theta, Salinity, and Pressure in the parameter list. This routine is |
| 9214 |
|
presently contained in find_rho.F. This routine does not give the |
| 9215 |
|
correct density for 'POLY3', which would be a z-dependent reference |
| 9216 |
|
density. |
| 9217 |
|
o cleaned up find_rho |
| 9218 |
|
- removed obsolete 'eqn' from the parameter list. |
| 9219 |
|
o added two new verification experiments: gop and goz |
| 9220 |
|
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
| 9221 |
|
checkpoint46g_pre (2002/09/16) |
| 9222 |
|
|
| 9223 |
|
checkpoint46f_post (2002/09/16) |
| 9224 |
|
o Enable tangent linear (forward mode) gradient checks: |
| 9225 |
|
- extended active file handling to g_... files |
| 9226 |
|
- added TANGENT_SIMULATION to theSimulationMode |
| 9227 |
|
- extended grdchk package accordingly |
| 9228 |
|
o added tangent linear setup in verification/carbon/code_ftl |
| 9229 |
|
o added adjoint setup in verification/front_relax/code_ad |
| 9230 |
|
|
| 9231 |
|
checkpoint46e_post (2002/09/05) |
| 9232 |
|
o Added new equation of state -> MDJWF |
| 9233 |
|
- EOS of McDougall et al., 2002, JAOT, submitted |
| 9234 |
|
- caveat: the equation of state is only valid for a smaller (more |
| 9235 |
|
realistic?) range of values than JMD95P/Z and UNESCO |
| 9236 |
|
- added masks to the calculation of pressure in store_pressure |
| 9237 |
|
- added more check values for density in check_eos (ini_eos.F), some of |
| 9238 |
|
the old check values are out of the range of the MDJWF-eos, so don't |
| 9239 |
|
expect perfect matches for those |
| 9240 |
|
checkpoint46e_pre (2002/08/19) |
| 9241 |
|
|
| 9242 |
|
checkpoint46d_post (2002/08/19) |
| 9243 |
|
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
| 9244 |
|
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
| 9245 |
|
case of pressure coordinates. eosType='JMD95Z' in |
| 9246 |
|
combination with buoyancyRelation='OCEANICP' now causes an error. |
| 9247 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 9248 |
|
in find_alpha/beta. |
| 9249 |
|
checkpoint46d_pre (2002/08/15) |
| 9250 |
|
|
| 9251 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 9252 |
|
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
| 9253 |
|
|
| 9254 |
|
checkpoint46c_post (2002/08/15) |
| 9255 |
|
o Changes necessary for ocean in p-coordinates |
| 9256 |
|
- Added new buoyancy relation = 'OCEANICP' |
| 9257 |
|
- Added new parameters = gravitySign (this used to be contained inside |
| 9258 |
|
the factor dRdZ which I added when we first switched to R coordinates). |
| 9259 |
|
X GM/Redi is not compatible (yet) |
| 9260 |
|
X bottom drag and no-slip need to be debugged. |
| 9261 |
|
checkpoint46c_pre (2002/08/07) |
| 9262 |
|
|
| 9263 |
|
checkpoint46b_post (2002/08/07) |
| 9264 |
|
o Added new equation of state -> JMD95Z and JMD95P |
| 9265 |
|
- EOS of Jackett and McDougall, 1995, JAOT |
| 9266 |
|
- moved all EOS parameters into EOS.h |
| 9267 |
|
- new routines ini_eos.F, store_pressure.F |
| 9268 |
|
o Added UNESCO EOS, but not recommended because it requires |
| 9269 |
|
in-situ temperature (see JMD95) |
| 9270 |
|
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
| 9271 |
|
unesco.f to be used with POLY3 |
| 9272 |
|
checkpoint46b_pre (2002/07/31) |
| 9273 |
|
|
| 9274 |
|
checkpoint46a_post (2002/07/31) |
| 9275 |
|
o Added (atmospheric) pressure loading |
| 9276 |
|
- new field in FFIELDS.h, etc... |
| 9277 |
|
- new cpp flag ATMOSPHERIC_LOADING |
| 9278 |
|
o Changed hFacC to _hFacC in calc_phi_hyd.F |
| 9279 |
|
o Added SHORTWAVE_HEATING to some files for consistency |
| 9280 |
|
checkpoint46a_pre (2002/07/13) |
| 9281 |
|
|
| 9282 |
|
checkpoint46 (2002/07/13) |
| 9283 |
|
further merges from release1_p5 |
| 9284 |
|
o new ctrl package |
| 9285 |
|
- adopted from ECCO environment to enable optimization |
| 9286 |
|
- added Eliassen Palm fluxes to controls |
| 9287 |
|
o added Eliassen Palm flux controls to gradient check package |
| 9288 |
|
o cost package |
| 9289 |
|
- Compatible with new ctrl package |
| 9290 |
|
- added Eliassen Palm cost hooks |
| 9291 |
|
- modif's of existing cost functions |
| 9292 |
|
o Adjoint-related bug fixes in kpp: |
| 9293 |
|
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix |
| 9294 |
|
- kpp_routines: store of Rib avoids partial recomputation bug of TAF. |
| 9295 |
|
o autodiff package |
| 9296 |
|
- flow directives: |
| 9297 |
|
+ new for S/R do_the_model_io |
| 9298 |
|
+ enhanced for S/R checkpoint |
| 9299 |
|
+ new gmredi.flow |
| 9300 |
|
- Introduced CPP option ALLOW_AUTODIFF_MONITOR to |
| 9301 |
|
disable adcommon.h/g_common.h by default. |
| 9302 |
|
- fixed problem for adjoint of global_max |
| 9303 |
|
o modified verification/carbon/ |
| 9304 |
|
o New setup for adjoint of global_ocean |
| 9305 |
|
o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F) |
| 9306 |
|
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
| 9307 |
|
o incorporated hooks for sponge layer code (external_forcing.F) |
| 9308 |
|
|
| 9309 |
|
checkpoint45d_post (2002/07/12) |
| 9310 |
|
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
| 9311 |
|
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
| 9312 |
|
(affects plume_on_slope "cg2d" output) |
| 9313 |
|
o add new parameter deltaTfreesurf for free-surface time stepping |
| 9314 |
|
o exchange gT,gS when using staggerTimeStep & GM & Oly<4 |
| 9315 |
|
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
| 9316 |
|
o change phiMin in exp1 (to agree with documentation) |
| 9317 |
|
o add new flags: |
| 9318 |
|
- T,S forcing inside/outside Adams-Bashforth |
| 9319 |
|
- turn off temp,salt advection and/or forcing |
| 9320 |
|
- for each tracer, define internal flag for multiDimAdvection & A-B |
| 9321 |
|
o monitor: change definition of KE to check conservation of Energy |
| 9322 |
|
|
| 9323 |
|
checkpoint45c_post (2002/05/30) |
| 9324 |
|
o Removed f90 comments ("!") |
| 9325 |
|
o Modified initialisations to enable exf package for MITgcm |
| 9326 |
|
(without invoking ECCO_PACKAGE). |
| 9327 |
|
o modifications to gradient check package (Martin Losch) |
| 9328 |
|
- enable centered differences |
| 9329 |
|
- modified format of standard output |
| 9330 |
|
|
| 9331 |
|
checkpoint45b_post (2002/05/30) |
| 9332 |
|
o cleaned exchange calls in cg2d |
| 9333 |
|
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
| 9334 |
|
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
| 9335 |
|
to configure barotropic setup (Martin Losch) |
| 9336 |
|
o moved some initialisations within bi,bj loop in dynamics |
| 9337 |
|
(TAF flow dependency) |
| 9338 |
|
o in initialise_varia, moved call packages_init_variables |
| 9339 |
|
before convective_adjustment_init |
| 9340 |
|
(corresponding adjustment of TAF tape initialisation). |
| 9341 |
|
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
| 9342 |
|
|
| 9343 |
|
checkpoint45a_post (2002/05/01) |
| 9344 |
|
o compute Rho over the whole domain (extend iMin,jMin indices) |
| 9345 |
|
o specific exchange for X-slice domain (case Ny=1) |
| 9346 |
|
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
| 9347 |
|
o solve_for_pressure : set cg2d_x to zero where OBCS are applied |
| 9348 |
|
|
| 9349 |
|
checkpoint44h_post = checkpoint45 |
| 9350 |
|
o Fix to restore differentiability: |
| 9351 |
|
place at which packages_init_variables is called in |
| 9352 |
|
initialise_varia is crucial for reverse control flow. |
| 9353 |
|
o modifications in GMRedi to enable stable adjoint |
| 9354 |
|
(corresponding modif's in thermodynamics, dynamics) |
| 9355 |
|
o added missing hook for sponge layer code in external_forcing |
| 9356 |
|
o modified test cost functions |
| 9357 |
|
o storing in gad_advection (plus removal of write(0,*)! |
| 9358 |
|
o missing headers TR1.h added in convective_adjustment routines |
| 9359 |
|
o errorMessageUnit set non-equal zero in eeboot |
| 9360 |
|
(conflict on some platforms, e.g. IBM SP3) |
| 9361 |
|
o modified carbon verif. |
| 9362 |
|
|
| 9363 |
|
checkpoint44h_pre (2002/03/14) |
| 9364 |
|
o vertical grid option: allow to put the Interface at the middle between |
| 9365 |
|
2 cell-centers ; replace delZ in pkg/kpp by drF. |
| 9366 |
|
o GM Advective form: Tracers are advected using the residual transport (= |
| 9367 |
|
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
| 9368 |
|
|
| 9369 |
|
checkpoint44g_post (2002/03/05) |
| 9370 |
|
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
| 9371 |
|
results) ; ifdef missing in thermodynamics.F |
| 9372 |
|
|
| 9373 |
|
checkpoint44f_pre,checkpoint44f_post |
| 9374 |
|
o added PTRACERS package |
| 9375 |
|
This allows an arbitrary number of passive tracers to be integrated |
| 9376 |
|
forward simultaneously with the dynamicaly model. |
| 9377 |
|
+ Implemented so far: |
| 9378 |
|
- basic forward algorithm (time-stepping, advection, diffusion, convection) |
| 9379 |
|
- I/O and checkpointing |
| 9380 |
|
- GM/Redi *but* using the GM/Redi coefficient of Salt |
| 9381 |
|
+ Not implemented so far: |
| 9382 |
|
- KPP |
| 9383 |
|
- OBCS |
| 9384 |
|
+ No specific example supplied (yet) but global_ocean.90x40x15 has the |
| 9385 |
|
necessary data.ptracer file. Simply use -enable=ptracers and uncomment |
| 9386 |
|
line in data.pkg. |
| 9387 |
|
+ This package is disabled by default since it increases storage. |
| 9388 |
|
|
| 9389 |
|
|
| 9390 |
|
o testscript: added -cleanup option |
| 9391 |
|
o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter |
| 9392 |
|
b) enable to filter 2D fields. |
| 9393 |
|
|
| 9394 |
|
checkpoint44e_pre,post |
| 9395 |
|
o re-wrote convective adjustment to use pre-calculated weights |
| 9396 |
|
Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F |
| 9397 |
|
Adds: model/src/convective_weights.F, convectively_mixtracer.F |
| 9398 |
|
Original calls to convect() still in place. |
| 9399 |
|
|
| 9400 |
|
chkpt44d_pre,post |
| 9401 |
|
o added missing EXCLUDE_MONITOR flags |
| 9402 |
|
o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
| 9403 |
|
(incompatible typ in MIN/MAX expressions caused problems |
| 9404 |
|
on IBM SP3) |
| 9405 |
|
o in genmake added variable MAKEDEPEND |
| 9406 |
|
plus resetting for case SunOS |
| 9407 |
|
o added timer_stats.c routine for IBM SP3 |
| 9408 |
|
o removed variables in dynamics |
| 9409 |
|
!!! I forgot to create tag chkpt44d_pre !!! |
| 9410 |
|
!!! But chkpt44d_pre = chkpt44c_post !!! |
| 9411 |
|
|
| 9412 |
|
o real fresh water flux implemented with non-linear free-surface. |
| 9413 |
|
|
| 9414 |
|
chkpt44c_pre,post |
| 9415 |
|
o few fix (mask in shap_s2, EmPmR in external_field_load, |
| 9416 |
|
USE_NATURAL_BCS in solve_for_P); |
| 9417 |
|
o add arguments myIter & myTime to S/R obcs_calc & solve_for_P |
| 9418 |
|
|
| 9419 |
|
checkpoint44b_pre/_post |
| 9420 |
|
o merge of relevant stuff from the ecco-branch: |
| 9421 |
- genmake: removed $S64 overwrite for case SunOS |
- genmake: removed $S64 overwrite for case SunOS |
| 9422 |
- pkg/exf: update and corrections for field swapping and obcs |
- pkg/exf: update and corrections for field swapping and obcs |
| 9423 |
- pkg/ecco: parameter lists for the_model_main, the_main_loop |
- pkg/ecco: parameter lists for the_model_main, the_main_loop |
| 9425 |
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice |
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice |
| 9426 |
updated checkpointing_lev... lists for obcs |
updated checkpointing_lev... lists for obcs |
| 9427 |
- model/src: minor changes in forward_step, plot_field |
- model/src: minor changes in forward_step, plot_field |
| 9428 |
|
added directive for divided adjoint in the_main_loop |
| 9429 |
- pkg/mdsio: added mdsio_gl_slice |
- pkg/mdsio: added mdsio_gl_slice |
| 9430 |
|
|
| 9431 |
ecco-branch-mod3 |
o check parameters & config (chkpt44a_pre,post) |
| 9432 |
o this is the first part of changes necessary to reconcile |
o OBC and NonLin_FrSurf. |
|
natl_box_adjoint verification (with and without grdchk). |
|
|
This set of changes is relevant for ECCO only. |
|
|
The next set/tag of changes (ecco-branch-mod4) |
|
|
should be merged into the main trunk. |
|
|
- update some options |
|
|
- parameter lists of ecco_the_model_main and ecco_the_main_loop |
|
|
differed from those of the MITgcm counterparts. |
|
|
|
|
|
ecco-branch-mod2 |
|
|
o update ecco-branch-mod1 to checkpoint44 |
|
|
o exclude from updates: |
|
|
- verification/ |
|
|
- adjoint/ |
|
|
- pkg/cost |
|
|
- pkg/ctrl |
|
|
- pkg/ecco |
|
|
- pkg/obcs |
|
|
- model/src/the_model_main.F |
|
|
- model/src/the_main_loop.F |
|
| 9433 |
|
|
| 9434 |
checkpoint44 |
checkpoint44 (2002/01/18) |
|
o apply Shapiro filter on T&S before calc_PhiHyd (stagger time stepping) |
|
| 9435 |
o fix bug in mom_vi_del2uv |
o fix bug in mom_vi_del2uv |
| 9436 |
|
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
| 9437 |
|
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
| 9438 |
|
o update AIM experiments (NCEP input files) |
| 9439 |
|
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
| 9440 |
o added some stuff for AD |
o added some stuff for AD |
| 9441 |
|
|
| 9442 |
ecco-branch-mod1 |
checkpoint43 (2001/09/28) |
|
o based on c43 |
|
|
o replaced packages cost, ctrl, ecco, obcs |
|
|
o removed MITgcm verif.'s, added ECCO verif.'s |
|
|
o added lsopt, optim for line search optimization. |
|
|
|
|
|
checkpoint43 |
|
| 9443 |
o added two new advection tests |
o added two new advection tests |
| 9444 |
o added global 4x4 degree ocean test |
o added global 4x4 degree ocean test |
| 9445 |
o added test of H&S94 with free surface on cube |
o added test of H&S94 with free surface on cube |
| 9446 |
o some final mods for gradient check, adjoint,... |
o some final mods for gradient check, adjoint,... |
| 9447 |
|
|
| 9448 |
checkpoint42 |
checkpoint42 (2001/09/27) |
| 9449 |
Fixed AD-related problems: |
Fixed AD-related problems: |
| 9450 |
o Store directives up-to-date with re-arranged Adams-Bashforth |
o Store directives up-to-date with re-arranged Adams-Bashforth |
| 9451 |
(mainly thermodynamics.F) |
(mainly thermodynamics.F) |
| 9457 |
for the case ALLOW_KPP |
for the case ALLOW_KPP |
| 9458 |
o Cleaned argument list for timestep_tracer.F |
o Cleaned argument list for timestep_tracer.F |
| 9459 |
|
|
| 9460 |
checkpoint41 |
checkpoint41 (2001/09/27) |
| 9461 |
o re-formatted/added comments in prologues of key subroutines |
o re-formatted/added comments in prologues of key subroutines |
| 9462 |
to work with protex |
to work with protex |
| 9463 |
|
|
| 9464 |
checkpoint40 |
checkpoint40 (2001/09/27) |
| 9465 |
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
| 9466 |
o added FLT (floats) package from Arne along with demo. experiment |
o added FLT (floats) package from Arne along with demo. experiment |
| 9467 |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
| 9470 |
o modified multi-dim method to work on cube |
o modified multi-dim method to work on cube |
| 9471 |
o bug fix in KPP (from DM) |
o bug fix in KPP (from DM) |
| 9472 |
|
|
| 9473 |
checkpoint40pre9 |
checkpoint40pre9 (2001/09/27) |
| 9474 |
o added DST advection schemes |
o added DST advection schemes |
| 9475 |
o fix MPI bug on SGI's |
o fix MPI bug on SGI's |
| 9476 |
o modifications for non-linear free-surface |
o modifications for non-linear free-surface |
| 9480 |
o added/updated many matlab scripts |
o added/updated many matlab scripts |
| 9481 |
o added multi-dimensional advection method for tracers |
o added multi-dimensional advection method for tracers |
| 9482 |
|
|
| 9483 |
checkpoint40pre8 |
checkpoint40pre8 (2001/09/05) |
| 9484 |
o new package rw/ |
o new package rw/ |
| 9485 |
Added method for dumping intermediate local arrays: |
Added method for dumping intermediate local arrays: |
| 9486 |
mdsio_writetile - same as mdsio_writefield except works from inside |
mdsio_writetile - same as mdsio_writefield except works from inside |
| 9499 |
currently nothing implemented to switch this storing off |
currently nothing implemented to switch this storing off |
| 9500 |
in case fluxform is used since no CPP flag available). |
in case fluxform is used since no CPP flag available). |
| 9501 |
|
|
| 9502 |
checkpoint40pre7 |
checkpoint40pre7 (2001/08/14) |
| 9503 |
o bug fix in dynamics.F |
o bug fix in dynamics.F |
| 9504 |
calc_viscosity called before k=1,Nr loop. |
calc_viscosity called before k=1,Nr loop. |
| 9505 |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
| 9506 |
o cleaned initialisations in ctrl_map_ini |
o cleaned initialisations in ctrl_map_ini |
| 9507 |
related to TAF |
related to TAF |
| 9508 |
|
|
| 9509 |
checkpoint40pre6 |
checkpoint40pre6 (2001/08/13) |
| 9510 |
o split dynamics into thermodynamics & dynamics |
o split dynamics into thermodynamics & dynamics |
| 9511 |
o corresponding split of calc_diffusivity into |
o corresponding split of calc_diffusivity into |
| 9512 |
calc_diffusivity, calc_viscosity |
calc_diffusivity, calc_viscosity |
| 9514 |
o Added diffkr, kapgm to control variables |
o Added diffkr, kapgm to control variables |
| 9515 |
o bug fix in gmredi_slope_limit for ldd97 |
o bug fix in gmredi_slope_limit for ldd97 |
| 9516 |
|
|
| 9517 |
checkpoint40pre5 |
checkpoint40pre5 (2001/07/31) |
| 9518 |
o proper initialization of Adams-Bashforth time stepping |
o proper initialization of Adams-Bashforth time stepping |
| 9519 |
+ uses forward step for very first step of model (iter=0) |
+ uses forward step for very first step of model (iter=0) |
| 9520 |
o re-generated *all* output since almost all output is modified by this |
o re-generated *all* output since almost all output is modified by this |
| 9528 |
+ this uses an alternative form of ini_curvilinear_grid.F which |
+ this uses an alternative form of ini_curvilinear_grid.F which |
| 9529 |
is not necessarily any better than the current one... |
is not necessarily any better than the current one... |
| 9530 |
|
|
| 9531 |
checkpoint40pre4 |
checkpoint40pre4 (2001/07/30) |
| 9532 |
o added re-initialisations of utrans,vtrans,rtrans in |
o added re-initialisations of utrans,vtrans,rtrans in |
| 9533 |
calc_common_factors which are crucial for TAF. |
calc_common_factors which are crucial for TAF. |
| 9534 |
o extended iMin,jMin range for calc_common_factors, |
o extended iMin,jMin range for calc_common_factors, |
| 9536 |
o added option ALLOW_PASSIVE_TRACER |
o added option ALLOW_PASSIVE_TRACER |
| 9537 |
o a few minor updates and fixes |
o a few minor updates and fixes |
| 9538 |
|
|
| 9539 |
checkpoint40pre3 |
checkpoint40pre3 (2001/07/13) |
| 9540 |
o created calc_gtr1.F for gad package |
o created calc_gtr1.F for gad package |
| 9541 |
o split the_main_loop and re-introduced forward_step |
o split the_main_loop and re-introduced forward_step |
| 9542 |
o some recomputations of nIter0 for TAMC |
o some recomputations of nIter0 for TAMC |
| 9543 |
|
|
| 9544 |
checkpoint40pre2 |
checkpoint40pre2 (2001/07/13) |
| 9545 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
| 9546 |
o Added gradient check package |
o Added gradient check package |
| 9547 |
o Added routines for passive tracer handling |
o Added routines for passive tracer handling |
| 9548 |
o Added carbon sequestration sensitivity experiment |
o Added carbon sequestration sensitivity experiment |
| 9549 |
|
|
| 9550 |
checkpoint39 |
checkpoint39 (2001/05/14) |
| 9551 |
o Modifications and fixes to support TAMC |
o Modifications and fixes to support TAMC |
| 9552 |
(mainly missing or wrong directives) |
(mainly missing or wrong directives) |
| 9553 |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
| 9561 |
(NB: this is not the full ECCO environment) |
(NB: this is not the full ECCO environment) |
| 9562 |
o disabled some packages by default in genmake |
o disabled some packages by default in genmake |
| 9563 |
|
|
| 9564 |
checkpoint38 |
checkpoint38 (2001/04/10) |
| 9565 |
o see notes_c37_adj.txt |
o see notes_c37_adj.txt |
| 9566 |
o corrected wrong layer index in external_forcing_t |
o corrected wrong layer index in external_forcing_t |
| 9567 |
o replaced the_main_loop/forward_step by the_main_loop |
o replaced the_main_loop/forward_step by the_main_loop |
| 9569 |
(replaced criteria for initial/final state) |
(replaced criteria for initial/final state) |
| 9570 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
| 9571 |
|
|
| 9572 |
checkpoint37 |
checkpoint37 (2001/03/13) |
| 9573 |
o mdsio.F routine split and packaged in pkg/mdsio |
o mdsio.F routine split and packaged in pkg/mdsio |
| 9574 |
(mdsio.F and mdsio_gl.F still exist in eesupp/src but are not |
(mdsio.F and mdsio_gl.F still exist in eesupp/src but are not |
| 9575 |
used unless genmake -disable=mdsio) |
used unless genmake -disable=mdsio) |
| 9586 |
o Non-Hydrostatic pickup file Pb fixed. |
o Non-Hydrostatic pickup file Pb fixed. |
| 9587 |
o bug with Rigid-lid version (since c35) fixed. |
o bug with Rigid-lid version (since c35) fixed. |
| 9588 |
|
|
| 9589 |
checkpoint36 |
checkpoint36 (2001/02/20) |
| 9590 |
o implement Crank-Nickelson barotropic time-stepping |
o implement Crank-Nickelson barotropic time-stepping |
| 9591 |
o recover Time-Average diagnostics |
o recover Time-Average diagnostics |
| 9592 |
o fix Pb in checkpoint (PR#19) |
o fix Pb in checkpoint (PR#19) |
| 9593 |
o AIM become a standard package ; clean unused CPP_kees |
o AIM become a standard package ; clean unused CPP_kees |
| 9594 |
|
|
| 9595 |
checkpoint35 |
checkpoint35 (2001/02/08) |
| 9596 |
o subtantial rewrite of dynamics.f |
o subtantial rewrite of dynamics.f |
| 9597 |
o allows staggered time-stepping |
o allows staggered time-stepping |
| 9598 |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
| 9599 |
o added bottom drag (linear + quadratic) |
o added bottom drag (linear + quadratic) |
| 9600 |
|
|
| 9601 |
checkpoint34 |
checkpoint34 (2001/01/30) |
| 9602 |
o Modified exchange routines for correct reverse simulation. |
o Modified exchange routines for correct reverse simulation. |
| 9603 |
o Added verification output to comply with bug fix in impldiff.F |
o Added verification output to comply with bug fix in impldiff.F |
| 9604 |
as of c33 (exp2, natl_box). |
as of c33 (exp2, natl_box). |
| 9609 |
o Added routine GLOBAL_SUM_INT to global_sum.F |
o Added routine GLOBAL_SUM_INT to global_sum.F |
| 9610 |
o Added mdsio_gl.F for ECCO purposes. |
o Added mdsio_gl.F for ECCO purposes. |
| 9611 |
|
|
| 9612 |
checkpoint33 |
checkpoint33 (2000/11/30) |
| 9613 |
o Fixed bug in lower BC in impldiff.F |
o Fixed bug in lower BC in impldiff.F |
| 9614 |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
| 9615 |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
| 9627 |
possibly use them. |
possibly use them. |
| 9628 |
o Corrected genmake to delete a temporary file during configuration |
o Corrected genmake to delete a temporary file during configuration |
| 9629 |
|
|
| 9630 |
checkpoint32 |
checkpoint32 (2000/11/13) |
| 9631 |
o Scaling of forcing fields moved from external_forcing.F to |
o Scaling of forcing fields moved from external_forcing.F to |
| 9632 |
external_fields_scale.F, called directly after loading fields. |
external_fields_scale.F, called directly after loading fields. |
| 9633 |
o Surface relaxation terms added to surface tendency fields in |
o Surface relaxation terms added to surface tendency fields in |
| 9638 |
o Modifications and bug fixes in KPP package. |
o Modifications and bug fixes in KPP package. |
| 9639 |
o Verification experiment for KPP added (verification/nat_box/) |
o Verification experiment for KPP added (verification/nat_box/) |
| 9640 |
|
|
| 9641 |
checkpoint31 |
checkpoint31 (2000/09/11) |
| 9642 |
o Packages interface brought in line with defined standard |
o Packages interface brought in line with defined standard |
| 9643 |
-> new routines packages_...F |
-> new routines packages_...F |
| 9644 |
-> changes in initialise_fixed.F, initialise_varia.F |
-> changes in initialise_fixed.F, initialise_varia.F |
| 9655 |
- not yet tested for GMRedi. |
- not yet tested for GMRedi. |
| 9656 |
- not yet tested for KPP. |
- not yet tested for KPP. |
| 9657 |
|
|
| 9658 |
checkpoint30 |
checkpoint30 (2000/07/13) |
| 9659 |
o Updates for OBCs |
o Updates for OBCs |
| 9660 |
o New experiment for test OBCs (internal_wave) |
o New experiment for test OBCs (internal_wave) |
| 9661 |
o New output.txt in verification/exp4/results/ |
o New output.txt in verification/exp4/results/ |
| 9664 |
o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.) |
o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.) |
| 9665 |
and entry for T90 in genmake |
and entry for T90 in genmake |
| 9666 |
|
|
| 9667 |
checkpoint29 |
checkpoint29 (2000/06/21) |
| 9668 |
o packaged KPP and GM/Redi |
o packaged KPP and GM/Redi |
| 9669 |
|
|
| 9670 |
checkpoint28 |
checkpoint28 (2000/06/09) |
| 9671 |
o Corrected initialization of hFacMin for difference vertical coordinates |
o Corrected initialization of hFacMin for difference vertical coordinates |
| 9672 |
o Modified calculation of partial cell thickness to more robust algorithm |
o Modified calculation of partial cell thickness to more robust algorithm |
| 9673 |
o config_summary.F: replaced write_1D_... by write_0D_... |
o config_summary.F: replaced write_1D_... by write_0D_... |
| 9680 |
included store directives and tape key computations required for TAMC. |
included store directives and tape key computations required for TAMC. |
| 9681 |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
| 9682 |
|
|
| 9683 |
checkpoint27 |
checkpoint27 (2000/04/10) |
| 9684 |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
| 9685 |
formulation works properly with variable resolution. |
formulation works properly with variable resolution. |
| 9686 |
o restructured the calling tree between the_model_main() and dynamics() |
o restructured the calling tree between the_model_main() and dynamics() |
| 9688 |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
| 9689 |
in new routine ini_psurf() |
in new routine ini_psurf() |
| 9690 |
|
|
| 9691 |
checkpoint26 |
checkpoint26 (2000/04/05) |
| 9692 |
o moved some #ifdef in optional routines to encompass everything |
o moved some #ifdef in optional routines to encompass everything |
| 9693 |
except the argument declarations. This was using up some memory. |
except the argument declarations. This was using up some memory. |
| 9694 |
o fixed macros like _ADT to work with both versions of Linux cpp |
o fixed macros like _ADT to work with both versions of Linux cpp |
| 9698 |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
| 9699 |
o patch for 2 processor JAM mode |
o patch for 2 processor JAM mode |
| 9700 |
|
|
| 9701 |
checkpoint25 |
checkpoint25 (2000/03/15) |
| 9702 |
o updates for OBCs and NH |
o updates for OBCs and NH |
| 9703 |
o dramatically reduced memory usage |
o dramatically reduced memory usage |
| 9704 |
o added "JAM" routines for use on Artic network |
o added "JAM" routines for use on Artic network |
| 9709 |
an explicit free-surface option) |
an explicit free-surface option) |
| 9710 |
o initial state input files for U and V |
o initial state input files for U and V |
| 9711 |
|
|
| 9712 |
checkpoint24 |
checkpoint24 (1999/08/02) |
| 9713 |
o Removed some spurious "REAL"s |
o Removed some spurious "REAL"s |
| 9714 |
o Updated KPP to latest version from JPL |
o Updated KPP to latest version from JPL |
| 9715 |
o Added a COS(latitude) in horizontal viscosity |
o Added a COS(latitude) in horizontal viscosity |
| 9716 |
|
|
| 9717 |
checkpoint23 |
checkpoint23 (1999/05/26) |
| 9718 |
o Added del^4 diffusion for salt and temperature |
o Added del^4 diffusion for salt and temperature |
| 9719 |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
| 9720 |
|
|
| 9721 |
checkpoint22 |
checkpoint22 (1999/05/18) |
| 9722 |
o Made many small changes: implicit none, format(i5), etc... |
o Made many small changes: implicit none, format(i5), etc... |
| 9723 |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
| 9724 |
|
|
| 9725 |
checkpoint21 |
checkpoint21 (1999/05/18) |
| 9726 |
o Introduced new I/O package that supports direct-access records (mdsio.F) |
o Introduced new I/O package that supports direct-access records (mdsio.F) |
| 9727 |
o Split-up mid-level I/O routines |
o Split-up mid-level I/O routines |
| 9728 |
o Updated input data for experiments 0,1,2,4 and 5 |
o Updated input data for experiments 0,1,2,4 and 5 |
| 9729 |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
| 9730 |
|
|
| 9731 |
checkpoint20 |
checkpoint20 (1999/03/22) |
| 9732 |
o Tidied up open-boundaries some more |
o Tidied up open-boundaries some more |
| 9733 |
o Added non-hydrostatic code |
o Added non-hydrostatic code |
| 9734 |
o Fixed some input data |
o Fixed some input data |
| 9735 |
o Modified MPI start-up to work in "coupled" context. |
o Modified MPI start-up to work in "coupled" context. |
| 9736 |
|
|
| 9737 |
checkpoint19 |
checkpoint19 (1998/12/15) |
| 9738 |
o Tidied up directory structure for verification experiments. |
o Tidied up directory structure for verification experiments. |
| 9739 |
o Added new code for open boundaries. |
o Added new code for open boundaries. |
| 9740 |
o Corrected advective terms near boundaries. |
o Corrected advective terms near boundaries. |
| 9742 |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
| 9743 |
o Split default parameters out of ini_parms.F into set_defaults.F. |
o Split default parameters out of ini_parms.F into set_defaults.F. |
| 9744 |
|
|
| 9745 |
checkpoint18 |
checkpoint18 (1998/11/30) |
| 9746 |
o Further changes for optional code generation with |
o Further changes for optional code generation with |
| 9747 |
CPP - ugh! |
CPP - ugh! |
| 9748 |
|
|
| 9749 |
checkpoint17 |
checkpoint17 (1998/11/03) |
| 9750 |
o Beginning to incorporating modularity |
o Beginning to incorporating modularity |
| 9751 |
for supporting atmos. and ocean configs. |
for supporting atmos. and ocean configs. |
| 9752 |
o Small changes for TAMC complinace |
o Small changes for TAMC complinace |
| 9753 |
o New ultra simple test case. Barotropic box |
o New ultra simple test case. Barotropic box |
| 9754 |
configuration "exp0". |
configuration "exp0". |
| 9755 |
|
|
| 9756 |
checkpoint16 |
checkpoint16 (1998/10/28) |
| 9757 |
o Minor changes to exchange routines to support |
o Minor changes to exchange routines to support |
| 9758 |
accumulation in reverse mode. Adjoint of an |
accumulation in reverse mode. Adjoint of an |
| 9759 |
assignment is an addition. |
assignment is an addition. |
| 9761 |
syntax) and by g77 under Linux ( 72 character |
syntax) and by g77 under Linux ( 72 character |
| 9762 |
limit ). |
limit ). |
| 9763 |
|
|
| 9764 |
checkpoint15 |
checkpoint15 (1998/09/29) |
| 9765 |
Rewrote exchange routines to allow |
Rewrote exchange routines to allow |
| 9766 |
o General tile <-> tile connectivity. |
o General tile <-> tile connectivity. |
| 9767 |
o TAMC reverse mode flag ( is this really needed? ) |
o TAMC reverse mode flag ( is this really needed? ) |
| 9770 |
shmput/shmget, VIA, SYSV shmem and every other cool |
shmput/shmget, VIA, SYSV shmem and every other cool |
| 9771 |
communication method. |
communication method. |
| 9772 |
|
|
| 9773 |
checkpoint14 |
checkpoint14 (1998/09/09) |
| 9774 |
Consistent isomorphism chages made. These allow dynamical core |
Consistent isomorphism chages made. These allow dynamical core |
| 9775 |
to support both pressure and meters as a vertical coordinate. |
to support both pressure and meters as a vertical coordinate. |
| 9776 |
|
|
| 9777 |
checkpoint13 |
checkpoint13 (1998/07/17) |
| 9778 |
Release which corrects global_max problem and a couple |
Release which corrects global_max problem and a couple |
| 9779 |
of KGM time-averaging diagnostic errors. Also contains |
of KGM time-averaging diagnostic errors. Also contains |
| 9780 |
a double-gyre experiment setup as well as the baseline |
a double-gyre experiment setup as well as the baseline |
| 9789 |
I don't want to commit the rDot to the main-trunk until |
I don't want to commit the rDot to the main-trunk until |
| 9790 |
we've actually tested it... |
we've actually tested it... |
| 9791 |
|
|
| 9792 |
checkpoint12 |
checkpoint12 (1998/07/08) |
| 9793 |
Tidy up and added generic genmake script (formerly |
Tidy up and added generic genmake script (formerly |
| 9794 |
configure script). |
configure script). |
| 9795 |
Released to testers. |
Released to testers. |
| 9796 |
|
|
| 9797 |
checkpoint11 |
checkpoint11 (1998/07/02) |
| 9798 |
Re-arranged initialise() and introduced ini_vertical_grid() |
Re-arranged initialise() and introduced ini_vertical_grid() |
| 9799 |
and ini_masks_etc(). |
and ini_masks_etc(). |
| 9800 |
|
|
| 9801 |
checkpoint10 |
checkpoint10 (1998/07/01) |
| 9802 |
Introduced the configure script. |
Introduced the configure script. |
| 9803 |
Separated out the diags package. |
Separated out the diags package. |
| 9804 |
Added template for writing time-averages of tile/intermediate quantities. |
Added template for writing time-averages of tile/intermediate quantities. |
| 9805 |
Updated SIZE.h in exp2 and made the data big-endian. |
Updated SIZE.h in exp2 and made the data big-endian. |
| 9806 |
|
|
| 9807 |
checkpoint9 |
checkpoint9 (1998/06/22) |
| 9808 |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
| 9809 |
General tidy-up. |
General tidy-up. |
| 9810 |
SST.bin SSS.bin added to verification/exp2 |
SST.bin SSS.bin added to verification/exp2 |
| 9811 |
|
|
| 9812 |
checkpoint8 |
checkpoint8 (1998/06/22) |
| 9813 |
Inludes time-dependant forcing and time-averaging. |
Inludes time-dependant forcing and time-averaging. |
| 9814 |
Works at 4x4 and 2.8125x2.8125 global |
Works at 4x4 and 2.8125x2.8125 global |
| 9815 |
|
|
| 9819 |
model etc.. |
model etc.. |
| 9820 |
Configured for verification/exp2 - 4 degree global, two process. |
Configured for verification/exp2 - 4 degree global, two process. |
| 9821 |
|
|
| 9822 |
checkpoint7 |
checkpoint7 (1998/06/15) |
| 9823 |
Created by cnh |
Created by cnh |
| 9824 |
Simple 4 degree global simulation |
Simple 4 degree global simulation |
| 9825 |
configuration. |
configuration. |
| 9827 |
hydrography, bathymetry etc |
hydrography, bathymetry etc |
| 9828 |
Does not include Heat Flux and E-P |
Does not include Heat Flux and E-P |
| 9829 |
|
|
| 9830 |
checkpoint6 |
checkpoint6 (1998/06/08) |
| 9831 |
Created by cnh |
Created by cnh |
| 9832 |
merged checkpoint5 with CD and |
merged checkpoint5 with CD and |
| 9833 |
spherical polar code. |
spherical polar code. |
| 9834 |
Still some problems with GM Redi |
Still some problems with GM Redi |
| 9835 |
abd full topography. |
abd full topography. |
| 9836 |
|
|
| 9837 |
checkpoint5 |
checkpoint5 (1998/06/08) |
| 9838 |
Created by AJA |
Created by AJA |
| 9839 |
contains updates to GM Redi |
contains updates to GM Redi |
| 9840 |
and reordered timestepping loop |
and reordered timestepping loop |
| 9841 |
for Implicit Diffusion. |
for Implicit Diffusion. |
| 9842 |
|
|
| 9843 |
checkpoint4 |
checkpoint4 (1998/05/30) |
| 9844 |
Created by cnh |
Created by cnh |
| 9845 |
Contains memory saving macros ( _rdxc etc..) for when |
Contains memory saving macros ( _rdxc etc..) for when |
| 9846 |
grid variations are limited. |
grid variations are limited. |
| 9847 |
Contains polynomial coeffs for EOS and knudsen program |
Contains polynomial coeffs for EOS and knudsen program |
| 9848 |
for generation. |
for generation. |
| 9849 |
|
|
| 9850 |
checkpoint3 |
checkpoint3 (1998/05/26) |
| 9851 |
Created by cnh |
Created by cnh |
| 9852 |
Added extra flags for runtime options |
Added extra flags for runtime options |
| 9853 |
Added this file |
Added this file |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch