| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o pkg/exf/exf_getffields.F : add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets |
| 8 |
|
and activate gentim2d for xx_atemp, xx_aqh, xx_swdown, xx_lwdown, xx_precip |
| 9 |
|
o pkg/exf/exf_getsurfacefluxes.F : implement gentim2d for xx_tauu, xx_tauv |
| 10 |
|
and add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets. |
| 11 |
|
o pkg/ecco/cost_forcing.F, cost_hyd.F, cost_internal_params.F : |
| 12 |
|
add .NOT.ctrlUseGen exclusive brackets -- ctrl_cost_driver |
| 13 |
|
is used instead when ctrlUseGen is .TRUE. |
| 14 |
|
o pkg/ecco/ecco_cost_final.F : print f_genarr3d to stdout |
| 15 |
|
o pkg/ctrl/ctrl_cost_driver.F : add ctrl_cost_gen3d loop |
| 16 |
|
o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F, |
| 17 |
|
pkg/shelfice/shelfice_thermodynamics.F, |
| 18 |
|
verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F, |
| 19 |
|
verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F : |
| 20 |
|
- add weight in CTRL_GET_GEN calls |
| 21 |
|
o pkg/ctrl : |
| 22 |
|
- ctrl_get_gen.F : add weight as input parameter, and apply |
| 23 |
|
it directly rather than using smooth_correl2Dw (to be retired). |
| 24 |
|
- ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call |
| 25 |
|
o pkg/ctrl : |
| 26 |
|
- CTRL_GENARR.h : add xx_gentim2d_numsmooth |
| 27 |
|
- ctrl_cost_driver.F : bug fix (iarr, not 1) |
| 28 |
|
- ctrl_init.F : bug fix (missing iarr) |
| 29 |
|
- ctrl_readparms.F : add xx_gentim2d_numsmooth, improve numsmooth defaults |
| 30 |
|
- ctrl_summary.F : improved report of controls settings |
| 31 |
|
o pkg/ecco/ecco_cost_final.F : add genarr2d, genarr3d cost contributions |
| 32 |
|
o pkg/ctrl : |
| 33 |
|
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F, |
| 34 |
|
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F) |
| 35 |
|
- re-activate ctrl_summary (call in ctrl_init.F) |
| 36 |
|
o pkg/ctrl/ctrl_cost_gen.F : |
| 37 |
|
- rename ctrl_cost_gen2d input parameters {wmean_gen,wgen,genmask} |
| 38 |
|
as {xx_gen_wmean,xx_gen_weight,xx_gen_mask} |
| 39 |
|
- add ctrl_cost_gen3d for ARR3D (ctrl_cost_gen2d is for ARR2D,TIM2D) |
| 40 |
|
o pkg/ctrl/CTRL_GENARR.h : |
| 41 |
|
- add objf_genarr2d, num_genarr2d, mult_genarr2d |
| 42 |
|
- add objf_genarr3d, num_genarr3d, mult_genarr3d |
| 43 |
|
- add wgenarr2d, wgenarr3d |
| 44 |
|
o pkg/ctrl/ctrl_readparms.F : |
| 45 |
|
- add mult_genarr2d,mult_genarr3d in namelist |
| 46 |
|
o pkg/ctrl_map_ini_genarr.F : |
| 47 |
|
- bug fixes |
| 48 |
|
o pkg/ctrl/ctrl_cost_driver.F : |
| 49 |
|
- remove un-necessary cal.h, fix CCP brackets, remove un-necessary |
| 50 |
|
myiter, mytime, add return |
| 51 |
|
o pkg/ctrl/ctrl_cost_gen.F : |
| 52 |
|
- fix CCP brackets, remove un-necessary myiter, mytime |
| 53 |
|
o pkg/ecco : |
| 54 |
|
- remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) |
| 55 |
|
- remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) |
| 56 |
|
- update cost_forcing_gen calls in cost_forcing.F |
| 57 |
|
- update cost_genctrl call in ecco_cost_driver.F |
| 58 |
|
- update ecco_ad_diff.list accordingly |
| 59 |
|
o pkg/ctrl : |
| 60 |
|
- add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F) |
| 61 |
|
- add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F) |
| 62 |
|
- update ctrl_ad_diff.list accordingly |
| 63 |
|
|
| 64 |
|
checkpoint65d (2014/09/15) |
| 65 |
|
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F : |
| 66 |
|
- add xx_genarr2d_bounds,xx_genarr3d_bounds, |
| 67 |
|
xx_genarr2d_numsmooth, xx_genarr3d_numsmooth |
| 68 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : |
| 69 |
|
- remove compilation failure |
| 70 |
|
- replace hard coded example |
| 71 |
|
- use ctrl_map_ini_gen2D, 3D |
| 72 |
|
o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F : |
| 73 |
|
- on/off switch based upon xx_genarr2d_weight,3d |
| 74 |
|
o src/packages_init_variables.F : |
| 75 |
|
- regroup pkg/estimation calls |
| 76 |
|
- remove CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
| 77 |
|
(moved to ctrl_init_variables) |
| 78 |
|
o cost/cost_init_varia.F : |
| 79 |
|
- remove ecco_cost_init_varia |
| 80 |
|
(moved to ecco_init_varia) |
| 81 |
|
o ctrl/ctrl_init_variables.F : |
| 82 |
|
- add CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
| 83 |
|
- add CTRL_MAP_INI_GENARR, SEAICE_CTRL_MAP_INI |
| 84 |
|
o ctrl/ctrl_map_ini.F : |
| 85 |
|
- remove ctrl_map_ini_genarr, seaice_ctrl_map_ini |
| 86 |
|
(moved to ctrl_init_variables) |
| 87 |
|
o ctrl/ctrl_map_ini_ecco.F : |
| 88 |
|
- remove ECCO_PHYS (mv to ecco_init_varia) |
| 89 |
|
- remove seaice_ctrl_map_ini (mv to ctrl_init_variables) |
| 90 |
|
o ecco/ecco_ad_diff.list : |
| 91 |
|
- add ecco_init_varia.f |
| 92 |
|
o ecco/ecco_init_varia.F |
| 93 |
|
- new routine |
| 94 |
|
o pkg/streamice: |
| 95 |
|
- move call to STREAMICE_INITIALIZE_PETSC from the_model_main.F |
| 96 |
|
to streamice_init_fixed.F ; fix setting of STREAMICEisOn. |
| 97 |
|
- from model/src, only call pkg/streamice routines if useStreamIce is TRUE. |
| 98 |
|
o pkg/generic_advdiff: |
| 99 |
|
- fix bug causing negatives in GAD_SMOLARKIEWICZ_HACK, introduced 8/8/2014. |
| 100 |
|
o pkg/exf: |
| 101 |
|
- exf_getffields.F : add xxg_atemp, xxg_aqh, xxg_swdown, xxg_lwdown, |
| 102 |
|
xxg_precip capability |
| 103 |
|
- exf_wind.F : no need for ALLOW_WSPEED_CONTROL cpp switch |
| 104 |
|
o pkg/ctrl: |
| 105 |
|
- ctrl_pack.F, ctrl_unpack.F : omit (un)packing of undefined xx_gentim2d |
| 106 |
|
o model/src/load_fields_driver.F : |
| 107 |
|
- move call to CTRL_MAP_GENTIM2D ahead of BULKF_FIELDS_LOAD, EXF_GETFORCING |
| 108 |
|
so xx_gentim2d can be applied to e.g. exf fields in a timely manner. |
| 109 |
|
o OpenAD verification experiments: |
| 110 |
|
- Include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, and CTRL_OPTIONS.h |
| 111 |
|
in src files (to enable to skip the ECCO_CPPOPTIONS.h); |
| 112 |
|
for now, only in pkgs used in OpenAD verification experiments. |
| 113 |
|
- Change all except one (halfpipe_streamice) OpenAD experiments to use pkg |
| 114 |
|
specific option file (AUTODIFF_OPTIONS.h, COST_OPTIONS.h & CTRL_OPTIONS.h) |
| 115 |
|
instead of using ECCO_CPPOPTIONS.h (with all relevant options in it). |
| 116 |
|
This applies to both TAF (*/code_ad/) and OpenAD (*/code_oad/) tests. |
| 117 |
|
o OpenAD verification tests: |
| 118 |
|
- finish removing ALLOW_AUTODIFF_OPENAD (replaced by ALLOW_OPENAD); |
| 119 |
|
- finish replacing ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for |
| 120 |
|
tape/storage which are specific to TAF/TAMC) in pkgs used in OpenAD exp. |
| 121 |
|
- leave ALLOW_AUTODIFF_TAMC undef in OpenAD verification tests (*/code_oad/) |
| 122 |
|
and remove local copy of "tamc.h" (needed only if ALLOW_AUTODIFF_TAMC). |
| 123 |
|
o model/src & generic_advdiff: |
| 124 |
|
- change hard-coded loop-range in S/R APPLY_FORCING_T/S to set T & S |
| 125 |
|
forcing over 0:sNx+1, 0:sNy=1 (instead of just 1:sNx,1:sNy): Model |
| 126 |
|
dynamics requires valid tracer forcing only over tile interior but, for |
| 127 |
|
some diagnostics, may need to extend it over 1 point in tile halo region. |
| 128 |
|
- in gad_calc_rhs.F, update calls to gmredi_x/ytransport to get valid |
| 129 |
|
tendency over i,j_Min,Max range. This allows to simplfy i,j_Min,Max |
| 130 |
|
setting in temp/salt/ptracer_integrate.F |
| 131 |
|
o pkg/dic: |
| 132 |
|
- multiply tracer tendencies by maskInC (if ussing OBCS) before updating |
| 133 |
|
gchem tracers: this allows to skip the 2nd call to OBCS_APPLY_PTRACER |
| 134 |
|
in gchem_forcing_sep.F |
| 135 |
|
o pkg/autodiff & obcs: |
| 136 |
|
- add storage of current OB values for U & V (was already done for T & S). |
| 137 |
|
|
| 138 |
|
checkpoint65c (2014/08/30) |
| 139 |
|
o pkg/dic: |
| 140 |
|
- take out of dic_atmos.F the initialisation part (corresponding to istate=0) |
| 141 |
|
and move it to new S/R DIC_INI_ATMOS ; also simplify the dependencies for |
| 142 |
|
AD compilers (but still a Pb with multi-threading and Ajoint dependencies). |
| 143 |
|
o verification: |
| 144 |
|
- new experiment testing OBCS and DIC pkgs, using params & output from |
| 145 |
|
tutorial_global_oce_biogeo but limited to a sub-domain around Drake |
| 146 |
|
passage: take OBCS from the last year of a 2 yrs simulation and initial |
| 147 |
|
conditions from t=1.yr while keeping the same forcing. |
| 148 |
|
o model/src: |
| 149 |
|
- when allowFreezing=T, only reset below freezing initial Temp to Tfreezing |
| 150 |
|
(at any k) if checkIniTemp is not set to FALSE (default checkIniTemp=T). |
| 151 |
|
o pkg/diagnostics (Stats-Diags): |
| 152 |
|
- re-write S/R DIAGSTATS_CALC (more similar to TARGET_NEC_SX part) to: |
| 153 |
|
a) refine region where stats are computed, excluding where arrhFac=0 ; |
| 154 |
|
b) fix missing interior mask (use with OBCS) in 3-D fields statistics; |
| 155 |
|
c) extend regional stats over the region edges (for U or V pt location). |
| 156 |
|
o pkg/gchem: |
| 157 |
|
- add a (2nd) call to OBCS_APPLY_PTRACER in gchem_forcing_sep.F (needed since |
| 158 |
|
pkg/dic is currently changing/updating ptracers values beyond the OB). |
| 159 |
|
o verification (hs94): |
| 160 |
|
- convert Held & Suarez external_forcing.F (from hs94.cs, with Sigma-coords |
| 161 |
|
bits) to apply_forcing.F and undef USE_OLD_EXTERNAL_FORCING in experiments |
| 162 |
|
hs94.cs-32x32x5 and tutorial_held_suarez_cs ; also use the same version of |
| 163 |
|
apply_forcing.F in 2D hs94 (fwd, ad & oad) but keep LatLon hs94 unchanged. |
| 164 |
|
o pkg/ptracers: |
| 165 |
|
- implement Adams-Bashforth on pTracers (instead of on tracer tendency), |
| 166 |
|
switched on by setting PTRACERS_doAB_onGpTr=F (default set to doAB_onGtGs) |
| 167 |
|
- change exp4 secondary test (input.nlfs) to test AB on T & S & pTracer |
| 168 |
|
with AB-2 code (so that it get tested). |
| 169 |
|
o model/src: |
| 170 |
|
- allow to apply Adams-Bashforth on Temp & Salt (instead of on gT,gS) |
| 171 |
|
with AB-2 code (previously only available with AB-3 code). |
| 172 |
|
Also move the code (call to ADAMS_BASHFORTH S/R) form thermodynamics.F |
| 173 |
|
to temp/salt_integrate.F (since the 2nd part of gt/sNm1 update is done |
| 174 |
|
there, by calling CYCLE_AB_TRACER). |
| 175 |
|
o pkg/generic_advdiff: |
| 176 |
|
- change Tracer argument (drop bi,bj indices) in S/R GAD_CALC_RHS, |
| 177 |
|
GAD_C2_ADV_R, GAD_U3_ADV_R, GAD_C4_ADV_R, GAD_DIFF_R, GAD_BIHARM_R |
| 178 |
|
+ also in GMREDI_X/Y/RTRANSPORT ; and update corresponding calls in |
| 179 |
|
S/R temp/salt/ptracers_integrate.F |
| 180 |
|
o model/src & pkg/ptracers: |
| 181 |
|
- remove common block variables gT,gS (in DYNVARS.h), except when |
| 182 |
|
USE_OLD_EXTERNAL_FORCING is defined; update TAF storage accordingly. |
| 183 |
|
- remove common block variable gPtr. |
| 184 |
|
o model/src & pkgs: |
| 185 |
|
- change gTracer (and/or tracer) argument (drop bi,bj indices) in S/R |
| 186 |
|
ADAMS_BASHFORTH(2&3), CYCLE_(AB_)TRACER, FREESURF_RESCALE_G, |
| 187 |
|
IMPLDIFF, SOLVE_TRIDIAGONAL & _PENTADIAGONAL, GAD_SOM_ADVECT, |
| 188 |
|
GAD_ADVECTION, GAD_CALC_RHS, GAD_IMPLICIT_R, TIMEAVE_CUMUL_DIF_1T |
| 189 |
|
+ change accordingly all calling S/R. |
| 190 |
|
- use local temperature/salinity/ptracer tendency array (without bi,bj) |
| 191 |
|
in S/R temp/salt/ptracers_integrate.F |
| 192 |
|
o pkg/seaice: |
| 193 |
|
- move computation of stress contributions to rhsU/V in s/r seaice_lsr |
| 194 |
|
to separate s/r seaice_lsr_rhsu/v in order to be able to re-use code |
| 195 |
|
- make u/vIceC local variables if SEAICE_CGRID is defined only to be used |
| 196 |
|
in seaice_lsr |
| 197 |
|
- seaice_lsr.F: make local 4D arrays UXX, VYY, etc 2D |
| 198 |
|
in s/r seaice_lsr_calc_coeffs |
| 199 |
|
o pkg/mdsio: |
| 200 |
|
- in MDS_READ/WRITE_FIELD, stop if file-name (+prefix) is too long |
| 201 |
|
(e.g., > MAX_LEN_MBUF -90 ) or, in INI_MODEL_IO, if mdsioLocalDir is |
| 202 |
|
too long (e.g., > MAX_LEN_FNAM/2 ) |
| 203 |
|
|
| 204 |
|
checkpoint65b (2014/08/12) |
| 205 |
|
o pkg/matrix: |
| 206 |
|
- pass, as argument, updated tracer field to S/R MATRIX_STORE_TENDENCY_EXP |
| 207 |
|
o model/src: |
| 208 |
|
- fix initialisation of geothermalFile; compile geothermal-flux code in |
| 209 |
|
natl_box verification experiment. |
| 210 |
|
o model/src & pkg/down_slope: |
| 211 |
|
- push the k loop inside S/R TIMESTEP_TRACER (now called outside the k loop). |
| 212 |
|
- in dwnslp_apply.F, update tracer tendency instead of the future tracer |
| 213 |
|
field and call S/R DWNSLP_APPLY before TIMESTEP_TRACER; this affects |
| 214 |
|
results at machine truncation level: update output of experiments |
| 215 |
|
global_ocean.90x40x15.dwnslp (FWD) and lab_sea.noseaicedyn (AD). |
| 216 |
|
o pkg/diagnostics (Stats-Diags): |
| 217 |
|
- do not cumulate the full volume when DIAGNOSTICS_FILL is |
| 218 |
|
called with bibjFlg < 0 (no increment of the counter for 2D/3D diag); |
| 219 |
|
This fix the mean statistics when DIAGNOSTICS_FILL is called multiple |
| 220 |
|
times (but Min,Max and StD are still wrong). |
| 221 |
|
o model/src: |
| 222 |
|
- add geothermal flux forcing: read in ini_forcing.F as time-constant |
| 223 |
|
field "geothermalFlux" applied in S/R APPLY_FORCING_T (apply_forcing.F) |
| 224 |
|
o model/src: |
| 225 |
|
- move CYCLE_TRACER calls from tracers_correction_step.F to temp/salt/ptracer |
| 226 |
|
_integrate.F so that, when leaving S/R THERMODYANMICS, theta,salt and pTrac |
| 227 |
|
arrays are already updated while adjustments (filters, conv.adjustment) are |
| 228 |
|
still applied later, in S/R TRACERS_CORRECTION_STEP. |
| 229 |
o model/src: |
o model/src: |
| 230 |
- store in common bloc array "rhoInSitu" the virtual potential temperature |
- store in common bloc array "rhoInSitu" the virtual potential temperature |
| 231 |
anomaly that is used to compute geopotential: this make the atmos code |
anomaly that is used to compute geopotential: this make the atmos code |
| 304 |
- collect T & S forcing tendency into local 2-D array (passed as argument to |
- collect T & S forcing tendency into local 2-D array (passed as argument to |
| 305 |
apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency. |
apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency. |
| 306 |
affects results at machine truncation level (e.g., ocean: if using |
affects results at machine truncation level (e.g., ocean: if using |
| 307 |
SHORTWAVE_HEATING and atmos:, if using FrictionHeating or (atm_Rq<>0) |
SHORTWAVE_HEATING ; atmos: if using FrictionHeating or (atm_Rq<>0) moist |
| 308 |
moist correction due to vertical advection). |
correction due to vertical advection). |
| 309 |
- update output of experiments: fizhi-cs-32x32x40 (13 digits), |
- update output of experiments: fizhi-cs-32x32x40 (13 digits), |
| 310 |
global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml: |
global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml: |
| 311 |
seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13), |
seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13), |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch