| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o model/src & most packages: |
| 8 |
|
- always call {PKG}_READPARMS even if corresponding use{PKG}=F; |
| 9 |
|
- in {PKG}_READPARMS, in case use{PKG}=F: add a call to new S/R |
| 10 |
|
PACKAGES_UNUSED_MSG to print a weak warning when parameter file |
| 11 |
|
"data.{pkg}" exist ; and leave the S/R (return) just after. |
| 12 |
|
o pkg/seaice: |
| 13 |
|
- remove code that resets useThSice in S/R seaice_readparms and |
| 14 |
|
replace by a warning in S/R seaice_check |
| 15 |
|
- remove parameter MULTDIM, replace with nITD and runtime |
| 16 |
|
parameter SEAICE_multDim (still hard-wired to nITD if |
| 17 |
|
SEAICE_ITD is defined) |
| 18 |
|
|
| 19 |
|
checkpoint64x (2014/05/24) |
| 20 |
|
o verification/lab_sea: |
| 21 |
|
- update adjoint and TLM output following changes to pkg/salt_plume |
| 22 |
|
- un-do the update after putting back local recip_Cp in few places. |
| 23 |
|
o pkg/salt_plume: modifications by An Nguyen: |
| 24 |
|
- add capability to do brine rejection (salt-plume) as function of |
| 25 |
|
volume+tracers (instead of only salinity tracer). |
| 26 |
|
- conserve volume by exchanging volume from each kLev to above to |
| 27 |
|
accommodate in-coming brine volume |
| 28 |
|
- store surface and klev exchanged fraction + volume in 4 new 3-d arrays |
| 29 |
|
- switch KPP surf buoyancy due to brine forcing to 3-d |
| 30 |
|
(3 more 3-d arrays, 2 for SPforcing[T,S], 1 for boplume) |
| 31 |
|
- add salt_plume_volfrac, salt_plume_apply, salt_plume_tendency_apply_t |
| 32 |
|
- unrelatedly, also add ad-hoc capability to vary salt_plume scheme |
| 33 |
|
in East/West Arctic. |
| 34 |
|
o pkg/sbo: |
| 35 |
|
- incorporate modifications from Katherine Quinn to enable the use of sbo |
| 36 |
|
pkg in ECCO-v4 set-up ; remove SBO-TimeAve output ; add monitor-like |
| 37 |
|
output for future testreport verification (unfinished). |
| 38 |
|
o pkg/atm_phys: |
| 39 |
|
- change diagnostics (AtPh_Trf & AtPh_Qrf) of DARGAN_BETTSMILLER S/R: |
| 40 |
|
skip the reseting of t_ref & q_ref to initial t & q ; this preserve the |
| 41 |
|
output of S/R CAPECALCNEW (Parcel temp & q) for diagnostics. |
| 42 |
|
o pkg/seaice |
| 43 |
|
seaice_calc_ice_strength.F: modify expression to avoid divisions |
| 44 |
|
(affects truncation) |
| 45 |
|
seaice_do_ridging.F: clean up the insectarium |
| 46 |
|
- fix a bug that was compensated by areaScaling (-> remove areaScaling code) |
| 47 |
|
- added SEAICEsnowFracRidge to redistributed snow (2nd bug) |
| 48 |
|
- set closing/openingRate to zero where no extra iteration is need (3rd bug) |
| 49 |
|
- add some debugging information and error messages (warnings) |
| 50 |
|
o model/src: modifications relatd to atmosphere p*: |
| 51 |
|
- Switch to more accurate p* coordinate slope term (calc_grad_phi_hyd.F) |
| 52 |
|
- With p* or Sigma-P, use constant reference Pot.Temp (thetaConst) instead |
| 53 |
|
of vertical profile tRef in geopotential background and anomaly. |
| 54 |
|
- Acount for true p* correction in theta <-> T conversion in pkg/aim_v23 |
| 55 |
|
and pkg/atm_phys. |
| 56 |
|
- Update FWD output of experiments: aim.5l_cs (x2), fizhi-cs-32x32x40, |
| 57 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, tutorial_held_suarez_cs, cpl_aim+ocn. |
| 58 |
|
o pkg/seaice: fix a bug in seaice_prepare_ridging.F, forgot a sqrt |
| 59 |
|
o pkg/ptracers: compute ptracer source/sink due to linear free surface. |
| 60 |
|
not used right now, but can be used in BGC packages to fix conservation. |
| 61 |
|
o pkg/dic, pkg/gchem: move tracer_meanarea to gchem, so it can be used by |
| 62 |
|
other packages too. |
| 63 |
|
o pkg/seaice/seaice_calc_ice_strength.F: replace SEAICE_rhoSnow by |
| 64 |
|
SEAICE_rhoIce in the Rothrock (1975)-type strength calculations (bug fix) |
| 65 |
|
o model/src: |
| 66 |
|
- since we have several heat capacity (even in model/src), define "recip_Cp" |
| 67 |
|
as local variable (no longer in common block) to avoid any confusion. |
| 68 |
|
- add thetaConst in PARAMS.h (to be used with pStar or sigma-P coords). |
| 69 |
|
o pkg/exf: |
| 70 |
|
- from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local |
| 71 |
|
air density as function of air Temp, Humidity and atm pressure. |
| 72 |
|
|
| 73 |
|
checkpoint64w (2014/05/02) |
| 74 |
|
o verification: |
| 75 |
|
- update output_adm.txt files for experiment global_ocean.cs32x15 (seaice & |
| 76 |
|
seaice_dynmix) and lab_sea (primary test & noseaicedyn): moving/changing |
| 77 |
|
code from seaice_growth.F & seaice_advdiff.F to new ridging routines |
| 78 |
|
seaice_reg_ridge.F seaice_do_ridging.F affects AD gradient |
| 79 |
|
(down to 8-7 matching digits for global_ocean and 5-6 for lab_sea). |
| 80 |
|
o model/src: for atmosphere in p* coords: |
| 81 |
|
- store factor rStarFacC**atm_kappa (= pStarFacK) in common block |
| 82 |
|
- implement more accurate p* coordinate slope term (in calc_grad_phi_hyd.F), |
| 83 |
|
but not yet activated. |
| 84 |
|
o pkg/seaice: fix restart problem for ITD with new ice strength parameterisation: |
| 85 |
|
- move computation of opnWtrFrac = 1-AREA to before computing ice strength |
| 86 |
|
- this changes the results (but not for any verification experiment, because |
| 87 |
|
none tests this), but avoids having an extra field in the restart files |
| 88 |
|
o pkg/seaice: remove global variable TICE (not needed) |
| 89 |
|
- replace by TICES or local variable where necessary (cost_seaice_test, |
| 90 |
|
seaice_diagnostics_state) |
| 91 |
|
- move copying TICE to TICES from seaice_check_pickup to seaice_read_pickup |
| 92 |
|
- use specific read/write routines for reading and writing individual leves |
| 93 |
|
of a multilevel field |
| 94 |
|
o pkg/ctrl & model/inc: |
| 95 |
|
- move additional anomaly fields of control vars (related to options: |
| 96 |
|
ALLOW_KAPGM_CONTROL, ALLOW_KAPREDI_CONTROL and ALLOW_BOTTOMDRAG_CONTROL) |
| 97 |
|
from DYNVARS.h into new header file: CTRL_FIELDS.h |
| 98 |
|
o pkg/seaice: some small modifications to the ridging code |
| 99 |
|
- make fw2ObyRidge a global variable and add the freshwater flux to |
| 100 |
|
seaice_growth |
| 101 |
|
- pass actual thickness from seaice_prepare_ridging, so that it is |
| 102 |
|
computed only in one place and compute it in the same way as in |
| 103 |
|
seaice_growth |
| 104 |
|
- initialise more fields in seaice_do_ridging that where cause floating |
| 105 |
|
point exceptions over land |
| 106 |
|
o pkg/seaice: preparations for ridging code and first real ridging code |
| 107 |
|
- move most of "PART 1" of S/R seaice_growth into a new and separate |
| 108 |
|
S/R seaice_reg_ridge that will both regularize the state variable after |
| 109 |
|
advection call the actual ridging routine; |
| 110 |
|
- requires to make 5 fields global fields: d_HEFFbyNEG,d_HSNWbyNEG, |
| 111 |
|
d_AREAbyRLX,d_HEFFbyRLX,saltFluxAdjust; |
| 112 |
|
- remove ridging code from seaice_advdiff |
| 113 |
|
- clean up remaining part 1 of seaice_growth in an attempt to make it |
| 114 |
|
more readable (this is probably subjective) |
| 115 |
|
- call seaice_itd_redist once in the initialisation phase to have the initial |
| 116 |
|
conditions in the correct category |
| 117 |
|
- finally: add new ridging routine for ITD code |
| 118 |
|
|
| 119 |
|
checkpoint64v (2014/04/11) |
| 120 |
|
o pkg/ecco: |
| 121 |
|
- add runtime parameters mdt[start,end]date[1,2] |
| 122 |
|
- rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile" |
| 123 |
|
o pkg/seaice: |
| 124 |
|
- make deltaC a global variable, so that it can be used in ridging code |
| 125 |
|
- first step towards ridging: introduce new routines that compute |
| 126 |
|
ice strength based on ridging parameters |
| 127 |
|
- add diagnostic for HSNOWITD |
| 128 |
|
- add opnWtrFrac as a global variable (required for ridging scheme) |
| 129 |
|
o pkg/salt_plume + pkg/seaice/seaice_growth.F |
| 130 |
|
- add SALT_PLUME_IN_LEADS flag to activate pkg/salt_plume only when ice |
| 131 |
|
AREA exceeds a threshold (code contributed by I.Fenty in 2011) |
| 132 |
|
o verification/hs94.1x64x5: |
| 133 |
|
- leave ALLOW_AUTODIFF_TAMC undefined in code_oad/AUTODIFF_OPTIONS.h |
| 134 |
|
- do not use ECCO_CPPOPTIONS.h anymore for TAF & OpenAD Adjoint tests. |
| 135 |
|
o autodiff: |
| 136 |
|
- Start to include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, |
| 137 |
|
and CTRL_OPTIONS.h in src files (to enable to skip the ECCO_CPPOPTIONS.h) |
| 138 |
|
For now, only in pkgs used in verification/hs94.1x64x5. |
| 139 |
|
- Replace ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for tape/storage |
| 140 |
|
which are specific to TAF/TAMC). |
| 141 |
|
- Replace ALLOW_AUTODIFF_OPENAD by ALLOW_OPENAD: |
| 142 |
|
since ALLOW_OPENAD is defined in PACKAGES_CONFIG.h (any time pkg/openad |
| 143 |
|
is compiled), this simplifies/reduces which *_OPTIONS.h file to include. |
| 144 |
|
- OpenAD: change Makefile to generate the appropriate AD_CONFIG.h when |
| 145 |
|
building mitgcmuv_ad (make adAll). |
| 146 |
|
o pkg/ecco: |
| 147 |
|
- cost_gencost_seaicev4.F: |
| 148 |
|
reformulate proxy cost as function of sst and local param SEAICE_freeze |
| 149 |
|
change cost names from siv4-[sst,vol] to siv4-[deconc,exconc] |
| 150 |
|
- add stop statement if old names siv4-[sst,vol] are used |
| 151 |
|
- add snapshots + cost reports for atmospheric longwave |
| 152 |
|
- remove factor 0.1 in front of wtau[u,v] |
| 153 |
|
- replace never used flag ALLOW_TMI_COST_CONTRIBUTION with |
| 154 |
|
ALLOW_TMI_SST_COST_CONTRIBUTION |
| 155 |
|
o pkg/atm_phys: |
| 156 |
|
- add some diagnostics for Short-wave and for convection S/R. |
| 157 |
|
o pkg/seaice/seaice_growth: |
| 158 |
|
- fix a bug in the lateral melt parameterization for SEAICE_ITD |
| 159 |
|
in seaice_growth; tempFrz needs to be computed inside the i/j-loop |
| 160 |
|
- rearrange loop order for better vector code in the same code block |
| 161 |
|
- rewrite the floeDiameter formula to have fewer divisions |
| 162 |
|
- (miraculously) none of this changes the results of seaice_itd |
| 163 |
|
o pkg/smooth: |
| 164 |
|
- move param smooth2Ddiffnbt to pkg/ecco |
| 165 |
|
o pkg/salt_plume: |
| 166 |
|
- salt_plume_frac.F: |
| 167 |
|
clean up local param names |
| 168 |
|
reformulate (1-frac) to frac; original 1-frac was based on swfrac code |
| 169 |
|
o pkg/rw: |
| 170 |
|
- add RS version of S/R READ_MFLDS_LEV. |
| 171 |
|
o pkg/streamice: |
| 172 |
|
- fix the restart test by writing/reading pickup_streamice files. |
| 173 |
|
o pkg/seaice: |
| 174 |
|
- refine checks for jfnk-related parameters |
| 175 |
|
- comment out if statement with SEAICEuseIMEX parameter as long as there |
| 176 |
|
is no IMEX code to avoid confusion and surprises |
| 177 |
|
|
| 178 |
|
checkpoint64u (2014/03/07) |
| 179 |
|
o verification/MLAdjust: |
| 180 |
|
- rename secondary test suffix: |
| 181 |
|
1.leith -> A4FlxF + switch to flux-form & add side-drag |
| 182 |
|
0.leithD -> AhFlxF + switch to flux-form |
| 183 |
|
0.smag -> AhVrDv (use Vorticity-Div. visc form) + add side-drag |
| 184 |
|
0.leith -> AhStTn (use Strain-Tension visc form) + add side-drag |
| 185 |
|
o pkg/mom_vecinv: |
| 186 |
|
- remove unused arguments from S/R MOM_VI_HDISSIP & MOM_HDISSIP (as it used |
| 187 |
|
to be before mom_calc_visc.F) |
| 188 |
|
- skip the call to MOM_CALC_TENSION & MOM_CALC_STRAIN if not needed. |
| 189 |
|
- add 2nd copy of vort3 & strain that knows about lateral BC (free/no slip): |
| 190 |
|
this is simpler for the adjoint and for diagnostics. |
| 191 |
|
o model/src + pkg/momentum: |
| 192 |
|
- add input files for 2-D additional Western and Southern cell-edge wall |
| 193 |
|
(e.g., to add "thin-wall" where it is =1). |
| 194 |
|
- fix sideDrag option for thin-walls with Non-Lin Free-Surf |
| 195 |
|
using 2nd hFacZ that is computed from initial (fix domain) hFac |
| 196 |
|
- known limitations of thin wall implementation: not yet coded for sigma |
| 197 |
|
coords; not working with CD-scheme neither. |
| 198 |
|
o pkg/seaice: |
| 199 |
|
- rename recently introduced parameters from (wrong name) AB to |
| 200 |
|
BDF (backward difference time discretisation) |
| 201 |
|
- retire runtime parameters SEAICEuseAB2, SEAICE_abEps |
| 202 |
|
o tools/adjoint_options: |
| 203 |
|
- remove setting of "OPENAD=true" (now set by command line "genmake2 -oad") |
| 204 |
|
|
| 205 |
|
checkpoint64t (2014/02/01) |
| 206 |
|
o pkg/ecco |
| 207 |
|
- add compile flag ALLOW_GENCOST_TIMEVARY_WEIGHT in ECCO_OPTIONS.h and |
| 208 |
|
runtime logical flag gencost_timevaryweight to read daily sea-ice sigma |
| 209 |
|
- replace hard-coded record number and period which only work for monthly |
| 210 |
|
with read-in runtime param that works for other periods (month,day,year) |
| 211 |
|
o pkg/thsice |
| 212 |
|
- corrected store directive fixes thsice adjoint gradient checks |
| 213 |
|
o genmake2 & testreport: |
| 214 |
|
- add genmake2 option "-oad" to generate a Makefile for OpenAD built and |
| 215 |
|
in this case, use tools/adjoint_options/adjoint_oad as default AD optfile. |
| 216 |
|
Update testreport accordingly. No need to set "export OPENAD=true" |
| 217 |
|
in adjoint_options/adjoint_oad anymore (will be removed later). |
| 218 |
|
o pkg/shelfice: |
| 219 |
|
- put T & S shelfice forcing into model surfaceForcing_T,_S (for now, |
| 220 |
|
only if SHELFICEboundaryLayer=F); Change model/src/external_forcing.F |
| 221 |
|
so that surface forcing applies to k=kSurf if using pkg/shelfice. |
| 222 |
|
o pkg/ctrl, pkg/grdchk, pkg/ecco: |
| 223 |
|
- Changes to make GENARR more modular (i.e. invisible if not used) |
| 224 |
|
o model/src/temp_integrate.F and salt_integrate.F |
| 225 |
|
- re-include store directives that were removed on Dec 27th. |
| 226 |
|
o model/src/external_forcing_surf.F |
| 227 |
|
- add storage directives for EmPmR and PmEpR to avoid recomputation of |
| 228 |
|
seaice_model in the adjoint that is problematic when seaice_model is |
| 229 |
|
turned off in the adjoint. The resolved issue dated back to July when |
| 230 |
|
EXTERNAL_FORCING_SURF call was moved. |
| 231 |
|
Update global_ocean.cs32x15/*/output_adm.seaice_dynmix.txt accordingly. |
| 232 |
|
o pkg/exf/exf_check.F |
| 233 |
|
- fix a small bug again (originally found by Wentao Liu, now found again) |
| 234 |
|
- streamline error output |
| 235 |
|
o pkg/streamice and aim_v23: |
| 236 |
|
- replace a few "_EXCH_XY_RL (" with "_EXCH_XY_RL(", so that |
| 237 |
|
Apple's /usr/bin/cpp knows what to do: |
| 238 |
|
Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
| 239 |
|
Target: x86_64-apple-darwin13.0.0 |
| 240 |
|
|
| 241 |
|
checkpoint64s (2014/01/05) |
| 242 |
|
o tools/adjoint_options: |
| 243 |
|
- switch to fastopt.net TAF server (instead of default fastopt.de) for |
| 244 |
|
AD optfiles adjoint_diva & adjoint_f95 (similar to adjoint_default). |
| 245 |
|
o model/src: |
| 246 |
|
- remove some unnecessary TAF storage directives in forward_step.F and |
| 247 |
|
in dynamics.F (note: not always removed by TAF, e.g., double storage |
| 248 |
|
of kappaRU,kappaRV in former version of dynamics.F). |
| 249 |
|
o model/src & pkg/ptracers: |
| 250 |
|
- call directly GAD_IMPLICIT_R & IMPLDIFF + DWNSLP_APPLY from temp_integrate.F |
| 251 |
|
salt_integrate.F and ptracers_integrate.F (instead of from thermodynamics.F) |
| 252 |
|
and remove ptracers_dwnslp_apply.F & ptracers_implicit.F |
| 253 |
|
- call MATRIX_STORE_TENDENCY_EXP for each tracer (in ptracers_integrate.F) |
| 254 |
|
- add fZon & fMer as output argument of S/R GAD_CALC_RHS. |
| 255 |
|
- update TAF AD-output of experiments global_ocean.90x40x15 (13 for AD-grad). |
| 256 |
|
o useSingleCpuInput separates single-CPU input from single-CPU output; |
| 257 |
|
for now only implemented for in exf_interp_read.F |
| 258 |
|
o verification/advect_xy: |
| 259 |
|
- fix missing EXCH call in local version of ini_salt.F and update output. |
| 260 |
|
o momentum diagnostics: |
| 261 |
|
- fix which deltaT is used in Total-Tendency diagnostics. |
| 262 |
|
- fix typo in diagnostics for momentum tendency from AB. |
| 263 |
|
o pkg/seaice/seaice_lsr.F: fix an initialisation bug for the |
| 264 |
|
SEAICE_VECTORIZE_LSR_ZEBRA option that lead to NaNs on a NEC-SX8 |
| 265 |
|
|
| 266 |
|
checkpoint64r (2013/12/08) |
| 267 |
|
o verification/*/results: |
| 268 |
|
- Update reference output of experiments that were passing with just 13 digits |
| 269 |
|
(make it easier to detect future changes in results) |
| 270 |
|
o model/src & pkg/ptracers: |
| 271 |
|
- move calls to GAD_ADVECTION (Multi-Dim advection) from thermodynamics.F to |
| 272 |
|
inside temp_integrate.F and salt_integrate.F and from ptracers_advection.F |
| 273 |
|
to inside ptracers_integrate.F ; remove ptracers_advection.F |
| 274 |
|
o coupling interface pkgs: |
| 275 |
|
[atm_compon_interf, ocn_compon_interf & atm_ocn_coupler] |
| 276 |
|
- change the config check to test the agreement of Ocean Depth |
| 277 |
|
with ATM land/sea mask (instead of ATM orography); |
| 278 |
|
- send to coupler the number of coupler time-steps to do for this run: |
| 279 |
|
this allows to check for consistency and don't need anymore to be |
| 280 |
|
specified in parameter file "data"; |
| 281 |
|
in coupler: |
| 282 |
|
- check consistency of RunOff map versus Ocean Depth and ATM land/sea mask. |
| 283 |
|
- improve report to log-file of config setting (pass log-file unit to few S/R) |
| 284 |
|
o pkg/compon_communic: |
| 285 |
|
- add coupling send/receive for non-tiled integer vector; |
| 286 |
|
- add S/R to check and stop if any proc has an error (similar to |
| 287 |
|
eesupp/src/stop_if_error.F but single thread and across Comm_World). |
| 288 |
|
o pkg/exch2: |
| 289 |
|
- in exch2*_get_rx[1,2]: use new list "W2_tileIndex" to replace search |
| 290 |
|
through list of all tiles my proc owns. |
| 291 |
|
o model/src: |
| 292 |
|
- AUTODIFF only: in calc_adv_flow.F, recompute rTransKp (instead of copying |
| 293 |
|
from rTrans) to simplify dependencies (no need to store rTrans anymore in |
| 294 |
|
calling S/R); this affects AD results at machine truncation level: |
| 295 |
|
update AD-output (TAF) of experiments: 1D_ocean_ice_column, |
| 296 |
|
bottom_ctrl_5x5 & obcs_ctrl (12 digits for AD grad, same FWD grad). |
| 297 |
|
o tools/build_options: |
| 298 |
|
- simplify Warnings options (-ieee & -devel cases) in linux_amd64_gfortran |
| 299 |
|
o coupling interface pkgs: |
| 300 |
|
[compon_communic, atm_compon_interf & ocn_compon_interf] |
| 301 |
|
- move declaration of local array "ibuf" out of header file "CPLR_SIG.h" |
| 302 |
|
to each S/R that needs it; remove un-used variables. |
| 303 |
|
- change component tile registration (cpl_register.F in both compon_interf |
| 304 |
|
and mitcomponent_tile_register.F) to pass the full list of tiles |
| 305 |
|
information (including bi,bj) in 1 vector (instead of in a bi,bj matrix). |
| 306 |
|
- with pkg/exch2: adopt the same convention used for I/O to define mapping |
| 307 |
|
towards coupler global array (unless W2_useE2ioLayOut=F): |
| 308 |
|
a) can now use different tiling between atm & ocn comp. |
| 309 |
|
b) no needs to modify the run-Off map when changing tiling (was needed |
| 310 |
|
even if using the same tiling between atm & ocn). |
| 311 |
|
c) will allow to run with blank-tiles in 1 component (e.g., for ocean |
| 312 |
|
full land tiles); not yet tested. |
| 313 |
|
- check for valid mapping from comp. tile to coupler global array |
| 314 |
|
- improve report of tile registration results to log file. |
| 315 |
|
o pkg/exch2: |
| 316 |
|
- in eesupp/src/eeboot.F: move call to W2_EEBOOT before Coupler |
| 317 |
|
tile-registration (CPL_REGISTER); |
| 318 |
|
- activate (un-comment) definition and setting of "W2_tileIndex" list to |
| 319 |
|
store the local bi,bj indices of each tile; |
| 320 |
|
- also print bi,bj in local report to log file; |
| 321 |
|
- fix pkg/debug/debug_cs_corner_uv.F for the case nSy > 1 (left from |
| 322 |
|
Jun 2009 modif of pkg/exch2). |
| 323 |
|
o testing on baudelaire: |
| 324 |
|
- run 2 tests at a time: no significant slow down (since enough cpu) and |
| 325 |
|
get the full set of test done earlier |
| 326 |
|
- switch the ifort test to "-devel" ; run the OpenAD test everyday. |
| 327 |
|
o model/src/thermodynamics.F and routines called from it: |
| 328 |
|
- pkg/gmredi: gmredi_residual_flow.F (replacing gmredi_calc_uvflow.F & |
| 329 |
|
gmredi_calc_wflow.F) to update eulerian velocity (input) into residual |
| 330 |
|
velocity (outp) by adding bolus velocity. |
| 331 |
|
- model/src: calc_adv_flow.F (replacing calc_common_factors.F) to compute |
| 332 |
|
mass transport from velocity + lateral grid cell area |
| 333 |
|
- rename calc_gt.F to temp_integrate.F (includes call to TIMESTEP_TRACER) |
| 334 |
|
- rename calc_gs.F to salt_integrate.F (includes call to TIMESTEP_TRACER) |
| 335 |
|
in thermodynamics.F |
| 336 |
|
- remove k from thermodynamics.F and move it to temp_integrate.F |
| 337 |
|
salt_integrate.F and ptracers_integrate.F (now done inside the tracer |
| 338 |
|
loop). |
| 339 |
|
- compute locally (in thermodynamics.F) 3-D velocity field that is used to |
| 340 |
|
advect tracers; pass it as argument to GAD_ADVECTION, GAD_SOM_ADVECT, |
| 341 |
|
PTRACERS_ADVECTION, TEMP_INTEGRATE, SALT_INTEGRATE, PTRACERS_INTEGRATE, |
| 342 |
|
GAD_IMPLICIT_R and PTRACERS_IMPLICIT |
| 343 |
|
- update AD-output (TAF & OAD) of experiments: 1D_ocean_ice_column, |
| 344 |
|
global_ocean.90x40x15, tutorial_global_oce_biogeo and |
| 345 |
|
tutorial_tracer_adjsens (+ TLM output). |
| 346 |
|
o tools/OAD_support and (verification/*/) code_oad: |
| 347 |
|
- OAD_support/cb2mGetModules.csh: add PACKAGES_CONFIG.h in header file to |
| 348 |
|
module conversion ; remove unneeded CPP_EEOPTIONS.h. |
| 349 |
|
- code_oad/CPP_OPTIONS.h: remove PACKAGES_CONFIG.h and use a more standard |
| 350 |
|
version (closer to model/inc/CPP_OPTIONS.h). |
| 351 |
|
o model/src: |
| 352 |
|
- remove parameter "useOldFreezing" from PARAMS.h and push it to the |
| 353 |
|
retired list of parameters (routine FREEZE has been replace by surface |
| 354 |
|
freezing (10.yrs ago) and by pkg/frazil (interior freezing). |
| 355 |
|
o pkg/gmredi: |
| 356 |
|
- add option (GM_CALC_TRANSP_FROM_VEL) to compute transport directly from |
| 357 |
|
velocity (same scheme but affects machine truncation) for GM_AdvForm. |
| 358 |
|
- update output of FWD experiments: front_relax.bvp, |
| 359 |
|
global_ocean.90x40x15.dwnslp, global_ocean.cs32x15 and ideal_2D_oce. |
| 360 |
|
|
| 361 |
|
checkpoint64q (2013/11/17) |
| 362 |
|
o verification: |
| 363 |
|
- generate new output on baudelaire (gfortran, -ieee) for OpenAD experiments |
| 364 |
|
tutorial_global_oce_biogeo and global_ocean.90x40x15. |
| 365 |
|
- generate new output (growth & melt) for seaice_itd experiment after |
| 366 |
|
updating the input pickup_seaice files (previously wrong). |
| 367 |
|
o pkg/cost: |
| 368 |
|
- define a "final cost function" for each tile, and use GLOBAL_SUM_TILE_RL |
| 369 |
|
(instead of _GLOBAL_SUM_RL) to get the final cost from all procs & threads: |
| 370 |
|
o this fixes global-sum value if multi-threads (since GLOBAL_SUM_RL |
| 371 |
|
cannot be applied to var in common block). |
| 372 |
|
o allows to get results independent of tile-per-proc setting (if using |
| 373 |
|
slower GLOBAL_SUM_SEND_RECV option). |
| 374 |
|
- update accordingly: seaice_cost_final.F, shelfice_cost_final.F, |
| 375 |
|
thsice_cost_final.F and ecco_cost_final.F (this one affects lab_sea |
| 376 |
|
forward gradients: update output). |
| 377 |
|
- update */code_oad/externalDummies.F by adding dummy GLOBAL_SUM_TILE_RL |
| 378 |
|
S/R and, for most exp., also comment out GLOBAL_SUM_R8. |
| 379 |
|
o pkg/mom_common: |
| 380 |
|
- move to pkg/mom_common and model/src (previously in tutorial_deep_convection |
| 381 |
|
code) 2nd version of isotropic 3-D Smagorinsky code interface: strain and |
| 382 |
|
viscosity are locally declared in dynmics.F and pass as argument to CALC_GW; |
| 383 |
|
ensure that all field value that are used are set. |
| 384 |
|
o tutorial_deep_convection (smag3d): |
| 385 |
|
- add missing scaling in mom_calc_smag_3d.F; |
| 386 |
|
- set smag3D_coeff in input.smag3d such that results do not change. |
| 387 |
|
o pkg/dic: |
| 388 |
|
- change dic_cost.F to compute cost on each tile first and then apply |
| 389 |
|
GLOBAL_SUM_TILE_RL: this affects forward gradient of AD experiments |
| 390 |
|
tutorial_dic_adjoffline & tutorial_global_oce_biogeo; update output. |
| 391 |
|
- remove kLev argument and use GLOBAL_SUM_TILE_RL in tracer_meanarea. |
| 392 |
|
o eesupp/src & pkg/mdsio: |
| 393 |
|
- remove gather/scatter_vector.F (from eesupp) and mdsio_read/writevector.F |
| 394 |
|
(from pkg/mdsio) since they are no longer used for tape IO. |
| 395 |
|
- move simple C subroutine "setdir.c" from pkg/compon_communic to eesupp/src |
| 396 |
|
(+ keep a copy in pkg/atm_ocn_coupler). |
| 397 |
|
o verification/isomip: |
| 398 |
|
- split domain in 8 squared tiles (instead of just 2) for FWD, AD & OAD tests. |
| 399 |
|
o tools/build_options: |
| 400 |
|
- optfile linux_amd64_ifort11, fast (no ieee) case: |
| 401 |
|
to get a working restart for all experiments, add "-fp-model source" |
| 402 |
|
to FOPTIM (also remove "-opt-streaming-stores auto" <- this is the default). |
| 403 |
|
|
| 404 |
|
checkpoint64p (2013/10/20) |
| 405 |
|
o pkg/autodiff: |
| 406 |
|
- adread_adwrite.F: when type and length do not match ALLOW_AUTODIFF_WHTAPEIO |
| 407 |
|
criteria, return to simple (default) tape IO format. |
| 408 |
|
o pkg/mdsio (+ eesupp/src): |
| 409 |
|
- rewrite/simplify tape-IO S/R (new S/R MDS_READ/WRITE_TAPE replace |
| 410 |
|
previous MDSREAD/WRITEVECTOR) with 2 array argument from each type (R4/R8); |
| 411 |
|
- fix globalFile and singleCpuIO options using simpler global mapping. |
| 412 |
|
- new pairs of scatter/gather vector S/R (one for each type, generated from |
| 413 |
|
template) corresponding to simpler global mapping. |
| 414 |
|
- adread_write.F: switch to new S/R (but leave old calls commented) and write |
| 415 |
|
to globalFile when parameter globalFiles is set to True. |
| 416 |
|
- switch on useSingleCpuIO in AD experiments: global_ocean.90x40x15 & isomip. |
| 417 |
|
o pkg/autodiff: |
| 418 |
|
- adread_adwrite.F: add a hack for RS arrays (when RS=real*4); |
| 419 |
|
with ALLOW_AUTODIFF_WHTAPEIO defined, since corresponding (real*4) is |
| 420 |
|
missing, just add a STOP if array type do not match. |
| 421 |
|
o pkg/exf: |
| 422 |
|
- to allow to use seaice-fraction from pkg/exf in other pkgs than pkg/seaice: |
| 423 |
|
rename CPP option EXF_ALLOW_SEAICE_RELAX to EXF_SEAICE_FRACTION |
| 424 |
|
and rename array obsSIce to exf_iceFraction. |
| 425 |
|
o tutorial_deep_convection: |
| 426 |
|
- add 1rst version of isotropic 3-D Smagorinsky code (from Louis-Philippe), |
| 427 |
|
for now all in this exp. code dir. |
| 428 |
|
- add secondary test using Smag-3D viscosity (keep very low backgroud visc for |
| 429 |
|
testing) and flux-limter advection scheme for Temp. (no explicit diffusion). |
| 430 |
|
o eesupp/src: |
| 431 |
|
- added SINGLE_DISK_IO option because reading of parameter files on |
| 432 |
|
very large number of processors did not work with existing set-up |
| 433 |
|
|
| 434 |
|
checkpoint64o (2013/09/25) |
| 435 |
|
o pkg/atm_phys & atm_compon_interf: |
| 436 |
|
- allows for coupling of gray-atmosphere (atm_phys) with ocean. |
| 437 |
|
o tools/build_options: |
| 438 |
|
- switch from "-fPIC" to "-mcmodel=medium" in optfiles: linux_amd64_gfortran |
| 439 |
|
& linux_amd64_ifort11 and in linux_amd64_g77 & linux_amd64_open64 also |
| 440 |
|
remove CPP setting (was identical to genmake2 default). |
| 441 |
|
o pkg/gmredi & model/src: Some updating and work done on the residual model. |
| 442 |
|
- created new file model/src/calc_eddy_stress.F to calculate the eddy stress. |
| 443 |
|
- fixed up the calculation of the eddy stress and how it is added to the |
| 444 |
|
external forcing via taueddy_external_forcing.F |
| 445 |
|
- at the moment, it is very experimental and only works with the variable eddy |
| 446 |
|
diffusivity calculated in gmredi_k3d.F |
| 447 |
|
o pkg/seaice/seaice_check.F: add a check to catch the case of specifying |
| 448 |
|
lw/swfluxfile instead of lw/swdownfile in data.exf together with pkg/seaice |
| 449 |
|
o testreport (& tools/do_tst_2+2): |
| 450 |
|
- for MPI test, set default COMMAND to 'mpirun -v -np TR_NPROC ./{executable}' |
| 451 |
|
o tools/build_options: linux_amd64_gfortran & linux_amd64_ifort11: |
| 452 |
|
- remove CPP='cpp -traditional -P' (this is genmake2 default) |
| 453 |
|
- add switch (for big setups) to use 'medium' memory-model (but leave it |
| 454 |
|
commented out for now). Note: needed with FC 19 to compile big setups. |
| 455 |
|
o pkg/atm_compon_interf: |
| 456 |
|
- regroup per field origin (model & pkgs) the coupling storage routines |
| 457 |
|
(which accumalate in time each coupling field) |
| 458 |
|
- move bi,bj loops inside atm_store_my_data.F and store also wind-stress; |
| 459 |
|
update accordingly + simplify aim_do_physics.F |
| 460 |
|
|
| 461 |
|
checkpoint64n (2013/08/26) |
| 462 |
|
o pkg/bbl: |
| 463 |
|
- update formulation to reduce dispersion of tracer properties in bbl |
| 464 |
|
- replaced horizontal and vertical transport parameters with velocities |
| 465 |
|
- changes results for verification/global_with_exf.yearly |
| 466 |
|
o verification/halfpipe_streamice: |
| 467 |
|
- change to matrix construction; update both Fwd & AD output. |
| 468 |
|
o verification/tutorial_tracer_adjsens: |
| 469 |
|
- OpenAD test: switch to vector-invariant momentum since fluxform with |
| 470 |
|
rStar causes problems with OpenAD; update output. |
| 471 |
|
o tools: |
| 472 |
|
- genmake2: define a common prefix for all temp-file names ; move them |
| 473 |
|
to local /tmp disk (but would be easy to move them back); |
| 474 |
|
- xmakedepend: apply the same switch for temp-files. |
| 475 |
|
o pkg/offline: |
| 476 |
|
- changes for use with rStar (NLFS): assume that we continue to provide |
| 477 |
|
UVELMASS/hFacW_ini & VVELMASS/hFacS_ini (hFacWi,S_ini as written in grid |
| 478 |
|
output files) and apply r* scaling at each time-step (function of the time |
| 479 |
|
varying Eta field); use normal pickup files (needed for restart with NLFS). |
| 480 |
|
o adjoint with OpenAD: |
| 481 |
|
- move OpenAD-specific files from verification/OpenAD/code_oad_all to a new |
| 482 |
|
package openad. This package has to be compiled for all runs with OpenAD |
| 483 |
|
instead of specifying code_oad_all as a modification directory. |
| 484 |
|
- link the fortran templates from tools/OAD_support to the build directory |
| 485 |
|
for preprocessing to avoid conflicts between different setups compiled |
| 486 |
|
simultaneously and simplify cleanup. |
| 487 |
|
o pkg/exf: |
| 488 |
|
- in exf_getforcing.F: comment out most of the EXCH calls (fields used by |
| 489 |
|
main model or other pkgs are exchanged in EXF_MAPFIELDS). |
| 490 |
|
o model/src: |
| 491 |
|
- do_stagger_fields_exchanges.F: skip EXCH calls when using pkg/offline |
| 492 |
|
(similar to do_fields_blocking_exchanges.F). |
| 493 |
|
o tools/genmake2: |
| 494 |
|
- remove TAF output src code just before calling staf (when not doing a fresh |
| 495 |
|
built, will stop if things go wrong with staf). |
| 496 |
|
- fix target "adobj" (left from TAF version-2 transition) |
| 497 |
|
o pkg/diagnostics: |
| 498 |
|
- add a parameter to track the status of pkg/diagnostics activation; |
| 499 |
|
this replace/extend the use of logical param "settingDiags" (to check |
| 500 |
|
when adding diag to the list) to also check any DIAGNOSTICS_[]FILL* call. |
| 501 |
|
New S/R to print error message and stop when pkgStatus is not right. |
| 502 |
|
- to try: add a warning when "data.diagnostics" exist but useDiagnostics=F. |
| 503 |
|
|
| 504 |
|
checkpoint64m (2013/08/13) |
| 505 |
|
o model/inc: |
| 506 |
|
- move FCORI_MACROS.h from PARAMS(_MACROS).h to GRID_MACROS.h (left from |
| 507 |
|
8 yrs ago modif when Coriolis arrays were moved from PARAMS.h to GRID.h) |
| 508 |
|
o pkg/kpp & aim_v23: |
| 509 |
|
- only call DIAGNOSTICS_FILL when useDiagnostics=TRUE. |
| 510 |
|
o pkg/seaice: |
| 511 |
|
- restore (last time on 2011/12/24) ability to compile pkg/seaice with |
| 512 |
|
undefined pkg/exf ALLOW_ATM_TEMP or ALLOW_RUNOFF CPP-options. |
| 513 |
|
- only call DIAGNOSTICS_FILL when useDiagnostics=TRUE. |
| 514 |
|
o eesupp/src: |
| 515 |
|
- fix check for overlap-size argument (myOLn.GT.MAX_OLY_EXCH) |
| 516 |
|
in exch1_rx[_ad].template (thanks to Francois Lefeuvre report). |
| 517 |
|
o switch to TAF version-2: |
| 518 |
|
- add flow directives to "freeze" naming convention for ad-routines that |
| 519 |
|
are used in I/O routines of adjoint state and associated common blocks |
| 520 |
|
that are used in adcommon.h (backward compatible with version-1) |
| 521 |
|
- update all ad-optfiles (in tools/adjoint_options + few local to some |
| 522 |
|
verification exp) to switch to latest TAF version (currently 2.5.5); |
| 523 |
|
merge "*_mpi" adoptfiles into the corresponding non-mpi (but commented |
| 524 |
|
out except for diva). |
| 525 |
|
- the major change with TAF version-2 is that both the differentiated |
| 526 |
|
routines and the forward routines (new) are returned as part of the TAF |
| 527 |
|
output source code. Update genmake2 accordingly. |
| 528 |
|
- new output for AD experiment tutorial_global_oce_biogeo (better AD gradient |
| 529 |
|
with version-2 when compared to TLM or FWD gradient); other experiments |
| 530 |
|
output show minor changes (machine truncation level); update the few AD & |
| 531 |
|
TLM output with 12 matching digits only (some prior to version-2 switch). |
| 532 |
|
|
| 533 |
|
checkpoint64l (2013/08/05) |
| 534 |
|
o model/src: |
| 535 |
|
- in dynamics.F, skip the call to CALC_VISCOSITY if momViscosity=F |
| 536 |
|
- main_do_loop.F: no longer includes additional (AUTODIFF) header files |
| 537 |
|
when using TAF but only if using OpenAD. |
| 538 |
|
o pkg/mom_common+fluxform+vecinv: |
| 539 |
|
- always set horiz. viscosity arrays to background value before calling |
| 540 |
|
MOM_CALC_VISC (in MOM_FLUXFORM & MOM_VECINV) and call S/R MOM_CALC_VISC |
| 541 |
|
only when using variable horiz. viscosity (useVariableVisc=T); |
| 542 |
|
- simplify mom_vecinv.F (only 1 block for momViscosity). |
| 543 |
|
o pkg/mom_common: variable horiz. viscosity in NH code |
| 544 |
|
- move horiz-viscosity 3-D arrays viscAh_W & viscA4_W (used in calc_gw.F) |
| 545 |
|
from model/inc/NH_VARS.h to pkg/mom_common/MOM_VISC.h |
| 546 |
|
- store in common block (in MOM_VISC.h) logical parameters: useHarmonicVisc, |
| 547 |
|
useBiharmonicVisc & useVariableVisc. |
| 548 |
|
- fix old bug (already in 1rst implementation of variable horizontal viscosity |
| 549 |
|
in calc_gw.F, version 1.27, 2006/06/20): |
| 550 |
|
horizontal bi-harmonic viscosity in gW was missing when wiscA4W=0 |
| 551 |
|
even if variable bi-harmonic viscosity (e.g., viscA4Grid) was non-zero. |
| 552 |
|
- change background horiz viscosity in vertical momentum (gW) to always be |
| 553 |
|
viscAhW,viscA4W (instead of switching to viscAhD, viscA4D when using |
| 554 |
|
any type of variable viscosity, e.g., viscAh/4Grid) |
| 555 |
|
- change default value of viscAhW,viscA4W to viscAhD,viscA4D (instead of |
| 556 |
|
viscAh,viscA4) which default to viscAh,viscA4 : this avoid missing |
| 557 |
|
horiz. viscosity in W eq when just setting viscAhD/Z,viscA4D/Z (since |
| 558 |
|
default viscAh,viscA4 is zero). |
| 559 |
|
o model/src: |
| 560 |
|
- extend length of drC & recip_drC from Nr to Nr+1. |
| 561 |
|
o Divided Adjoint (DIVA) with MPI: |
| 562 |
|
- genmake2: do not create local ./mpi_headers dir when no file to copy into. |
| 563 |
|
- remove option ALLOW_DIVIDED_ADJOINT_MPI (replaced by ALLOW_DIVIDED_ADJOINT |
| 564 |
|
and ALLOW_USE_MPI) from model/src code and from ECCO_CPPOPTIONS.h. |
| 565 |
|
|
| 566 |
|
checkpoint64k (2013/07/23) |
| 567 |
|
o tools/OAD_support: |
| 568 |
|
- avoid the need for file "oadtempflile" in insertTemplateDir.bash |
| 569 |
|
and remove it from genmake2. |
| 570 |
|
o tools/build_options: |
| 571 |
|
- remove MPI_HEADER_FILES_INC setting (no longer used) and comment out |
| 572 |
|
MPI_HEADER_FILES list (let genmake2 find the missing headers) |
| 573 |
|
o verification/halfpipe_streamice: |
| 574 |
|
- change to driving stress formulation; update both Fwd & AD output. |
| 575 |
|
o tools/genmake2 and Divided Adjoint with MPI: |
| 576 |
|
- remove default setting of MPIINCLUDEDIR from $MPIHOME (always been broken); |
| 577 |
|
- only create local ./mpi_headers dir if using MPI and MPIINCLUDEDIR is set; |
| 578 |
|
- add new variable (LOCAL_MPI_HEADERS, replace MPI_HEADER_FILES_INC) in |
| 579 |
|
Makefile, which is set by genmake2, and check which mpi-headers are needed. |
| 580 |
|
Note: need to update adjoint_options/adjoint_diva_mpi accordingly. |
| 581 |
|
- update target "CLEAN" (to also remove ./mpi_headers/ dir). |
| 582 |
o testreport: |
o testreport: |
| 583 |
- changes for Divided Adjoint Run: when file "run_ADM_DIVA" is present, |
- changes for Divided Adjoint Run: when file "run_ADM_DIVA" is present, |
| 584 |
perform additional runs (number of additional runs is "add_DIVA_runs" taken |
perform additional runs (number of additional runs is "add_DIVA_runs" taken |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch