| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/obcs: |
o pkg/obcs: |
| 8 |
writing sections with globalFiles=T does not work: add a STOP for this case. |
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
| 9 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
| 10 |
|
over a band of OLx width) |
| 11 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
| 12 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
| 13 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
| 14 |
|
o obcs in model/src: |
| 15 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
| 16 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
| 17 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
| 18 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
| 19 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
| 20 |
|
- zero out velocity outside OB interior region: This has no effect on |
| 21 |
|
the solution but just to prevent unrealistic velocity outside OB. |
| 22 |
|
o obcs and non-lin free-surf: |
| 23 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
| 24 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
| 25 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
| 26 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
| 27 |
|
update results of test-exp. exp4(nlfs). |
| 28 |
|
o exp4 (nlfs) test-exp: |
| 29 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
| 30 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
| 31 |
|
o obcs and 2d/3d solver norm: |
| 32 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
| 33 |
|
and outside OB interior region (will allow to place OB further inside the |
| 34 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
| 35 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
| 36 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
| 37 |
|
e.g. in tutorial_plume_on_slope. |
| 38 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
| 39 |
|
o pkg rbcs: |
| 40 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
| 41 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
| 42 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
| 43 |
|
o pkg/shelfice/shelfice_init_fixed.F |
| 44 |
|
fix CPP-flag combinations |
| 45 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
| 46 |
|
* update/change/correct ice age calculations |
| 47 |
|
* add age updates for pathological cases |
| 48 |
|
Probably needs more testing... |
| 49 |
|
|
| 50 |
|
checkpoint62x (2011/05/13) |
| 51 |
|
o pkg/mom_vecinv: |
| 52 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
| 53 |
|
to zero-out (outside OB) gradient of vorticity. |
| 54 |
|
o verification exp.: |
| 55 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
| 56 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
| 57 |
|
o pkg/obcs: |
| 58 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
| 59 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
| 60 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 61 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
| 62 |
|
variables needs its own mask. |
| 63 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 64 |
|
from the first guess (zero) in analogy to other control variables |
| 65 |
|
o pkg/shelfice: |
| 66 |
|
- start basic adjoint |
| 67 |
|
o pkg/ctrl: |
| 68 |
|
- remove extra 2D field "for good measure" when initializing in |
| 69 |
|
ctrl_set_globfld_[xy/xz/yz].F |
| 70 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
| 71 |
|
- improve error messages in ctrl_set_unpack_* |
| 72 |
|
o OBC implementation in momentum: |
| 73 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
| 74 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
| 75 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
| 76 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
| 77 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
| 78 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
| 79 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
| 80 |
|
Update output of experiment dome and exp4 (+nlfs). |
| 81 |
|
o exp4 test-exp: |
| 82 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
| 83 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
| 84 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
| 85 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
| 86 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
| 87 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
| 88 |
|
o pkg/obcs: |
| 89 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
| 90 |
|
o model/src: |
| 91 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
| 92 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
| 93 |
|
from the other without ambiguity. |
| 94 |
|
o seaice_obcs test-exp.: |
| 95 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
| 96 |
|
o pkg/obcs: |
| 97 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
| 98 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
| 99 |
|
o pkg/seaice: |
| 100 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
| 101 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
| 102 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
| 103 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
| 104 |
|
o fizhi-cs test exp.: |
| 105 |
|
switch reference output convention for these 2 non-standard test-exp, |
| 106 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
| 107 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
| 108 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
| 109 |
|
o model/inc: |
| 110 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
| 111 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
| 112 |
|
o pkg/seaice: |
| 113 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
| 114 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
| 115 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
| 116 |
|
and initial HSALT |
| 117 |
|
|
| 118 |
|
checkpoint62w (2011/04/26) |
| 119 |
|
o pkg/mom_fluxform: |
| 120 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
| 121 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
| 122 |
|
- update output of exp. global_ocean.90x40x15 |
| 123 |
|
o pkg/mom_vecinv: |
| 124 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
| 125 |
|
o update seaice exp.: |
| 126 |
|
use more consistent parameter values (remove "backward compatability only": |
| 127 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
| 128 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
| 129 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
| 130 |
|
o update test-exp global_ocean.90x40x15: |
| 131 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
| 132 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
| 133 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
| 134 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
| 135 |
|
and update output files: output.txt & output.dwnslp.txt |
| 136 |
|
o new AD-test experiment: obcs_ctrl |
| 137 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
| 138 |
|
o pkg/dic: |
| 139 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
| 140 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
| 141 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
| 142 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
| 143 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
| 144 |
|
at depth and bring the negative heat anomaly to the surface level |
| 145 |
|
o pkgs _fields_load: |
| 146 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
| 147 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
| 148 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
| 149 |
|
rbcs to get interpolation weights and time reccord number. |
| 150 |
|
- fix multi-threading in aim_fields_load.F |
| 151 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
| 152 |
|
o external_fields_load: |
| 153 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
| 154 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
| 155 |
|
time-step to convert to integer: |
| 156 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
| 157 |
|
(Thanks to Christopher L. Wolfe) |
| 158 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
| 159 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
| 160 |
|
store index of time-record which is currently loaded: |
| 161 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
| 162 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
| 163 |
|
(to be fixed soon) |
| 164 |
|
|
| 165 |
|
checkpoint62v (2011/04/02) |
| 166 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
| 167 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
| 168 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
| 169 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
| 170 |
|
o pkg/generic_advdiff with OBCS: |
| 171 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
| 172 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
| 173 |
|
This will affect the results if using obcs+biharmonic diffusion. |
| 174 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
| 175 |
|
o pkg/obcs: |
| 176 |
|
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
| 177 |
|
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
| 178 |
|
in Interior region. No impact on solution but affects Velocity monitor stats. |
| 179 |
|
o pkg/ptracers (adjoint) |
| 180 |
|
New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate |
| 181 |
|
tape file for each tracer |
| 182 |
|
o model/inc/src and pkg/autodiff: add parameters that allow to turn |
| 183 |
|
of parts of the adjoint code at run time. For now, there are only |
| 184 |
|
useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These |
| 185 |
|
parameters are set in data.pkg. |
| 186 |
|
This is the lazy coward's version of doing this, but still useful for |
| 187 |
|
debugging. In order to do it right, everything needs to be moved to |
| 188 |
|
pkg/autodiff. |
| 189 |
|
o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at |
| 190 |
|
the end; this fixes the adjoint balancing code for open boundaries. |
| 191 |
|
o pkg/ctrl: |
| 192 |
|
- change behavior of xx_${varname}period to be analogous to exf-conventions: |
| 193 |
|
xx_${varname}period = 0., means time-independent control part |
| 194 |
|
xx_${varname}period = -12., means one-year-periodic monthly control part |
| 195 |
|
- introduce helper routine ctrl_init_rec (part of ctrl_init.F) to |
| 196 |
|
clean up ctrl_init a little, remove unused variables |
| 197 |
|
- ctrl_init: fixed the handling of the start/endrec for obcs-variables |
| 198 |
|
- move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec |
| 199 |
|
|
| 200 |
|
checkpoint62u (2011/03/15) |
| 201 |
|
o model/src: |
| 202 |
|
- for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in |
| 203 |
|
h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ; |
| 204 |
|
- in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to |
| 205 |
|
INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF. |
| 206 |
|
o pkg/ctrl/obcs/ecco: |
| 207 |
|
- remove obsolete, unused, and partially broken code: |
| 208 |
|
ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within |
| 209 |
|
ALLOW_CTRL_OBCS_BALANCE |
| 210 |
|
- put a stop statement into ecco/cost_obcsvol.F, but also add |
| 211 |
|
cost_obcsvol to ecco_ad_diff.list |
| 212 |
|
o pkg/ecco: fix counting cost function contributions for obcs (code |
| 213 |
|
by Matt M.) and diffkr for diagnostics |
| 214 |
|
o pkg/ecco, pkg/ctrl, pkg/grdchk: |
| 215 |
|
add cost penalty terms for initial uvel, vvel, eta controls |
| 216 |
|
and I/O for prior error files |
| 217 |
|
o pkg/mdsio: |
| 218 |
|
move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option |
| 219 |
|
(new argument) to check for tiled file in mdsioLocalDir : this fix the |
| 220 |
|
restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir. |
| 221 |
|
o pkg/ctrl: |
| 222 |
|
- ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by |
| 223 |
|
ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove |
| 224 |
|
unused and superfluous variables |
| 225 |
|
- ctrl_get_gen_rec.F: catch the case of xx_genperiod=0. |
| 226 |
|
o pkg/ecco |
| 227 |
|
- enable adjoint of Stevens OB |
| 228 |
|
o pkg/ctrl/ecco/grdchk: |
| 229 |
|
- remove global declaration of tmpfldx/yz and tmpfldx/yz2. |
| 230 |
|
Fortunately, we do not have any tests for the numerous cpp-flagged |
| 231 |
|
option of "obcs as control parameters" so we will never know |
| 232 |
|
if this is an improvement (but at least now things compile). |
| 233 |
|
- remove an obsolete initialization from ecco_cost_init_barfiles.F |
| 234 |
|
- fix some problems within never used ifdefs to make the code compile |
| 235 |
|
o pkg/obcs: |
| 236 |
|
- Refine Interior mask definition to work with more complex OB (e.g. |
| 237 |
|
if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to |
| 238 |
|
read in Interior mask from file. Check if Interior mask is consistent |
| 239 |
|
with OB list of indices. |
| 240 |
|
o pkg/seaice |
| 241 |
|
- beginning code for a seaice tracer package, |
| 242 |
|
but currently only used for seaice age: SEAICE_AGE |
| 243 |
|
SEAICE_num = 4 |
| 244 |
|
iTracer = 1: area-weighted ice age |
| 245 |
|
= 2: volume-weighted ice age |
| 246 |
|
= 3, 4: template for one-year vs. multi-year ice |
| 247 |
|
data.seaice has new namelist SEAICE_PARM03 for arrays related to |
| 248 |
|
SEAICE_num |
| 249 |
|
|
| 250 |
|
checkpoint62t (2011/03/05) |
| 251 |
|
o pkg/obcs: |
| 252 |
|
- obcs_apply_uv.F: change to a 2 steps method, first tangential component; |
| 253 |
|
then normal component. This ensures that the normal component is set |
| 254 |
|
correctly even when it conficts with tangential setting from an other OB. |
| 255 |
|
Affects results of test-experiment seaice_obcs: update the output.txt |
| 256 |
|
o pkg/obcs: |
| 257 |
|
- add code to monitor statistics of dynamical fields at OB. |
| 258 |
|
- take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW : |
| 259 |
|
- fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection). |
| 260 |
|
- change default: balance the Net inflow through all OB (instead of balancing |
| 261 |
|
each OB separately); keep the old method if setting OBC_balanceFacX < 0. |
| 262 |
|
- switch on useOBCSbalance in dome experiment: only correct Western OB outflow |
| 263 |
|
to match Nortern OB inflow (OBCS_balanceFacN=0). |
| 264 |
|
o pkg/seaice: |
| 265 |
|
- redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL |
| 266 |
|
o pkg/seaice (seaice_growth v 1.113): |
| 267 |
|
- reverting seaice_growth to v 1.111 in order to have code with exact bit |
| 268 |
|
compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge |
| 269 |
|
CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced |
| 270 |
|
runtime flag SEAICEareaFormula is kept but is inactive |
| 271 |
|
o model/src: |
| 272 |
|
- add new param to scale curvilinear grid distance and area when using |
| 273 |
|
a different sphere radius from the grid-files. |
| 274 |
|
- test/check multi-threads EXCH applied to local variable (cg2d_x) |
| 275 |
|
o adjoint: |
| 276 |
|
- enable adjoint of Stevens OB |
| 277 |
|
- add dummy_in_dynamics to enable extraction of ADJrhoinsitu |
| 278 |
|
(a bit delicate because of potentially modified adj. common block structure; |
| 279 |
|
current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later) |
| 280 |
|
|
| 281 |
|
checkpoint62s (2011/02/15) |
| 282 |
|
o pkg/seaice (seaice_growth v 1.112): |
| 283 |
|
- introduce SEAICEareaFormula run time parameter, which selects the recipe for |
| 284 |
|
computing the ice cover tendency from effective thickness tendencies. Include |
| 285 |
|
Ian Fenty's formula. |
| 286 |
|
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using |
| 287 |
|
SEAICEareaFormula. |
| 288 |
|
- simplify notations for the various d_HEFF/d_AREA terms. |
| 289 |
|
o pkg/gmredi: |
| 290 |
|
- add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code |
| 291 |
|
from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative; |
| 292 |
|
add a verification test-run (front_relax.bvp) to test GM_useBVP. |
| 293 |
|
o pkg/seaice (seaice_growth v 1.111): |
| 294 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
| 295 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to |
| 296 |
|
also melt ice. |
| 297 |
|
o pkg/seaice: |
| 298 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
| 299 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
| 300 |
|
o pkg/cheapaml: |
| 301 |
|
- from Nico Wienders: New version of this package. |
| 302 |
|
o pkg/flt: |
| 303 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
| 304 |
|
a periodic domain (default: keep periodicity) |
| 305 |
|
o pkg/gmredi: |
| 306 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
| 307 |
|
(needed for multi-dim advection). |
| 308 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
| 309 |
|
o model/src: |
| 310 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
| 311 |
|
o tutorial_tracer_adjsens |
| 312 |
|
- extend to NLFS and replace maskC by hFacC |
| 313 |
|
(change reference output accordingly) |
| 314 |
|
|
| 315 |
|
checkpoint62r (2011/01/24) |
| 316 |
|
o testreport: |
| 317 |
|
- add option -deloutp (-do) to remove output file after successful run |
| 318 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
| 319 |
|
extract exact list of procs from this file ; adjust COMMAND by |
| 320 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
| 321 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
| 322 |
|
first guess (of obcs) with code by Matt Mazloff |
| 323 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
| 324 |
|
exf/cal |
| 325 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
| 326 |
|
and handle case of obcs?period == 0 |
| 327 |
|
Not affected by these changes: There is still an inconsistency in |
| 328 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
| 329 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
| 330 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
| 331 |
|
ALLOW_CAL is not defined |
| 332 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
| 333 |
|
S/R exf_swapfields |
| 334 |
|
o testreport: |
| 335 |
|
allow to test MPI with different number of processors for each experiment: |
| 336 |
|
create file "SIZE.h.mpi" in each build dir. |
| 337 |
|
Note: update of "-command" argument not yet implemented. |
| 338 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
| 339 |
|
alleviate the need for additional 3D tapes when using |
| 340 |
|
the non-inear free surface in the adjoint. This is done |
| 341 |
|
by adding an 'update' of hfacc etc. to their current |
| 342 |
|
value at the beginning of forward_step.F. |
| 343 |
|
o pkg/seaice |
| 344 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
| 345 |
|
timestepping loop |
| 346 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
| 347 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
| 348 |
|
of the routine. |
| 349 |
|
o pkg/gmredi: |
| 350 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
| 351 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
| 352 |
|
o pkg/seaice: |
| 353 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
| 354 |
|
o pkg/seaice: |
| 355 |
|
reduce memory footprint of seaice mutldim advection tapes, |
| 356 |
|
by using a 2D tape independent of the generic_advdiff ones, |
| 357 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
| 358 |
|
|
| 359 |
|
checkpoint62q (2010/12/29) |
| 360 |
|
o model/src: |
| 361 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
| 362 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
| 363 |
|
o pkg/flt: |
| 364 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
| 365 |
|
- precision of input and output files set according to readBinaryPrec |
| 366 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
| 367 |
|
- initial float position from tiled file was not converted to index space |
| 368 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
| 369 |
|
o global_ocean.cs32x15: |
| 370 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
| 371 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
| 372 |
|
o model/src: |
| 373 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
| 374 |
|
ini_mask_etc (call to plot_fieds_xy*). |
| 375 |
|
o pkg/thsice: |
| 376 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
| 377 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
| 378 |
|
o pkg/mdsio: |
| 379 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
| 380 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
| 381 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
| 382 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
| 383 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
| 384 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
| 385 |
|
o pkg/flt: |
| 386 |
|
- add fourth-order Runge-Kutta integration |
| 387 |
|
- add basic exch2 support (only 1 facet supported so far!) |
| 388 |
|
o pkg/mdsio+rw: |
| 389 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
| 390 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
| 391 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
| 392 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 393 |
|
(using multidim advection for seaice) |
| 394 |
|
o towards more F95 syntax for array specification in namelist: |
| 395 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
| 396 |
|
of all verification experiments. |
| 397 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
| 398 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
| 399 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
| 400 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
| 401 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 402 |
|
|
| 403 |
|
checkpoint62p (2010/12/17) |
| 404 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
| 405 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
| 406 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
| 407 |
|
allow for use of multim. advection in seaice adjoint. |
| 408 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
| 409 |
|
- first attempt to close budgets by taking into account the freshwater |
| 410 |
|
flux implied by the sublimation of snow and ice. So far only the |
| 411 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
| 412 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
| 413 |
|
o eesupp/src: |
| 414 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
| 415 |
|
from F95 standard to commonly accepted extended F77 form. |
| 416 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
| 417 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
| 418 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
| 419 |
|
o globalFiles: |
| 420 |
|
commented out in parameter file "data" since it's not safe with MPI |
| 421 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
| 422 |
|
in this case); no longer commented out in restart test (tst_2+2). |
| 423 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
| 424 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
| 425 |
|
and cannot be used together with mdsioLocalDir. |
| 426 |
|
o nesting pkgs: |
| 427 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
| 428 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 429 |
|
- add parameter files + utils dir + output from short run on beagle. |
| 430 |
|
o pkg/seaice: |
| 431 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
| 432 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
| 433 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
| 434 |
|
|
| 435 |
|
checkpoint62o (2010/11/25) |
| 436 |
|
o pkg/exf: |
| 437 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
| 438 |
|
o pkg/seaice: |
| 439 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
| 440 |
|
adjoint code |
| 441 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
| 442 |
|
capping of heff, put contribution into d_HEFFbyNEG |
| 443 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
| 444 |
|
by something more sensible (parameters that are what their name implies) |
| 445 |
|
- change some defaults, so that by default exf-parameters are used for |
| 446 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
| 447 |
|
to reproduce the old results, many data.seaice now contain funny values |
| 448 |
|
for cpAir and latent heat of sublimation |
| 449 |
|
o packages_readparms.F: move exf_readparms up in line so that |
| 450 |
|
exf-parameters are visible for other packages (e.g. seaice) |
| 451 |
|
o debugMode & debugLevel=2: |
| 452 |
|
- differentiate between debugMode & debugLevel=2: |
| 453 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
| 454 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
| 455 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
| 456 |
|
=> allows to print debug-stats without all sequence of call messages. |
| 457 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
| 458 |
|
o pkg/obcs (obcs-sponge): |
| 459 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
| 460 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
| 461 |
|
o pkg/generic_advdiff: |
| 462 |
|
- record overlap minimum size for each advection scheme; |
| 463 |
|
- refine criteria on overlap minimum size; |
| 464 |
|
- check and stop (in gad_check) if overlap size is too small. |
| 465 |
|
o pkg/obcs: |
| 466 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
| 467 |
|
once, in ptracers_implicit.F) |
| 468 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
| 469 |
|
apply OB values when tile has OB) |
| 470 |
|
o model/src, coriolis setting: |
| 471 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
| 472 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
| 473 |
|
files (selectCoriMap=3) with any grid. |
| 474 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
| 475 |
|
o pkg/seaice/seaice_growth.F: |
| 476 |
|
a few cosmetic changes that reduce the number of lines of code |
| 477 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
| 478 |
|
- the code follows old MOM/NAOSIM code |
| 479 |
|
- so far it is only implemented for the eastern and western boundaries |
| 480 |
|
and NOT for pTracers |
| 481 |
|
o pkg/rbcs: |
| 482 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
| 483 |
|
beginning of the first rbcs forcing period. |
| 484 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
| 485 |
|
offline package, i.e., one file per time, labeled by iteration number; |
| 486 |
|
deltaTrbcs sets the timestep with which the data was generated; |
| 487 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
| 488 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
| 489 |
|
- make arithmetic safe for negative times and odd forcing periods. |
| 490 |
|
|
| 491 |
|
checkpoint62n (2010/11/09) |
| 492 |
|
o pkg/seaice: |
| 493 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
| 494 |
|
o pkg/obcs: |
| 495 |
|
New S/R to copy tracer value from the OB location to narrow band region |
| 496 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
| 497 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
| 498 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
| 499 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
| 500 |
|
in seaice_advection.F and advect.F. |
| 501 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
| 502 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
| 503 |
|
o tools/genmake2: |
| 504 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
| 505 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
| 506 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
| 507 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
| 508 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
| 509 |
|
an optfile, but otherwise default was just "cpp". |
| 510 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
| 511 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
| 512 |
|
(instead of just setting CC=cc) |
| 513 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
| 514 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
| 515 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
| 516 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
| 517 |
|
with reference compiler switch from g77 to gfortran) |
| 518 |
|
o pkg/seaice: |
| 519 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
| 520 |
|
seaice_check that stops the model, when the CPP flag is used. |
| 521 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
| 522 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
| 523 |
|
experiments but will change runs where the capping is acutally active |
| 524 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
| 525 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
| 526 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
| 527 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
| 528 |
|
o tools/genmake2: |
| 529 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
| 530 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
| 531 |
|
- clean previous genmake log files before anything else. |
| 532 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
| 533 |
|
files only with "CLEAN" target (instead of "Clean"); |
| 534 |
|
o pkg/generic_advdiff: |
| 535 |
|
Change OBCS in multiDim advection (gad_advection.F): |
| 536 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
| 537 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
| 538 |
|
which were applying future time-step OB values. |
| 539 |
|
This way, all explicit calculations use current-time-step OB values |
| 540 |
|
(simpler and more consistent). |
| 541 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
| 542 |
|
update output of experiment seaice_obcs. |
| 543 |
|
o pkg/seaice: |
| 544 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 545 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 546 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
| 547 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
| 548 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
| 549 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
| 550 |
|
o pkg aim (2010/10/26): |
| 551 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
| 552 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
| 553 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
| 554 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
| 555 |
|
o pkg/obcs: |
| 556 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
| 557 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
| 558 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
| 559 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
| 560 |
|
|
| 561 |
checkpoint62m (2010/10/21) |
checkpoint62m (2010/10/21) |
| 562 |
o pkg/seaice: vectorize seaice_solve4temp.F |
o pkg/seaice: vectorize seaice_solve4temp.F |
| 968 |
but keep the former optfile for few weeks for smooth transition |
but keep the former optfile for few weeks for smooth transition |
| 969 |
o pkg/ecco |
o pkg/ecco |
| 970 |
- allow user defined cost function contributions |
- allow user defined cost function contributions |
| 971 |
CPP: ALLOW_USERCOST_CONTRIBUTION |
CPP: ALLOW_USERCOST_CONTRIBUTION |
| 972 |
USAGE: compute contributions in cost_usercost_all.F |
USAGE: compute contributions in cost_usercost_all.F |
| 973 |
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
| 974 |
the two options are complementary. |
the two options are complementary. |
| 975 |
o pkg/smooth |
o pkg/smooth |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch