| 1 |
$Header$ |
$Header$ |
| 2 |
|
$Name$ |
| 3 |
|
|
| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o pkg/shelfice: |
| 8 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
| 9 |
|
with SHELFICEtopoFile in data.shelfice |
| 10 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
| 11 |
|
subroutines of the shelfice package |
| 12 |
|
- separate initialisation of "fixed" and "variable" variables |
| 13 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
| 14 |
|
o fix a bug in diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
| 15 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
| 16 |
|
and rename: |
| 17 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
| 18 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
| 19 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
| 20 |
|
|
| 21 |
|
checkpoint61c |
| 22 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
| 23 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
| 24 |
|
of oceanic real-fresh water flux). |
| 25 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
| 26 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
| 27 |
|
o new pkg: down_slope |
| 28 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
| 29 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
| 30 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
| 31 |
|
- implementation for ocean in P-coords not tested. |
| 32 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
| 33 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
| 34 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
| 35 |
|
o change FIND_RHO to FIND_RHO_2D : |
| 36 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
| 37 |
|
o new pkg: cheapaml |
| 38 |
|
|
| 39 |
|
checkpoint61b |
| 40 |
|
o exch2: |
| 41 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
| 42 |
|
- no longer depend on the order sequence (N,S,E,W). |
| 43 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
| 44 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
| 45 |
|
- exch_UV_A-grid readily available (but not yet tested). |
| 46 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
| 47 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
| 48 |
|
get truncation error differences with adjoint exch. |
| 49 |
|
o exch2: |
| 50 |
|
- change index-bounds storage (moved from target to local tile, |
| 51 |
|
more intuitive this way) ; rename/remove some variables. |
| 52 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
| 53 |
|
|
| 54 |
|
checkpoint61a |
| 55 |
|
o exch2/matlab-topology-generator: |
| 56 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
| 57 |
|
had any effect on the solution). |
| 58 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
| 59 |
|
is exceeded |
| 60 |
|
o testreport: modify syntax of awk, so that it works also with |
| 61 |
|
awk, and not only with nawk and gawk |
| 62 |
|
|
| 63 |
|
checkpoint61 |
| 64 |
|
o autodiff |
| 65 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
| 66 |
|
This changes TAF subroutine argument list (ordering of active var.) |
| 67 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
| 68 |
|
To restore TAMC-compatibility, need following modifs: |
| 69 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
| 70 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
| 71 |
|
Tested TAF version is 1.9.22 |
| 72 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
| 73 |
|
|
| 74 |
|
checkpoint60 |
| 75 |
|
--->>> This is the last checkpoint for which generating the adjoint |
| 76 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
| 77 |
|
--->>> by default. |
| 78 |
|
--->>> Future checkpoints will ommit this flag by default. |
| 79 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
| 80 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
| 81 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
| 82 |
|
o pkg/autodiff: more flexibility in zeroadj. |
| 83 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
| 84 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
| 85 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
| 86 |
|
special setup of gmredi for which the adjoint is stable |
| 87 |
|
enough for parameter optimization. |
| 88 |
|
o bridging the gap between eddy stress and GM. |
| 89 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
| 90 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
| 91 |
|
-> when using GM w/ GM_AdvForm: |
| 92 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
| 93 |
|
is applied either in the tracer Eq. or in momentum Eq. |
| 94 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
| 95 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
| 96 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
| 97 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
| 98 |
|
|
| 99 |
|
checkpoint59r |
| 100 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
| 101 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
| 102 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
| 103 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
| 104 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
| 105 |
|
mass points, when using mnc for output |
| 106 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
| 107 |
|
default (which is the value of getcon('UNDEF')) |
| 108 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
| 109 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
| 110 |
|
initialisation of never used fields |
| 111 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
| 112 |
|
versions |
| 113 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
| 114 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
| 115 |
|
are missing. |
| 116 |
|
o move from external_forcing_surf.F to ini_forcing.F |
| 117 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
| 118 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
| 119 |
|
o Freshen up a bit hs94.1x64x5, notably: |
| 120 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
| 121 |
|
exactConserv=.TRUE. |
| 122 |
|
o pkg/generic_advdiff: |
| 123 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
| 124 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
| 125 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
| 126 |
|
this uses a dynamically allocated internal state data structure |
| 127 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
| 128 |
|
and requires a fortran 90 compiler |
| 129 |
|
|
| 130 |
|
checkpoint59q |
| 131 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
| 132 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
| 133 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
| 134 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
| 135 |
|
- change EOS (POLY3 --> JMD95Z) |
| 136 |
|
- use Bryan-Lewis vertical diffusivity |
| 137 |
|
- use multidimensional advection |
| 138 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
| 139 |
|
- change a couple of parameters in dic pkg |
| 140 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
| 141 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
| 142 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
| 143 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
| 144 |
|
o implementation of TAF directives for gchem,cfc,dic |
| 145 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
| 146 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
| 147 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
| 148 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
| 149 |
|
--> changes results in exp4, seaice_obcs |
| 150 |
|
o tutorial_deep_convection : |
| 151 |
|
update the set-up and increase resolution and domain size ; start |
| 152 |
|
from pseudo initial conditions = output at t=120mn in order to see |
| 153 |
|
something happening when running testreport. |
| 154 |
|
o pkg/seaice: add os7mp as an advection scheme |
| 155 |
|
add check for advection schemes |
| 156 |
|
add a flag for restoring T and S underneath sea ice |
| 157 |
|
o pkg/my82: add netcdf-support and diagnostics |
| 158 |
|
o thsice pkg: |
| 159 |
|
- Now hsMax limits snow height by turning it into ice following |
| 160 |
|
flooding scheme (and now conserving energy) |
| 161 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
| 162 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
| 163 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
| 164 |
|
|
| 165 |
|
checkpoint59p |
| 166 |
|
o gchem / dic / cfc : |
| 167 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
| 168 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
| 169 |
|
- various re-arrangement in initialisation & header file ; |
| 170 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
| 171 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
| 172 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
| 173 |
|
before) providing pickupStrictlyMatch is set to False. |
| 174 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
| 175 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
| 176 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
| 177 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
| 178 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
| 179 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
| 180 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
| 181 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
| 182 |
|
scheme to use for vorticty-term ; |
| 183 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
| 184 |
|
(with default selectVortScheme, return to original discretisation) |
| 185 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
| 186 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
| 187 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
| 188 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
| 189 |
|
also fix diagnostics VISCAHW & VISCA4W. |
| 190 |
|
|
| 191 |
|
checkpoint59o |
| 192 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
| 193 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
| 194 |
|
move a few statemens out the main loop into separate loops |
| 195 |
|
o pkg/shelfice: |
| 196 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
| 197 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
| 198 |
|
rhoConstFresh=rhoConst (by accident) |
| 199 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
| 200 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
| 201 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
| 202 |
|
- convert potential temperature into in-situ temperature. This changes the |
| 203 |
|
isomip tests => update tests |
| 204 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
| 205 |
|
writing a pickup at the last timestep |
| 206 |
|
o tools/mpack-1.6 : |
| 207 |
|
- disable automake (not working) and autoconf (not needed). |
| 208 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
| 209 |
|
also cleaner with much less compilation warnings. |
| 210 |
|
o pkg/profiles: |
| 211 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
| 212 |
|
(for "less than 32 characters name" compiler requirement) |
| 213 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
| 214 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
| 215 |
|
o pkg/diagnostics (stats-diags): |
| 216 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
| 217 |
|
o genmake2: replace (4 times) |
| 218 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
| 219 |
|
with |
| 220 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
| 221 |
|
echo $COMM >> genmake_warnings |
| 222 |
|
$COMM >> genmake_warnings 2>&1 |
| 223 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
| 224 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
| 225 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
| 226 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
| 227 |
|
o pkg/ctrl: |
| 228 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
| 229 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
| 230 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
| 231 |
|
|
| 232 |
|
checkpoint59n |
| 233 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
| 234 |
|
number in dedicate array "hdiag": |
| 235 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
| 236 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
| 237 |
|
- many small changes (integer format) for large number of diagnostics |
| 238 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
| 239 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
| 240 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
| 241 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
| 242 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
| 243 |
|
geographical coordinates according to the inverse of the rotation defined |
| 244 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
| 245 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
| 246 |
|
Naturally, this feature does not work with all packages, so some |
| 247 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
| 248 |
|
profiles), because there the coordinates are assumed to be regular |
| 249 |
|
spherical grid coordinates. |
| 250 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
| 251 |
|
- introduce isopycnal diffusion coefficient control. |
| 252 |
|
o tools/adjoint_options: |
| 253 |
|
- additional control vector components. |
| 254 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
| 255 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
| 256 |
|
o pkg/mypackage: |
| 257 |
|
- add example of read/write pickup for state-var ; |
| 258 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
| 259 |
|
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
| 260 |
|
transitions for useExfYearlyFields |
| 261 |
|
- add new subroutine that determines the file to read from for |
| 262 |
|
use*YearlyFields = .TRUE. and .FALSE. |
| 263 |
|
- add a verification experiment to global_with_exf that tests |
| 264 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
| 265 |
|
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
| 266 |
|
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
| 267 |
|
subroutines (which could be generated from a template, because they are |
| 268 |
|
almost identical), for now they are included in obcs_prescribe_read.F for |
| 269 |
|
simplicity |
| 270 |
|
o pkg/exf: |
| 271 |
|
- add a little more diagnostic to exf_interp_read (in analogy to |
| 272 |
|
mds_read_field, can be turned off with debugLevel < debugLevA=1) |
| 273 |
|
- improve vectorizability of exf_interp for TARGET_NEC_SX, makes code |
| 274 |
|
ugly but fast by unrolling short inner loops, inserting a unroll=8 |
| 275 |
|
directive in routine lagran, and splitting a loop and making do while the |
| 276 |
|
outermost loop (the latter requires the intoduction of index arrays) |
| 277 |
|
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice |
| 278 |
|
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver |
| 279 |
|
http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html |
| 280 |
|
o verification/seaice_obcs: updated for restart test and latest options |
| 281 |
|
o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different |
| 282 |
|
ice rheology (so-called truncated ellipse, that gets rid of tensile stress); |
| 283 |
|
for now this is only available for the C-grid code and also within |
| 284 |
|
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
| 285 |
|
|
| 286 |
|
checkpoint59m |
| 287 |
|
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
| 288 |
|
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
| 289 |
|
o gad_som : fix flux output (& diagnostics) to have same units as other |
| 290 |
|
advection scheme fluxes (was previously multiplied by deltaT). |
| 291 |
|
o added verification/seaice_obcs both to test seaice open boundaries |
| 292 |
|
and to provide an example matlab scrpt for generating them |
| 293 |
|
o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume |
| 294 |
|
o pkg/salt_plume: clean up salt_plume_frac.F to |
| 295 |
|
remove redundancy in PlumeMethod 1 and 4 |
| 296 |
|
o pkg/kpp: added saltplume diagnostics |
| 297 |
|
o pkg/obcs and pkg/seaice: |
| 298 |
|
- do not set uice and vice to zero when OB*icefile are unspecified |
| 299 |
|
- OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default |
| 300 |
|
- moved seaice tracer obcs after call to seaice_growth |
| 301 |
|
o pkg/salt_plume: added various options for salt plume depth |
| 302 |
|
criterion and for vertical distribution of the salt |
| 303 |
|
|
| 304 |
|
checkpoint59l |
| 305 |
|
o pkg/ptracers: new version of ptracers pickup: |
| 306 |
|
read meta file and write only fields which are needed to restart. |
| 307 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 308 |
|
o pkg/seaice: |
| 309 |
|
- add timescale for melting due to warm mixed layer as a means of |
| 310 |
|
setting SEAICE_availHeatFrac more conveniently |
| 311 |
|
- add a CPP-flag/runtime parameter check for flooding algorithm |
| 312 |
|
- reformulated availHeat in seaice_growth.F to be independent of AREA |
| 313 |
|
o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent |
| 314 |
|
unit changes |
| 315 |
|
o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint |
| 316 |
|
o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC |
| 317 |
|
SX vector computer. |
| 318 |
|
o pkg/seaice: |
| 319 |
|
- removed SEAICE_FFIELDS.h and seaice_get_forcing.F |
| 320 |
|
seaice forcing fields can now be read only through pkg/exf |
| 321 |
|
- removed some unused halos |
| 322 |
|
o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP |
| 323 |
|
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
| 324 |
|
or U/VICE from U/VWIND before computing U/VSTRESS |
| 325 |
|
|
| 326 |
|
checkpoint59k |
| 327 |
|
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
| 328 |
|
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
| 329 |
|
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
| 330 |
|
all experiments pass when compile with un-initialised var. checking option. |
| 331 |
|
o added pkg/salt_plume |
| 332 |
|
o script to test restart (for now, in MITgcm_contrib/jmc_script) |
| 333 |
|
o pkg/seaice: new read/write pickup version. |
| 334 |
|
read meta file and write only fields which are needed to restart. |
| 335 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 336 |
|
o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates) |
| 337 |
|
o lab_sea.hb87: modify the domain & update output.hb87.txt : |
| 338 |
|
lat-long grid & no-slip BC in seaice-dynamics produce different sigma12 |
| 339 |
|
at j=1 & j=Ny+1 : this case is not treated correctly in the restart |
| 340 |
|
process. Fixed here by closing the domain at the Northern boundary. |
| 341 |
|
o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD. |
| 342 |
|
o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing |
| 343 |
|
a set of consecutive levels in/from a 3-D array. |
| 344 |
|
o pkg/ptracers: |
| 345 |
|
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
| 346 |
|
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
| 347 |
|
|
| 348 |
|
checkpoint59j |
| 349 |
|
o in pkgs: dic, obcs, offline, rbcs: |
| 350 |
|
standard way to compute coeff. for time interpolation between 2 time reccords |
| 351 |
|
which retains full precision (& make results less dependent on compiler). |
| 352 |
|
update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo. |
| 353 |
|
o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those |
| 354 |
|
packages instead of reading ice cover and wind speed separately |
| 355 |
|
o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h |
| 356 |
|
(keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad |
| 357 |
|
to allow to compile customized code before the update) |
| 358 |
|
o cleaning-up: |
| 359 |
|
- fix CPP instruction syntax in pkg/obcs |
| 360 |
|
- replace (some) call to MDSIO S/R with call to RW interface S/R ; and |
| 361 |
|
add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio) |
| 362 |
|
- fix some threads issue in IO parts. |
| 363 |
|
o pkg/dic: |
| 364 |
|
- add tons of "_d 0" (--> much better testreports !) |
| 365 |
|
and then update outputs of tutorial_global_oce_biogeo |
| 366 |
|
o pkg/mom_fluxform: |
| 367 |
|
add a special version of momentum advection intended to conserve momentum |
| 368 |
|
next to a bathymetry step or a coastline edge. (default = off = #undef) |
| 369 |
|
o new read/write pickup version: |
| 370 |
|
- for now, only implemented for main (mdsio) pickup file. |
| 371 |
|
- write out only what is needed to restart; merge pickup_nh , pickup_ph |
| 372 |
|
and main pickup together. |
| 373 |
|
- read meta file; read only what is needed to restart; stop if a field |
| 374 |
|
is missing (if pickupStrictlyMatch=T, = the default) or try to restart |
| 375 |
|
if it make sense (even if the restart is not perfect). |
| 376 |
|
- if no meta file, assume that pickup to read corresponds exactly to |
| 377 |
|
a pickup that would currently be written. |
| 378 |
|
- read pickup written in the old format (until checkpoint59i) if it |
| 379 |
|
recognizes an old meta file (no field-list). |
| 380 |
|
- add a meta file in exp. which starts from a pickup: 2 cases: |
| 381 |
|
a) minimal meta file (with just file precision) + pickupStrictlyMatch=F |
| 382 |
|
e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta |
| 383 |
|
b) a meta file describing the content of the associated pickup file |
| 384 |
|
e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta |
| 385 |
|
o pkg/mdsio & pkg/rw: |
| 386 |
|
- new routine to read a meta file ; new set of routine to read |
| 387 |
|
Multiple-fields file (with meta file). |
| 388 |
|
o added open boundary conditions capability for seaice |
| 389 |
|
HSNOW, HSALT, UICE, and VICE |
| 390 |
|
|
| 391 |
|
checkpoint59i |
| 392 |
|
o adjoint: |
| 393 |
|
* fix multiDimAdvection adjoint |
| 394 |
|
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
| 395 |
|
and comlev1 size definition (maxpass vs. max. number of tracers) |
| 396 |
|
* verification/global_ocean.90x45x15 adjoint now tests |
| 397 |
|
NLFS and multiDimAdvection using DST3 (=30) |
| 398 |
|
* verification/lab_sea now tests multiDimAdvection using DST3 (=30) |
| 399 |
|
o pkg/kpp: add "_d 0" to real constant (if missing); |
| 400 |
|
update output of exp: natl_box (10.digits); vermix (std, 7.digits) |
| 401 |
|
and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits). |
| 402 |
|
o prepare for "clever pickup" implementation: add new header file "RESTART.h" |
| 403 |
|
for internal parameters related to restart process (formerly from PARAMS.h) |
| 404 |
|
and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2. |
| 405 |
|
o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed |
| 406 |
|
as argument. (only atm2d & obcs write_pickup have not yet been updated) |
| 407 |
|
o pkg/monitor: |
| 408 |
|
- use GLOBAL_SUM_TILE instead of _GLOBAL_SUM |
| 409 |
|
- fix mon_stats_rs (statistics over the full domain, even where field is zero) |
| 410 |
|
- account for deep Atmosphere factor and density factor (anelastic) |
| 411 |
|
o added open boundary conditions capability for seaice HEFF and AREA |
| 412 |
|
o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989) |
| 413 |
|
thermodynamics |
| 414 |
|
- requires a little reorganization, which affects the testreport results |
| 415 |
|
of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment, |
| 416 |
|
so that now the conservative form is tested |
| 417 |
|
- add a few comments |
| 418 |
|
o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code* |
| 419 |
|
o add a little bit of code to gad_os7mp_adv_?.F to help vectorization |
| 420 |
|
o add new diagnostics to seaice: advective, diffusive fluxes (only for |
| 421 |
|
multidim-advection, for scheme 2 they are not filled) and transports, |
| 422 |
|
thermodynamic growth rates |
| 423 |
|
o change units of EmPmR (inside the code, + within coupling interface) |
| 424 |
|
from m/s to kg/m2/s (mass flux) but leave input file unchanged. |
| 425 |
|
Affects results @ truncation level (cg2d match) and update output of |
| 426 |
|
experiments: lab_sea(6), global_ocean.90x40x15(10), |
| 427 |
|
global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11) |
| 428 |
|
+ adjoint results: global_ocean_ebm(11) and lab_sea (12). |
| 429 |
|
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
| 430 |
|
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
| 431 |
|
|
| 432 |
|
checkpoint59h |
| 433 |
|
o pkg/exf: |
| 434 |
|
- improve vectorization by moving if-statement out of loops in |
| 435 |
|
exf_mapfields, exf_radiation |
| 436 |
|
- exf_bulkformulae.F: introduce 2D fields and vectorize code |
| 437 |
|
o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package |
| 438 |
|
o testreport: |
| 439 |
|
- allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE |
| 440 |
|
monitor & update offline_exf_seaice exp. output. |
| 441 |
|
- AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost) |
| 442 |
|
o pkg/seaice: |
| 443 |
|
- bug fix in the evp solver: boundary conditions were affected be |
| 444 |
|
masking of zMax/zMin (changes results) |
| 445 |
|
- minor bug fix in boundary conditions in seaice_calc_strainrates |
| 446 |
|
(changes results for no_slip) |
| 447 |
|
- seaice_lsr.F: make interpolation of eta dependent on boundaries |
| 448 |
|
- replace hardcoded lower limit for zeta (zMin) by runtime parameter |
| 449 |
|
- add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean |
| 450 |
|
stress formulation and no-slip boundary conditions |
| 451 |
|
o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP |
| 452 |
|
in gad_calc_rhs.F ; add few safety stops in initialisation phase. |
| 453 |
|
o pkg/seaice: a first HSALT time stepping equation has been checked in |
| 454 |
|
o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV |
| 455 |
|
in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem |
| 456 |
|
without requiring DO-IF statements |
| 457 |
|
o pkg/thsice: |
| 458 |
|
use continuous power-law function for partition of energy between lateral |
| 459 |
|
melting/freezing and thinning/thickening ; old code using step function |
| 460 |
|
still available with #undef THSICE_FRACEN_POWERLAW |
| 461 |
|
update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice |
| 462 |
|
o testreport: change AD testing : check against results/output_adm.txt |
| 463 |
|
using same scripts as for forward test. |
| 464 |
|
|
| 465 |
|
checkpoint59g |
| 466 |
|
o adjoint testing: in preparation for changing testreport: |
| 467 |
|
- output format: cost and grad written on separated lines |
| 468 |
|
- ad output results in directory "results" (instead of "results_ad") |
| 469 |
|
o pkg/seaice: adding ice salinity HSALT as a prognostic variable |
| 470 |
|
o pkg/seaice: changes for using pkg/seaice with pkg/obcs |
| 471 |
|
o pkg/ecco: allow user defined cost function contributions |
| 472 |
|
o testreport: |
| 473 |
|
Allow to choose (per experiment) the list of tested output variables |
| 474 |
|
and the main variable (used to issue a pass/FAIL ) ; |
| 475 |
|
- for now, done by adding the specific list in file: [exp]/input/tr_checklist |
| 476 |
|
- default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ; |
| 477 |
|
Also modify printing of summary: |
| 478 |
|
a) ">" NN "<" indicates the "main" variable (used for pass/FAIL) |
| 479 |
|
b) echo the list of tested variables in the individual summary.txt of |
| 480 |
|
each experiment. |
| 481 |
|
o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of |
| 482 |
|
threads and number of processes (with #define GLOBAL_SUM_SEND_RECV) |
| 483 |
|
(but still depend on the tile decompostion of the domain). |
| 484 |
|
o pkg/seaice: change a discretization detail to make the B-grid code |
| 485 |
|
"more symmetric". This change is likely to remove all "ridges/leads" that |
| 486 |
|
where quasi-aligned with the grid in B-grid solutions. It may also be |
| 487 |
|
the solution to the stress coupling issues with the B-grid. |
| 488 |
|
o each tested exp: add a "run" directory with a standard ".cvsignore" file ; |
| 489 |
|
remove .cvsignore from input dir. (since testreport no longer run here). |
| 490 |
|
o pkg/thsice: |
| 491 |
|
- cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h" |
| 492 |
|
- fix reshaping of sea-ice just after advection: |
| 493 |
|
melt all the ice only if ice-volume is too small. |
| 494 |
|
- re-visit lateral/thinning repartition of melting (modifs from May 04, 2007): |
| 495 |
|
prevent lateral melting if sea-ice fraction is too close to iceMaskMin ; |
| 496 |
|
and update experiment global_ocean.cs32x15.icedyn (+start from pickup files). |
| 497 |
|
o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water |
| 498 |
|
tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged. |
| 499 |
|
o define mass2rUnit & rUnit2mass as units conversion factor, used for surface |
| 500 |
|
forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit |
| 501 |
|
(z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse; |
| 502 |
|
and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error |
| 503 |
|
of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16 |
| 504 |
|
-> update output.txt |
| 505 |
|
o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME): |
| 506 |
|
this affects truncation error: -> update output.txt of exp: |
| 507 |
|
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
| 508 |
|
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
| 509 |
|
|
| 510 |
|
checkpoint59f |
| 511 |
|
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
| 512 |
|
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
| 513 |
|
a bounded range (in forward mode) |
| 514 |
|
o pkg/ecco, ctrl, autodiff and mom_common: |
| 515 |
|
internal parameter controls, completements of implementations |
| 516 |
|
o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy. |
| 517 |
|
o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ; |
| 518 |
|
(not seem any difference in testing results). |
| 519 |
|
o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains |
| 520 |
|
at face corners. |
| 521 |
|
o pkg/generic_advdiff: |
| 522 |
|
- in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR) |
| 523 |
|
loop range indices for computing vertical advection tendency |
| 524 |
|
and do the calculation in the interior only (no overlap) ; |
| 525 |
|
for now, only implemented for SOM advection (to save CPU time). |
| 526 |
|
- add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment) |
| 527 |
|
o exch2 adjoint |
| 528 |
|
First set of changes: |
| 529 |
|
- add exch2 hand-written adjoint templates |
| 530 |
|
- exch2 hand-written no longer use TAF-flag 'nownew_arg' |
| 531 |
|
This will require cleanup in pkg/autodiff/*.F |
| 532 |
|
(changed routines currently kept separate in verif. code/) |
| 533 |
|
- Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC |
| 534 |
|
that used to hide exch2 or cubed-sphere specific code |
| 535 |
|
(commented via 'cph-exch2') |
| 536 |
|
o pkg/seaice |
| 537 |
|
- Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE. |
| 538 |
|
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
| 539 |
|
output of global_ocean.cs32x15.thsice . |
| 540 |
|
|
| 541 |
|
checkpoint59e |
| 542 |
|
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
| 543 |
|
for B-grid vector (not yet tested) and C-grid vector (<- only used |
| 544 |
|
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
| 545 |
|
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme |
| 546 |
|
(#ifdef ALLOW_SALT_PLUME) |
| 547 |
|
o gather_2d/scatter_2d: removed halo regions |
| 548 |
|
o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007 |
| 549 |
|
scheme and the corresponding test case (under front_relax dir). For now, |
| 550 |
|
only available with Skew-flux form and not yet tested in realistic set-up. |
| 551 |
|
adjoint: store directives updated, but gradient checks deteriorated, |
| 552 |
|
so maybe GM/Redi adjoint is now broken. |
| 553 |
|
o seaice adjoint |
| 554 |
|
* add AREA, HEFF, HSNOW as control variable |
| 555 |
|
(should not change lab_sea results) |
| 556 |
|
* CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40 |
| 557 |
|
o pkg/seaice: |
| 558 |
|
* added computation of saltFlux in seaice_growth; |
| 559 |
|
For time being, sea ice salinity is assumed constant |
| 560 |
|
contribution of snow flooding to freshening of sea ice is neglected. |
| 561 |
|
SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it |
| 562 |
|
defaults to 0.0 in order to maintain backward compatibility. |
| 563 |
|
Typical values for SEAICE_salinity are 4 to 10 g/kg. |
| 564 |
|
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F |
| 565 |
|
* added SEAICE_availHeatFrac, which specifies fraction of surface level |
| 566 |
|
heat content used to melt or grow ice |
| 567 |
|
* commented out cap of HICE: it helps keep ice thinner |
| 568 |
|
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
| 569 |
|
* applied OBCS T/S mask to HEFFM sea ice mask |
| 570 |
|
|
| 571 |
|
checkpoint59d |
| 572 |
|
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
| 573 |
|
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
| 574 |
|
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
| 575 |
|
o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0" |
| 576 |
|
and change default value of parameter "GM_Small_Number"; |
| 577 |
|
update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15, |
| 578 |
|
global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf, |
| 579 |
|
tutorial_global_oce_biogeo, tutorial_global_oce_latlon |
| 580 |
|
o pkg/ecco: cost function when applying pkg/smooth to controls |
| 581 |
|
o pkg/ctrl: add forcingPrecond run time parameter |
| 582 |
|
o pkg/seaice: |
| 583 |
|
- replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code |
| 584 |
|
- fix bug in metric terms of u-equation in LSR solver (implicit part), |
| 585 |
|
changes verification/lab_sea |
| 586 |
|
- rearrange implicit part of u-equation in LSR solver to make it easier to |
| 587 |
|
read, understand, and debug. This causes changes at the truncation level. |
| 588 |
|
- fix (serious) bug in the boundary conditions (sign error in the implicit |
| 589 |
|
part) of the LSR solver. Changes all LSR results. |
| 590 |
|
- fixed problem with HSNOW initialization to avoid thick snow when AREA |
| 591 |
|
is initilized with small values - does not change lab_sea results. |
| 592 |
|
- added HsnowFile initialization capability |
| 593 |
|
o pkg/smooth: addition to model/src and pkg/ctrl so allow |
| 594 |
|
initialization of pkg/smooth and application to control vector |
| 595 |
|
o pkg/seaice: fix another bug in the LSR no-slip boundary conditons |
| 596 |
|
o dependencies: pkg/profiles requires pkg/cal |
| 597 |
|
o pkg/profiles: |
| 598 |
|
- added option ALLOW_PROFILES_GENERICGRID |
| 599 |
|
-> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming |
| 600 |
|
that interpolation information (grid points and coefficients) is provided |
| 601 |
|
within the netcdf input files. |
| 602 |
|
-> sample matlab scripts can be found in MITgcm_contrib/gael |
| 603 |
|
that allow you to prepare netcdf input files. |
| 604 |
|
- also modified: cleaner include statements, cleaner error print statements, |
| 605 |
|
cleaner stops when error, and more tests of the netcdf input files consistency. |
| 606 |
|
o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs. |
| 607 |
|
o pkg/seaice: |
| 608 |
|
- move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this |
| 609 |
|
requires a new routine: seaice_diagnostics_fill.F |
| 610 |
|
- make sure that seaice does not move if not forced (pressure replacement |
| 611 |
|
method, Hibler and Ip, 1995), changes results |
| 612 |
|
- and new damping criterion for EVP solver according to Hunke, JCP, 2001 |
| 613 |
|
- SEAICE_evpDampC = > 0. turns it on (615. is the recommended value). |
| 614 |
|
It is turned off by default (=-1.), because it changes the results. |
| 615 |
|
- make it possible to read AREA from a file, too. |
| 616 |
|
|
| 617 |
|
checkpoint59c |
| 618 |
|
o add S/R and diagnostics for oceanic mixed-layer depth |
| 619 |
|
o move GMRedi call after all vertical mixing schemes (including KPP) |
| 620 |
|
o pkg/thsice: |
| 621 |
|
- ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs |
| 622 |
|
(melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice |
| 623 |
|
o pkg/obcs: |
| 624 |
|
- bug fix for balance code |
| 625 |
|
o pkg/seaice: |
| 626 |
|
- allow values of SEAICE_elasticParm > 1 |
| 627 |
|
- add new parameter SEAICE_evpTauRelax as an alternative |
| 628 |
|
to SEAICE_elasticParm |
| 629 |
|
- make lsr boundary conditions free slip (by default), changes result |
| 630 |
|
- add code for no slip boundary conditions for lsr |
| 631 |
|
- set minimum of zeta to zero (and not 4e8) (changes results) |
| 632 |
|
- add a cap on AREA after advecting AREA if seaice_growth is not called |
| 633 |
|
o change calculation of Visbeck K: |
| 634 |
|
- no longer depend on tapering scheme; instead, compute slope (limited |
| 635 |
|
by GM_maxSlope). this is equivalent to what was comuted before with |
| 636 |
|
clipping or linear tappering. |
| 637 |
|
- fix vertical averaging (wrong by 1/2 level) |
| 638 |
|
- leave the old version (but will not be maintained) within |
| 639 |
|
#ifdef OLD_VISBECK_CALC / #endif |
| 640 |
|
- update output of exp. ideal_2D_oce |
| 641 |
|
o change error catch in calc_r_star to improve vectorization |
| 642 |
|
o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and |
| 643 |
|
add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf). |
| 644 |
|
o adjoint: |
| 645 |
|
Re-organized adjoint checkpointing according to Matt Mazloff |
| 646 |
|
(but with modifs/completions/cleanups) |
| 647 |
|
Storing is now bundled into large arrays to optimized I/O |
| 648 |
|
(and second step in cleanup of the_main_loop) |
| 649 |
|
|
| 650 |
|
checkpoint59b |
| 651 |
|
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
| 652 |
|
- export/import (between ocean & coupler) fields needed for ocean DIC. |
| 653 |
|
o pkg/seaice: |
| 654 |
|
- get rid of three more exchanges seaice_calc_viscosities (required |
| 655 |
|
different loop boundaries in seaice_lsr and seaice_ocean_stress) |
| 656 |
|
- bug fix in seaice_ocean_stress (update of lab_sea required) |
| 657 |
|
- reduce loop boundaries to necessary minimum also in seaice_evp |
| 658 |
|
- go back to the old way of computing deltaC/Z as the adjoint likes that |
| 659 |
|
better |
| 660 |
|
o Refresh of tutorial_global_oce_latlon (includes changing salinity-like |
| 661 |
|
passive tracer to an Age Tracer) + update output.txt |
| 662 |
|
o pkg/exf: |
| 663 |
|
- implement A-grid / C-grid selection for wind-stress input files. |
| 664 |
|
- clean-up exf_wind.F (remove us, use wspeed instead ; add wStress) |
| 665 |
|
for now, in exf_bulk_largeyeager04.F only : |
| 666 |
|
- change implementation for case where windspeed + 2. components wind-stress |
| 667 |
|
are read-in. AND use rhoConstFresh to convert evap. |
| 668 |
|
o pkg/seaice: |
| 669 |
|
- use correct EXCH_UV for wind-forcing (on A-grid). |
| 670 |
|
- change SEAICE_OPTIONS.h to limit the number of option combinations (regarding |
| 671 |
|
SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops. |
| 672 |
|
o pkg/exf: |
| 673 |
|
- default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) |
| 674 |
|
EXF_INTERPOLATION: |
| 675 |
|
- merge global_with_exf/code version of exf_interp_read.F |
| 676 |
|
to the main code ; |
| 677 |
|
- Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when |
| 678 |
|
reading the file ; Important: This options needs to be defined to recover |
| 679 |
|
previous code. |
| 680 |
|
otherwise, use fixed size array to read in (size=exf_interp_bufferSize). |
| 681 |
|
- no longer loose real*8 precision along the way when using exf_iprec=64. |
| 682 |
|
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
| 683 |
|
- change discretisation of evp-solver in order to avoid another exchange |
| 684 |
|
(changes lab_sea) and clean up a little |
| 685 |
|
- replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS) |
| 686 |
|
help the adjoint (this also changes the results slightly) |
| 687 |
|
- add a few "_d 0" where they had been missing in seaice_evp.F |
| 688 |
|
- cleaning up: remove unused seaice_calc_rhs.F |
| 689 |
|
o pkg/exf: some cleaning-up: |
| 690 |
|
- change various "constants" into runtime parameters |
| 691 |
|
- cleaned-up Large&Yeager04 routine which should eventually |
| 692 |
|
replace exf_bulkformulae.F (changed names of S/R and CPP) |
| 693 |
|
and merged various ALLOW_ATM_WIND options |
| 694 |
|
only used with thsice pkg (in thsice_get_exf.F): |
| 695 |
|
- implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04) |
| 696 |
|
which are used when useStabilityFct_overIce=TRUE (= the default) |
| 697 |
|
- change default values of ice & snow emissivity and scale downward LW |
| 698 |
|
by ice & snow emissivity. |
| 699 |
|
o pkg/thsice: |
| 700 |
|
fix few little problems, in thsice_calc_thickn.F: |
| 701 |
|
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
| 702 |
|
- melt only laterally if hIce < hThinIce (as the comments say) |
| 703 |
|
and in thsice_extend.F: |
| 704 |
|
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
| 705 |
|
- start to form ice as soon as the minimum ice-volume is reachable. |
| 706 |
|
update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice), |
| 707 |
|
and cpl_aim+ocn |
| 708 |
|
o pkg/kpp |
| 709 |
|
- move computation of surface related input fields to KPP into a new |
| 710 |
|
subroutine kpp_forcing_surf.F |
| 711 |
|
- remove wrong (within bi,bj loops) EXCH calls. |
| 712 |
|
- little cleaning (add argument myThid in last position, cvs header ...) |
| 713 |
|
- for now, fix conservation problem by exchanging KPPviscAz (may not |
| 714 |
|
be the best fix) |
| 715 |
|
o pkg/seaice |
| 716 |
|
- check for inconsistent evp parameter/cpp-flag combination |
| 717 |
|
- remove leftover errIO flat for obsolete name list error handling |
| 718 |
|
o OpenAD |
| 719 |
|
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
| 720 |
|
|
| 721 |
|
checkpoint59a |
| 722 |
|
o pkg/seaice: some parameter clarifications and a little bit of clean up |
| 723 |
|
o pkg/thsice: rename run-time parameters: |
| 724 |
|
himin -> hIceMin |
| 725 |
|
himin0 -> hThinIce |
| 726 |
|
hihig -> hThickIce |
| 727 |
|
i0 -> i0swFrac |
| 728 |
|
transCoef -> bMeltCoef |
| 729 |
|
frac_energy -> fracMelting |
| 730 |
|
add new parameters: hNewIceMax, fracFreezing, dhSnowLin |
| 731 |
|
with default values (for now) that do not change the results. |
| 732 |
|
remove old version of thsice vars advection in pkg/seaice. |
| 733 |
|
o in FFIELDS.h: |
| 734 |
|
- replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD |
| 735 |
|
- make pLoad & sIceLoad always available (but still only used if |
| 736 |
|
ATMOSPHERIC_LOADING is #define). |
| 737 |
|
o pkg/kpp: replaced _KPP_RL with _RL |
| 738 |
|
o bug fixes for vertical diffusivity computations when both KPP and |
| 739 |
|
3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F |
| 740 |
|
are no longer updating the vertical diffusivity array |
| 741 |
|
(passed as argument) but are (re-) setting those arrays. |
| 742 |
|
o pkg/seaice: fix bug in evp solver, while doing that |
| 743 |
|
- change (improve?) discretization of stress computations for both |
| 744 |
|
cgrid-lsr and evp solver |
| 745 |
|
- add a new routine to compute strain rates |
| 746 |
|
- the above changes lab_sea results |
| 747 |
|
- add no slip conditions for evp solver (off by default), lsr-version |
| 748 |
|
may follow |
| 749 |
|
- fix exchange for shear at Z-points (does not change lab_sea) |
| 750 |
|
- retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp |
| 751 |
|
(to force the user to pick a time step since there is not "safe" way |
| 752 |
|
of choosing it) |
| 753 |
|
- add principal stress diagnostics |
| 754 |
|
- rearrange fields for evp a little to avoid having to call a: too many |
| 755 |
|
exchanges and b: exchanges for stress trensor components which we do |
| 756 |
|
not have. |
| 757 |
|
- modify Hibler+Bryan (1987) stress coupling so that it reuses information |
| 758 |
|
of evp, complete rewrite for lsr case (latter is does not yet work |
| 759 |
|
in all cases) |
| 760 |
|
o pkg/kpp: add code to have mixing in shelf ice caverns |
| 761 |
|
- add myThid to all kpp routines (long overdue) |
| 762 |
|
|
| 763 |
|
checkpoint59 |
| 764 |
|
o pkg/exf: |
| 765 |
|
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
| 766 |
|
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
| 767 |
|
- move exf header files from lower_case.h to UPPER_CASE.h ; |
| 768 |
|
add missing cvs Header & Name |
| 769 |
|
- add adjoint routines and flow dirs for newly used exch_uv_agrid routines |
| 770 |
|
- add namelist param. selectStressGridPosition, exf_monFreq |
| 771 |
|
- retire many _CLIM routines, and remove data.exf_clim |
| 772 |
|
+ params moved to data.exf |
| 773 |
|
+ climsst, climsss now handled by exf_set_gen, i.e. |
| 774 |
|
climss?period=0 refers to constant field, |
| 775 |
|
climss?period=-12 to monthly forcing |
| 776 |
|
- split up namelists in data.exf |
| 777 |
|
o pkg/seaice: |
| 778 |
|
- remove seaice_exch and seaice_exch_uv |
| 779 |
|
- remove superfluous exchange of theta |
| 780 |
|
- add myThid to seaice_budget_ocean/ice |
| 781 |
|
- add new interface for atmospheric wind forcing (C-grid only) |
| 782 |
|
+ new routine |
| 783 |
|
+ two new field (taux, tauy for stress over ice) |
| 784 |
|
+ removed one global field (DAIRN) for C-grid case only |
| 785 |
|
o pkg/thsise |
| 786 |
|
- 2nd set of modifs for thsice adjoint in conjunction with exf |
| 787 |
|
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
| 788 |
|
|
| 789 |
|
checkpoint58y_post |
| 790 |
|
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
| 791 |
|
vertical diffusivity, similar to that in MOM4; turned on using |
| 792 |
|
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
| 793 |
|
diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file. |
| 794 |
|
o Added capability for 3D specification of background vertical diffusion |
| 795 |
|
coefficient. This is done by (i) #define ALLOW_3D_DIFFKR |
| 796 |
|
in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime |
| 797 |
|
"data" file that contains the 3D vertical diffusivity coefficients. |
| 798 |
|
o ice dynamics (pkg/seaice) with thsice thermodynamics: |
| 799 |
|
- add code within pkg thsice to advect & diffuse sea-ice fields |
| 800 |
|
similar to (and will replace) what has been added in seaice_advdiff.F, |
| 801 |
|
but: - conserving Mass, Heat & Salt. |
| 802 |
|
- better when using non-linear advection scheme (not yet fully tested) |
| 803 |
|
- can also be used in atmospheric set-up (for now, only the diffusion). |
| 804 |
|
|
| 805 |
|
checkpoint58x_post |
| 806 |
|
o IO option for global-file compact format: |
| 807 |
|
- add options when generating topology (utils/exch2/matlab-topology-generator) |
| 808 |
|
- add I/O capability (pkg/mdsio). |
| 809 |
|
- adapt utils/matlab/rdmds.m to read this format. |
| 810 |
|
for now long-line format not yet supported by pkg/mdsio (& exch2). |
| 811 |
|
o shelfice: add a few diagnostics |
| 812 |
|
|
| 813 |
|
checkpoint58w_post |
| 814 |
|
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
| 815 |
|
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
| 816 |
|
(and replace horiVertRatio in NH code). |
| 817 |
|
Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !) |
| 818 |
|
and tutorial_plume_on_slope (sensitive to truncation) |
| 819 |
|
o seaice: if ALLOW_ATM_WIND is undefined use wind stress |
| 820 |
|
directly to drive seaice model (C-grid only) |
| 821 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND): |
| 822 |
|
- reintroduce computation of wind from stress, |
| 823 |
|
- compute tau (in exf_bulkformulae.F) from windstress averaged to |
| 824 |
|
mass points to avoid tau = 0 |
| 825 |
|
- fix serious bug: (1/3) in Fortran is not the same as (1./3.) |
| 826 |
|
o rdmnc.m: make it work with "global" files created with gluemnc |
| 827 |
|
o rdmnc.m : some improvements in dealing with singleton dimension |
| 828 |
|
(tested on all testreport mnc output files). |
| 829 |
|
o genmake2: disable pkg/profiles if netcdf test fails. |
| 830 |
|
o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output. |
| 831 |
|
o move call to cal_readparms up to make calendar parameters/variable available |
| 832 |
|
to all packages |
| 833 |
|
|
| 834 |
|
checkpoint58v_post |
| 835 |
|
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
| 836 |
|
useDynP_inEos_Zc tested. |
| 837 |
|
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
| 838 |
|
o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields |
| 839 |
|
and portions thereof. See read_cs.txt for description and examples. |
| 840 |
|
o utils/matlab/cs_grid/bk_line: to compute transport through passages, |
| 841 |
|
add a script (grt_circ_bkl.m) to generate broken-line between 2 points, |
| 842 |
|
following the great-circle arc between those 2 points. |
| 843 |
|
o trap un-initialized variable with pathscale compiler on weddell.mit.edu |
| 844 |
|
(thanks to Constantinos): fix few problems and get (almost) all exp to pass. |
| 845 |
|
o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in |
| 846 |
|
- enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h) |
| 847 |
|
- used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81) |
| 848 |
|
- still needs work (not working with some options ; efficiency to improve) |
| 849 |
|
and serious testing. |
| 850 |
|
- use this scheme for temperature & salinity in 2 advection test exp.: |
| 851 |
|
advect_xy & advect_xz, respectively. |
| 852 |
|
|
| 853 |
|
checkpoint58u_post |
| 854 |
|
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
| 855 |
|
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
| 856 |
|
o testreport: add option "-skipdir" to skip some test. |
| 857 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent |
| 858 |
|
momentum calculation. |
| 859 |
|
o gad_advection: fix vertAdvecScheme (if different from advectionScheme) |
| 860 |
|
o some cleaning: usePickupBeforeC35 no longer supported ; remove this option. |
| 861 |
|
remove checkpoint.F and the_correction_step.F (no longer used); |
| 862 |
|
do the k loop inside CYCLE_TRACER (supposed to be more efficient). |
| 863 |
|
o add option (linFSConserveTr) to correct for tracer source/sink due to |
| 864 |
|
Linear Free surface |
| 865 |
|
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
| 866 |
|
o pkg/thsice: fix reading mnc-pickups |
| 867 |
|
|
| 868 |
|
checkpoint58t_post |
| 869 |
|
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
| 870 |
|
o pkg/mdsio: |
| 871 |
|
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
| 872 |
|
move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) & |
| 873 |
|
mdsio_write_field.F (S/R MDS_WRITE_FIELD); |
| 874 |
|
- fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD |
| 875 |
|
- collect old S/R in one file: mdsio_rw_field.F (now just a call to |
| 876 |
|
either MDS_READ_FIELD or MDS_WRITE_FIELD ) |
| 877 |
|
- new S/R (to replace MDSWRITEMETA), which allows to write more |
| 878 |
|
informations (variable names, time ...) to meta files. |
| 879 |
|
- modify rdmds.m to give back the meta file content. |
| 880 |
|
o pkg/diagnostics: change vertical interpolation to be safer, and more |
| 881 |
|
flexible (define p-levels to interpolate to in data.diagnostics); |
| 882 |
|
add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right |
| 883 |
|
diagnostic pointer. |
| 884 |
|
o pkg/seaice: more cleaning up of seaice_growth, added many comments |
| 885 |
|
o pkg/exf: put runoff0 and runoff1 into the appropriate common block |
| 886 |
|
o fix multi-category seaice: |
| 887 |
|
- change cpp flag SEAICE_MULTILEVEL to more meaningful name: |
| 888 |
|
SEAICE_MULTICATEGORY |
| 889 |
|
- fix short wave heat flux |
| 890 |
|
o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics |
| 891 |
|
and allow to use EVP solver. Change forward lab_sea: test both EVP |
| 892 |
|
solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint) |
| 893 |
|
o Initial check-in of lab_sea adjoint |
| 894 |
|
(very similar to natl_box_adjoint/code_seaice) |
| 895 |
|
* used C-grid and EVP solver |
| 896 |
|
* used KPP, GM/Redi |
| 897 |
|
* uses inAdExact=.TRUE. |
| 898 |
|
* gradient checks fail for both ADM and TLM |
| 899 |
|
due to sensitive snow melt code in seaice_grwoth (look for "JZ") |
| 900 |
|
f.d. gradients actually seem more problematic than ADM, TLM gradients; |
| 901 |
|
issue is related to forward mismatch between g77 an ifort |
| 902 |
|
o pkg/seaice: overhaul of thermodynamics |
| 903 |
|
- growth.F and groatb.F are replaced by new routine seaice_growth.F |
| 904 |
|
- budget.F is replaced by two new routines seaice_budget_ocean/ice.F |
| 905 |
|
- move a few global fields out of SEAICE.h into seaice_growth.F and |
| 906 |
|
make them 2D (FICE/QNETO/ ...) |
| 907 |
|
- remove FO (it is the same as QNETO) |
| 908 |
|
- introduce a few local fields to avoid modifying external fields such |
| 909 |
|
as atemp, etc. |
| 910 |
|
|
| 911 |
|
checkpoint58s_post |
| 912 |
|
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
| 913 |
|
changed exf_set_gen.F so that |
| 914 |
|
genperiod=0 means input file is one time-constant field and |
| 915 |
|
genperiod=-12 means input file contains 12 monthly means |
| 916 |
|
o CG2D: use pre-computed solver main-diagonal (stored in common block); |
| 917 |
|
this affects truncation error ; generate new output file for exp. which |
| 918 |
|
fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d), |
| 919 |
|
global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d), |
| 920 |
|
ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d), |
| 921 |
|
MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d), |
| 922 |
|
tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d), |
| 923 |
|
vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d) |
| 924 |
|
o start implementation of deep-atmosphere and anelastic formulation |
| 925 |
|
o verification: remove 2nd copy of input files and use script "prepare_run" |
| 926 |
|
to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M) |
| 927 |
|
o mom_common/vecinv/fluxform: fix a few initialisation isssues |
| 928 |
|
o profiles: fix for multithreaded case |
| 929 |
|
|
| 930 |
|
o diagnostics: rename few diags: |
| 931 |
|
s/'PRESSURE'/'RCENTER '/g |
| 932 |
|
s/'TICE '/'oceFreez'/g |
| 933 |
|
s/'TAUX '/'oceTAUX '/g |
| 934 |
|
s/'TAUY '/'oceTAUY '/g |
| 935 |
|
s/'SWFLUX '/'oceQsw '/g |
| 936 |
|
s/DIFx/DFxE/g |
| 937 |
|
s/DIFy/DFyE/g |
| 938 |
|
and add few ocean-forcing diagnostics: |
| 939 |
|
atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS |
| 940 |
|
o modifications to pkg/seaice/growth.F and budget.F, which change results of |
| 941 |
|
lab_sea experiment: HSNOW was sometimes treated as effective and sometimes |
| 942 |
|
as actual snow thickness. It now refers everywhere to effective snow |
| 943 |
|
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
| 944 |
|
|
| 945 |
|
checkpoint58r_post |
| 946 |
|
o modifications to pkg/seaice/growth.F, which change results of |
| 947 |
|
lab_sea experiment: fixes pertain to melting snow over open water, to |
| 948 |
|
masking EVAP under sea ice, and to using the correct AREA variable for |
| 949 |
|
computations of EVAP, PRECIP, HSNOW, and GHEFF |
| 950 |
|
o add ability to read bathy, salt, and theta using MNC (off by def) |
| 951 |
|
o add flooding algorithm and advection of HSNOW for pkg/seaice; |
| 952 |
|
both are turned off by default and do no change any results |
| 953 |
|
o seaice advection with pkg/thsice: a step toward the use of non-linear |
| 954 |
|
advection scheme, but #ifdef or commented out for now (requires more EXCH). |
| 955 |
|
o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens |
| 956 |
|
(identical results) and the standard version of EXTERNAL_FIELDS_LOAD |
| 957 |
|
in natl_box (affects results @ truncation level: update output.txt) |
| 958 |
|
o multi-threading and IO: |
| 959 |
|
- replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R. |
| 960 |
|
- remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls |
| 961 |
|
(needed to work with SingleCpuIO): tested in all verif. exp. |
| 962 |
|
o GAD: use simpler DST3 formulation as default (old version left within #ifdef) |
| 963 |
|
affects the results (but none of the verification test uses this scheme). |
| 964 |
|
o Adding some pkg/diagnostics capability to pkg/seaice |
| 965 |
|
(will certainly be subject to changes) |
| 966 |
|
o ctrl: adding new control variables: |
| 967 |
|
lwflux, lwdown, evap, snowprecip, apressure, runoff |
| 968 |
|
|
| 969 |
|
checkpoint58q_post |
| 970 |
|
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
| 971 |
|
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
| 972 |
|
high_res_cube configuration by 4% on Columbia. |
| 973 |
|
o clean-up multi-threaded problems (reported by debugger tcheck on ACES); |
| 974 |
|
add (in global_with_exf/code) a version of EXF_INTERP_READ without |
| 975 |
|
dynamical allocation (seems to work in multi-threaded). |
| 976 |
|
o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using |
| 977 |
|
single CPU io) so that TAF does not have to see EESUPPORT.h |
| 978 |
|
o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux) |
| 979 |
|
|
| 980 |
|
checkpoint58p_post |
| 981 |
|
o obcs: stop if obcs is used with useCDscheme = .true. |
| 982 |
|
o shelfice: |
| 983 |
|
- fix a sign error so that no slip at shelfice interface works |
| 984 |
|
- remove stop for combination non-hydrostatic code and shelfice. That does |
| 985 |
|
not mean, that the results are correct, but at least they are numerically |
| 986 |
|
stable |
| 987 |
|
o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted) |
| 988 |
|
o added adjoint exch routined for all exch*3d* routines |
| 989 |
|
and updated flow directives |
| 990 |
|
|
| 991 |
|
checkpoint58o_post |
| 992 |
|
o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ; |
| 993 |
|
remove old subroutines (_XY_ & _XYZ_); update the adjoint version. |
| 994 |
|
o change controling S/R for writing pickup file (new S/R do_write_pickup) |
| 995 |
|
and clean-up reading/writing of pickup files. |
| 996 |
|
o fix local version of read/write pickup (NH part) in rotating_tank/code |
| 997 |
|
o simplify EXCH interface: |
| 998 |
|
- change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list) |
| 999 |
|
- not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version |
| 1000 |
|
o added the regrid package |
| 1001 |
|
o shelfice: |
| 1002 |
|
- add a simple boundary layer scheme to reduce noise |
| 1003 |
|
- fix the indexing in shelfice_u/v_drag so that there will be actually drag |
| 1004 |
|
|
| 1005 |
|
checkpoint58n_post |
| 1006 |
|
o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to |
| 1007 |
|
local variable (not in common block). |
| 1008 |
|
o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass. |
| 1009 |
|
- still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more); |
| 1010 |
|
- still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls |
| 1011 |
|
to work with SingleCpuIO. |
| 1012 |
|
o add "_d 0" to real constant of pkg/cfc subroutines ; |
| 1013 |
|
update exp. cfc_exemple & tutorial_cfc_offline output files. |
| 1014 |
|
o multi-threading and IO: |
| 1015 |
|
- all threads call READ_FLD S/R (needed if using SingleCpuIO): |
| 1016 |
|
(no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R. |
| 1017 |
|
- barrier before and after reading. |
| 1018 |
|
- stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE) |
| 1019 |
|
- avoid using MDS_WRITELOCAL for LAND pkg output. |
| 1020 |
|
- new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics |
| 1021 |
|
common-block variables ; Allows multi-threading with master-thread IO. |
| 1022 |
|
o change default MAX_NO_THREADS from 32 to 4 ; |
| 1023 |
|
and stop cleanly when MAX_NO_THREADS is too small. |
| 1024 |
|
o add S/R BAR_CHECK to check multi-threaded barrier synchronization |
| 1025 |
|
|
| 1026 |
|
checkpoint58m_post |
| 1027 |
|
o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc. |
| 1028 |
|
and side-drag) on CS-grid : global_ocean.cs32x15.viscA4 |
| 1029 |
|
o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp. |
| 1030 |
|
keep global_ocean.90x40x15 (for AD testing) with former secondary test |
| 1031 |
|
(".qshyd") as the main test (mv output.qshyd.txt to output.txt) |
| 1032 |
|
o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos; |
| 1033 |
|
add MITgcm_tutorials (= code + all the tutorials) |
| 1034 |
|
o ecco, option to compute cost for total ssh (mean+anom) |
| 1035 |
|
o consistent with addition of ptracer and ssh in pkg/profiles |
| 1036 |
|
o profiles: adding ptracer and ssh |
| 1037 |
|
o testreport: change multi-test output-file name |
| 1038 |
|
(from output.txt.{name} to output.{name}.txt) |
| 1039 |
|
o profiles: now ok for mutli-tiles case |
| 1040 |
|
o seaice: add 4 parameters for different advection schemes for area, |
| 1041 |
|
(effective) seaice thickness, enthalphy, and snow height. Their default |
| 1042 |
|
is the standard parameter SEAICEadvScheme |
| 1043 |
|
o calc_gw: |
| 1044 |
|
- add cosFacU in zonal viscous flux (harmonic.visc.). |
| 1045 |
|
- put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt. |
| 1046 |
|
of tutorial_plume_on_slope. |
| 1047 |
|
o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria). |
| 1048 |
|
o calc_gw: true flux-form, account for horizontal grid spacing. |
| 1049 |
|
update rotating_tank results, but not plume_on_slope (affected at |
| 1050 |
|
truncation level, 11 digits). |
| 1051 |
|
|
| 1052 |
|
checkpoint58l_post |
| 1053 |
|
o calc_gw: |
| 1054 |
|
- take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V |
| 1055 |
|
- remove side-drag for now (need to fix it); update plume_on_slope results. |
| 1056 |
|
- fix for partial-cell & non-uniform dz; update plume_on_slope results. |
| 1057 |
|
o commit code to make SST/SSS weights spatially variable |
| 1058 |
|
(based on either variable in-situ or variable initial T/S weights) |
| 1059 |
|
o pkg/ecco: |
| 1060 |
|
* commit code to relax deviations of xx_theta, xx_salt to 5*sigma, |
| 1061 |
|
now based on horizontally varying weights wthetaLev, wsaltLev |
| 1062 |
|
* cost_averagesflags now returns year indices in addition to day, month |
| 1063 |
|
* sflux balance is performed on annual basis |
| 1064 |
|
(sflxumm, sfluxmm2, bal_sfluxmm) |
| 1065 |
|
* for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO, |
| 1066 |
|
including separate counting and multipliers |
| 1067 |
|
o pkg/rbcs |
| 1068 |
|
* add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing |
| 1069 |
|
|
| 1070 |
|
checkpoint58k_post |
| 1071 |
|
o testreport: |
| 1072 |
|
- always build in dir. "build" (if not there, mkdir build instead of building |
| 1073 |
|
& running in input) |
| 1074 |
|
- run in dir run (if it exists), in build otherwise. |
| 1075 |
|
- call prepare_run (if input/prepare_run exists) |
| 1076 |
|
- run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists. |
| 1077 |
|
o pkg/exf modifications to interpolation and rotation routines for more |
| 1078 |
|
reasonable treatment of North Pole singularity: for tracers North Pole |
| 1079 |
|
value is set to northernmost zonal-mean value, for zonal velocity it is |
| 1080 |
|
set to zero, and for meridional velocity it is set to northernmost value. |
| 1081 |
|
o pkg/exf/exf_check_range.F |
| 1082 |
|
- add tile index to diagnostics and move stop statement to the very |
| 1083 |
|
end of the routine. |
| 1084 |
|
o pkg/diagnostics: (diagnostics_main_init.F) |
| 1085 |
|
define title of isomorphic variables according to the current config. |
| 1086 |
|
o pkg/thsice with pkg/seaice dynamics: |
| 1087 |
|
- fix domain of computation (interior only, required for exf) and do exchanges |
| 1088 |
|
- seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient |
| 1089 |
|
o towards a standard way of dealing with multi-threading in MONITOR |
| 1090 |
|
and ${PKG}_MONITOR (all except ptracers_monitor) subroutines. |
| 1091 |
|
o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith) |
| 1092 |
|
to W momentum equation in nonhydrostatic and quasihydrostatic runs. |
| 1093 |
|
o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor. |
| 1094 |
|
o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block) |
| 1095 |
|
o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL |
| 1096 |
|
(problems ? with gradient check in bottom_ctrl_5x5 adjoint test) |
| 1097 |
|
o tracer advection: |
| 1098 |
|
- clean-up and simplify calc_common_factors.F |
| 1099 |
|
- make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer |
| 1100 |
|
advection subroutine (but still not used within DST advection S/R) |
| 1101 |
|
o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim) |
| 1102 |
|
|
| 1103 |
|
checkpoint58j_post |
| 1104 |
|
o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields |
| 1105 |
|
from file (collects calls previously in FORWARD_STEP) |
| 1106 |
|
o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS |
| 1107 |
|
o adjoint store dir. adjusted accordingly |
| 1108 |
|
o genmake2 |
| 1109 |
|
replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list. |
| 1110 |
|
|
| 1111 |
|
checkpoint58i_post |
| 1112 |
|
o pkg/seaice: add parameter that allows to scale/turn off effect of seaice |
| 1113 |
|
on wind stress (SEAICEstressFactor defaults to 1.) |
| 1114 |
|
o Total number of Timers is finite (<=40): comment out 2 non-essential one |
| 1115 |
|
in the_main_loop.F to avoid Pb (e.g., when running fizhi test) |
| 1116 |
|
o vector_invariant: fix highOrderVorticity(=4.th.Order) advection |
| 1117 |
|
on CS-grid: no longer loosing mass. |
| 1118 |
|
o exf & curvilinear-grid: no longer modify longitude xC & xG. |
| 1119 |
|
o pkg/ggl90: fix sloppy output and fix a bug |
| 1120 |
|
o pkg/seaice: added SEAICEuseEVPpickup parameter |
| 1121 |
|
- Set to false in order to start EVP solver with |
| 1122 |
|
non-EVP pickup files when using SEAICEuseEVP |
| 1123 |
|
- fix sign error in diffusion in seaice_calc_rhs |
| 1124 |
|
|
| 1125 |
|
checkpoint58h_post |
| 1126 |
|
* Modifications for bottom topography control |
| 1127 |
|
o replace hFacC by _hFacC at various places |
| 1128 |
|
o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL |
| 1129 |
|
o add non-self-adjoint cg2d_nsa |
| 1130 |
|
o update autodiff support routines |
| 1131 |
|
o re-initialise hfac after ctrl_depth_ini |
| 1132 |
|
o works for 5x5 box, doesnt work for global_ocean.90x40x15 |
| 1133 |
|
* Adding verification for 5x5 box (4-layer) bottom topography control |
| 1134 |
|
|
| 1135 |
|
checkpoint58g_post |
| 1136 |
|
o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g., |
| 1137 |
|
used for mean seasonal cycle, mean diurnal cycle); add an example |
| 1138 |
|
in verification/global_ocean.cs32x15/input.thsice/data.diagnostics |
| 1139 |
|
o pkg/ggl90: |
| 1140 |
|
- add parameter (minimum surface kinetic energy) |
| 1141 |
|
- fix bug (avoiding division by zero) |
| 1142 |
|
o couple pkg/thsice to pkg/seaice: |
| 1143 |
|
- modify advection in seaice to accomodate new scalar fields to be advected |
| 1144 |
|
- only muliDimAdection scheme work with seaice/thsice |
| 1145 |
|
- mapping of thsice-variables to seaice-variables, back and forth |
| 1146 |
|
- does not break the verification experiments, but does not give the |
| 1147 |
|
desired results either |
| 1148 |
|
o pkg/seaice |
| 1149 |
|
- make (default) second order advection a bit less confusing? |
| 1150 |
|
|
| 1151 |
|
checkpoint58f_post |
| 1152 |
|
o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice |
| 1153 |
|
to pkg/seaice): |
| 1154 |
|
- new routines thsice_map_exf and thsice_get_exf provide the interface |
| 1155 |
|
- add an additional formal parameter to thsice_solve4temp |
| 1156 |
|
o pkg/exf: |
| 1157 |
|
- add new fields wspeed, snowprecip (to be able to couple to thsice) |
| 1158 |
|
- correct Stefan-Boltzmann constant |
| 1159 |
|
- new parameter for longwave surface emittance |
| 1160 |
|
- separate some stuff from exf_bulkformulae into new routines |
| 1161 |
|
exf_radiation, exf_wind |
| 1162 |
|
- add new parameters and constants: longwave emissivity for ocean, ice |
| 1163 |
|
and snow, evaporation parameters over ice |
| 1164 |
|
- decouple wind/stress computation from ALLOW_BULKFORMULA: always compute |
| 1165 |
|
either wind from stress or stress from wind |
| 1166 |
|
o pkg/thSIce: |
| 1167 |
|
- split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F |
| 1168 |
|
- put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND |
| 1169 |
|
and THSICE_CALC_THICKN |
| 1170 |
|
- for now, call to THSICE_GET_BULKF remains inside i,j loops. |
| 1171 |
|
- add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h |
| 1172 |
|
to make debugging easier. |
| 1173 |
|
- affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output |
| 1174 |
|
o pkg/bulk_force: |
| 1175 |
|
- clean-up comments and parameters ; |
| 1176 |
|
- add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ; |
| 1177 |
|
o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched; |
| 1178 |
|
generate new output for test-experiment: aim.5l_cs.thSI |
| 1179 |
|
o results_ad : rename "output.txt_adm" to "output_adm.txt" and change |
| 1180 |
|
testreport accordingly |
| 1181 |
|
|
| 1182 |
|
checkpoint58e_post |
| 1183 |
|
o SEAICE_CGRID adjoint done |
| 1184 |
|
o R_STAR adjoint implemented. |
| 1185 |
|
* Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ ) |
| 1186 |
|
* need to sort out init. of h0facc, etc. |
| 1187 |
|
o Make pkg/profile fully independent of ecco,cost, etc. stuff |
| 1188 |
|
to be able to use it in pure forward. |
| 1189 |
|
|
| 1190 |
|
checkpoint58d_post |
| 1191 |
|
o upgrade simple test-experiment to tutorial example: |
| 1192 |
|
step.1: duplicate the experiment and (step.2) will remove the old copy. |
| 1193 |
|
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
| 1194 |
|
tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere) |
| 1195 |
|
tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation) |
| 1196 |
|
tutorial_global_oce_biogeo <- copy of dic_example |
| 1197 |
|
tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection) |
| 1198 |
|
tutorial_plume_on_slope <- copy of plume_on_slope |
| 1199 |
|
tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity) |
| 1200 |
|
tutorial_global_oce_optim <- empty for now (David ?) |
| 1201 |
|
tutorial_global_oce_in_p <- copy of global_ocean_pressure |
| 1202 |
|
some tutorials (R1) were already checked-in under tutorial_examples in release1_branch |
| 1203 |
|
o correct a sign problem in cost_scat.F |
| 1204 |
|
o obcs and ptracers: fix boundary conditions for advections schemes |
| 1205 |
|
with larger stencil |
| 1206 |
|
o thsice adjoint: start |
| 1207 |
|
o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for |
| 1208 |
|
completeness |
| 1209 |
|
o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING |
| 1210 |
|
and COSINEMETH_III, add comments in default CPP_OPTIONS.h |
| 1211 |
|
o ptracers adjoint: |
| 1212 |
|
* avoid extensive recomputatations |
| 1213 |
|
* fix missing re-init. of gptr (missed by TAF) |
| 1214 |
|
o obcs: add a flag (OBCSprintDiags, defaults is true) that allows |
| 1215 |
|
me to turn off the excessive output to STDOUT that this package produces |
| 1216 |
|
o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common |
| 1217 |
|
and add those terms in Vector-Invariant formulation. |
| 1218 |
|
o in ctrl pkg, if ALLOW_CAL, use monthly mean controls |
| 1219 |
|
if the control period (xx_hfluxperiod etc) is 0 |
| 1220 |
|
o in profiles pkg, clean routines and fix details |
| 1221 |
|
o in ecco pkg, reading ssh data: |
| 1222 |
|
fix problem in case the model does not start at iter0=0 |
| 1223 |
|
o fix mnc-pickup/restart for ptracers |
| 1224 |
|
o new package prifiles: |
| 1225 |
|
code to compute profile-based cost by Gael Forget |
| 1226 |
|
(modifs in ecco, ctrl, autodiff) |
| 1227 |
|
o Benign bug fix in initialization (spotted by M. Mazloff) of |
| 1228 |
|
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
| 1229 |
|
|
| 1230 |
|
checkpoint58c_post |
| 1231 |
|
o adjoint: finish NLFS adjoint and provide reference output in |
| 1232 |
|
verification/global_ocean.90x40x15/results_ad_nlfs |
| 1233 |
|
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
| 1234 |
|
documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in |
| 1235 |
|
SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only |
| 1236 |
|
with SEAICE_CGRID defined. |
| 1237 |
|
o move calendarDumps from "data" to "data.cal" and clean-up the code |
| 1238 |
|
with a simple call to pkg/cal S/R: CAL_TIME2WRITE |
| 1239 |
|
o add useEXF & useCAL flags (for now, set in hard-coded way) |
| 1240 |
|
o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum |
| 1241 |
|
(were missing in NH mode, and wrong in quasihydrostatic mode). |
| 1242 |
|
waiting for Chris updated version of calc_gw to add those CALLs. |
| 1243 |
|
o fix bug in quasihydrostatic S/R ; |
| 1244 |
|
add a test for this option: global_ocean.90x40x15.qshyd |
| 1245 |
|
o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs. |
| 1246 |
|
(called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS) |
| 1247 |
|
o add on/off flag useOffLine for package OFFLINE |
| 1248 |
|
o seaice: |
| 1249 |
|
- modify advection so that it works also on the C-grid |
| 1250 |
|
- extend loop ranges in seaice_lsr and seaice_dynsolver; fixes |
| 1251 |
|
problem in multi-tile runs with C-grid |
| 1252 |
|
- add flags for clipping ice velocities and/or masking solver forcing |
| 1253 |
|
- fix drag (ocean on ice) formulation and a bug that caused noise in the |
| 1254 |
|
C-grid solver |
| 1255 |
|
- added a few comments to seaice_diffusion.F |
| 1256 |
|
- separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V |
| 1257 |
|
are now exclusive) |
| 1258 |
|
- add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which |
| 1259 |
|
required re-ordering the code a little: |
| 1260 |
|
+ make DAIRN global variable (defined in SEAICE) |
| 1261 |
|
+ move computation of the viscosities eta and zeta into a new separate |
| 1262 |
|
routine (because I need to recompute them in seaice_ocean_stress.F) |
| 1263 |
|
|
| 1264 |
|
checkpoint58b_post |
| 1265 |
|
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
| 1266 |
|
update output.txt of exp. aim.5l_cs.thSI |
| 1267 |
|
o various mnc cleanups and improvements: |
| 1268 |
|
+ shrink lookup tables by factor of ~4 |
| 1269 |
|
+ better error reporting when running out of lookup space |
| 1270 |
|
+ able to handle longer path/file names (up to 500 chars) |
| 1271 |
|
o adjoint: |
| 1272 |
|
- Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations. |
| 1273 |
|
- TBD: "hidden" mom_vecinv recomp. in dynamics |
| 1274 |
|
o change forcing_In_AB to affects both T,S forcing and Momentum forcing |
| 1275 |
|
(allow to differentiate between forcing components using new integer flags: |
| 1276 |
|
momForcingOutAB=1/0 & tracForcingOutAB=1/0) |
| 1277 |
|
and add new flag to put Dissipation tendency out of Adams-Bashforth. |
| 1278 |
|
o ecco |
| 1279 |
|
- enable trend removal from SSH anomaly obs. |
| 1280 |
|
o adjoint |
| 1281 |
|
- a fix for PmEpR when #undef EXACT_CONSERV |
| 1282 |
|
- fix of "hidden" recomp. in thermodynamics (no TAF warnings) |
| 1283 |
|
- try to fix "hidden" recomp. in forward_step for NLFS |
| 1284 |
|
(NLFS seems broken sometimes after I checked it in) |
| 1285 |
|
o seaice: |
| 1286 |
|
- add c-grid version of the dynamic solver: |
| 1287 |
|
+ three new routines that are the c-grid substitute lsr, dynsolver |
| 1288 |
|
and ostres |
| 1289 |
|
+ put a few fields that were local to dynsolver into global common |
| 1290 |
|
blocks, so that I can move the computation of stresses etc into |
| 1291 |
|
seaice_lsr (saves coding but may break the adjoint). |
| 1292 |
|
- replace more hardwired parameters by runtime parameters |
| 1293 |
|
- add ice masks that mask the rhs of the implicit solvers where there |
| 1294 |
|
is no ice (commented out in seaice_dynsolver, because i am not sure |
| 1295 |
|
if this works properly), eventually this should replace the clipping |
| 1296 |
|
of ice velocities in seaice_dynsolver to +/-40cm/s. |
| 1297 |
|
o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly |
| 1298 |
|
include it only where its needed |
| 1299 |
|
o move balancing of fluxes before the call of external_forcing_surf |
| 1300 |
|
o seaice: |
| 1301 |
|
- correct units of turning angles (now they are really in degrees) |
| 1302 |
|
- move computation of GWATX/Y out of main routine into dynsolver |
| 1303 |
|
- initialize GWATX/Y in seaice_init |
| 1304 |
|
o Apply mask on Fresh-Water flux (needed for SSH forcing). |
| 1305 |
|
update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual) |
| 1306 |
|
o seaice: add runtime flags for turning angles (default to zero) |
| 1307 |
|
o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean |
| 1308 |
|
and trend from exf forcing and ctrl control adjustments |
| 1309 |
|
o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF |
| 1310 |
|
(since checkpoint57x_post) |
| 1311 |
|
o change the default rotation period to 86164.s = the Earth rotation |
| 1312 |
|
o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T) |
| 1313 |
|
and based on a reference stratification. Tested within hs94.cs-32x32x5. |
| 1314 |
|
o seaice advection: add code for choosing between the default (2nd order |
| 1315 |
|
central differences) and multiDim advection schemes provided by |
| 1316 |
|
pkg/generic_advdiff |
| 1317 |
|
o seaice: |
| 1318 |
|
- removed all references to SEAICE_GRID.h fields from |
| 1319 |
|
dynsolver, advect, diffus, lsr, without changing the results of lab_sea |
| 1320 |
|
(cubed-sphere configuration will change a little) |
| 1321 |
|
- grid computations in seaice_init are obsolete now. |
| 1322 |
|
- cleaned up code a little so that is easier to read (hopefully). |
| 1323 |
|
- added new (better?) discretizations of default advection and diffusion |
| 1324 |
|
(turn on with SEAICEuseFluxForm) |
| 1325 |
|
- replace 1 in 3d global fields by kSurface in growth.F |
| 1326 |
|
|
| 1327 |
|
checkpoint58a_post |
| 1328 |
|
o seaice: |
| 1329 |
|
- bug fix in advect.F |
| 1330 |
|
o shelfice: |
| 1331 |
|
- separate shelfice load anomaly from pload (breaks with time |
| 1332 |
|
dependent forcing), => introduce constant field shelficeLoadAnomaly. |
| 1333 |
|
Its default is 0., but it may be computed more cleverly from (unknown) |
| 1334 |
|
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be |
| 1335 |
|
done offline. A good approximation of the pressure load anomaly is |
| 1336 |
|
necessary to avoid large initial adjustment processes underneath |
| 1337 |
|
deep-reaching shelfice. |
| 1338 |
|
- small fix in ISOMIP shelfice_thermodynamics |
| 1339 |
|
- add more sophisticated thermodynamics of Hellmer (1989), this is |
| 1340 |
|
now the default |
| 1341 |
|
- give a few constants more intuitive names |
| 1342 |
|
o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful |
| 1343 |
|
if bulk formulae are used in long integration (especially EmPmR). Turn |
| 1344 |
|
on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01 |
| 1345 |
|
if balancePrintMean, the imbalance that is substracted is printed to |
| 1346 |
|
STDOUT. |
| 1347 |
|
o fix bug (typo) in obcs_apply_eta.F |
| 1348 |
|
o add a new package shelfice which enables us to model the circulation |
| 1349 |
|
underneath shelf-ice with draughts of hundreds of meters. |
| 1350 |
|
- works |
| 1351 |
|
- to do: + include improved thermodynamics |
| 1352 |
|
+ check whether kSurfC (from model/inc/SURFACE.h) can be used |
| 1353 |
|
instead of new field kTopC |
| 1354 |
|
+ can we use topoFile, Ro_surf and existing code in ini_depth.F |
| 1355 |
|
instead of new field R_shelfIce and new code in ini_depth.F |
| 1356 |
|
and ini_mask_etc.F? |
| 1357 |
|
+ adjust vertical mixing schemes? |
| 1358 |
|
o seaice pkg: |
| 1359 |
|
- add a cpp-flag to include a simple formula for a salinity dependent |
| 1360 |
|
freezing point of sea water at the surface |
| 1361 |
|
- change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and |
| 1362 |
|
meridional stresses are now different (and hopefully correct) |
| 1363 |
|
o AIM pkg: change threshold on large-scale condensation to conserve Heat. |
| 1364 |
|
update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics |
| 1365 |
|
and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG) |
| 1366 |
|
o pkg/diagnostics: add options and parameters for regional-statistics |
| 1367 |
|
diagnostics ; define regions by reading a region-mask from a file |
| 1368 |
|
(might add other options later) |
| 1369 |
|
o pkg/bulk_force: |
| 1370 |
|
- add option and parameters to use AIM surface-flux formulae. |
| 1371 |
|
- Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ; |
| 1372 |
|
others forcing fields (defined in PARM05, parameter file "data") are loaded |
| 1373 |
|
from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F). |
| 1374 |
|
- initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F |
| 1375 |
|
- use the right EXCH call for uwind,vwind (to work on CS-grid). |
| 1376 |
|
- re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h) |
| 1377 |
|
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
| 1378 |
|
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
| 1379 |
|
|
| 1380 |
|
checkpoint58 |
| 1381 |
|
o add "--embed-source" option to genmake2 which, when the supporting |
| 1382 |
|
tools can be compiled (as determined by genmake2) will turn on the |
| 1383 |
|
embed_files package which then embeds the entire MITgcm source code |
| 1384 |
|
(*.[fFhc] + Makefile) used for the build within the executable |
| 1385 |
|
- requested by CNH but off by default |
| 1386 |
|
- adds a paltry <9MB to the mitgcmuv executable in most cases |
| 1387 |
|
- only writes the output when useEMBEDSRC in eedata is true |
| 1388 |
|
o clean up 3-dim. relaxation codes: |
| 1389 |
|
* Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec |
| 1390 |
|
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
| 1391 |
|
* Thanks to Tom Haine for testing! |
| 1392 |
|
|
| 1393 |
|
checkpoint57z_post |
| 1394 |
|
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
| 1395 |
|
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
| 1396 |
|
o fix the pickup behavior for obcs in combination with ptracers |
| 1397 |
|
o fix a bug in ptracers_external_fields_load |
| 1398 |
|
o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...) |
| 1399 |
|
affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!) |
| 1400 |
|
o transfered surface NH pressure to eta field (if exactConserv). |
| 1401 |
|
o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign) |
| 1402 |
|
and update lab_sea output.txt file. |
| 1403 |
|
o completing 3-dim. relaxation code: additional term |
| 1404 |
|
1/tau*( theta(i,j,k) - thetaStar(i,j,k) ) |
| 1405 |
|
in S/R EXTERNAL_FORCING_T (file external_forcing.F) |
| 1406 |
|
* At compile time, in "EXF_OPTIONS.h" set |
| 1407 |
|
#define ALLOW_CLIMTEMP_RELAXATION |
| 1408 |
|
#define ALLOW_CLIMSALT_RELAXATION |
| 1409 |
|
* At runtime in "data", under &PARM03 set (e.g., units in seconds) |
| 1410 |
|
tauThetaClimRelax3Dim = 15552000.0, |
| 1411 |
|
tauSaltClimRelax3Dim = 15552000.0, |
| 1412 |
|
* 3 cases: |
| 1413 |
|
1) Use a constant-in-time 3-dim. field |
| 1414 |
|
2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec. |
| 1415 |
|
3) Real-time relax. to time-evolving prescribed field |
| 1416 |
|
o Adding Laplacian-type smoothness constraint on |
| 1417 |
|
initial and boundary (forcing) controls (ic, bc) |
| 1418 |
|
* enable at compile-time via |
| 1419 |
|
ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION |
| 1420 |
|
* enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1 |
| 1421 |
|
* Absolute scale somewhat unclear so far |
| 1422 |
|
* no area weighting was included since no other cost term does so far |
| 1423 |
|
|
| 1424 |
|
checkpoint57y_post |
| 1425 |
|
First step for a NLFS adjoint |
| 1426 |
|
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
| 1427 |
|
o new init. routines for calc_r_star, calc_surf_dr |
| 1428 |
|
o still need to deal with ini_masks_etc |
| 1429 |
|
o testreport seemed happy |
| 1430 |
|
checkpoint57y_pre |
| 1431 |
|
|
| 1432 |
|
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
| 1433 |
|
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
| 1434 |
|
o add new offset feature to offline pkg (plus minor cleanup) |
| 1435 |
|
o cfc fixes for final year of integration |
| 1436 |
|
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
| 1437 |
|
be in GCHEM_OPTIONS). |
| 1438 |
|
|
| 1439 |
|
checkpoint57x_post |
| 1440 |
|
o fix testreport Pb in multiple test experiment. |
| 1441 |
|
o cleanup our namelist syntax in verification: |
| 1442 |
|
- make it more F95 standards compliant (some work still needed) |
| 1443 |
|
- allows the vast majority of our tests to work with gfortran |
| 1444 |
|
o Non-Hydrostatic: |
| 1445 |
|
- put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h |
| 1446 |
|
- fix exchange calls for CS-grid using the new EXCH_S3D_RL. |
| 1447 |
|
o Allow to apply AB on T,S rather than on AB(gT,gS): |
| 1448 |
|
- implemented within #ifdef ALLOW_ADAMSBASHFORTH_3 |
| 1449 |
|
- use the same arrays (gtNm,gsNm) to hold tracer field at previous |
| 1450 |
|
time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)). |
| 1451 |
|
- need a "clever" read_pickup to restart from the other AB formulation |
| 1452 |
|
o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h |
| 1453 |
|
o remove some unused variables (reduces number of compiler warnings) |
| 1454 |
|
o adjoint |
| 1455 |
|
* Disable useVariableViscosity for adjoint for time being |
| 1456 |
|
(there are a number of extensive recomputations) |
| 1457 |
|
* Initialize certain variables needed for adjoint |
| 1458 |
|
|
| 1459 |
|
checkpoint57w_post |
| 1460 |
|
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
| 1461 |
|
fix the singleCpuIO RS version of MDSWRITEFIELD |
| 1462 |
|
and add a WARNING if using globalFiles=T with multi-processors. |
| 1463 |
|
o write grid-file(s) in only one format (MDS or MNC): default=MNC (if |
| 1464 |
|
using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc |
| 1465 |
|
o tracer advection scheme: |
| 1466 |
|
add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get |
| 1467 |
|
those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile, |
| 1468 |
|
was not very convenient). |
| 1469 |
|
add implicit version for DST-3 & DST3_Flux_Limit vertical advection; |
| 1470 |
|
(further tests needed for the implicit DST & Flux-Limiter schemes). |
| 1471 |
|
o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef |
| 1472 |
|
and sRef for convenience, handy, when you want to initialize |
| 1473 |
|
ptracers in a large domain with a constant non-zero value. Also, |
| 1474 |
|
untangle ptracers_init.F a little. |
| 1475 |
|
|
| 1476 |
|
checkpoint57v_post |
| 1477 |
|
o change dome exp. to use variable viscosity in side-drag terms. |
| 1478 |
|
o remove all the files from the cfc_offline test since they are now |
| 1479 |
|
incorporated into tutorial_cfc_offline which has been producing |
| 1480 |
|
identical results for a few days of testing |
| 1481 |
|
o add new parameter: sideDragFactor to enable half-slip-side BC |
| 1482 |
|
and change side-drag S/R to use viscosity from mom_calc_visc |
| 1483 |
|
(can switch back by setting sideDragFactor=0.); affects results at |
| 1484 |
|
truncation level; regenerate output for exp.: global_ocean.cs32x10(x3), |
| 1485 |
|
global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5). |
| 1486 |
|
o vorticity & strain are now computed without masking, to account for |
| 1487 |
|
no-slip-side BC in variable viscosity calculation ; mask is applied |
| 1488 |
|
anyway later on, before computing advection/coriolis terms. |
| 1489 |
|
o modify exp4 to test new obcs support for reading from external files |
| 1490 |
|
and for passive tracers |
| 1491 |
|
o fix behavior of ptracers_monitor when monitor output is written to a |
| 1492 |
|
netcdf-file; still not independent of monitor.F (writes in the same |
| 1493 |
|
file). |
| 1494 |
|
o change default value of tRef (put a uniform, meaningful value for ocean |
| 1495 |
|
& atmos) and initialize sRef (was missing, as Martin mentioned). |
| 1496 |
|
o Redefine viscC?Leith*. Change the coefficients of Leith viscosity |
| 1497 |
|
to be proportional to enstrophy dissipation length. Thus, |
| 1498 |
|
viscC?leith?_new=pi*(viscC?leith?_old)^(1/3) |
| 1499 |
|
This is now consistent with Smagorinsky and with the manual. |
| 1500 |
|
|
| 1501 |
|
checkpoint57u_post |
| 1502 |
|
o OBCS and PTRACERS: add open boundary support for passive tracers |
| 1503 |
|
- either use homogenous (pseudo) v.Neumann conditions or prescribe |
| 1504 |
|
OB-values from file; this is not different from the way theta and salinity |
| 1505 |
|
are treated |
| 1506 |
|
- however, Orlanski-radiation conditions are not supported, and the model |
| 1507 |
|
will stop if you use pTracers and Orlanski at the same time. |
| 1508 |
|
- beefed up the rountine obcs_external_fields_load: now only those open |
| 1509 |
|
boundary values are overwritten with values from files for which there |
| 1510 |
|
are really files, otherwise the OB-fields remain untouched. This makes |
| 1511 |
|
it possible to use different OBs at different ends of the domain (as |
| 1512 |
|
with EXF) |
| 1513 |
|
o reduce number of exch calls in shap_filt (s2). |
| 1514 |
|
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
| 1515 |
|
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
| 1516 |
|
|
| 1517 |
|
checkpoint57t_post |
| 1518 |
|
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
| 1519 |
|
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
| 1520 |
|
same truncation, independent of the face number: affects affects several |
| 1521 |
|
test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5). |
| 1522 |
|
o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times); |
| 1523 |
|
note that biharmonic viscosity + no-slip was not tested in any experiment. |
| 1524 |
|
o fix bug in non-linear free-surf side-drag ; generate new output for |
| 1525 |
|
global_ocean.cs32x15(+.thsice) & global_ocean_pressure. |
| 1526 |
|
o make mnc honor the writeBinaryPrec flag for most kinds of output |
| 1527 |
|
o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum |
| 1528 |
|
o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation |
| 1529 |
|
error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5). |
| 1530 |
|
o add brackets in multi-terms sum to get same truncation, independent of |
| 1531 |
|
the face number (manage to get exactly same value of gU,gV at the cs-edge) |
| 1532 |
|
affects several test. exp. Update global_ocean.cs32x15 (+.thsice). |
| 1533 |
|
o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax |
| 1534 |
|
and viscA4Remax, which allow one to limit the minimum viscosity by specifying |
| 1535 |
|
a maximum grid-scale Reynolds number. Also, changes all length calculations |
| 1536 |
|
in the case of grid anisotropy to geometric mean of dx**2 and dy**2. |
| 1537 |
|
Suggested values of viscosity parameters found in mom_calc_visc. |
| 1538 |
|
Many new viscosity diagnostics available. |
| 1539 |
|
|
| 1540 |
|
checkpoint57s_post |
| 1541 |
|
o Add clearing-house for viscosity calculations, mom_calc_visc and |
| 1542 |
|
correct numerous bugs in LeithD and Smagorinsky discretizations. |
| 1543 |
|
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
| 1544 |
|
used simultaneously, and to be used in mom_vecinv and mom_fluxform. |
| 1545 |
|
Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F) |
| 1546 |
|
and with Strain-Tension viscous term calculation (mom_hdissip.F). |
| 1547 |
|
The Strain-Tension form is now called with useStrainTensonVisc=.true. |
| 1548 |
|
ViscAhStrain and viscAhTension are now retired. |
| 1549 |
|
o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4". |
| 1550 |
|
o In response to JMC's bug report, genmake2 now ignores any soft-links |
| 1551 |
|
that it finds in the *current* directory when searching for files. |
| 1552 |
|
Soft-links found in any other source directories will still work as |
| 1553 |
|
they did before. |
| 1554 |
|
o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls |
| 1555 |
|
a C routine to unlimit the stack size |
| 1556 |
|
o mnc-ify pkg/aim snapshot vars |
| 1557 |
|
o mnc-ify pkg/land as requested by Daniel |
| 1558 |
|
o various changes to mnc including: |
| 1559 |
|
- all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format |
| 1560 |
|
- output can now be grouped so that all files within a group |
| 1561 |
|
change the ITER portion of their names in lock-step together |
| 1562 |
|
- can now read ("global") PER-FACE (in addition to PER-TILE) files |
| 1563 |
|
and works with both EXCH1 and EXCH2 (but needs more testing) |
| 1564 |
|
- writing works for all verification test cases w/ g77 on Linux |
| 1565 |
|
|
| 1566 |
|
checkpoint57r_post |
| 1567 |
|
o make MNC variable initialization happen earlier |
| 1568 |
|
o add diagnostics for (almost) each term of the momentum Eq. |
| 1569 |
|
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
| 1570 |
|
o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups) |
| 1571 |
|
o remove MINIMAL_TAVE_OUTPUT option ; |
| 1572 |
|
add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT). |
| 1573 |
|
o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src |
| 1574 |
|
allows to compile without pkg/mdsio (& test successfully hs94.1x64x5) |
| 1575 |
|
o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice) |
| 1576 |
|
o add time-dependent SST, SSS control |
| 1577 |
|
o cost terms in ecco/ modularized (new cost_generic.F) |
| 1578 |
|
o cost_averages routines are modularized (new cost_averagesgeneric.F) |
| 1579 |
|
o new infrastructure for seaice model vs. obs misfits in seaice/ |
| 1580 |
|
* driver from the_main_loop.F is seaice_cost_driver.F |
| 1581 |
|
* first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA) |
| 1582 |
|
* gradient check in Exp. 6a of natl_box_adjoint/ |
| 1583 |
|
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
| 1584 |
|
(see README file) |
| 1585 |
|
|
| 1586 |
|
checkpoint57q_post |
| 1587 |
|
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
| 1588 |
|
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
| 1589 |
|
- bug was reported by Jean-Michel and Ian Fenty |
| 1590 |
|
o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F) |
| 1591 |
|
update exp. cpl_aim+ocn output. |
| 1592 |
|
o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT |
| 1593 |
|
Needed for high-res. runs with large global files |
| 1594 |
|
to be able to limit tapelev size |
| 1595 |
|
o Changed some tests for adjoint: |
| 1596 |
|
* carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT |
| 1597 |
|
* natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT |
| 1598 |
|
* global_ocean.90x40x15/ back to default 3-level checkpointing |
| 1599 |
|
o Modifications to enable scripted COMMON to MODULE conversion |
| 1600 |
|
* verification/OpenAD/code/ has necessary scripts and description; |
| 1601 |
|
* converts, compiles and runs successfully; |
| 1602 |
|
|
| 1603 |
|
checkpoint57p_post |
| 1604 |
|
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
| 1605 |
|
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
| 1606 |
|
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
| 1607 |
|
o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP) |
| 1608 |
|
o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F |
| 1609 |
|
(was already the case for dissipation with mom_vecinv, |
| 1610 |
|
and also the case for grad.PhiHyd when staggered-timeStep) |
| 1611 |
|
This will allow to put dissipation out-off the AB time-stepping. |
| 1612 |
|
Unfortunately, affects truncation error. Update output of exp. that "fails" |
| 1613 |
|
(cg2d matching number) and leave the others for later: front_relax(10), |
| 1614 |
|
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
| 1615 |
|
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
| 1616 |
|
|
| 1617 |
|
checkpoint57o_post |
| 1618 |
|
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
| 1619 |
|
(2) its ready to be documented during the 20050801 DocFest |
| 1620 |
|
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
| 1621 |
|
for ideal_2D_oce and lab_sea on linux_ia32_g77 |
| 1622 |
|
o set to #undef CTRL_SET_OLD_MAXCVARS_30 |
| 1623 |
|
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
| 1624 |
|
(worth another tag) |
| 1625 |
|
|
| 1626 |
|
checkpoint57n_post |
| 1627 |
|
o adding precip control xx_precip 32 |
| 1628 |
|
o adding swflux control xx_swflux 33 |
| 1629 |
|
o Replacing 10 forcing penalty cost routines by 1 generic. |
| 1630 |
|
o Implementing partitioning in time-mean and variable adjustment |
| 1631 |
|
for atmos. state. |
| 1632 |
|
o Time-mean constant error is now read in data.ecco (instead of hard-coded) |
| 1633 |
|
o in natl_box_adjoint: |
| 1634 |
|
* updated exp 1 to 10 |
| 1635 |
|
(but does not have time-mean vs. variable split results yet) |
| 1636 |
|
o updated global1x1/*_seaice_adj/ |
| 1637 |
|
to incorporate latest changes |
| 1638 |
|
o enable useSingleCpuIO for mdsio vector routines |
| 1639 |
|
(applies in particular to tapelev I/O) |
| 1640 |
|
o removed inefficient K-loop in all active_file*control*.F |
| 1641 |
|
|
| 1642 |
|
checkpoint57m_post |
| 1643 |
|
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
| 1644 |
|
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
| 1645 |
|
o pkg/exch2: filling of face-corner halo regions is optional |
| 1646 |
|
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
| 1647 |
|
|
| 1648 |
|
checkpoint57l_post |
| 1649 |
|
tag before updating tutorials (pre-release-2) |
| 1650 |
|
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
| 1651 |
|
for output and interpolation of input fields onto model grid) |
| 1652 |
|
o fix radius in mom_v_metric_cylinder.F (wrong by dy/2). |
| 1653 |
|
Affects results of exp. rotating_tank ; update output.txt. |
| 1654 |
|
o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor |
| 1655 |
|
and taking the square quantity and/or using a fraction-weight field. |
| 1656 |
|
o fix aim_diagnostics_init.F mate numbers. |
| 1657 |
|
o add mnc output capability to diagnostics/diagstat and update |
| 1658 |
|
our cvsignore files for the ACSII output generated |
| 1659 |
|
|
| 1660 |
|
checkpoint57k_post |
| 1661 |
|
o lab_sea now uses diagnostics package and provides a suite of |
| 1662 |
|
new EXF diagnostics output. |
| 1663 |
|
|
| 1664 |
|
checkpoint57j_post |
| 1665 |
|
o exf |
| 1666 |
|
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
| 1667 |
|
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
| 1668 |
|
terms -2*ATAN(x) + pi/2 were added to both stable and unstable case. |
| 1669 |
|
* extended diagnostics output |
| 1670 |
|
- now includes all EXF variables |
| 1671 |
|
- hs, hl moved to common block |
| 1672 |
|
- separate S/R for diagnostics, called after ctrl vector is added |
| 1673 |
|
- name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet |
| 1674 |
|
- EXFqnet contains true Qnet (i.e. includes qsw) |
| 1675 |
|
* updated verif. lab_sea, global_with_exf |
| 1676 |
|
* Rearranging hflux (exf_mapfields -> exf_getforcing) |
| 1677 |
|
to ensure that diagnostics sees a true EXFqnet |
| 1678 |
|
o add matlab scripts for CS-grid vectors (in utils/cs_grid) |
| 1679 |
|
o diagnostics pkg: change pointers so that 1 diagnostic can be used |
| 1680 |
|
several times with different frequencies. |
| 1681 |
|
o mnc-ify the thsice package as requested by Daniel Enderton |
| 1682 |
|
- the monitor--MNC output needs work |
| 1683 |
|
- many attributes need to be added (most are currently blank) |
| 1684 |
|
o mnc-ify theaim_v23 package as requested by Daniel Enderton |
| 1685 |
|
- many attributes need to be added (most are currently blank) |
| 1686 |
|
o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign) |
| 1687 |
|
o add Sadourny like discretization to the 4th.O vorticity advection scheme |
| 1688 |
|
o fix bug in rStar code (calc_r_star.F) when used with topo/bathy. |
| 1689 |
|
update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn, |
| 1690 |
|
fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice). |
| 1691 |
|
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
| 1692 |
|
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
| 1693 |
|
|
| 1694 |
|
checkpoint57i_post |
| 1695 |
|
o Diagnostics package was changed: diagnostic allocation is now deactivated |
| 1696 |
|
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
| 1697 |
|
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
| 1698 |
|
add 1rst Order upwind vertical Shear. |
| 1699 |
|
o add a quick fix for A/B checkpointing in OFFLINE mode |
| 1700 |
|
o add IGNORE_TIME define and -ignore_time option to genmake2 as an |
| 1701 |
|
end-run around the C/Fortran linking horror in eesup/src/timers.F |
| 1702 |
|
o added pkg/runclock: allows user to terminate run based on wall clock |
| 1703 |
|
o added non-hydrostatic scaling parameter: nh_am2 |
| 1704 |
|
o pkg/my82: futile attempt to make results compiler-independent by adding |
| 1705 |
|
some "_d 0", etc. no effect. |
| 1706 |
|
o for mnc output, fill the 'T' coordinate var with myTime and create a |
| 1707 |
|
separate 'iter' variable for iteration count |
| 1708 |
|
o pkg/diagnostics: |
| 1709 |
|
add new capability: output of Global/Regional & per-level statistics ; |
| 1710 |
|
tested against monitor output (including land & thSIce) on various exp. |
| 1711 |
|
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
| 1712 |
|
|
| 1713 |
|
checkpoint57h_done |
| 1714 |
|
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
| 1715 |
|
data.diagnostics, data.gchem, data.ptracers) is done. |
| 1716 |
|
|
| 1717 |
|
o pkg/diagnostics: prepare for Global/Regional statistics. |
| 1718 |
|
add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h |
| 1719 |
|
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
| 1720 |
|
and rename it: DIFFERENT_MULTIPLE |
| 1721 |
|
|
| 1722 |
|
checkpoint57h_post |
| 1723 |
|
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
| 1724 |
|
o pkg/diagnostics: change output frequency, now in seconds (instead |
| 1725 |
|
of Nb of iterations). This requires to change data.diagnostics. |
| 1726 |
|
checkpoint57h_pre |
| 1727 |
|
|
| 1728 |
|
o in mnc, let the user create the output dir if both mnc_outdir_date |
| 1729 |
|
and mnc_outdir_num are false |
| 1730 |
|
o add fflags() to pkg/diagnostics which allows one to specify, on a |
| 1731 |
|
per-file basis, the file precision [default behavior is unchanged] |
| 1732 |
|
o added diagnostics to pkg/kpp, including computation of mixed layer |
| 1733 |
|
depth based on a temperature/density criterion |
| 1734 |
|
o updated verification/natl_box to test the new pkg/kpp diagnostics |
| 1735 |
|
o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T) |
| 1736 |
|
o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4) |
| 1737 |
|
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
| 1738 |
|
not mnc -- this mistake was found by JMC and is now corrected |
| 1739 |
|
|
| 1740 |
|
checkpoint57g_post |
| 1741 |
|
o add Adams-Bashforth 3rd Order time stepping: |
| 1742 |
|
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
| 1743 |
|
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
| 1744 |
|
checkpoint57g_pre |
| 1745 |
|
|
| 1746 |
|
o make lambda[Theta,Salt]ClimRelax spatially varying |
| 1747 |
|
(default remains spatially uniform constant based on tau) |
| 1748 |
|
o added new control variables |
| 1749 |
|
* init. uVel, vVel, etanN |
| 1750 |
|
* lambda[Theta,Salt]ClimRelax |
| 1751 |
|
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
| 1752 |
|
(suggested by G. Forget) |
| 1753 |
|
|
| 1754 |
|
checkpoint57f_post |
| 1755 |
|
o add parameter "baseTime" = model base time = time at iteration zero |
| 1756 |
|
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
| 1757 |
|
account for baseTime shift |
| 1758 |
|
o move Coriolis arrays from PARAMS.h to GRID.h |
| 1759 |
|
checkpoint57f_pre |
| 1760 |
|
|
| 1761 |
|
o mnc-ifying the seaice package |
| 1762 |
|
o introduced an alternative length scale calculation for use in the limiting |
| 1763 |
|
maximum viscosity (off by default, see mom_vi_hdissip.F for details) |
| 1764 |
|
o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S |
| 1765 |
|
o added modified Leith scheme with viscosity proportional to grad(Hdiv) |
| 1766 |
|
as well as grad(vort3). Made it compatible with both approximate form |
| 1767 |
|
for the cubed sphere and full form of these gradients. Added flag |
| 1768 |
|
useFullLeith to select between approximate and full form. |
| 1769 |
|
o add "d0" in getcon.F to reduce differences between compilers/platforms |
| 1770 |
|
update output.txt of exp. fizhi-gridalt-hs |
| 1771 |
|
o change port_rand funtion to allow to set the seed. |
| 1772 |
|
o fix obscure MNC bug involving conversion between reals and integers |
| 1773 |
|
- it caused no problems with certain (eg. gcc, ifc) compilers but the |
| 1774 |
|
new version is now more standards-compliant |
| 1775 |
|
o adjoint-related modifications |
| 1776 |
|
* gad_dst3_adv_?: to be able to use advscheme=30 in adjoint |
| 1777 |
|
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
| 1778 |
|
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
| 1779 |
|
|
| 1780 |
|
checkpoint57e_post |
| 1781 |
|
o Adding eddy stress controls a la Ferreira et al. |
| 1782 |
|
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
| 1783 |
|
|
| 1784 |
|
o fizhi pkg: fix AtoC and CtoA when called with same input & output array |
| 1785 |
|
update output.txt of exp. fizhi-gridalt-hs |
| 1786 |
|
o add more "Z" dimensions and associated coordinate vars to MNC |
| 1787 |
|
o pkg/exf: added twoDigitYear capability for option useExfYearlyFields |
| 1788 |
|
o parameter calendarDumps: when set, approximate months (30-31 days) and years |
| 1789 |
|
(360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq, |
| 1790 |
|
KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar |
| 1791 |
|
months and years. Requires pkg/cal. |
| 1792 |
|
o diagnostics: add pickup functionality |
| 1793 |
|
- off by default for backwards compatibility |
| 1794 |
|
- current version only uses MDSIO -- MNC will be added |
| 1795 |
|
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
| 1796 |
|
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
| 1797 |
|
|
| 1798 |
|
checkpoint57d_post |
| 1799 |
|
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
| 1800 |
|
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
| 1801 |
|
output from the diagnostics package |
| 1802 |
|
o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up |
| 1803 |
|
o make genmake2 more portable by using ".$FS" instead of ".f" for more |
| 1804 |
|
of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys) |
| 1805 |
|
o add coordinate variables to the MNC output from the diagnostics package |
| 1806 |
|
o change MNC-flags default value: true when useMNC=TRUE |
| 1807 |
|
o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F |
| 1808 |
|
the ability (off by default) to read the grid information using MNC |
| 1809 |
|
o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt |
| 1810 |
|
o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging |
| 1811 |
|
o do snap-shot diagnostics at the middle of the time-interval (instead of |
| 1812 |
|
at the end). |
| 1813 |
|
o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add |
| 1814 |
|
new test for AIM with thSIce + slab-ocean |
| 1815 |
|
o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h) |
| 1816 |
|
o move state variable diagnostics to the beginning of the time step ; |
| 1817 |
|
(note: still needs some work specially for snap-shot diagnostics) |
| 1818 |
|
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
| 1819 |
|
|
| 1820 |
|
checkpoint57c_post |
| 1821 |
|
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
| 1822 |
|
o generate new output.txt files on faulks with g77 & the new -ieee option |
| 1823 |
|
checkpoint57c_pre |
| 1824 |
|
|
| 1825 |
|
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
| 1826 |
|
update output.txt of exp. global_ocean.90x40x15 |
| 1827 |
|
o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer |
| 1828 |
|
results; update global_ocean_pressure & global_ocean.cs32x15 output.txt |
| 1829 |
|
o add saltFlux(+File) forcing capability with periodicExternalForcing |
| 1830 |
|
o allow to use pkg diagnostics for GM-Redi & ThSIce output |
| 1831 |
|
o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc. |
| 1832 |
|
o improvements for the MNC output from DIAGNOSTICS: |
| 1833 |
|
- correct handling of the unlimitied dimension |
| 1834 |
|
- all dims now have associated coordinate variables |
| 1835 |
|
- variables located at U, V, and Corner ("Z") points are now written |
| 1836 |
|
with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that |
| 1837 |
|
*all* data points are output |
| 1838 |
|
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice |
| 1839 |
|
o added pkg/seaice/seaice_monitor.F |
| 1840 |
|
o mdsio_readfield.F can now read files visible only to master MPI process. |
| 1841 |
|
o pkg/seaice: some test code for ice-modified ocean stress |
| 1842 |
|
o exf_getffields interpolation defaults to bilinear for all scalar forcing |
| 1843 |
|
fields (remains bicubic for wind velocity and stress). This avoids, e.g., |
| 1844 |
|
spurious negative numbers for precipitation and humidity. Will cause |
| 1845 |
|
some small numerical differences for integrations using pkg/exf/exf_interp.F. |
| 1846 |
|
o pkg/ctrl/ |
| 1847 |
|
* Add ctrlvec diagnostics in pack/unpack for nondimensional I/O |
| 1848 |
|
May be enabled via doPackDiag |
| 1849 |
|
* introduce z-scaling of |
| 1850 |
|
+ gradient (doZscalePack) and |
| 1851 |
|
+ control (doZscaleUnpack) |
| 1852 |
|
o pkg/mdsio/ |
| 1853 |
|
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
| 1854 |
|
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
| 1855 |
|
|
| 1856 |
|
checkpoint57b_post |
| 1857 |
|
o simplify options in diagnostics_fill arguments (remove weird combinations) |
| 1858 |
|
o fix MNC coordinate variables so that they now contain per-face index |
| 1859 |
|
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
| 1860 |
|
general, EXCH2 grids are only aligned to a "local" coordinate system |
| 1861 |
|
o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput) |
| 1862 |
|
o Implement instantaneous output within pkg diagnostics: |
| 1863 |
|
setting a negative frequency in data.diagnostics produces |
| 1864 |
|
"snap-shot" output (as opposed to time-average if freq > 0) |
| 1865 |
|
o move out off EQUIVALENCE all diagnostics that fizhi does not use ; |
| 1866 |
|
NOTE: change ptracer diagnostics name: use 2 characters to work with |
| 1867 |
|
more than 9 tracers. Add also diagnostics of advect & diffus flux. |
| 1868 |
|
o more CF compliance: convert all MNC 'iter' variables to 'T' so that it |
| 1869 |
|
becomes the coordinate variable for the 'T' dimension |
| 1870 |
|
o add CF-style coordinate variables to MNC |
| 1871 |
|
- just a first cut: numbers are meaningless on the cubesphere and |
| 1872 |
|
missing along the T axis but otherwise it works! |
| 1873 |
|
o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX |
| 1874 |
|
o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC. |
| 1875 |
|
o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon) |
| 1876 |
|
this is based directly on what the model compute, so that the content of |
| 1877 |
|
each diagnostics might be affected by switching options (e.g., implicitDiffusion) |
| 1878 |
|
o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F) |
| 1879 |
|
o clean up build options files for SunOS, in particular |
| 1880 |
|
- remove -traditional from xmakedepend |
| 1881 |
|
- change -xarch=v9 to -xarch=native for f77 |
| 1882 |
|
- restore use of make (not gmake) |
| 1883 |
|
- add CC=gcc if using g77 |
| 1884 |
|
o changes per discussion of AM, JMC, & EH3 today: |
| 1885 |
|
- move redundant "grid" variables out of "state" -- in preparation of |
| 1886 |
|
creating proper CF-style coordinate variables and in recognition |
| 1887 |
|
that any/all grid variables can be easily copied (eg. w/NCO) from |
| 1888 |
|
the grid files into any of the other NetCDF files |
| 1889 |
|
- *always* output grid variables with MDSIO (this will eventually be |
| 1890 |
|
changed) |
| 1891 |
|
- output MNC grid file if useMNC is true |
| 1892 |
|
o every instance of _END_MASTER() has been found and replaced with |
| 1893 |
|
_END_MASTER( myThid ) in order to satisfy certain picky Sun |
| 1894 |
|
preprocessors |
| 1895 |
|
o re-arrange diagnostics pkg initialisation: |
| 1896 |
|
- allow each package to extend the available diagnostics list |
| 1897 |
|
- add some checking and fix small problems (multi-threaded, ...) |
| 1898 |
|
- new S/R diagnostics_fill (replace fill_diagnostics): |
| 1899 |
|
look through the short list of active diag. (instead of the long list) |
| 1900 |
|
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
| 1901 |
|
|
| 1902 |
|
checkpoint57a_post |
| 1903 |
|
o this set of changes restores TAMC compatibility |
| 1904 |
|
tested for global_ocean.90x40x15 adjoint on trough |
| 1905 |
|
(what a pain) |
| 1906 |
|
|
| 1907 |
|
checkpoint57a_pre |
| 1908 |
|
o some modifs in tools/build_options for sunos |
| 1909 |
|
o call ctrl_pack for ctrl at end for optimcycle=0 |
| 1910 |
|
|
| 1911 |
|
checkpoint57 |
| 1912 |
|
o add horizontal bi-harmonic viscosity for vertical velocity |
| 1913 |
|
- new parameter viscA4W (defaults to viscA4) |
| 1914 |
|
- affects only non-hydrostatic code |
| 1915 |
|
- to be done: no-slip lateral boundary conditions |
| 1916 |
|
o switch back to "sflux = sflux - runoff" in exf_getforcing.F |
| 1917 |
|
o implement Implicit Vertical advection for pTracers |
| 1918 |
|
o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k) |
| 1919 |
|
(implemented also for implicit vertical diffusion & advection) |
| 1920 |
|
o OBCS: extend application of tracer open boundary conditions |
| 1921 |
|
to a strip beyond the boundary of width Olx/Oly |
| 1922 |
|
o add call monitor to TAF set of required calls (flow directives) |
| 1923 |
|
and include in natl_box_adjoint |
| 1924 |
|
o untangle a few ifdefs related to cost, ctrl, autodiff |
| 1925 |
|
untangel a few ALLOW_ECCO_OPTIMIZATION |
| 1926 |
|
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
| 1927 |
|
(theta2, salt2 in ecco_cost_weights) |
| 1928 |
|
|
| 1929 |
|
checkpoint56c_post |
| 1930 |
|
o OBCS as control variables |
| 1931 |
|
- update ctrl_ad_diff.list, obcs_ad_diff.list |
| 1932 |
|
- remove balance of obcs controls from default |
| 1933 |
|
- fix index bug nobcs in ctrl_init |
| 1934 |
|
- fix dummy fields filen in ctrl_pack |
| 1935 |
|
- add dummy weights for obcs |
| 1936 |
|
o lsopt: comment out fort.94 output |
| 1937 |
|
o optim: |
| 1938 |
|
- remove unnecessary header files |
| 1939 |
|
- adjusted namelists |
| 1940 |
|
- add xerbla.F to Makefile |
| 1941 |
|
o exf: |
| 1942 |
|
- multiple modifications of exf_check_range |
| 1943 |
|
- unit change in exf_init_runoff from [m/year] to [m/s] |
| 1944 |
|
o mdsio: |
| 1945 |
|
- i/o-vector change debugLevel from debLevA to debLevB |
| 1946 |
|
|
| 1947 |
|
checkpoint56b_post |
| 1948 |
|
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
| 1949 |
|
is called from DO_THE_MODEL_IO |
| 1950 |
|
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
| 1951 |
|
- introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq) |
| 1952 |
|
- clean up PTRACERS_WRITE_TIMEAVE a little |
| 1953 |
|
o add another verification experiment that tests both the cfc-pkg and |
| 1954 |
|
the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with |
| 1955 |
|
reactive tendencies treated inline with regular timestepping |
| 1956 |
|
o testreport previously did a lousy job of comparing small numbers, so |
| 1957 |
|
we (Ed and Martin) changed the way the cut-off of 1.e-12 is |
| 1958 |
|
implemented in the little c-progam tmp_cmpnum.c which is embedded in |
| 1959 |
|
testreport. |
| 1960 |
|
o ptracers_monitor: bug fix for MPI |
| 1961 |
|
|
| 1962 |
|
checkpoint56a_post |
| 1963 |
|
o GCHEM: finish reorganizating the package |
| 1964 |
|
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
| 1965 |
|
(introduces another 3D-array for each passive tracer, but only if |
| 1966 |
|
GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING |
| 1967 |
|
gchemTendency is not needed because the timestep is done separately) |
| 1968 |
|
- gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY |
| 1969 |
|
- GCHEM is now---more or less cleanly---separate from PTRACERS |
| 1970 |
|
- to bo done: handling of surfaceForcingPtr that is needed for KPP not |
| 1971 |
|
so clear to me how that should be done in a general way. |
| 1972 |
|
o CFC: improve formatting of output in CFC_ATMOS |
| 1973 |
|
o PTRACERS: |
| 1974 |
|
- rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so |
| 1975 |
|
that ALL experiments with ptracers enable can be checked. This makes |
| 1976 |
|
GCHEM_MONITOR obsolete. |
| 1977 |
|
- include a runtime parameter PTRACERS_monitorFreq that defaults to |
| 1978 |
|
monitorFreq |
| 1979 |
|
- set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true |
| 1980 |
|
o add PTRACERS (PTR0[1-5]) to testreport output |
| 1981 |
|
o exf_check_range: |
| 1982 |
|
* default changed to .TRUE. |
| 1983 |
|
* will check values for niter0 if debLevA, every timestep if debLevB |
| 1984 |
|
* STOP in exf_check_range if 'out of range' |
| 1985 |
|
* range chosen generous to allow for potential extema |
| 1986 |
|
TBD: a version with stricter range |
| 1987 |
|
permitted range would be runtime parameters |
| 1988 |
|
o GMredi: |
| 1989 |
|
- fix ldd97 slope limit ; extend valid domain of Psi-Bolus ; |
| 1990 |
|
- change S/R GRAD_SIGMA to be valid in the overlap on CS-grid. |
| 1991 |
|
- change the default GMREDI_OPTIONS.h: compile everything except Visbeck |
| 1992 |
|
o GCHEM: |
| 1993 |
|
- move call to GCHEM_FORCING_SEP, so that it is now called before |
| 1994 |
|
the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP |
| 1995 |
|
- introduced a useGCHEM runtime flag and applied it everywhere. |
| 1996 |
|
- renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING; |
| 1997 |
|
this flag is now only visible within GCHEM-pkg routines. |
| 1998 |
|
- moved gchem_forcing_int temporarily into ptracers_forcing, this will |
| 1999 |
|
be replaced by a 3D array that is computed before thermodynamics; for |
| 2000 |
|
this, the tracer ID iTracer had to be included into the parameter list |
| 2001 |
|
of ptracers_forcing |
| 2002 |
|
- set up forward_step to call gchem_forcing, that will replace |
| 2003 |
|
gchem_forcing_int in ptracers_forcing |
| 2004 |
|
- cleaning up |
| 2005 |
|
o small cleaning of exch2: remove files that are also in eesupp/src |
| 2006 |
|
|
| 2007 |
|
checkpoint56 |
| 2008 |
|
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
| 2009 |
|
o mnc: cleanup "full" files--fixes out-of-memory problem |
| 2010 |
|
o ECCO-GODAE |
| 2011 |
|
* model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup |
| 2012 |
|
* fully merged and updated from SIO code |
| 2013 |
|
windstress sign change affects |
| 2014 |
|
- exf_inscal_[u/v]stress |
| 2015 |
|
- sign of xx_tau[u/v] adjustments |
| 2016 |
|
- signs in cost_scat |
| 2017 |
|
* ctrl_get_gen: avoid update of tau[u/v] for first few days |
| 2018 |
|
* natl_box_adjoint updated and compressed |
| 2019 |
|
* 2-level checkpoint switch added |
| 2020 |
|
(tested in EXP. 1 of natl_box_adjoint) |
| 2021 |
|
* new switch doInitXX to avoid init. of xx_... in optimcycle=0 |
| 2022 |
|
o SVD |
| 2023 |
|
* first complete, non-hacked version for SVD calculations |
| 2024 |
|
* all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_... |
| 2025 |
|
performed via direct access files admtlm_vector.it???? |
| 2026 |
|
(via ctrl_[un]pack) |
| 2027 |
|
* optimcycle is used for ARPACK iteration counter |
| 2028 |
|
(note: adxx_... is iterated, rather than xx_...; latter is constant!) |
| 2029 |
|
* EV problem ok w.r.t. L2-norm in tangent space; need to check other norms |
| 2030 |
|
and add linear transforms where necessary |
| 2031 |
|
* controls are initial/final SST, SSS (can be extended; need to check |
| 2032 |
|
ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F |
| 2033 |
|
o mdsio: filename info to both stderr, stdout |
| 2034 |
|
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
| 2035 |
|
from sign change |
| 2036 |
|
|
| 2037 |
|
checkpoint55j_post |
| 2038 |
|
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
| 2039 |
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 2040 |
|
o add consistent build directories and .cvsignore files to verification |
| 2041 |
|
o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity |
| 2042 |
|
o make all subroutines 30 or less characters in length for certain older |
| 2043 |
|
compilers to work (a thorough search only turns up two routines in |
| 2044 |
|
pkg/ptracers) |
| 2045 |
|
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
| 2046 |
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
| 2047 |
|
|
| 2048 |
|
checkpoint55i_post |
| 2049 |
|
o change arrays for total vertical diffusivity (2.D if explicit, |
| 2050 |
|
3.D if implicit) ; each ptracer uses its own background value. |
| 2051 |
|
o added mnc/NetCDF output capability to ocn_compon_interf |
| 2052 |
|
- added bits to verification/cpl_aim+ocn so that it can run on |
| 2053 |
|
ITRDA and other clusters without the mpirun "-wd" option |
| 2054 |
|
o fixed wayward endif in mom_fluxform.F that messed up cyclindrical |
| 2055 |
|
configuration |
| 2056 |
|
o give MNC the ability to create additional files rather than |
| 2057 |
|
exceeding a specified file size limit "MNC_MAX_FILESIZE" |
| 2058 |
|
- the default is just less than 2GB which is a practical limit |
| 2059 |
|
on many systems |
| 2060 |
|
o Compute the non-local term using either KPP vertical diffusivity (=default) |
| 2061 |
|
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
| 2062 |
|
|
| 2063 |
|
checkpoint55h_post |
| 2064 |
|
o add verification test "vermix" |
| 2065 |
|
o remove all the *_ioinc flags and replace with the single global |
| 2066 |
|
outputTypesInclusive flag |
| 2067 |
|
o allow to set a vertical profile of vertical diffusivity for T & S |
| 2068 |
|
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
| 2069 |
|
o useMNC moved from data.mnc to data.pkg |
| 2070 |
|
|
| 2071 |
|
checkpoint55g_post |
| 2072 |
|
o Renaming carbon AD experiments to comply with testreport conventions |
| 2073 |
|
o Updating adjoint of Held-Suarez hs94.1x64x5 |
| 2074 |
|
o Fixing directives for non-ECCO forward_step, after ECCO directives |
| 2075 |
|
have been fixed to avoid recomp. of do_oceanic_phys |
| 2076 |
|
Works well for global_ocean.90x40x15, |
| 2077 |
|
but recomp. issue remains for carbon |
| 2078 |
|
o Updating adjoint output for natl_box_adjoint after |
| 2079 |
|
pkg/ecco has been modified (see taga c55d_post) |
| 2080 |
|
|
| 2081 |
|
checkpoint55f_post |
| 2082 |
|
o rename to timeave_init_fixed |
| 2083 |
|
|
| 2084 |
|
checkpoint55e_post |
| 2085 |
|
o some delicate re-shuffle of store directives to avoid one |
| 2086 |
|
extra call of do_oceanic_physics |
| 2087 |
|
affects ecco_the_main_loop.F, do_oceanic_physics.F |
| 2088 |
|
checkpoint_lev1_directives.h |
| 2089 |
|
o NB: this may break global_ocean adjoint temporarily, |
| 2090 |
|
but it is clear how to fix it. Will do later, need this now. |
| 2091 |
|
|
| 2092 |
|
checkpoint55d_post |
| 2093 |
|
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
| 2094 |
|
o ecco_cost_weights is modified to 1x1 runs |
| 2095 |
|
o modifs to allow observations to be read in as |
| 2096 |
|
single file or yearly files |
| 2097 |
|
o enable to read exf forcing fields as either |
| 2098 |
|
single file or yearly files (flag useExfYearlyFields) |
| 2099 |
|
checkpoint55d_pre |
| 2100 |
|
|
| 2101 |
|
o switch between 2-level and 3-level checkpointing |
| 2102 |
|
o add ability of MNC to write local and "partial" (eg. 2D slices where |
| 2103 |
|
the full 3D field is never actually stored) arrays to NetCDF files |
| 2104 |
|
with the correct (that is, the complete multi-dimensional) set of |
| 2105 |
|
array indicies |
| 2106 |
|
- used in mom_vecinv() to write the diagFreq output |
| 2107 |
|
- tested (demonstrated) in verification/aim.5l_cs |
| 2108 |
|
o further mnc-ification |
| 2109 |
|
- add verification/lab_sea to the list with mnc setups |
| 2110 |
|
- fix undefined mnc v-names in cd_code |
| 2111 |
|
- add kpp to mnc output (both snapshot and timeave) |
| 2112 |
|
o non-hydrostatic code |
| 2113 |
|
- added horizontal viscosity parameter viscAhW for w, that replaces viscAh |
| 2114 |
|
in calc_gw.F |
| 2115 |
|
- defaults to viscAh |
| 2116 |
|
- this is useful, when I want to use viscAh=0 (e.g., only biharmonic |
| 2117 |
|
friction or Leith) in non-hydrostatic mode, as long as there is |
| 2118 |
|
no biharmonic friction and/or Leigth or equivalent for vertical velocity. |
| 2119 |
|
o pkg/cost |
| 2120 |
|
extend simple cost functions to treat time mean quantities |
| 2121 |
|
(T,U,V) via cost_accumulate_state from cost_tile |
| 2122 |
|
o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to |
| 2123 |
|
be 2 times larger than the minimum size the advection scheme requires. |
| 2124 |
|
now get a perfect conservation of salt in advect_cs test-exp (updated) |
| 2125 |
|
o GGL90 (Gaspar's TKE mixed layer) |
| 2126 |
|
- add horizontal diffusion of TKE, requires exchanges in |
| 2127 |
|
do_fields_blocking_exchanges, horizontal diffusivity is zero by |
| 2128 |
|
default. In OPA there is no horizontal diffusion of TKE but the |
| 2129 |
|
mixing coefficients are computed from a horizontal average of TKE of |
| 2130 |
|
6 points or so. I think that diffusion has a little more physical |
| 2131 |
|
justification. |
| 2132 |
|
- clean up ggl90_calc in the hope of reducing memory usage (this hope |
| 2133 |
|
was in vain) |
| 2134 |
|
- mask tke-variable in ggl90_init |
| 2135 |
|
o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass) |
| 2136 |
|
o fix biharmonic diffusion on CS-grid. |
| 2137 |
|
o more obcs stuff |
| 2138 |
|
- added obcs_external_fields_load as an alternative to the EXF-pkg option |
| 2139 |
|
for reading boundary values. This routine is called from |
| 2140 |
|
obcs_prescribe_read |
| 2141 |
|
- updated obcs_check |
| 2142 |
|
- changed sponge layer relaxation parameter units for days to seconds |
| 2143 |
|
- turned off sponge layer by default |
| 2144 |
|
- changed argument list of OBCS_CALC to myTime+deltaTclock |
| 2145 |
|
- fixed about 35 bugs in obcs_external_fields_load |
| 2146 |
|
|
| 2147 |
|
checkpoint55c_post |
| 2148 |
|
o obcs stuff |
| 2149 |
|
- new runtime flags useOBCSprescribe, useOBCSbalance |
| 2150 |
|
- re-arranged obcs_calc |
| 2151 |
|
- moved exf_getobcs to obcs_prescibe_read |
| 2152 |
|
obcs_prescibe_read is called after ORLANSKI stuff |
| 2153 |
|
and independent of it (executable can contain all). |
| 2154 |
|
- updated obcs_check |
| 2155 |
|
- added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE. |
| 2156 |
|
These may be necessary only if tangential velocities are |
| 2157 |
|
prescribed at OB, not sure, needs testing. |
| 2158 |
|
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
| 2159 |
|
which simplifies the calls and passes the ifc check-bounds test |
| 2160 |
|
|
| 2161 |
|
checkpoint55b_post |
| 2162 |
|
o add a 2D scalar, Z location, exchange_2 routine. |
| 2163 |
|
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
| 2164 |
|
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
| 2165 |
|
affects advect_cs results (for the wrong reason): update output.txt |
| 2166 |
|
o use a more standard discretization for biharmonic viscosity ; |
| 2167 |
|
(original version still available with #define MOM_VI_ORIGINAL_VISCA4 ) |
| 2168 |
|
affects results of dome set-up: update output.txt |
| 2169 |
|
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
| 2170 |
|
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
| 2171 |
|
|
| 2172 |
|
checkpoint55a_post |
| 2173 |
|
o merged code to |
| 2174 |
|
* prescribe/read time-dependent open boundaries |
| 2175 |
|
(works in conjunction with exf, cal) |
| 2176 |
|
* sponge layer code for open boundaries |
| 2177 |
|
* each boundary N/S/E/W now has its own CPP option |
| 2178 |
|
(healthy for the adjoint) |
| 2179 |
|
|
| 2180 |
|
checkpoint55 |
| 2181 |
|
o up-to-date adjoint of previous breaks |
| 2182 |
|
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
| 2183 |
|
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
| 2184 |
|
- global_ocean.90x40x15: extended GMREDI_OPTIONS.h |
| 2185 |
|
- carbon: * remove tr1-related adjoint verification |
| 2186 |
|
* add ptracer as control variable |
| 2187 |
|
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
| 2188 |
|
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
| 2189 |
|
|
| 2190 |
|
checkpoint54f_post |
| 2191 |
|
o in verification/carbin/ remove experiment related to |
| 2192 |
|
ALLOW_PASSIVE_TRACER (array tr1 etc) |
| 2193 |
|
code_ad/ input_ad/ results_ad |
| 2194 |
|
|
| 2195 |
|
o add two new packages |
| 2196 |
|
- ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993) |
| 2197 |
|
+ subject to optimization (memory) |
| 2198 |
|
- opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997) |
| 2199 |
|
+ subject to reordering (many GOTOs in the original code) |
| 2200 |
|
+ so far opps is called for every (i,j) point, and then operates in |
| 2201 |
|
the vertical; one may want to reorder the scheme in order operate in |
| 2202 |
|
horizontal slabs at the cost of (a lot of) memory, at least ten new 3D |
| 2203 |
|
fields) |
| 2204 |
|
o overhaul of IO so that we now have flags for MDSIO and/or MNC |
| 2205 |
|
- all verification tests compile and run with linux_ia32_g77 |
| 2206 |
|
- defaults are compatible with current input files--nothing |
| 2207 |
|
should change if you were not previously using MNC |
| 2208 |
|
- MNC output has been added in numerous places (eg. timeave) |
| 2209 |
|
but there are still a few writes not yet do-able with MNC |
| 2210 |
|
(this is in progress) |
| 2211 |
|
- flags now allow for either/or/both use of MDSIO and MNC and |
| 2212 |
|
documentation will soon follow |
| 2213 |
|
- numerous small formatting cleanups for ProTeX |
| 2214 |
|
o add version info (via BUILD_INFO.h) to MNC and stdout |
| 2215 |
|
|
| 2216 |
|
checkpoint54e_post |
| 2217 |
|
o add two new packages |
| 2218 |
|
- pp81 (Packanowski and Philander, 1981), Richardson number and |
| 2219 |
|
stratification dependent mixing |
| 2220 |
|
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
| 2221 |
|
- these scheme operate in a similar manner as KPP (without ghat, of |
| 2222 |
|
course), however there is only one diffusivity that is used for both |
| 2223 |
|
temperature and salinity (and passive tracers)ç |
| 2224 |
|
o add offline package |
| 2225 |
|
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
| 2226 |
|
provided by Stephanie Dutkiewicz |
| 2227 |
|
o genmake2: add ability to search for C compilers and cleanup test output |
| 2228 |
|
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
| 2229 |
|
|
| 2230 |
|
checkpoint54d_post |
| 2231 |
|
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
| 2232 |
|
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
| 2233 |
|
leading to additional shift by 5 days each year of integration |
| 2234 |
|
(i.e. leading to considerable offset over the years) |
| 2235 |
|
o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep |
| 2236 |
|
o start with no AB and no initial filtering (staggerTimeStep): |
| 2237 |
|
change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5 |
| 2238 |
|
o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F |
| 2239 |
|
(external loading & cpl import/export stay in forward_step.F) |
| 2240 |
|
o update coupling interface to work with new staggerTimeStep |
| 2241 |
|
o change MDSIO ptracers_pickup. |
| 2242 |
|
o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F); |
| 2243 |
|
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
| 2244 |
|
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
| 2245 |
|
|
| 2246 |
|
checkpoint54c_post |
| 2247 |
|
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
| 2248 |
|
this affects (truncation error) output.txt of test-exp: |
| 2249 |
|
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
| 2250 |
|
o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array) |
| 2251 |
|
o change Qnet to always be the net heat flux, (+upward). |
| 2252 |
|
affects (truncation error) output of natl_box exp.: updated |
| 2253 |
|
o define the max number of passive tracers in PTRACERS_SIZE.h |
| 2254 |
|
o start to test mnc routinely in exp0 |
| 2255 |
|
o add sea-ice loading (sIceLoad) as a new forcing field. |
| 2256 |
|
|
| 2257 |
|
checkpoint54b_post |
| 2258 |
|
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
| 2259 |
|
impressive on Altix and Opteron systems) |
| 2260 |
|
o diagnostics can now write NetCDF files through the mnc package |
| 2261 |
|
o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output |
| 2262 |
|
o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added |
| 2263 |
|
o staggerTimeStep & NLFS: rescale T & S surface tendencies. |
| 2264 |
|
affects (truncation error) output of lab_sea & natl_box exp.: updated |
| 2265 |
|
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
| 2266 |
|
|
| 2267 |
|
checkpoint54a_post |
| 2268 |
|
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
| 2269 |
|
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
| 2270 |
|
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
| 2271 |
|
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
| 2272 |
|
+ internal_wave (shift in writing cg2d_ini_res) |
| 2273 |
|
checkpoint54a_pre |
| 2274 |
|
|
| 2275 |
|
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
| 2276 |
|
- modified verification/lab_sea and natl_box_adjoint accordingly |
| 2277 |
|
|
| 2278 |
|
checkpoint54 |
| 2279 |
|
checkpoint53g_post |
| 2280 |
|
o prepare splitting of thermodynamics: store convect.counter in common block |
| 2281 |
|
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
| 2282 |
|
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
| 2283 |
|
o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection |
| 2284 |
|
o new parameter "nShapS": allow to treat differently S from T (nShapT) |
| 2285 |
|
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
| 2286 |
|
o restore adjointability |
| 2287 |
|
|
| 2288 |
|
checkpoint53f_post |
| 2289 |
|
o modifications that affect AIM experiment results (update output.txt): |
| 2290 |
|
- no advection of S at top interface Nr (pkg/generic_advdiff) |
| 2291 |
|
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
| 2292 |
|
o AIM pkg: |
| 2293 |
|
- include stability function into surf.Flux derivative relative to Tsurf |
| 2294 |
|
- calculate clear-sky radiation & surface temp. change (for diagnostics) |
| 2295 |
|
|
| 2296 |
|
checkpoint53e_post |
| 2297 |
|
o merged cylindrical coord configuration |
| 2298 |
|
o added rotating_tank experiment |
| 2299 |
|
checkpoint53e_pre |
| 2300 |
|
|
| 2301 |
|
checkpoint53d_post |
| 2302 |
|
o faulks upgraded: re-generate output.txt that have changed: |
| 2303 |
|
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
| 2304 |
|
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
| 2305 |
|
o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing. |
| 2306 |
|
o added Sadourny discretization of Coriolis |
| 2307 |
|
- moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h |
| 2308 |
|
- re-enabled use of omega3 (useAbsVorticity) |
| 2309 |
|
o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for |
| 2310 |
|
vector-invariant equations |
| 2311 |
|
- note: does *NOT* yet use same variable visc. for no-slip BC's. |
| 2312 |
|
o recoded the lateral boundary conditions for non-hydrostatic w, this time |
| 2313 |
|
hopefully without new bugs |
| 2314 |
|
- still to do: biharmonic friction for non-hydrostatic w |
| 2315 |
|
o bug fix for mom_*_sidedrag: rA -> rAs,rAw |
| 2316 |
|
o regenerated output for global_ocean_ebm (using -ieee) |
| 2317 |
|
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
| 2318 |
|
of mom_common/ |
| 2319 |
|
- simple re-arrangement of instructions within computing loop |
| 2320 |
|
checkpoint53d_pre |
| 2321 |
|
|
| 2322 |
|
checkpoint53c_post |
| 2323 |
|
o new version of coupler for AIM+thSIce and Ocean models |
| 2324 |
|
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
| 2325 |
|
- land: change Evaporation of snow |
| 2326 |
|
- aim with thSIce: fix bug in snow-precip. |
| 2327 |
|
o changes to calc_gw.F |
| 2328 |
|
- bug fix for w^2 term near the bottom boundary |
| 2329 |
|
- (hopefully) improve the lateral slip boundary condtions for use with |
| 2330 |
|
partial/looped cells |
| 2331 |
|
- because the bug fix changes two verification experiments anyway (exp5 |
| 2332 |
|
and plume on slope), change the lateral boundary condition from half slip |
| 2333 |
|
to the value of no_slip_sides |
| 2334 |
|
o ebm package wasnt quite up to the parallel task. Fixed that. |
| 2335 |
|
o Adjoint of EBM package + verification |
| 2336 |
|
* TLM OK |
| 2337 |
|
* ADM not sufficient accuracy yet (needs further testing) |
| 2338 |
|
|
| 2339 |
|
checkpoint53b_post |
| 2340 |
|
o Commiting new energy balance model to repository |
| 2341 |
|
* package is pkg/ebm |
| 2342 |
|
* verif. is verification/global_ocean_ebm |
| 2343 |
|
* references are in ebm_driver.F |
| 2344 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 2345 |
|
C Global thermohaline circulation. Part I: |
| 2346 |
|
C Sensitivity to atmospheric moisture transport. |
| 2347 |
|
C J. Climate 12(1), 71-82 |
| 2348 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 2349 |
|
C Global thermohaline circulation. Part II: |
| 2350 |
|
C Sensitivity with interactive transport. |
| 2351 |
|
C J. Climate 12(1), 83-91 |
| 2352 |
|
C * M. Nakamura, P. Stone and J. Marotzke, 1994: |
| 2353 |
|
C Destabilization of the thermohaline circulation |
| 2354 |
|
C by atmospheric eddy transports. |
| 2355 |
|
C J. Climate 7(12), 1870-1882 |
| 2356 |
|
o Will need long integration testing. |
| 2357 |
|
checkpoint53b_pre |
| 2358 |
|
|
| 2359 |
|
o created pkg/mom_common in preparation for variable viscosity code |
| 2360 |
|
o renamed and split ini_mnc_io |
| 2361 |
|
o pkg/land: only liquid water can diffuse or run-off |
| 2362 |
|
o AIM using land: soil wetness availability account for snow |
| 2363 |
|
o added printMapIncludesZeros to EEPARMS namelist |
| 2364 |
|
|
| 2365 |
|
checkpoint53a_post |
| 2366 |
|
o restore TAMC compatiility for exf_constants.h |
| 2367 |
|
(no usage of _d in .h) |
| 2368 |
|
o Additional storing in KPP in an attempt to fix |
| 2369 |
|
TAMC problem with adjoint of KPP code. |
| 2370 |
|
(no success...) |
| 2371 |
|
Identical code works fine with TAF. |
| 2372 |
|
o Fixed verification/natl_box_adjoint experiments. |
| 2373 |
|
Initial conditions for Experiments 4 and 5 are now |
| 2374 |
|
set to "SEAICE_initialHEFF=0", which is more reasonable, |
| 2375 |
|
and hence gives results closer to that of Experiment 2. |
| 2376 |
|
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
| 2377 |
|
|
| 2378 |
|
checkpoint53 |
| 2379 |
|
o stable checkpoint with up to date adjoint |
| 2380 |
|
TLM tests only run for 1st grdchk at the moment. Its unclear if |
| 2381 |
|
this is a code problem or a problem with resetting code for g_ |
| 2382 |
|
variables that is being autogenerated wrong. |
| 2383 |
|
Otherwise: |
| 2384 |
|
o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix. |
| 2385 |
|
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
| 2386 |
|
are both still in chaos following their security messes. |
| 2387 |
|
|
| 2388 |
|
checkpoint52n_post |
| 2389 |
|
o various build (mostly genmake2) changes including: |
| 2390 |
|
- ability to build/run more easily within Cygwin and MacOS X |
| 2391 |
|
- more complicated Makefiles with a stronger dependence on Gnu Make |
| 2392 |
|
o pkg/seaice modifications |
| 2393 |
|
- added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost |
| 2394 |
|
of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer |
| 2395 |
|
and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm |
| 2396 |
|
- changed proxy for geostrophic velocity and updated |
| 2397 |
|
verification/lab_sea/results/* accordingly |
| 2398 |
|
- removed ADI dynamic solver from pkg/seaice |
| 2399 |
|
- replaced all occurrences of 1/CSTICE or 1/CSUICE |
| 2400 |
|
they caused a segmentation fault under certain circumstances |
| 2401 |
|
- removed unused field WATR |
| 2402 |
|
o bug fix in exf-package: |
| 2403 |
|
- u/vwind are defined at tracer/pressure points. The values of u/vwindmask |
| 2404 |
|
now reflect that. |
| 2405 |
|
o small fixes in the cal-package: |
| 2406 |
|
- set reference date to first of January for the 'model'-calendar |
| 2407 |
|
- failing of cal_CheckDate in cal_FullDate now actually results in a |
| 2408 |
|
warning |
| 2409 |
|
o small modifications in exf-package to increase flexibility: |
| 2410 |
|
- change climtempfreeze from a constant to a runtime parameter that |
| 2411 |
|
is specified in data.exf_clim (default = -1.9) |
| 2412 |
|
- introduce runtime parameter windstressmax (default = 2.0) that is |
| 2413 |
|
specified in data.exf |
| 2414 |
|
o fix in pkg/thsice: |
| 2415 |
|
- update Evap (Tsf changes) to be consistent with Latent heat flux |
| 2416 |
|
- maintain snow precipitation unchanged (even if Tsf >=0). |
| 2417 |
|
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
| 2418 |
|
|
| 2419 |
|
checkpoint52m_post |
| 2420 |
|
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
| 2421 |
|
this does not change any of the results, because myIter=0 in swfrac always |
| 2422 |
|
lead to jwtype=2 (the default anyway), but the call makes little sense |
| 2423 |
|
as a default |
| 2424 |
|
o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated |
| 2425 |
|
o re-work pkg/thsice interface with ocean & bulk_force pkg to allow |
| 2426 |
|
atmospheric model (AIM) to use it ; add a "slab ocean" component. |
| 2427 |
|
o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice) |
| 2428 |
|
o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice |
| 2429 |
|
o extending useSingleCpuIO option to work with new exch2 I/O format |
| 2430 |
|
- old-style, missing-tile I/O is still accessible by defining CPP |
| 2431 |
|
option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h |
| 2432 |
|
o monitor package can write to NetCDF files and/or STDOUT |
| 2433 |
|
o fix re-definition bug in MNC_GRID_INIT_ALL() |
| 2434 |
|
o doc/api_reference added |
| 2435 |
|
- a framework for building an API Reference Manual using all |
| 2436 |
|
the "protex" comments embedded in the code |
| 2437 |
|
- see pkg/generic_advdiff, pkg/mnc for examples |
| 2438 |
|
o MNC: |
| 2439 |
|
- make myThid the last argument for all subroutines |
| 2440 |
|
- new default for the grid files: NO halos |
| 2441 |
|
- add useMNC and other run-time flags |
| 2442 |
|
- separate per-file-group handling of the unlimited dimension |
| 2443 |
|
- early initialization of MNC w/ flags read at the eeboot stage |
| 2444 |
|
and lookup tables set in initialize_fixed |
| 2445 |
|
- write all MNC output to a freshly-created directory |
| 2446 |
|
o thermodynamics sea-ice (thsice) is now tested with testreport. |
| 2447 |
|
o test exp. advect_cs: use the standard cs32 grid ; update output. |
| 2448 |
|
o Added functionality to grdchk: |
| 2449 |
|
pick global i,j,k position (or nearest wet) where to perform check. |
| 2450 |
|
|
| 2451 |
|
checkpoint52l_post |
| 2452 |
|
o new land formulation: |
| 2453 |
|
a) use ground enthalpy as prognostic variable to ensure exact |
| 2454 |
|
energy conservation. |
| 2455 |
|
b) account for water temperature and for latent heat of freezing |
| 2456 |
|
in all processes (rain, run-off, ground storage) |
| 2457 |
|
c) compute surface and ground temperature implicitly. |
| 2458 |
|
o aim_v23 modification for new land model: |
| 2459 |
|
a) Treat separately land / ocean / sea-ice surface fluxes |
| 2460 |
|
to allow implicit computation of land & sea-ice surface temp. |
| 2461 |
|
b) add snow precipitation. |
| 2462 |
|
checkpoint52l_pre |
| 2463 |
|
|
| 2464 |
|
o fix problem (when 1 tile is empty) in min/max monitor. |
| 2465 |
|
o fix bug in timeAve (u,vZetatave in common block) |
| 2466 |
|
o no restoring terms under ice for pkg/seaice |
| 2467 |
|
o moved SEAICE_DO_DIAGS to S/R do_the_model_io |
| 2468 |
|
o bug fix for pkg/seaice pickups |
| 2469 |
|
o change MNC call locations and add coordinate attributes |
| 2470 |
|
o mask vorticity at the corner ; affects global_ocean.cs output |
| 2471 |
|
o fix ini_curvilinear_grid ; test CS experiments with mpi |
| 2472 |
|
o aim.5l_cs: modify sea-ice fraction input file ; update output |
| 2473 |
|
o exf: Adding simple range check routine for exf fields after read |
| 2474 |
|
|
| 2475 |
|
checkpoint52k_post |
| 2476 |
|
o removed top-level directory "diags" |
| 2477 |
|
- we migrated these functions to pkg/timeave a long time ago |
| 2478 |
|
o fixed bug introduced in pkg/monitor |
| 2479 |
|
o accuracy ctrlprec = 32 insuffient for gradient checks using |
| 2480 |
|
averaged fields (I/O via cost_averages) |
| 2481 |
|
-> use ctrl.h in active_file*.F to control I/O precision. |
| 2482 |
|
o paramter list of CALL ADTHE_MAIN_LOOP |
| 2483 |
|
o added initial do_the_model_io to ecco |
| 2484 |
|
o set all ...Freq to zero after cost_final |
| 2485 |
|
taveFreq, dumpFreq, pChkptFreq |
| 2486 |
|
o MAIN and ECCO differentiability restored |
| 2487 |
|
|
| 2488 |
|
checkpoint52j_post |
| 2489 |
|
o fix nchklev in tamc.h for global_ocean... |
| 2490 |
|
o Bringing flow and store directives up-to-date |
| 2491 |
|
o Really weird thing! |
| 2492 |
|
call do_the_model_io from the_main_loop with parameters |
| 2493 |
|
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
| 2494 |
|
TAF places a faulty re-call of initialise_varia |
| 2495 |
|
after cost_final call which should not be there! |
| 2496 |
|
checkpoint52j_pre |
| 2497 |
|
|
| 2498 |
|
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
| 2499 |
|
error messages |
| 2500 |
|
o fix errorMessageUnit problem. remove old version of mdsio from eesup/src |
| 2501 |
|
o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating |
| 2502 |
|
debug output |
| 2503 |
|
o modfied mdsio_writefield.F to handle non-global files under exch2 |
| 2504 |
|
o update AIM Cubed-Sphere exp (aim.5l_cs): |
| 2505 |
|
use land, p*, and Franco.M forcing fields with fractional land-sea mask. |
| 2506 |
|
o update AIM Equatorial Channel exp: |
| 2507 |
|
use standard aim_v23 pkg and change the SST fields to be more realistic. |
| 2508 |
|
o globalFile now works with exch2 |
| 2509 |
|
o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and |
| 2510 |
|
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
| 2511 |
|
o limit timeave output for hi-res integrations |
| 2512 |
|
|
| 2513 |
|
checkpoint52i_post |
| 2514 |
|
o removed CPP_EEOPTIONS.h from verification/*/code |
| 2515 |
|
o updated the tiling for global_ocean_pressure |
| 2516 |
|
checkpoint52i_pre |
| 2517 |
|
|
| 2518 |
|
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
| 2519 |
|
the old pkg/aim). |
| 2520 |
|
|
| 2521 |
|
checkpoint52h_pre |
| 2522 |
|
o shortened offending lines in exch2_send_rx?.template |
| 2523 |
|
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
| 2524 |
|
o genmake2: add build & execute test for NetCDF code |
| 2525 |
|
o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed |
| 2526 |
|
old grid files, moved CPP_EEMACROS.h to pkg/exch2 |
| 2527 |
|
o added useSingleCPUIO flag to monitor.F and mon_out.F |
| 2528 |
|
o added temporary hack for sea-ice dynamics on the cube: |
| 2529 |
|
metric terms are ignored and it is assumed that |
| 2530 |
|
there is no sea-ice on cube faces 1, 2, 4, and 5. |
| 2531 |
|
|
| 2532 |
|
checkpoint52f_post |
| 2533 |
|
o added exch2 cube routines to pkg/exch2 |
| 2534 |
|
o modified hs94.cs-32x32x5 to use it |
| 2535 |
|
o added new grid files to hs94.cs-32x32x5 |
| 2536 |
|
checkpoint52f_pre |
| 2537 |
|
|
| 2538 |
|
checkpoint52e_post |
| 2539 |
|
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
| 2540 |
|
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
| 2541 |
|
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
| 2542 |
|
to work with implicit vertical advection and AB ; |
| 2543 |
|
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
| 2544 |
|
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
| 2545 |
|
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
| 2546 |
|
checkpoint52e_pre |
| 2547 |
|
|
| 2548 |
|
o fix bug in impldiff when Nr=1 or Nr=2. |
| 2549 |
|
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
| 2550 |
|
o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test. |
| 2551 |
|
o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2 |
| 2552 |
|
ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure |
| 2553 |
|
o added exf_offset_atemp for Celsius to Kelvin conversion of atemp |
| 2554 |
|
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
| 2555 |
|
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
| 2556 |
|
|
| 2557 |
|
checkpoint52d_post |
| 2558 |
|
o re-tiled many expts to allow comparison in multi-processor mode |
| 2559 |
|
- updated output accordingly |
| 2560 |
|
- changed hs94.128x64x5 to use intial T from file rather than use the |
| 2561 |
|
random number generator |
| 2562 |
|
o add infrastructure in model routines for fizhi and gridalt packages |
| 2563 |
|
o change global_ocean.cs32x15 because of Pb with GM on CS-grid. |
| 2564 |
|
o changes to permit hi-res, cubed-sphere, configuration |
| 2565 |
|
- added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F |
| 2566 |
|
- added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F |
| 2567 |
|
- added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation |
| 2568 |
|
of surface winds for the cube |
| 2569 |
|
(A verification experiment, based on global_ocean.cs32x15, but with |
| 2570 |
|
pkg/seaice turned on and with on-the-fly interpolation from the NCEP |
| 2571 |
|
Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice, |
| 2572 |
|
complete with example surface forcing files and matlab scripts to look |
| 2573 |
|
at the output and compare it with that of global_ocean.cs32x15.) |
| 2574 |
|
o packages pickup: $PKG_write_pickup called from packages_write_pickup ; |
| 2575 |
|
but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code |
| 2576 |
|
to conform to the common rule. |
| 2577 |
|
o check-in the first version of the coupler + interfaces for multi-components |
| 2578 |
|
set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI. |
| 2579 |
|
- imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD). |
| 2580 |
|
- atmosphere: use pkg aim_v23 ; no sea-ice for now. |
| 2581 |
|
- ocean and atmos. share the same horizontal grid (no interpolation). |
| 2582 |
|
- exchanges between component and coupler is done in forward_step |
| 2583 |
|
o new verification experiment, cpl_aim+ocn: |
| 2584 |
|
coupled ocean - AIM atmosphere on cs32 grid. |
| 2585 |
|
|
| 2586 |
|
checkpoint52d_pre |
| 2587 |
|
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
| 2588 |
|
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
| 2589 |
|
|
| 2590 |
|
checkpoint52c_post |
| 2591 |
|
o Fixing OPTIONS files for use of exf: |
| 2592 |
|
- ALLOW_ECCO not needed |
| 2593 |
|
- ECCO_CPPOPTIONS.h should not be included from |
| 2594 |
|
EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h |
| 2595 |
|
as has been the case in the past |
| 2596 |
|
- All cal/exf related options are currently set in |
| 2597 |
|
single header file. Should remain so until we |
| 2598 |
|
agree on a consistent new policy. |
| 2599 |
|
o Removed all CPP options for cal package. |
| 2600 |
|
cal has no more CPP options. |
| 2601 |
|
o modified STOREs in GAD_ADVECTION |
| 2602 |
|
o corrected key comp. for passkey |
| 2603 |
|
|
| 2604 |
|
checkpoint52b_post |
| 2605 |
|
o new version: "thsice" of thermodynamic sea-ice pkg: |
| 2606 |
|
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
| 2607 |
|
- modify fluxes but do not change theta directly; |
| 2608 |
|
- light cleaning of bulk_force pkg (still needed with thsice). |
| 2609 |
|
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
| 2610 |
|
+ output_thsice.txt to test thsice & bulk_force pkgs. |
| 2611 |
|
o put back grid & coriolis monitor output. |
| 2612 |
|
checkpoint52b_pre |
| 2613 |
|
|
| 2614 |
|
o call "do_the_model_io" at the beginning (=> dump initial state) |
| 2615 |
|
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
| 2616 |
|
o sort out interplay between tamc.h and PTRACERS_OPTIONS.h |
| 2617 |
|
(need info on NUMBER_OF_PTRACERS) |
| 2618 |
|
o missing PTRACERS headers in some routines |
| 2619 |
|
o default tamc.h in pkg/autodiff supposed to crash |
| 2620 |
|
to ensure proper customization |
| 2621 |
|
|
| 2622 |
|
checkpoint52a_post |
| 2623 |
|
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
| 2624 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 2625 |
|
- subroutine FREEZE_SURFACE now limits only surface temperature |
| 2626 |
|
and is called in FORWARD_STEP (if allowFreezing=.TRUE.) |
| 2627 |
|
=> new output.txt for global_ocean.cs32x15 & global_with_exf |
| 2628 |
|
- keep the old version of FREEZE for backward compatibility; |
| 2629 |
|
global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE. |
| 2630 |
|
- corresponding modifs for TAF directives |
| 2631 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 2632 |
|
o time-averaged output for pkg/ptracers |
| 2633 |
|
o fix problem with ECCO-related divided adjoint |
| 2634 |
|
snapshot file was missing some ad-variables, |
| 2635 |
|
but no warning issued by TAF |
| 2636 |
|
|
| 2637 |
|
checkpoint52a_pre |
| 2638 |
|
o some bug fixes for #undef REAL4_IS_SLOW |
| 2639 |
|
|
| 2640 |
|
checkpoint52 = ecco_c52_e35 |
| 2641 |
|
o after testing adjoints of checkpoint51u_post |
| 2642 |
|
|
| 2643 |
|
checkpoint51u_post |
| 2644 |
|
o this is the post-merge tag of the ecco-branch |
| 2645 |
|
(needs another clean checkout and re-testing) |
| 2646 |
|
o various natl_box_adjoint configs and results |
| 2647 |
|
but no input fields |
| 2648 |
|
o obcs adjoint not yet merged! |
| 2649 |
|
o adding ECCO global 1x1 and 2x2 degree configs |
| 2650 |
|
o updated/extended some store directives for seaice |
| 2651 |
|
o pkg/ecco now containes ecco-specific part of cost function |
| 2652 |
|
o top level routines the_main_loop, forward_step |
| 2653 |
|
supersede those in model/src/ |
| 2654 |
|
previous input data.cost now in data.ecco |
| 2655 |
|
(new namelist ecco_cost_nml) |
| 2656 |
|
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
| 2657 |
|
|
| 2658 |
|
checkpoint51t_post |
| 2659 |
|
o this is the pre-merge tag of the ecco-branch |
| 2660 |
|
|
| 2661 |
|
checkpoint51s_post |
| 2662 |
|
o cleanup: removed various obsolete #define-s |
| 2663 |
|
o pkg/grdchk |
| 2664 |
|
- renamed 'ph-grd 3' to 'grad-res' |
| 2665 |
|
- merged from ecco-branch |
| 2666 |
|
(remaining bug fixes for obcs gradient checks) |
| 2667 |
|
- additional high-precision output for testreport |
| 2668 |
|
(grep for 'precision_grdchk_result') |
| 2669 |
|
|
| 2670 |
|
checkpoint51r_post |
| 2671 |
|
o cleaned up or removed CPP_OPTIONS.h files |
| 2672 |
|
o updated results for some of the tests to reflect the new |
| 2673 |
|
optfiles (-ieee: -O0 instead of -O3) |
| 2674 |
|
|
| 2675 |
|
checkpoint51q_post |
| 2676 |
|
o cd_code: |
| 2677 |
|
- moved cd_scheme.F -> cd_code_scheme.F |
| 2678 |
|
- separate read_checkpoint from cd_code_ini_vars.F |
| 2679 |
|
- separated cd_code part from write_checkpoint |
| 2680 |
|
- updated AD_SOURCE, generated .flow |
| 2681 |
|
- added CD_CODE_VARS.h to the_main_loop |
| 2682 |
|
- Moving cd_code specific store dir.s to pkg/cd_code |
| 2683 |
|
o ctrl package totally restructured |
| 2684 |
|
- pack/unpack now optional and decoupled from |
| 2685 |
|
xx_/adxx_ I/O |
| 2686 |
|
- ctrl_pack/unpack cleaned |
| 2687 |
|
(new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F) |
| 2688 |
|
- confined inclusion of AD_CONFIG.h to where necessary. |
| 2689 |
|
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
| 2690 |
|
|
| 2691 |
|
checkpoint51p_post |
| 2692 |
|
o create initial cd_code package |
| 2693 |
|
- WARNING: the initialization of fields within packages |
| 2694 |
|
is broken because INI_FIELDS (where READ_CHECKPOINT is |
| 2695 |
|
called) is called *before* PACKAGES_INIT_VARIABLES. |
| 2696 |
|
This seems to be backwards since |
| 2697 |
|
1) its important to initially zero the entire field including |
| 2698 |
|
the "halo" region |
| 2699 |
|
2) zeroing needs to be done *before* reading pickup info |
| 2700 |
|
and the pickup call might or might not happen in any |
| 2701 |
|
particular run |
| 2702 |
|
- this needs an overhaul for R2 |
| 2703 |
|
o cleanup verification/*/code/GMREDI_OPTIONS.h |
| 2704 |
|
o cleanup testreport |
| 2705 |
|
|
| 2706 |
|
checkpoint51o_post |
| 2707 |
|
o bringing AD-related verif's up to date with genmake2 |
| 2708 |
|
- carbon/ |
| 2709 |
|
- global_ocean.90x40x15/ |
| 2710 |
|
- hs.94.1x64x5/ |
| 2711 |
|
- (front_relax/ ) |
| 2712 |
|
o (more) consistent directory structure for AD-related verif.'s |
| 2713 |
|
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK |
| 2714 |
|
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF |
| 2715 |
|
o bug fix in find_alpha.F for MDJWF: |
| 2716 |
|
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for |
| 2717 |
|
change rho -> rho-rhoConst |
| 2718 |
|
- replace call find_rho to find_rhonum |
| 2719 |
|
o initialisation of rFlx extended to full array (required by TAF) |
| 2720 |
|
and shifted to thermodynamics |
| 2721 |
|
o removed PTRACERS.h in ptracers routine |
| 2722 |
|
o added surfacetendencyPtr to S/R parameter list pracers_forcing |
| 2723 |
|
o Correcting initialisations for fVerU, fVerV. |
| 2724 |
|
o helping TAF to recognize dependency on kUp for |
| 2725 |
|
fVerU, fVerV |
| 2726 |
|
o Replacing delZ by delR in pkg/ctrl/ |
| 2727 |
|
checkpoint51o_pre |
| 2728 |
|
|
| 2729 |
|
o undid all of cp51 pending some cleanups and discussion |
| 2730 |
|
o added the [#include "AD_CONFIG.h"] statement to all files that need |
| 2731 |
|
it for adjoint/tl #defines |
| 2732 |
|
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
| 2733 |
|
o removed tools/genmake since it no longer works |
| 2734 |
|
|
| 2735 |
|
checkpoint51n_post |
| 2736 |
|
o modifications to make FREEZE flux visible to pkg/kpp |
| 2737 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 2738 |
|
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
| 2739 |
|
- subroutine FREEZE now limits only surface temperature |
| 2740 |
|
(this means new output.txt for global_ocean.90x40x15, |
| 2741 |
|
global_ocean.cs32x15, and global_with_exf) |
| 2742 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 2743 |
|
|
| 2744 |
|
checkpoint51n_pre |
| 2745 |
|
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
| 2746 |
|
o added [#include "AD_CONFIG.h"] to all files that use the following |
| 2747 |
|
defines: |
| 2748 |
|
- ALLOW_ADJOINT_RUN |
| 2749 |
|
- ALLOW_TANGENTLINEAR_RUN |
| 2750 |
|
- ALLOW_ECCO_OPTIMIZATION |
| 2751 |
|
|
| 2752 |
|
checkpoint51m_post |
| 2753 |
|
o incorporating changes to get TAMC/TAF working in genmake2 |
| 2754 |
|
- added new TAMC/TAF targets to the Makefile |
| 2755 |
|
- various cleanups related to package handling |
| 2756 |
|
- these changes should have no impact on the forward model |
| 2757 |
|
|
| 2758 |
|
checkpoint51l_post |
| 2759 |
|
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
| 2760 |
|
- faster algorithm for cal_addtime.F |
| 2761 |
|
- higher precision arithmetic, where needed |
| 2762 |
|
- pkg/exf *startdate variables changed from calendar date to |
| 2763 |
|
model integration time |
| 2764 |
|
|
| 2765 |
|
checkpoint51l_pre |
| 2766 |
|
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
| 2767 |
|
o enable to apply restoring on S & T only in a latitude band. |
| 2768 |
|
o update output (external_forcing_surf modif. change truncation errors) |
| 2769 |
|
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
| 2770 |
|
|
| 2771 |
|
checkpoint51k_post |
| 2772 |
|
o change default to: useNHMTerms=.FALSE. |
| 2773 |
|
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
| 2774 |
|
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
| 2775 |
|
- new output.txt for idealized oceanic exp (NHMTerms are now turned off): |
| 2776 |
|
exp1, ideal_2D_oce |
| 2777 |
|
- change data file of oceanic exp (leave the results unchanged for now) |
| 2778 |
|
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box |
| 2779 |
|
o set gravitySign automatically according to the vertical coordinate used |
| 2780 |
|
(and change sign: back to "logical" value: +1 when R increases downward) |
| 2781 |
|
o added an include barrier to the default CPP_OPTIONS.h and |
| 2782 |
|
removed the #include "PACKAGES_CONFIG.h" from it |
| 2783 |
|
o fix a bug in mom_fluxform (from chk51j_post) |
| 2784 |
|
|
| 2785 |
|
checkpoint51j_post |
| 2786 |
|
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
| 2787 |
|
o adjusted some flow directives (dynamics, thermodynamics) |
| 2788 |
|
o added cubed-sphere case to test cost function |
| 2789 |
|
o heckpoint_lev?_directives.h now include |
| 2790 |
|
pkg-specific directives, whenever those are enabled. |
| 2791 |
|
o Moving pkg-specific flow directives to corresponding pkg |
| 2792 |
|
Moving pkg-specific differentiation list to corresponding pkg |
| 2793 |
|
Moving pkg-specific checkpoint-lev storing to corresponding pkg |
| 2794 |
|
---> conventions are |
| 2795 |
|
- pkg_ad.flow |
| 2796 |
|
- pkg_ad_diff.list |
| 2797 |
|
- pkg_ad_check_lev?_dir.h |
| 2798 |
|
|
| 2799 |
|
checkpoint51i_post |
| 2800 |
|
o merge of the branch-genmake2 |
| 2801 |
|
- knowingly breaks the older genmake |
| 2802 |
|
- automatic generation of all ALLOW_${PKG_NAME} defines |
| 2803 |
|
- new testreport supersedes older testscript |
| 2804 |
|
o large number of package inclusion and header cleanups |
| 2805 |
|
checkpoint51i_pre |
| 2806 |
|
|
| 2807 |
|
o new output for adjoin of global ocean vector invariant |
| 2808 |
|
o fix for checkpoint of thermodynamic seaice and bulk_force |
| 2809 |
|
o Steph gchem various cleanups |
| 2810 |
|
|
| 2811 |
|
checkpoint 51h_pre |
| 2812 |
|
o fixed some single quotes |
| 2813 |
|
o modify gchem pkg to be more versatile |
| 2814 |
|
o modifications to clean up dic pkg |
| 2815 |
|
o add pkg/cfc |
| 2816 |
|
|
| 2817 |
|
checkpoint51g_post |
| 2818 |
|
o provide links for ARPACK and ADM*TLM |
| 2819 |
|
o start removing verification/vero/ |
| 2820 |
|
o update AD-related stuff |
| 2821 |
|
(in particular some IF-statements in model/src/ routines) |
| 2822 |
|
o adding to verification/global_ocean.90x40x15/ adjoint of |
| 2823 |
|
vector invariant setup |
| 2824 |
|
|
| 2825 |
|
checkpoint51f_post |
| 2826 |
|
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
| 2827 |
|
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
| 2828 |
|
of tracer Green's fucntions for ocean inversion project. |
| 2829 |
|
|
| 2830 |
|
checkpoint51f_pre |
| 2831 |
|
o Added on-the-fly spatial interpolation capability |
| 2832 |
|
"USE_EXF_INTERPOLATION" to pkg/exf. |
| 2833 |
|
- This is a temporary Cartesian-grid hack until |
| 2834 |
|
the super-duper ESMF coupler becomes available. |
| 2835 |
|
- See verification/global_with_exf/README for usage example. |
| 2836 |
|
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid |
| 2837 |
|
flags and modified pkg/seaice accordingly. |
| 2838 |
|
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F, |
| 2839 |
|
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
| 2840 |
|
non-local transport term. |
| 2841 |
|
|
| 2842 |
|
checkpoint51e_post |
| 2843 |
|
o pkg/mom_vecinv: |
| 2844 |
|
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
| 2845 |
|
- add time-ave diagnostic of vorticity advection. |
| 2846 |
|
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV. |
| 2847 |
|
o atmospheric geopotential: - include water vapor effect; |
| 2848 |
|
- use p^kappa in p* scaling. |
| 2849 |
|
o land pkg: read initial state from files. |
| 2850 |
|
o AIM : add stratospheric drag in the upper level |
| 2851 |
|
|
| 2852 |
|
checkpoint51d_post |
| 2853 |
|
o change function ILNBLNK (=> last non-blank char.) to return zero |
| 2854 |
|
(instead of the string length) when the string. char is empty |
| 2855 |
|
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
| 2856 |
|
o modif's to restore TAMC compatibility |
| 2857 |
|
- avoid "_d" constructs in PARAMETER declarations |
| 2858 |
|
- avoid interrupting lines by comment lines |
| 2859 |
|
o Use cluster local disks for purely local I/O |
| 2860 |
|
vs. globally visible disks needed for ctrl stuff |
| 2861 |
|
(merged from ecco-branch) |
| 2862 |
|
- new active_file_loc... and mdsio_..._loc routines |
| 2863 |
|
- affected packages: autodiff, ctrl, grdchk, mdsio |
| 2864 |
|
|
| 2865 |
|
checkpoint51c_post |
| 2866 |
|
o introducing integer flag debugLevel |
| 2867 |
|
- debLevZero: suppress all output |
| 2868 |
|
- debLevA: standard |
| 2869 |
|
- debLevB: equivalent to current debugMode=.TRUE. |
| 2870 |
|
o introducing pathname variable mdsioLocalDir for mdsio |
| 2871 |
|
that can be specified at runtime |
| 2872 |
|
(relevant for cluster I/O to local disk) |
| 2873 |
|
` |
| 2874 |
|
>>>checkpoint51b_post |
| 2875 |
|
adjoint of ptracers |
| 2876 |
|
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM |
| 2877 |
|
o extended state in checkpoint_lev?, etc. |
| 2878 |
|
o alternative ctrl/cost with tr1 or ptracer |
| 2879 |
|
o new comlev1_bibj_ptracers |
| 2880 |
|
o new ptracers.flow |
| 2881 |
|
o made ptracers_forcing same as external_forcing_s |
| 2882 |
|
o added verification for adjoint with ptracers |
| 2883 |
|
- adm. grdchk fail so far |
| 2884 |
|
- tlm. grdchk OK |
| 2885 |
|
- checked tapelev/comlev recomputations: OK |
| 2886 |
|
<<<checkpoint51b_pre |
| 2887 |
|
|
| 2888 |
|
checkpoint51a_post |
| 2889 |
|
o added code for biogeochemistry package |
| 2890 |
|
- new pkgs: dic, gchem |
| 2891 |
|
- new subroutine in ptracers |
| 2892 |
|
o modify code for biogeo packages |
| 2893 |
|
- in model/src and pkg/ptracers |
| 2894 |
|
|
| 2895 |
|
checkpoint51 |
| 2896 |
|
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
| 2897 |
|
- autodiff, ctrl, exf, grdchk, seaice |
| 2898 |
|
kept separate packages |
| 2899 |
|
- cost, ecco, obcs |
| 2900 |
|
o updating verification/internal_wave, verification/lab_sea |
| 2901 |
|
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
| 2902 |
|
|
| 2903 |
|
checkpoint50i_post |
| 2904 |
|
o Preparing next differentiable checkpoint and sync |
| 2905 |
|
of MAIN vs. ecco-branch |
| 2906 |
|
- 1st step: this one is differentiable |
| 2907 |
|
- 2nd step: next(! not this) checkpoint will have updated packages |
| 2908 |
|
from ecco-branch) |
| 2909 |
|
|
| 2910 |
|
checkpoint50h_post |
| 2911 |
|
o new package "land": provide surface BC for AIM. |
| 2912 |
|
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
| 2913 |
|
o AIM: use true log-P extrapolation for near surface temp (= as in |
| 2914 |
|
F.Molteni paper) ; update aim.5l_cs output. |
| 2915 |
|
o New variable in PARM03 for more flexible pickups |
| 2916 |
|
o somewhat cleaned package initialisation sequence for |
| 2917 |
|
ctrl/ cost/ ecco/ in packages_... routines |
| 2918 |
|
|
| 2919 |
|
checkpoint50g_post |
| 2920 |
|
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
| 2921 |
|
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
| 2922 |
|
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
| 2923 |
|
made the default because of faster convergence than ADI |
| 2924 |
|
|
| 2925 |
|
checkpoint50f_post |
| 2926 |
|
o exf totally restructured |
| 2927 |
|
- replaced all exf_set_ routines by one generic exf_set_gen.F |
| 2928 |
|
and made sure it's still differentiable |
| 2929 |
|
- split exf_getffields.F into new exf_bulkformulae.F |
| 2930 |
|
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
| 2931 |
|
- updated adjoint/makefile and relevant verif. accordingly |
| 2932 |
|
|
| 2933 |
|
checkpoint50f_pre |
| 2934 |
|
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
| 2935 |
|
+ change Evap over land. (update aim.5l_cs output) |
| 2936 |
|
o added missing .cvsignores and made uniform across expts |
| 2937 |
|
o changed configuration of tidal_basin_2d expt |
| 2938 |
|
o added pkg/debug functions for tracing code in fatal crashes |
| 2939 |
|
o tidied pkg/monitor to use MONITOR_OPTIONS.h |
| 2940 |
|
o new fn in pkg/monitor to stop model if solution grows too big |
| 2941 |
|
o removed lots of single quotes from comments |
| 2942 |
|
|
| 2943 |
|
checkpoint50e_post |
| 2944 |
|
o make KPP work with PTRACERS |
| 2945 |
|
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
| 2946 |
|
nearly a copy of kpp_transport_s |
| 2947 |
|
- there is no analogue to SurfaceTendencyS, so I have to use |
| 2948 |
|
gPtr(of the surface layer) instead |
| 2949 |
|
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
| 2950 |
|
checkpoint50e_pre |
| 2951 |
|
|
| 2952 |
|
checkpoint50d_post |
| 2953 |
|
o change kpp output from multiple-record state files to single-record state |
| 2954 |
|
files analogous to write_state.F |
| 2955 |
|
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
| 2956 |
|
analogous to the cg2d-related output. |
| 2957 |
|
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
| 2958 |
|
so that writing to internal file fn (with length 512) fails. |
| 2959 |
|
checkpoint50d_pre |
| 2960 |
|
|
| 2961 |
|
checkpoint50c_post |
| 2962 |
|
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
| 2963 |
|
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
| 2964 |
|
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
| 2965 |
|
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
| 2966 |
|
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
| 2967 |
|
|
| 2968 |
|
checkpoint50c_pre |
| 2969 |
|
Merging from release1_p13: |
| 2970 |
|
o bug fix for pkg/seaice dynamic solver |
| 2971 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 2972 |
|
|
| 2973 |
|
checkpoint50b_post |
| 2974 |
|
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
| 2975 |
|
o in order to put the momForcing out of the Adams-Bashforth: |
| 2976 |
|
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
| 2977 |
|
to timestep.F |
| 2978 |
|
o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays |
| 2979 |
|
o re-generate output for highly sensitive test-exp: |
| 2980 |
|
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
| 2981 |
|
|
| 2982 |
|
checkpoint50b_pre |
| 2983 |
|
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
| 2984 |
|
o corrected CPP option mismatch in exf_Bulk... functions for case |
| 2985 |
|
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
| 2986 |
|
|
| 2987 |
|
checkpoint50a_post |
| 2988 |
|
o Bug fix for merging between c50 and KPP. |
| 2989 |
|
ikey was passed from thermodynamics to kpp_calc via |
| 2990 |
|
common block rather than being recomputed in kpp_calc, |
| 2991 |
|
in contradiction with new key itdkey. |
| 2992 |
|
New key ikppkey created, and tamc.h headers updated. |
| 2993 |
|
|
| 2994 |
|
checkpoint50 |
| 2995 |
|
- 2nd step of merge with ecco-branch: |
| 2996 |
|
merge changes in ecco-branch back into main trunk |
| 2997 |
|
- bug fix in find_alpha |
| 2998 |
|
- more storing in gmredi_calc_tensor.F, kpp_routines.F |
| 2999 |
|
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
| 3000 |
|
- merged some sliced AD support routines |
| 3001 |
|
|
| 3002 |
|
checkpoint49 |
| 3003 |
|
merged from ecco-branch: |
| 3004 |
|
o exf: |
| 3005 |
|
- Enable initialisation of forcing fields to constant |
| 3006 |
|
(runtime) values. |
| 3007 |
|
- in exf_getffields.F |
| 3008 |
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
| 3009 |
|
That also fixes wrong TAF-key computations for key_1, key_2 |
| 3010 |
|
with bulf formulae. |
| 3011 |
|
- exf_init.F modify #ifdef for exf_init_evap |
| 3012 |
|
- exf_getffieldrec.F, ctrl_getrec.F |
| 3013 |
|
The following INT-usages are not safe: |
| 3014 |
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
| 3015 |
|
fldcount = int(fldsecs/fldperiod) + 1 |
| 3016 |
|
and were modified. |
| 3017 |
|
o autodiff: checkpoint_lev... |
| 3018 |
|
- updated storing for bulk formulae (some arrays were missing) |
| 3019 |
|
- added state for seaice package |
| 3020 |
|
- synchronized with main branch |
| 3021 |
|
o DIVA: |
| 3022 |
|
Modif.s in |
| 3023 |
|
- the_main_loop.F |
| 3024 |
|
- the_model_main.F |
| 3025 |
|
and added cost_final_restore.F cost_final_store.F |
| 3026 |
|
o With these changes, it is possible to fully separate |
| 3027 |
|
the first forward run to compute the cost function (mdthe_main_loop) |
| 3028 |
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
| 3029 |
|
into separate model executions. |
| 3030 |
|
This enables better tuning of DIVA to given queue sizes. |
| 3031 |
|
o Loss of cost function value in consecutive DIVA runs is |
| 3032 |
|
fixed by storing to 'costfinal' file. |
| 3033 |
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
| 3034 |
|
beginning/end of adjoint integration is accounted for. |
| 3035 |
|
The current changes apply to TAF-1.4.26. |
| 3036 |
|
TAF has one remaining bug, requiring one manual change |
| 3037 |
|
(see MITgcm manual). |
| 3038 |
|
o cal: synchronized between MAIN and ecco-branch |
| 3039 |
|
|
| 3040 |
|
checkpoint48i_post |
| 3041 |
|
o Changes to restore differentiability of code w.r.t. previous tag |
| 3042 |
|
(mostly adding new routines to make list and replacing |
| 3043 |
|
pressure by totPhiHyd). |
| 3044 |
|
o Updated and merged grdchk package |
| 3045 |
|
- has both ADM and TLM checks |
| 3046 |
|
- works for single- and multi-proc. |
| 3047 |
|
- output cleaned |
| 3048 |
|
- worked successfully for parallel DIVA |
| 3049 |
|
o genmake: |
| 3050 |
|
- Adding -platform=SP4 |
| 3051 |
|
- Modif. for DEC Alpha (many don't have makedepend; use mkdep instead). |
| 3052 |
|
o Modif. for DIVA: |
| 3053 |
|
ctrl_unpack should not be called in intermediate DIVA interval. |
| 3054 |
|
(similar thing would apply for active files such as |
| 3055 |
|
tbar, sbar, psbar, which should not be reinitialised; |
| 3056 |
|
only relevant for ecco-branch) |
| 3057 |
|
|
| 3058 |
|
checkpoint48h_post |
| 3059 |
|
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
| 3060 |
|
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
| 3061 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 3062 |
|
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
| 3063 |
|
|
| 3064 |
|
checkpoint48g_post |
| 3065 |
|
--- EOS: |
| 3066 |
|
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
| 3067 |
|
store total Potential in totPhyHyd for diagnostics & EOS. |
| 3068 |
|
o fix restart and overlap Pb when using Z-coord and EOS funct. of P |
| 3069 |
|
--- Pressure/geopotential gradient: |
| 3070 |
|
o use Ro_surf & R_low instead of hFac in cal_phi_hyd: |
| 3071 |
|
o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind |
| 3072 |
|
( changes results of global_ocean_pressure ) |
| 3073 |
|
o NLFS + z-coord.: add eta*Rho' contribution. |
| 3074 |
|
o accurate phiHyd when using interface-W at the middle between 2 centers |
| 3075 |
|
( changes results of ideal_2D_oce ) |
| 3076 |
|
o includes r* 2nd term in potential gradient. |
| 3077 |
|
|
| 3078 |
|
checkpoint48f_post |
| 3079 |
|
Merging from release1_p12: |
| 3080 |
|
o Modifications for using pkg/exf with pkg/seaice |
| 3081 |
|
- improved description of the various forcing configurations |
| 3082 |
|
- added basic radiation bulk formulae to pkg/exf |
| 3083 |
|
- units/sign fix for evap computation in exf_getffields.F |
| 3084 |
|
- updated verification/global_with_exf/results/output.txt |
| 3085 |
|
o Added pkg/sbo for computing IERS Special Bureau for the Oceans |
| 3086 |
|
(SBO) core products, including oceanic mass, center-of-mass, |
| 3087 |
|
angular, and bottom pressure (see pkg/sbo/README.sbo). |
| 3088 |
|
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F |
| 3089 |
|
to avoid negative values in shallow regions. |
| 3090 |
|
- updated verification/natl_box/results/output.txt |
| 3091 |
|
- updated verification/lab_sea/results/output.txt |
| 3092 |
|
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F |
| 3093 |
|
o Added useSingleCpuIO option (see PARAMS.h). |
| 3094 |
|
o Updated useSingleCpuIO option in mdsio_writefield.F to |
| 3095 |
|
work with multi-field files, e.g., for single-file pickup. |
| 3096 |
|
o pkg/seaice: |
| 3097 |
|
- bug fix in growth.F: QNET for no shortwave case |
| 3098 |
|
- added HeffFile for specifying initial sea-ice thickness |
| 3099 |
|
- changed SEAICE_EXTERNAL_FLUXES wind stress implementation |
| 3100 |
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
| 3101 |
|
kpp_transport_t.F, forward_step.F, and the_main_loop.F |
| 3102 |
|
o pkg/seaice: |
| 3103 |
|
- adjoint-friendly modifications |
| 3104 |
|
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
| 3105 |
|
|
| 3106 |
|
checkpoint48e_post |
| 3107 |
|
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
| 3108 |
|
o dynamics: change definition of computational domain & adapt mom_fluxform |
| 3109 |
|
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
| 3110 |
|
o following exp works with Olx=Oly=2 (and pass through checkbounds option): |
| 3111 |
|
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1 |
| 3112 |
|
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5 |
| 3113 |
|
global_ocean.90x40x15 global_with_exf global_ocean_pressure |
| 3114 |
|
inverted_barometer solid-body.cs-32x32x1 |
| 3115 |
|
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
| 3116 |
|
|
| 3117 |
|
checkpoint48d_post |
| 3118 |
|
o in preparation for r*: |
| 3119 |
|
a) use pre-computed gradient of hydrostatic potential: |
| 3120 |
|
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
| 3121 |
|
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd: |
| 3122 |
|
=> affects results of glob_oce_pressure (different truncation error) |
| 3123 |
|
update output.txt of ideal_2D_oce & global_ocean_pressure |
| 3124 |
|
|
| 3125 |
|
checkpoint48d_pre |
| 3126 |
|
o in preparation for r*: |
| 3127 |
|
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
| 3128 |
|
pass the 2 comp. of the grad. as arguments to momentum S/R. |
| 3129 |
|
but for the moment, only used if it does not change the results. |
| 3130 |
|
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
| 3131 |
|
|
| 3132 |
|
checkpoint48c_post |
| 3133 |
|
Modifications in treatment of initial flux forcing controls |
| 3134 |
|
to avoid extra storing of flux fields. |
| 3135 |
|
|
| 3136 |
|
checkpoint48c_pre |
| 3137 |
|
o Added tidal_basin_2d experiment (currently 1D!) |
| 3138 |
|
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
| 3139 |
|
|
| 3140 |
|
checkpoint48b_post |
| 3141 |
|
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
| 3142 |
|
(modification to pressure gradient not yet implemented) |
| 3143 |
|
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
| 3144 |
|
(for U & V) that are used for vertical advection of momentum. |
| 3145 |
|
|
| 3146 |
|
checkpoint48a_post |
| 3147 |
|
o In preparation for r*, use temp. array to compute vertical transport |
| 3148 |
|
in flux-form momentum pkg. => change results of few test-exp. |
| 3149 |
|
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
| 3150 |
|
lab_sea, natl_box & plume_on_slope |
| 3151 |
|
|
| 3152 |
|
checkpoint48 |
| 3153 |
|
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
| 3154 |
|
|
| 3155 |
|
checkpoint47j_post |
| 3156 |
|
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
| 3157 |
|
o moved adexch from forward_step to addummy_in_stepping |
| 3158 |
|
o added exch in ctrl_map_... |
| 3159 |
|
o aveFreq.=0. at end of cost_final to avoid overwrite in |
| 3160 |
|
reverse checkpointing loop |
| 3161 |
|
o Yet more changes in gmredi: |
| 3162 |
|
* adgmredi_calc_tensor |
| 3163 |
|
avoiding all recomputation of gmredi_slope_limit |
| 3164 |
|
* adgmredi_x/y/rtransport |
| 3165 |
|
added flag for excessive storing to avoid recomp. of |
| 3166 |
|
u/v/rtans, dTdx/y/z |
| 3167 |
|
-> this is not really necessary and very memory-consuming |
| 3168 |
|
* adgmredi_slope_psi: |
| 3169 |
|
consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff |
| 3170 |
|
* gmredi_slope_limit |
| 3171 |
|
re-activated full calculation of taperfct for case 'ac02' |
| 3172 |
|
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
| 3173 |
|
|
| 3174 |
|
checkpoint47i_post |
| 3175 |
|
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
| 3176 |
|
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
| 3177 |
|
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
| 3178 |
|
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf) |
| 3179 |
|
o gmredi: fix few bugs. |
| 3180 |
|
|
| 3181 |
|
checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48) |
| 3182 |
|
This will be a good checkpoint to plug into the ecco-branch. |
| 3183 |
|
o few modif.'s to get latest version adjointed |
| 3184 |
|
(mainly kick out code in ini_linear_phisurf) |
| 3185 |
|
o modif's to run adjoint with exactConserv |
| 3186 |
|
o case GM_BOLUS_ADVEC should be cleaned |
| 3187 |
|
S/R gmredi_slope_psi should be cleaned |
| 3188 |
|
o verification/carbon now has exactConserv=.TRUE. |
| 3189 |
|
|
| 3190 |
|
checkpoint47g_post |
| 3191 |
|
o time-average AIM output: becomes independent from statvars time-average |
| 3192 |
|
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
| 3193 |
|
o After TAF bug fix: |
| 3194 |
|
Tested adjoint of gmredi package. |
| 3195 |
|
Tests were done with checkpoint47 rather than with latest |
| 3196 |
|
checkpoint47f_post since the latter is broken for the adjoint |
| 3197 |
|
verification/carbon/ contains both ADM and TLM gradient checks. |
| 3198 |
|
Here they are, before they get changed/lost/stolen. |
| 3199 |
|
Mostly modif.'s to fix numerical sensitivities. |
| 3200 |
|
Gradient checks OK for |
| 3201 |
|
- GM_taper_scheme: |
| 3202 |
|
* clipping |
| 3203 |
|
* ac02 |
| 3204 |
|
* linear |
| 3205 |
|
* glw91 |
| 3206 |
|
* dm95 |
| 3207 |
|
* ldd97 |
| 3208 |
|
- GMREDI_OPTIONS: |
| 3209 |
|
* GM_VISBECK_VARIABLE_K |
| 3210 |
|
* GM_NON_UNITY_DIAGONAL |
| 3211 |
|
* GM_EXTRA_DIAGONAL |
| 3212 |
|
* GM_BOLUS_ADVEC |
| 3213 |
|
in conjunction with data.gmredi parameters to be checked in |
| 3214 |
|
in a few minutes under verification/carbon/code/ |
| 3215 |
|
|
| 3216 |
|
checkpoint47f_post |
| 3217 |
|
Merging from release1_p10: |
| 3218 |
|
o modifications for using pkg/exf with pkg/seaice |
| 3219 |
|
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
| 3220 |
|
and SEAICE_EXTERNAL_FLUXES |
| 3221 |
|
- pkg/exf CPP options EXF_READ_EVAP and |
| 3222 |
|
EXF_NO_BULK_COMPUTATIONS |
| 3223 |
|
- usage examples are Experiments 8 and 9 in |
| 3224 |
|
verification/lab_sea/README |
| 3225 |
|
- verification/lab_sea default experiment now uses |
| 3226 |
|
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
| 3227 |
|
|
| 3228 |
|
checkpoint47e_post |
| 3229 |
|
o created a tag prior to creating a branch |
| 3230 |
|
|
| 3231 |
|
checkpoint47d_post |
| 3232 |
|
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
| 3233 |
|
at the bottom boundary had an erroneous half slip boundary condition |
| 3234 |
|
o added bottom drag and no slip boundary condition capabilities to |
| 3235 |
|
oceanic pressure coordinates code |
| 3236 |
|
o added new verification experiment global_ocean_pressure, this experiment is |
| 3237 |
|
also described in the tutorial section of the manual |
| 3238 |
|
checkpoint47d_pre |
| 3239 |
|
|
| 3240 |
|
checkpoint47c_post |
| 3241 |
|
o Added a verification experiment for a global cubed-sphere ocean run |
| 3242 |
|
- verification/global_ocean.cubed32x32x30 |
| 3243 |
|
- uses pkg/therm_seaice and pkg/bulk_forcing |
| 3244 |
|
|
| 3245 |
|
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) |
| 3246 |
|
o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) |
| 3247 |
|
when using P-coordinate; only implemented for atmospheric config. |
| 3248 |
|
o OCEANICP & realFreshWater: include P-E direct effect on wVel ; |
| 3249 |
|
NOTES: requires option NONLIN_FRSURF to be "#define". |
| 3250 |
|
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
| 3251 |
|
|
| 3252 |
|
checkpoint47b_post |
| 3253 |
|
Merging from release1_p9: |
| 3254 |
|
o pkg/seaice |
| 3255 |
|
- removed GOTO's and added taf directives |
| 3256 |
|
- double precision constants to reduce the g77 (Linux) |
| 3257 |
|
to F77 (SGI) differences reported in release1_p8 |
| 3258 |
|
o tools/genmake |
| 3259 |
|
- added SGI options |
| 3260 |
|
o verification/testscript |
| 3261 |
|
- updated to that of checkpoint47a_post |
| 3262 |
|
o verification/global_ocean.90x40x15/input/eedata |
| 3263 |
|
- modified for SGI f77 compatibility |
| 3264 |
|
o verification/lab_sea |
| 3265 |
|
- added description of sea-ice model |
| 3266 |
|
- added missing matlab routines |
| 3267 |
|
- added test of thermodynamics parallelization |
| 3268 |
|
|
| 3269 |
|
checkpoint47a_post |
| 3270 |
|
o new pkg: aim_v23 |
| 3271 |
|
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
| 3272 |
|
for now, keep the same surface forcing as before. |
| 3273 |
|
- Part-Cell implemented into AIM; check that Heat & Water are conserved |
| 3274 |
|
- aim.5l_cs: use new aim pkg (run 10yr & get better results than before) |
| 3275 |
|
- aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg |
| 3276 |
|
o add diagnostic of surface correction term in monitor output |
| 3277 |
|
|
| 3278 |
|
o bulk_force and therm_seaice |
| 3279 |
|
- Two packages: bulk_force (Bulk forcing) |
| 3280 |
|
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2 |
| 3281 |
|
- Earlier integration from Stephaine Dutkiewicz |
| 3282 |
|
and Patrick Heimbach. |
| 3283 |
|
- Two ifdef statements for compile time, |
| 3284 |
|
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
| 3285 |
|
|
| 3286 |
|
checkpoint47 |
| 3287 |
|
differentiable version of checkpoint46n_post |
| 3288 |
|
o bug fix in quasihydrostaticterms |
| 3289 |
|
o * "clean" adjoint code (in terms of extensive recomputations) |
| 3290 |
|
can now be obtained for all GMREDI options (i.e. for |
| 3291 |
|
- GM_VISBECK_VARIABLE_K |
| 3292 |
|
- GM_NON_UNITY_DIAGONAL |
| 3293 |
|
- GM_EXTRA_DIAGONAL |
| 3294 |
|
- GM_BOLUS_ADVEC ) |
| 3295 |
|
* However, wrong gradient check problem remains unsolved. |
| 3296 |
|
* New CPP options have been introduced for different |
| 3297 |
|
tapering schemes |
| 3298 |
|
o external_fields_load now part of differentiation list |
| 3299 |
|
o pressure needs multiple storing; |
| 3300 |
|
would be nice to have store_pressure at beginning or |
| 3301 |
|
end of forward_step, e.g. by having phiHyd global (5-dim.) |
| 3302 |
|
(NB: pressure is needed for certain cases in find_rho, |
| 3303 |
|
which is also invoked through convective_adjustment). |
| 3304 |
|
o recomputations in find_rho for cases |
| 3305 |
|
'JMD95'/'UNESCO' or 'MDJWF' are OK. |
| 3306 |
|
o #define ATMOSPHERIC_LOADING should be differentiable |
| 3307 |
|
o ini_forcing shifted to begining of initialise_varia |
| 3308 |
|
o Incorporating QNVS line search routines into MITgcm |
| 3309 |
|
(this is separate code, and therefore not under pkg) |
| 3310 |
|
lsopt/, optim/ |
| 3311 |
|
o Updated verification/carbon/ |
| 3312 |
|
- #define GM_VISBECK_VARIABLE_K |
| 3313 |
|
- GM_taper_scheme = 'ldd97' |
| 3314 |
|
|
| 3315 |
|
checkpoint46n_post |
| 3316 |
|
Merging from release1_p8: |
| 3317 |
|
o verification/natl_box: |
| 3318 |
|
updating new external_fields_load routine |
| 3319 |
|
o New package: pkg/seaice |
| 3320 |
|
Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle). |
| 3321 |
|
The sea-ice code is based on Hibler (1979-1980). |
| 3322 |
|
Two sea-ice dynamic solvers, ADI and LSR, are included. |
| 3323 |
|
In addition to computing prognostic sea-ice variables and diagnosing |
| 3324 |
|
the forcing/external data fields that drive the ocean model, |
| 3325 |
|
SEAICE_MODEL also sets theta to the freezing point under sea-ice. |
| 3326 |
|
The implied surface heat flux is then stored in variable |
| 3327 |
|
surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and |
| 3328 |
|
kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the |
| 3329 |
|
non-local transport term. Because this call precedes model |
| 3330 |
|
thermodynamics, temperature under sea-ice may not be "exactly" at |
| 3331 |
|
the freezing point by the time theta is dumped or time-averaged. |
| 3332 |
|
N.B.: fairly large differences in accuracy occur across |
| 3333 |
|
different platforms/compilers; comparison between |
| 3334 |
|
g77 (Linux) and F77 (SGI Origin 2000/MIPSpro) |
| 3335 |
|
generated output gives: |
| 3336 |
|
T S U V |
| 3337 |
|
C D M c m s m s m s m s |
| 3338 |
|
n p a R g m m e . m m e . m m e . m m e . |
| 3339 |
|
f n k u 2 i a a d i a a d i a a d i a a d |
| 3340 |
|
g d e n d n x n . n x n . n x n . n x n . |
| 3341 |
|
|
| 3342 |
|
Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea |
| 3343 |
|
o GAD: |
| 3344 |
|
- generated new common blocks to account for call of |
| 3345 |
|
same gad routines with differing traceridentities |
| 3346 |
|
(needed to modify tracerIdentity indices in GAD.h) |
| 3347 |
|
- generated separate common blocks for case useCubedSphereExchange |
| 3348 |
|
(Department of Futurology) |
| 3349 |
|
- parameter lists to gmredi_?transport: added tracerIdentity |
| 3350 |
|
- added new key indices to tamc.h |
| 3351 |
|
o external_fields_load: |
| 3352 |
|
- added this routine to TAF list |
| 3353 |
|
- needed to make some common blocks global and additional storing |
| 3354 |
|
along the same lines as exf package (checkpoint_lev?_directives.h) |
| 3355 |
|
o exf: |
| 3356 |
|
updated external forcing package |
| 3357 |
|
- bug fixes carried over from ecco-branch |
| 3358 |
|
(missing OBCS_OPTIONS.h in two routines) |
| 3359 |
|
- enable easy to use "no forcing". |
| 3360 |
|
- added exf I/O for atmospheric loading |
| 3361 |
|
- added exf I/O for runoff data |
| 3362 |
|
- transfered scaling between exf <-> MITgcm to exf namelist |
| 3363 |
|
o Adding new verification experiment global_with_exf. |
| 3364 |
|
This verification experiment is almost identical to the |
| 3365 |
|
global_ocean.90x40x15 experiment, except that it uses |
| 3366 |
|
the exf (and cal) package instead of the |
| 3367 |
|
external_fields_load routine (cf README file). |
| 3368 |
|
|
| 3369 |
|
checkpoint46m_post |
| 3370 |
|
o modified testscript to return -- when there are no lines of "%MON" output |
| 3371 |
|
o added new flag "quasiHydrostatic" for QH mode |
| 3372 |
|
and new routine quasihydrostaticterms() |
| 3373 |
|
o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term) |
| 3374 |
|
New routine: mom_u_coriolis_nh() |
| 3375 |
|
o fixed sign of non-hydrostatic metric terms in u and v equations. |
| 3376 |
|
Depend on correct sign of gravitySign. |
| 3377 |
|
o added work.pc* to .cvsignore in aim directories using ifc |
| 3378 |
|
o introduced flag for controllin non-hydrostatic metric terms |
| 3379 |
|
o removed gravitySign from PARM04 |
| 3380 |
|
o switched to g77/ifc from pgf77 in aim experiments |
| 3381 |
|
|
| 3382 |
|
checkpoint46l_post |
| 3383 |
|
o made convective adjustment work with pressure coordinates: |
| 3384 |
|
- changed the direction of k-loop in convective_adjustment.F for the |
| 3385 |
|
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
| 3386 |
|
- adjusted the reference pressure k-index in convective_adjustment.F |
| 3387 |
|
- adjusted the convection condition in convect.F (in analogy to |
| 3388 |
|
calc_ivdc.F) |
| 3389 |
|
- convective_adjustment no longer computes anything on the halos |
| 3390 |
|
- removed the warnings about negative salinity from find_rho.F and |
| 3391 |
|
find_alpha.F; instead the new routine look_for_neg_salinity, called |
| 3392 |
|
at the beginning of find_rho, find_alpha, and find_beta, does a |
| 3393 |
|
check of the entire slice, if CPP-option |
| 3394 |
|
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
| 3395 |
|
checkpoint46l_pre |
| 3396 |
|
|
| 3397 |
|
checkpoint46k_post |
| 3398 |
|
o fixed the verification/global_ocean.90x40x15 experiment: |
| 3399 |
|
- new bathymetry (the world according to A., JMC, and M.) |
| 3400 |
|
- new initial fields and forcing fields (*.bin files) |
| 3401 |
|
- new POLY3.COEFFS (for the next release one should switch to a full |
| 3402 |
|
equation of state: JMD95P or MDJWF) |
| 3403 |
|
- fixed several errors and redundancies in the data file |
| 3404 |
|
- experiment uses looped cells |
| 3405 |
|
- added matlab directory with diagnostic scripts for plotting of output |
| 3406 |
|
|
| 3407 |
|
o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: |
| 3408 |
|
- read AIM physics parameters from a file (data.aimphys) |
| 3409 |
|
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
| 3410 |
|
|
| 3411 |
|
checkpoint46j_post |
| 3412 |
|
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
| 3413 |
|
o move wVel computation at the end of the time step, in S/R integr_continuity |
| 3414 |
|
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
| 3415 |
|
o update timeave pkg for wVel diagnostic. |
| 3416 |
|
checkpoint46j_pre |
| 3417 |
|
|
| 3418 |
|
checkpoint46i_post |
| 3419 |
|
o Clean up AIM package (and keep the results unchanged): |
| 3420 |
|
include CPP_OPTION and use IMPLICT NONE in all routines ; |
| 3421 |
|
declare all the variables _RL ; use _d 0 for all numerical constants. |
| 3422 |
|
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
| 3423 |
|
|
| 3424 |
|
checkpoint46h_post |
| 3425 |
|
o cleaned up the use of rhoNil and rhoConst. |
| 3426 |
|
- rhoNil should only appear in the LINEAR equation of state, everywhere |
| 3427 |
|
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
| 3428 |
|
and the dynamical equations are all divided by rhoConst |
| 3429 |
|
o introduced new parameter rhoConstFresh, a reference density of fresh |
| 3430 |
|
water, to remove the fresh water flux's dependence on rhoNil. The default |
| 3431 |
|
value is 999.8 kg/m^3 |
| 3432 |
|
o cleanup up external_forcing.F and external_forcing_surf.F |
| 3433 |
|
- can now be used by both OCEANIC and OCEANICP |
| 3434 |
|
checkpoint46h_pre |
| 3435 |
|
|
| 3436 |
|
Added code to convert surface volume flux (fresh water) into |
| 3437 |
|
a mass flux when using P coordinates in the ocean (OCEANICP). |
| 3438 |
|
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
| 3439 |
|
|
| 3440 |
|
checkpoint46g_post |
| 3441 |
|
o Include a new diagnostic variable phiHydLow for the ocean model |
| 3442 |
|
- in z-coordinates, it is the bottom pressure anomaly |
| 3443 |
|
- in p-coordinates, it is the sea surface elevation |
| 3444 |
|
- in both cases, these variable have global drift, reflecting the mass |
| 3445 |
|
drift in z-coordinates and the volume drift in p-coordinates |
| 3446 |
|
- included time averaging for phiHydLow, be aware of the drift! |
| 3447 |
|
o depth-dependent computation of Bo_surf for pressure coordinates |
| 3448 |
|
in the ocean (buoyancyRelation='OCEANICP') |
| 3449 |
|
- requires a new routine (FIND_RHO_SCALAR) to compute density with only |
| 3450 |
|
Theta, Salinity, and Pressure in the parameter list. This routine is |
| 3451 |
|
presently contained in find_rho.F. This routine does not give the |
| 3452 |
|
correct density for 'POLY3', which would be a z-dependent reference |
| 3453 |
|
density. |
| 3454 |
|
o cleaned up find_rho |
| 3455 |
|
- removed obsolete 'eqn' from the parameter list. |
| 3456 |
|
o added two new verification experiments: gop and goz |
| 3457 |
|
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
| 3458 |
|
checkpoint46g_pre |
| 3459 |
|
|
| 3460 |
|
checkpoint46f_post |
| 3461 |
|
o Enable tangent linear (forward mode) gradient checks: |
| 3462 |
|
- extended active file handling to g_... files |
| 3463 |
|
- added TANGENT_SIMULATION to theSimulationMode |
| 3464 |
|
- extended grdchk package accordingly |
| 3465 |
|
o added tangent linear setup in verification/carbon/code_ftl |
| 3466 |
|
o added adjoint setup in verification/front_relax/code_ad |
| 3467 |
|
|
| 3468 |
|
checkpoint46e_post |
| 3469 |
|
o Added new equation of state -> MDJWF |
| 3470 |
|
- EOS of McDougall et al., 2002, JAOT, submitted |
| 3471 |
|
- caveat: the equation of state is only valid for a smaller (more |
| 3472 |
|
realistic?) range of values than JMD95P/Z and UNESCO |
| 3473 |
|
- added masks to the calculation of pressure in store_pressure |
| 3474 |
|
- added more check values for density in check_eos (ini_eos.F), some of |
| 3475 |
|
the old check values are out of the range of the MDJWF-eos, so don't |
| 3476 |
|
expect perfect matches for those |
| 3477 |
|
checkpoint46e_pre |
| 3478 |
|
|
| 3479 |
|
checkpoint46d_post |
| 3480 |
|
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
| 3481 |
|
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
| 3482 |
|
case of pressure coordinates. eosType='JMD95Z' in |
| 3483 |
|
combination with buoyancyRelation='OCEANICP' now causes an error. |
| 3484 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 3485 |
|
in find_alpha/beta. |
| 3486 |
|
checkpoint46d_pre |
| 3487 |
|
|
| 3488 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 3489 |
|
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
| 3490 |
|
|
| 3491 |
|
checkpoint46c_post |
| 3492 |
|
o Changes necessary for ocean in p-coordinates |
| 3493 |
|
- Added new buoyancy relation = 'OCEANICP' |
| 3494 |
|
- Added new parameters = gravitySign (this used to be contained inside |
| 3495 |
|
the factor dRdZ which I added when we first switched to R coordinates). |
| 3496 |
|
X GM/Redi is not compatible (yet) |
| 3497 |
|
X bottom drag and no-slip need to be debugged. |
| 3498 |
|
checkpoint46c_pre |
| 3499 |
|
|
| 3500 |
|
checkpoint46b_post |
| 3501 |
|
o Added new equation of state -> JMD95Z and JMD95P |
| 3502 |
|
- EOS of Jackett and McDougall, 1995, JAOT |
| 3503 |
|
- moved all EOS parameters into EOS.h |
| 3504 |
|
- new routines ini_eos.F, store_pressure.F |
| 3505 |
|
o Added UNESCO EOS, but not recommended because it requires |
| 3506 |
|
in-situ temperature (see JMD95) |
| 3507 |
|
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
| 3508 |
|
unesco.f to be used with POLY3 |
| 3509 |
|
checkpoint46b_pre |
| 3510 |
|
|
| 3511 |
|
checkpoint46a_post |
| 3512 |
|
o Added (atmospheric) pressure loading |
| 3513 |
|
- new field in FFIELDS.h, etc... |
| 3514 |
|
- new cpp flag ATMOSPHERIC_LOADING |
| 3515 |
|
o Changed hFacC to _hFacC in calc_phi_hyd.F |
| 3516 |
|
o Added SHORTWAVE_HEATING to some files for consistency |
| 3517 |
|
checkpoint46a_pre |
| 3518 |
|
|
| 3519 |
|
checkpoint46 |
| 3520 |
|
further merges from release1_p5 |
| 3521 |
|
o new ctrl package |
| 3522 |
|
- adopted from ECCO environment to enable optimization |
| 3523 |
|
- added Eliassen Palm fluxes to controls |
| 3524 |
|
o added Eliassen Palm flux controls to gradient check package |
| 3525 |
|
o cost package |
| 3526 |
|
- Compatible with new ctrl package |
| 3527 |
|
- added Eliassen Palm cost hooks |
| 3528 |
|
- modif's of existing cost functions |
| 3529 |
|
o Adjoint-related bug fixes in kpp: |
| 3530 |
|
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix |
| 3531 |
|
- kpp_routines: store of Rib avoids partial recomputation bug of TAF. |
| 3532 |
|
o autodiff package |
| 3533 |
|
- flow directives: |
| 3534 |
|
+ new for S/R do_the_model_io |
| 3535 |
|
+ enhanced for S/R checkpoint |
| 3536 |
|
+ new gmredi.flow |
| 3537 |
|
- Introduced CPP option ALLOW_AUTODIFF_MONITOR to |
| 3538 |
|
disable adcommon.h/g_common.h by default. |
| 3539 |
|
- fixed problem for adjoint of global_max |
| 3540 |
|
o modified verification/carbon/ |
| 3541 |
|
o New setup for adjoint of global_ocean |
| 3542 |
|
o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F) |
| 3543 |
|
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
| 3544 |
|
o incorporated hooks for sponge layer code (external_forcing.F) |
| 3545 |
|
|
| 3546 |
|
checkpoint45d_post |
| 3547 |
|
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
| 3548 |
|
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
| 3549 |
|
(affects plume_on_slope "cg2d" output) |
| 3550 |
|
o add new parameter deltaTfreesurf for free-surface time stepping |
| 3551 |
|
o exchange gT,gS when using staggerTimeStep & GM & Oly<4 |
| 3552 |
|
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
| 3553 |
|
o change phiMin in exp1 (to agree with documentation) |
| 3554 |
|
o add new flags: |
| 3555 |
|
- T,S forcing inside/outside Adams-Bashforth |
| 3556 |
|
- turn off temp,salt advection and/or forcing |
| 3557 |
|
- for each tracer, define internal flag for multiDimAdvection & A-B |
| 3558 |
|
o monitor: change definition of KE to check conservation of Energy |
| 3559 |
|
|
| 3560 |
|
checkpoint45c_post |
| 3561 |
|
o Removed f90 comments ("!") |
| 3562 |
|
o Modified initialisations to enable exf package for MITgcm |
| 3563 |
|
(without invoking ECCO_PACKAGE). |
| 3564 |
|
o modifications to gradient check package (Martin Losch) |
| 3565 |
|
- enable centered differences |
| 3566 |
|
- modified format of standard output |
| 3567 |
|
|
| 3568 |
|
checkpoint45b_post |
| 3569 |
|
o cleaned exchange calls in cg2d |
| 3570 |
|
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
| 3571 |
|
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
| 3572 |
|
to configure barotropic setup (Martin Losch) |
| 3573 |
|
o moved some initialisations within bi,bj loop in dynamics |
| 3574 |
|
(TAF flow dependency) |
| 3575 |
|
o in initialise_varia, moved call packages_init_variables |
| 3576 |
|
before convective_adjustment_init |
| 3577 |
|
(corresponding adjustment of TAF tape initialisation). |
| 3578 |
|
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
| 3579 |
|
|
| 3580 |
|
checkpoint45a_post |
| 3581 |
|
o compute Rho over the whole domain (extend iMin,jMin indices) |
| 3582 |
|
o specific exchange for X-slice domain (case Ny=1) |
| 3583 |
|
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
| 3584 |
|
o solve_for_pressure : set cg2d_x to zero where OBCS are applied |
| 3585 |
|
|
| 3586 |
|
checkpoint44h_post = checkpoint45 |
| 3587 |
|
o Fix to restore differentiability: |
| 3588 |
|
place at which packages_init_variables is called in |
| 3589 |
|
initialise_varia is crucial for reverse control flow. |
| 3590 |
|
o modifications in GMRedi to enable stable adjoint |
| 3591 |
|
(corresponding modif's in thermodynamics, dynamics) |
| 3592 |
|
o added missing hook for sponge layer code in external_forcing |
| 3593 |
|
o modified test cost functions |
| 3594 |
|
o storing in gad_advection (plus removal of write(0,*)! |
| 3595 |
|
o missing headers TR1.h added in convective_adjustment routines |
| 3596 |
|
o errorMessageUnit set non-equal zero in eeboot |
| 3597 |
|
(conflict on some platforms, e.g. IBM SP3) |
| 3598 |
|
o modified carbon verif. |
| 3599 |
|
|
| 3600 |
|
checkpoint44h_pre |
| 3601 |
|
o vertical grid option: allow to put the Interface at the middle between |
| 3602 |
|
2 cell-centers ; replace delZ in pkg/kpp by drF. |
| 3603 |
|
o GM Advective form: Tracers are advected using the residual transport (= |
| 3604 |
|
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
| 3605 |
|
|
| 3606 |
|
checkpoint44g_post |
| 3607 |
|
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
| 3608 |
|
results) ; ifdef missing in thermodynamics.F |
| 3609 |
|
|
| 3610 |
|
checkpoint44f_pre,checkpoint44f_post |
| 3611 |
|
o added PTRACERS package |
| 3612 |
|
This allows an arbitrary number of passive tracers to be integrated |
| 3613 |
|
forward simultaneously with the dynamicaly model. |
| 3614 |
|
+ Implemented so far: |
| 3615 |
|
- basic forward algorithm (time-stepping, advection, diffusion, convection) |
| 3616 |
|
- I/O and checkpointing |
| 3617 |
|
- GM/Redi *but* using the GM/Redi coefficient of Salt |
| 3618 |
|
+ Not implemented so far: |
| 3619 |
|
- KPP |
| 3620 |
|
- OBCS |
| 3621 |
|
+ No specific example supplied (yet) but global_ocean.90x40x15 has the |
| 3622 |
|
necessary data.ptracer file. Simply use -enable=ptracers and uncomment |
| 3623 |
|
line in data.pkg. |
| 3624 |
|
+ This package is disabled by default since it increases storage. |
| 3625 |
|
|
| 3626 |
|
|
| 3627 |
|
o testscript: added -cleanup option |
| 3628 |
|
o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter |
| 3629 |
|
b) enable to filter 2D fields. |
| 3630 |
|
|
| 3631 |
|
checkpoint44e_pre,post |
| 3632 |
|
o re-wrote convective adjustment to use pre-calculated weights |
| 3633 |
|
Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F |
| 3634 |
|
Adds: model/src/convective_weights.F, convectively_mixtracer.F |
| 3635 |
|
Original calls to convect() still in place. |
| 3636 |
|
|
| 3637 |
|
chkpt44d_pre,post |
| 3638 |
|
o added missing EXCLUDE_MONITOR flags |
| 3639 |
|
o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
| 3640 |
|
(incompatible typ in MIN/MAX expressions caused problems |
| 3641 |
|
on IBM SP3) |
| 3642 |
|
o in genmake added variable MAKEDEPEND |
| 3643 |
|
plus resetting for case SunOS |
| 3644 |
|
o added timer_stats.c routine for IBM SP3 |
| 3645 |
|
o removed variables in dynamics |
| 3646 |
|
!!! I forgot to create tag chkpt44d_pre !!! |
| 3647 |
|
!!! But chkpt44d_pre = chkpt44c_post !!! |
| 3648 |
|
|
| 3649 |
o real fresh water flux implemented with non-linear free-surface. |
o real fresh water flux implemented with non-linear free-surface. |
| 3650 |
|
|
| 3651 |
chkpt44c_pre,post |
chkpt44c_pre,post |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch