| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o AD_CONFIG.h file: |
| 8 |
|
- in genmake2: remove "#undef ALLOW_ECCO_OPTIMIZATION" from AD_CONFIG.h; |
| 9 |
|
- remove #include "AD_CONFIG.h" from all included OPTIONS files and |
| 10 |
|
add it explicitly in each fortran src file where it is needed. |
| 11 |
|
motivation: header file AD_CONFIG.h is generated/modified after "make depend" |
| 12 |
|
thus introducing potentially wrong dependency; therefore, better to include |
| 13 |
|
it only where it's really needed, and after any other included OPTIONS file |
| 14 |
|
(less tempting to bring conditional includes according to ALLOW_ADJOINT_RUN |
| 15 |
|
or ALLOW_TANGENTLINEAR_RUN). |
| 16 |
|
|
| 17 |
|
checkpoint63p (2012/07/06) |
| 18 |
|
o pkg/autodiff: |
| 19 |
|
- rename S/R INI_AUTODIFF to AUTODIFF_INIT_VARIA ; |
| 20 |
|
- create new header file "AUTODIFF_PARAMS.h" for pkg/autodiff parameters |
| 21 |
|
which are now read from new parameter file "data.autodiff" (inAdExact |
| 22 |
|
previously in "data", use{KPP/GMRedi/SEAICE}inAdMode previously in data.pkg) |
| 23 |
|
- add file "data.autodiff" in all verification/*/input_ad/ directories. |
| 24 |
|
- add run-time parameter to turn On/Off SEAICEuseFREEDRIFT in adjoint/forward |
| 25 |
|
mode (used in global_ocean.cs32x15.seaice_dynmix test exp.) |
| 26 |
|
o verification/tutorial_tracer_adjsens/ |
| 27 |
|
- add extra sub-verification which uses "SOM" advection scheme |
| 28 |
|
(2nd Order-Moment Advection Scheme, Prather Limiter) with |
| 29 |
|
#define GAD_ALLOW_TS_SOM_ADV in GAD_OPTIONS.h |
| 30 |
|
and in data: |
| 31 |
|
multiDimAdvection=.TRUE., |
| 32 |
|
tempAdvScheme=81, |
| 33 |
|
saltAdvScheme=81, |
| 34 |
|
o model/src: |
| 35 |
|
- introduce ALLOW_BALANCE_RELAX which allow the removal |
| 36 |
|
of the global mean of relaxation terms by setting |
| 37 |
|
balanceThetaClimRelax and balanceSaltClimRelax |
| 38 |
|
- disable balanceEmPmR and balanceQnet in the case when useSeaice. |
| 39 |
|
This case is now treated appropriately in seaice_growth.F |
| 40 |
|
o pkg/seaice: |
| 41 |
|
- do balanceEmPmR and balanceQnet based on the net fluxes |
| 42 |
|
(SItflux) that enter the ocean+ice system rather than QNET |
| 43 |
|
and EMPMR. Works best in real fresh water. |
| 44 |
|
- SIatmFW, SIatmQnet, and SItflux computations had to be moved |
| 45 |
|
out of the diagnotics bloc, and stored in global arrays. |
| 46 |
|
|
| 47 |
|
checkpoint63o (2012/06/29) |
| 48 |
|
o vertical mixing schemes: |
| 49 |
|
- remove unused S/R CALC_BUOYANCY (left from branch-atmos merging) |
| 50 |
|
- replace computation of density (in Function STATE1, opps_calc.F) by a call |
| 51 |
|
to S/R FIND_RHO_SCALAR |
| 52 |
|
- pass sigmaR to S/R PP81_CALC, MY82_CALC (but not yet used) and to GGL90_CALC |
| 53 |
|
and use it for N^2 calculation in ggl90_calc.F (save 2 density computations); |
| 54 |
|
affects output (vermix.ggl90) at truncation level. |
| 55 |
|
o testreport: |
| 56 |
|
- change adjustment of SIZE.h for mpi+mth testing: preserve enough tiles |
| 57 |
|
(nSx,nSy) for the number of threads (from eedata.mth) |
| 58 |
|
o model/src: |
| 59 |
|
- remove 2nd set of calls at the top of initialise_varia.F (Adjoint part) |
| 60 |
|
related to Non_Lin Free-Surf or Bottom-Control (but not longer necessary). |
| 61 |
|
o verification/tutorial_tracer_adjsens/ |
| 62 |
|
- compile with ALLOW_CG2D_NSA |
| 63 |
|
- run with nonlinFreeSurf=3 |
| 64 |
|
- update reference output_adm.txt |
| 65 |
|
o tools/genmake2: |
| 66 |
|
- add "-DHAVE_NETCDF" to the DEFINES list when NetCDF is available ; |
| 67 |
|
refine usePROFILES switching off (only when NetCDF is not available). |
| 68 |
|
o verification (atmospheric set-up): |
| 69 |
|
- change eosType='IDEALGAS' to eosType='IDEALG' to match variable declaration |
| 70 |
|
o pkg/profiles : refine profiles and files handling. |
| 71 |
|
o model/src and pkg/ecco : introduce run-time switch usePROFILES. |
| 72 |
|
o model/src/the_main_loop.F, forward_step.F and pkg/exf/EXF_OPTIONS.h : |
| 73 |
|
- changes to use model/src/the_main_loop.F rather than the ecco version |
| 74 |
|
in ecco type adjoint runs. |
| 75 |
|
o model/src: |
| 76 |
|
- move computation of recip of grid distance & area from INI_MASKS_ETC to INI_GRID |
| 77 |
|
- move setting of h0Fac[C,W,S] from INI_LINEAR_PHISURF to INI_MASKS_ETC |
| 78 |
|
- update_masks_etc.F: rename SMOOTH*_R4,R8 function to the corresponding type (RS,RL) |
| 79 |
|
o model/src: |
| 80 |
|
- fix S/R UPDATE_CG2D for ALLOW_DEPTH_CONTROL case (was empty before); |
| 81 |
|
update output of test experiment bottom_ctrl_5x5. |
| 82 |
|
o pkg/generic_advdiff: |
| 83 |
|
- implement vertical bi-harmonic diffusion (for now, only for T & S and |
| 84 |
|
only explicitly). |
| 85 |
|
o verification/bottom_ctrl_5x5/ |
| 86 |
|
update reference output (results changed quite some time ago, |
| 87 |
|
not sure when; but new reference results look ok in terms of grdchk) |
| 88 |
|
o verification/1D_ocean_ice_column/ |
| 89 |
|
For verification purposes, the exact adjoint rather than an approx. |
| 90 |
|
should be used (e.g., to comare against F.D. or TLM). |
| 91 |
|
removed autodiff_inadmode*_ad.F routines in code_ad/ |
| 92 |
|
Update results/ accordingly. |
| 93 |
|
o pkg/cal: |
| 94 |
|
- change cal_getdate.F so that output date is function of input time only |
| 95 |
|
(less ambiguous, not mixed up with input iteration number). |
| 96 |
|
- fix calendarDumps for non-zero phase-lag (S/R CAL_TIME2DUMP). |
| 97 |
|
o pkg/diagnostics: |
| 98 |
|
- implement calendarDumps also for stats-diags |
| 99 |
|
- implement calendarDumps also for snap-shot output (negative freq) |
| 100 |
|
- for now, ignores calendarDumps if non-zero phase-lag. |
| 101 |
|
|
| 102 |
|
checkpoint63n (2012/06/04) |
| 103 |
|
o model/src: |
| 104 |
|
- recompute rSurfW & S to ensure consistent column thickness (needed for rStar) |
| 105 |
|
between Sum_k(hFac*drF) and rSurf-rLow, for now only when using pkg/shelfice; |
| 106 |
|
- use h0FacC, W & S to compute hFac_surfC, W & S in calc_surf_dr.F (more |
| 107 |
|
similar to calc_r_star.F); update results of experiment internal_wave and |
| 108 |
|
tutorial_global_oce_in_p (affected @ truncation level). |
| 109 |
|
o pkg/shelfice: |
| 110 |
|
- add parameterisation of advective-diffusive flux into the ice shelf |
| 111 |
|
according to Holland and Jenkins (1999), eq.22-33, as suggested by Jan De Ryd |
| 112 |
|
- simply eps3/3a computation |
| 113 |
|
o eesupp: |
| 114 |
|
- add new CPP option (DISCONNECTED_TILES) to disconnect tiles (no exchange |
| 115 |
|
between tiles, just fill-in edges assuming locally periodic subdomain) and |
| 116 |
|
add corresponding exchange subroutines (EXCH0); |
| 117 |
|
- new CG-solver version (_EX0) for disconnected-tiles special case. |
| 118 |
|
o model/src (CG-solvers): |
| 119 |
|
- modify Single-Reduction version (CG2D_SR) in case cg2dMaxIters is reached |
| 120 |
|
(similar final residual output and max-Iter number as with standard version); |
| 121 |
|
- allows to store and use lowest-residual solution (standard & _SR versions); |
| 122 |
|
- cleaning up (remove old, commented out code, LETS_MAKE_JAM ...). |
| 123 |
|
- by default, also compile CG2D_SR version (define ALLOW_SRCG in CPP_OPTIONS.h) |
| 124 |
|
o eesup/src: |
| 125 |
|
- global_vec_sum.F cleaning: add a BARRIER ; update comments ; remove ndef |
| 126 |
|
ALWAYS_USE_MPI (no longer needed after fixing usingMPI settings - March 2012) |
| 127 |
|
o pkg/salt_plume added to lab_sea/input_ad.noseaicedyn |
| 128 |
|
|
| 129 |
|
checkpoint63m (2012/04/27) |
| 130 |
|
o pkg/shelfice: |
| 131 |
|
- account for partical cells in surface level below ice-shelf for hydrostatic |
| 132 |
|
pressure calculion (set uniformFreeSurfLev to F); update isomip experiments. |
| 133 |
|
o ad test experiments: |
| 134 |
|
- update and rename to "ad_optfile.local" local AD-optfile specific to a |
| 135 |
|
particular adjoint verification experiment (in verification/*/code_ad/) |
| 136 |
|
o pkg/seaice & pkg/exf: |
| 137 |
|
- Part two of ECCO-CLIVAR code merges. |
| 138 |
|
Completes merge of seaice area relax. code. |
| 139 |
|
Requires unified CPP option EXF_ALLOW_SEAICE_RELAX |
| 140 |
|
to be set in EXF_OPTIONS.h since this pkg controls its I/O |
| 141 |
|
(and avoids second CPP option in SEAICE_OPTIONS.h) |
| 142 |
|
- change default value of costIceStart & costIceEnd to a valid date. |
| 143 |
|
- add snowPrecip to HSNOW in seaice_growth |
| 144 |
|
o pkg/ptracers: |
| 145 |
|
- move ptracers summary and setup check into separated S/R ; add a check for |
| 146 |
|
valid PTRACERS_Iter0 value (error+stop or just warning). |
| 147 |
|
o pkg/cal (+ pkg/ecco): |
| 148 |
|
- avoid calling a S/R with 2 times the same arg (FWD: unless both are only used |
| 149 |
|
as input; and for AD, unless both are not differentiable (e.g., k index)). |
| 150 |
|
o model/src: |
| 151 |
|
- define internal flag "uniformFreeSurfLev" (=T when free-surface level-index |
| 152 |
|
is everywhere k=1) to speed-up some calculations (by pass kSurf reference); |
| 153 |
|
temporary set to usingZCoords value (to be changed to F when using shelfice). |
| 154 |
|
- hydrostatic pressure: implement partial cell near the surface also for |
| 155 |
|
Z-coordinates (for the case where uniformFreeSurfLev=F); replace test on |
| 156 |
|
usingZCoords with test on uniformFreeSurfLev where needed (in NonHyd code). |
| 157 |
|
o pkg/ctrl/ctrl_init.F: |
| 158 |
|
- add a formal parameter to s/r ctrl_init_rec to print |
| 159 |
|
xx_$(ctrl_valiable)_file for easier debugging |
| 160 |
|
- move call of cal_* routines into the if-block where they are really |
| 161 |
|
needed so that xx_$(ctrl_variable)_period can be 0 or -12 without having |
| 162 |
|
to specify a startdate |
| 163 |
|
o pkg/seaice: |
| 164 |
|
- update comments in SEAICE_OPTIONS.h (+ similar update of lab_sea/code and |
| 165 |
|
global_ocean.cs32x15/code versions). |
| 166 |
|
- turn on seaice Multi-category (in data.seaice, SEAICE_multDim=7) for |
| 167 |
|
verification experiment global_ocean.cs32x15.seaice and update results. |
| 168 |
|
o pkg/exf: |
| 169 |
|
- new S/R EXF_GETFIELD_START to return starting-time of a forcing field |
| 170 |
|
(according to useExfYearlyFields). |
| 171 |
|
o pkg/cal: |
| 172 |
|
- move calendar setting & summary (previously in cal_readparams.F) into new |
| 173 |
|
S/R CAL_INIT_FIXED to be called later in the initialisation process, once |
| 174 |
|
length of the simulation is set (after SET_PARMS call); This is an attempt |
| 175 |
|
to fix Pb when, e.g.: pkg/longstep, modifies the length of the run. |
| 176 |
|
- For safety: keep a record of pkg/cal parameter settings status |
| 177 |
|
to allow to STOP if one pkg/cal S/R is called too early. |
| 178 |
|
- add a stop in all basic pkg/cal subroutines if called before setting is done. |
| 179 |
|
- modify cal_getdate.F: stop when nothing was returned; |
| 180 |
|
if called with myIter=-1, simply retrun modelBaseDate (1,2 = startDate_1,_2); |
| 181 |
|
this allows to remove "cal.h" from seaice_read_parms.F & init_mnc_vars.F. |
| 182 |
|
|
| 183 |
|
checkpoint63l (2012/04/04) |
| 184 |
|
o pkg/bbl: |
| 185 |
|
- fix call to FIND_RHO_2D in bbl_calc_rho.F (case multi-tiles per proc); |
| 186 |
|
update global_with_exf output.yearly.txt file. |
| 187 |
|
o pkg/cal: |
| 188 |
|
- start to clean-up cal_set.F ; fix for the case where baseTime is non-zero. |
| 189 |
|
- remove 2 unsused and very short (1 line only) functions ; |
| 190 |
|
- remove unsused subroutines from AD-Diff list. |
| 191 |
|
o model/src: |
| 192 |
|
- start to implement clean wait to stop in initialization S/R (config_check.F, |
| 193 |
|
packages_check.F, ini_parms.F and pkg/obcs/obcs_check.F + pkg/mypackage) |
| 194 |
|
o folowing PRINT_MESSAGE changes: |
| 195 |
|
- remove reminder multiple print to the same file (STDOUT) when multi-threads. |
| 196 |
|
o pkg/bbl: |
| 197 |
|
- modification so it can work with z* |
| 198 |
|
- replace deltaT with dTtracerLev(k) for asynchronous time stepping |
| 199 |
|
- global_with_exf/input.yearly verification; changes output.yearly.txt |
| 200 |
|
o eesupp/src: |
| 201 |
|
- PRINT_MESSAGE: use OpenMP critical instruction (similar to PRINT_ERROR); |
| 202 |
|
writing to unit 0 (if unit=errorMessageUnit) extended to the case myThid=1 |
| 203 |
|
- CHECK_THREADS: specific code if using OpenMP threading: improve checking of |
| 204 |
|
# of threads across processors (e.g., different env OMP_NUM_THREADS setting) |
| 205 |
|
- improve special preliminary call to EESET_PARMS (if eedata is read 2 times). |
| 206 |
|
- when using MPI, always set usingMPI=T ; set default accordingly and stop |
| 207 |
|
if not consistent. |
| 208 |
|
- ALL_PROC_DIE: add a BARRIER after MPI_FINALIZE call ; skip this when thread |
| 209 |
|
argument is zero (in case called within single-thread section). |
| 210 |
|
o pkg/fizhi: |
| 211 |
|
clean-up turbulence cold-start switch: decided in fizhi_init_vars.F, stored |
| 212 |
|
in common bloc (fizhi_coms.h) and then passed as argument up to S/R TURBIO. |
| 213 |
|
o pkg/exch2: |
| 214 |
|
- add argument "updateCorners" to S/R exch2_get_uv_bounds (enable to |
| 215 |
|
activate EXCH_IGNORE_CORNERS in vector EXCH S/R). |
| 216 |
|
- switch 1rst EXCH call to IGNORE_CORNERS (instead of UPDATE_CORNERS) |
| 217 |
|
but keep the 2nd with UPDATE_CORNERS: this prevents overwriting good data |
| 218 |
|
with bad ones coming from a not-yet-updated halo. |
| 219 |
|
This should fix the problem when sNx <> sNy and GCD(sNx,sNy) < 2*Olx. |
| 220 |
|
o pkg/frazil: |
| 221 |
|
move FrzForcT diag from frazil_diagnostics_state.F to frazil_calc_rhs.F |
| 222 |
|
http://mitgcm.org/pipermail/mitgcm-devel/2012-March/005384.html |
| 223 |
|
o model/src/config_check.F: add a check for OLx>sNx/OLy>sNy |
| 224 |
|
o verification/lab_sea |
| 225 |
|
* #undef SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING |
| 226 |
|
* #define ALLOW_SST_CONTROL & ALLOW_SST_CONTROL |
| 227 |
|
* nTimeSteps 3 -> 4 |
| 228 |
|
* changed reference output accordingly |
| 229 |
|
o pkg/ctrl: |
| 230 |
|
* fix ctrl_get_gen for xx_sst, xx_sss |
| 231 |
|
o pkg/fizhi: |
| 232 |
|
- fix 2 calls to S/R GRD2MSC (argument igrd) in update_earth_exports.F |
| 233 |
|
update results of exp. fizhi-cs-32x32x40 (fail with only 6 digits for cg2d) |
| 234 |
|
- by default, use new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE); |
| 235 |
|
fix few out-of-bounds indices in referencing vars (initialise igrd to 1); |
| 236 |
|
clean-up fizhi_turb.F (remove unused & uninitialised qdiaglsm array). |
| 237 |
|
o pkg/gmredi: |
| 238 |
|
- add diagnostic of Redi (main diagnonal) vertical diffusive flux of Temp |
| 239 |
|
o pkg/fizhi: |
| 240 |
|
- fix few initialisation and multi-tile Pb: aqualev & gridalt now pass the |
| 241 |
|
(old)aces open64 tuv test. |
| 242 |
|
o pkg/icefront: fix bug and reorder loop in icefront_init_varia.F |
| 243 |
|
o pkg/mom_vecinv: |
| 244 |
|
- fix 1 loop range in mom_vecinv.F to be like all the other loops which |
| 245 |
|
set/update gu,gv/Diss (fix Pb of uninitialised fVerUkp in admom_vecinv |
| 246 |
|
with non-lin free-surf). |
| 247 |
|
o model/src: move k-loop outside of i/j-loops when (re-)computing R_low |
| 248 |
|
in ini/update_masks_etc.F in order to avoid -O3 optimization problems with |
| 249 |
|
some compilers (gfortran 4.6.0 on MacOS) |
| 250 |
|
o momentum: |
| 251 |
|
- separate fVer?(:,:,kUp) & fVer?(:,:,kDown) in argument list of MOM_FLUXFORM |
| 252 |
|
& MOM_VECINV subroutines (to help TAF). This fixes Pb of uninitialised |
| 253 |
|
fVer?(kUp) in admom_fluxform with non-lin free-surf or bottom control. |
| 254 |
|
|
| 255 |
|
checkpoint63k (2012/03/17) |
| 256 |
|
o model/src: |
| 257 |
|
- selectAddFluid (ALLOW_ADDFLUID): add missing term in horizontal momentum |
| 258 |
|
flux-form (mom_fluxform.F) and vertical momentum (calc_gw.F) equations. |
| 259 |
|
- SOLVE_DIAGONAL: switch default to use adjoinable & vectorized version |
| 260 |
|
(#undef SOLVE_DIAGONAL_LOWMEMORY); update output of exp. front_relax.bvp. |
| 261 |
|
o model/src: solve_*diagonal.F |
| 262 |
|
- replace division with multiplication by inverse (similar to original version) |
| 263 |
|
update output of AD exp. global_ocean.90x40x15. |
| 264 |
|
- fix pkg/gmredi/gmredi_calc_psi_bvp.F & pkg/ggl90/ggl90_calc.F |
| 265 |
|
to enable the use of the vectorized & differentiable solve_tridiagonal.F |
| 266 |
|
- test exp. global_ocean.90x40x15/input_ad: switch to advection scheme 20 for |
| 267 |
|
vertical advection (to get solve_tridiagonal tested in AD mode). |
| 268 |
|
o pkg/seaice: ECCO-CLIVAR merge: |
| 269 |
|
1. seaice AREA relaxation |
| 270 |
|
* CPP option: SEAICE_ALLOW_AREA_RELAXATION |
| 271 |
|
* runtime flag: SEAICE_tauAreaObsRelax |
| 272 |
|
2. modified global mean cost imbalance code: CPP option |
| 273 |
|
ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION |
| 274 |
|
o another iteration on solve_*diagonal.F |
| 275 |
|
Make choices independent of AUTODIFF |
| 276 |
|
Default will be the adjoinable vectorized version. |
| 277 |
|
Alternative choices are: |
| 278 |
|
* non-adjoinable original version with low memory footprint: |
| 279 |
|
#define SOLVE_DIAGONAL_LOWMEMORY |
| 280 |
|
* still adjoinable but does not vectorize (k as inner-most loop): |
| 281 |
|
#define SOLVE_DIAGONAL_KINNER (keeping SOLVE_DIAGONAL_LOWMEMORY undef) |
| 282 |
|
o testreport |
| 283 |
|
- add option to use a home made wrapper around "make" |
| 284 |
|
- remove MITGCM_IEEE env. variable (no longer active) |
| 285 |
|
o pkg/shelfice |
| 286 |
|
- improve computation of friction velocity for velocity dependent |
| 287 |
|
exchange coefficients: include velocities into SHELFICEBoundaryLayer |
| 288 |
|
block to average velocities vertically |
| 289 |
|
- add TAF store directives for SHI_ALLOW_GAMMAFRICT |
| 290 |
|
o Modify diagonal solvers, now three versions (upon request): |
| 291 |
|
#ifndef SOLVE_DIAGONAL_AUTODIFF |
| 292 |
|
1. default version (dating back a while ago) |
| 293 |
|
#else /* def SOLVE_DIAGONAL_AUTODIFF */ |
| 294 |
|
# ifdef SOLVE_DIAGONAL_KINNER |
| 295 |
|
2. adjoinable version with k-innermost loop (G. Forget) |
| 296 |
|
# else |
| 297 |
|
3. adjoinable vectorized version of 2. |
| 298 |
|
# endif |
| 299 |
|
#endif /* SOLVE_DIAGONAL_AUTODIFF */ |
| 300 |
|
All flags are currently set within routines, but could/should be moved to CPP-options. |
| 301 |
|
Array bounds for 1. are as before, for 2.,3. cover the entire domain |
| 302 |
|
(could be changed for 1. too). |
| 303 |
|
o verification/lab_sea (fwd): |
| 304 |
|
- update the 4 fwd lab_sea test experiment: no longer SEAICE_GROWTH_LEGACY, |
| 305 |
|
use 7 categories (except hb87), new solve4temp params (except salt_plume), |
| 306 |
|
constant salinity (=4) or variable salinity (salt_plume) done through |
| 307 |
|
SItracer. |
| 308 |
|
o pkg/seaice: |
| 309 |
|
- rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0; |
| 310 |
|
- remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t, |
| 311 |
|
SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz) |
| 312 |
|
from SEAICE_PARMS.h ; still need to fix seaice_cost_sst.F (broken when |
| 313 |
|
SEAICE_freeze got retired) but already better than previously with |
| 314 |
|
SEAICE_freeze=123456.7 deg.C; |
| 315 |
|
- move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS |
| 316 |
|
(safer multi-threaded setting); always set SEAICEuseEVP; |
| 317 |
|
- setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to |
| 318 |
|
SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report); |
| 319 |
|
stop if multiple specifications for the same coeff; make sure default |
| 320 |
|
SEAICE_mcPheePiston is compatible with drF(1) & deltaT. |
| 321 |
|
o pkg/obcs: |
| 322 |
|
- allow to switch to upwind 1rst order advection scheme for the advective |
| 323 |
|
flux computation at the open-boundary; disabled for adjoint built. |
| 324 |
|
o pkg/ptracers: |
| 325 |
|
- rename PTRACERS_RESTART.h -> PTRACERS_START.h |
| 326 |
|
- rename ptracers_fields_blocking_exchanges.F -> ptracers_fields_blocking_exch.F |
| 327 |
|
- add parameter to decide when to start a tracer; use internal flag to |
| 328 |
|
know which tracer to step-forward; switch this internal flag at the top |
| 329 |
|
of forward_step.F (new S/R PTRACERS_SWITCH_ONOFF); for now, not enabled |
| 330 |
|
for adjoint built. |
| 331 |
|
o pkg/seaice: |
| 332 |
|
- add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ; |
| 333 |
|
- move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ; |
| 334 |
|
- keep experiment offline_exf_seaice truly single category (set MULTDIM=1). |
| 335 |
|
o pkg/ecco: |
| 336 |
|
- fix writing of output file DiagnosCost_ClimSalt/Theta |
| 337 |
|
and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc). |
| 338 |
|
o pkg/seaice: |
| 339 |
|
- add missing initialisation of COR_ICE array in dynsolver.F |
| 340 |
|
- merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is |
| 341 |
|
compiled either way, and is tested in all exps (multidim was only tested |
| 342 |
|
in lab_sea ad before). |
| 343 |
|
- cosmetic change to prepare for future addition of ITD. no change to results. |
| 344 |
|
no defaults change. |
| 345 |
|
- added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise). |
| 346 |
|
- by lack of adequate verification experiments, I further used custom versions |
| 347 |
|
of global_ocean.cs32x15 to test multicat or not, with pickup or not. All |
| 348 |
|
should be correct. |
| 349 |
|
- avoid recomputations in ad. |
| 350 |
|
o array initialisation in adjoint mode: |
| 351 |
|
1) pkg/mom_common/mom_calc_ke.F: |
| 352 |
|
add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC): |
| 353 |
|
The S/R which calls MOM_CALC_KE initialises KE but in some recomputation |
| 354 |
|
part this initialisation is gone, resulting in Floating Point Exception |
| 355 |
|
(caught by open64 compiler with debug option). |
| 356 |
|
2) model/src/convective_weights.F |
| 357 |
|
set output convectCount over the full array range (instead of doing |
| 358 |
|
an update): this fix a similar issue when called within recomputation (adjoint) |
| 359 |
|
which could by-pass the initialisation (normally done in the caller S/R). |
| 360 |
|
o pkg/seaice: |
| 361 |
|
- final version of turbulent flux params, as agreed at MIT ice meet: |
| 362 |
|
SEAICE_mcPheePiston (default is ~ 0.000875) |
| 363 |
|
SEAICE_mcPheeTaper (default is 0.) |
| 364 |
|
SEAICE_frazilFrac (defualt is 1.) |
| 365 |
|
SEAICE_mcPheeStepFunc (default is false) |
| 366 |
|
- changes results at trunction error level |
| 367 |
|
- ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo |
| 368 |
|
o added pkg/frazil: |
| 369 |
|
- see frazil_description.tex for details |
| 370 |
|
- verification experiment is global_with_exf/input.yearly; changes output.yearly.txt |
| 371 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
| 372 |
|
- fix exponents for velocity dependent exchange coefficients: change |
| 373 |
|
from 2/3(=0) to 0.66666666666666667 |
| 374 |
|
- move computation of velocity dependent exchange coefficients into |
| 375 |
|
separate loop, so that it applies to both thermodynamics |
| 376 |
|
- move some divisions by constants out of loops |
| 377 |
|
|
| 378 |
|
checkpoint63j (2012/02/16) |
| 379 |
|
o pkg/seaice: |
| 380 |
|
- overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc. |
| 381 |
|
- SItracer: added run time params, and allow coupling to ocn salinity. |
| 382 |
|
o pkg/seaice: remove (almost) all divisions by constants within loops |
| 383 |
|
in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d |
| 384 |
|
results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only |
| 385 |
|
those, caused by 1/QI -> recip_QI) -> update output.seaice.txt, |
| 386 |
|
output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt |
| 387 |
|
o pkg/seaice : |
| 388 |
|
- simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula |
| 389 |
|
= 1 or 2, using newly added run time parameter SEAICE_availHeatTaper. |
| 390 |
|
- fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148. |
| 391 |
|
- add permanent SItflux diag that corresponds to TFLUX but includes |
| 392 |
|
ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget. |
| 393 |
|
- allow activation/testing of a fix for suspected missing term in |
| 394 |
|
ocn-ice heat budget (to be confirmed). To test this, you want to |
| 395 |
|
undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param |
| 396 |
|
SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic. |
| 397 |
|
- no change in results, fwd or ad. |
| 398 |
|
o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below: |
| 399 |
|
- switch to variable freezing point. |
| 400 |
|
Results change : cg2d -> 1 digits; ad -> 3-6-6 digits. |
| 401 |
|
- bug fix : the sublimation term that was missing is now activated. |
| 402 |
|
Results change : cg2d -> 2 digits; ad -> 8-6-6 digits. |
| 403 |
|
- bug fix : flooding sign term for SIsal0.NE.0. |
| 404 |
|
Result change : cg2d -> 8 digits; ad -> 11-12-9 digits. |
| 405 |
|
o pkg/seaice: |
| 406 |
|
- unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT |
| 407 |
|
is now the default, and the old default constant freezing point is recovered |
| 408 |
|
with SEAICE_tempFrz0 = -1.96, |
| 409 |
|
SEAICE_dTempFrz_dS = 0., |
| 410 |
|
- retire SEAICE_freeze (= the old way of specifycing the constant freezing point) |
| 411 |
|
- remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there. |
| 412 |
|
- bug fix (thanks to M. Losch) : the sublimation term that was missing is now |
| 413 |
|
activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM. |
| 414 |
|
- bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211) |
| 415 |
|
was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail). |
| 416 |
|
- bug fix (thanks to O. Jahn) : area loss for melting got messed up in |
| 417 |
|
seaice_growth r149 for legacy branch (no results change). |
| 418 |
|
- introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code |
| 419 |
|
from I. Fenty). |
| 420 |
|
- results did not change except for global_ocean.cs32x15, mostly due to the |
| 421 |
|
switch to variable freezing point (see above item for detail). |
| 422 |
|
o pkg/thsice: |
| 423 |
|
- fix and simplify interface to salt_plume pkg ; diagnose directly amount of |
| 424 |
|
seawater freezing in thsice_calc_thickn (not used). |
| 425 |
|
o pkg/seaice: turbulent flux term specification via run time params. |
| 426 |
|
- replace CPP switches with run time switches to facilitate testing |
| 427 |
|
- retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX, |
| 428 |
|
GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR |
| 429 |
|
- added runtime parameter : SEAICEturbFluxFormula |
| 430 |
|
- move Mcphee constants to SEAICE_PARAMS.h |
| 431 |
|
- seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula; |
| 432 |
|
SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply); |
| 433 |
|
remove seaice_summary call (moved to seaice_init_fixed) |
| 434 |
|
- seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on |
| 435 |
|
SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms) |
| 436 |
|
- seaice_summary.F : add missing report of read turbulent flux term set up |
| 437 |
|
and SITRACER. |
| 438 |
|
- seaice_check.F : check range; inform and stop if retired CPPs are used |
| 439 |
|
(incl. SEAICE_AGE). |
| 440 |
|
- seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without |
| 441 |
|
CPP switch, same computation as before for the different options. |
| 442 |
|
- change results at the truncation level. |
| 443 |
|
o pkg/seaice: |
| 444 |
|
- remove un-used parameters LAD & MAX_TICE ; add new run-time parameters: |
| 445 |
|
useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and |
| 446 |
|
SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY. |
| 447 |
|
- update verification/*/input*/data.seaice: |
| 448 |
|
to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY |
| 449 |
|
code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ; |
| 450 |
|
and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code, |
| 451 |
|
set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0. |
| 452 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY): |
| 453 |
|
- remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same |
| 454 |
|
algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0); |
| 455 |
|
difference in results only due to machine truncation. |
| 456 |
|
- remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using |
| 457 |
|
MaykutPolySatVap; keep MIN_LWDOWN. |
| 458 |
|
- adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation. |
| 459 |
|
- update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87, |
| 460 |
|
+ 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits). |
| 461 |
|
o pkg/salt_plume: |
| 462 |
|
- isolate saltPlumeFlux array exch into a specific S/R called from |
| 463 |
|
do_oceanic_phys.F |
| 464 |
|
- add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice. |
| 465 |
|
o verification: |
| 466 |
|
- move untested set-up to MITgcm_contrib/verification_other. |
| 467 |
|
o pkg/seaice: |
| 468 |
|
- retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER. |
| 469 |
|
o pkg/seaice: |
| 470 |
|
- seaice_solve4temp.F (keeping results unchanged): |
| 471 |
|
* add 2 future run-time params to select which saturation vapor pressure |
| 472 |
|
formula is used and how post-iteration fluxes are set. |
| 473 |
|
Temporary set these 2 params according to option SOLVE4TEMP_LEGACY; |
| 474 |
|
* New piece of code (not used) to update surf. atmos. heat flux F_ia using |
| 475 |
|
the linearized expression to stay consistent with tsurf finding. |
| 476 |
|
- seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x |
| 477 |
|
can be < 0. |
| 478 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef): |
| 479 |
|
- remove from F_ia (and from it's derivative dFiDTs1) the contribution of |
| 480 |
|
conductive heat flux F_c , and add it explicitly when updating tsurf as |
| 481 |
|
solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf |
| 482 |
|
so that now F_ia has a consistent meaning through the entire routine. |
| 483 |
|
This causes differences at truncation level: update output of fwd exp. |
| 484 |
|
global_ocean.cs32x15.seaice. |
| 485 |
|
o pkg/seaice: |
| 486 |
|
- lots of editing/cleaning in seaice_solve4temp.F + better documentation |
| 487 |
|
of arrays, sign/direction of fluxes; no effect on results. |
| 488 |
|
- replace hard coded 273.16 (=previous value of celsius2K) by celsius2K |
| 489 |
|
in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part); |
| 490 |
|
note: this should have been done before changing celsius2K default. |
| 491 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
| 492 |
|
exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs |
| 493 |
|
- replace hard coded seawater freezing temp in seaice_solve4temp.F (part |
| 494 |
|
SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default |
| 495 |
|
value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater |
| 496 |
|
freezing temp is consistent with value in seaice_growth.F ; this causes |
| 497 |
|
differences at machine truncation level: update lab_sea AD output (3/4). |
| 498 |
|
o pkg/seaice: |
| 499 |
|
- mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask |
| 500 |
|
and climsst/sss even when using seaice (to prevent calculation that might |
| 501 |
|
use SST on land); does not affect any verification exp. |
| 502 |
|
- apply mask to taux,tauy (in seaice_get_dynforcing.F); update output |
| 503 |
|
of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix. |
| 504 |
|
o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness |
| 505 |
|
over land (non-legacy code) |
| 506 |
|
o vectorize salt_plume package: |
| 507 |
|
- add extra code to salt_plume_frac and salt_plume_tendency_apply_s |
| 508 |
|
- this code computes plumebk everywhere (also over land), thus requires |
| 509 |
|
code to avoid divisions by zero and catch the case of kLev=Nr. |
| 510 |
|
- efficiency of salt_plume_frac is still sub-optimal |
| 511 |
|
o tools (genmake2): |
| 512 |
|
- fix makefile NAME specification (option: -makefile NAME) by adding |
| 513 |
|
"-f $MAKEFILE" in few places where it was missing including makedepend |
| 514 |
|
command (contribution from Paul). |
| 515 |
|
|
| 516 |
|
checkpoint63i (2012/01/24) |
| 517 |
|
o model/src: |
| 518 |
|
- add factorized versions of some EOS code to find_rho.F, |
| 519 |
|
define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX) |
| 520 |
|
o model/src: |
| 521 |
|
- add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h; |
| 522 |
|
- change default celsius2K from 273.16 to 273.15 |
| 523 |
|
- to keep results unchanged, add back old value of celsius2K in verification |
| 524 |
|
exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd), |
| 525 |
|
global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm). |
| 526 |
|
o model/src: add a little initialisation trick to find_rho.F and find_alpha.F |
| 527 |
|
to make TAF generate vectorizable code |
| 528 |
|
o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows. |
| 529 |
|
Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers |
| 530 |
|
have flags that do this more efficiently. |
| 531 |
|
o pkg/diagnostics/diagstats_calc.F |
| 532 |
|
- for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact |
| 533 |
|
o pkg/obcs (with exch2): |
| 534 |
|
- derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F) |
| 535 |
|
and remove code (in obcs_readparms.F) which was based on EXCH of indices |
| 536 |
|
(through buffer) and did not account for exch2 (e.g., CS-grid) topology. |
| 537 |
|
o pkg/exf and seaice exp: |
| 538 |
|
- change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0) |
| 539 |
|
so that switching off area & heff advection flags does not affect results. |
| 540 |
|
- change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h |
| 541 |
|
- keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef |
| 542 |
|
EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update |
| 543 |
|
results of verification experiments: 1D_ocean_ice_column(fwd), |
| 544 |
|
global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8) |
| 545 |
|
and offline_exf_seaice (all 4). |
| 546 |
|
o pkg/seaice: |
| 547 |
|
- remove array YNEG, RIVER, TMIX (replaced by local var) from common block; |
| 548 |
|
remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef. |
| 549 |
|
- fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY) |
| 550 |
|
but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and |
| 551 |
|
not multi-dim advection; |
| 552 |
|
- fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and |
| 553 |
|
SHORTWAVE_HEATING #undef. |
| 554 |
|
o optim: make Makefile more robust (?) |
| 555 |
|
o pkg/obcs: |
| 556 |
|
* fix treatment of obcs_read_pickup for TAF |
| 557 |
|
o pkg/shelfice: |
| 558 |
|
* add missing initialisation of num_shifwflx |
| 559 |
|
* new adjoint verification exp. for isomip |
| 560 |
|
* change Prandtl and Schmidt numbers from generic formulations |
| 561 |
|
(in terms of model diffus. and visc.) to separate runtime |
| 562 |
|
parameters, with Holland and Jenkins (1999) default values. |
| 563 |
|
o pkg/exf (interpolation): |
| 564 |
|
- extended input field (2 rows) near the N & S poles: |
| 565 |
|
* fill in with the symetric value (when even Nb of data in longitude) |
| 566 |
|
* add average value at the poles only for scalar quantities ; for vector |
| 567 |
|
component interpolation, skip the averaging and keep duplicated values, |
| 568 |
|
unless the 2 components have same location (uvInterp=T) in which case |
| 569 |
|
interpolate the 2 components together using S/R EXF_INTERP_UV. |
| 570 |
|
- new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field |
| 571 |
|
together: this allows to account properly for local orientation when |
| 572 |
|
averaging at N & S pole. |
| 573 |
|
- add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding |
| 574 |
|
exf-interpolation near N & S poles. Undef by default. |
| 575 |
|
- add debug check/print on 1rst iter if debugLevel >=2. |
| 576 |
|
o pkg/exf: |
| 577 |
|
- change masking flags definition (no longer "parameter"), put them in |
| 578 |
|
common block and set them in S/R EXF_INIT_FIXED. |
| 579 |
|
- change recognized masking flag from s,u,v to c,w,s since the mask |
| 580 |
|
to use (maskC,W,S) depends on position on model grid and has little to |
| 581 |
|
do with scalar/vector difference; fix masking if using P-coordinates. |
| 582 |
|
- fix masking of wind-stress (was wrong if interpolated or read on A-grid) |
| 583 |
|
and update results of exp. global_with_exf (x2). |
| 584 |
|
- fix setting of zenith-angle table when SHORTWAVE_HEATING is undef. |
| 585 |
|
o pkg/obcs |
| 586 |
|
- S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate) |
| 587 |
|
o pkg/exf (interpolation): |
| 588 |
|
- assume periodicity in X only if input field cover full longitude range. |
| 589 |
|
- improve search for lat. index (supposed to be faster, in ~log2(ny) steps, |
| 590 |
|
and should vectorise). |
| 591 |
|
- fix input lat of the 2 added row (in case we provide N.pole data). |
| 592 |
|
|
| 593 |
|
checkpoint63h (2011/12/30) |
| 594 |
|
o pkg/seaice: |
| 595 |
|
- change declaration of UVM from _RL to _RS in order to get B-grid |
| 596 |
|
uIce,vIce monitor when _RS = real*4 |
| 597 |
|
o pkg/offline: |
| 598 |
|
- new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags); |
| 599 |
|
- compute vertical velocity if not read from file (switch on exactConserv |
| 600 |
|
& staggerTimeStep); |
| 601 |
|
- fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq. |
| 602 |
|
o verification: |
| 603 |
|
- update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input) |
| 604 |
|
with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m": |
| 605 |
|
fix Pb in yG definition @ 2 missing corners (previously yG was averaged); |
| 606 |
|
- update output of exp. global_ocean.cs32x15.viscA4 after changing |
| 607 |
|
grid-file angles (used here for coriolis-3d); |
| 608 |
|
- remove (or gzip) few files not needed to run fizhi-cs experiments. |
| 609 |
|
o pkg/exf (vector interpolation): |
| 610 |
|
- rotate vector component toward local grid-axis orientation using grid-angles |
| 611 |
|
(stored in GRID.h) instead of locally computed rotation angle; keep old code |
| 612 |
|
available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default). |
| 613 |
|
o pkg/seaice: |
| 614 |
|
- allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION |
| 615 |
|
undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined. |
| 616 |
|
o pkg/PKG_OPTIONS.h files: |
| 617 |
|
- move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h", |
| 618 |
|
outside of the #ifdef ALLOW_THISPKG / #endif block. |
| 619 |
|
- update verification/*/code/PKG_OPTIONS.h files. |
| 620 |
|
o add a verification experiment (offline_exf_seaice/input.seaice) that test |
| 621 |
|
the B-grid LSOR solver |
| 622 |
|
o pkg/seaice: sort out emissivity and long wave radiation step 2: |
| 623 |
|
- add emissivity for snow and ice as new run-time parameters |
| 624 |
|
(unfortunately) that default to the corresponding exf values; this |
| 625 |
|
changes results in most verification experiments so that for backward |
| 626 |
|
compatibility these parameter have to be set explicitly to inconsistent |
| 627 |
|
values (ugly); |
| 628 |
|
- the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired |
| 629 |
|
emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp |
| 630 |
|
until we agree how to handle this bug properly |
| 631 |
|
o pkg/exf (interpolation): |
| 632 |
|
- add a set of run-time param ({inputfield}_interpMethod), one for |
| 633 |
|
each interpolated input field, to select the interpolation method |
| 634 |
|
with a value of zero switching off the interpolation; |
| 635 |
|
- print interpolation parameters to standard output; |
| 636 |
|
- refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined |
| 637 |
|
(to use instead runoff_interpMethod=0 in data.exf). |
| 638 |
|
- simplify default setting of interpolation parameters (for all fields, |
| 639 |
|
set position to match model grid cell-center position, leading to trivial |
| 640 |
|
interpolation in case of regular Lat-Lon grid) and fix for the case of |
| 641 |
|
non-uniform delY. |
| 642 |
|
o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for |
| 643 |
|
within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1. |
| 644 |
|
this factor is absolutely required, because the lw exitance (= out-going |
| 645 |
|
long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown, |
| 646 |
|
where the reflectivity rho = 1-emissivity for conservation reasons. Once |
| 647 |
|
this is established, we can remove the CPP-Flag (if we want to). |
| 648 |
|
o pkg/seaice: |
| 649 |
|
- qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and |
| 650 |
|
ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined |
| 651 |
|
- sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity |
| 652 |
|
what the name implies (and not emissivity*BoltzmannConstant), this means |
| 653 |
|
the old default value of 5.5e-8 now means |
| 654 |
|
5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in |
| 655 |
|
S/R exf_readparms |
| 656 |
|
- FV-discretization of the B-grid LSOR solver, turn on with |
| 657 |
|
SEAICE_LSRBNEW. This new solver also involves a slight re-organization |
| 658 |
|
of the calling routine dynsolver, so that B and C-grid code look a |
| 659 |
|
little more alike. |
| 660 |
|
- fix index bugs in ostres.F (B-grid code) |
| 661 |
|
o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better |
| 662 |
|
o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the |
| 663 |
|
default for SEAICE_emissivity, if useEXF; requires setting a wrong |
| 664 |
|
parameter value in global_ocean.cs32x15/input.seaice/data.seaice for |
| 665 |
|
backward compatiblity |
| 666 |
|
o model/src: use sigmaR in calc_ivdc |
| 667 |
|
|
| 668 |
|
checkpoint63g (2011/12/16) |
| 669 |
|
o pkg/seaice/seaice_growth.F: |
| 670 |
|
fix heat conservation of the coupled ocean-seaice system. |
| 671 |
|
when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of |
| 672 |
|
solid vs liquid water treatment is resolved via QNET. |
| 673 |
|
o pkg/seaice/seaice_growth.F: |
| 674 |
|
add missing term for sublimation in saltFlux, which was breaking conservation. |
| 675 |
|
o pkg/seaice/seaice_model.F: |
| 676 |
|
Remove this patholigical case treatment in evolution branch, |
| 677 |
|
where it is un-necessary and breaks conservation. |
| 678 |
|
Update global_ocean.cs32x15/results accordingly for |
| 679 |
|
output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt |
| 680 |
|
o model/src: |
| 681 |
|
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in |
| 682 |
|
external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE. |
| 683 |
|
o pkg/obcs: |
| 684 |
|
modify Stevens boundary conditions so that S/R obcs_calc_stevens computes |
| 685 |
|
tendency for temperature and salinity that is then applied to update |
| 686 |
|
theta and salt in S/R obcs_apply_ts; this requires proper masking of all |
| 687 |
|
horizontal advection and diffusion contributions on the boundary (in |
| 688 |
|
S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and |
| 689 |
|
removing the mask in S/R timestep_tracer. The advantage of this approach is |
| 690 |
|
that the updated tracer values include contributions from the surface |
| 691 |
|
forcing and vertical diffusion. |
| 692 |
|
This modification changes exp4.stevens because of vertical diffusion. |
| 693 |
|
o model/src: |
| 694 |
|
change non-curvilinear grid setting to also work with exch2 + blank tiles: |
| 695 |
|
- move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst |
| 696 |
|
face dimensions. |
| 697 |
|
- new S/R INI_LOCAL_GRID to define model tile-local grid (using same units |
| 698 |
|
as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID |
| 699 |
|
and INI_SPHERICAL_POLAR_GRID. |
| 700 |
|
change test-experiment global_ocean.90x40x15: |
| 701 |
|
- split the domain in many more tiles (9x4 tiles of 10x10 each); |
| 702 |
|
- switch to exch2 and remove 1 blank-tile (but only for MPI test). |
| 703 |
|
- update results of both test (std & dwnslp). |
| 704 |
|
o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in |
| 705 |
|
tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation |
| 706 |
|
o model/src: |
| 707 |
|
- take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS |
| 708 |
|
and fix initialisation when using sigma-coords. |
| 709 |
|
o model/src: |
| 710 |
|
- improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc. |
| 711 |
|
to their current value at the beginning of forward_step.F": add a new run-time |
| 712 |
|
switch "doResetHFactors" (default=false) and use it to do (or not) the resetting. |
| 713 |
|
- set doResetHFactors=T in the following test exp: |
| 714 |
|
global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS), |
| 715 |
|
global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS) |
| 716 |
|
and tutorial_global_oce_in_p (nonLinFS in p) |
| 717 |
|
o pkg/ecco |
| 718 |
|
- added IES cost term |
| 719 |
|
o verification/advect_xz |
| 720 |
|
- scale down the depth by 1/100 (from 200 km to just 2.km) |
| 721 |
|
- add secondary test using divergent flow, r-star and implicit vertical advection. |
| 722 |
|
- add note (check_conserve_TS.txt) and matlab script to check global |
| 723 |
|
conservation of T & S with NonLin-FreeSurf and Adams-Bashforth. |
| 724 |
|
o pkg/rbcs: |
| 725 |
|
- add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F). |
| 726 |
|
o pkg/obcs (Stevens BCs): |
| 727 |
|
- fix various problems in the phase speed computations of the Stevens |
| 728 |
|
boundary conditions: |
| 729 |
|
- sign error for western and southern boundaries, |
| 730 |
|
- time tendencies were underestimated by factor of dTracerLev and some just |
| 731 |
|
zero (for multidim advection schemes) -> now estimate time tendencies |
| 732 |
|
from difference between previous (n) time level and the one before (n-1); |
| 733 |
|
this requires storing a field per tracer per boundary, also in the pickup |
| 734 |
|
files. |
| 735 |
|
- replace deltaTmom in cflMer/Zon computation with dTracerLev |
| 736 |
|
- set default phase velocity to cflMer/Zon |
| 737 |
|
- update verification experiment exp4.stevens |
| 738 |
|
o pkg/generic_advdiff (implicit_r): |
| 739 |
|
- fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf |
| 740 |
|
(remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F); |
| 741 |
|
- fix implicit vertical diffusion or advection with NonLin FreeSurf |
| 742 |
|
(was using current recip_hFacC instead of future recip_hFacC): set future |
| 743 |
|
recip_hFac in thermodynamics.F and pass & use it in all vertical implicit |
| 744 |
|
solver S/R ; |
| 745 |
|
- fill diagnostics of vertical advective fluxes (computed from tendency) |
| 746 |
|
when using implicit vert. advection; |
| 747 |
|
- update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion: |
| 748 |
|
global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD), |
| 749 |
|
tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD) |
| 750 |
|
and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5. |
| 751 |
|
o pkg/diagnostics: |
| 752 |
|
- add diags for T & S tendency which goes through Adams-Bashforth. |
| 753 |
|
|
| 754 |
|
checkpoint63f (2011/11/30) |
| 755 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 756 |
|
- join some loops to reduce number of if-statements |
| 757 |
|
- fix a bug in code for northern and southern boundaries. |
| 758 |
|
o pkg/seaice/seaice_init_varia.F |
| 759 |
|
- undo resetting UVM=0 that has slipped in unnoticed in r1.49 and |
| 760 |
|
caused zero ice-velocities for the B-grid code |
| 761 |
|
o pkg/seaice/seaice_init_fixed.F |
| 762 |
|
- fix a bug in the initialisation of the second metric terms |
| 763 |
|
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0. |
| 764 |
|
- this affects all seaice configurations with useCurviLinearGrid = .true. |
| 765 |
|
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms |
| 766 |
|
= .true. (default) |
| 767 |
|
- the only verification experiment affected is global_ocean.cs32x15: |
| 768 |
|
icedyn, seaice, and seaice_dynmix (AD) |
| 769 |
|
o pkg/thsice/thsice_diagnostics_state.F |
| 770 |
|
- only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does |
| 771 |
|
not contain garbage that can lead to surprises in diagstats_calc.F |
| 772 |
|
o model/src: |
| 773 |
|
- move bi,bj loops inside INTEGR_CONTINUITY ; |
| 774 |
|
- call INTEGR_CONTINUITY directly from forward_step.F |
| 775 |
|
(previously called from momentum_correction_step.F) |
| 776 |
|
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F, |
| 777 |
|
forward_step.F and pkg/ecco/the_main_loop.F |
| 778 |
|
o model/src/do_oceanic_phys.F: |
| 779 |
|
- reset addMass to zero only if useICEFRONT ; |
| 780 |
|
- separated k-loop for rhoInSitu calculation ; |
| 781 |
|
- add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P) |
| 782 |
|
and at constant T,S (= WdRHOdP); |
| 783 |
|
NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport |
| 784 |
|
of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical |
| 785 |
|
transport of locally-referenced potential density); |
| 786 |
|
to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP) |
| 787 |
|
o gluemnc: |
| 788 |
|
- replace ncrcat with ncks when adding variables to *.glob.nc |
| 789 |
|
- change the way variables without record dimensions are handled so that |
| 790 |
|
files that have variables with and without record variables can be glued: |
| 791 |
|
add a record dimension with a new unique name to be able to differentiate |
| 792 |
|
between variable with and without a-prior record dimensions. Remove |
| 793 |
|
this record dimension before adding the variable to the *.glob.nc file. |
| 794 |
|
This procedure automatically works also for grid.*.nc files that do not |
| 795 |
|
have any record dimension. |
| 796 |
|
o verification/cpl_aim+ocn: |
| 797 |
|
- generate new reference output on baudelaire (gfortran, mpich2) (previously |
| 798 |
|
from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script. |
| 799 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 800 |
|
- add code for northern and southern boundaries. |
| 801 |
|
- reorder some loops to save some operations and so that drFBar can be scalar |
| 802 |
|
o model/src: |
| 803 |
|
- re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine |
| 804 |
|
truncation) and add diagnostics for Adams-Bashforth tendency increment. |
| 805 |
|
- update test-exp. AD output: |
| 806 |
|
1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl; |
| 807 |
|
and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20, |
| 808 |
|
front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5), |
| 809 |
|
global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4), |
| 810 |
|
matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre, |
| 811 |
|
tutorial_global_oce_in_p, tutorial_global_oce_latlon and |
| 812 |
|
tutorial_plume_on_slope. |
| 813 |
|
o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX |
| 814 |
|
that vectorises. This code uses 3 extra 2D fields, F90 array assignments |
| 815 |
|
and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX |
| 816 |
|
does not even come with an F77 compiler anymore, this should not be |
| 817 |
|
a limitation |
| 818 |
|
|
| 819 |
|
checkpoint63e (2011/11/06) |
| 820 |
|
o pkg/seaice adjoint of LSR: |
| 821 |
|
- substantially rework STORE dirs. |
| 822 |
|
- add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED |
| 823 |
|
this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields |
| 824 |
|
and only perform SOLV_MAX_FIXED adjoint iters. |
| 825 |
|
If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration |
| 826 |
|
always goes to same record, meaning that the last forward field will be |
| 827 |
|
the one used in the adjoint - an approximation. |
| 828 |
|
- now produces non-zero LSR-related gradients, and acceptable gradients for |
| 829 |
|
An's zonal (x-z) test case (to be checked in) |
| 830 |
|
- lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR |
| 831 |
|
(but these are screwed up by the thermodynamics in the first place); |
| 832 |
|
reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution; |
| 833 |
|
output_adm.txt also reflects changes to seaice_lsr |
| 834 |
|
- global_ocean.cs32x15: |
| 835 |
|
* the "default" input_ad.seaice has been re-defined to always exclude dynamics |
| 836 |
|
(output_adm.seaice.txt was updated) |
| 837 |
|
* new input_ad.seaice_dynmix tests a forward LSR / backward free-drift |
| 838 |
|
(output_adm.seaice_dynmix.txt) |
| 839 |
|
o test-exp. exp4+stevens: |
| 840 |
|
- switch off pTracers and nonHydrostatic (restart problems with NH); update output |
| 841 |
|
o pkg/seaice (lsr solver): |
| 842 |
|
- put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only); |
| 843 |
|
update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15 |
| 844 |
|
- fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD) |
| 845 |
|
- new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution |
| 846 |
|
into initial guess for linearised solver; use weight ~ (1/err)^2,4. |
| 847 |
|
- compute (with new S/R) and print initial (+ free-driff sol. if available) |
| 848 |
|
and final residual of linearised system. |
| 849 |
|
o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity |
| 850 |
|
(requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F) |
| 851 |
|
o pkg/obcs: Stevens BCs (still only for east and west) |
| 852 |
|
- fix Stevens BCs by using intermediate velocities of previous |
| 853 |
|
time step as "baroclinic" contribution rather velocity of one grid cell |
| 854 |
|
inside the boundaries; more consistent but makes the entire treatment |
| 855 |
|
more complicated, requires new pickup files and two new S/Rs: |
| 856 |
|
obcs_copy_uv_n and obcs_save_uv_n |
| 857 |
|
keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY |
| 858 |
|
(undefined by default) |
| 859 |
|
- silently move computation of some grid factors into separate loops to |
| 860 |
|
save some recomputations |
| 861 |
|
- add a hack for non-linear free surface |
| 862 |
|
- add a verification experiment to exp4 that tests this code |
| 863 |
|
o make gluemnc/xplodemnc work with (moron) non-GNU shell tools |
| 864 |
|
|
| 865 |
|
checkpoint63d (2011/10/25) |
| 866 |
|
o pkg/obcs + seaice-dynamics: |
| 867 |
|
- new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before |
| 868 |
|
solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB |
| 869 |
|
values (consistent with an implicit method). |
| 870 |
|
- add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to |
| 871 |
|
return to older implementation (same results as before); note that none of |
| 872 |
|
the "experimental" OBCS_SEAICE options are implemented in the new version. |
| 873 |
|
- switch test exp. seaice_obcs to use new version (update output). |
| 874 |
|
o pkg/seaice: |
| 875 |
|
- add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS) |
| 876 |
|
- add parenthesis in Water-Ice drag calculations (evp & lsr); |
| 877 |
|
- in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1; |
| 878 |
|
and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice) |
| 879 |
|
- update output of test exp lab_sea that uses evp or lsr (fwd+ad) |
| 880 |
|
and global_ocean.cs32x15 (icedyn & seaice fwd+ad). |
| 881 |
|
o pkg/layers: |
| 882 |
|
- Include potential density as new coordinate (Thanks to David Munday) |
| 883 |
|
o pkg/dic: |
| 884 |
|
- Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add |
| 885 |
|
carbonate computation/output to CALC_PCO2_APPROX |
| 886 |
|
o pkg/generic_advdiff |
| 887 |
|
- make TAF generate code that vectorizes: |
| 888 |
|
gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F |
| 889 |
|
o model/src: |
| 890 |
|
- improve vectorization also for adjoint code of |
| 891 |
|
solve_tridiagonal and solve_pentadiagonal. As this requires up to |
| 892 |
|
5 new 3D-fields, this code is only turned on for the combination of |
| 893 |
|
ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message |
| 894 |
|
for singular matrix check (only for TARGET_NEC_SX). |
| 895 |
|
- remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to |
| 896 |
|
ALLOW_AUTODIFF. This flag now needs to be set outside of |
| 897 |
|
solve_tri/pentadiagonal.F |
| 898 |
|
o pkg/exf: |
| 899 |
|
- fix previous modif in exf_readparms.F (revision 1.66: treatment of |
| 900 |
|
optional namelist EXF_NML_OBCS). |
| 901 |
|
- add many debug-print (to trace down where pkg/cal error msg comes from) |
| 902 |
|
o pkg/mom_vecinv/mom_vi_hdissip.F |
| 903 |
|
- rearrange loops so that vectorization is improved and in particular |
| 904 |
|
the adjoint routine vectorizes. The code is a little longer now, but I |
| 905 |
|
think easier to read. |
| 906 |
|
Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested. |
| 907 |
|
o pkg/seaice: |
| 908 |
|
- allow to specify initial seaice velocity from files (uIceFile,vIceFile) |
| 909 |
|
o pkg/exch2: |
| 910 |
|
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
| 911 |
|
used as default; keep using matrix version in adjustment.cs-32x32x1. |
| 912 |
|
o tools/build_options: |
| 913 |
|
- after merging some MPI and/or multi-threads specific optfiles so that |
| 914 |
|
the modified default optfile support both built (using genmake2 -mpi |
| 915 |
|
for the MPI built, using genmake2 -omp for OpenMP built), |
| 916 |
|
move now obsolete optfiles to tools/build_options/unsupported/ |
| 917 |
|
(add copy of email sent to support list in doc/optfiles_changes.txt) |
| 918 |
|
|
| 919 |
|
checkpoint63c (2011/09/28) |
| 920 |
|
o pkg/ebm: |
| 921 |
|
- fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of |
| 922 |
|
test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d) |
| 923 |
|
o pkg/seaice (SItracer pickup) |
| 924 |
|
* Simple code for pickup of SItracer fields (#define ALLOW_SITRACER) |
| 925 |
|
To be done: |
| 926 |
|
- thorough testing of missing fields in S/R seaice_read_pickup |
| 927 |
|
- thorough matching between generic tracers and specific fields used |
| 928 |
|
(e.g. volume-weighted age, area-weighted age, salinity, ...) |
| 929 |
|
o pkg/grdchk: |
| 930 |
|
- all procs calculate and print finite-difference gradient (for testreport) |
| 931 |
|
- change description output used by testreport; |
| 932 |
|
- AD testing: also compare and report Finite-difference gradient; |
| 933 |
|
=> update all output_adm*.txt |
| 934 |
|
o test exp. global_ocean_ebm: |
| 935 |
|
- switch back useRealFreshWaterFlux (no problem anymore with run-off); |
| 936 |
|
and turn on exactConserve; update (fwd) output. |
| 937 |
|
o pkg/seaice (LSR): |
| 938 |
|
- print to STDOUT number of solver iterations at SEAICE_monFreq interval. |
| 939 |
|
- modify solver to deal cleanly with u/v switch at face edges (CS-grid): |
| 940 |
|
* identical results with non-CS topology (but save up to half of EXCH calls) |
| 941 |
|
* no much changes in cs-32 verification tests since no ice at face edges |
| 942 |
|
(differences due to convergence criteria, since nb of iterations changed) |
| 943 |
|
* expect some differences on lat-lon-cap grid. |
| 944 |
|
update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice) |
| 945 |
|
o pkg/exch2: |
| 946 |
|
- add new CPP option to disable Cumul-Sum matrix (to save storage when using |
| 947 |
|
many tiles); until alternative coding is added, just add a stop. |
| 948 |
|
o pkg/kpp: |
| 949 |
|
- move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F |
| 950 |
|
to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list). |
| 951 |
|
o optfiles: |
| 952 |
|
- merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles |
| 953 |
|
into corresponding standard one, which now support different build: |
| 954 |
|
(when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built) |
| 955 |
|
- add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael) |
| 956 |
|
o pkg/obcs (seaice): |
| 957 |
|
- add missing EXCH for uIce,vIce after applying OBCS; |
| 958 |
|
- remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding |
| 959 |
|
argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R |
| 960 |
|
EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F; |
| 961 |
|
- fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared) |
| 962 |
|
- verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi |
| 963 |
|
and eedata.mth for MPI and mutlti-threaded testing. |
| 964 |
|
o pkg/flt: |
| 965 |
|
- make FLT EXCH working with multi-threads (and MPI + multi-threads); |
| 966 |
|
- use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h; |
| 967 |
|
- fix pickup and trajectories + profiles output with multi-threads; |
| 968 |
|
- add parameter to select group of fields to write along trajectory and |
| 969 |
|
profile (default unchanged); |
| 970 |
|
- only call PORT_RAND* function when flt_noise <> 0; |
| 971 |
|
- add multi-threaded test for verification exp. flt_example. |
| 972 |
|
o eesupp/src: |
| 973 |
|
- fix S/R ALL_PROC_DIE for MPI+multi-threads. |
| 974 |
|
- USE_OMP_THREADING: check that number of threads (from eedata) matches |
| 975 |
|
actual number (from env.var. setting). |
| 976 |
|
o pkg/ebm: |
| 977 |
|
- fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file. |
| 978 |
|
- add multi-threaded test for verification exp. global_ocean_ebm |
| 979 |
|
|
| 980 |
|
checkpoint63b (2011/08/29) |
| 981 |
|
o pkg/ebm: |
| 982 |
|
- fix sign of runoff; |
| 983 |
|
- update directly forcing fields (Qnet,EmPmR) to use standard |
| 984 |
|
external_forcing_surf.F (remove ebm_forcing_surf.F); |
| 985 |
|
- avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F); |
| 986 |
|
- set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm) |
| 987 |
|
and apply relaxation towards corresponding SST field (2-D map or ZonAver). |
| 988 |
|
- update global_ocean_ebm parameters file data and update output (fwd+ad). |
| 989 |
|
o verification/matrix_example: |
| 990 |
|
- split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for |
| 991 |
|
MPI and mutlti-threaded testing. |
| 992 |
|
o pkg/matrix: |
| 993 |
|
- change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ; |
| 994 |
|
- fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter); |
| 995 |
|
- fix for multi-threaded (remove DATA statement); |
| 996 |
|
- use standard DIFFERENT_MULTIPLE function; |
| 997 |
|
- add MATRIX_OPTIONS.h |
| 998 |
|
o verification/matrix_example: |
| 999 |
|
To allow to split the domain in several tiles, change the domain size |
| 1000 |
|
from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on |
| 1001 |
|
Western side) of land points. |
| 1002 |
|
o (*_)write_pickup: |
| 1003 |
|
- fix few bugs in mypackage_read/write_pickup.F |
| 1004 |
|
- in MDS_WR_METAFILES calls, replace "myTime" by a local copy into |
| 1005 |
|
array of length 1 (was caught by compiler syntax-check). |
| 1006 |
|
o pkg/diagnostics (velocity potential solver): |
| 1007 |
|
- fix initialisation of main diagonal matrix (for overlap values) |
| 1008 |
|
o tools/build_options: |
| 1009 |
|
- towards single optfile for MPI and non-MPI built: merge few +mpi optfile |
| 1010 |
|
into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11) |
| 1011 |
|
- linux_amd64_gfortran: merge +mpi_generic version into standard optfile: |
| 1012 |
|
* move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ; |
| 1013 |
|
* FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list; |
| 1014 |
|
and use "-devel" testreport option for standard testing on baudelaire. |
| 1015 |
|
o pkg/grdchk: |
| 1016 |
|
- Assume that all gradient-check position are within the same tile |
| 1017 |
|
corresponding to global indices (iGloTile,jGloTile) and that |
| 1018 |
|
positions (i,j indices or nbeg) are local to this tile; |
| 1019 |
|
- set tile local-indices and proc. number according to tile global-indices; |
| 1020 |
|
- remove grdchkwhichproc from namelist (retired param); |
| 1021 |
|
- send adjoint gradient to all procs so that all procs print it to STDOUT; |
| 1022 |
|
- switch on MPI test for global_ocean.90x40x15 AD test experiment. |
| 1023 |
|
o adding package bbl (Bottom Boundary Layer) |
| 1024 |
|
description in MITgcm/pkg/bbl/bbl_description.tex |
| 1025 |
|
example/test experiment in MITgcm_contrib/bbl |
| 1026 |
|
o adjoint verifications |
| 1027 |
|
- changed 5 experiments to multi-tiles |
| 1028 |
|
* global_ocean.90x40x15 |
| 1029 |
|
* obcs_ctrl |
| 1030 |
|
* offline_exf_seaice |
| 1031 |
|
* tutorial_dic_adjoffline |
| 1032 |
|
* tutorial_tracer_adjsens |
| 1033 |
|
changed reference output for those that crossed tile boundaries |
| 1034 |
|
(changed choices of gradient check positions) |
| 1035 |
|
- with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi) |
| 1036 |
|
- temporary bug fix in grdchk_loc.F for obcs |
| 1037 |
|
o genmake2 & testreport |
| 1038 |
|
- add target "obj" (just for OBJFILES files) to Makefile; |
| 1039 |
|
- add option to specify FEXTRAFLAGS on command line. |
| 1040 |
|
o pkg/mypackage: |
| 1041 |
|
- remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS |
| 1042 |
|
|
| 1043 |
|
checkpoint63a (2011/08/02) |
| 1044 |
|
o pkg/diagnostics (velocity potential): |
| 1045 |
|
- fix velocity-potential calculation when using OBCS: balance net inflow |
| 1046 |
|
at each level (new S/R OBCS_DIAG_BALANCE). |
| 1047 |
|
- fix some of the problems with OBCS in stream-function calculation. |
| 1048 |
|
o pkg/exf/exf_readparms.F |
| 1049 |
|
- make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF, |
| 1050 |
|
EXF_NML_OBCS) more consistent, so that you need not have these lists |
| 1051 |
|
in data.exf when they are not used. |
| 1052 |
|
o optim/optim_readdata.F: |
| 1053 |
|
- add some output about obcs variables that might help debugging |
| 1054 |
|
- add a check about nvarlength |
| 1055 |
|
o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec |
| 1056 |
|
o pkg/diagnostics (velocity potential): |
| 1057 |
|
- fix mask for OBCS (still problems in stream-function with OBCS); |
| 1058 |
|
- add specific parameter (default = main code CG2D params) for solver; |
| 1059 |
|
- in case of poor convergence, use solution corresponding to lowest residual. |
| 1060 |
|
o pkg/seaice/seaice_growth.F: small changes that permit vectorizable |
| 1061 |
|
adjoint code. In general statements like tmpscal=fld(i,j) are problematic |
| 1062 |
|
and should be avoided where possible. |
| 1063 |
|
o model/src (rStar): |
| 1064 |
|
- include r* effect on reference-state (PhiRef) in totPhiHyd |
| 1065 |
|
(so that it's really the potential anomaly at the cell center); |
| 1066 |
|
affect solution only if z* with full pressure in EOS. |
| 1067 |
|
- test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and |
| 1068 |
|
update output (because of z* in totPhiHyd and viscA4 changes); |
| 1069 |
|
- keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly |
| 1070 |
|
@ constant r) until interpolation at constant r is implemented. |
| 1071 |
|
o pkg/diagnostics |
| 1072 |
|
- fix RCENTER diagnostics in case cell center is not at interface middle |
| 1073 |
|
o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use |
| 1074 |
|
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies |
| 1075 |
|
that THETA and SALT are "conservative temperature" and "absolute |
| 1076 |
|
salinity" |
| 1077 |
|
o pkg/ctrl |
| 1078 |
|
- fix computation of endrec in s/r ctrl_init_rec |
| 1079 |
|
- ctrl_pack/unpack_*: remove unused variables and some obsolete code |
| 1080 |
|
o pkg/seaice/seaice_growth.F |
| 1081 |
|
- fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code, |
| 1082 |
|
remove then obsolete STORE directives |
| 1083 |
|
- fix STORE directives for tice and tices, so that only the |
| 1084 |
|
appropriate part of the fields are stored (and not the entire |
| 1085 |
|
field); update global_ocean.cs32x15.seaice AD output. |
| 1086 |
|
- cosmetic changes: adjust CPP flags and indentation for better |
| 1087 |
|
legibilty |
| 1088 |
|
o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by |
| 1089 |
|
Chris Wilson) |
| 1090 |
|
o pkg/gmredi: |
| 1091 |
|
Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF), |
| 1092 |
|
and test it in verification exp. "front_relax.bvp" (update output.bvp.txt) |
| 1093 |
|
|
| 1094 |
|
checkpoint63 (2011/07/11) |
| 1095 |
|
o pkg/exch2: |
| 1096 |
|
- rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h |
| 1097 |
|
- exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the |
| 1098 |
|
(2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y |
| 1099 |
|
increments, calculates Cumul-Sum @ tile origin and sends results to each tile. |
| 1100 |
|
o pkg/diagnostics: |
| 1101 |
|
- deal with pairs of post-processed diags which are computed together; in |
| 1102 |
|
particular, re-order list of diags within 1 file to save 2nd computation. |
| 1103 |
|
- add S/R to compute velocity stream-function (called after velocity-potential |
| 1104 |
|
calculation) from divergence free transport -> new diagnostics "PsiVEL". |
| 1105 |
|
- add parameter to select grid-point location where PsiVEL == 0. |
| 1106 |
|
o eesupp/src: |
| 1107 |
|
new S/R to calculate cumulated sum on tiled array, corner grid-cell location |
| 1108 |
|
(specific S/R needed with exch2 topology - for now, just print an error msg) |
| 1109 |
|
o pkg/shelfice |
| 1110 |
|
- Implement friction velocity-dependent transfer coefficients following |
| 1111 |
|
Holland and Jenkins, JPO, 1999 |
| 1112 |
|
Original code by M. Losch with small modifs. |
| 1113 |
|
Enable with CPP option SHI_ALLOW_GAMMAFRICT |
| 1114 |
|
and runtime flag SHELFICEuseGammaFrict |
| 1115 |
|
o verification lab_sea & global_ocean.cs32x15: |
| 1116 |
|
- use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local): |
| 1117 |
|
does not miss some dependencies (but is slower) and also works with many files |
| 1118 |
|
(default makedepend limitation for AD built). |
| 1119 |
|
- use cyrus_makedepend in adjustment.128x64x1 (so that it still tested). |
| 1120 |
|
o pkg/diagnostics: |
| 1121 |
|
- add run-time parameter "useMissingValue" (def=False) to fill land-point |
| 1122 |
|
(i.e., where mask=0) with MissingValue ; used only in MNC output file. |
| 1123 |
|
This replaces CPP-option DIAGNOSTICS_MISSING_VALUE. |
| 1124 |
|
- Extend the use of "missing_value" setting from data.diagnostics for the case |
| 1125 |
|
of counter-diagnostics (where fraction-weight is zero). This applies both to |
| 1126 |
|
MNC and MDS output files. |
| 1127 |
|
o pkg/seaice/seaice_growth.F: |
| 1128 |
|
- add 'a priori' cap of latent heat flux based on actual mass considerations |
| 1129 |
|
when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the |
| 1130 |
|
non-legacy seaice_solve4temp. |
| 1131 |
|
- add diagnostic of the residual sublimation freshwater flux (the freshwater |
| 1132 |
|
flux taken from the ocean if the total actual latent heat fluxes exceed |
| 1133 |
|
the maximum) |
| 1134 |
|
- remove the CPP switch around the *_FWbySublim unit change and move diagnostic |
| 1135 |
|
fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F. |
| 1136 |
|
- add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef |
| 1137 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim). |
| 1138 |
|
- bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET. |
| 1139 |
|
- bug fix : missing part to Martin's r_FWbySublim pathological case fix. |
| 1140 |
|
o verification 1D_ocean_ice_column: |
| 1141 |
|
made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet |
| 1142 |
|
update results |
| 1143 |
|
o pkg/diagnostics: |
| 1144 |
|
- Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P') |
| 1145 |
|
which are not filled-up but computed from other diags ; In this case, the mate |
| 1146 |
|
diag points to the primary (filled-up) diag to used for post processing. |
| 1147 |
|
- Update Velocity-potential computation using post-processed diag framework. |
| 1148 |
|
==> Change the ordering of fields and time-periods in MDS output file |
| 1149 |
|
when using periodic averaging: now writes one time record with the full set |
| 1150 |
|
of fields for this time period, then the next time reccord (it used to be |
| 1151 |
|
one field with the full set of time records then the next field). |
| 1152 |
|
Note: this is now similar to NetCDF (MNC) output file. <== |
| 1153 |
|
|
| 1154 |
|
checkpoint62z (2011/06/21) |
| 1155 |
|
o adjoint monitor: |
| 1156 |
|
- Add adjoint monitor output for packages exf, seaice |
| 1157 |
|
and update relevant testreport output |
| 1158 |
|
o pkg/seaice: |
| 1159 |
|
- re-order diags inits so that they appear in order in available_diagnostics.log |
| 1160 |
|
- added diags: hsnow thermo. rates of change, area preceeding ridiging process, |
| 1161 |
|
area/heff/hsnow preceeding thermodynamic growth/melt. |
| 1162 |
|
- modified diag: SIdA; output actual effect, as the description states. |
| 1163 |
|
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
| 1164 |
|
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
| 1165 |
|
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
| 1166 |
|
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
| 1167 |
|
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
| 1168 |
|
- added diagnostics for seaice generic tracers (SItr*). |
| 1169 |
|
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
| 1170 |
|
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
| 1171 |
|
I. Fenty: 18-Jun-2011: |
| 1172 |
|
Minor changes to seaice package: |
| 1173 |
|
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
| 1174 |
|
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
| 1175 |
|
- Differentiated "regularization variables" from "floor variables" |
| 1176 |
|
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
| 1177 |
|
* hiceMin became SEAICE_hice_reg (old hiceMin) |
| 1178 |
|
(with _reg meaning regularization variable) |
| 1179 |
|
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
| 1180 |
|
so as to ensure energy conservation when going between phases |
| 1181 |
|
- A22 was not used anywhere |
| 1182 |
|
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
| 1183 |
|
well-boundedness and smooth adjoint in seaice_growth.F |
| 1184 |
|
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
| 1185 |
|
because the old regularization always set heffActual >= 0.05 cm |
| 1186 |
|
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
| 1187 |
|
on AREA when HEFF > 0. |
| 1188 |
|
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
| 1189 |
|
requiring that DISABLE_AREA_FLOOR *not* be defined |
| 1190 |
|
Affected verifications: |
| 1191 |
|
- 1D_ocean_ice_column (output.txt output_adm.txt) |
| 1192 |
|
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
| 1193 |
|
o pkg/diagnostics: |
| 1194 |
|
- move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R). |
| 1195 |
|
- rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument |
| 1196 |
|
(was _RL, now integer) with option = 0 to retrieve all levels. |
| 1197 |
|
- add pieces of code to compute velocity potential at each level (new diagnostics |
| 1198 |
|
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
| 1199 |
|
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
| 1200 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
| 1201 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
| 1202 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
| 1203 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
| 1204 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
| 1205 |
|
o model/src (rStar): |
| 1206 |
|
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
| 1207 |
|
affect solution only if z* with full pressure in EOS; |
| 1208 |
|
update output of test-exp global_ocean.90x40x15. |
| 1209 |
|
o pkg/seaice: |
| 1210 |
|
- introduce siEps=1e-5 parameter |
| 1211 |
|
- use areaMax in AREA update (part 4), consistent with ridging step (part 2.5). |
| 1212 |
|
- re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code. |
| 1213 |
|
- introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer. |
| 1214 |
|
For now it covers, and was tested for, ice salinity and age (attached to HEFF), |
| 1215 |
|
as well as ice cover age and ridging index (attached to AREA). |
| 1216 |
|
For now the run time parameters (in data.seaice/SEAICE_PARM03) are |
| 1217 |
|
SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA'). |
| 1218 |
|
Up to SItrMaxNum=3 tracers can be used simultaneously. |
| 1219 |
|
o pkg/salt_plume: |
| 1220 |
|
-introduce SPsalFRAC run time parameter that sets the fraction of the |
| 1221 |
|
salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically) |
| 1222 |
|
that gets vertically redistributed (fluxed down) by pkg/salt_plume. |
| 1223 |
|
o model debug options: |
| 1224 |
|
- Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored |
| 1225 |
|
in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h). |
| 1226 |
|
- Refine debug-msg printing selection (3 new levels): |
| 1227 |
|
debugMode : controls printing of debug messages (sequence of S/R calls). |
| 1228 |
|
debugLevel : controls printing of algorithm-relevant auxiliary/debug messages |
| 1229 |
|
debLevZero = 0 ; /* level of disabled aux. msg printing */ |
| 1230 |
|
debLevA = 1 ; /* level of minimum aux. msg printing */ |
| 1231 |
|
debLevB = 2 ; /* level of low aux. print (report read-file opening)*/ |
| 1232 |
|
debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */ |
| 1233 |
|
debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */ |
| 1234 |
|
debLevE = 5 ; /* level of extensive debug printing */ |
| 1235 |
|
New debugLevel default: with default debugMode value (=F), |
| 1236 |
|
= 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.; |
| 1237 |
|
and if debugMode=T, default debugLevel = 4 (debLevD). |
| 1238 |
|
Relation with previous settings: |
| 1239 |
|
debLevB (=2) corresponds to former debLevA (=1) |
| 1240 |
|
debLevD (=4) corresponds to former debLevB (=2) |
| 1241 |
|
Note: |
| 1242 |
|
a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before); |
| 1243 |
|
b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs); |
| 1244 |
|
to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5) |
| 1245 |
|
- Add new parameter (printResidualFreq, read from PARM02 namelist) to print |
| 1246 |
|
detailed CG solvers convergence; off (=0) by default, except if debugLevel=5. |
| 1247 |
|
o pkg/obcs: |
| 1248 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
| 1249 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
| 1250 |
|
o pkg/thsice: |
| 1251 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
| 1252 |
|
2nd layer seaice sublimation (unlikely to happen) |
| 1253 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
| 1254 |
|
done in gad_advection & seaice_advection). |
| 1255 |
|
o adjoint: |
| 1256 |
|
bug fix spotted by Gael Forget: |
| 1257 |
|
seaice_advection and thsice_advection still had |
| 1258 |
|
legacy CPP options to avoid CS corner updates for adjoint |
| 1259 |
|
o pkg/seaice: |
| 1260 |
|
=> Change some of the defaults (2011/05/29): |
| 1261 |
|
- change SEAICEuseFluxForm default (from False to True) |
| 1262 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
| 1263 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
| 1264 |
|
avection scheme is used without any diffusion. |
| 1265 |
|
also: |
| 1266 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
| 1267 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
| 1268 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
| 1269 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
| 1270 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
| 1271 |
|
update results of test exp.: |
| 1272 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
| 1273 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
| 1274 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
| 1275 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
| 1276 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
| 1277 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
| 1278 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
| 1279 |
|
o pkg/seaice/seaice_growth.F: |
| 1280 |
|
- use Ian Fenty's capping formulas for actual ice |
| 1281 |
|
thickness thoughout EVOLUTION branch. |
| 1282 |
|
- put treatment pathological case #2) in CPP brackets |
| 1283 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
| 1284 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
| 1285 |
|
o pkg/seaice: |
| 1286 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
| 1287 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
| 1288 |
|
also pass fac as a param, which can be 1. (to update the tendency |
| 1289 |
|
field) or the time step (to update the field itself). |
| 1290 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
| 1291 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
| 1292 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
| 1293 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
| 1294 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
| 1295 |
|
o pkg/seaice: |
| 1296 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
| 1297 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
| 1298 |
|
to just compute the laplacian of input-field. |
| 1299 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
| 1300 |
|
- fix flux-form version in diffus.F to conserve tracer. |
| 1301 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
| 1302 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
| 1303 |
|
|
| 1304 |
|
checkpoint62y (2011/05/26) |
| 1305 |
|
o pkg/seaice: |
| 1306 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
| 1307 |
|
a_QSWbyATM_cover in qnet (as it should be). |
| 1308 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
| 1309 |
|
(output.seaice.txt output_adm.seaice.txt). |
| 1310 |
|
o pkg/seaice + obcs: |
| 1311 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
| 1312 |
|
equivalent of assuming no tracer gradient outside the OB region. |
| 1313 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
| 1314 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
| 1315 |
|
after changes above); |
| 1316 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
| 1317 |
|
only at OB location (instead of over a band of OLx width). |
| 1318 |
|
o pkg/seaice: |
| 1319 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
| 1320 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
| 1321 |
|
o pkg/obcs: |
| 1322 |
|
- split header file "OBCS.h" into 4 separated files: |
| 1323 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
| 1324 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
| 1325 |
|
(contain no conditional statement which depends on OBCS options). |
| 1326 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
| 1327 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
| 1328 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
| 1329 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
| 1330 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
| 1331 |
|
o pkg/obcs: |
| 1332 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
| 1333 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
| 1334 |
|
over a band of OLx width) |
| 1335 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
| 1336 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
| 1337 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
| 1338 |
|
o obcs in model/src: |
| 1339 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
| 1340 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
| 1341 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
| 1342 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
| 1343 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
| 1344 |
|
- zero out velocity outside OB interior region: This has no effect on |
| 1345 |
|
the solution but just to prevent unrealistic velocity outside OB. |
| 1346 |
|
o obcs and non-lin free-surf: |
| 1347 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
| 1348 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
| 1349 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
| 1350 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
| 1351 |
|
update results of test-exp. exp4(nlfs). |
| 1352 |
|
o exp4 (nlfs) test-exp: |
| 1353 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
| 1354 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
| 1355 |
|
o obcs and 2d/3d solver norm: |
| 1356 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
| 1357 |
|
and outside OB interior region (will allow to place OB further inside the |
| 1358 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
| 1359 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
| 1360 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
| 1361 |
|
e.g. in tutorial_plume_on_slope. |
| 1362 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
| 1363 |
|
o pkg rbcs: |
| 1364 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
| 1365 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
| 1366 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
| 1367 |
|
o pkg/shelfice/shelfice_init_fixed.F |
| 1368 |
|
fix CPP-flag combinations |
| 1369 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
| 1370 |
|
* update/change/correct ice age calculations |
| 1371 |
|
* add age updates for pathological cases |
| 1372 |
|
Probably needs more testing... |
| 1373 |
|
|
| 1374 |
|
checkpoint62x (2011/05/13) |
| 1375 |
|
o pkg/mom_vecinv: |
| 1376 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
| 1377 |
|
to zero-out (outside OB) gradient of vorticity. |
| 1378 |
|
o verification exp.: |
| 1379 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
| 1380 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
| 1381 |
|
o pkg/obcs: |
| 1382 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
| 1383 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
| 1384 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 1385 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
| 1386 |
|
variables needs its own mask. |
| 1387 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 1388 |
|
from the first guess (zero) in analogy to other control variables |
| 1389 |
|
o pkg/shelfice: |
| 1390 |
|
- start basic adjoint |
| 1391 |
|
o pkg/ctrl: |
| 1392 |
|
- remove extra 2D field "for good measure" when initializing in |
| 1393 |
|
ctrl_set_globfld_[xy/xz/yz].F |
| 1394 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
| 1395 |
|
- improve error messages in ctrl_set_unpack_* |
| 1396 |
|
o OBC implementation in momentum: |
| 1397 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
| 1398 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
| 1399 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
| 1400 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
| 1401 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
| 1402 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
| 1403 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
| 1404 |
|
Update output of experiment dome and exp4 (+nlfs). |
| 1405 |
|
o exp4 test-exp: |
| 1406 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
| 1407 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
| 1408 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
| 1409 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
| 1410 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
| 1411 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
| 1412 |
|
o pkg/obcs: |
| 1413 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
| 1414 |
|
o model/src: |
| 1415 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
| 1416 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
| 1417 |
|
from the other without ambiguity. |
| 1418 |
|
o seaice_obcs test-exp.: |
| 1419 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
| 1420 |
|
o pkg/obcs: |
| 1421 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
| 1422 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
| 1423 |
|
o pkg/seaice: |
| 1424 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
| 1425 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
| 1426 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
| 1427 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
| 1428 |
|
o fizhi-cs test exp.: |
| 1429 |
|
switch reference output convention for these 2 non-standard test-exp, |
| 1430 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
| 1431 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
| 1432 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
| 1433 |
|
o model/inc: |
| 1434 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
| 1435 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
| 1436 |
|
o pkg/seaice: |
| 1437 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
| 1438 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
| 1439 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
| 1440 |
|
and initial HSALT |
| 1441 |
|
|
| 1442 |
|
checkpoint62w (2011/04/26) |
| 1443 |
|
o pkg/mom_fluxform: |
| 1444 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
| 1445 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
| 1446 |
|
- update output of exp. global_ocean.90x40x15 |
| 1447 |
|
o pkg/mom_vecinv: |
| 1448 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
| 1449 |
|
o update seaice exp.: |
| 1450 |
|
use more consistent parameter values (remove "backward compatability only": |
| 1451 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
| 1452 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
| 1453 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
| 1454 |
|
o update test-exp global_ocean.90x40x15: |
| 1455 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
| 1456 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
| 1457 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
| 1458 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
| 1459 |
|
and update output files: output.txt & output.dwnslp.txt |
| 1460 |
|
o new AD-test experiment: obcs_ctrl |
| 1461 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
| 1462 |
|
o pkg/dic: |
| 1463 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
| 1464 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
| 1465 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
| 1466 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
| 1467 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
| 1468 |
|
at depth and bring the negative heat anomaly to the surface level |
| 1469 |
|
o pkgs _fields_load: |
| 1470 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
| 1471 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
| 1472 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
| 1473 |
|
rbcs to get interpolation weights and time reccord number. |
| 1474 |
|
- fix multi-threading in aim_fields_load.F |
| 1475 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
| 1476 |
|
o external_fields_load: |
| 1477 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
| 1478 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
| 1479 |
|
time-step to convert to integer: |
| 1480 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
| 1481 |
|
(Thanks to Christopher L. Wolfe) |
| 1482 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
| 1483 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
| 1484 |
|
store index of time-record which is currently loaded: |
| 1485 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
| 1486 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
| 1487 |
|
(to be fixed soon) |
| 1488 |
|
|
| 1489 |
|
checkpoint62v (2011/04/02) |
| 1490 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
| 1491 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
| 1492 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
| 1493 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
| 1494 |
|
o pkg/generic_advdiff with OBCS: |
| 1495 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
| 1496 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
| 1497 |
|
This will affect the results if using obcs+biharmonic diffusion. |
| 1498 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
| 1499 |
|
o pkg/obcs: |
| 1500 |
|
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
| 1501 |
|
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
| 1502 |
|
in Interior region. No impact on solution but affects Velocity monitor stats. |
| 1503 |
|
o pkg/ptracers (adjoint) |
| 1504 |
|
New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate |
| 1505 |
|
tape file for each tracer |
| 1506 |
|
o model/inc/src and pkg/autodiff: add parameters that allow to turn |
| 1507 |
|
of parts of the adjoint code at run time. For now, there are only |
| 1508 |
|
useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These |
| 1509 |
|
parameters are set in data.pkg. |
| 1510 |
|
This is the lazy coward's version of doing this, but still useful for |
| 1511 |
|
debugging. In order to do it right, everything needs to be moved to |
| 1512 |
|
pkg/autodiff. |
| 1513 |
|
o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at |
| 1514 |
|
the end; this fixes the adjoint balancing code for open boundaries. |
| 1515 |
|
o pkg/ctrl: |
| 1516 |
|
- change behavior of xx_${varname}period to be analogous to exf-conventions: |
| 1517 |
|
xx_${varname}period = 0., means time-independent control part |
| 1518 |
|
xx_${varname}period = -12., means one-year-periodic monthly control part |
| 1519 |
|
- introduce helper routine ctrl_init_rec (part of ctrl_init.F) to |
| 1520 |
|
clean up ctrl_init a little, remove unused variables |
| 1521 |
|
- ctrl_init: fixed the handling of the start/endrec for obcs-variables |
| 1522 |
|
- move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec |
| 1523 |
|
|
| 1524 |
|
checkpoint62u (2011/03/15) |
| 1525 |
|
o model/src: |
| 1526 |
|
- for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in |
| 1527 |
|
h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ; |
| 1528 |
|
- in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to |
| 1529 |
|
INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF. |
| 1530 |
|
o pkg/ctrl/obcs/ecco: |
| 1531 |
|
- remove obsolete, unused, and partially broken code: |
| 1532 |
|
ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within |
| 1533 |
|
ALLOW_CTRL_OBCS_BALANCE |
| 1534 |
|
- put a stop statement into ecco/cost_obcsvol.F, but also add |
| 1535 |
|
cost_obcsvol to ecco_ad_diff.list |
| 1536 |
|
o pkg/ecco: fix counting cost function contributions for obcs (code |
| 1537 |
|
by Matt M.) and diffkr for diagnostics |
| 1538 |
|
o pkg/ecco, pkg/ctrl, pkg/grdchk: |
| 1539 |
|
add cost penalty terms for initial uvel, vvel, eta controls |
| 1540 |
|
and I/O for prior error files |
| 1541 |
|
o pkg/mdsio: |
| 1542 |
|
move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option |
| 1543 |
|
(new argument) to check for tiled file in mdsioLocalDir : this fix the |
| 1544 |
|
restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir. |
| 1545 |
|
o pkg/ctrl: |
| 1546 |
|
- ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by |
| 1547 |
|
ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove |
| 1548 |
|
unused and superfluous variables |
| 1549 |
|
- ctrl_get_gen_rec.F: catch the case of xx_genperiod=0. |
| 1550 |
|
o pkg/ecco |
| 1551 |
|
- enable adjoint of Stevens OB |
| 1552 |
|
o pkg/ctrl/ecco/grdchk: |
| 1553 |
|
- remove global declaration of tmpfldx/yz and tmpfldx/yz2. |
| 1554 |
|
Fortunately, we do not have any tests for the numerous cpp-flagged |
| 1555 |
|
option of "obcs as control parameters" so we will never know |
| 1556 |
|
if this is an improvement (but at least now things compile). |
| 1557 |
|
- remove an obsolete initialization from ecco_cost_init_barfiles.F |
| 1558 |
|
- fix some problems within never used ifdefs to make the code compile |
| 1559 |
|
o pkg/obcs: |
| 1560 |
|
- Refine Interior mask definition to work with more complex OB (e.g. |
| 1561 |
|
if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to |
| 1562 |
|
read in Interior mask from file. Check if Interior mask is consistent |
| 1563 |
|
with OB list of indices. |
| 1564 |
|
o pkg/seaice |
| 1565 |
|
- beginning code for a seaice tracer package, |
| 1566 |
|
but currently only used for seaice age: SEAICE_AGE |
| 1567 |
|
SEAICE_num = 4 |
| 1568 |
|
iTracer = 1: area-weighted ice age |
| 1569 |
|
= 2: volume-weighted ice age |
| 1570 |
|
= 3, 4: template for one-year vs. multi-year ice |
| 1571 |
|
data.seaice has new namelist SEAICE_PARM03 for arrays related to |
| 1572 |
|
SEAICE_num |
| 1573 |
|
|
| 1574 |
|
checkpoint62t (2011/03/05) |
| 1575 |
|
o pkg/obcs: |
| 1576 |
|
- obcs_apply_uv.F: change to a 2 steps method, first tangential component; |
| 1577 |
|
then normal component. This ensures that the normal component is set |
| 1578 |
|
correctly even when it conficts with tangential setting from an other OB. |
| 1579 |
|
Affects results of test-experiment seaice_obcs: update the output.txt |
| 1580 |
|
o pkg/obcs: |
| 1581 |
|
- add code to monitor statistics of dynamical fields at OB. |
| 1582 |
|
- take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW : |
| 1583 |
|
- fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection). |
| 1584 |
|
- change default: balance the Net inflow through all OB (instead of balancing |
| 1585 |
|
each OB separately); keep the old method if setting OBC_balanceFacX < 0. |
| 1586 |
|
- switch on useOBCSbalance in dome experiment: only correct Western OB outflow |
| 1587 |
|
to match Nortern OB inflow (OBCS_balanceFacN=0). |
| 1588 |
|
o pkg/seaice: |
| 1589 |
|
- redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL |
| 1590 |
|
o pkg/seaice (seaice_growth v 1.113): |
| 1591 |
|
- reverting seaice_growth to v 1.111 in order to have code with exact bit |
| 1592 |
|
compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge |
| 1593 |
|
CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced |
| 1594 |
|
runtime flag SEAICEareaFormula is kept but is inactive |
| 1595 |
|
o model/src: |
| 1596 |
|
- add new param to scale curvilinear grid distance and area when using |
| 1597 |
|
a different sphere radius from the grid-files. |
| 1598 |
|
- test/check multi-threads EXCH applied to local variable (cg2d_x) |
| 1599 |
|
o adjoint: |
| 1600 |
|
- enable adjoint of Stevens OB |
| 1601 |
|
- add dummy_in_dynamics to enable extraction of ADJrhoinsitu |
| 1602 |
|
(a bit delicate because of potentially modified adj. common block structure; |
| 1603 |
|
current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later) |
| 1604 |
|
|
| 1605 |
|
checkpoint62s (2011/02/15) |
| 1606 |
|
o pkg/seaice (seaice_growth v 1.112): |
| 1607 |
|
- introduce SEAICEareaFormula run time parameter, which selects the recipe for |
| 1608 |
|
computing the ice cover tendency from effective thickness tendencies. Include |
| 1609 |
|
Ian Fenty's formula. |
| 1610 |
|
- remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using |
| 1611 |
|
SEAICEareaFormula. |
| 1612 |
|
- simplify notations for the various d_HEFF/d_AREA terms. |
| 1613 |
|
o pkg/gmredi: |
| 1614 |
|
- add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code |
| 1615 |
|
from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative; |
| 1616 |
|
add a verification test-run (front_relax.bvp) to test GM_useBVP. |
| 1617 |
|
o pkg/seaice (seaice_growth v 1.111): |
| 1618 |
|
- for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's. |
| 1619 |
|
- the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to |
| 1620 |
|
also melt ice. |
| 1621 |
|
o pkg/seaice: |
| 1622 |
|
- McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty). |
| 1623 |
|
- can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h |
| 1624 |
|
o pkg/cheapaml: |
| 1625 |
|
- from Nico Wienders: New version of this package. |
| 1626 |
|
o pkg/flt: |
| 1627 |
|
- add CPP options to prevent floats to re-enter the opposite side of |
| 1628 |
|
a periodic domain (default: keep periodicity) |
| 1629 |
|
o pkg/gmredi: |
| 1630 |
|
- apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners |
| 1631 |
|
(needed for multi-dim advection). |
| 1632 |
|
- switch on GM Advective form in global_ocean.cs32x15 and update output.txt |
| 1633 |
|
o model/src: |
| 1634 |
|
- fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run. |
| 1635 |
|
o tutorial_tracer_adjsens |
| 1636 |
|
- extend to NLFS and replace maskC by hFacC |
| 1637 |
|
(change reference output accordingly) |
| 1638 |
|
|
| 1639 |
|
checkpoint62r (2011/01/24) |
| 1640 |
|
o testreport: |
| 1641 |
|
- add option -deloutp (-do) to remove output file after successful run |
| 1642 |
|
- add option -mfile (-mf) for MPI machile-file and for each test-exp, |
| 1643 |
|
extract exact list of procs from this file ; adjust COMMAND by |
| 1644 |
|
replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs. |
| 1645 |
|
o pkg/ecco: replace old ineffective way of penalizing deviations from |
| 1646 |
|
first guess (of obcs) with code by Matt Mazloff |
| 1647 |
|
o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without |
| 1648 |
|
exf/cal |
| 1649 |
|
- ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl |
| 1650 |
|
and handle case of obcs?period == 0 |
| 1651 |
|
Not affected by these changes: There is still an inconsistency in |
| 1652 |
|
the computation of start/endrec for the obcs variables for ALLOW_CAL |
| 1653 |
|
defined (see comment by Menemenlis, 7-Mar-2003) |
| 1654 |
|
- make S/R ctrl_get_gen_rec return something meaningful even if |
| 1655 |
|
ALLOW_CAL is not defined |
| 1656 |
|
- ctrl_getobcs?: simplify code so that it does not need to use |
| 1657 |
|
S/R exf_swapfields |
| 1658 |
|
o testreport: |
| 1659 |
|
allow to test MPI with different number of processors for each experiment: |
| 1660 |
|
create file "SIZE.h.mpi" in each build dir. |
| 1661 |
|
Note: update of "-command" argument not yet implemented. |
| 1662 |
|
o model/src, pkg/autodiff, pkg/ecco, pkg/seaice: |
| 1663 |
|
alleviate the need for additional 3D tapes when using |
| 1664 |
|
the non-inear free surface in the adjoint. This is done |
| 1665 |
|
by adding an 'update' of hfacc etc. to their current |
| 1666 |
|
value at the beginning of forward_step.F. |
| 1667 |
|
o pkg/seaice |
| 1668 |
|
seaice_lsr: move stress-divergence computations out of outer pseudo- |
| 1669 |
|
timestepping loop |
| 1670 |
|
o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD' |
| 1671 |
|
up, so that the calls of the ctrl_* subroutines are really at the end |
| 1672 |
|
of the routine. |
| 1673 |
|
o pkg/gmredi: |
| 1674 |
|
allow to specify a 2-D horizontal map and a 1-D vertical profil |
| 1675 |
|
as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity. |
| 1676 |
|
o pkg/seaice: |
| 1677 |
|
move lsr iterations from seaice_dynsolver to seaice_lsr. |
| 1678 |
|
o pkg/seaice: |
| 1679 |
|
reduce memory footprint of seaice mutldim advection tapes, |
| 1680 |
|
by using a 2D tape independent of the generic_advdiff ones, |
| 1681 |
|
and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc. |
| 1682 |
|
|
| 1683 |
|
checkpoint62q (2010/12/29) |
| 1684 |
|
o model/src: |
| 1685 |
|
- check horizontal grid-spacing for unset or zero/negative values. |
| 1686 |
|
- change AD test hs94.1x64x5 to be truly a 2-D set-up. |
| 1687 |
|
o pkg/flt: |
| 1688 |
|
- use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR |
| 1689 |
|
- precision of input and output files set according to readBinaryPrec |
| 1690 |
|
and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits. |
| 1691 |
|
- initial float position from tiled file was not converted to index space |
| 1692 |
|
(looks like a bug): fixed to make it similar to initial pos. global file. |
| 1693 |
|
o global_ocean.cs32x15: |
| 1694 |
|
change SIZE.h of AD set-up to get same tiling as with MPI. |
| 1695 |
|
Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11) |
| 1696 |
|
o model/src: |
| 1697 |
|
add flag to control printing of domain fields (bathymetry, hFac ...) in |
| 1698 |
|
ini_mask_etc (call to plot_fieds_xy*). |
| 1699 |
|
o pkg/thsice: |
| 1700 |
|
if useEXF, some forcing fields are not valid in overlap: fixed by computing |
| 1701 |
|
over the interior only + apply EXCH at the end (like with SEAICE advection). |
| 1702 |
|
o pkg/mdsio: |
| 1703 |
|
- add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer |
| 1704 |
|
to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS. |
| 1705 |
|
- change barrier call for safe multi-threads access to 3-D shared buffer. |
| 1706 |
|
- MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones) |
| 1707 |
|
- replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and |
| 1708 |
|
remove the 4 S/R MDS_PASS_WH_R4/8toRL/S. |
| 1709 |
|
o pkg/flt: |
| 1710 |
|
- add fourth-order Runge-Kutta integration |
| 1711 |
|
- add basic exch2 support (only 1 facet supported so far!) |
| 1712 |
|
o pkg/mdsio+rw: |
| 1713 |
|
new S/R to read local (or tile independent) vector (read counterpart of |
| 1714 |
|
mds_writevec_loc, and front-end write_glvec_rl/rs). |
| 1715 |
|
o global_ocean.cs32x15: additional input_ad.seaice experiment |
| 1716 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 1717 |
|
(using multidim advection for seaice) |
| 1718 |
|
o towards more F95 syntax for array specification in namelist: |
| 1719 |
|
- change "data.diagnostics" (data.ptracers was changed before checkpoint62p) |
| 1720 |
|
of all verification experiments. |
| 1721 |
|
e.g.: line: fields(1,3)='ETAN ','ETANSQ ', |
| 1722 |
|
was changed to: fields(1:2,3)='ETAN ','ETANSQ ', |
| 1723 |
|
- finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles |
| 1724 |
|
o global_ocean.cs32x15: additional input.seaice experiment |
| 1725 |
|
that uses pkg/seaice rather than pkg/thsice. |
| 1726 |
|
|
| 1727 |
|
checkpoint62p (2010/12/17) |
| 1728 |
|
o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it |
| 1729 |
|
to THSICE_SIZE.h to avoid conflict with pkg/seaice. |
| 1730 |
|
o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint. |
| 1731 |
|
allow for use of multim. advection in seaice adjoint. |
| 1732 |
|
o pkg/seaice: add diagnostics for snow precipitation and sublimation flux |
| 1733 |
|
- first attempt to close budgets by taking into account the freshwater |
| 1734 |
|
flux implied by the sublimation of snow and ice. So far only the |
| 1735 |
|
volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag |
| 1736 |
|
SEAICE_ADD_SUBLIMATION_TO_FWBUDGET |
| 1737 |
|
o eesupp/src: |
| 1738 |
|
new S/R with new option (NML_EXTENDED_F77) to change array specification |
| 1739 |
|
from F95 standard to commonly accepted extended F77 form. |
| 1740 |
|
This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5) |
| 1741 |
|
and to revert back to the original syntax (with -DNML_EXTENDED_F77) |
| 1742 |
|
for less tolerant f77 compiler (e.g., pgf77, g77). |
| 1743 |
|
o globalFiles: |
| 1744 |
|
commented out in parameter file "data" since it's not safe with MPI |
| 1745 |
|
(e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much |
| 1746 |
|
in this case); no longer commented out in restart test (tst_2+2). |
| 1747 |
|
o add adTapeDir to specify a special directory where adjoint tapes are |
| 1748 |
|
written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05 |
| 1749 |
|
and cannot be used together with mdsioLocalDir. |
| 1750 |
|
o nesting pkgs: |
| 1751 |
|
- packages_init_variables : put call to OBCS_INIT_VARIABLES in last position |
| 1752 |
|
- update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 1753 |
|
- add parameter files + utils dir + output from short run on beagle. |
| 1754 |
|
o pkg/seaice: |
| 1755 |
|
fix seaice_growth.F store directives; update results of exp. lab_sea.ad |
| 1756 |
|
o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid |
| 1757 |
|
unnecessary copying in adjoint code, requires new parameter NMAX_ITER |
| 1758 |
|
|
| 1759 |
|
checkpoint62o (2010/11/25) |
| 1760 |
|
o pkg/exf: |
| 1761 |
|
- change CPP option EXF_VERBOSE to run-time logical param exf_verbose. |
| 1762 |
|
o pkg/seaice: |
| 1763 |
|
- seaice_ocean_stress: split a loop for better vectorization of the |
| 1764 |
|
adjoint code |
| 1765 |
|
- seaice_growth.F: fix bug in conservation of freshwater connected to |
| 1766 |
|
capping of heff, put contribution into d_HEFFbyNEG |
| 1767 |
|
- replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat |
| 1768 |
|
by something more sensible (parameters that are what their name implies) |
| 1769 |
|
- change some defaults, so that by default exf-parameters are used for |
| 1770 |
|
things like rhoAir, cpAir,latent/sensible heat parameters, in order |
| 1771 |
|
to reproduce the old results, many data.seaice now contain funny values |
| 1772 |
|
for cpAir and latent heat of sublimation |
| 1773 |
|
o packages_readparms.F: move exf_readparms up in line so that |
| 1774 |
|
exf-parameters are visible for other packages (e.g. seaice) |
| 1775 |
|
o debugMode & debugLevel=2: |
| 1776 |
|
- differentiate between debugMode & debugLevel=2: |
| 1777 |
|
debugMode: controls printing of debug messages (sequence of S/R calls). |
| 1778 |
|
debugLevel: controls printing of algorithm intermediate results and stats. |
| 1779 |
|
- remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2"; |
| 1780 |
|
=> allows to print debug-stats without all sequence of call messages. |
| 1781 |
|
- switch control of debug print from debugLevel to debugMode in many S/R. |
| 1782 |
|
o pkg/obcs (obcs-sponge): |
| 1783 |
|
fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the |
| 1784 |
|
call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge) |
| 1785 |
|
o pkg/generic_advdiff: |
| 1786 |
|
- record overlap minimum size for each advection scheme; |
| 1787 |
|
- refine criteria on overlap minimum size; |
| 1788 |
|
- check and stop (in gad_check) if overlap size is too small. |
| 1789 |
|
o pkg/obcs: |
| 1790 |
|
- with ptracers: remove multiple calls to obcs_apply_ptracer (only done |
| 1791 |
|
once, in ptracers_implicit.F) |
| 1792 |
|
- with seaice: remove test on empty file name in obcs_apply_seaice (always |
| 1793 |
|
apply OB values when tile has OB) |
| 1794 |
|
o model/src, coriolis setting: |
| 1795 |
|
- integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical |
| 1796 |
|
useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from |
| 1797 |
|
files (selectCoriMap=3) with any grid. |
| 1798 |
|
- add parameter "fPrime" for constant second Coriolis coeff (default=0). |
| 1799 |
|
o pkg/seaice/seaice_growth.F: |
| 1800 |
|
a few cosmetic changes that reduce the number of lines of code |
| 1801 |
|
o pkg/obcs: add boundary conditions following Stevens (1990) |
| 1802 |
|
- the code follows old MOM/NAOSIM code |
| 1803 |
|
- so far it is only implemented for the eastern and western boundaries |
| 1804 |
|
and NOT for pTracers |
| 1805 |
|
o pkg/rbcs: |
| 1806 |
|
- replace rbcsInIter by rbcsForcingOffset, the time in seconds at the |
| 1807 |
|
beginning of the first rbcs forcing period. |
| 1808 |
|
- add option rbcsSingleTimeFiles that makes rbcs read forcing data like the |
| 1809 |
|
offline package, i.e., one file per time, labeled by iteration number; |
| 1810 |
|
deltaTrbcs sets the timestep with which the data was generated; |
| 1811 |
|
rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset. |
| 1812 |
|
- rbcsForcingCycle=0 makes forcing non-cyclic. |
| 1813 |
|
- make arithmetic safe for negative times and odd forcing periods. |
| 1814 |
|
|
| 1815 |
|
checkpoint62n (2010/11/09) |
| 1816 |
|
o pkg/seaice: |
| 1817 |
|
fix masking in free-drift S/R ; update results of exp. lab_sea.fd |
| 1818 |
|
o pkg/obcs: |
| 1819 |
|
New S/R to copy tracer value from the OB location to narrow band region |
| 1820 |
|
(width = same as overlap) beyond the OB: preserve OB value (needed for |
| 1821 |
|
high-order scheme) which were overwritten by EXCH call if in overlap |
| 1822 |
|
region. Applied to theta, salt, ptracer and advected seaice variables. |
| 1823 |
|
With seaice: use maskInC in similar way as in gad_advection.F, |
| 1824 |
|
in seaice_advection.F and advect.F. |
| 1825 |
|
Update output of experiment seaice_obcs and change exp4 to test OBCS with |
| 1826 |
|
4th order Adv.Scheme. for pasive salt and ptracer. |
| 1827 |
|
o tools/genmake2: |
| 1828 |
|
- when looking for an optfile (not specified), only search for Fortran compiler |
| 1829 |
|
(remove sym-link test + setting of CPP + makedepend check + C-compiler check) |
| 1830 |
|
- in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm |
| 1831 |
|
(instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong) |
| 1832 |
|
- set default for CPP to "cpp -traditional -P" (was the case without specifying |
| 1833 |
|
an optfile, but otherwise default was just "cpp". |
| 1834 |
|
- comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from) |
| 1835 |
|
- when "CC" is not set in the optfile, look for possible C compiler |
| 1836 |
|
(instead of just setting CC=cc) |
| 1837 |
|
- put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes: |
| 1838 |
|
=> add a ".F" to ".o" rule for source files with no "#include" (such as |
| 1839 |
|
port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS. |
| 1840 |
|
- move gfortran before g77 in list of possible Fortran compiler (consistent |
| 1841 |
|
with reference compiler switch from g77 to gfortran) |
| 1842 |
|
o pkg/seaice: |
| 1843 |
|
o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to |
| 1844 |
|
seaice_check that stops the model, when the CPP flag is used. |
| 1845 |
|
o seaice_growth.F: make capping of ice volume conserving by returning the |
| 1846 |
|
capped ice as freshwater to EmPmR. This does not change the verification |
| 1847 |
|
experiments but will change runs where the capping is acutally active |
| 1848 |
|
o change reference platform+compiler from faulks+g77 to baudelaire+gfortran |
| 1849 |
|
(except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5, |
| 1850 |
|
global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD), |
| 1851 |
|
lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd) |
| 1852 |
|
o tools/genmake2: |
| 1853 |
|
- merge genmake_warnings & genmake_errors into 1 log file: "genmake.log") |
| 1854 |
|
- change DUMPSTATE default to false (can use "-ds" option to switch it to T) |
| 1855 |
|
- clean previous genmake log files before anything else. |
| 1856 |
|
- change Makefile to remove testreport log files (*.tr_log) and genmake log |
| 1857 |
|
files only with "CLEAN" target (instead of "Clean"); |
| 1858 |
|
o pkg/generic_advdiff: |
| 1859 |
|
Change OBCS in multiDim advection (gad_advection.F): |
| 1860 |
|
Use maskInC to prevent intermediate update of tracer-field in OB regions, |
| 1861 |
|
thus keeping current-time-step OB values; and remove the call to OBCS_APPLY |
| 1862 |
|
which were applying future time-step OB values. |
| 1863 |
|
This way, all explicit calculations use current-time-step OB values |
| 1864 |
|
(simpler and more consistent). |
| 1865 |
|
Affects results when set-up uses time-varying OBC and multi-dim advection; |
| 1866 |
|
update output of experiment seaice_obcs. |
| 1867 |
|
o pkg/seaice: |
| 1868 |
|
move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h: |
| 1869 |
|
this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH & |
| 1870 |
|
SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY. |
| 1871 |
|
Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY |
| 1872 |
|
but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp |
| 1873 |
|
unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h) |
| 1874 |
|
o pkg aim (2010/10/26): |
| 1875 |
|
- Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation |
| 1876 |
|
formulation with obliquity, eccentricity, ... as run-time parameters, |
| 1877 |
|
- Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and |
| 1878 |
|
upward shortwave radition at the surface (all-sky and clear-sky). |
| 1879 |
|
o pkg/obcs: |
| 1880 |
|
- writing sections with globalFiles=T does not work: switch to tiled-files |
| 1881 |
|
when writing sections for OBCS (change pkg/rw/write_rec.F accordingly). |
| 1882 |
|
- fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F |
| 1883 |
|
- apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs |
| 1884 |
|
|
| 1885 |
|
checkpoint62m (2010/10/21) |
| 1886 |
|
o pkg/seaice: vectorize seaice_solve4temp.F |
| 1887 |
|
- move iterations loops outside of i/j-loops |
| 1888 |
|
- requires 2D arrays for TB and effConduct |
| 1889 |
|
- add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is |
| 1890 |
|
modified in this routine |
| 1891 |
|
- a little bit of clean up, adjusting indentation, etc. |
| 1892 |
|
- replaced a few TEN**a by exp(a*log(10.)) in new code for better |
| 1893 |
|
performance and '**TWO' by '**2' (because TWO is a float), |
| 1894 |
|
replaced ONE, ZERO |
| 1895 |
|
o eesupp/src: |
| 1896 |
|
fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube |
| 1897 |
|
o pkg/seaice/seaice_growth.F |
| 1898 |
|
Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and |
| 1899 |
|
merging process. The merged routine has two branches, and one activates the 'evolution' |
| 1900 |
|
branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now). |
| 1901 |
|
In summary, here is what the '10/10 revision' did consist of |
| 1902 |
|
part 1: seaice_growth.F revisions 1.71 to 1.75 |
| 1903 |
|
- Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged. |
| 1904 |
|
The emphasis here was on improving readability (e.g. by trying to use meaningful |
| 1905 |
|
variable names) and modularity (e.g. by adding arrays to store heff etc. updates). |
| 1906 |
|
part 1.5: |
| 1907 |
|
- revising the lab_sea experiment to make it a more useful (i.e. stable |
| 1908 |
|
and representative of an actual model run). This was done by generating a |
| 1909 |
|
(winter) pickup to start from, switching back the main experiment dynamic |
| 1910 |
|
solver from evp to lsr, having one of the experiments use the free drift solution. |
| 1911 |
|
part 2: seaice_growth.F revisions 1.76 to 1.85 |
| 1912 |
|
- Sorting out hard-coded constants that prevented heat and fresh water conservation. |
| 1913 |
|
- Sorting out the various fields units and sign (set early on and reset at the end) |
| 1914 |
|
to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and |
| 1915 |
|
fresh water stock is 'effective ice meters', and >0 implies more ice/snow. |
| 1916 |
|
- Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks, |
| 1917 |
|
and simplifying logical expressions to further improve readibility. |
| 1918 |
|
part 3: seaice_growth.F revisions 1.86 to 1.89 |
| 1919 |
|
- Re-organize the blocks of code more logically. |
| 1920 |
|
- Merging the '_if.F' pieces that add something new. |
| 1921 |
|
o pkg/thsice: |
| 1922 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
| 1923 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
| 1924 |
|
might also be problematic for TAF |
| 1925 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
| 1926 |
|
does not change the verifcation experiment, but will change all |
| 1927 |
|
experiments that have this flag undefined (not tested in verification); |
| 1928 |
|
a little reorganization to save a few 2D fields and recomputations |
| 1929 |
|
- 1st step of revisiting thsice adjoint (major recomp. sorted out) |
| 1930 |
|
- 2nd step: fix some store dirs |
| 1931 |
|
o seems to work somewhat, i.e. using ifort but not g77 |
| 1932 |
|
o likely cause are incomplete init. or recomputation |
| 1933 |
|
o start verification/global_ocean.cs32x15/input_ad.thsice |
| 1934 |
|
o pkg/obcs: add support for exch2 |
| 1935 |
|
- the position of the boundary and prescribed values are specified using |
| 1936 |
|
a global domain with exch2 facets stacked |
| 1937 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
| 1938 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
| 1939 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
| 1940 |
|
file layout is as for obcs described above: |
| 1941 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
| 1942 |
|
- for y-z sections, facets are stacked in y |
| 1943 |
|
o pkg/thsice: |
| 1944 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
| 1945 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
| 1946 |
|
not affected, but in particular the latter routine has changed |
| 1947 |
|
dramatically (not necessarily easier to read now). |
| 1948 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
| 1949 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
| 1950 |
|
o verification/lab_sea: |
| 1951 |
|
- overhaul of the forward model experiments. The main motivation |
| 1952 |
|
for this revision is that lab_sea has proven quite fragile (when |
| 1953 |
|
changing the sea-ice code, and switching platforms) to a point |
| 1954 |
|
when failures were very hard to attribute to specific code problems. |
| 1955 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
| 1956 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
| 1957 |
|
- the input.lsr experiment thus became obsolete and was removed. |
| 1958 |
|
- it was replaced with the input.fd experiment that uses an |
| 1959 |
|
analytical "free drift" solution as the ice velocity field. |
| 1960 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
| 1961 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
| 1962 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
| 1963 |
|
us to test additional options, along with the salt plume package. |
| 1964 |
|
- Finally a pickup was generated (at the end of a one year run) to |
| 1965 |
|
make the tests more representative of an actual model run. Previously |
| 1966 |
|
the tests starting point was a 1m thickness of ice everywhere. |
| 1967 |
|
o pkg/seaice: |
| 1968 |
|
- introducing S\R seaice_freedrift.F that compute the |
| 1969 |
|
analytical solution to an approximate ice momentum |
| 1970 |
|
equation (i.e. the simple stress/coriolis balance). |
| 1971 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
| 1972 |
|
of the free drift velocity field, and enable its use. |
| 1973 |
|
To actually use the free drift solution as the model ice |
| 1974 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
| 1975 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
| 1976 |
|
|
| 1977 |
|
checkpoint62l (2010/10/04) |
| 1978 |
|
o pkg/seaice: |
| 1979 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
| 1980 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
| 1981 |
|
version (with USE_ORIGINAL_SBI undef); |
| 1982 |
|
o add hooks for new packages OASIS, the package will follow |
| 1983 |
|
(hooks exclude the seaice pkg for now) |
| 1984 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
| 1985 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
| 1986 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
| 1987 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
| 1988 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
| 1989 |
|
Option to write/read 2D fields to files including tiles halos. |
| 1990 |
|
The main purpose is for adjoint related "tape I/O". |
| 1991 |
|
The secondary purpose is for debugging phases. |
| 1992 |
|
A word on those rather specifically intended purposes. |
| 1993 |
|
The code was meant to be stripped down to the bare minimum. |
| 1994 |
|
Typically, there is a unique and basic mapping to the global |
| 1995 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
| 1996 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
| 1997 |
|
meant to generate user friendly outputs of various shapes and forms. |
| 1998 |
|
Rather it is intended, for the knowledgeabale developers, |
| 1999 |
|
to be largely independent of the many mdsio options, to allow |
| 2000 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
| 2001 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
| 2002 |
|
file system behavior. With regard to tuning, most of the potential knobs |
| 2003 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
| 2004 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
| 2005 |
|
are not yet included, and will be added if they prove useful. |
| 2006 |
|
o pkg/seaice: |
| 2007 |
|
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
| 2008 |
|
o pkg/seaice: |
| 2009 |
|
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
| 2010 |
|
code (seaice_budget_ice_if.F) which enable to recover old standard |
| 2011 |
|
code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined. |
| 2012 |
|
temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F. |
| 2013 |
|
o model/src (rStar): |
| 2014 |
|
use simple average (not area weighted) of rStarFac at U,V point when using |
| 2015 |
|
vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection) |
| 2016 |
|
update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20. |
| 2017 |
|
|
| 2018 |
|
checkpoint62k (2010/09/17) |
| 2019 |
|
o adjoint |
| 2020 |
|
* changed verification/global_ocean.cs32x15 ; adjoint now tests |
| 2021 |
|
Adams-Bashforth 3 + NLFS + RSTAR |
| 2022 |
|
* some more modifs required for ECCO-GODAE v4 |
| 2023 |
|
o pkg/seaice |
| 2024 |
|
add SEAICE_AGE_VOL option to use volume instead of area for |
| 2025 |
|
integrating SEAICE_AGE |
| 2026 |
|
o model/src: |
| 2027 |
|
first check-in of sigma & hybrid-sigma coordinate code ; also includes |
| 2028 |
|
non-linear free-surface parts ; but pressure-gradient not yet coded. |
| 2029 |
|
o pkg/ptracers: |
| 2030 |
|
option for ptracer to convert Salt Relax into additional EmP. |
| 2031 |
|
tested in exp. global_ocean.90x40x15.dwnslp (update output) |
| 2032 |
|
|
| 2033 |
|
checkpoint62j (2010/08/25) |
| 2034 |
|
o pkg/ggl90: |
| 2035 |
|
other minor changes: remove 3-D temp array gTKE (+ add argument myIter) |
| 2036 |
|
o pkg/dic: car_flux.F, phos_flux.F |
| 2037 |
|
- reduce number of exp-calls in order to improve performance |
| 2038 |
|
- clean up a little (replace fields by their macros, etc., fix |
| 2039 |
|
typo in CPP-flag) |
| 2040 |
|
o pkg/ggl90: minor changes |
| 2041 |
|
- GGL90diffKrS was removed --> always use GGL90diffKr |
| 2042 |
|
- GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV |
| 2043 |
|
- hack of mxlMaxFlag=2 --> ensure mixing between first and second level |
| 2044 |
|
(commented out for now) |
| 2045 |
|
- change in max/min operations to ensure that smoothing is ok |
| 2046 |
|
- smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr) |
| 2047 |
|
- always use diffKrNrT as background profile (i.e. never use diffKr field) |
| 2048 |
|
o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj) |
| 2049 |
|
o pkg/dic: |
| 2050 |
|
- model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better |
| 2051 |
|
vectorization |
| 2052 |
|
- small bug fix in insol for the unlikely case of a cartesian grid |
| 2053 |
|
- towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F |
| 2054 |
|
+ now vectorize, which also removes adjoint recomputations; |
| 2055 |
|
+ replace integer maksp1 by _RL maskp1 |
| 2056 |
|
+ replace a**x by exp(x*log(a)) in phos_flux.F for speed |
| 2057 |
|
|
| 2058 |
|
checkpoint62i (2010/07/21) |
| 2059 |
|
o pkg/flt: |
| 2060 |
|
- with OBCS: stop floats which enter the OB region |
| 2061 |
|
o model/src: |
| 2062 |
|
- use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones) |
| 2063 |
|
for implicit vertical advection. |
| 2064 |
|
o pkg/seaice: |
| 2065 |
|
- account for melting in seaice age evolution. |
| 2066 |
|
- remove double counting of seaice ridging effect on seaice age. |
| 2067 |
|
|
| 2068 |
|
checkpoint62h (2010/06/18) |
| 2069 |
|
o pkg/exch2: |
| 2070 |
|
- remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1). |
| 2071 |
|
o tools/genmake2 |
| 2072 |
|
- remove "-pdefault" option: redundant with the use of "packages.conf"; |
| 2073 |
|
- remove file pkg/pkg_default : set the default as a pkg group |
| 2074 |
|
("default_pkg_list") defined in pkg/pkg_groups; |
| 2075 |
|
- fix for case pkg/pkg_depend is missing (was hanging before); |
| 2076 |
|
- add option "-pgroups" to specify a different pkg_groups than the default. |
| 2077 |
|
o verification/adjustment.cs-32x32x1: |
| 2078 |
|
add a "minimal" set-up test (code_min & input_min) which only compiles |
| 2079 |
|
eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc. |
| 2080 |
|
o tools/genmake2 |
| 2081 |
|
- extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg])) |
| 2082 |
|
- fix details of checking for mnc & profile pkg when NetCDF is unavailable. |
| 2083 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
| 2084 |
|
files are nearly the same anyway. |
| 2085 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
| 2086 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
| 2087 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
| 2088 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
| 2089 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
| 2090 |
|
- replace |
| 2091 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
| 2092 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
| 2093 |
|
by |
| 2094 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
| 2095 |
|
(changes results) |
| 2096 |
|
-> exf_bulkformulae v1.22, |
| 2097 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
| 2098 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
| 2099 |
|
output.txt 1.63 |
| 2100 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
| 2101 |
|
seaice_obcs: output.txt 1.10) |
| 2102 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
| 2103 |
|
-> exf_bulkformulae v1.23, |
| 2104 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
| 2105 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
| 2106 |
|
Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice. |
| 2107 |
|
o adjoint of exch-1: |
| 2108 |
|
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
| 2109 |
|
(note: was already like this when using EXCH-2) and remove flow dir |
| 2110 |
|
and hand-written AD version of high-level EXCH S/R (pkg/autodiff); |
| 2111 |
|
- provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow); |
| 2112 |
|
- update pkg/exch2 diff list. |
| 2113 |
|
|
| 2114 |
|
checkpoint62g (2010/05/19) |
| 2115 |
|
o eesupp/src (exch-1): |
| 2116 |
|
- split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F) |
| 2117 |
|
and remove argument "simulationMode"; same thing for all exch_*rx_cube.F |
| 2118 |
|
(renamed to exch1_*rx_cube.F). |
| 2119 |
|
- change accordingly exch_*_rx.template and AD version in pkg/autodiff |
| 2120 |
|
to call new exch1 S/R ; update Makefile and .cvsignore. |
| 2121 |
|
- replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove |
| 2122 |
|
exch2_xy_rx later) |
| 2123 |
|
Note: after updating your code, need to run "make clean" in eesupp/src |
| 2124 |
|
o test experiment bottom_ctrl_5x5: |
| 2125 |
|
new output_adm.txt with fewer grdchk & less monitor output. |
| 2126 |
|
o model/src: |
| 2127 |
|
remove the call to ini_cori in initialise_varia.F (just keep the usual one |
| 2128 |
|
in initialise_fixed.F). More consistent with coriolis & horizontal grid |
| 2129 |
|
beeing treated in the same way (ini_grid is not called a 2nd time). |
| 2130 |
|
o pkg/exf: |
| 2131 |
|
- rewrite exf_bulk_largeyeager04.F for better vectorization, changes |
| 2132 |
|
global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated |
| 2133 |
|
- fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now) |
| 2134 |
|
- cosmetic changes to exf_bulkformulae.F to make it look more like |
| 2135 |
|
exf_bulk_largeyeager04.F |
| 2136 |
|
o eesupp/src (exch-1): |
| 2137 |
|
- Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1). |
| 2138 |
|
- Separate buffer filling and MPI sending: allow EXCH-1 to work for local |
| 2139 |
|
array (non-shared) when using MPI+MTH. Also reduces number of BARRIER |
| 2140 |
|
(even without using MPI). |
| 2141 |
|
- Message mode: move RecvAck setting (indicator of buffer being ready) |
| 2142 |
|
from send_put to recv_get S/R (was useless before, but not sure if |
| 2143 |
|
it's much more useful now); |
| 2144 |
|
- Switch the order of sync: MPI-proc 1rst and then threads; |
| 2145 |
|
- take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead. |
| 2146 |
|
- fix AD code for communication mode ='get' (but not used). |
| 2147 |
|
o model/src: |
| 2148 |
|
initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does |
| 2149 |
|
not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp). |
| 2150 |
|
o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API |
| 2151 |
|
o pkg/ctrl: require a specific set of control variables and exf-flags for |
| 2152 |
|
adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied) |
| 2153 |
|
o model/src: |
| 2154 |
|
a) 1rst version of a new driver S/R to turn-off output freq and flags after the |
| 2155 |
|
1rst forward sweep, to avoid over-writing output files during recomputations |
| 2156 |
|
recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?) |
| 2157 |
|
b) 2nd version: |
| 2158 |
|
- add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO); |
| 2159 |
|
- switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast, |
| 2160 |
|
writePickupAtEnd) + seaice & ptracers output; |
| 2161 |
|
- do not switch off MNC flags (otherwise, won't get admonitor netcdf file) |
| 2162 |
|
o model/src: |
| 2163 |
|
- new S/R rotate_uv2en_rl (..._rs) that rotates vector fields. |
| 2164 |
|
o pkg/exch2: |
| 2165 |
|
- remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ; |
| 2166 |
|
- add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch). |
| 2167 |
|
o pkg/autodiff & exch2: |
| 2168 |
|
process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF |
| 2169 |
|
(for now, only if ALLOW_EXCH2 is defined). |
| 2170 |
|
o pkg/autodiff: |
| 2171 |
|
- include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F |
| 2172 |
|
(not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly. |
| 2173 |
|
+ clean-up comments (_RS is not always real*4) |
| 2174 |
|
- fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R) |
| 2175 |
|
- add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2: |
| 2176 |
|
was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs. |
| 2177 |
|
o testreport (AD-tests): |
| 2178 |
|
no longer link files from dir "../input" (1rst link files from |
| 2179 |
|
"../input_ad.[xx]" if secondary test "xx" and then from "../input_ad") |
| 2180 |
|
|
| 2181 |
|
checkpoint62f (2010/04/29) |
| 2182 |
|
o model/src/the_main_loop.F: |
| 2183 |
|
adjust store directives for seaice evp and multicategory according to |
| 2184 |
|
pkg/ecco/the_main_loop.F |
| 2185 |
|
o adjoint: |
| 2186 |
|
global_sum_ad was incomplete (noted many times by many people ;) |
| 2187 |
|
nice description by Jean U. as follows: |
| 2188 |
|
* allreduce(var) in global_sum.F can be interpreted as |
| 2189 |
|
reduce(sum) followed by broadcast of sum. |
| 2190 |
|
* The adjoint of that is |
| 2191 |
|
sum(adjoint) followed by broadcast(summed adjoint value) |
| 2192 |
|
or in other words, allreduce(sum, adjoint vars) |
| 2193 |
|
We were missing the sum(adjoint)! |
| 2194 |
|
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |
| 2195 |
|
(noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset). |
| 2196 |
|
The fix should produce 16-digit accuracy between |
| 2197 |
|
single-CPU multi-tile (e.g. nSx=2, nPx=1) and |
| 2198 |
|
multi-CPU single-tile (e.g. nSx=1, nPx-2) |
| 2199 |
|
We'll probably change this yet again shortly |
| 2200 |
|
o eesupp/src: |
| 2201 |
|
- fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?) |
| 2202 |
|
o pkg/icefront |
| 2203 |
|
- ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving |
| 2204 |
|
specification of addmass array based on a 2D field, which is added |
| 2205 |
|
at bottommost wet level at each horizontal location. |
| 2206 |
|
o model/src: |
| 2207 |
|
horizontal grid initialisation (other than curvilinear): add code for Exch2 IO |
| 2208 |
|
layout; (not always compatible with delX,delY setting; commented out for now). |
| 2209 |
|
o pkg/exch2: |
| 2210 |
|
change tile to processor setting (case nSy*nPy > 1): allows default model mapping |
| 2211 |
|
(myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config. |
| 2212 |
|
|
| 2213 |
|
checkpoint62e (2010/04/15) |
| 2214 |
|
o pkg/obcs: |
| 2215 |
|
- fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert). |
| 2216 |
|
o pkg/dic: |
| 2217 |
|
-fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up; |
| 2218 |
|
(note: not presently tested in any forward verification exp.) |
| 2219 |
|
update tutorial_global_oce_biogeo AD output file. |
| 2220 |
|
o pkg/exf: |
| 2221 |
|
- account for the variation of albedo as a function of zenith angle |
| 2222 |
|
by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h |
| 2223 |
|
o build_options: |
| 2224 |
|
- rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas" |
| 2225 |
|
o pkg/dic: |
| 2226 |
|
change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart: |
| 2227 |
|
- use binary pickup file for restart; |
| 2228 |
|
- initialise atmos-CO2 box from dic_pCO2 parameter; |
| 2229 |
|
- fix multi-threaded. |
| 2230 |
|
o pkg/rbcs: |
| 2231 |
|
- clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ; |
| 2232 |
|
change (+ fix IO calls) type of array RBC_mask from _RL to _RS. |
| 2233 |
|
- add RBCS to exp4 passive tracer 01 (rbcs was previously untested) |
| 2234 |
|
and update output.txt |
| 2235 |
|
o pkg/kpp: |
| 2236 |
|
- add diagnostics for KPP non-local flux of Temp, Salinity and pTracers; |
| 2237 |
|
- change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS |
| 2238 |
|
(= ratio of KPP non-local (salt) flux relative to surface-flux) when |
| 2239 |
|
using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat '); |
| 2240 |
|
- change pkg/offline to read-in average KPPghat*KPPdiffKzS from file |
| 2241 |
|
KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile). |
| 2242 |
|
o pkg/offline: |
| 2243 |
|
fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor |
| 2244 |
|
(bug was added in version 1.10 on 2007-08-23). |
| 2245 |
|
o pkg/offline: |
| 2246 |
|
- no need to specify periodicExternalForcing, etc ... to use offline pack |
| 2247 |
|
- offline input files no longer just single prec --> parameter offlineLoadPrec |
| 2248 |
|
o verification/lab_sea: |
| 2249 |
|
change AD test to multi-tile setup and update all 4 AD output. |
| 2250 |
|
NOTE: while cost function values remain very similar, |
| 2251 |
|
gradients are very different, although gradient checks are self-consistent |
| 2252 |
|
Should try to get to the bottom of this (cost function summation order?) |
| 2253 |
|
o pkg/dic: |
| 2254 |
|
in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid |
| 2255 |
|
a weakness of TAF that drops part of double precision in log10 derivative. |
| 2256 |
|
<= changes removed since problem has been fixed in current TAF version 1.9.71 |
| 2257 |
|
update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo. |
| 2258 |
|
o pkg/ecco: |
| 2259 |
|
add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F |
| 2260 |
|
update all 4 lab_sea AD output. |
| 2261 |
|
|
| 2262 |
|
checkpoint62d (2010/03/22) |
| 2263 |
|
o build_options: |
| 2264 |
|
remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles. |
| 2265 |
|
o remove unbalanced quote (single or double) in commented line of source code |
| 2266 |
|
(may cause some warning with some preprocessor/makedepend versions). |
| 2267 |
|
o pkg/seaice: |
| 2268 |
|
fix seaice_model.F for adjoint (gael) and update AD results of experiments |
| 2269 |
|
lab_sea (std + evp + noseaicedyn) and offline_exf_seaice. |
| 2270 |
|
o testreport: |
| 2271 |
|
add option '-runonly' (short: '-ro') to just do the run part (without make). |
| 2272 |
|
o eesupp: remove JAM communication code (obsolete). |
| 2273 |
|
o add option to genmake2 & testreport to switch "_RS" type to "real*4" |
| 2274 |
|
(if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return |
| 2275 |
|
to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1 |
| 2276 |
|
(update also the output). |
| 2277 |
|
|
| 2278 |
|
checkpoint62c (2010/03/02) |
| 2279 |
|
o tools/build_options : |
| 2280 |
|
move (some) old optfiles from build_options/ to build_options/unsupported/ |
| 2281 |
|
o model/src and pkg/exf |
| 2282 |
|
surface relaxation -- separating data and data.exf options |
| 2283 |
|
The point is to ensure that we specify the surface relaxation |
| 2284 |
|
either in data or in data.exf (but not half and half) and to |
| 2285 |
|
avoid an accidental relaxation to 0 (which happened if a time |
| 2286 |
|
scale was specified but the file name was left empty) |
| 2287 |
|
o model/src model/inc and pkg/mom_common |
| 2288 |
|
ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity |
| 2289 |
|
=> addition to the viscosity field as computed by others schemes |
| 2290 |
|
o tools/build_options: |
| 2291 |
|
- rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile) |
| 2292 |
|
but keep the former optfile for few weeks for smooth transition |
| 2293 |
|
o pkg/ecco |
| 2294 |
|
- allow user defined cost function contributions |
| 2295 |
|
CPP: ALLOW_USERCOST_CONTRIBUTION |
| 2296 |
|
USAGE: compute contributions in cost_usercost_all.F |
| 2297 |
|
- note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was. |
| 2298 |
|
the two options are complementary. |
| 2299 |
|
o pkg/smooth |
| 2300 |
|
- migration from contrib to the main repository |
| 2301 |
|
|
| 2302 |
|
checkpoint62b (2010/01/26) |
| 2303 |
|
o pkg/monitor: |
| 2304 |
|
- change back mon_printstats_rl.F & mon_stats_rl.F and add a stop |
| 2305 |
|
(in case someone forgot to update customized pieces of code) |
| 2306 |
|
o nonHydrostatic: |
| 2307 |
|
- add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested); |
| 2308 |
|
- add a simple 2-D experiment (short_surf_wave) to test it. |
| 2309 |
|
o pkg/icefront: |
| 2310 |
|
adding the shell of, and the hooks to, a new package that |
| 2311 |
|
will model melting and freezing of vertical glacier ice fronts |
| 2312 |
|
o momentum: |
| 2313 |
|
add diagnostics of momentum tendency from Hydrostatic pressure gradient |
| 2314 |
|
(without surf.pressure term: would need a 2nd filling since implicit term). |
| 2315 |
|
o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace |
| 2316 |
|
two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR |
| 2317 |
|
cannot deal with the former |
| 2318 |
|
o cleaning: |
| 2319 |
|
- remove all (except OpenAD) old TLM output from results_ad dirs. |
| 2320 |
|
- remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R) |
| 2321 |
|
- comment out maskH definition (replaced by maskInC) |
| 2322 |
|
o pkg/monitor: |
| 2323 |
|
- change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl |
| 2324 |
|
& mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs. |
| 2325 |
|
|
| 2326 |
|
checkpoint62a (2010/01/15) |
| 2327 |
|
o model/src: |
| 2328 |
|
- bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4) |
| 2329 |
|
o pkg/diagnostics: |
| 2330 |
|
- add optional level number diagnostics (i.e., level number to be define |
| 2331 |
|
explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X". |
| 2332 |
|
- strictly check for valid parser-code(10) ; |
| 2333 |
|
- check if adding diag to the list from the right place. |
| 2334 |
|
o pkg/longstep: |
| 2335 |
|
- change parameters and fix tracer conservation with rstar/nonlinear free surface |
| 2336 |
|
o diagnostics: |
| 2337 |
|
- in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer |
| 2338 |
|
S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics. |
| 2339 |
|
o pkg/diagnostics: |
| 2340 |
|
- Add option for writing vertical integral (sum of selected levels) of an output |
| 2341 |
|
field instead of writing output field levels. Activate this option on a per |
| 2342 |
|
output-file basis, by setting the 2nd character of fileflag to 'I'. |
| 2343 |
|
- Add field-specific information relative to level integral in 3rd postion |
| 2344 |
|
of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate |
| 2345 |
|
vertically (x level-thickness x hFac), "r"=same but without hFac. |
| 2346 |
|
o do_the_model_io: |
| 2347 |
|
- pass end-of-model-run flag as argument, from forward_step to diagnostics_write: |
| 2348 |
|
in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before |
| 2349 |
|
writing pickups and stopping. |
| 2350 |
|
o pkg/diagnostics (for now, only with mdsio): |
| 2351 |
|
- write time information to meta file (and modify accordingly rdmds.m) : |
| 2352 |
|
time-averaged diagnostics output: write starting and ending time of the |
| 2353 |
|
time-averaging interval ; snap-shot diagnostics output remains unchanged; |
| 2354 |
|
o pkg/timeave: |
| 2355 |
|
- S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously |
| 2356 |
|
always Nr), now assumed to be equal to number of levels of averaged field; |
| 2357 |
|
only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F |
| 2358 |
|
o pkg/sbo: |
| 2359 |
|
- fix ocean bottom pressure global-average & 2-D time-ave output (was |
| 2360 |
|
neither initialised nor filled). |
| 2361 |
|
- add starting iteration in suffix of global-average output file |
| 2362 |
|
(to avoid over-writing the file after a restart) |
| 2363 |
|
- use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb). |
| 2364 |
|
o time-average: |
| 2365 |
|
- use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj) |
| 2366 |
|
(pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf, |
| 2367 |
|
ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice) |
| 2368 |
|
this fix DIC_COST cumulative-time array (previously: bi,bj,k) |
| 2369 |
|
- fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice) |
| 2370 |
|
- fix missing accumulation for pkg/opps. |
| 2371 |
|
- cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0) |
| 2372 |
|
(pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81); |
| 2373 |
|
- fix initialisation of time-ave vars and do only full time-step increment |
| 2374 |
|
(i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81); |
| 2375 |
|
o pkg/layers: |
| 2376 |
|
- use standard RW pkg S/R to write the output |
| 2377 |
|
and remove local write_fld version (which had a problem). |
| 2378 |
|
- use simple cumulative-time array (no level index) to fix time-ave S/R calls. |
| 2379 |
|
- fix LAYERS_CALC argument list. |
| 2380 |
|
o pkg/timeave: |
| 2381 |
|
- store cumulative-time in a simple tiled array (drop the level index) |
| 2382 |
|
- add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array. |
| 2383 |
|
o pkg/ocn,aim_compon_interf |
| 2384 |
|
- changes for multi-threaded coupled run. (tested with ifort-11 on danton) |
| 2385 |
|
|
| 2386 |
|
checkpoint62 (2009/12/23) |
| 2387 |
|
o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output. |
| 2388 |
|
(was not previously tested in any other exp.) |
| 2389 |
|
o pkg/monitor: |
| 2390 |
|
- clean-up _RL/_RS version: add specific S/R for statistics with mask & volume: |
| 2391 |
|
mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one |
| 2392 |
|
(mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics. |
| 2393 |
|
- use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F). |
| 2394 |
|
- change del2 calculation. |
| 2395 |
|
- use interior masks (instead of maskH, <- to be remove). |
| 2396 |
|
- shorter monitor suffix for forcing stats ("forcing" instead of "extforcing"). |
| 2397 |
|
o mask & obcs: |
| 2398 |
|
- define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S). |
| 2399 |
|
- move global area computation from ini_masks_etc.F to ini_linear_phisurf.F |
| 2400 |
|
(called after packages_init_fixed) |
| 2401 |
|
o pkg/obcs: |
| 2402 |
|
- move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once. |
| 2403 |
|
Fixes bug in obcs+exf with nSx*nSy.GT.1 |
| 2404 |
|
- fix multi-tile handling in obcs balance code |
| 2405 |
|
o nonHydrostatic: |
| 2406 |
|
- Implement AB-3 for non-hydrostatic vertical momentum ; |
| 2407 |
|
(change ordering of var. stored in pickup file when using NH) |
| 2408 |
|
- move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D. |
| 2409 |
|
- add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x |
| 2410 |
|
(in prep. for new NH free surface form). |
| 2411 |
|
o pkg/obcs: |
| 2412 |
|
add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe |
| 2413 |
|
o model/src: |
| 2414 |
|
fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography |
| 2415 |
|
|
| 2416 |
|
checkpoint61z (2009/12/01) |
| 2417 |
|
o nonHydrostatic: |
| 2418 |
|
Fix missing vertical flux of vert. momentum near surface (k=1). This fixes |
| 2419 |
|
a spurious source of energy in simple baroclinic adjusment test case. |
| 2420 |
|
Update all non-hydrostatic exp output. |
| 2421 |
|
o model/src (3-d solver): |
| 2422 |
|
Change again 3-D solver free-surface RHS term when exactConserv=T: |
| 2423 |
|
simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1 |
| 2424 |
|
(which was not the case with previous formulation). |
| 2425 |
|
To recover previous version, just reset "oldFreeSurfTerm" to previous value. |
| 2426 |
|
Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW. |
| 2427 |
|
o nonHydrostatic: |
| 2428 |
|
- compatible with implicDiv2Dflow < 1 ; + implement implicit factor |
| 2429 |
|
for Non-Hydrostatic pressure gradient (similar to implicSurfPress). |
| 2430 |
|
- change 3-D solver to work with r* (for now, only with linear free-surf.) |
| 2431 |
|
- add few debug diagnostics (cg3d_x, residual) |
| 2432 |
|
o model/src: |
| 2433 |
|
fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b). |
| 2434 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
| 2435 |
|
o update output of exp. global_ocean.cs32x15.icedyn after removing |
| 2436 |
|
#define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h |
| 2437 |
|
o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino) |
| 2438 |
|
o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output |
| 2439 |
|
for complex grids, for now only to "state", "adstate", "adexf", "adseaice" |
| 2440 |
|
o model: add Christopher Wolfe's implemetation of the single reduction cg2d |
| 2441 |
|
(d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and |
| 2442 |
|
runtime flag useSRCGSolver. Modify verification experiment global_with_exf |
| 2443 |
|
to test this code |
| 2444 |
|
o pkg/cd_code: |
| 2445 |
|
Change defaut D-grid time-stepping to get the same for D-grid momentum as for |
| 2446 |
|
C-grid momentum. D-grid velocity used to be stepped forward in time with |
| 2447 |
|
Adams-Bashforth only on surface pressure term. Tests show that using AB on |
| 2448 |
|
D-grid coriolis term improves stability (as expected from CD-scheme paper). |
| 2449 |
|
To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h). |
| 2450 |
|
Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2), |
| 2451 |
|
lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD), |
| 2452 |
|
tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens. |
| 2453 |
|
Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2, |
| 2454 |
|
global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD. |
| 2455 |
|
o pkg/obcs: |
| 2456 |
|
- fix bug in initialisation (broken since Oct 1rst modification) |
| 2457 |
|
for useOBCSprescribe without useEXF. |
| 2458 |
|
|
| 2459 |
|
checkpoint61y (2009/11/15) |
| 2460 |
|
o pkg/seaice |
| 2461 |
|
- change (once again) the discretization for the evp solver: rather than |
| 2462 |
|
squaring the averages of strain rates, average the squares to give |
| 2463 |
|
a better approximation to VP behavior (in simple test); this breaks |
| 2464 |
|
verification experiments that use EVP (lab_sea and lab_sea.hb87) |
| 2465 |
|
--> update outputs |
| 2466 |
|
o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit) |
| 2467 |
|
to improve vectorization of adjoint code on TARGET_NEC_SX |
| 2468 |
|
o verification/vermix: |
| 2469 |
|
- change vermix to a more "classical" 1d column with high vertical |
| 2470 |
|
resolution, seasonal heat flux forcing and constant wind forcing |
| 2471 |
|
--> update outputs |
| 2472 |
|
o pkg/seaice |
| 2473 |
|
- fix diagnostics of principal stress components for EVP |
| 2474 |
|
- add optional diagnostics of non-linear convergence for LSOR solver |
| 2475 |
|
- make maximum zeta a runtime parameter |
| 2476 |
|
o model/src (3-d solver): |
| 2477 |
|
Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49), |
| 2478 |
|
which consisted in removing the Surf. Non-Hydrostatic pressure from the |
| 2479 |
|
whole column and adding it to Eta (inspired from Casualli, 1999): |
| 2480 |
|
Only affects 3-D solver initial guess and only if using ExactConserv, |
| 2481 |
|
but tests did show a degradation of solver convergence. For this reason, |
| 2482 |
|
decide to disable this piece of code. |
| 2483 |
|
to recover previous version, just set zeroPsNH = exactConserv (line 78). |
| 2484 |
|
Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW |
| 2485 |
|
o pkg/ggl90: |
| 2486 |
|
- fix previous modif (unfortunatly has not been documented here). |
| 2487 |
|
o pkg/seaice/autodiff: |
| 2488 |
|
- add CPP flag to include clipping of zeta in EVP code; |
| 2489 |
|
although clipping of zeta is not necessary for EVP and not recommended |
| 2490 |
|
it was done by default, now clipping is disabled by default |
| 2491 |
|
- modify computation and store zetaC/Z in seaice_evp for TAF |
| 2492 |
|
- add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default) |
| 2493 |
|
- change seaice_calc_viscosities/strainrates for better |
| 2494 |
|
vectorization after AD by TAF |
| 2495 |
|
- rearrange common blocks in SEAICE.h once again for easier dumps of |
| 2496 |
|
adjoint output, adjust adcommon.h and g_common.h |
| 2497 |
|
- change flux form of default advection scheme for better vectorization |
| 2498 |
|
of adjoint code |
| 2499 |
|
- modify lab_sea/input.lsr to test the flux form of default advection |
| 2500 |
|
scheme |
| 2501 |
|
o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level |
| 2502 |
|
transition in checkpoint61r) |
| 2503 |
|
|
| 2504 |
|
checkpoint61x (2009/10/19) |
| 2505 |
|
o adjoint: adding two new verification experiments |
| 2506 |
|
* tutorial_global_biogeo: an online dic sensitivity experiment |
| 2507 |
|
(work with G. Forget) |
| 2508 |
|
* tutorial_dic_adjoffline: an offline dic sensitivity experiment |
| 2509 |
|
(an update of the Dutkiewicz et al., 2006 paper) |
| 2510 |
|
Both use the same CO2FLUX cost function, but different controls |
| 2511 |
|
Gradient checks look good, but some recomp. could still be traightened out |
| 2512 |
|
Should add xx_dic control variable to test at some point |
| 2513 |
|
o model/src: |
| 2514 |
|
add run-time parameters to check and/or mask initial Temp & Salt |
| 2515 |
|
o pkg/ptracers: |
| 2516 |
|
apply zonal filter (if used) to all passive tracers |
| 2517 |
|
|
| 2518 |
|
checkpoint61w (2009/10/12) |
| 2519 |
|
o adjoint: |
| 2520 |
|
* update and finish work on adjoint of dic package (G. Forget) |
| 2521 |
|
* start adjoint of offline package |
| 2522 |
|
* bug fix for cube-sphere TLM code (active_file_g.F) |
| 2523 |
|
o tutorial_global_oce_optim: |
| 2524 |
|
now tested with 4 tiles (change data.grdchk and update output_adm.txt) |
| 2525 |
|
and add SIZE.h_mpi for MPI testing |
| 2526 |
|
o pkg autodiff |
| 2527 |
|
- fix bug in autodiff_restore |
| 2528 |
|
- make genmake2 remove comments and empty lines from ad_input_code.f in |
| 2529 |
|
order to reduce file size (new script file remove_comments_sed) |
| 2530 |
|
o allows to specify vertical profile of vertical viscosity (viscArNr) |
| 2531 |
|
o pkg autodiff |
| 2532 |
|
autodiff_ini_model_io: comment out writing of grid information to netcdf |
| 2533 |
|
files, because at this time the grid fields are a bunch of zeros |
| 2534 |
|
(this is analogous to ini_mnc_vars.F) |
| 2535 |
|
o pkg seaice/autodiff: |
| 2536 |
|
left-over from removing the 3-time-level fields: |
| 2537 |
|
- small rearrangement of common blocks (SEAICE.h) |
| 2538 |
|
- fix field declaration in order to get meaningful output in |
| 2539 |
|
adseaice.*.nc (adcommon.h) |
| 2540 |
|
o pkg obcs: |
| 2541 |
|
- go through NH code only if nonHydrostatic=T |
| 2542 |
|
- fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart) |
| 2543 |
|
- move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields |
| 2544 |
|
=> Update output of experiment seaice_obcs |
| 2545 |
|
- useOBCSbalance: code is wrong with multi-tile / proc: add a stop. |
| 2546 |
|
- fix NH+Orlanski restart (add wvel OBC value in pickup file) |
| 2547 |
|
- fix restart for useOBCSprescribe + useEXF |
| 2548 |
|
o pkg ctrl |
| 2549 |
|
- make obcs as control parameter work also with useSingleCPUio |
| 2550 |
|
- replace a few sny and snx by Ny and Nx to be consistent with |
| 2551 |
|
ctrl_set_globfld_x/yz.F |
| 2552 |
|
o pkg seaice |
| 2553 |
|
- re-introduce global field frWtrAtm for the case of |
| 2554 |
|
ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F) |
| 2555 |
|
- catch the case of an empty filename in seaice_cost_init_fixed.F |
| 2556 |
|
o pkg ecco: |
| 2557 |
|
- small bug fixes in the_main_loop |
| 2558 |
|
. fix order of monitor arguments |
| 2559 |
|
. change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY |
| 2560 |
|
. move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so |
| 2561 |
|
that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF |
| 2562 |
|
- replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the |
| 2563 |
|
imbalance diagnostics for wmean_h/sflux = 0 |
| 2564 |
|
- add actual values to f_obcsn/s/w/e in ecco_cost_final.F |
| 2565 |
|
- catch the case of empty filenames in ecco_cost_init_fixed.F |
| 2566 |
|
and ecco_readparms.F |
| 2567 |
|
- fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta) |
| 2568 |
|
to make this statement meaningfull in ecco_cost_weights.F |
| 2569 |
|
o pkg zonal_filt: |
| 2570 |
|
- change ZONAL_FILTER S/R interface (allows to filter 2-D fields) |
| 2571 |
|
- when using rStar, filter uVel*hFacW instead of uVel |
| 2572 |
|
(tested without topography: fix a Pb of growing instability with NLFS) |
| 2573 |
|
o pkg/aim/thsice: |
| 2574 |
|
-Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F |
| 2575 |
|
(works as SST restoring) |
| 2576 |
|
o pkg/thsice: |
| 2577 |
|
-add specific parameter for salt restoring in slab mixed-layer |
| 2578 |
|
(by default equal to the temperature restoring) |
| 2579 |
|
|
| 2580 |
|
checkpoint61v (2009/09/21) |
| 2581 |
|
o pkg/kpp: |
| 2582 |
|
-add double diffusive contributions as a hack, turned off by default |
| 2583 |
|
for now, and the code can be excluded with a CPP-flag |
| 2584 |
|
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX |
| 2585 |
|
-add a verification experiments to "vermix" to test this code |
| 2586 |
|
o pkg/mom_common: |
| 2587 |
|
Move computation of length scales to mom_init_fixed.F (avoid recomputation |
| 2588 |
|
at each time-steps*levels). |
| 2589 |
|
o pkg/layers: |
| 2590 |
|
Created a new package for computing volume fluxes in temperature or |
| 2591 |
|
[not yet implemented] density layers, e.g. for calculating residual |
| 2592 |
|
overturning circulations. |
| 2593 |
|
o pkg/diagnostics: |
| 2594 |
|
implement a RS type version for the set of DIAGNOSTICS-FILL subroutines |
| 2595 |
|
o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option) |
| 2596 |
|
o pkg/mdsio (& pkg/rw): rework high level S/R interface: |
| 2597 |
|
To avoid mixing type (RS/RL) of input/output array argument, |
| 2598 |
|
replace single mixed-type array with a pair from each type (RS/RL). |
| 2599 |
|
o setting pickupSuff force to start from a pickup (even if nIter0=0): this |
| 2600 |
|
is now implemented for all pkgs (previously only done for the main pickup) |
| 2601 |
|
|
| 2602 |
|
checkpoint61u (2009/08/25) |
| 2603 |
|
o pkg/obcs: |
| 2604 |
|
- change OB?eta from _RS to _RL and put them into a separate commen block |
| 2605 |
|
- add code to read OB?eta from a file via obcs_prescribe_read: the code |
| 2606 |
|
compiles and does not destroy any other experiments, the data is read |
| 2607 |
|
properly, but the code is not tested in actual applications |
| 2608 |
|
o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to |
| 2609 |
|
create a meaningful unit attribute for the time coordinate variable |
| 2610 |
|
o pkg/ebm: add plenty of missing "_d 0" ; |
| 2611 |
|
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
| 2612 |
|
Notes: several pieces of code only works for (very) specific set up |
| 2613 |
|
(domain size, lat range, etc ...); should be documented & stop if one |
| 2614 |
|
of those assumptions is not meet. |
| 2615 |
|
o pkg/seaice: add missing "_d 0" in HSNOW initialisation |
| 2616 |
|
update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests) |
| 2617 |
|
and offline_exf_seaice (seaicetd + adjoint). |
| 2618 |
|
o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC): |
| 2619 |
|
update results of experiments: lab_sea (4 fwd tests + 3 adjoint), |
| 2620 |
|
seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2). |
| 2621 |
|
o few changes to pass when compiling with strick checking of arguments |
| 2622 |
|
across S/R (allow to find few bugs in S/R calls). |
| 2623 |
|
o pkg/seaice: |
| 2624 |
|
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
| 2625 |
|
2d-fields, for slightly better performance |
| 2626 |
|
|
| 2627 |
|
checkpoint61t (2009/07/22) |
| 2628 |
|
o pkg/seaice: |
| 2629 |
|
- remove unused variables in seaice_evp |
| 2630 |
|
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
| 2631 |
|
o eeset_parms.F, open_copy_data_file.F & ini_parms.F: |
| 2632 |
|
named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT): |
| 2633 |
|
each processor opens a different file (a fix from Matt). |
| 2634 |
|
o cg2d: |
| 2635 |
|
use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F : |
| 2636 |
|
this reduces number of EXCH calls by 2 when using exch2. |
| 2637 |
|
For now, keep previous size array for gc2d_nsa.F to avoid Pb with store |
| 2638 |
|
directives and missing simple EXCH (exch_s3d_rx) adjoint code. |
| 2639 |
|
o pkg/thsice: |
| 2640 |
|
add code for Near Infra-Red albedo (from Jeff) |
| 2641 |
|
(turned on with run-time flag: thSIce_calc_albNIR, in data.ice). |
| 2642 |
|
o ini_model_io: |
| 2643 |
|
move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F |
| 2644 |
|
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
| 2645 |
|
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
| 2646 |
|
|
| 2647 |
|
checkpoint61s (2009/06/30) |
| 2648 |
|
o pkg/exch2 (exch2_rxN_cube*): |
| 2649 |
|
remove last BARRIER (no need to synchronise after getting data from shared |
| 2650 |
|
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
| 2651 |
|
o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH |
| 2652 |
|
and generate new output (for the 2 tests) using default rotationPeriod. |
| 2653 |
|
o pkg/exch2: |
| 2654 |
|
- always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F |
| 2655 |
|
(was already the case with AUTODIFF_EXCH2 defined) |
| 2656 |
|
- add bj in exch2 arrays and S/R. |
| 2657 |
|
- can now use pkg/exch2 for regular (non CS) set-up; switch test experiment |
| 2658 |
|
MLAdjust to exch2 (identical results except with MPI -> truncation diff); |
| 2659 |
|
o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep |
| 2660 |
|
- adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY |
| 2661 |
|
GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT |
| 2662 |
|
- verification experiment natl_box.longstep |
| 2663 |
o build_options: ifort+mpi_aces optfile (following Constantinos advise): |
o build_options: ifort+mpi_aces optfile (following Constantinos advise): |
| 2664 |
allow different versions of ifort (8 or 9) and different versions |
allow different versions of ifort (8 or 9) and different versions |
| 2665 |
of mpi (mpich or mpich2) to be used with the same optfile. |
of mpi (mpich or mpich2) to be used with the same optfile. |
| 2666 |
requires to load a netcdf module and set MPI_INC_DIR (see comments inside |
requires to load a netcdf module and set MPI_INC_DIR (see comments inside |
| 2667 |
optfile). Change testing scripts (example_scripts/ACESgrid) accordingly. |
optfile). Change testing scripts (example_scripts/ACESgrid) accordingly. |
| 2668 |
|
o pkg/seaice: |
| 2669 |
|
fix previous modif (3-level field removed) for old-pickup reading |
| 2670 |
|
|
| 2671 |
checkpoint61r |
checkpoint61r (2009/06/25) |
| 2672 |
o pkg/seaice: |
o pkg/seaice: |
| 2673 |
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
| 2674 |
1. introduce fields for time step (N-1) |
1. introduce fields for time step (N-1) |
| 2682 |
- adjusted adjoint accordingly; |
- adjusted adjoint accordingly; |
| 2683 |
gradient checks have improved by an order of magnitude! |
gradient checks have improved by an order of magnitude! |
| 2684 |
|
|
| 2685 |
checkpoint61q |
checkpoint61q (2009/06/22) |
| 2686 |
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
| 2687 |
- the boundary conditions along open boundaries are unclear, because the |
- the boundary conditions along open boundaries are unclear, because the |
| 2688 |
associated masks are set to zero and are thus treated as closed when |
associated masks are set to zero and are thus treated as closed when |
| 2707 |
- add diagnostics for surface temperature, atmospheric and oceanic |
- add diagnostics for surface temperature, atmospheric and oceanic |
| 2708 |
heat flux, and atmospheric and oceanic ice growth |
heat flux, and atmospheric and oceanic ice growth |
| 2709 |
|
|
| 2710 |
checkpoint61p |
checkpoint61p (2009/06/10) |
| 2711 |
o eesupp (global_max & global_sum): |
o eesupp (global_max & global_sum): |
| 2712 |
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
| 2713 |
- remove starting & endding barrier (no longer needed) |
- remove starting & endding barrier (no longer needed) |
| 2769 |
should be called before a "stop" if we know that all process are going |
should be called before a "stop" if we know that all process are going |
| 2770 |
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
| 2771 |
|
|
| 2772 |
checkpoint61o |
checkpoint61o (2009/05/26) |
| 2773 |
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
| 2774 |
o model/src/ini_curvilinear_grid.F: |
o model/src/ini_curvilinear_grid.F: |
| 2775 |
compute angleSin/CosC when they are not read from a file |
compute angleSin/CosC when they are not read from a file |
| 2810 |
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
| 2811 |
in utils/exch2/input. |
in utils/exch2/input. |
| 2812 |
|
|
| 2813 |
checkpoint61n |
checkpoint61n (2009/05/12) |
| 2814 |
o eesupp & mdsio (SingleCpuIO): |
o eesupp & mdsio (SingleCpuIO): |
| 2815 |
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
| 2816 |
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
| 2823 |
when using exch2. Add S/R to map global io-buffer to global model array. |
when using exch2. Add S/R to map global io-buffer to global model array. |
| 2824 |
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
| 2825 |
|
|
| 2826 |
checkpoint61m |
checkpoint61m (2009/04/29) |
| 2827 |
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
| 2828 |
and add 3 other S/R for other types (R4,R8,RS). |
and add 3 other S/R for other types (R4,R8,RS). |
| 2829 |
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
| 2859 |
and keep the original tile numbering. Note: compatible with old |
and keep the original tile numbering. Note: compatible with old |
| 2860 |
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
| 2861 |
|
|
| 2862 |
checkpoint61l |
checkpoint61l (2009/04/07) |
| 2863 |
o Overlaps had been forgotten in calculating ijk keys : fixed |
o Overlaps had been forgotten in calculating ijk keys : fixed |
| 2864 |
o fix cyrus makedepend for gcc 4.4 |
o fix cyrus makedepend for gcc 4.4 |
| 2865 |
o experiment fizhi-cs-aqualev20: |
o experiment fizhi-cs-aqualev20: |
| 2907 |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
| 2908 |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
- seaice_growth: replace computation of UG by a simple copy from wspeed |
| 2909 |
|
|
| 2910 |
checkpoint61k |
checkpoint61k (2009/03/18) |
| 2911 |
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
| 2912 |
seaice_lsr: fixed a few metric terms, |
seaice_lsr: fixed a few metric terms, |
| 2913 |
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
| 2924 |
updated all relevant verification experiments (except lab_sea//output_adm.txt |
updated all relevant verification experiments (except lab_sea//output_adm.txt |
| 2925 |
which was left over, but fails at level 7 & 6) |
which was left over, but fails at level 7 & 6) |
| 2926 |
|
|
| 2927 |
checkpoint61j |
checkpoint61j (2009/03/17) |
| 2928 |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
o pkg/seaice: turn a few hard wired parameters into run time parameters |
| 2929 |
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
| 2930 |
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
| 2952 |
TAF store directivs "byte" and "kind" seem equivalent; |
TAF store directivs "byte" and "kind" seem equivalent; |
| 2953 |
Most tamc.h have been updated correspondingly. |
Most tamc.h have been updated correspondingly. |
| 2954 |
|
|
| 2955 |
checkpoint61i |
checkpoint61i (2009/02/13) |
| 2956 |
o autodiff: |
o autodiff: |
| 2957 |
fix autodiff_sore/_restore indices for obcs |
fix autodiff_sore/_restore indices for obcs |
| 2958 |
(spotted by I. Hoteit, M. Mazloff) |
(spotted by I. Hoteit, M. Mazloff) |
| 2987 |
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
| 2988 |
(maintain temporary backward compatibility, until next checkpoint) |
(maintain temporary backward compatibility, until next checkpoint) |
| 2989 |
|
|
| 2990 |
checkpoint61h |
checkpoint61h (2009/01/27) |
| 2991 |
o pkg/diagnostics with "periodic averaging diagnostics": |
o pkg/diagnostics with "periodic averaging diagnostics": |
| 2992 |
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
| 2993 |
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
| 3011 |
(drop to 4 digits matching for grad). But this test does not look very |
(drop to 4 digits matching for grad). But this test does not look very |
| 3012 |
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
| 3013 |
|
|
| 3014 |
checkpoint61g |
checkpoint61g (2008/12/29) |
| 3015 |
o pkg/flt: |
o pkg/flt: |
| 3016 |
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
| 3017 |
+ make OPTIONS file more standard. |
+ make OPTIONS file more standard. |
| 3024 |
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
| 3025 |
a still unfixed compiler/optimization bug |
a still unfixed compiler/optimization bug |
| 3026 |
|
|
| 3027 |
checkpoint61f |
checkpoint61f (2008/11/21) |
| 3028 |
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
| 3029 |
update results of global_ocean.cs32x15.icedyn test. |
update results of global_ocean.cs32x15.icedyn test. |
| 3030 |
o move getcon.F from model/src to pkg/fizhi. |
o move getcon.F from model/src to pkg/fizhi. |
| 3053 |
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
| 3054 |
(generate new output). |
(generate new output). |
| 3055 |
|
|
| 3056 |
checkpoint61e |
checkpoint61e (2008/10/23) |
| 3057 |
o gmredi (Visbeck-variable-K): |
o gmredi (Visbeck-variable-K): |
| 3058 |
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
| 3059 |
- change computation of Visbeck-K where Slope > Smax : |
- change computation of Visbeck-K where Slope > Smax : |
| 3078 |
scale in ggl90_calc.F |
scale in ggl90_calc.F |
| 3079 |
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
| 3080 |
|
|
| 3081 |
checkpoint61d |
checkpoint61d (2008/09/25) |
| 3082 |
o adjoint modifs |
o adjoint modifs |
| 3083 |
- adapt to new field rhoInSitu |
- adapt to new field rhoInSitu |
| 3084 |
- allow to revert from StoreDynVars2D, StoreDynVars3D |
- allow to revert from StoreDynVars2D, StoreDynVars3D |
| 3105 |
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
| 3106 |
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
| 3107 |
|
|
| 3108 |
checkpoint61c |
checkpoint61c (2008/08/30) |
| 3109 |
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
| 3110 |
to add mass source/sink of fluid in the interior (3-D generalisation |
to add mass source/sink of fluid in the interior (3-D generalisation |
| 3111 |
of oceanic real-fresh water flux). |
of oceanic real-fresh water flux). |
| 3123 |
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
| 3124 |
o new pkg: cheapaml |
o new pkg: cheapaml |
| 3125 |
|
|
| 3126 |
checkpoint61b |
checkpoint61b (2008/08/05) |
| 3127 |
o exch2: |
o exch2: |
| 3128 |
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
| 3129 |
- no longer depend on the order sequence (N,S,E,W). |
- no longer depend on the order sequence (N,S,E,W). |
| 3138 |
more intuitive this way) ; rename/remove some variables. |
more intuitive this way) ; rename/remove some variables. |
| 3139 |
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
| 3140 |
|
|
| 3141 |
checkpoint61a |
checkpoint61a (2008/07/29) |
| 3142 |
o exch2/matlab-topology-generator: |
o exch2/matlab-topology-generator: |
| 3143 |
fix bug in index bounds for N-S internal exchange (hard to tell if this |
fix bug in index bounds for N-S internal exchange (hard to tell if this |
| 3144 |
had any effect on the solution). |
had any effect on the solution). |
| 3147 |
o testreport: modify syntax of awk, so that it works also with |
o testreport: modify syntax of awk, so that it works also with |
| 3148 |
awk, and not only with nawk and gawk |
awk, and not only with nawk and gawk |
| 3149 |
|
|
| 3150 |
checkpoint61 |
checkpoint61 (2008/06/24) |
| 3151 |
o autodiff |
o autodiff |
| 3152 |
Change default for TAF usage by removing argument '-nonew_arg' |
Change default for TAF usage by removing argument '-nonew_arg' |
| 3153 |
This changes TAF subroutine argument list (ordering of active var.) |
This changes TAF subroutine argument list (ordering of active var.) |
| 3158 |
Tested TAF version is 1.9.22 |
Tested TAF version is 1.9.22 |
| 3159 |
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
| 3160 |
|
|
| 3161 |
checkpoint60 |
checkpoint60 (2008/06/19) |
| 3162 |
--->>> This is the last checkpoint for which generating the adjoint |
--->>> This is the last checkpoint for which generating the adjoint |
| 3163 |
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
| 3164 |
--->>> by default. |
--->>> by default. |
| 3183 |
The key modifications are in model/src/taueddy_external_forcing.F |
The key modifications are in model/src/taueddy_external_forcing.F |
| 3184 |
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
| 3185 |
|
|
| 3186 |
checkpoint59r |
checkpoint59r (2008/05/29) |
| 3187 |
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
| 3188 |
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
| 3189 |
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
| 3214 |
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
| 3215 |
and requires a fortran 90 compiler |
and requires a fortran 90 compiler |
| 3216 |
|
|
| 3217 |
checkpoint59q |
checkpoint59q (2008/05/06) |
| 3218 |
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
| 3219 |
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
| 3220 |
o Refresh tutorial_global_oce_biogeo, notably: |
o Refresh tutorial_global_oce_biogeo, notably: |
| 3249 |
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
| 3250 |
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
| 3251 |
|
|
| 3252 |
checkpoint59p |
checkpoint59p (2008/04/10) |
| 3253 |
o gchem / dic / cfc : |
o gchem / dic / cfc : |
| 3254 |
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
| 3255 |
- add new parameter files: "data.dic" & "data.cfc" ; |
- add new parameter files: "data.dic" & "data.cfc" ; |
| 3275 |
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
| 3276 |
also fix diagnostics VISCAHW & VISCA4W. |
also fix diagnostics VISCAHW & VISCA4W. |
| 3277 |
|
|
| 3278 |
checkpoint59o |
checkpoint59o (2008/03/07) |
| 3279 |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
| 3280 |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
| 3281 |
move a few statemens out the main loop into separate loops |
move a few statemens out the main loop into separate loops |
| 3316 |
introducing a generic routine (ctrl_map_ini_gen.F). |
introducing a generic routine (ctrl_map_ini_gen.F). |
| 3317 |
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
| 3318 |
|
|
| 3319 |
checkpoint59n |
checkpoint59n (2008/02/09) |
| 3320 |
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
| 3321 |
number in dedicate array "hdiag": |
number in dedicate array "hdiag": |
| 3322 |
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
| 3370 |
for now this is only available for the C-grid code and also within |
for now this is only available for the C-grid code and also within |
| 3371 |
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
| 3372 |
|
|
| 3373 |
checkpoint59m |
checkpoint59m (2008/01/14) |
| 3374 |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
| 3375 |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
| 3376 |
o gad_som : fix flux output (& diagnostics) to have same units as other |
o gad_som : fix flux output (& diagnostics) to have same units as other |
| 3388 |
o pkg/salt_plume: added various options for salt plume depth |
o pkg/salt_plume: added various options for salt plume depth |
| 3389 |
criterion and for vertical distribution of the salt |
criterion and for vertical distribution of the salt |
| 3390 |
|
|
| 3391 |
checkpoint59l |
checkpoint59l (2007/12/18) |
| 3392 |
o pkg/ptracers: new version of ptracers pickup: |
o pkg/ptracers: new version of ptracers pickup: |
| 3393 |
read meta file and write only fields which are needed to restart. |
read meta file and write only fields which are needed to restart. |
| 3394 |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 3410 |
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
| 3411 |
or U/VICE from U/VWIND before computing U/VSTRESS |
or U/VICE from U/VWIND before computing U/VSTRESS |
| 3412 |
|
|
| 3413 |
checkpoint59k |
checkpoint59k (2007/11/30) |
| 3414 |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
| 3415 |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
| 3416 |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
| 3432 |
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
| 3433 |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
| 3434 |
|
|
| 3435 |
checkpoint59j |
checkpoint59j (2007/11/09) |
| 3436 |
o in pkgs: dic, obcs, offline, rbcs: |
o in pkgs: dic, obcs, offline, rbcs: |
| 3437 |
standard way to compute coeff. for time interpolation between 2 time reccords |
standard way to compute coeff. for time interpolation between 2 time reccords |
| 3438 |
which retains full precision (& make results less dependent on compiler). |
which retains full precision (& make results less dependent on compiler). |
| 3475 |
o added open boundary conditions capability for seaice |
o added open boundary conditions capability for seaice |
| 3476 |
HSNOW, HSALT, UICE, and VICE |
HSNOW, HSALT, UICE, and VICE |
| 3477 |
|
|
| 3478 |
checkpoint59i |
checkpoint59i (2007/10/21) |
| 3479 |
o adjoint: |
o adjoint: |
| 3480 |
* fix multiDimAdvection adjoint |
* fix multiDimAdvection adjoint |
| 3481 |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
| 3516 |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
| 3517 |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
| 3518 |
|
|
| 3519 |
checkpoint59h |
checkpoint59h (2007/09/29) |
| 3520 |
o pkg/exf: |
o pkg/exf: |
| 3521 |
- improve vectorization by moving if-statement out of loops in |
- improve vectorization by moving if-statement out of loops in |
| 3522 |
exf_mapfields, exf_radiation |
exf_mapfields, exf_radiation |
| 3549 |
o testreport: change AD testing : check against results/output_adm.txt |
o testreport: change AD testing : check against results/output_adm.txt |
| 3550 |
using same scripts as for forward test. |
using same scripts as for forward test. |
| 3551 |
|
|
| 3552 |
checkpoint59g |
checkpoint59g (2007/09/17) |
| 3553 |
o adjoint testing: in preparation for changing testreport: |
o adjoint testing: in preparation for changing testreport: |
| 3554 |
- output format: cost and grad written on separated lines |
- output format: cost and grad written on separated lines |
| 3555 |
- ad output results in directory "results" (instead of "results_ad") |
- ad output results in directory "results" (instead of "results_ad") |
| 3594 |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
| 3595 |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
| 3596 |
|
|
| 3597 |
checkpoint59f |
checkpoint59f (2007/08/21) |
| 3598 |
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
| 3599 |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
| 3600 |
a bounded range (in forward mode) |
a bounded range (in forward mode) |
| 3625 |
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
| 3626 |
output of global_ocean.cs32x15.thsice . |
output of global_ocean.cs32x15.thsice . |
| 3627 |
|
|
| 3628 |
checkpoint59e |
checkpoint59e (2007/07/26) |
| 3629 |
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
| 3630 |
for B-grid vector (not yet tested) and C-grid vector (<- only used |
for B-grid vector (not yet tested) and C-grid vector (<- only used |
| 3631 |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
| 3655 |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
| 3656 |
* applied OBCS T/S mask to HEFFM sea ice mask |
* applied OBCS T/S mask to HEFFM sea ice mask |
| 3657 |
|
|
| 3658 |
checkpoint59d |
checkpoint59d (2007/06/21) |
| 3659 |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
| 3660 |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
| 3661 |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
| 3701 |
It is turned off by default (=-1.), because it changes the results. |
It is turned off by default (=-1.), because it changes the results. |
| 3702 |
- make it possible to read AREA from a file, too. |
- make it possible to read AREA from a file, too. |
| 3703 |
|
|
| 3704 |
checkpoint59c |
checkpoint59c (2007/06/04) |
| 3705 |
o add S/R and diagnostics for oceanic mixed-layer depth |
o add S/R and diagnostics for oceanic mixed-layer depth |
| 3706 |
o move GMRedi call after all vertical mixing schemes (including KPP) |
o move GMRedi call after all vertical mixing schemes (including KPP) |
| 3707 |
o pkg/thsice: |
o pkg/thsice: |
| 3734 |
Storing is now bundled into large arrays to optimized I/O |
Storing is now bundled into large arrays to optimized I/O |
| 3735 |
(and second step in cleanup of the_main_loop) |
(and second step in cleanup of the_main_loop) |
| 3736 |
|
|
| 3737 |
checkpoint59b |
checkpoint59b (2007/05/16) |
| 3738 |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
| 3739 |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
- export/import (between ocean & coupler) fields needed for ocean DIC. |
| 3740 |
o pkg/seaice: |
o pkg/seaice: |
| 3805 |
o OpenAD |
o OpenAD |
| 3806 |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
| 3807 |
|
|
| 3808 |
checkpoint59a |
checkpoint59a (2007/05/01) |
| 3809 |
o pkg/seaice: some parameter clarifications and a little bit of clean up |
o pkg/seaice: some parameter clarifications and a little bit of clean up |
| 3810 |
o pkg/thsice: rename run-time parameters: |
o pkg/thsice: rename run-time parameters: |
| 3811 |
himin -> hIceMin |
himin -> hIceMin |
| 3847 |
o pkg/kpp: add code to have mixing in shelf ice caverns |
o pkg/kpp: add code to have mixing in shelf ice caverns |
| 3848 |
- add myThid to all kpp routines (long overdue) |
- add myThid to all kpp routines (long overdue) |
| 3849 |
|
|
| 3850 |
checkpoint59 |
checkpoint59 (2007/04/19) |
| 3851 |
o pkg/exf: |
o pkg/exf: |
| 3852 |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
| 3853 |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
| 3873 |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
- 2nd set of modifs for thsice adjoint in conjunction with exf |
| 3874 |
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
| 3875 |
|
|
| 3876 |
checkpoint58y_post |
checkpoint58y_post (2007/04/15) |
| 3877 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
| 3878 |
vertical diffusivity, similar to that in MOM4; turned on using |
vertical diffusivity, similar to that in MOM4; turned on using |
| 3879 |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
| 3889 |
- better when using non-linear advection scheme (not yet fully tested) |
- better when using non-linear advection scheme (not yet fully tested) |
| 3890 |
- can also be used in atmospheric set-up (for now, only the diffusion). |
- can also be used in atmospheric set-up (for now, only the diffusion). |
| 3891 |
|
|
| 3892 |
checkpoint58x_post |
checkpoint58x_post (2007/04/04) |
| 3893 |
o IO option for global-file compact format: |
o IO option for global-file compact format: |
| 3894 |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
- add options when generating topology (utils/exch2/matlab-topology-generator) |
| 3895 |
- add I/O capability (pkg/mdsio). |
- add I/O capability (pkg/mdsio). |
| 3897 |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
for now long-line format not yet supported by pkg/mdsio (& exch2). |
| 3898 |
o shelfice: add a few diagnostics |
o shelfice: add a few diagnostics |
| 3899 |
|
|
| 3900 |
checkpoint58w_post |
checkpoint58w_post (2007/03/13) |
| 3901 |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
| 3902 |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
| 3903 |
(and replace horiVertRatio in NH code). |
(and replace horiVertRatio in NH code). |
| 3918 |
o move call to cal_readparms up to make calendar parameters/variable available |
o move call to cal_readparms up to make calendar parameters/variable available |
| 3919 |
to all packages |
to all packages |
| 3920 |
|
|
| 3921 |
checkpoint58v_post |
checkpoint58v_post (2007/02/08) |
| 3922 |
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
| 3923 |
useDynP_inEos_Zc tested. |
useDynP_inEos_Zc tested. |
| 3924 |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
| 3937 |
- use this scheme for temperature & salinity in 2 advection test exp.: |
- use this scheme for temperature & salinity in 2 advection test exp.: |
| 3938 |
advect_xy & advect_xz, respectively. |
advect_xy & advect_xz, respectively. |
| 3939 |
|
|
| 3940 |
checkpoint58u_post |
checkpoint58u_post (2007/01/12) |
| 3941 |
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
| 3942 |
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
| 3943 |
o testreport: add option "-skipdir" to skip some test. |
o testreport: add option "-skipdir" to skip some test. |
| 3952 |
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
| 3953 |
o pkg/thsice: fix reading mnc-pickups |
o pkg/thsice: fix reading mnc-pickups |
| 3954 |
|
|
| 3955 |
checkpoint58t_post |
checkpoint58t_post (2006/12/30) |
| 3956 |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
| 3957 |
o pkg/mdsio: |
o pkg/mdsio: |
| 3958 |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
| 3995 |
- introduce a few local fields to avoid modifying external fields such |
- introduce a few local fields to avoid modifying external fields such |
| 3996 |
as atemp, etc. |
as atemp, etc. |
| 3997 |
|
|
| 3998 |
checkpoint58s_post |
checkpoint58s_post (2006/12/11) |
| 3999 |
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
| 4000 |
changed exf_set_gen.F so that |
changed exf_set_gen.F so that |
| 4001 |
genperiod=0 means input file is one time-constant field and |
genperiod=0 means input file is one time-constant field and |
| 4029 |
as actual snow thickness. It now refers everywhere to effective snow |
as actual snow thickness. It now refers everywhere to effective snow |
| 4030 |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
| 4031 |
|
|
| 4032 |
checkpoint58r_post |
checkpoint58r_post (2006/11/17) |
| 4033 |
o modifications to pkg/seaice/growth.F, which change results of |
o modifications to pkg/seaice/growth.F, which change results of |
| 4034 |
lab_sea experiment: fixes pertain to melting snow over open water, to |
lab_sea experiment: fixes pertain to melting snow over open water, to |
| 4035 |
masking EVAP under sea ice, and to using the correct AREA variable for |
masking EVAP under sea ice, and to using the correct AREA variable for |
| 4053 |
o ctrl: adding new control variables: |
o ctrl: adding new control variables: |
| 4054 |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
lwflux, lwdown, evap, snowprecip, apressure, runoff |
| 4055 |
|
|
| 4056 |
checkpoint58q_post |
checkpoint58q_post (2006/10/20) |
| 4057 |
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
| 4058 |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
| 4059 |
high_res_cube configuration by 4% on Columbia. |
high_res_cube configuration by 4% on Columbia. |
| 4064 |
single CPU io) so that TAF does not have to see EESUPPORT.h |
single CPU io) so that TAF does not have to see EESUPPORT.h |
| 4065 |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
| 4066 |
|
|
| 4067 |
checkpoint58p_post |
checkpoint58p_post (2006/09/08) |
| 4068 |
o obcs: stop if obcs is used with useCDscheme = .true. |
o obcs: stop if obcs is used with useCDscheme = .true. |
| 4069 |
o shelfice: |
o shelfice: |
| 4070 |
- fix a sign error so that no slip at shelfice interface works |
- fix a sign error so that no slip at shelfice interface works |
| 4075 |
o added adjoint exch routined for all exch*3d* routines |
o added adjoint exch routined for all exch*3d* routines |
| 4076 |
and updated flow directives |
and updated flow directives |
| 4077 |
|
|
| 4078 |
checkpoint58o_post |
checkpoint58o_post (2006/08/28) |
| 4079 |
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
| 4080 |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
| 4081 |
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
| 4089 |
- add a simple boundary layer scheme to reduce noise |
- add a simple boundary layer scheme to reduce noise |
| 4090 |
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
| 4091 |
|
|
| 4092 |
checkpoint58n_post |
checkpoint58n_post (2006/08/14) |
| 4093 |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
| 4094 |
local variable (not in common block). |
local variable (not in common block). |
| 4095 |
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
| 4110 |
and stop cleanly when MAX_NO_THREADS is too small. |
and stop cleanly when MAX_NO_THREADS is too small. |
| 4111 |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
| 4112 |
|
|
| 4113 |
checkpoint58m_post |
checkpoint58m_post (2006/07/17) |
| 4114 |
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
| 4115 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
| 4116 |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
| 4136 |
update rotating_tank results, but not plume_on_slope (affected at |
update rotating_tank results, but not plume_on_slope (affected at |
| 4137 |
truncation level, 11 digits). |
truncation level, 11 digits). |
| 4138 |
|
|
| 4139 |
checkpoint58l_post |
checkpoint58l_post (2006/07/12) |
| 4140 |
o calc_gw: |
o calc_gw: |
| 4141 |
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
| 4142 |
- remove side-drag for now (need to fix it); update plume_on_slope results. |
- remove side-drag for now (need to fix it); update plume_on_slope results. |
| 4154 |
o pkg/rbcs |
o pkg/rbcs |
| 4155 |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
| 4156 |
|
|
| 4157 |
checkpoint58k_post |
checkpoint58k_post (2006/07/06) |
| 4158 |
o testreport: |
o testreport: |
| 4159 |
- always build in dir. "build" (if not there, mkdir build instead of building |
- always build in dir. "build" (if not there, mkdir build instead of building |
| 4160 |
& running in input) |
& running in input) |
| 4187 |
advection subroutine (but still not used within DST advection S/R) |
advection subroutine (but still not used within DST advection S/R) |
| 4188 |
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
| 4189 |
|
|
| 4190 |
checkpoint58j_post |
checkpoint58j_post (2006/06/15) |
| 4191 |
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
| 4192 |
from file (collects calls previously in FORWARD_STEP) |
from file (collects calls previously in FORWARD_STEP) |
| 4193 |
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
| 4195 |
o genmake2 |
o genmake2 |
| 4196 |
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
| 4197 |
|
|
| 4198 |
checkpoint58i_post |
checkpoint58i_post (2006/06/14) |
| 4199 |
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
| 4200 |
on wind stress (SEAICEstressFactor defaults to 1.) |
on wind stress (SEAICEstressFactor defaults to 1.) |
| 4201 |
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
| 4209 |
non-EVP pickup files when using SEAICEuseEVP |
non-EVP pickup files when using SEAICEuseEVP |
| 4210 |
- fix sign error in diffusion in seaice_calc_rhs |
- fix sign error in diffusion in seaice_calc_rhs |
| 4211 |
|
|
| 4212 |
checkpoint58h_post |
checkpoint58h_post (2006/06/07) |
| 4213 |
* Modifications for bottom topography control |
* Modifications for bottom topography control |
| 4214 |
o replace hFacC by _hFacC at various places |
o replace hFacC by _hFacC at various places |
| 4215 |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
| 4219 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
| 4220 |
* Adding verification for 5x5 box (4-layer) bottom topography control |
* Adding verification for 5x5 box (4-layer) bottom topography control |
| 4221 |
|
|
| 4222 |
checkpoint58g_post |
checkpoint58g_post (2006/06/07) |
| 4223 |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
| 4224 |
used for mean seasonal cycle, mean diurnal cycle); add an example |
used for mean seasonal cycle, mean diurnal cycle); add an example |
| 4225 |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
| 4235 |
o pkg/seaice |
o pkg/seaice |
| 4236 |
- make (default) second order advection a bit less confusing? |
- make (default) second order advection a bit less confusing? |
| 4237 |
|
|
| 4238 |
checkpoint58f_post |
checkpoint58f_post (2006/06/05) |
| 4239 |
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
| 4240 |
to pkg/seaice): |
to pkg/seaice): |
| 4241 |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
- new routines thsice_map_exf and thsice_get_exf provide the interface |
| 4266 |
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
| 4267 |
testreport accordingly |
testreport accordingly |
| 4268 |
|
|
| 4269 |
checkpoint58e_post |
checkpoint58e_post (2006/05/17) |
| 4270 |
o SEAICE_CGRID adjoint done |
o SEAICE_CGRID adjoint done |
| 4271 |
o R_STAR adjoint implemented. |
o R_STAR adjoint implemented. |
| 4272 |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
| 4274 |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
| 4275 |
to be able to use it in pure forward. |
to be able to use it in pure forward. |
| 4276 |
|
|
| 4277 |
checkpoint58d_post |
checkpoint58d_post (2006/04/21) |
| 4278 |
o upgrade simple test-experiment to tutorial example: |
o upgrade simple test-experiment to tutorial example: |
| 4279 |
step.1: duplicate the experiment and (step.2) will remove the old copy. |
step.1: duplicate the experiment and (step.2) will remove the old copy. |
| 4280 |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
| 4314 |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
| 4315 |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
| 4316 |
|
|
| 4317 |
checkpoint58c_post |
checkpoint58c_post (2006/03/23) |
| 4318 |
o adjoint: finish NLFS adjoint and provide reference output in |
o adjoint: finish NLFS adjoint and provide reference output in |
| 4319 |
verification/global_ocean.90x40x15/results_ad_nlfs |
verification/global_ocean.90x40x15/results_ad_nlfs |
| 4320 |
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
| 4348 |
+ move computation of the viscosities eta and zeta into a new separate |
+ move computation of the viscosities eta and zeta into a new separate |
| 4349 |
routine (because I need to recompute them in seaice_ocean_stress.F) |
routine (because I need to recompute them in seaice_ocean_stress.F) |
| 4350 |
|
|
| 4351 |
checkpoint58b_post |
checkpoint58b_post (2006/03/13) |
| 4352 |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
| 4353 |
update output.txt of exp. aim.5l_cs.thSI |
update output.txt of exp. aim.5l_cs.thSI |
| 4354 |
o various mnc cleanups and improvements: |
o various mnc cleanups and improvements: |
| 4411 |
(turn on with SEAICEuseFluxForm) |
(turn on with SEAICEuseFluxForm) |
| 4412 |
- replace 1 in 3d global fields by kSurface in growth.F |
- replace 1 in 3d global fields by kSurface in growth.F |
| 4413 |
|
|
| 4414 |
checkpoint58a_post |
checkpoint58a_post (2006/02/13) |
| 4415 |
o seaice: |
o seaice: |
| 4416 |
- bug fix in advect.F |
- bug fix in advect.F |
| 4417 |
o shelfice: |
o shelfice: |
| 4464 |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
| 4465 |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
| 4466 |
|
|
| 4467 |
checkpoint58 |
checkpoint58 (2006/01/12) |
| 4468 |
o add "--embed-source" option to genmake2 which, when the supporting |
o add "--embed-source" option to genmake2 which, when the supporting |
| 4469 |
tools can be compiled (as determined by genmake2) will turn on the |
tools can be compiled (as determined by genmake2) will turn on the |
| 4470 |
embed_files package which then embeds the entire MITgcm source code |
embed_files package which then embeds the entire MITgcm source code |
| 4477 |
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
| 4478 |
* Thanks to Tom Haine for testing! |
* Thanks to Tom Haine for testing! |
| 4479 |
|
|
| 4480 |
checkpoint57z_post |
checkpoint57z_post (2005/12/31) |
| 4481 |
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
| 4482 |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
| 4483 |
o fix the pickup behavior for obcs in combination with ptracers |
o fix the pickup behavior for obcs in combination with ptracers |
| 4508 |
* Absolute scale somewhat unclear so far |
* Absolute scale somewhat unclear so far |
| 4509 |
* no area weighting was included since no other cost term does so far |
* no area weighting was included since no other cost term does so far |
| 4510 |
|
|
| 4511 |
checkpoint57y_post |
checkpoint57y_post (2005/12/08) |
| 4512 |
First step for a NLFS adjoint |
First step for a NLFS adjoint |
| 4513 |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
| 4514 |
o new init. routines for calc_r_star, calc_surf_dr |
o new init. routines for calc_r_star, calc_surf_dr |
| 4515 |
o still need to deal with ini_masks_etc |
o still need to deal with ini_masks_etc |
| 4516 |
o testreport seemed happy |
o testreport seemed happy |
| 4517 |
checkpoint57y_pre |
checkpoint57y_pre (2005/12/08) |
| 4518 |
|
|
| 4519 |
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
| 4520 |
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
| 4523 |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
| 4524 |
be in GCHEM_OPTIONS). |
be in GCHEM_OPTIONS). |
| 4525 |
|
|
| 4526 |
checkpoint57x_post |
checkpoint57x_post (2005/12/04) |
| 4527 |
o fix testreport Pb in multiple test experiment. |
o fix testreport Pb in multiple test experiment. |
| 4528 |
o cleanup our namelist syntax in verification: |
o cleanup our namelist syntax in verification: |
| 4529 |
- make it more F95 standards compliant (some work still needed) |
- make it more F95 standards compliant (some work still needed) |
| 4543 |
(there are a number of extensive recomputations) |
(there are a number of extensive recomputations) |
| 4544 |
* Initialize certain variables needed for adjoint |
* Initialize certain variables needed for adjoint |
| 4545 |
|
|
| 4546 |
checkpoint57w_post |
checkpoint57w_post (2005/11/03) |
| 4547 |
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
| 4548 |
fix the singleCpuIO RS version of MDSWRITEFIELD |
fix the singleCpuIO RS version of MDSWRITEFIELD |
| 4549 |
and add a WARNING if using globalFiles=T with multi-processors. |
and add a WARNING if using globalFiles=T with multi-processors. |
| 4560 |
ptracers in a large domain with a constant non-zero value. Also, |
ptracers in a large domain with a constant non-zero value. Also, |
| 4561 |
untangle ptracers_init.F a little. |
untangle ptracers_init.F a little. |
| 4562 |
|
|
| 4563 |
checkpoint57v_post |
checkpoint57v_post (2005/10/13) |
| 4564 |
o change dome exp. to use variable viscosity in side-drag terms. |
o change dome exp. to use variable viscosity in side-drag terms. |
| 4565 |
o remove all the files from the cfc_offline test since they are now |
o remove all the files from the cfc_offline test since they are now |
| 4566 |
incorporated into tutorial_cfc_offline which has been producing |
incorporated into tutorial_cfc_offline which has been producing |
| 4601 |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
| 4602 |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
| 4603 |
|
|
| 4604 |
checkpoint57t_post |
checkpoint57t_post (2005/10/03) |
| 4605 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
| 4606 |
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
| 4607 |
same truncation, independent of the face number: affects affects several |
same truncation, independent of the face number: affects affects several |
| 4624 |
Suggested values of viscosity parameters found in mom_calc_visc. |
Suggested values of viscosity parameters found in mom_calc_visc. |
| 4625 |
Many new viscosity diagnostics available. |
Many new viscosity diagnostics available. |
| 4626 |
|
|
| 4627 |
checkpoint57s_post |
checkpoint57s_post (2005/09/20) |
| 4628 |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
| 4629 |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
correct numerous bugs in LeithD and Smagorinsky discretizations. |
| 4630 |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
| 4650 |
and works with both EXCH1 and EXCH2 (but needs more testing) |
and works with both EXCH1 and EXCH2 (but needs more testing) |
| 4651 |
- writing works for all verification test cases w/ g77 on Linux |
- writing works for all verification test cases w/ g77 on Linux |
| 4652 |
|
|
| 4653 |
checkpoint57r_post |
checkpoint57r_post (2005/09/07) |
| 4654 |
o make MNC variable initialization happen earlier |
o make MNC variable initialization happen earlier |
| 4655 |
o add diagnostics for (almost) each term of the momentum Eq. |
o add diagnostics for (almost) each term of the momentum Eq. |
| 4656 |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
| 4670 |
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
| 4671 |
(see README file) |
(see README file) |
| 4672 |
|
|
| 4673 |
checkpoint57q_post |
checkpoint57q_post (2005/08/19) |
| 4674 |
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
| 4675 |
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
| 4676 |
- bug was reported by Jean-Michel and Ian Fenty |
- bug was reported by Jean-Michel and Ian Fenty |
| 4687 |
* verification/OpenAD/code/ has necessary scripts and description; |
* verification/OpenAD/code/ has necessary scripts and description; |
| 4688 |
* converts, compiles and runs successfully; |
* converts, compiles and runs successfully; |
| 4689 |
|
|
| 4690 |
checkpoint57p_post |
checkpoint57p_post (2005/08/01) |
| 4691 |
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
| 4692 |
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
| 4693 |
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
| 4701 |
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
| 4702 |
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
| 4703 |
|
|
| 4704 |
checkpoint57o_post |
checkpoint57o_post (2005/07/30) |
| 4705 |
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
| 4706 |
(2) its ready to be documented during the 20050801 DocFest |
(2) its ready to be documented during the 20050801 DocFest |
| 4707 |
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
| 4710 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
| 4711 |
(worth another tag) |
(worth another tag) |
| 4712 |
|
|
| 4713 |
checkpoint57n_post |
checkpoint57n_post (2005/07/29) |
| 4714 |
o adding precip control xx_precip 32 |
o adding precip control xx_precip 32 |
| 4715 |
o adding swflux control xx_swflux 33 |
o adding swflux control xx_swflux 33 |
| 4716 |
o Replacing 10 forcing penalty cost routines by 1 generic. |
o Replacing 10 forcing penalty cost routines by 1 generic. |
| 4726 |
(applies in particular to tapelev I/O) |
(applies in particular to tapelev I/O) |
| 4727 |
o removed inefficient K-loop in all active_file*control*.F |
o removed inefficient K-loop in all active_file*control*.F |
| 4728 |
|
|
| 4729 |
checkpoint57m_post |
checkpoint57m_post (2005/07/28) |
| 4730 |
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
| 4731 |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
| 4732 |
o pkg/exch2: filling of face-corner halo regions is optional |
o pkg/exch2: filling of face-corner halo regions is optional |
| 4733 |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
| 4734 |
|
|
| 4735 |
checkpoint57l_post |
checkpoint57l_post (2005/07/14) |
| 4736 |
tag before updating tutorials (pre-release-2) |
tag before updating tutorials (pre-release-2) |
| 4737 |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
| 4738 |
for output and interpolation of input fields onto model grid) |
for output and interpolation of input fields onto model grid) |
| 4744 |
o add mnc output capability to diagnostics/diagstat and update |
o add mnc output capability to diagnostics/diagstat and update |
| 4745 |
our cvsignore files for the ACSII output generated |
our cvsignore files for the ACSII output generated |
| 4746 |
|
|
| 4747 |
checkpoint57k_post |
checkpoint57k_post (2005/07/02) |
| 4748 |
o lab_sea now uses diagnostics package and provides a suite of |
o lab_sea now uses diagnostics package and provides a suite of |
| 4749 |
new EXF diagnostics output. |
new EXF diagnostics output. |
| 4750 |
|
|
| 4751 |
checkpoint57j_post |
checkpoint57j_post (2005/06/30) |
| 4752 |
o exf |
o exf |
| 4753 |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
| 4754 |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
| 4778 |
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
| 4779 |
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
| 4780 |
|
|
| 4781 |
checkpoint57i_post |
checkpoint57i_post (2005/06/19) |
| 4782 |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
| 4783 |
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
| 4784 |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
| 4797 |
tested against monitor output (including land & thSIce) on various exp. |
tested against monitor output (including land & thSIce) on various exp. |
| 4798 |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
| 4799 |
|
|
| 4800 |
checkpoint57h_done |
checkpoint57h_done (2005/05/19) |
| 4801 |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
| 4802 |
data.diagnostics, data.gchem, data.ptracers) is done. |
data.diagnostics, data.gchem, data.ptracers) is done. |
| 4803 |
|
|
| 4806 |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
| 4807 |
and rename it: DIFFERENT_MULTIPLE |
and rename it: DIFFERENT_MULTIPLE |
| 4808 |
|
|
| 4809 |
checkpoint57h_post |
checkpoint57h_post (2005/05/14) |
| 4810 |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
| 4811 |
o pkg/diagnostics: change output frequency, now in seconds (instead |
o pkg/diagnostics: change output frequency, now in seconds (instead |
| 4812 |
of Nb of iterations). This requires to change data.diagnostics. |
of Nb of iterations). This requires to change data.diagnostics. |
| 4813 |
checkpoint57h_pre |
checkpoint57h_pre (2005/05/12) |
| 4814 |
|
|
| 4815 |
o in mnc, let the user create the output dir if both mnc_outdir_date |
o in mnc, let the user create the output dir if both mnc_outdir_date |
| 4816 |
and mnc_outdir_num are false |
and mnc_outdir_num are false |
| 4824 |
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
| 4825 |
not mnc -- this mistake was found by JMC and is now corrected |
not mnc -- this mistake was found by JMC and is now corrected |
| 4826 |
|
|
| 4827 |
checkpoint57g_post |
checkpoint57g_post (2005/04/15) |
| 4828 |
o add Adams-Bashforth 3rd Order time stepping: |
o add Adams-Bashforth 3rd Order time stepping: |
| 4829 |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
| 4830 |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
| 4831 |
checkpoint57g_pre |
checkpoint57g_pre (2005/04/15) |
| 4832 |
|
|
| 4833 |
o make lambda[Theta,Salt]ClimRelax spatially varying |
o make lambda[Theta,Salt]ClimRelax spatially varying |
| 4834 |
(default remains spatially uniform constant based on tau) |
(default remains spatially uniform constant based on tau) |
| 4838 |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
| 4839 |
(suggested by G. Forget) |
(suggested by G. Forget) |
| 4840 |
|
|
| 4841 |
checkpoint57f_post |
checkpoint57f_post (2005/04/06) |
| 4842 |
o add parameter "baseTime" = model base time = time at iteration zero |
o add parameter "baseTime" = model base time = time at iteration zero |
| 4843 |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
| 4844 |
account for baseTime shift |
account for baseTime shift |
| 4845 |
o move Coriolis arrays from PARAMS.h to GRID.h |
o move Coriolis arrays from PARAMS.h to GRID.h |
| 4846 |
checkpoint57f_pre |
checkpoint57f_pre (2005/04/06) |
| 4847 |
|
|
| 4848 |
o mnc-ifying the seaice package |
o mnc-ifying the seaice package |
| 4849 |
o introduced an alternative length scale calculation for use in the limiting |
o introduced an alternative length scale calculation for use in the limiting |
| 4864 |
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
| 4865 |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
| 4866 |
|
|
| 4867 |
checkpoint57e_post |
checkpoint57e_post (2005/02/28) |
| 4868 |
o Adding eddy stress controls a la Ferreira et al. |
o Adding eddy stress controls a la Ferreira et al. |
| 4869 |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
| 4870 |
|
|
| 4882 |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
| 4883 |
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
| 4884 |
|
|
| 4885 |
checkpoint57d_post |
checkpoint57d_post (2005/02/11) |
| 4886 |
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
| 4887 |
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
| 4888 |
output from the diagnostics package |
output from the diagnostics package |
| 4904 |
(note: still needs some work specially for snap-shot diagnostics) |
(note: still needs some work specially for snap-shot diagnostics) |
| 4905 |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
| 4906 |
|
|
| 4907 |
checkpoint57c_post |
checkpoint57c_post (2005/01/27) |
| 4908 |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
| 4909 |
o generate new output.txt files on faulks with g77 & the new -ieee option |
o generate new output.txt files on faulks with g77 & the new -ieee option |
| 4910 |
checkpoint57c_pre |
checkpoint57c_pre (2005/01/27) |
| 4911 |
|
|
| 4912 |
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
| 4913 |
update output.txt of exp. global_ocean.90x40x15 |
update output.txt of exp. global_ocean.90x40x15 |
| 4940 |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
| 4941 |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
| 4942 |
|
|
| 4943 |
checkpoint57b_post |
checkpoint57b_post (2004/12/20) |
| 4944 |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
o simplify options in diagnostics_fill arguments (remove weird combinations) |
| 4945 |
o fix MNC coordinate variables so that they now contain per-face index |
o fix MNC coordinate variables so that they now contain per-face index |
| 4946 |
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
| 4986 |
look through the short list of active diag. (instead of the long list) |
look through the short list of active diag. (instead of the long list) |
| 4987 |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
| 4988 |
|
|
| 4989 |
checkpoint57a_post |
checkpoint57a_post (2004/12/10) |
| 4990 |
o this set of changes restores TAMC compatibility |
o this set of changes restores TAMC compatibility |
| 4991 |
tested for global_ocean.90x40x15 adjoint on trough |
tested for global_ocean.90x40x15 adjoint on trough |
| 4992 |
(what a pain) |
(what a pain) |
| 4993 |
|
|
| 4994 |
checkpoint57a_pre |
checkpoint57a_pre (2004/12/10) |
| 4995 |
o some modifs in tools/build_options for sunos |
o some modifs in tools/build_options for sunos |
| 4996 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
o call ctrl_pack for ctrl at end for optimcycle=0 |
| 4997 |
|
|
| 4998 |
checkpoint57 |
checkpoint57 (2004/12/09) |
| 4999 |
o add horizontal bi-harmonic viscosity for vertical velocity |
o add horizontal bi-harmonic viscosity for vertical velocity |
| 5000 |
- new parameter viscA4W (defaults to viscA4) |
- new parameter viscA4W (defaults to viscA4) |
| 5001 |
- affects only non-hydrostatic code |
- affects only non-hydrostatic code |
| 5013 |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
| 5014 |
(theta2, salt2 in ecco_cost_weights) |
(theta2, salt2 in ecco_cost_weights) |
| 5015 |
|
|
| 5016 |
checkpoint56c_post |
checkpoint56c_post (2004/12/03) |
| 5017 |
o OBCS as control variables |
o OBCS as control variables |
| 5018 |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
- update ctrl_ad_diff.list, obcs_ad_diff.list |
| 5019 |
- remove balance of obcs controls from default |
- remove balance of obcs controls from default |
| 5031 |
o mdsio: |
o mdsio: |
| 5032 |
- i/o-vector change debugLevel from debLevA to debLevB |
- i/o-vector change debugLevel from debLevA to debLevB |
| 5033 |
|
|
| 5034 |
checkpoint56b_post |
checkpoint56b_post (2004/12/01) |
| 5035 |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
| 5036 |
is called from DO_THE_MODEL_IO |
is called from DO_THE_MODEL_IO |
| 5037 |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
| 5046 |
testreport. |
testreport. |
| 5047 |
o ptracers_monitor: bug fix for MPI |
o ptracers_monitor: bug fix for MPI |
| 5048 |
|
|
| 5049 |
checkpoint56a_post |
checkpoint56a_post (2004/11/28) |
| 5050 |
o GCHEM: finish reorganizating the package |
o GCHEM: finish reorganizating the package |
| 5051 |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
| 5052 |
(introduces another 3D-array for each passive tracer, but only if |
(introduces another 3D-array for each passive tracer, but only if |
| 5091 |
- cleaning up |
- cleaning up |
| 5092 |
o small cleaning of exch2: remove files that are also in eesupp/src |
o small cleaning of exch2: remove files that are also in eesupp/src |
| 5093 |
|
|
| 5094 |
checkpoint56 |
checkpoint56 (2004/11/17) |
| 5095 |
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
| 5096 |
o mnc: cleanup "full" files--fixes out-of-memory problem |
o mnc: cleanup "full" files--fixes out-of-memory problem |
| 5097 |
o ECCO-GODAE |
o ECCO-GODAE |
| 5121 |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
| 5122 |
from sign change |
from sign change |
| 5123 |
|
|
| 5124 |
checkpoint55j_post |
checkpoint55j_post (2004/11/10) |
| 5125 |
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
| 5126 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 5127 |
o add consistent build directories and .cvsignore files to verification |
o add consistent build directories and .cvsignore files to verification |
| 5132 |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
| 5133 |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 5134 |
|
|
| 5135 |
checkpoint55i_post |
checkpoint55i_post (2004/10/28) |
| 5136 |
o change arrays for total vertical diffusivity (2.D if explicit, |
o change arrays for total vertical diffusivity (2.D if explicit, |
| 5137 |
3.D if implicit) ; each ptracer uses its own background value. |
3.D if implicit) ; each ptracer uses its own background value. |
| 5138 |
o added mnc/NetCDF output capability to ocn_compon_interf |
o added mnc/NetCDF output capability to ocn_compon_interf |
| 5147 |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
| 5148 |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
| 5149 |
|
|
| 5150 |
checkpoint55h_post |
checkpoint55h_post (2004/10/20) |
| 5151 |
o add verification test "vermix" |
o add verification test "vermix" |
| 5152 |
o remove all the *_ioinc flags and replace with the single global |
o remove all the *_ioinc flags and replace with the single global |
| 5153 |
outputTypesInclusive flag |
outputTypesInclusive flag |
| 5155 |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
| 5156 |
o useMNC moved from data.mnc to data.pkg |
o useMNC moved from data.mnc to data.pkg |
| 5157 |
|
|
| 5158 |
checkpoint55g_post |
checkpoint55g_post (2004/10/14) |
| 5159 |
o Renaming carbon AD experiments to comply with testreport conventions |
o Renaming carbon AD experiments to comply with testreport conventions |
| 5160 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
o Updating adjoint of Held-Suarez hs94.1x64x5 |
| 5161 |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
o Fixing directives for non-ECCO forward_step, after ECCO directives |
| 5165 |
o Updating adjoint output for natl_box_adjoint after |
o Updating adjoint output for natl_box_adjoint after |
| 5166 |
pkg/ecco has been modified (see taga c55d_post) |
pkg/ecco has been modified (see taga c55d_post) |
| 5167 |
|
|
| 5168 |
checkpoint55f_post |
checkpoint55f_post (2004/10/13) |
| 5169 |
o rename to timeave_init_fixed |
o rename to timeave_init_fixed |
| 5170 |
|
|
| 5171 |
checkpoint55e_post |
checkpoint55e_post (2004/10/13) |
| 5172 |
o some delicate re-shuffle of store directives to avoid one |
o some delicate re-shuffle of store directives to avoid one |
| 5173 |
extra call of do_oceanic_physics |
extra call of do_oceanic_physics |
| 5174 |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
affects ecco_the_main_loop.F, do_oceanic_physics.F |
| 5176 |
o NB: this may break global_ocean adjoint temporarily, |
o NB: this may break global_ocean adjoint temporarily, |
| 5177 |
but it is clear how to fix it. Will do later, need this now. |
but it is clear how to fix it. Will do later, need this now. |
| 5178 |
|
|
| 5179 |
checkpoint55d_post |
checkpoint55d_post (2004/10/11) |
| 5180 |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
| 5181 |
o ecco_cost_weights is modified to 1x1 runs |
o ecco_cost_weights is modified to 1x1 runs |
| 5182 |
o modifs to allow observations to be read in as |
o modifs to allow observations to be read in as |
| 5183 |
single file or yearly files |
single file or yearly files |
| 5184 |
o enable to read exf forcing fields as either |
o enable to read exf forcing fields as either |
| 5185 |
single file or yearly files (flag useExfYearlyFields) |
single file or yearly files (flag useExfYearlyFields) |
| 5186 |
checkpoint55d_pre |
checkpoint55d_pre (2004/10/08) |
| 5187 |
|
|
| 5188 |
o switch between 2-level and 3-level checkpointing |
o switch between 2-level and 3-level checkpointing |
| 5189 |
o add ability of MNC to write local and "partial" (eg. 2D slices where |
o add ability of MNC to write local and "partial" (eg. 2D slices where |
| 5231 |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
| 5232 |
- fixed about 35 bugs in obcs_external_fields_load |
- fixed about 35 bugs in obcs_external_fields_load |
| 5233 |
|
|
| 5234 |
checkpoint55c_post |
checkpoint55c_post (2004/09/23) |
| 5235 |
o obcs stuff |
o obcs stuff |
| 5236 |
- new runtime flags useOBCSprescribe, useOBCSbalance |
- new runtime flags useOBCSprescribe, useOBCSbalance |
| 5237 |
- re-arranged obcs_calc |
- re-arranged obcs_calc |
| 5245 |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
| 5246 |
which simplifies the calls and passes the ifc check-bounds test |
which simplifies the calls and passes the ifc check-bounds test |
| 5247 |
|
|
| 5248 |
checkpoint55b_post |
checkpoint55b_post (2004/09/22) |
| 5249 |
o add a 2D scalar, Z location, exchange_2 routine. |
o add a 2D scalar, Z location, exchange_2 routine. |
| 5250 |
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
| 5251 |
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
| 5256 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
| 5257 |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
| 5258 |
|
|
| 5259 |
checkpoint55a_post |
checkpoint55a_post (2004/09/20) |
| 5260 |
o merged code to |
o merged code to |
| 5261 |
* prescribe/read time-dependent open boundaries |
* prescribe/read time-dependent open boundaries |
| 5262 |
(works in conjunction with exf, cal) |
(works in conjunction with exf, cal) |
| 5264 |
* each boundary N/S/E/W now has its own CPP option |
* each boundary N/S/E/W now has its own CPP option |
| 5265 |
(healthy for the adjoint) |
(healthy for the adjoint) |
| 5266 |
|
|
| 5267 |
checkpoint55 |
checkpoint55 (2004/09/17) |
| 5268 |
o up-to-date adjoint of previous breaks |
o up-to-date adjoint of previous breaks |
| 5269 |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
| 5270 |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
| 5274 |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
| 5275 |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
| 5276 |
|
|
| 5277 |
checkpoint54f_post |
checkpoint54f_post (2004/09/16) |
| 5278 |
o in verification/carbin/ remove experiment related to |
o in verification/carbin/ remove experiment related to |
| 5279 |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
ALLOW_PASSIVE_TRACER (array tr1 etc) |
| 5280 |
code_ad/ input_ad/ results_ad |
code_ad/ input_ad/ results_ad |
| 5300 |
- numerous small formatting cleanups for ProTeX |
- numerous small formatting cleanups for ProTeX |
| 5301 |
o add version info (via BUILD_INFO.h) to MNC and stdout |
o add version info (via BUILD_INFO.h) to MNC and stdout |
| 5302 |
|
|
| 5303 |
checkpoint54e_post |
checkpoint54e_post (2004/09/02) |
| 5304 |
o add two new packages |
o add two new packages |
| 5305 |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
- pp81 (Packanowski and Philander, 1981), Richardson number and |
| 5306 |
stratification dependent mixing |
stratification dependent mixing |
| 5314 |
o genmake2: add ability to search for C compilers and cleanup test output |
o genmake2: add ability to search for C compilers and cleanup test output |
| 5315 |
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
| 5316 |
|
|
| 5317 |
checkpoint54d_post |
checkpoint54d_post (2004/07/27) |
| 5318 |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
| 5319 |
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
| 5320 |
leading to additional shift by 5 days each year of integration |
leading to additional shift by 5 days each year of integration |
| 5330 |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
| 5331 |
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
| 5332 |
|
|
| 5333 |
checkpoint54c_post |
checkpoint54c_post (2004/07/18) |
| 5334 |
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
| 5335 |
this affects (truncation error) output.txt of test-exp: |
this affects (truncation error) output.txt of test-exp: |
| 5336 |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
| 5341 |
o start to test mnc routinely in exp0 |
o start to test mnc routinely in exp0 |
| 5342 |
o add sea-ice loading (sIceLoad) as a new forcing field. |
o add sea-ice loading (sIceLoad) as a new forcing field. |
| 5343 |
|
|
| 5344 |
checkpoint54b_post |
checkpoint54b_post (2004/07/08) |
| 5345 |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
| 5346 |
impressive on Altix and Opteron systems) |
impressive on Altix and Opteron systems) |
| 5347 |
o diagnostics can now write NetCDF files through the mnc package |
o diagnostics can now write NetCDF files through the mnc package |
| 5351 |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
affects (truncation error) output of lab_sea & natl_box exp.: updated |
| 5352 |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
| 5353 |
|
|
| 5354 |
checkpoint54a_post |
checkpoint54a_post (2004/07/06) |
| 5355 |
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
| 5356 |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
| 5357 |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
| 5358 |
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
| 5359 |
+ internal_wave (shift in writing cg2d_ini_res) |
+ internal_wave (shift in writing cg2d_ini_res) |
| 5360 |
checkpoint54a_pre |
checkpoint54a_pre (2004/07/05) |
| 5361 |
|
|
| 5362 |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
| 5363 |
- modified verification/lab_sea and natl_box_adjoint accordingly |
- modified verification/lab_sea and natl_box_adjoint accordingly |
| 5364 |
|
|
| 5365 |
checkpoint54 |
checkpoint54 (2004/07/02) |
| 5366 |
checkpoint53g_post |
checkpoint53g_post (2004/07/02) |
| 5367 |
o prepare splitting of thermodynamics: store convect.counter in common block |
o prepare splitting of thermodynamics: store convect.counter in common block |
| 5368 |
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
| 5369 |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
| 5372 |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
| 5373 |
o restore adjointability |
o restore adjointability |
| 5374 |
|
|
| 5375 |
checkpoint53f_post |
checkpoint53f_post (2004/06/25) |
| 5376 |
o modifications that affect AIM experiment results (update output.txt): |
o modifications that affect AIM experiment results (update output.txt): |
| 5377 |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
- no advection of S at top interface Nr (pkg/generic_advdiff) |
| 5378 |
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
| 5385 |
o added rotating_tank experiment |
o added rotating_tank experiment |
| 5386 |
checkpoint53e_pre |
checkpoint53e_pre |
| 5387 |
|
|
| 5388 |
checkpoint53d_post |
checkpoint53d_post (2004/06/14) |
| 5389 |
o faulks upgraded: re-generate output.txt that have changed: |
o faulks upgraded: re-generate output.txt that have changed: |
| 5390 |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
| 5391 |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
| 5404 |
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
| 5405 |
of mom_common/ |
of mom_common/ |
| 5406 |
- simple re-arrangement of instructions within computing loop |
- simple re-arrangement of instructions within computing loop |
| 5407 |
checkpoint53d_pre |
checkpoint53d_pre (2004/05/21) |
| 5408 |
|
|
| 5409 |
checkpoint53c_post |
checkpoint53c_post (2004/05/21) |
| 5410 |
o new version of coupler for AIM+thSIce and Ocean models |
o new version of coupler for AIM+thSIce and Ocean models |
| 5411 |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
| 5412 |
- land: change Evaporation of snow |
- land: change Evaporation of snow |
| 5423 |
* TLM OK |
* TLM OK |
| 5424 |
* ADM not sufficient accuracy yet (needs further testing) |
* ADM not sufficient accuracy yet (needs further testing) |
| 5425 |
|
|
| 5426 |
checkpoint53b_post |
checkpoint53b_post (2004/05/14) |
| 5427 |
o Commiting new energy balance model to repository |
o Commiting new energy balance model to repository |
| 5428 |
* package is pkg/ebm |
* package is pkg/ebm |
| 5429 |
* verif. is verification/global_ocean_ebm |
* verif. is verification/global_ocean_ebm |
| 5441 |
C by atmospheric eddy transports. |
C by atmospheric eddy transports. |
| 5442 |
C J. Climate 7(12), 1870-1882 |
C J. Climate 7(12), 1870-1882 |
| 5443 |
o Will need long integration testing. |
o Will need long integration testing. |
| 5444 |
checkpoint53b_pre |
checkpoint53b_pre (2004/05/14) |
| 5445 |
|
|
| 5446 |
o created pkg/mom_common in preparation for variable viscosity code |
o created pkg/mom_common in preparation for variable viscosity code |
| 5447 |
o renamed and split ini_mnc_io |
o renamed and split ini_mnc_io |
| 5449 |
o AIM using land: soil wetness availability account for snow |
o AIM using land: soil wetness availability account for snow |
| 5450 |
o added printMapIncludesZeros to EEPARMS namelist |
o added printMapIncludesZeros to EEPARMS namelist |
| 5451 |
|
|
| 5452 |
checkpoint53a_post |
checkpoint53a_post (2004/05/11) |
| 5453 |
o restore TAMC compatiility for exf_constants.h |
o restore TAMC compatiility for exf_constants.h |
| 5454 |
(no usage of _d in .h) |
(no usage of _d in .h) |
| 5455 |
o Additional storing in KPP in an attempt to fix |
o Additional storing in KPP in an attempt to fix |
| 5462 |
and hence gives results closer to that of Experiment 2. |
and hence gives results closer to that of Experiment 2. |
| 5463 |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
| 5464 |
|
|
| 5465 |
checkpoint53 |
checkpoint53 (2004/05/06) |
| 5466 |
o stable checkpoint with up to date adjoint |
o stable checkpoint with up to date adjoint |
| 5467 |
TLM tests only run for 1st grdchk at the moment. Its unclear if |
TLM tests only run for 1st grdchk at the moment. Its unclear if |
| 5468 |
this is a code problem or a problem with resetting code for g_ |
this is a code problem or a problem with resetting code for g_ |
| 5472 |
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
| 5473 |
are both still in chaos following their security messes. |
are both still in chaos following their security messes. |
| 5474 |
|
|
| 5475 |
checkpoint52n_post |
checkpoint52n_post (2004/05/06) |
| 5476 |
o various build (mostly genmake2) changes including: |
o various build (mostly genmake2) changes including: |
| 5477 |
- ability to build/run more easily within Cygwin and MacOS X |
- ability to build/run more easily within Cygwin and MacOS X |
| 5478 |
- more complicated Makefiles with a stronger dependence on Gnu Make |
- more complicated Makefiles with a stronger dependence on Gnu Make |
| 5503 |
- maintain snow precipitation unchanged (even if Tsf >=0). |
- maintain snow precipitation unchanged (even if Tsf >=0). |
| 5504 |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
| 5505 |
|
|
| 5506 |
checkpoint52m_post |
checkpoint52m_post (2004/04/18) |
| 5507 |
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
| 5508 |
this does not change any of the results, because myIter=0 in swfrac always |
this does not change any of the results, because myIter=0 in swfrac always |
| 5509 |
lead to jwtype=2 (the default anyway), but the call makes little sense |
lead to jwtype=2 (the default anyway), but the call makes little sense |
| 5535 |
o Added functionality to grdchk: |
o Added functionality to grdchk: |
| 5536 |
pick global i,j,k position (or nearest wet) where to perform check. |
pick global i,j,k position (or nearest wet) where to perform check. |
| 5537 |
|
|
| 5538 |
checkpoint52l_post |
checkpoint52l_post (2004/03/11) |
| 5539 |
o new land formulation: |
o new land formulation: |
| 5540 |
a) use ground enthalpy as prognostic variable to ensure exact |
a) use ground enthalpy as prognostic variable to ensure exact |
| 5541 |
energy conservation. |
energy conservation. |
| 5546 |
a) Treat separately land / ocean / sea-ice surface fluxes |
a) Treat separately land / ocean / sea-ice surface fluxes |
| 5547 |
to allow implicit computation of land & sea-ice surface temp. |
to allow implicit computation of land & sea-ice surface temp. |
| 5548 |
b) add snow precipitation. |
b) add snow precipitation. |
| 5549 |
checkpoint52l_pre |
checkpoint52l_pre (2004/03/11) |
| 5550 |
|
|
| 5551 |
o fix problem (when 1 tile is empty) in min/max monitor. |
o fix problem (when 1 tile is empty) in min/max monitor. |
| 5552 |
o fix bug in timeAve (u,vZetatave in common block) |
o fix bug in timeAve (u,vZetatave in common block) |
| 5559 |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
| 5560 |
o exf: Adding simple range check routine for exf fields after read |
o exf: Adding simple range check routine for exf fields after read |
| 5561 |
|
|
| 5562 |
checkpoint52k_post |
checkpoint52k_post (2004/02/23) |
| 5563 |
o removed top-level directory "diags" |
o removed top-level directory "diags" |
| 5564 |
- we migrated these functions to pkg/timeave a long time ago |
- we migrated these functions to pkg/timeave a long time ago |
| 5565 |
o fixed bug introduced in pkg/monitor |
o fixed bug introduced in pkg/monitor |
| 5572 |
taveFreq, dumpFreq, pChkptFreq |
taveFreq, dumpFreq, pChkptFreq |
| 5573 |
o MAIN and ECCO differentiability restored |
o MAIN and ECCO differentiability restored |
| 5574 |
|
|
| 5575 |
checkpoint52j_post |
checkpoint52j_post (2004/02/18) |
| 5576 |
o fix nchklev in tamc.h for global_ocean... |
o fix nchklev in tamc.h for global_ocean... |
| 5577 |
o Bringing flow and store directives up-to-date |
o Bringing flow and store directives up-to-date |
| 5578 |
o Really weird thing! |
o Really weird thing! |
| 5580 |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
| 5581 |
TAF places a faulty re-call of initialise_varia |
TAF places a faulty re-call of initialise_varia |
| 5582 |
after cost_final call which should not be there! |
after cost_final call which should not be there! |
| 5583 |
checkpoint52j_pre |
checkpoint52j_pre (2004/02/03) |
| 5584 |
|
|
| 5585 |
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
| 5586 |
error messages |
error messages |
| 5597 |
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
| 5598 |
o limit timeave output for hi-res integrations |
o limit timeave output for hi-res integrations |
| 5599 |
|
|
| 5600 |
checkpoint52i_post |
checkpoint52i_post (2004/01/21) |
| 5601 |
o removed CPP_EEOPTIONS.h from verification/*/code |
o removed CPP_EEOPTIONS.h from verification/*/code |
| 5602 |
o updated the tiling for global_ocean_pressure |
o updated the tiling for global_ocean_pressure |
| 5603 |
checkpoint52i_pre |
checkpoint52i_pre (2004/01/20) |
| 5604 |
|
|
| 5605 |
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
| 5606 |
the old pkg/aim). |
the old pkg/aim). |
| 5607 |
|
|
| 5608 |
checkpoint52h_pre |
checkpoint52h_pre (2004/01/20) |
| 5609 |
o shortened offending lines in exch2_send_rx?.template |
o shortened offending lines in exch2_send_rx?.template |
| 5610 |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
| 5611 |
o genmake2: add build & execute test for NetCDF code |
o genmake2: add build & execute test for NetCDF code |
| 5616 |
metric terms are ignored and it is assumed that |
metric terms are ignored and it is assumed that |
| 5617 |
there is no sea-ice on cube faces 1, 2, 4, and 5. |
there is no sea-ice on cube faces 1, 2, 4, and 5. |
| 5618 |
|
|
| 5619 |
checkpoint52f_post |
checkpoint52f_post (2004/01/09) |
| 5620 |
o added exch2 cube routines to pkg/exch2 |
o added exch2 cube routines to pkg/exch2 |
| 5621 |
o modified hs94.cs-32x32x5 to use it |
o modified hs94.cs-32x32x5 to use it |
| 5622 |
o added new grid files to hs94.cs-32x32x5 |
o added new grid files to hs94.cs-32x32x5 |
| 5623 |
checkpoint52f_pre |
checkpoint52f_pre (2004/01/07) |
| 5624 |
|
|
| 5625 |
checkpoint52e_post |
checkpoint52e_post (2004/01/07) |
| 5626 |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
| 5627 |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
| 5628 |
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
| 5630 |
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
| 5631 |
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
| 5632 |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
| 5633 |
checkpoint52e_pre |
checkpoint52e_pre (2004/01/02) |
| 5634 |
|
|
| 5635 |
o fix bug in impldiff when Nr=1 or Nr=2. |
o fix bug in impldiff when Nr=1 or Nr=2. |
| 5636 |
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
| 5641 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
| 5642 |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
| 5643 |
|
|
| 5644 |
checkpoint52d_post |
checkpoint52d_post (2003/12/16) |
| 5645 |
o re-tiled many expts to allow comparison in multi-processor mode |
o re-tiled many expts to allow comparison in multi-processor mode |
| 5646 |
- updated output accordingly |
- updated output accordingly |
| 5647 |
- changed hs94.128x64x5 to use intial T from file rather than use the |
- changed hs94.128x64x5 to use intial T from file rather than use the |
| 5670 |
o new verification experiment, cpl_aim+ocn: |
o new verification experiment, cpl_aim+ocn: |
| 5671 |
coupled ocean - AIM atmosphere on cs32 grid. |
coupled ocean - AIM atmosphere on cs32 grid. |
| 5672 |
|
|
| 5673 |
checkpoint52d_pre |
checkpoint52d_pre (2003/12/06) |
| 5674 |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
| 5675 |
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
| 5676 |
|
|
| 5677 |
checkpoint52c_post |
checkpoint52c_post (2003/11/25) |
| 5678 |
o Fixing OPTIONS files for use of exf: |
o Fixing OPTIONS files for use of exf: |
| 5679 |
- ALLOW_ECCO not needed |
- ALLOW_ECCO not needed |
| 5680 |
- ECCO_CPPOPTIONS.h should not be included from |
- ECCO_CPPOPTIONS.h should not be included from |
| 5688 |
o modified STOREs in GAD_ADVECTION |
o modified STOREs in GAD_ADVECTION |
| 5689 |
o corrected key comp. for passkey |
o corrected key comp. for passkey |
| 5690 |
|
|
| 5691 |
checkpoint52b_post |
checkpoint52b_post (2003/11/23) |
| 5692 |
o new version: "thsice" of thermodynamic sea-ice pkg: |
o new version: "thsice" of thermodynamic sea-ice pkg: |
| 5693 |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
| 5694 |
- modify fluxes but do not change theta directly; |
- modify fluxes but do not change theta directly; |
| 5696 |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
| 5697 |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
+ output_thsice.txt to test thsice & bulk_force pkgs. |
| 5698 |
o put back grid & coriolis monitor output. |
o put back grid & coriolis monitor output. |
| 5699 |
checkpoint52b_pre |
checkpoint52b_pre (2003/11/23) |
| 5700 |
|
|
| 5701 |
o call "do_the_model_io" at the beginning (=> dump initial state) |
o call "do_the_model_io" at the beginning (=> dump initial state) |
| 5702 |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
| 5706 |
o default tamc.h in pkg/autodiff supposed to crash |
o default tamc.h in pkg/autodiff supposed to crash |
| 5707 |
to ensure proper customization |
to ensure proper customization |
| 5708 |
|
|
| 5709 |
checkpoint52a_post |
checkpoint52a_post (2003/11/17) |
| 5710 |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
| 5711 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
| 5712 |
- subroutine FREEZE_SURFACE now limits only surface temperature |
- subroutine FREEZE_SURFACE now limits only surface temperature |
| 5721 |
snapshot file was missing some ad-variables, |
snapshot file was missing some ad-variables, |
| 5722 |
but no warning issued by TAF |
but no warning issued by TAF |
| 5723 |
|
|
| 5724 |
checkpoint52a_pre |
checkpoint52a_pre (2003/11/12) |
| 5725 |
o some bug fixes for #undef REAL4_IS_SLOW |
o some bug fixes for #undef REAL4_IS_SLOW |
| 5726 |
|
|
| 5727 |
checkpoint52 = ecco_c52_e35 |
checkpoint52 = ecco_c52_e35 |
| 5728 |
o after testing adjoints of checkpoint51u_post |
o after testing adjoints of checkpoint51u_post |
| 5729 |
|
|
| 5730 |
checkpoint51u_post |
checkpoint51u_post (2003/11/06) |
| 5731 |
o this is the post-merge tag of the ecco-branch |
o this is the post-merge tag of the ecco-branch |
| 5732 |
(needs another clean checkout and re-testing) |
(needs another clean checkout and re-testing) |
| 5733 |
o various natl_box_adjoint configs and results |
o various natl_box_adjoint configs and results |
| 5742 |
(new namelist ecco_cost_nml) |
(new namelist ecco_cost_nml) |
| 5743 |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
| 5744 |
|
|
| 5745 |
checkpoint51t_post |
checkpoint51t_post (2003/11/04) |
| 5746 |
o this is the pre-merge tag of the ecco-branch |
o this is the pre-merge tag of the ecco-branch |
| 5747 |
|
|
| 5748 |
checkpoint51s_post |
checkpoint51s_post (2003/11/04) |
| 5749 |
o cleanup: removed various obsolete #define-s |
o cleanup: removed various obsolete #define-s |
| 5750 |
o pkg/grdchk |
o pkg/grdchk |
| 5751 |
- renamed 'ph-grd 3' to 'grad-res' |
- renamed 'ph-grd 3' to 'grad-res' |
| 5754 |
- additional high-precision output for testreport |
- additional high-precision output for testreport |
| 5755 |
(grep for 'precision_grdchk_result') |
(grep for 'precision_grdchk_result') |
| 5756 |
|
|
| 5757 |
checkpoint51r_post |
checkpoint51r_post (2003/11/03) |
| 5758 |
o cleaned up or removed CPP_OPTIONS.h files |
o cleaned up or removed CPP_OPTIONS.h files |
| 5759 |
o updated results for some of the tests to reflect the new |
o updated results for some of the tests to reflect the new |
| 5760 |
optfiles (-ieee: -O0 instead of -O3) |
optfiles (-ieee: -O0 instead of -O3) |
| 5761 |
|
|
| 5762 |
checkpoint51q_post |
checkpoint51q_post (2003/10/30) |
| 5763 |
o cd_code: |
o cd_code: |
| 5764 |
- moved cd_scheme.F -> cd_code_scheme.F |
- moved cd_scheme.F -> cd_code_scheme.F |
| 5765 |
- separate read_checkpoint from cd_code_ini_vars.F |
- separate read_checkpoint from cd_code_ini_vars.F |
| 5775 |
- confined inclusion of AD_CONFIG.h to where necessary. |
- confined inclusion of AD_CONFIG.h to where necessary. |
| 5776 |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
| 5777 |
|
|
| 5778 |
checkpoint51p_post |
checkpoint51p_post (2003/10/30) |
| 5779 |
o create initial cd_code package |
o create initial cd_code package |
| 5780 |
- WARNING: the initialization of fields within packages |
- WARNING: the initialization of fields within packages |
| 5781 |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
is broken because INI_FIELDS (where READ_CHECKPOINT is |
| 5790 |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
| 5791 |
o cleanup testreport |
o cleanup testreport |
| 5792 |
|
|
| 5793 |
checkpoint51o_post |
checkpoint51o_post (2003/10/27) |
| 5794 |
o bringing AD-related verif's up to date with genmake2 |
o bringing AD-related verif's up to date with genmake2 |
| 5795 |
- carbon/ |
- carbon/ |
| 5796 |
- global_ocean.90x40x15/ |
- global_ocean.90x40x15/ |
| 5811 |
o helping TAF to recognize dependency on kUp for |
o helping TAF to recognize dependency on kUp for |
| 5812 |
fVerU, fVerV |
fVerU, fVerV |
| 5813 |
o Replacing delZ by delR in pkg/ctrl/ |
o Replacing delZ by delR in pkg/ctrl/ |
| 5814 |
checkpoint51o_pre |
checkpoint51o_pre (2003/10/24) |
| 5815 |
|
|
| 5816 |
o undid all of cp51 pending some cleanups and discussion |
o undid all of cp51 pending some cleanups and discussion |
| 5817 |
o added the [#include "AD_CONFIG.h"] statement to all files that need |
o added the [#include "AD_CONFIG.h"] statement to all files that need |
| 5819 |
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
| 5820 |
o removed tools/genmake since it no longer works |
o removed tools/genmake since it no longer works |
| 5821 |
|
|
| 5822 |
checkpoint51n_post |
checkpoint51n_post (2003/10/23) |
| 5823 |
o modifications to make FREEZE flux visible to pkg/kpp |
o modifications to make FREEZE flux visible to pkg/kpp |
| 5824 |
- moved surfaceTendencyTice from pkg/seaice to main code |
- moved surfaceTendencyTice from pkg/seaice to main code |
| 5825 |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
| 5828 |
global_ocean.cs32x15, and global_with_exf) |
global_ocean.cs32x15, and global_with_exf) |
| 5829 |
o added surface flux output variables to TIMEAVE_STATVARS |
o added surface flux output variables to TIMEAVE_STATVARS |
| 5830 |
|
|
| 5831 |
checkpoint51n_pre |
checkpoint51n_pre (2003/10/23) |
| 5832 |
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
| 5833 |
o added [#include "AD_CONFIG.h"] to all files that use the following |
o added [#include "AD_CONFIG.h"] to all files that use the following |
| 5834 |
defines: |
defines: |
| 5836 |
- ALLOW_TANGENTLINEAR_RUN |
- ALLOW_TANGENTLINEAR_RUN |
| 5837 |
- ALLOW_ECCO_OPTIMIZATION |
- ALLOW_ECCO_OPTIMIZATION |
| 5838 |
|
|
| 5839 |
checkpoint51m_post |
checkpoint51m_post (2003/10/21) |
| 5840 |
o incorporating changes to get TAMC/TAF working in genmake2 |
o incorporating changes to get TAMC/TAF working in genmake2 |
| 5841 |
- added new TAMC/TAF targets to the Makefile |
- added new TAMC/TAF targets to the Makefile |
| 5842 |
- various cleanups related to package handling |
- various cleanups related to package handling |
| 5843 |
- these changes should have no impact on the forward model |
- these changes should have no impact on the forward model |
| 5844 |
|
|
| 5845 |
checkpoint51l_post |
checkpoint51l_post (2003/10/20) |
| 5846 |
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
| 5847 |
- faster algorithm for cal_addtime.F |
- faster algorithm for cal_addtime.F |
| 5848 |
- higher precision arithmetic, where needed |
- higher precision arithmetic, where needed |
| 5849 |
- pkg/exf *startdate variables changed from calendar date to |
- pkg/exf *startdate variables changed from calendar date to |
| 5850 |
model integration time |
model integration time |
| 5851 |
|
|
| 5852 |
checkpoint51l_pre |
checkpoint51l_pre (2003/10/17) |
| 5853 |
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
| 5854 |
o enable to apply restoring on S & T only in a latitude band. |
o enable to apply restoring on S & T only in a latitude band. |
| 5855 |
o update output (external_forcing_surf modif. change truncation errors) |
o update output (external_forcing_surf modif. change truncation errors) |
| 5856 |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
| 5857 |
|
|
| 5858 |
checkpoint51k_post |
checkpoint51k_post (2003/10/16) |
| 5859 |
o change default to: useNHMTerms=.FALSE. |
o change default to: useNHMTerms=.FALSE. |
| 5860 |
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
| 5861 |
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
| 5869 |
removed the #include "PACKAGES_CONFIG.h" from it |
removed the #include "PACKAGES_CONFIG.h" from it |
| 5870 |
o fix a bug in mom_fluxform (from chk51j_post) |
o fix a bug in mom_fluxform (from chk51j_post) |
| 5871 |
|
|
| 5872 |
checkpoint51j_post |
checkpoint51j_post (2003/10/10) |
| 5873 |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
| 5874 |
o adjusted some flow directives (dynamics, thermodynamics) |
o adjusted some flow directives (dynamics, thermodynamics) |
| 5875 |
o added cubed-sphere case to test cost function |
o added cubed-sphere case to test cost function |
| 5883 |
- pkg_ad_diff.list |
- pkg_ad_diff.list |
| 5884 |
- pkg_ad_check_lev?_dir.h |
- pkg_ad_check_lev?_dir.h |
| 5885 |
|
|
| 5886 |
checkpoint51i_post |
checkpoint51i_post (2003/10/09) |
| 5887 |
o merge of the branch-genmake2 |
o merge of the branch-genmake2 |
| 5888 |
- knowingly breaks the older genmake |
- knowingly breaks the older genmake |
| 5889 |
- automatic generation of all ALLOW_${PKG_NAME} defines |
- automatic generation of all ALLOW_${PKG_NAME} defines |
| 5890 |
- new testreport supersedes older testscript |
- new testreport supersedes older testscript |
| 5891 |
o large number of package inclusion and header cleanups |
o large number of package inclusion and header cleanups |
| 5892 |
checkpoint51i_pre |
checkpoint51i_pre (2003/10/08) |
| 5893 |
|
|
| 5894 |
o new output for adjoin of global ocean vector invariant |
o new output for adjoin of global ocean vector invariant |
| 5895 |
o fix for checkpoint of thermodynamic seaice and bulk_force |
o fix for checkpoint of thermodynamic seaice and bulk_force |
| 5901 |
o modifications to clean up dic pkg |
o modifications to clean up dic pkg |
| 5902 |
o add pkg/cfc |
o add pkg/cfc |
| 5903 |
|
|
| 5904 |
checkpoint51g_post |
checkpoint51g_post (2003/10/02) |
| 5905 |
o provide links for ARPACK and ADM*TLM |
o provide links for ARPACK and ADM*TLM |
| 5906 |
o start removing verification/vero/ |
o start removing verification/vero/ |
| 5907 |
o update AD-related stuff |
o update AD-related stuff |
| 5909 |
o adding to verification/global_ocean.90x40x15/ adjoint of |
o adding to verification/global_ocean.90x40x15/ adjoint of |
| 5910 |
vector invariant setup |
vector invariant setup |
| 5911 |
|
|
| 5912 |
checkpoint51f_post |
checkpoint51f_post (2003/10/02) |
| 5913 |
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
| 5914 |
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
| 5915 |
of tracer Green's fucntions for ocean inversion project. |
of tracer Green's fucntions for ocean inversion project. |
| 5916 |
|
|
| 5917 |
checkpoint51f_pre |
checkpoint51f_pre (2003/08/07) |
| 5918 |
o Added on-the-fly spatial interpolation capability |
o Added on-the-fly spatial interpolation capability |
| 5919 |
"USE_EXF_INTERPOLATION" to pkg/exf. |
"USE_EXF_INTERPOLATION" to pkg/exf. |
| 5920 |
- This is a temporary Cartesian-grid hack until |
- This is a temporary Cartesian-grid hack until |
| 5926 |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
| 5927 |
non-local transport term. |
non-local transport term. |
| 5928 |
|
|
| 5929 |
checkpoint51e_post |
checkpoint51e_post (2003/08/03) |
| 5930 |
o pkg/mom_vecinv: |
o pkg/mom_vecinv: |
| 5931 |
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
| 5932 |
- add time-ave diagnostic of vorticity advection. |
- add time-ave diagnostic of vorticity advection. |
| 5936 |
o land pkg: read initial state from files. |
o land pkg: read initial state from files. |
| 5937 |
o AIM : add stratospheric drag in the upper level |
o AIM : add stratospheric drag in the upper level |
| 5938 |
|
|
| 5939 |
checkpoint51d_post |
checkpoint51d_post (2003/07/18) |
| 5940 |
o change function ILNBLNK (=> last non-blank char.) to return zero |
o change function ILNBLNK (=> last non-blank char.) to return zero |
| 5941 |
(instead of the string length) when the string. char is empty |
(instead of the string length) when the string. char is empty |
| 5942 |
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
| 5949 |
- new active_file_loc... and mdsio_..._loc routines |
- new active_file_loc... and mdsio_..._loc routines |
| 5950 |
- affected packages: autodiff, ctrl, grdchk, mdsio |
- affected packages: autodiff, ctrl, grdchk, mdsio |
| 5951 |
|
|
| 5952 |
checkpoint51c_post |
checkpoint51c_post (2003/07/08) |
| 5953 |
o introducing integer flag debugLevel |
o introducing integer flag debugLevel |
| 5954 |
- debLevZero: suppress all output |
- debLevZero: suppress all output |
| 5955 |
- debLevA: standard |
- debLevA: standard |
| 5972 |
- checked tapelev/comlev recomputations: OK |
- checked tapelev/comlev recomputations: OK |
| 5973 |
<<<checkpoint51b_pre |
<<<checkpoint51b_pre |
| 5974 |
|
|
| 5975 |
checkpoint51a_post |
checkpoint51a_post (2003/06/25) |
| 5976 |
o added code for biogeochemistry package |
o added code for biogeochemistry package |
| 5977 |
- new pkgs: dic, gchem |
- new pkgs: dic, gchem |
| 5978 |
- new subroutine in ptracers |
- new subroutine in ptracers |
| 5979 |
o modify code for biogeo packages |
o modify code for biogeo packages |
| 5980 |
- in model/src and pkg/ptracers |
- in model/src and pkg/ptracers |
| 5981 |
|
|
| 5982 |
checkpoint51 |
checkpoint51 (2003/06/24) |
| 5983 |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
| 5984 |
- autodiff, ctrl, exf, grdchk, seaice |
- autodiff, ctrl, exf, grdchk, seaice |
| 5985 |
kept separate packages |
kept separate packages |
| 5987 |
o updating verification/internal_wave, verification/lab_sea |
o updating verification/internal_wave, verification/lab_sea |
| 5988 |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
| 5989 |
|
|
| 5990 |
checkpoint50i_post |
checkpoint50i_post (2003/06/23) |
| 5991 |
o Preparing next differentiable checkpoint and sync |
o Preparing next differentiable checkpoint and sync |
| 5992 |
of MAIN vs. ecco-branch |
of MAIN vs. ecco-branch |
| 5993 |
- 1st step: this one is differentiable |
- 1st step: this one is differentiable |
| 5994 |
- 2nd step: next(! not this) checkpoint will have updated packages |
- 2nd step: next(! not this) checkpoint will have updated packages |
| 5995 |
from ecco-branch) |
from ecco-branch) |
| 5996 |
|
|
| 5997 |
checkpoint50h_post |
checkpoint50h_post (2003/06/20) |
| 5998 |
o new package "land": provide surface BC for AIM. |
o new package "land": provide surface BC for AIM. |
| 5999 |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
| 6000 |
o AIM: use true log-P extrapolation for near surface temp (= as in |
o AIM: use true log-P extrapolation for near surface temp (= as in |
| 6003 |
o somewhat cleaned package initialisation sequence for |
o somewhat cleaned package initialisation sequence for |
| 6004 |
ctrl/ cost/ ecco/ in packages_... routines |
ctrl/ cost/ ecco/ in packages_... routines |
| 6005 |
|
|
| 6006 |
checkpoint50g_post |
checkpoint50g_post (2003/05/23) |
| 6007 |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
| 6008 |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
| 6009 |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
| 6010 |
made the default because of faster convergence than ADI |
made the default because of faster convergence than ADI |
| 6011 |
|
|
| 6012 |
checkpoint50f_post |
checkpoint50f_post (2003/05/23) |
| 6013 |
o exf totally restructured |
o exf totally restructured |
| 6014 |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
- replaced all exf_set_ routines by one generic exf_set_gen.F |
| 6015 |
and made sure it's still differentiable |
and made sure it's still differentiable |
| 6017 |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
| 6018 |
- updated adjoint/makefile and relevant verif. accordingly |
- updated adjoint/makefile and relevant verif. accordingly |
| 6019 |
|
|
| 6020 |
checkpoint50f_pre |
checkpoint50f_pre (2003/05/23) |
| 6021 |
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
| 6022 |
+ change Evap over land. (update aim.5l_cs output) |
+ change Evap over land. (update aim.5l_cs output) |
| 6023 |
o added missing .cvsignores and made uniform across expts |
o added missing .cvsignores and made uniform across expts |
| 6027 |
o new fn in pkg/monitor to stop model if solution grows too big |
o new fn in pkg/monitor to stop model if solution grows too big |
| 6028 |
o removed lots of single quotes from comments |
o removed lots of single quotes from comments |
| 6029 |
|
|
| 6030 |
checkpoint50e_post |
checkpoint50e_post (2003/05/14) |
| 6031 |
o make KPP work with PTRACERS |
o make KPP work with PTRACERS |
| 6032 |
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
| 6033 |
nearly a copy of kpp_transport_s |
nearly a copy of kpp_transport_s |
| 6034 |
- there is no analogue to SurfaceTendencyS, so I have to use |
- there is no analogue to SurfaceTendencyS, so I have to use |
| 6035 |
gPtr(of the surface layer) instead |
gPtr(of the surface layer) instead |
| 6036 |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
| 6037 |
checkpoint50e_pre |
checkpoint50e_pre (2003/05/13) |
| 6038 |
|
|
| 6039 |
checkpoint50d_post |
checkpoint50d_post (2003/05/13) |
| 6040 |
o change kpp output from multiple-record state files to single-record state |
o change kpp output from multiple-record state files to single-record state |
| 6041 |
files analogous to write_state.F |
files analogous to write_state.F |
| 6042 |
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
| 6043 |
analogous to the cg2d-related output. |
analogous to the cg2d-related output. |
| 6044 |
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
| 6045 |
so that writing to internal file fn (with length 512) fails. |
so that writing to internal file fn (with length 512) fails. |
| 6046 |
checkpoint50d_pre |
checkpoint50d_pre (2003/05/12) |
| 6047 |
|
|
| 6048 |
checkpoint50c_post |
checkpoint50c_post (2003/05/12) |
| 6049 |
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
| 6050 |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
| 6051 |
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
| 6052 |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
| 6053 |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
| 6054 |
|
|
| 6055 |
checkpoint50c_pre |
checkpoint50c_pre (2003/04/30) |
| 6056 |
Merging from release1_p13: |
Merging from release1_p13: |
| 6057 |
o bug fix for pkg/seaice dynamic solver |
o bug fix for pkg/seaice dynamic solver |
| 6058 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
| 6059 |
|
|
| 6060 |
checkpoint50b_post |
checkpoint50b_post (2003/04/17) |
| 6061 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
| 6062 |
o in order to put the momForcing out of the Adams-Bashforth: |
o in order to put the momForcing out of the Adams-Bashforth: |
| 6063 |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
| 6066 |
o re-generate output for highly sensitive test-exp: |
o re-generate output for highly sensitive test-exp: |
| 6067 |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
| 6068 |
|
|
| 6069 |
checkpoint50b_pre |
checkpoint50b_pre (2003/04/17) |
| 6070 |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
| 6071 |
o corrected CPP option mismatch in exf_Bulk... functions for case |
o corrected CPP option mismatch in exf_Bulk... functions for case |
| 6072 |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
| 6073 |
|
|
| 6074 |
checkpoint50a_post |
checkpoint50a_post (2003/03/21) |
| 6075 |
o Bug fix for merging between c50 and KPP. |
o Bug fix for merging between c50 and KPP. |
| 6076 |
ikey was passed from thermodynamics to kpp_calc via |
ikey was passed from thermodynamics to kpp_calc via |
| 6077 |
common block rather than being recomputed in kpp_calc, |
common block rather than being recomputed in kpp_calc, |
| 6078 |
in contradiction with new key itdkey. |
in contradiction with new key itdkey. |
| 6079 |
New key ikppkey created, and tamc.h headers updated. |
New key ikppkey created, and tamc.h headers updated. |
| 6080 |
|
|
| 6081 |
checkpoint50 |
checkpoint50 (2003/03/08) |
| 6082 |
- 2nd step of merge with ecco-branch: |
- 2nd step of merge with ecco-branch: |
| 6083 |
merge changes in ecco-branch back into main trunk |
merge changes in ecco-branch back into main trunk |
| 6084 |
- bug fix in find_alpha |
- bug fix in find_alpha |
| 6086 |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
| 6087 |
- merged some sliced AD support routines |
- merged some sliced AD support routines |
| 6088 |
|
|
| 6089 |
checkpoint49 |
checkpoint49 (2003/03/06) |
| 6090 |
merged from ecco-branch: |
merged from ecco-branch: |
| 6091 |
o exf: |
o exf: |
| 6092 |
- Enable initialisation of forcing fields to constant |
- Enable initialisation of forcing fields to constant |
| 6124 |
(see MITgcm manual). |
(see MITgcm manual). |
| 6125 |
o cal: synchronized between MAIN and ecco-branch |
o cal: synchronized between MAIN and ecco-branch |
| 6126 |
|
|
| 6127 |
checkpoint48i_post |
checkpoint48i_post (2003/03/05) |
| 6128 |
o Changes to restore differentiability of code w.r.t. previous tag |
o Changes to restore differentiability of code w.r.t. previous tag |
| 6129 |
(mostly adding new routines to make list and replacing |
(mostly adding new routines to make list and replacing |
| 6130 |
pressure by totPhiHyd). |
pressure by totPhiHyd). |
| 6142 |
tbar, sbar, psbar, which should not be reinitialised; |
tbar, sbar, psbar, which should not be reinitialised; |
| 6143 |
only relevant for ecco-branch) |
only relevant for ecco-branch) |
| 6144 |
|
|
| 6145 |
checkpoint48h_post |
checkpoint48h_post (2003/02/28) |
| 6146 |
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
| 6147 |
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
| 6148 |
o Added SEAICE_initialHEFF to pkg/seaice |
o Added SEAICE_initialHEFF to pkg/seaice |
| 6149 |
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
| 6150 |
|
|
| 6151 |
checkpoint48g_post |
checkpoint48g_post (2003/02/18) |
| 6152 |
--- EOS: |
--- EOS: |
| 6153 |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
| 6154 |
store total Potential in totPhyHyd for diagnostics & EOS. |
store total Potential in totPhyHyd for diagnostics & EOS. |
| 6162 |
( changes results of ideal_2D_oce ) |
( changes results of ideal_2D_oce ) |
| 6163 |
o includes r* 2nd term in potential gradient. |
o includes r* 2nd term in potential gradient. |
| 6164 |
|
|
| 6165 |
checkpoint48f_post |
checkpoint48f_post (2003/02/18) |
| 6166 |
Merging from release1_p12: |
Merging from release1_p12: |
| 6167 |
o Modifications for using pkg/exf with pkg/seaice |
o Modifications for using pkg/exf with pkg/seaice |
| 6168 |
- improved description of the various forcing configurations |
- improved description of the various forcing configurations |
| 6190 |
- adjoint-friendly modifications |
- adjoint-friendly modifications |
| 6191 |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
| 6192 |
|
|
| 6193 |
checkpoint48e_post |
checkpoint48e_post (2003/02/12) |
| 6194 |
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
| 6195 |
o dynamics: change definition of computational domain & adapt mom_fluxform |
o dynamics: change definition of computational domain & adapt mom_fluxform |
| 6196 |
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
| 6201 |
inverted_barometer solid-body.cs-32x32x1 |
inverted_barometer solid-body.cs-32x32x1 |
| 6202 |
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
| 6203 |
|
|
| 6204 |
checkpoint48d_post |
checkpoint48d_post (2003/02/09) |
| 6205 |
o in preparation for r*: |
o in preparation for r*: |
| 6206 |
a) use pre-computed gradient of hydrostatic potential: |
a) use pre-computed gradient of hydrostatic potential: |
| 6207 |
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
| 6209 |
=> affects results of glob_oce_pressure (different truncation error) |
=> affects results of glob_oce_pressure (different truncation error) |
| 6210 |
update output.txt of ideal_2D_oce & global_ocean_pressure |
update output.txt of ideal_2D_oce & global_ocean_pressure |
| 6211 |
|
|
| 6212 |
checkpoint48d_pre |
checkpoint48d_pre (2003/02/08) |
| 6213 |
o in preparation for r*: |
o in preparation for r*: |
| 6214 |
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
| 6215 |
pass the 2 comp. of the grad. as arguments to momentum S/R. |
pass the 2 comp. of the grad. as arguments to momentum S/R. |
| 6216 |
but for the moment, only used if it does not change the results. |
but for the moment, only used if it does not change the results. |
| 6217 |
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
| 6218 |
|
|
| 6219 |
checkpoint48c_post |
checkpoint48c_post (2003/02/06) |
| 6220 |
Modifications in treatment of initial flux forcing controls |
Modifications in treatment of initial flux forcing controls |
| 6221 |
to avoid extra storing of flux fields. |
to avoid extra storing of flux fields. |
| 6222 |
|
|
| 6223 |
checkpoint48c_pre |
checkpoint48c_pre (2003/01/21) |
| 6224 |
o Added tidal_basin_2d experiment (currently 1D!) |
o Added tidal_basin_2d experiment (currently 1D!) |
| 6225 |
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
| 6226 |
|
|
| 6227 |
checkpoint48b_post |
checkpoint48b_post (2003/01/27) |
| 6228 |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
| 6229 |
(modification to pressure gradient not yet implemented) |
(modification to pressure gradient not yet implemented) |
| 6230 |
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
| 6231 |
(for U & V) that are used for vertical advection of momentum. |
(for U & V) that are used for vertical advection of momentum. |
| 6232 |
|
|
| 6233 |
checkpoint48a_post |
checkpoint48a_post (2003/01/24) |
| 6234 |
o In preparation for r*, use temp. array to compute vertical transport |
o In preparation for r*, use temp. array to compute vertical transport |
| 6235 |
in flux-form momentum pkg. => change results of few test-exp. |
in flux-form momentum pkg. => change results of few test-exp. |
| 6236 |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
| 6237 |
lab_sea, natl_box & plume_on_slope |
lab_sea, natl_box & plume_on_slope |
| 6238 |
|
|
| 6239 |
checkpoint48 |
checkpoint48 (2003/01/23) |
| 6240 |
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
| 6241 |
|
|
| 6242 |
checkpoint47j_post |
checkpoint47j_post (2003/01/21) |
| 6243 |
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
| 6244 |
o moved adexch from forward_step to addummy_in_stepping |
o moved adexch from forward_step to addummy_in_stepping |
| 6245 |
o added exch in ctrl_map_... |
o added exch in ctrl_map_... |
| 6258 |
re-activated full calculation of taperfct for case 'ac02' |
re-activated full calculation of taperfct for case 'ac02' |
| 6259 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
| 6260 |
|
|
| 6261 |
checkpoint47i_post |
checkpoint47i_post (2003/01/13) |
| 6262 |
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
| 6263 |
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
| 6264 |
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
| 6274 |
S/R gmredi_slope_psi should be cleaned |
S/R gmredi_slope_psi should be cleaned |
| 6275 |
o verification/carbon now has exactConserv=.TRUE. |
o verification/carbon now has exactConserv=.TRUE. |
| 6276 |
|
|
| 6277 |
checkpoint47g_post |
checkpoint47g_post (2003/01/10) |
| 6278 |
o time-average AIM output: becomes independent from statvars time-average |
o time-average AIM output: becomes independent from statvars time-average |
| 6279 |
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
| 6280 |
o After TAF bug fix: |
o After TAF bug fix: |
| 6300 |
in conjunction with data.gmredi parameters to be checked in |
in conjunction with data.gmredi parameters to be checked in |
| 6301 |
in a few minutes under verification/carbon/code/ |
in a few minutes under verification/carbon/code/ |
| 6302 |
|
|
| 6303 |
checkpoint47f_post |
checkpoint47f_post (2002/12/28) |
| 6304 |
Merging from release1_p10: |
Merging from release1_p10: |
| 6305 |
o modifications for using pkg/exf with pkg/seaice |
o modifications for using pkg/exf with pkg/seaice |
| 6306 |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
| 6312 |
- verification/lab_sea default experiment now uses |
- verification/lab_sea default experiment now uses |
| 6313 |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
| 6314 |
|
|
| 6315 |
checkpoint47e_post |
checkpoint47e_post (2002/12/27) |
| 6316 |
o created a tag prior to creating a branch |
o created a tag prior to creating a branch |
| 6317 |
|
|
| 6318 |
checkpoint47d_post |
checkpoint47d_post (2002/12/16) |
| 6319 |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
| 6320 |
at the bottom boundary had an erroneous half slip boundary condition |
at the bottom boundary had an erroneous half slip boundary condition |
| 6321 |
o added bottom drag and no slip boundary condition capabilities to |
o added bottom drag and no slip boundary condition capabilities to |
| 6322 |
oceanic pressure coordinates code |
oceanic pressure coordinates code |
| 6323 |
o added new verification experiment global_ocean_pressure, this experiment is |
o added new verification experiment global_ocean_pressure, this experiment is |
| 6324 |
also described in the tutorial section of the manual |
also described in the tutorial section of the manual |
| 6325 |
checkpoint47d_pre |
checkpoint47d_pre (2002/12/16) |
| 6326 |
|
|
| 6327 |
checkpoint47c_post |
checkpoint47c_post (2002/12/16) |
| 6328 |
o Added a verification experiment for a global cubed-sphere ocean run |
o Added a verification experiment for a global cubed-sphere ocean run |
| 6329 |
- verification/global_ocean.cubed32x32x30 |
- verification/global_ocean.cubed32x32x30 |
| 6330 |
- uses pkg/therm_seaice and pkg/bulk_forcing |
- uses pkg/therm_seaice and pkg/bulk_forcing |
| 6336 |
NOTES: requires option NONLIN_FRSURF to be "#define". |
NOTES: requires option NONLIN_FRSURF to be "#define". |
| 6337 |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
| 6338 |
|
|
| 6339 |
checkpoint47b_post |
checkpoint47b_post (2002/12/05) |
| 6340 |
Merging from release1_p9: |
Merging from release1_p9: |
| 6341 |
o pkg/seaice |
o pkg/seaice |
| 6342 |
- removed GOTO's and added taf directives |
- removed GOTO's and added taf directives |
| 6353 |
- added missing matlab routines |
- added missing matlab routines |
| 6354 |
- added test of thermodynamics parallelization |
- added test of thermodynamics parallelization |
| 6355 |
|
|
| 6356 |
checkpoint47a_post |
checkpoint47a_post (2002/11/23) |
| 6357 |
o new pkg: aim_v23 |
o new pkg: aim_v23 |
| 6358 |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
| 6359 |
for now, keep the same surface forcing as before. |
for now, keep the same surface forcing as before. |
| 6370 |
- Two ifdef statements for compile time, |
- Two ifdef statements for compile time, |
| 6371 |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
| 6372 |
|
|
| 6373 |
checkpoint47 |
checkpoint47 (2002/11/15) |
| 6374 |
differentiable version of checkpoint46n_post |
differentiable version of checkpoint46n_post |
| 6375 |
o bug fix in quasihydrostaticterms |
o bug fix in quasihydrostaticterms |
| 6376 |
o * "clean" adjoint code (in terms of extensive recomputations) |
o * "clean" adjoint code (in terms of extensive recomputations) |
| 6399 |
- #define GM_VISBECK_VARIABLE_K |
- #define GM_VISBECK_VARIABLE_K |
| 6400 |
- GM_taper_scheme = 'ldd97' |
- GM_taper_scheme = 'ldd97' |
| 6401 |
|
|
| 6402 |
checkpoint46n_post |
checkpoint46n_post (2002/11/12) |
| 6403 |
Merging from release1_p8: |
Merging from release1_p8: |
| 6404 |
o verification/natl_box: |
o verification/natl_box: |
| 6405 |
updating new external_fields_load routine |
updating new external_fields_load routine |
| 6453 |
the exf (and cal) package instead of the |
the exf (and cal) package instead of the |
| 6454 |
external_fields_load routine (cf README file). |
external_fields_load routine (cf README file). |
| 6455 |
|
|
| 6456 |
checkpoint46m_post |
checkpoint46m_post (2002/11/07) |
| 6457 |
o modified testscript to return -- when there are no lines of "%MON" output |
o modified testscript to return -- when there are no lines of "%MON" output |
| 6458 |
o added new flag "quasiHydrostatic" for QH mode |
o added new flag "quasiHydrostatic" for QH mode |
| 6459 |
and new routine quasihydrostaticterms() |
and new routine quasihydrostaticterms() |
| 6466 |
o removed gravitySign from PARM04 |
o removed gravitySign from PARM04 |
| 6467 |
o switched to g77/ifc from pgf77 in aim experiments |
o switched to g77/ifc from pgf77 in aim experiments |
| 6468 |
|
|
| 6469 |
checkpoint46l_post |
checkpoint46l_post (2002/11/01) |
| 6470 |
o made convective adjustment work with pressure coordinates: |
o made convective adjustment work with pressure coordinates: |
| 6471 |
- changed the direction of k-loop in convective_adjustment.F for the |
- changed the direction of k-loop in convective_adjustment.F for the |
| 6472 |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
| 6479 |
at the beginning of find_rho, find_alpha, and find_beta, does a |
at the beginning of find_rho, find_alpha, and find_beta, does a |
| 6480 |
check of the entire slice, if CPP-option |
check of the entire slice, if CPP-option |
| 6481 |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
| 6482 |
checkpoint46l_pre |
checkpoint46l_pre (2002/10/23) |
| 6483 |
|
|
| 6484 |
checkpoint46k_post |
checkpoint46k_post (2002/10/23) |
| 6485 |
o fixed the verification/global_ocean.90x40x15 experiment: |
o fixed the verification/global_ocean.90x40x15 experiment: |
| 6486 |
- new bathymetry (the world according to A., JMC, and M.) |
- new bathymetry (the world according to A., JMC, and M.) |
| 6487 |
- new initial fields and forcing fields (*.bin files) |
- new initial fields and forcing fields (*.bin files) |
| 6495 |
- read AIM physics parameters from a file (data.aimphys) |
- read AIM physics parameters from a file (data.aimphys) |
| 6496 |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
| 6497 |
|
|
| 6498 |
checkpoint46j_post |
checkpoint46j_post (2002/10/07) |
| 6499 |
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
| 6500 |
o move wVel computation at the end of the time step, in S/R integr_continuity |
o move wVel computation at the end of the time step, in S/R integr_continuity |
| 6501 |
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
| 6502 |
o update timeave pkg for wVel diagnostic. |
o update timeave pkg for wVel diagnostic. |
| 6503 |
checkpoint46j_pre |
checkpoint46j_pre (2002/09/27) |
| 6504 |
|
|
| 6505 |
checkpoint46i_post |
checkpoint46i_post (2002/09/25) |
| 6506 |
o Clean up AIM package (and keep the results unchanged): |
o Clean up AIM package (and keep the results unchanged): |
| 6507 |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
include CPP_OPTION and use IMPLICT NONE in all routines ; |
| 6508 |
declare all the variables _RL ; use _d 0 for all numerical constants. |
declare all the variables _RL ; use _d 0 for all numerical constants. |
| 6509 |
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
| 6510 |
|
|
| 6511 |
checkpoint46h_post |
checkpoint46h_post (2002/09/25) |
| 6512 |
o cleaned up the use of rhoNil and rhoConst. |
o cleaned up the use of rhoNil and rhoConst. |
| 6513 |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
- rhoNil should only appear in the LINEAR equation of state, everywhere |
| 6514 |
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
| 6518 |
value is 999.8 kg/m^3 |
value is 999.8 kg/m^3 |
| 6519 |
o cleanup up external_forcing.F and external_forcing_surf.F |
o cleanup up external_forcing.F and external_forcing_surf.F |
| 6520 |
- can now be used by both OCEANIC and OCEANICP |
- can now be used by both OCEANIC and OCEANICP |
| 6521 |
checkpoint46h_pre |
checkpoint46h_pre (2002/09/18) |
| 6522 |
|
|
| 6523 |
Added code to convert surface volume flux (fresh water) into |
Added code to convert surface volume flux (fresh water) into |
| 6524 |
a mass flux when using P coordinates in the ocean (OCEANICP). |
a mass flux when using P coordinates in the ocean (OCEANICP). |
| 6525 |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
| 6526 |
|
|
| 6527 |
checkpoint46g_post |
checkpoint46g_post (2002/09/18) |
| 6528 |
o Include a new diagnostic variable phiHydLow for the ocean model |
o Include a new diagnostic variable phiHydLow for the ocean model |
| 6529 |
- in z-coordinates, it is the bottom pressure anomaly |
- in z-coordinates, it is the bottom pressure anomaly |
| 6530 |
- in p-coordinates, it is the sea surface elevation |
- in p-coordinates, it is the sea surface elevation |
| 6542 |
- removed obsolete 'eqn' from the parameter list. |
- removed obsolete 'eqn' from the parameter list. |
| 6543 |
o added two new verification experiments: gop and goz |
o added two new verification experiments: gop and goz |
| 6544 |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
| 6545 |
checkpoint46g_pre |
checkpoint46g_pre (2002/09/16) |
| 6546 |
|
|
| 6547 |
checkpoint46f_post |
checkpoint46f_post (2002/09/16) |
| 6548 |
o Enable tangent linear (forward mode) gradient checks: |
o Enable tangent linear (forward mode) gradient checks: |
| 6549 |
- extended active file handling to g_... files |
- extended active file handling to g_... files |
| 6550 |
- added TANGENT_SIMULATION to theSimulationMode |
- added TANGENT_SIMULATION to theSimulationMode |
| 6552 |
o added tangent linear setup in verification/carbon/code_ftl |
o added tangent linear setup in verification/carbon/code_ftl |
| 6553 |
o added adjoint setup in verification/front_relax/code_ad |
o added adjoint setup in verification/front_relax/code_ad |
| 6554 |
|
|
| 6555 |
checkpoint46e_post |
checkpoint46e_post (2002/09/05) |
| 6556 |
o Added new equation of state -> MDJWF |
o Added new equation of state -> MDJWF |
| 6557 |
- EOS of McDougall et al., 2002, JAOT, submitted |
- EOS of McDougall et al., 2002, JAOT, submitted |
| 6558 |
- caveat: the equation of state is only valid for a smaller (more |
- caveat: the equation of state is only valid for a smaller (more |
| 6561 |
- added more check values for density in check_eos (ini_eos.F), some of |
- added more check values for density in check_eos (ini_eos.F), some of |
| 6562 |
the old check values are out of the range of the MDJWF-eos, so don't |
the old check values are out of the range of the MDJWF-eos, so don't |
| 6563 |
expect perfect matches for those |
expect perfect matches for those |
| 6564 |
checkpoint46e_pre |
checkpoint46e_pre (2002/08/19) |
| 6565 |
|
|
| 6566 |
checkpoint46d_post |
checkpoint46d_post (2002/08/19) |
| 6567 |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
| 6568 |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
| 6569 |
case of pressure coordinates. eosType='JMD95Z' in |
case of pressure coordinates. eosType='JMD95Z' in |
| 6570 |
combination with buoyancyRelation='OCEANICP' now causes an error. |
combination with buoyancyRelation='OCEANICP' now causes an error. |
| 6571 |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 6572 |
in find_alpha/beta. |
in find_alpha/beta. |
| 6573 |
checkpoint46d_pre |
checkpoint46d_pre (2002/08/15) |
| 6574 |
|
|
| 6575 |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 6576 |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
| 6577 |
|
|
| 6578 |
checkpoint46c_post |
checkpoint46c_post (2002/08/15) |
| 6579 |
o Changes necessary for ocean in p-coordinates |
o Changes necessary for ocean in p-coordinates |
| 6580 |
- Added new buoyancy relation = 'OCEANICP' |
- Added new buoyancy relation = 'OCEANICP' |
| 6581 |
- Added new parameters = gravitySign (this used to be contained inside |
- Added new parameters = gravitySign (this used to be contained inside |
| 6582 |
the factor dRdZ which I added when we first switched to R coordinates). |
the factor dRdZ which I added when we first switched to R coordinates). |
| 6583 |
X GM/Redi is not compatible (yet) |
X GM/Redi is not compatible (yet) |
| 6584 |
X bottom drag and no-slip need to be debugged. |
X bottom drag and no-slip need to be debugged. |
| 6585 |
checkpoint46c_pre |
checkpoint46c_pre (2002/08/07) |
| 6586 |
|
|
| 6587 |
checkpoint46b_post |
checkpoint46b_post (2002/08/07) |
| 6588 |
o Added new equation of state -> JMD95Z and JMD95P |
o Added new equation of state -> JMD95Z and JMD95P |
| 6589 |
- EOS of Jackett and McDougall, 1995, JAOT |
- EOS of Jackett and McDougall, 1995, JAOT |
| 6590 |
- moved all EOS parameters into EOS.h |
- moved all EOS parameters into EOS.h |
| 6593 |
in-situ temperature (see JMD95) |
in-situ temperature (see JMD95) |
| 6594 |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
| 6595 |
unesco.f to be used with POLY3 |
unesco.f to be used with POLY3 |
| 6596 |
checkpoint46b_pre |
checkpoint46b_pre (2002/07/31) |
| 6597 |
|
|
| 6598 |
checkpoint46a_post |
checkpoint46a_post (2002/07/31) |
| 6599 |
o Added (atmospheric) pressure loading |
o Added (atmospheric) pressure loading |
| 6600 |
- new field in FFIELDS.h, etc... |
- new field in FFIELDS.h, etc... |
| 6601 |
- new cpp flag ATMOSPHERIC_LOADING |
- new cpp flag ATMOSPHERIC_LOADING |
| 6602 |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
o Changed hFacC to _hFacC in calc_phi_hyd.F |
| 6603 |
o Added SHORTWAVE_HEATING to some files for consistency |
o Added SHORTWAVE_HEATING to some files for consistency |
| 6604 |
checkpoint46a_pre |
checkpoint46a_pre (2002/07/13) |
| 6605 |
|
|
| 6606 |
checkpoint46 |
checkpoint46 (2002/07/13) |
| 6607 |
further merges from release1_p5 |
further merges from release1_p5 |
| 6608 |
o new ctrl package |
o new ctrl package |
| 6609 |
- adopted from ECCO environment to enable optimization |
- adopted from ECCO environment to enable optimization |
| 6630 |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
| 6631 |
o incorporated hooks for sponge layer code (external_forcing.F) |
o incorporated hooks for sponge layer code (external_forcing.F) |
| 6632 |
|
|
| 6633 |
checkpoint45d_post |
checkpoint45d_post (2002/07/12) |
| 6634 |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
| 6635 |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
| 6636 |
(affects plume_on_slope "cg2d" output) |
(affects plume_on_slope "cg2d" output) |
| 6644 |
- for each tracer, define internal flag for multiDimAdvection & A-B |
- for each tracer, define internal flag for multiDimAdvection & A-B |
| 6645 |
o monitor: change definition of KE to check conservation of Energy |
o monitor: change definition of KE to check conservation of Energy |
| 6646 |
|
|
| 6647 |
checkpoint45c_post |
checkpoint45c_post (2002/05/30) |
| 6648 |
o Removed f90 comments ("!") |
o Removed f90 comments ("!") |
| 6649 |
o Modified initialisations to enable exf package for MITgcm |
o Modified initialisations to enable exf package for MITgcm |
| 6650 |
(without invoking ECCO_PACKAGE). |
(without invoking ECCO_PACKAGE). |
| 6652 |
- enable centered differences |
- enable centered differences |
| 6653 |
- modified format of standard output |
- modified format of standard output |
| 6654 |
|
|
| 6655 |
checkpoint45b_post |
checkpoint45b_post (2002/05/30) |
| 6656 |
o cleaned exchange calls in cg2d |
o cleaned exchange calls in cg2d |
| 6657 |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
| 6658 |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
| 6664 |
(corresponding adjustment of TAF tape initialisation). |
(corresponding adjustment of TAF tape initialisation). |
| 6665 |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
| 6666 |
|
|
| 6667 |
checkpoint45a_post |
checkpoint45a_post (2002/05/01) |
| 6668 |
o compute Rho over the whole domain (extend iMin,jMin indices) |
o compute Rho over the whole domain (extend iMin,jMin indices) |
| 6669 |
o specific exchange for X-slice domain (case Ny=1) |
o specific exchange for X-slice domain (case Ny=1) |
| 6670 |
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
| 6684 |
(conflict on some platforms, e.g. IBM SP3) |
(conflict on some platforms, e.g. IBM SP3) |
| 6685 |
o modified carbon verif. |
o modified carbon verif. |
| 6686 |
|
|
| 6687 |
checkpoint44h_pre |
checkpoint44h_pre (2002/03/14) |
| 6688 |
o vertical grid option: allow to put the Interface at the middle between |
o vertical grid option: allow to put the Interface at the middle between |
| 6689 |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
2 cell-centers ; replace delZ in pkg/kpp by drF. |
| 6690 |
o GM Advective form: Tracers are advected using the residual transport (= |
o GM Advective form: Tracers are advected using the residual transport (= |
| 6691 |
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
| 6692 |
|
|
| 6693 |
checkpoint44g_post |
checkpoint44g_post (2002/03/05) |
| 6694 |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
| 6695 |
results) ; ifdef missing in thermodynamics.F |
results) ; ifdef missing in thermodynamics.F |
| 6696 |
|
|
| 6755 |
o check parameters & config (chkpt44a_pre,post) |
o check parameters & config (chkpt44a_pre,post) |
| 6756 |
o OBC and NonLin_FrSurf. |
o OBC and NonLin_FrSurf. |
| 6757 |
|
|
| 6758 |
checkpoint44 |
checkpoint44 (2002/01/18) |
| 6759 |
o fix bug in mom_vi_del2uv |
o fix bug in mom_vi_del2uv |
| 6760 |
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
| 6761 |
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
| 6763 |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
| 6764 |
o added some stuff for AD |
o added some stuff for AD |
| 6765 |
|
|
| 6766 |
checkpoint43 |
checkpoint43 (2001/09/28) |
| 6767 |
o added two new advection tests |
o added two new advection tests |
| 6768 |
o added global 4x4 degree ocean test |
o added global 4x4 degree ocean test |
| 6769 |
o added test of H&S94 with free surface on cube |
o added test of H&S94 with free surface on cube |
| 6770 |
o some final mods for gradient check, adjoint,... |
o some final mods for gradient check, adjoint,... |
| 6771 |
|
|
| 6772 |
checkpoint42 |
checkpoint42 (2001/09/27) |
| 6773 |
Fixed AD-related problems: |
Fixed AD-related problems: |
| 6774 |
o Store directives up-to-date with re-arranged Adams-Bashforth |
o Store directives up-to-date with re-arranged Adams-Bashforth |
| 6775 |
(mainly thermodynamics.F) |
(mainly thermodynamics.F) |
| 6781 |
for the case ALLOW_KPP |
for the case ALLOW_KPP |
| 6782 |
o Cleaned argument list for timestep_tracer.F |
o Cleaned argument list for timestep_tracer.F |
| 6783 |
|
|
| 6784 |
checkpoint41 |
checkpoint41 (2001/09/27) |
| 6785 |
o re-formatted/added comments in prologues of key subroutines |
o re-formatted/added comments in prologues of key subroutines |
| 6786 |
to work with protex |
to work with protex |
| 6787 |
|
|
| 6788 |
checkpoint40 |
checkpoint40 (2001/09/27) |
| 6789 |
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 |
| 6790 |
o added FLT (floats) package from Arne along with demo. experiment |
o added FLT (floats) package from Arne along with demo. experiment |
| 6791 |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
| 6794 |
o modified multi-dim method to work on cube |
o modified multi-dim method to work on cube |
| 6795 |
o bug fix in KPP (from DM) |
o bug fix in KPP (from DM) |
| 6796 |
|
|
| 6797 |
checkpoint40pre9 |
checkpoint40pre9 (2001/09/27) |
| 6798 |
o added DST advection schemes |
o added DST advection schemes |
| 6799 |
o fix MPI bug on SGI's |
o fix MPI bug on SGI's |
| 6800 |
o modifications for non-linear free-surface |
o modifications for non-linear free-surface |
| 6804 |
o added/updated many matlab scripts |
o added/updated many matlab scripts |
| 6805 |
o added multi-dimensional advection method for tracers |
o added multi-dimensional advection method for tracers |
| 6806 |
|
|
| 6807 |
checkpoint40pre8 |
checkpoint40pre8 (2001/09/05) |
| 6808 |
o new package rw/ |
o new package rw/ |
| 6809 |
Added method for dumping intermediate local arrays: |
Added method for dumping intermediate local arrays: |
| 6810 |
mdsio_writetile - same as mdsio_writefield except works from inside |
mdsio_writetile - same as mdsio_writefield except works from inside |
| 6823 |
currently nothing implemented to switch this storing off |
currently nothing implemented to switch this storing off |
| 6824 |
in case fluxform is used since no CPP flag available). |
in case fluxform is used since no CPP flag available). |
| 6825 |
|
|
| 6826 |
checkpoint40pre7 |
checkpoint40pre7 (2001/08/14) |
| 6827 |
o bug fix in dynamics.F |
o bug fix in dynamics.F |
| 6828 |
calc_viscosity called before k=1,Nr loop. |
calc_viscosity called before k=1,Nr loop. |
| 6829 |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
o added some #ifdef's ALLOW_PASSIVE_TRACER |
| 6830 |
o cleaned initialisations in ctrl_map_ini |
o cleaned initialisations in ctrl_map_ini |
| 6831 |
related to TAF |
related to TAF |
| 6832 |
|
|
| 6833 |
checkpoint40pre6 |
checkpoint40pre6 (2001/08/13) |
| 6834 |
o split dynamics into thermodynamics & dynamics |
o split dynamics into thermodynamics & dynamics |
| 6835 |
o corresponding split of calc_diffusivity into |
o corresponding split of calc_diffusivity into |
| 6836 |
calc_diffusivity, calc_viscosity |
calc_diffusivity, calc_viscosity |
| 6838 |
o Added diffkr, kapgm to control variables |
o Added diffkr, kapgm to control variables |
| 6839 |
o bug fix in gmredi_slope_limit for ldd97 |
o bug fix in gmredi_slope_limit for ldd97 |
| 6840 |
|
|
| 6841 |
checkpoint40pre5 |
checkpoint40pre5 (2001/07/31) |
| 6842 |
o proper initialization of Adams-Bashforth time stepping |
o proper initialization of Adams-Bashforth time stepping |
| 6843 |
+ uses forward step for very first step of model (iter=0) |
+ uses forward step for very first step of model (iter=0) |
| 6844 |
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 |
| 6852 |
+ this uses an alternative form of ini_curvilinear_grid.F which |
+ this uses an alternative form of ini_curvilinear_grid.F which |
| 6853 |
is not necessarily any better than the current one... |
is not necessarily any better than the current one... |
| 6854 |
|
|
| 6855 |
checkpoint40pre4 |
checkpoint40pre4 (2001/07/30) |
| 6856 |
o added re-initialisations of utrans,vtrans,rtrans in |
o added re-initialisations of utrans,vtrans,rtrans in |
| 6857 |
calc_common_factors which are crucial for TAF. |
calc_common_factors which are crucial for TAF. |
| 6858 |
o extended iMin,jMin range for calc_common_factors, |
o extended iMin,jMin range for calc_common_factors, |
| 6860 |
o added option ALLOW_PASSIVE_TRACER |
o added option ALLOW_PASSIVE_TRACER |
| 6861 |
o a few minor updates and fixes |
o a few minor updates and fixes |
| 6862 |
|
|
| 6863 |
checkpoint40pre3 |
checkpoint40pre3 (2001/07/13) |
| 6864 |
o created calc_gtr1.F for gad package |
o created calc_gtr1.F for gad package |
| 6865 |
o split the_main_loop and re-introduced forward_step |
o split the_main_loop and re-introduced forward_step |
| 6866 |
o some recomputations of nIter0 for TAMC |
o some recomputations of nIter0 for TAMC |
| 6867 |
|
|
| 6868 |
checkpoint40pre2 |
checkpoint40pre2 (2001/07/13) |
| 6869 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
| 6870 |
o Added gradient check package |
o Added gradient check package |
| 6871 |
o Added routines for passive tracer handling |
o Added routines for passive tracer handling |
| 6872 |
o Added carbon sequestration sensitivity experiment |
o Added carbon sequestration sensitivity experiment |
| 6873 |
|
|
| 6874 |
checkpoint39 |
checkpoint39 (2001/05/14) |
| 6875 |
o Modifications and fixes to support TAMC |
o Modifications and fixes to support TAMC |
| 6876 |
(mainly missing or wrong directives) |
(mainly missing or wrong directives) |
| 6877 |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
| 6885 |
(NB: this is not the full ECCO environment) |
(NB: this is not the full ECCO environment) |
| 6886 |
o disabled some packages by default in genmake |
o disabled some packages by default in genmake |
| 6887 |
|
|
| 6888 |
checkpoint38 |
checkpoint38 (2001/04/10) |
| 6889 |
o see notes_c37_adj.txt |
o see notes_c37_adj.txt |
| 6890 |
o corrected wrong layer index in external_forcing_t |
o corrected wrong layer index in external_forcing_t |
| 6891 |
o replaced the_main_loop/forward_step by the_main_loop |
o replaced the_main_loop/forward_step by the_main_loop |
| 6893 |
(replaced criteria for initial/final state) |
(replaced criteria for initial/final state) |
| 6894 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
| 6895 |
|
|
| 6896 |
checkpoint37 |
checkpoint37 (2001/03/13) |
| 6897 |
o mdsio.F routine split and packaged in pkg/mdsio |
o mdsio.F routine split and packaged in pkg/mdsio |
| 6898 |
(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 |
| 6899 |
used unless genmake -disable=mdsio) |
used unless genmake -disable=mdsio) |
| 6910 |
o Non-Hydrostatic pickup file Pb fixed. |
o Non-Hydrostatic pickup file Pb fixed. |
| 6911 |
o bug with Rigid-lid version (since c35) fixed. |
o bug with Rigid-lid version (since c35) fixed. |
| 6912 |
|
|
| 6913 |
checkpoint36 |
checkpoint36 (2001/02/20) |
| 6914 |
o implement Crank-Nickelson barotropic time-stepping |
o implement Crank-Nickelson barotropic time-stepping |
| 6915 |
o recover Time-Average diagnostics |
o recover Time-Average diagnostics |
| 6916 |
o fix Pb in checkpoint (PR#19) |
o fix Pb in checkpoint (PR#19) |
| 6917 |
o AIM become a standard package ; clean unused CPP_kees |
o AIM become a standard package ; clean unused CPP_kees |
| 6918 |
|
|
| 6919 |
checkpoint35 |
checkpoint35 (2001/02/08) |
| 6920 |
o subtantial rewrite of dynamics.f |
o subtantial rewrite of dynamics.f |
| 6921 |
o allows staggered time-stepping |
o allows staggered time-stepping |
| 6922 |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
| 6923 |
o added bottom drag (linear + quadratic) |
o added bottom drag (linear + quadratic) |
| 6924 |
|
|
| 6925 |
checkpoint34 |
checkpoint34 (2001/01/30) |
| 6926 |
o Modified exchange routines for correct reverse simulation. |
o Modified exchange routines for correct reverse simulation. |
| 6927 |
o Added verification output to comply with bug fix in impldiff.F |
o Added verification output to comply with bug fix in impldiff.F |
| 6928 |
as of c33 (exp2, natl_box). |
as of c33 (exp2, natl_box). |
| 6933 |
o Added routine GLOBAL_SUM_INT to global_sum.F |
o Added routine GLOBAL_SUM_INT to global_sum.F |
| 6934 |
o Added mdsio_gl.F for ECCO purposes. |
o Added mdsio_gl.F for ECCO purposes. |
| 6935 |
|
|
| 6936 |
checkpoint33 |
checkpoint33 (2000/11/30) |
| 6937 |
o Fixed bug in lower BC in impldiff.F |
o Fixed bug in lower BC in impldiff.F |
| 6938 |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
o Fixed confusion about units of forcing arrays in FFIELDS.h |
| 6939 |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
namely Fu,Fv,Qnet,Qsw,EmPmR: |
| 6951 |
possibly use them. |
possibly use them. |
| 6952 |
o Corrected genmake to delete a temporary file during configuration |
o Corrected genmake to delete a temporary file during configuration |
| 6953 |
|
|
| 6954 |
checkpoint32 |
checkpoint32 (2000/11/13) |
| 6955 |
o Scaling of forcing fields moved from external_forcing.F to |
o Scaling of forcing fields moved from external_forcing.F to |
| 6956 |
external_fields_scale.F, called directly after loading fields. |
external_fields_scale.F, called directly after loading fields. |
| 6957 |
o Surface relaxation terms added to surface tendency fields in |
o Surface relaxation terms added to surface tendency fields in |
| 6962 |
o Modifications and bug fixes in KPP package. |
o Modifications and bug fixes in KPP package. |
| 6963 |
o Verification experiment for KPP added (verification/nat_box/) |
o Verification experiment for KPP added (verification/nat_box/) |
| 6964 |
|
|
| 6965 |
checkpoint31 |
checkpoint31 (2000/09/11) |
| 6966 |
o Packages interface brought in line with defined standard |
o Packages interface brought in line with defined standard |
| 6967 |
-> new routines packages_...F |
-> new routines packages_...F |
| 6968 |
-> changes in initialise_fixed.F, initialise_varia.F |
-> changes in initialise_fixed.F, initialise_varia.F |
| 6979 |
- not yet tested for GMRedi. |
- not yet tested for GMRedi. |
| 6980 |
- not yet tested for KPP. |
- not yet tested for KPP. |
| 6981 |
|
|
| 6982 |
checkpoint30 |
checkpoint30 (2000/07/13) |
| 6983 |
o Updates for OBCs |
o Updates for OBCs |
| 6984 |
o New experiment for test OBCs (internal_wave) |
o New experiment for test OBCs (internal_wave) |
| 6985 |
o New output.txt in verification/exp4/results/ |
o New output.txt in verification/exp4/results/ |
| 6988 |
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.) |
| 6989 |
and entry for T90 in genmake |
and entry for T90 in genmake |
| 6990 |
|
|
| 6991 |
checkpoint29 |
checkpoint29 (2000/06/21) |
| 6992 |
o packaged KPP and GM/Redi |
o packaged KPP and GM/Redi |
| 6993 |
|
|
| 6994 |
checkpoint28 |
checkpoint28 (2000/06/09) |
| 6995 |
o Corrected initialization of hFacMin for difference vertical coordinates |
o Corrected initialization of hFacMin for difference vertical coordinates |
| 6996 |
o Modified calculation of partial cell thickness to more robust algorithm |
o Modified calculation of partial cell thickness to more robust algorithm |
| 6997 |
o config_summary.F: replaced write_1D_... by write_0D_... |
o config_summary.F: replaced write_1D_... by write_0D_... |
| 7004 |
included store directives and tape key computations required for TAMC. |
included store directives and tape key computations required for TAMC. |
| 7005 |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
| 7006 |
|
|
| 7007 |
checkpoint27 |
checkpoint27 (2000/04/10) |
| 7008 |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
| 7009 |
formulation works properly with variable resolution. |
formulation works properly with variable resolution. |
| 7010 |
o restructured the calling tree between the_model_main() and dynamics() |
o restructured the calling tree between the_model_main() and dynamics() |
| 7012 |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
| 7013 |
in new routine ini_psurf() |
in new routine ini_psurf() |
| 7014 |
|
|
| 7015 |
checkpoint26 |
checkpoint26 (2000/04/05) |
| 7016 |
o moved some #ifdef in optional routines to encompass everything |
o moved some #ifdef in optional routines to encompass everything |
| 7017 |
except the argument declarations. This was using up some memory. |
except the argument declarations. This was using up some memory. |
| 7018 |
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 |
| 7022 |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
| 7023 |
o patch for 2 processor JAM mode |
o patch for 2 processor JAM mode |
| 7024 |
|
|
| 7025 |
checkpoint25 |
checkpoint25 (2000/03/15) |
| 7026 |
o updates for OBCs and NH |
o updates for OBCs and NH |
| 7027 |
o dramatically reduced memory usage |
o dramatically reduced memory usage |
| 7028 |
o added "JAM" routines for use on Artic network |
o added "JAM" routines for use on Artic network |
| 7033 |
an explicit free-surface option) |
an explicit free-surface option) |
| 7034 |
o initial state input files for U and V |
o initial state input files for U and V |
| 7035 |
|
|
| 7036 |
checkpoint24 |
checkpoint24 (1999/08/02) |
| 7037 |
o Removed some spurious "REAL"s |
o Removed some spurious "REAL"s |
| 7038 |
o Updated KPP to latest version from JPL |
o Updated KPP to latest version from JPL |
| 7039 |
o Added a COS(latitude) in horizontal viscosity |
o Added a COS(latitude) in horizontal viscosity |
| 7040 |
|
|
| 7041 |
checkpoint23 |
checkpoint23 (1999/05/26) |
| 7042 |
o Added del^4 diffusion for salt and temperature |
o Added del^4 diffusion for salt and temperature |
| 7043 |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
| 7044 |
|
|
| 7045 |
checkpoint22 |
checkpoint22 (1999/05/18) |
| 7046 |
o Made many small changes: implicit none, format(i5), etc... |
o Made many small changes: implicit none, format(i5), etc... |
| 7047 |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
| 7048 |
|
|
| 7049 |
checkpoint21 |
checkpoint21 (1999/05/18) |
| 7050 |
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) |
| 7051 |
o Split-up mid-level I/O routines |
o Split-up mid-level I/O routines |
| 7052 |
o Updated input data for experiments 0,1,2,4 and 5 |
o Updated input data for experiments 0,1,2,4 and 5 |
| 7053 |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
| 7054 |
|
|
| 7055 |
checkpoint20 |
checkpoint20 (1999/03/22) |
| 7056 |
o Tidied up open-boundaries some more |
o Tidied up open-boundaries some more |
| 7057 |
o Added non-hydrostatic code |
o Added non-hydrostatic code |
| 7058 |
o Fixed some input data |
o Fixed some input data |
| 7059 |
o Modified MPI start-up to work in "coupled" context. |
o Modified MPI start-up to work in "coupled" context. |
| 7060 |
|
|
| 7061 |
checkpoint19 |
checkpoint19 (1998/12/15) |
| 7062 |
o Tidied up directory structure for verification experiments. |
o Tidied up directory structure for verification experiments. |
| 7063 |
o Added new code for open boundaries. |
o Added new code for open boundaries. |
| 7064 |
o Corrected advective terms near boundaries. |
o Corrected advective terms near boundaries. |
| 7066 |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
| 7067 |
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. |
| 7068 |
|
|
| 7069 |
checkpoint18 |
checkpoint18 (1998/11/30) |
| 7070 |
o Further changes for optional code generation with |
o Further changes for optional code generation with |
| 7071 |
CPP - ugh! |
CPP - ugh! |
| 7072 |
|
|
| 7073 |
checkpoint17 |
checkpoint17 (1998/11/03) |
| 7074 |
o Beginning to incorporating modularity |
o Beginning to incorporating modularity |
| 7075 |
for supporting atmos. and ocean configs. |
for supporting atmos. and ocean configs. |
| 7076 |
o Small changes for TAMC complinace |
o Small changes for TAMC complinace |
| 7077 |
o New ultra simple test case. Barotropic box |
o New ultra simple test case. Barotropic box |
| 7078 |
configuration "exp0". |
configuration "exp0". |
| 7079 |
|
|
| 7080 |
checkpoint16 |
checkpoint16 (1998/10/28) |
| 7081 |
o Minor changes to exchange routines to support |
o Minor changes to exchange routines to support |
| 7082 |
accumulation in reverse mode. Adjoint of an |
accumulation in reverse mode. Adjoint of an |
| 7083 |
assignment is an addition. |
assignment is an addition. |
| 7085 |
syntax) and by g77 under Linux ( 72 character |
syntax) and by g77 under Linux ( 72 character |
| 7086 |
limit ). |
limit ). |
| 7087 |
|
|
| 7088 |
checkpoint15 |
checkpoint15 (1998/09/29) |
| 7089 |
Rewrote exchange routines to allow |
Rewrote exchange routines to allow |
| 7090 |
o General tile <-> tile connectivity. |
o General tile <-> tile connectivity. |
| 7091 |
o TAMC reverse mode flag ( is this really needed? ) |
o TAMC reverse mode flag ( is this really needed? ) |
| 7094 |
shmput/shmget, VIA, SYSV shmem and every other cool |
shmput/shmget, VIA, SYSV shmem and every other cool |
| 7095 |
communication method. |
communication method. |
| 7096 |
|
|
| 7097 |
checkpoint14 |
checkpoint14 (1998/09/09) |
| 7098 |
Consistent isomorphism chages made. These allow dynamical core |
Consistent isomorphism chages made. These allow dynamical core |
| 7099 |
to support both pressure and meters as a vertical coordinate. |
to support both pressure and meters as a vertical coordinate. |
| 7100 |
|
|
| 7101 |
checkpoint13 |
checkpoint13 (1998/07/17) |
| 7102 |
Release which corrects global_max problem and a couple |
Release which corrects global_max problem and a couple |
| 7103 |
of KGM time-averaging diagnostic errors. Also contains |
of KGM time-averaging diagnostic errors. Also contains |
| 7104 |
a double-gyre experiment setup as well as the baseline |
a double-gyre experiment setup as well as the baseline |
| 7113 |
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 |
| 7114 |
we've actually tested it... |
we've actually tested it... |
| 7115 |
|
|
| 7116 |
checkpoint12 |
checkpoint12 (1998/07/08) |
| 7117 |
Tidy up and added generic genmake script (formerly |
Tidy up and added generic genmake script (formerly |
| 7118 |
configure script). |
configure script). |
| 7119 |
Released to testers. |
Released to testers. |
| 7120 |
|
|
| 7121 |
checkpoint11 |
checkpoint11 (1998/07/02) |
| 7122 |
Re-arranged initialise() and introduced ini_vertical_grid() |
Re-arranged initialise() and introduced ini_vertical_grid() |
| 7123 |
and ini_masks_etc(). |
and ini_masks_etc(). |
| 7124 |
|
|
| 7125 |
checkpoint10 |
checkpoint10 (1998/07/01) |
| 7126 |
Introduced the configure script. |
Introduced the configure script. |
| 7127 |
Separated out the diags package. |
Separated out the diags package. |
| 7128 |
Added template for writing time-averages of tile/intermediate quantities. |
Added template for writing time-averages of tile/intermediate quantities. |
| 7129 |
Updated SIZE.h in exp2 and made the data big-endian. |
Updated SIZE.h in exp2 and made the data big-endian. |
| 7130 |
|
|
| 7131 |
checkpoint9 |
checkpoint9 (1998/06/22) |
| 7132 |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
MPI fix. Filename changes (meta/data). salbin*y stuff. |
| 7133 |
General tidy-up. |
General tidy-up. |
| 7134 |
SST.bin SSS.bin added to verification/exp2 |
SST.bin SSS.bin added to verification/exp2 |
| 7135 |
|
|
| 7136 |
checkpoint8 |
checkpoint8 (1998/06/22) |
| 7137 |
Inludes time-dependant forcing and time-averaging. |
Inludes time-dependant forcing and time-averaging. |
| 7138 |
Works at 4x4 and 2.8125x2.8125 global |
Works at 4x4 and 2.8125x2.8125 global |
| 7139 |
|
|
| 7143 |
model etc.. |
model etc.. |
| 7144 |
Configured for verification/exp2 - 4 degree global, two process. |
Configured for verification/exp2 - 4 degree global, two process. |
| 7145 |
|
|
| 7146 |
checkpoint7 |
checkpoint7 (1998/06/15) |
| 7147 |
Created by cnh |
Created by cnh |
| 7148 |
Simple 4 degree global simulation |
Simple 4 degree global simulation |
| 7149 |
configuration. |
configuration. |
| 7151 |
hydrography, bathymetry etc |
hydrography, bathymetry etc |
| 7152 |
Does not include Heat Flux and E-P |
Does not include Heat Flux and E-P |
| 7153 |
|
|
| 7154 |
checkpoint6 |
checkpoint6 (1998/06/08) |
| 7155 |
Created by cnh |
Created by cnh |
| 7156 |
merged checkpoint5 with CD and |
merged checkpoint5 with CD and |
| 7157 |
spherical polar code. |
spherical polar code. |
| 7158 |
Still some problems with GM Redi |
Still some problems with GM Redi |
| 7159 |
abd full topography. |
abd full topography. |
| 7160 |
|
|
| 7161 |
checkpoint5 |
checkpoint5 (1998/06/08) |
| 7162 |
Created by AJA |
Created by AJA |
| 7163 |
contains updates to GM Redi |
contains updates to GM Redi |
| 7164 |
and reordered timestepping loop |
and reordered timestepping loop |
| 7165 |
for Implicit Diffusion. |
for Implicit Diffusion. |
| 7166 |
|
|
| 7167 |
checkpoint4 |
checkpoint4 (1998/05/30) |
| 7168 |
Created by cnh |
Created by cnh |
| 7169 |
Contains memory saving macros ( _rdxc etc..) for when |
Contains memory saving macros ( _rdxc etc..) for when |
| 7170 |
grid variations are limited. |
grid variations are limited. |
| 7171 |
Contains polynomial coeffs for EOS and knudsen program |
Contains polynomial coeffs for EOS and knudsen program |
| 7172 |
for generation. |
for generation. |
| 7173 |
|
|
| 7174 |
checkpoint3 |
checkpoint3 (1998/05/26) |
| 7175 |
Created by cnh |
Created by cnh |
| 7176 |
Added extra flags for runtime options |
Added extra flags for runtime options |
| 7177 |
Added this file |
Added this file |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch