| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o model/src: |
o model/src: |
| 8 |
|
- fix wrong truncation (single prec) from "FLOAT" function in expressions |
| 9 |
|
like: deltaT*FLOAT(myIter) when myIter is large: |
| 10 |
|
a) replaced by DFLOAT (if not seen by TAF); |
| 11 |
|
b) remove "FLOAT" and use implicit type conversion (if seen by TAF). |
| 12 |
|
o pkg/aim_v23: |
| 13 |
|
- write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading |
| 14 |
|
when pickupSuff is set ; do write rolling pickups + at the end of the run. |
| 15 |
|
o pkg/atm_ocn_coupler + ocn_compon_interf: |
| 16 |
|
- in prep for using pkg/seaice Dyn in coupled set-up, implement sequential |
| 17 |
|
coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ; |
| 18 |
|
add corresponding call in DO_OCEANIC_PHYS. |
| 19 |
|
o coupler pkgs: |
| 20 |
|
Start a new way to set-up optionally-exchanged variables (previously, only |
| 21 |
|
there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler |
| 22 |
|
data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ; |
| 23 |
|
send switch to ATM & OCN compon before reading their own "data.cpl" (so that |
| 24 |
|
compononent param default can be set accordingly). |
| 25 |
|
Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch |
| 26 |
|
but rather applies to a group a fields (going both ways like for DIC) |
| 27 |
|
and corresponds to an option of coupling config. |
| 28 |
|
coupler (pkg/atm_ocn_coupler): |
| 29 |
|
- change parameter file from "data" to "data.cpl" (in cpl_read_params.F), |
| 30 |
|
and read namelist directly (without eessup S/R calls) instead of |
| 31 |
|
in the very un-flexible old way, 1 param per line, in fixed order; |
| 32 |
|
- add error-counter to track errors (e.g., missing "data.cpl") and to stop |
| 33 |
|
cleanly in CPL_CHECK_CPLCONFIG |
| 34 |
|
- add new coupling-exchange selectors (some not yet active) including |
| 35 |
|
cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h |
| 36 |
|
and ocnCpl_exchange_DIC=T in OCNIDS.h); |
| 37 |
|
- add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each |
| 38 |
|
component ; called directly from coupler.F, after comp. registrations; |
| 39 |
|
- rename few variable-ID names (in ATMIDS.h & OCNIDS.h): |
| 40 |
|
atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name -> |
| 41 |
|
-> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName |
| 42 |
|
components (pkg/atm_ & ocn_compon_interf): |
| 43 |
|
- add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding |
| 44 |
|
CPP header file in all pkg source files. |
| 45 |
|
- move checking of comp. configs out of cpl_exch_configs.F into new S/R |
| 46 |
|
ATM/OCN_CHECK_CPLCONFIG; |
| 47 |
|
- add error-counter to track errors (e.g., in "data.cpl") and to stop |
| 48 |
|
cleanly in ATM/OCN_CHECK_CPLCONFIG; |
| 49 |
|
- add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors |
| 50 |
|
from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and |
| 51 |
|
before PACKAGES_READPARMS; |
| 52 |
|
verification/cpl_aim+ocn/: |
| 53 |
|
- update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file |
| 54 |
|
"data.cpl" for coupler (in input_cpl). |
| 55 |
|
o eesupp/inc: |
| 56 |
|
- change the MPI-global-sum default (in CPP_EEOPTIONS.h) to: |
| 57 |
|
#define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F) |
| 58 |
|
to always cumulate tile local-sum in the same order (still uses |
| 59 |
|
MPI_Allreduce like standard code). |
| 60 |
|
- in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files |
| 61 |
|
that are now identical to standard version (in eesupp/inc). |
| 62 |
|
o pkg/shelfice: |
| 63 |
|
- add SHELFICETransCoeffTFile for initializing spatially varying |
| 64 |
|
heat and salt transfer coefficients |
| 65 |
|
o pkg/atm_compon_interf & ocn_compon_interf: |
| 66 |
|
- combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous |
| 67 |
|
S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA |
| 68 |
|
- move bi,bj loops inside S/R OCN_STORE_MY_DATA |
| 69 |
|
o pkg/atm_ocn_coupler: |
| 70 |
|
- initialise to zero ATMVARS.h & OCNVARS.h arrays. |
| 71 |
|
o pkg/rbcs: |
| 72 |
|
- select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows |
| 73 |
|
to compile with maskLEN=1 when all tracers use the same RBCS-mask. |
| 74 |
|
- add a short report (to STDOUT) about RBCS-mask settings. |
| 75 |
|
|
| 76 |
|
checkpoint65p (2015/10/23) |
| 77 |
|
o pkg/seaice/seaice_evp.F: fix store directives and key computations, since |
| 78 |
|
there is no adjoint test for EVP, we don't know what it does to the adjoint |
| 79 |
|
solution, but at least there are no more recomputation warnings left |
| 80 |
|
o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands |
| 81 |
|
a chance of giving the same results as a fully converged VP (JFNK) solver |
| 82 |
|
o tools/adjoint_options/adjoint_diva: |
| 83 |
|
- fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA |
| 84 |
|
o pkg/streamice: |
| 85 |
|
- spotted bug in streamice_driving_stress using dyG where should have been dxG |
| 86 |
|
o pkg/exf: |
| 87 |
|
- remove STOP statement that prevented to use wind or (wind-)stress |
| 88 |
|
interpolation for constant-in-time forcing fields (wind/stress period = 0). |
| 89 |
|
o pkg/seaice: |
| 90 |
|
- replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires |
| 91 |
|
5 additionals 2D fields and 6 new store directives |
| 92 |
|
- change logic in seaice_readparms.F: EVP code can now be turned on in |
| 93 |
|
various ways, setting SEAICE_deltaTev is no longer required, |
| 94 |
|
alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev, |
| 95 |
|
or SEAICEaEVPcoeff |
| 96 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
| 97 |
|
- redefining uLoc/vLoc to u/v, instead of 2u/v |
| 98 |
|
o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz |
| 99 |
|
- this is an intermediate state of a truely converging EVP that has |
| 100 |
|
the potential of outperforming implicit VP methods, I do not recommend |
| 101 |
|
using it yet. |
| 102 |
|
- for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION |
| 103 |
|
and all parameters are hardwired |
| 104 |
|
- for convergence it still requires very smooth regularisations, that means, |
| 105 |
|
if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is |
| 106 |
|
different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also |
| 107 |
|
specific averaging appears to be required, still subject to tuning |
| 108 |
|
- still needs cleaning and I need to turn parameter into runtime parameters |
| 109 |
|
- add code to compute and print residuals of iteration, compile with |
| 110 |
|
defining ALLOW_SEAICE_EVP_RESIDUAL to enable it |
| 111 |
|
o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq) |
| 112 |
|
that entered with r1.54 on Sep04, 2015, -> update results |
| 113 |
|
|
| 114 |
|
checkpoint65o (2015/09/14) |
| 115 |
|
o pkg/mom_vecinv & mom_common: |
| 116 |
|
- add deep-atmosphere geometry factor in mom_calc_visc.F + in routines |
| 117 |
|
called from there. |
| 118 |
|
- add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this |
| 119 |
|
allows to use Vector-Invariant form in deep atmos and anelastic formulation |
| 120 |
|
o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015) |
| 121 |
|
and Koenig-Beatty+Holland (2012) |
| 122 |
|
- two new parameters SEAICE_tensilFac and SEAICE_tensilDepth |
| 123 |
|
- global 2D field tensileStrength, computed in seaice_calc_ice_strength |
| 124 |
|
- requires an extra input argument for S/R seaice_calc_viscosities |
| 125 |
|
- tensileStrength's depth dependence is different from Itkin et al. (2015) |
| 126 |
|
(to be changed and played with, for now exponential) |
| 127 |
|
o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.) |
| 128 |
|
- if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice |
| 129 |
|
by AREA according to Connelly et al. (2004), JPO. |
| 130 |
|
- For EVP and the LSR solver, the implicit part of the drag term is |
| 131 |
|
the only non-zero term in the denominator when there is no ice (which |
| 132 |
|
prevented running the model with zero ice-ocean drag). If |
| 133 |
|
SEAICEscaleSurfStress = .TRUE., this results in a division by zero |
| 134 |
|
(or zero main diagonals BU/BV) which need to be caught. A practical |
| 135 |
|
consequence is that for open water, the momentum equation reduce |
| 136 |
|
to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if |
| 137 |
|
they happen to be zero, often leading to a non-zero solution over |
| 138 |
|
open water. |
| 139 |
|
o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more |
| 140 |
|
efficient EVP method. |
| 141 |
|
- introduce area-weighted averages for e12 (analogously to |
| 142 |
|
seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits |
| 143 |
|
remain, but also changing the order of terms in the previous average |
| 144 |
|
changed the results as much) -> update experiment |
| 145 |
|
- add SEAICE_DELTA_SMOOTHREG code |
| 146 |
|
- disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for |
| 147 |
|
TEM-code |
| 148 |
|
- adjust loop bounds so that only required fields are computed |
| 149 |
|
- add new averaging code for zetaZ/deltaZ (again similar to |
| 150 |
|
seaice_calc_viscosities.F), inactive by default for now (will change |
| 151 |
|
results again), but will replace old code eventually |
| 152 |
|
o eesupp/src: |
| 153 |
|
- add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F) |
| 154 |
|
to always cumulate tile local-sum in the same order |
| 155 |
|
(option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h). |
| 156 |
|
Still uses MPI_Allreduce (like standard code) but on array of tiles |
| 157 |
|
and should be faster than GLOBAL_SUM_SEND_RECV code. |
| 158 |
|
- switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV |
| 159 |
|
(defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead. |
| 160 |
|
- add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.: |
| 161 |
|
aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40, |
| 162 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example, |
| 163 |
|
natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre, |
| 164 |
|
tutorial_baroclinic_gyre and tutorial_held_suarez_cs. |
| 165 |
|
|
| 166 |
|
checkpoint65n (2015/07/29) |
| 167 |
|
o pkg/thsice: |
| 168 |
|
- add a warning when used with pkg/aim but without updating SST |
| 169 |
|
(stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ). |
| 170 |
|
o pkg/offline: |
| 171 |
|
- change where Offline-Fields are loaded, from load_fields_driver.F to |
| 172 |
|
directly within FORWARD_STEP, just after updating iter number and time; |
| 173 |
|
- move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new |
| 174 |
|
S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS; |
| 175 |
|
These changes allow: |
| 176 |
|
a) to recover exactly on-line results using deltaToffline=deltaTClock, |
| 177 |
|
tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2) |
| 178 |
|
both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous |
| 179 |
|
time-step, both with GM & KPP files and with recomputing these fields; |
| 180 |
|
b) no needs to switch on staggerTimeStep anymore; |
| 181 |
|
c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf. |
| 182 |
|
- update output of experiment tutorial_dic_adjoffline (only 3 digits left). |
| 183 |
|
o pkg/offline: |
| 184 |
|
- change (rarely used) offset-iteration parameter to an offset time (in s): |
| 185 |
|
can easily recover previous offset-iter effect by setting offset-time |
| 186 |
|
(offlineTimeOffset) to offset-iter x deltaToffline; |
| 187 |
|
- do not turn-off Temp & Salinity surface relaxation when using KPP (used |
| 188 |
|
in KPP as part of surface buoyancy forcing) in offline run. |
| 189 |
|
- fix ptracers KPP non-local term in the case where KPP is re-computed. |
| 190 |
|
o OpenAD |
| 191 |
|
- Adding preliminary ggl90 test to OpenAD verification. |
| 192 |
|
Config. with ggl90 currently diverges after 64 time steps |
| 193 |
|
so will need more work to become more stable |
| 194 |
|
- Adding preliminary kpp test to OpenAD verification. |
| 195 |
|
required small tweakes in kpp_routines.F |
| 196 |
|
- Merge and update from Krishna Narayanan's contrib area: |
| 197 |
|
* Add one variable for preliminary OpenAD DIVA |
| 198 |
|
* Add replacement time-stepping for OpenAD DIVA |
| 199 |
|
* genmake2 flag -diva (but only for OpenAD; preliminary) |
| 200 |
|
* required modifs for OAD_support |
| 201 |
|
successful preliminary test for tutorial_global_oce_biogeo/ |
| 202 |
|
o pkg/seaice: |
| 203 |
|
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
| 204 |
|
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
| 205 |
|
delta with a smooth function in s/r seaice_calc_viscosity |
| 206 |
|
(no effect on EVP) |
| 207 |
|
- rename local suffix "sqr" into "sq" for more consistent variable names |
| 208 |
|
o pkg/seaice: |
| 209 |
|
add new parameter SEAICE_deltaMin that is used ***only*** |
| 210 |
|
for regularizing Delta (and nothing else, like the parameter |
| 211 |
|
which is also used for all sorts of things SEAICE_EPS). |
| 212 |
|
Defaults to SEAICE_EPS for backward compatibility only. |
| 213 |
|
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
| 214 |
|
the wrong key by inialising it before use -> fixes a recomputation |
| 215 |
|
problem but does not fix the gradient |
| 216 |
|
o pkg/layers: |
| 217 |
|
- move resetting of flux arrays to outside the iLa loop |
| 218 |
|
(this caused layers_diapycnal to not work with more than one layer coord.) |
| 219 |
|
- fix bug in calculation of layers_recip_delta in layers_init_fixed.F |
| 220 |
|
o pkg/layers: |
| 221 |
|
- remove from common block 3D layers fields (used to diagnose transport |
| 222 |
|
in tracer coords) and declare them as local arrays in layers_calc.F |
| 223 |
|
o pkg/seaice: |
| 224 |
|
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
| 225 |
|
in lab_sea forward experiment (changes results -> updated) |
| 226 |
|
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
| 227 |
|
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
| 228 |
|
computations; for SEAICE_VECTORIZE_LSR |
| 229 |
|
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
| 230 |
|
sweep to the outside, |
| 231 |
|
- remove store directives and add "CADJ loop sequential" directives |
| 232 |
|
in analogy to model/src/solve_tridiagonal.F |
| 233 |
|
- replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop |
| 234 |
|
boundaries to yield more readable code. This has also the charming side |
| 235 |
|
effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without |
| 236 |
|
SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in |
| 237 |
|
seaice_lsr_tridiagu/v now requires either of these flags, vectorization |
| 238 |
|
still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as |
| 239 |
|
an additional option) |
| 240 |
|
The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F |
| 241 |
|
but the adjoint gradients (which are affected by this change) still explode. |
| 242 |
|
o coupler (atm & ocn _compon_interf): |
| 243 |
|
- avoid using Exch2 IO mapping if not suitable. |
| 244 |
|
|
| 245 |
|
checkpoint65m (2015/06/15) |
| 246 |
|
o pkg/layers: |
| 247 |
|
- clean-up old parameters setting (from Sep 2012): |
| 248 |
|
+ remove old parameters setting from common block (declared locally); |
| 249 |
|
+ stop if any old parameter is mixed with new parameters; |
| 250 |
|
+ check for valid or consistent parameter setting (e.g., layers_name) |
| 251 |
|
- check that layers_bounds for Pot.Density are in the right range; |
| 252 |
|
this is supposed to catch un-updated setting after recently shifting |
| 253 |
|
potential density field "prho" by -1000 (now in "sigma" scale). |
| 254 |
|
o pkg/layers: |
| 255 |
|
- Added missing call to layers_fill for keeping track of tottend in |
| 256 |
|
pkg/diagnostics/diagnostics_fill_state.F |
| 257 |
|
o pkg/layers: |
| 258 |
|
- added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning |
| 259 |
|
of diapycnal fluxes |
| 260 |
|
o pkg/layers: |
| 261 |
|
- reverted changes to interpolation to previous treatment; there |
| 262 |
|
was never actually a problem |
| 263 |
|
o pkg/layers: |
| 264 |
|
- fix interpolation of layers tracers in the presence of partial cells |
| 265 |
|
- add lots of new functionality to compute water mass transformation |
| 266 |
|
(enabled by CPP flag LAYERS_THERMODYNAMICS) |
| 267 |
|
- add new calls from main code (diags_oceanic_surf_flux.F, |
| 268 |
|
thermodynamics.F, impldiff.F) and gad to save the necessary fields |
| 269 |
|
for layers_thermodynamics calculations |
| 270 |
|
o pkg/ptracers: |
| 271 |
|
- add capability of stepping a passive tracer forward without advection |
| 272 |
|
by setting PTRACERS_advScheme to 0. |
| 273 |
|
o pkg/diagnostics: |
| 274 |
|
- add few (threads) _BARRIER around any update of "diag_pkgStatus". |
| 275 |
|
o pkg/layers: |
| 276 |
|
- shift potential density field "prho" by -1000 for density layer averaging so |
| 277 |
|
that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000); |
| 278 |
|
Note that density bin boundaries (layers_bounds in data.layers) have |
| 279 |
|
to be set accordingly (i.e., shifted, in sigma scale). |
| 280 |
|
o pkg/layers: |
| 281 |
|
- fix snap-shot output of layer thickness @ V.pt and output of pot.density |
| 282 |
|
- fix calculation of layer non-weighted velocity and layer probability |
| 283 |
|
- add diagnostics for pot.density used for layer averaging |
| 284 |
|
o pkg/seaice: |
| 285 |
|
- seaice_calc_viscosity.F: change computation of deltaC**2 to ensure |
| 286 |
|
positiveness, modify a few comments and improve variable names, |
| 287 |
|
- the changed computation of deltaC affects most seaice-related |
| 288 |
|
experiments at the truncation level. |
| 289 |
|
seaice_itd.thermo is affected by far the most, with |
| 290 |
|
only 7 digits of agreement remaining; update experiments. |
| 291 |
|
|
| 292 |
|
checkpoint65l (2015/05/04) |
| 293 |
|
o pkg/shelfice: |
| 294 |
|
- in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set |
| 295 |
|
factor drKp1 to zero where it is negative (ie. do not use |
| 296 |
|
SHELFICEBoundaryLayer if hFacC>1) |
| 297 |
|
- the same for factor drLoc in shelfice_forcing.F |
| 298 |
|
o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem |
| 299 |
|
with modules in ptracers, when using testreport option "-small_f" |
| 300 |
|
o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD) |
| 301 |
|
- replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1)) |
| 302 |
|
o verification/testreport |
| 303 |
|
- add new option -small_f |
| 304 |
|
with this option testreport first makes the target small_f (*.f files) |
| 305 |
|
before running make (all). This is useful for explicit inlining when |
| 306 |
|
all sources need to be full available. |
| 307 |
|
o pkg/exf/exf_interp.F: |
| 308 |
|
remove previous changes related to reverse (decreasing) input grids latitude |
| 309 |
|
|
| 310 |
|
checkpoint65k (2015/04/01) |
| 311 |
|
o pkg/ecco: |
| 312 |
|
fix missing cosphi initialization; use eccoiter in place of optimcycle; |
| 313 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
| 314 |
|
instead of active read/write |
| 315 |
|
o pkg/ctrl: |
| 316 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
| 317 |
|
instead of active read/write. |
| 318 |
|
o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F |
| 319 |
|
return if .NOT.useAUTODIFF |
| 320 |
|
o pkg/seaice: add CPP brackets (cost function related). |
| 321 |
|
o model/src: |
| 322 |
|
add useAUTODIFF run time switch. |
| 323 |
|
o pkg/exf/exf_interp.F: |
| 324 |
|
add code to allow input grids with latitude starting in the north (i.e. when |
| 325 |
|
j=1 corresponds to northern edge of field); modify global_with_exf to test |
| 326 |
|
this feature. |
| 327 |
|
o verification/testreport: |
| 328 |
|
- replace "grep -A3" with POSIX conformal sed command, because there are |
| 329 |
|
implementations of grep that cannot do contextual searches |
| 330 |
|
- replace "cat -n" by "nl" (two occurrences), because not all implementations |
| 331 |
|
of "cat" have the option "-n" |
| 332 |
|
o model/src: |
| 333 |
|
add new file gsw_teos10.F that contains 3 functions, more or less a copy |
| 334 |
|
of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to |
| 335 |
|
convert from conservative to potential temperature. For now they are not |
| 336 |
|
called anywhere. |
| 337 |
|
o pkg/ggl90: make "useIDEMIX" useful |
| 338 |
|
- re-organize code in s/r ggl90_calc a little to move computations that |
| 339 |
|
are different for idemix into separate loops (changes verification |
| 340 |
|
experiment idemix at truncation level, 12 digits remain -> updated) |
| 341 |
|
- requires 2 new 2D fields KappaM, verticalShear |
| 342 |
|
- make hFacI and recip_hFacI local 3D variables that are passed to |
| 343 |
|
s/r ggl90_idemix |
| 344 |
|
- fix and improve some comments |
| 345 |
|
|
| 346 |
|
checkpoint65j (2015/02/25) |
| 347 |
|
o pkg/openad |
| 348 |
|
- synchronize seawater.F with version in model/src: replace routine |
| 349 |
|
body of sw_temp by calling sw_ptmp and fix/add a few comments. |
| 350 |
|
o pkg/mnc: |
| 351 |
|
- change default value of pickup_read/write_mnc params to FALSE |
| 352 |
|
(since few features are missing in reading MNC pickup files). |
| 353 |
|
o model/src: |
| 354 |
|
- change default (background) vertical diffusivity for salt to be the |
| 355 |
|
temperature (background) vertical diffusivity. |
| 356 |
|
- change background vertical diffusivity in vertical mixing pkgs ggl90, |
| 357 |
|
kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity. |
| 358 |
|
This makes ptracers default diffusivity (that uses salt diffKr) more |
| 359 |
|
consistent with vertical mixing schemes. |
| 360 |
|
o verification/testreport: |
| 361 |
|
- fix typo in "-pcls" option ; |
| 362 |
|
- put temp files in /tmp (instead of in local dir) |
| 363 |
|
- add option "-ncad" to use genmake2 new option "-nocat4ad" |
| 364 |
|
- allow to use "-j" option (for multi-procs make) for AD, OAD and TLM. |
| 365 |
|
o pkg/ggl90 (idemix code): |
| 366 |
|
- apply few fixes ; add some missing "_d 0" ; update output of exp. |
| 367 |
|
global_ocean.90x40x15.idemix |
| 368 |
|
o OpenAD |
| 369 |
|
- enable active file I/O and begin removal of work-around code |
| 370 |
|
for OpenAD for handling control variables (memory vs. active files) |
| 371 |
|
- new CPP options file OPENAD_OPTIONS.h |
| 372 |
|
- revert to genarr2d gradient check for hs94.1x64x5 |
| 373 |
|
- (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens) |
| 374 |
|
- gentim2d works for halfpipe_streamice but not yet hs94.1x64x5 |
| 375 |
|
o tools/genmake2: |
| 376 |
|
- add option for an alternative Makefile (from Martin) where multiple |
| 377 |
|
source files are sent to TAF (instead of all in one file). |
| 378 |
|
o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013) |
| 379 |
|
- code provided by Carsten Eden as an extension of ggl90 |
| 380 |
|
- so far the code is turned on within ggl90 by setting a CPP-flag at |
| 381 |
|
compile time; a runtime flag implementation is not yet complete |
| 382 |
|
- tested in new verification experiment global_ocean.90x40x15.idemix |
| 383 |
|
o verification: |
| 384 |
|
- reduce length of the AD test run by half for experiments |
| 385 |
|
global_ocean.cs32x15 (std + thsice) and isomip |
| 386 |
|
- enable active file I/O for OpenAD, adjust verifications accordingly |
| 387 |
|
- halfpipe_streamice: change gradient check from genarr2d to gentim2d |
| 388 |
|
o verification/testreport: |
| 389 |
|
- fix two non-POSIX sed statements so that there are no error messages |
| 390 |
|
on Mac OS X |
| 391 |
|
- replace hostname -s with hostname | sed 's/\..*$//' |
| 392 |
|
o model/src/seawater.F: |
| 393 |
|
- simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged |
| 394 |
|
(following the matlab code), which would have avoided the bug caught |
| 395 |
|
by Matt (see below) in the first place |
| 396 |
|
o pkg/shelfice: |
| 397 |
|
- implement alternative discretisation of quadratic drag (selectBotDragQuadr) |
| 398 |
|
and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag. |
| 399 |
|
- fix sign of friction tendency (no-slip BC) and fix u,v drag for thin |
| 400 |
|
ice-shelf case (i.e., within surface level). |
| 401 |
|
- add config summary in shelfice_check.F |
| 402 |
|
- remove global variable recip_SHELFICElatentHeat and replace by a local |
| 403 |
|
variable recip_latentHeat |
| 404 |
|
- introduce diagnostics for friction velocity uStar (in case of |
| 405 |
|
SHELFICEuseGammaFrict) |
| 406 |
|
- change verification experiment isomip.htd: |
| 407 |
|
+ start from pickup (as input_ad at nIter0=8640) |
| 408 |
|
+ start from SHELFICEmassFile instead of SHELFICEloadAnomaly file |
| 409 |
|
+ test SHELFICEuseGammaFrict = .TRUE. |
| 410 |
|
+ test SHELFICEadvDiffHeatFlux = .TRUE. |
| 411 |
|
o model/src: |
| 412 |
|
- fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to |
| 413 |
|
in-situ Temp) and in routine SW_TEMP (in pkg/openad); |
| 414 |
|
update output of experiments global_with_exf.yearly and isomip (all 6). |
| 415 |
|
o pkg/shelfice: |
| 416 |
|
- change setting of kTopC to also be zero where there is no ice-shelf. |
| 417 |
|
- zero out surface forcing arrays (for now, for T & S + EmPmR) where |
| 418 |
|
ice-shelf is. |
| 419 |
|
- first attempt to get RealFreshWaterFlux effects: for now, only without |
| 420 |
|
SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping. |
| 421 |
|
o pkg/seaice: add the option to prescribe a fixed thickness PDF |
| 422 |
|
for thermodynamic calculations |
| 423 |
|
- because of divisions of the type 7/7 not exactly equal to 1, this change |
| 424 |
|
affects results of some verification experiments by up to 4 digits: |
| 425 |
|
global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume, |
| 426 |
|
seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides |
| 427 |
|
adjoint: lab_sea, lab_sea.noseaicedyn |
| 428 |
|
-> updated |
| 429 |
|
|
| 430 |
|
checkpoint65i (2015/01/23) |
| 431 |
|
o model/src: |
| 432 |
|
- change units of frictionHeating field from W to W/m^2 |
| 433 |
|
- fix bug in frictional heating from stratospheric drag in |
| 434 |
|
S/R ATM_PHYS_TENDENCY_APPLY_V |
| 435 |
|
- with synchronous time-stepping: move resetting to zero of frictionHeating |
| 436 |
|
field from load_fields_driver.F to thermodynamics.F ; |
| 437 |
|
- add diagnostics for frictional heating. |
| 438 |
|
o model/src & gmredi K3D: |
| 439 |
|
- add frictionHeating field to pickup-files (for synchronous time-stepping) |
| 440 |
|
- move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h |
| 441 |
|
- rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name |
| 442 |
|
and name in pickup file). |
| 443 |
|
- fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F |
| 444 |
|
o model/src: |
| 445 |
- move (from ini_forcing.F) initialisation of all arrays in header file |
- move (from ini_forcing.F) initialisation of all arrays in header file |
| 446 |
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
| 447 |
(since Nov 2012) with option selectAddFluid=1. |
(since Nov 2012) with option selectAddFluid=1. |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch