| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o pkg/flt: |
| 8 |
|
- do some cleaning and fix the restart ; |
| 9 |
|
- add output.txt in flt_example/results to get this pkg tested. |
| 10 |
|
o genmake2: add an EXTENDED_SRC option and flag. |
| 11 |
|
for now, cannot be turned on on command line (only through genmake_local) |
| 12 |
|
o pkg/mdsio: read/write vector: |
| 13 |
|
- singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS |
| 14 |
|
- singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR |
| 15 |
|
& MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS. |
| 16 |
|
- affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO) |
| 17 |
|
(drop to 4 digits matching for grad). But this test does not look very |
| 18 |
|
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
| 19 |
|
|
| 20 |
|
checkpoint61g |
| 21 |
|
o pkg/flt: |
| 22 |
|
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
| 23 |
|
+ make OPTIONS file more standard. |
| 24 |
|
- rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name) |
| 25 |
|
- fix _BYTESWAPIO CPP-Flag |
| 26 |
|
- standard reading of file-parameter "data.flt" |
| 27 |
|
- fix argument list of S/R FLT_RESTART |
| 28 |
|
still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F |
| 29 |
|
o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell |
| 30 |
|
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
| 31 |
|
a still unfixed compiler/optimization bug |
| 32 |
|
|
| 33 |
|
checkpoint61f |
| 34 |
|
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
| 35 |
|
update results of global_ocean.cs32x15.icedyn test. |
| 36 |
|
o move getcon.F from model/src to pkg/fizhi. |
| 37 |
|
o pkg/exf: add parameter for extrapolation of temp up to the surface |
| 38 |
|
and option to prevent negative evap (in bulk_largeyeager04 only). |
| 39 |
|
o Prather Advection scheme: fix tracer conservation for divergent flow |
| 40 |
|
(e.g., when using NonLin Free-Surface). |
| 41 |
|
o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead |
| 42 |
|
o gmredi (Visbeck-variable-K): |
| 43 |
|
- add more parameters to Visbeck-variable-K. |
| 44 |
|
- use a 5 points average for dSigmaR in Visbeck-K calculation |
| 45 |
|
(more "homogenous": same stencil and same weights as in dSigmaH) |
| 46 |
|
- update output of ideal_2D_oce experiment. |
| 47 |
|
o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4 |
| 48 |
|
(#undef REAL4_IS_SLOW) |
| 49 |
|
- pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4 |
| 50 |
|
coordinate variable |
| 51 |
|
- pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables |
| 52 |
|
(surface forcing fields), removes some of the functionality |
| 53 |
|
- model/src/write_grid.F: write _RS variables as RS-netcdf variables |
| 54 |
|
- model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but |
| 55 |
|
probably not all: copy _RS surface flux fields to RL field before |
| 56 |
|
calling DIAGNOSTICS_FILL |
| 57 |
|
- model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into |
| 58 |
|
real*4 (CALL EXCH_*_RS) versions. |
| 59 |
|
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
| 60 |
|
(generate new output). |
| 61 |
|
|
| 62 |
|
checkpoint61e |
| 63 |
|
o gmredi (Visbeck-variable-K): |
| 64 |
|
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
| 65 |
|
- change computation of Visbeck-K where Slope > Smax : |
| 66 |
|
now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct) |
| 67 |
|
previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output. |
| 68 |
|
o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic |
| 69 |
|
to be the same as with Z-coord. (i.e., m/s & no-units respectively). |
| 70 |
|
o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc) |
| 71 |
|
o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz |
| 72 |
|
does not become too large (to avoid precision problems in implicit-diffusion |
| 73 |
|
solver); update ideal_2D_oce output. |
| 74 |
|
o pkg ggl90: |
| 75 |
|
- in ggl90_cal.F: compute only one set of visc/diff, used to |
| 76 |
|
step forward TKE/T/S/momentum |
| 77 |
|
- default value of GGL90viscMax/GGL90diffMax larger and equal (to |
| 78 |
|
have Prandlt =1) |
| 79 |
|
o gmredi (fm07): |
| 80 |
|
- add lower limit on Transition layer thickness + lower limit on 1/lambda |
| 81 |
|
- allow to set few more params from data.gmredi |
| 82 |
|
o pkg ggl90: |
| 83 |
|
- add missing sqrt(2) factor in computation of mixing length |
| 84 |
|
scale in ggl90_calc.F |
| 85 |
|
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
| 86 |
|
|
| 87 |
|
checkpoint61d |
| 88 |
|
o adjoint modifs |
| 89 |
|
- adapt to new field rhoInSitu |
| 90 |
|
- allow to revert from StoreDynVars2D, StoreDynVars3D |
| 91 |
|
to individual fields |
| 92 |
|
(switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D) |
| 93 |
|
o store 3-D (in-situ) density in commom block (DYNVARS.h) |
| 94 |
|
- save 1 rho computation. |
| 95 |
|
- no longer modify T & S inland when using down_slope pkg. |
| 96 |
|
o gad_som : allow to switch to SOM advection for T & S without corresponding |
| 97 |
|
pickup files (using new S/R: MDS_CHECK4FILE). |
| 98 |
|
o keep removing _BEGIN/_END_MASTER between MDSIO S/R call |
| 99 |
|
(for useSingleCpuIO to work in multi-threaded) |
| 100 |
|
o pkg/shelfice: |
| 101 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
| 102 |
|
with SHELFICEtopoFile in data.shelfice |
| 103 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
| 104 |
|
subroutines of the shelfice package |
| 105 |
|
- separate initialisation of "fixed" and "variable" variables |
| 106 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
| 107 |
|
o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
| 108 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
| 109 |
|
and rename: |
| 110 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
| 111 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
| 112 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
| 113 |
|
|
| 114 |
|
checkpoint61c |
| 115 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
| 116 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
| 117 |
|
of oceanic real-fresh water flux). |
| 118 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
| 119 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
| 120 |
|
o new pkg: down_slope |
| 121 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
| 122 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
| 123 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
| 124 |
|
- implementation for ocean in P-coords not tested. |
| 125 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
| 126 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
| 127 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
| 128 |
|
o change FIND_RHO to FIND_RHO_2D : |
| 129 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
| 130 |
|
o new pkg: cheapaml |
| 131 |
|
|
| 132 |
|
checkpoint61b |
| 133 |
|
o exch2: |
| 134 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
| 135 |
|
- no longer depend on the order sequence (N,S,E,W). |
| 136 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
| 137 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
| 138 |
|
- exch_UV_A-grid readily available (but not yet tested). |
| 139 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
| 140 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
| 141 |
|
get truncation error differences with adjoint exch. |
| 142 |
|
o exch2: |
| 143 |
|
- change index-bounds storage (moved from target to local tile, |
| 144 |
|
more intuitive this way) ; rename/remove some variables. |
| 145 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
| 146 |
|
|
| 147 |
|
checkpoint61a |
| 148 |
|
o exch2/matlab-topology-generator: |
| 149 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
| 150 |
|
had any effect on the solution). |
| 151 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
| 152 |
|
is exceeded |
| 153 |
|
o testreport: modify syntax of awk, so that it works also with |
| 154 |
|
awk, and not only with nawk and gawk |
| 155 |
|
|
| 156 |
|
checkpoint61 |
| 157 |
|
o autodiff |
| 158 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
| 159 |
|
This changes TAF subroutine argument list (ordering of active var.) |
| 160 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
| 161 |
|
To restore TAMC-compatibility, need following modifs: |
| 162 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
| 163 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
| 164 |
|
Tested TAF version is 1.9.22 |
| 165 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
| 166 |
|
|
| 167 |
|
checkpoint60 |
| 168 |
|
--->>> This is the last checkpoint for which generating the adjoint |
| 169 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
| 170 |
|
--->>> by default. |
| 171 |
|
--->>> Future checkpoints will ommit this flag by default. |
| 172 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
| 173 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
| 174 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
| 175 |
|
o pkg/autodiff: more flexibility in zeroadj. |
| 176 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
| 177 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
| 178 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
| 179 |
|
special setup of gmredi for which the adjoint is stable |
| 180 |
|
enough for parameter optimization. |
| 181 |
|
o bridging the gap between eddy stress and GM. |
| 182 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
| 183 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
| 184 |
|
-> when using GM w/ GM_AdvForm: |
| 185 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
| 186 |
|
is applied either in the tracer Eq. or in momentum Eq. |
| 187 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
| 188 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
| 189 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
| 190 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
| 191 |
|
|
| 192 |
|
checkpoint59r |
| 193 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
| 194 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
| 195 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
| 196 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
| 197 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
| 198 |
|
mass points, when using mnc for output |
| 199 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
| 200 |
|
default (which is the value of getcon('UNDEF')) |
| 201 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
| 202 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
| 203 |
|
initialisation of never used fields |
| 204 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
| 205 |
|
versions |
| 206 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
| 207 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
| 208 |
|
are missing. |
| 209 |
|
o move from external_forcing_surf.F to ini_forcing.F |
| 210 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
| 211 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
| 212 |
|
o Freshen up a bit hs94.1x64x5, notably: |
| 213 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
| 214 |
|
exactConserv=.TRUE. |
| 215 |
|
o pkg/generic_advdiff: |
| 216 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
| 217 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
| 218 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
| 219 |
|
this uses a dynamically allocated internal state data structure |
| 220 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
| 221 |
|
and requires a fortran 90 compiler |
| 222 |
|
|
| 223 |
|
checkpoint59q |
| 224 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
| 225 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
| 226 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
| 227 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
| 228 |
|
- change EOS (POLY3 --> JMD95Z) |
| 229 |
|
- use Bryan-Lewis vertical diffusivity |
| 230 |
|
- use multidimensional advection |
| 231 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
| 232 |
|
- change a couple of parameters in dic pkg |
| 233 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
| 234 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
| 235 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
| 236 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
| 237 |
|
o implementation of TAF directives for gchem,cfc,dic |
| 238 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
| 239 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
| 240 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
| 241 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
| 242 |
|
--> changes results in exp4, seaice_obcs |
| 243 |
|
o tutorial_deep_convection : |
| 244 |
|
update the set-up and increase resolution and domain size ; start |
| 245 |
|
from pseudo initial conditions = output at t=120mn in order to see |
| 246 |
|
something happening when running testreport. |
| 247 |
|
o pkg/seaice: add os7mp as an advection scheme |
| 248 |
|
add check for advection schemes |
| 249 |
|
add a flag for restoring T and S underneath sea ice |
| 250 |
|
o pkg/my82: add netcdf-support and diagnostics |
| 251 |
|
o thsice pkg: |
| 252 |
|
- Now hsMax limits snow height by turning it into ice following |
| 253 |
|
flooding scheme (and now conserving energy) |
| 254 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
| 255 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
| 256 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
| 257 |
|
|
| 258 |
|
checkpoint59p |
| 259 |
|
o gchem / dic / cfc : |
| 260 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
| 261 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
| 262 |
|
- various re-arrangement in initialisation & header file ; |
| 263 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
| 264 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
| 265 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
| 266 |
|
before) providing pickupStrictlyMatch is set to False. |
| 267 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
| 268 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
| 269 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
| 270 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
| 271 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
| 272 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
| 273 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
| 274 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
| 275 |
|
scheme to use for vorticty-term ; |
| 276 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
| 277 |
|
(with default selectVortScheme, return to original discretisation) |
| 278 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
| 279 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
| 280 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
| 281 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
| 282 |
|
also fix diagnostics VISCAHW & VISCA4W. |
| 283 |
|
|
| 284 |
checkpoint59o |
checkpoint59o |
| 285 |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
| 286 |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch