Warning, /doc/tag-index is written in an unsupported language. File is not indexed.
view on githubraw file Latest commit 63cdc0b9 on 2026-09-30 20:05:11 UTC
addde852ed Chri*0001 Notes on tags used in MITgcmUV
0002 ==============================
5dda98cf07 Jean*0003
63cdc0b960 Jean*0004 o pkg/ecco & ctrl:
0005 - quick fix for "xx_geothermal" ctrl when compiling with _RS being real*4
0006 - add secondary test ideal_2D_oce.geom to the list of mutl-threaded tests
b561771fc1 Jean*0007 o pkg/cheapaml:
d861cd501f Jean*0008 - fix cheapaml implementation of Large and Pond surface flux and add a
0009 secondary test in experiment cheapAML_box that uses 'LANL' flux formula.
0010 o pkg/cheapaml:
b561771fc1 Jean*0011 - fix LW derivative vs surf. temp (cheapaml_coare3_flux.F) which is used over
0012 seaice ; update offline_cheapaml exp. (in verification_other) ref. output.
fc2dc65be7 Jean*0013 o doc:
0014 - add reference to MITgcmIS in Chapt.12
0015 o pkg/fizhi:
0016 - fix indices in averaged variance (SVAR) for turbulence fluxes (S/R TRBFLX);
0017 add new CPP option "FIZHI_TRBFLX_OLD_BUG" to recover old bug ; update ref.
0018 output of the fizhi-cs test experiments.
4ad03ba84e Mich*0019 o model/src:
0020 - fix TEOS-10 derivatives (bug) in FIND_ALPHA and FIND_BETA ;
0021 add missing "_d 0" to constants in GSW_GIBBS_PT0_PT0.
0022
853761d8f4 Jean*0023 checkpoint69q (2026/08/24)
1827555eb3 aver*0024 o pkg/profiles:
0025 - improve error handling and check that number of depth levels (in profiles
0026 file) does not exceed NLEVELMAX ; add run-time param "prof_dBugLevel".
f0f170d54b Mart*0027 o pkg/layers:
0028 - rename and split src files according to S/R content.
4cda91e6a9 Mich*0029 o pkg/mom, seaice & streamice:
0030 - cleaning inconsistent OLx <-> OLy usage.
ec8b15f1ca Jean*0031 o pkg/bbl:
0032 - fix wrong grid distance (dxG instead of dyG); this affects results of test
0033 exp. global_oce_latlon.yearly (6 matching digits), update ref. output.
62c4258752 Jean*0034 o pkg/gmredi:
0035 - fix signed cap on Bates wave speed (in gmredi_calc_bates_k.F); it strongly
0036 affects results when using GM_useBatesK3d=T (only in verifiation_other).
7fe60b03cb Mich*0037 o model/src & pkg/atm_phys:
0038 - fix initialisation of dBHybSigC/F (case selectSigmaCoord=0) and
0039 fix setting/copy of gcm_debLevB & gcm_debLevC in pkg/atm_phys.
50b6fdcce9 Jean*0040 o pkg/gmredi:
0041 - fix Rossby-wave speed advection (in gmredi_calc_geom.F);
0042 - fix indexing in QG-Leith averaging (gmredi_calc_qgleith.F & mom_calc_visc.F)
4c7e7650f5 Mich*0043 o pkgs *_read/write_pickup.F
0044 - fix bug/typo a) in "missFldList" index (7 files) b) in thsice MNC pickup
0045 and c) in cheapaml passive tracer pickup.
dfc30dafb1 Mich*0046 o pkg/seaice:
0047 - fix 3 bugs (loop range and 2 times seaiceMaskU -> MaskV) in seaice_lsr.F ;
0048 update 12 ref. outputs in exp. global_ocean.cs32x15, lab_sea & cpl_aim+ocn.
a2d34d4ce7 Jean*0049 o pkg/ggl90 & obcs:
0050 - fix loop limits in ggl90_calc.F, when getting BC from pkg/shelfice;
0051 - fix OBCS indices in N & S OB-Eta field when applied to rStar factors.
99e73f4003 Jean*0052 o pkg/ggl90:
0053 - langmuir code: save some computations for u/vStar (done once vs Nr times).
cd672fab6e Jean*0054 o tools & testreport:
0055 - add a very short script and adjust testreport & do_tst_2+2 to enable to use
0056 "sftp" to send output results.
0057
d7a3a8f5b7 Jean*0058 checkpoint69p (2026/07/24)
c1b8648b4c Jean*0059 o verification:
0060 - remove all OpenAD test dir and files (code_oad, input_oad*, output_oadm.*)
0061 and update docs in few places.
ee5aaa9a62 dngo*0062 o pkg/streamice:
0063 - fix Tapenade adjoint for simple SOLVE_FP use (same fix as for OpenAD)
0064 and update halfpipe_streamice Tap adj & tlm ref. output.
ca3a717dfb Jean*0065 o pkg/seaice:
0066 - comment out debug print in seaice_cost_test.F and reduce overlap size
0067 (from 3 to 2) in experiment "1D_ocean_ice_column".
e4aef62d49 Mart*0068 o pkg/exf:
0069 - fix time-invariant exf field (fldPeriod=0) when used as ctrl variables
0070 (xx_gentim2d), by resetting it (ALLOW_GENTIM2D_CONTROL) from fld0,fld1 in
0071 exf_set_fld.F ; simplify "data.exf" in AD experiment "offline_exf_seaice".
de8e498dc9 Oliv*0072 o tools/ci:
0073 - remove OpenAD tests from GitHub actions; add other Adjoint Tapenade test
0074 experiments to CI (only run with label "adjoint"); update docs.
0075
e4aef62d49 Mart*0076 checkpoint69o (2026/07/06) last version to support OpenAD
1c3b30160d Jean*0077 o testreport:
0078 - add process-id number to tar-file name when sending output with "scp".
4b8b6dffc3 Jean*0079 o pkg/obcs(sponge):
0080 - fix bug in sponge relaxation time-scale for Salinity at the Southern OB;
0081 - remove special condition (non zero T / S) for temp and salt relaxation.
9b89fcf692 antn*0082 o pkg/layers:
24d87fa921 Mart*0083 - fix bug in LAYERS_THERMODYNAMCS surface term code for LinFSConserveTr=F
0084 o pkg/layers:
9b89fcf692 antn*0085 - new header file "LAYERS_P2SHARE.h" with new parameter "layers_useThermo"
0086 allows calling S/R layers_fill only when it is necessary;
0087 - fix bug that leads to zero output for some of the LAYERS_THERMODYNAMCS
0088 diagnostics (LaTz, LaSz, LTto, LSto,LaTs,LaSs).
0089
a2d7de1ac7 Jean*0090 checkpoint69n (2026/05/08)
3f0f10fc37 Mart*0091 o pkg/seaice:
0092 - move seaice grid-variables from SEAICE.h into new header "SEAICE_GRID.h";
0093 - add missing metric terms to stress divergence (bug fix); new run-time parms
0094 SEAICEselectMetricTerms, default=2, =1 recover previous partial metric-terms
0095 (i.e., old results), tested in lab_sea.salt_plume ;
0096 - update all affected reference output (in cpl_aim+ocn, global_ocean.cs32x15,
0097 lab_sea & seaice_obcs, 19 total).
242228367a Mart*0098 o pkg/mdsio:
0099 - when using pkg/cal, add date and time to ".meta" output file.
f39e9f371c Mart*0100 o pkg/shelfice:
0101 - use alternative way to compute freshWaterFlux based on heat balance ;
0102 keep old code under CPP option SHI_SALTBAL_FWFLX, and define this option
0103 in verification exp. shelfice_2d_remesh; update docs;
0104 - fix potential division by zero in saltFreeze & freshWaterFlux expressions;
0105 - fix bug related to SHELFICEadvDiffHeatFlux=T.
ea437dae83 Hugo 0106 o pkg/obcs:
0107 - fix CPP logic in obcs_cost_driver.F to avoid compilation error.
0108
8d6ec7ca68 Jean*0109 checkpoint69m (2026/03/30)
df0999b5dc Jean*0110 o pkg/cost:
0111 - change ordering of calls in `cost_final.F`, profiles before ecco, as
0112 before PR 946 ; refine printing of cost per tile value to STDOUT.
0113 - drop condition on "useECCO" in shelfice_cost_final.F ; fix few missing
0114 or inconsistent CPP #ifdef.
6fc9daf8e1 Jean*0115 o verification/global_ocean.cs32x15 & offline_exf_seaice:
0116 - in exp. "global_ocean.cs32x15", turn off useCAL in remaining FWD and AD
0117 tests and skip compilation of pkg/cal in FWD built. Also shift "nIter0"
0118 + rename pickup files in few secondary tests.
0119 - similarly, in exp. offline_exf_seaice, turn off and skip compilation of
0120 of pkg/cal in AD tests.
0121 - fix missing useCAL in 2 pkg/ctrl src files.
69361556c2 Mart*0122 o pkg/cost,ctrl,ecco,obcs:
0123 - final cost-function always computed in "cost_final.F" (even if useECCO=T),
0124 calling individual {PKG}_COST_FINAL, each writing its own "costfunction_*"
0125 summary file. Similar changes in new "cost_driver.F", calling individual
0126 pkg "{pkg}_cost_driver.F";
0127 - make ctrl-cost (and obcs-ctrl-cost) available without pkg/ecco ; move all
0128 obcs-cost S/R from pkg/ecco to pkg/obcs ; and move+rename "data_errfile"
0129 (formerly in data.ecco) to "obcs_data_errfile" in "data.ctrl";
0130 - retire ALLOW_COST_DEPTH (covered by generic controls);
0131 - no changes to results ; adjust few namelists for special cases (obcs_ctrl,
0132 bottom_ctrl_5x5);
0133 - adjust store directives for combinations of pkgs kpp, seaice, shelfice
0134 with ALLOW_DEPTH_CONTROL.
0135
932fd2f667 Jean*0136 checkpoint69l (2026/03/01)
15ec4b1e94 Jean*0137 o verification:
0138 - for secondary tests, change testreport to only run a single "prepare_run"
0139 from run-dir, after linking files from both ../input.${sfx}/ and ../input/.
0140 - adjust several verification exp. secondary tests accordingly and update
0141 instructions in README files + in the docs.
decd05a68a dngo*0142 o pkg/streamice:
0143 - fix typo and S/R argument list within #ifdef ALLOW_PETSC adjoint code.
0ecb64d391 Jean*0144 o tools:
0145 - fix PR 949 changes (location of "flow_tap") in Tapenade ad-optfile by
0146 using Makefile variable "TOOLSDIR".
642de41482 dngo*0147 o pkg/tapenade:
0148 - fix for Tang-Lin: add missing handwritten code for some pkg/streamice S/R
0149 and fix issues in ACTIVE_READ_XY/XYZ_D ;
0150 - turn back on Tapenade TLM test for experiment halfpipe_streamice.
6a9e386e2e dngo*0151 o tapenade & genmake2:
0152 - in genmake2, import Tapenade command arguments from ad-optfile (adjoint_tap)
0153 - allow additional extra arguments with TAP_EXTRA, which can also be set using
0154 new command line option "-tap_extra" ;
0155 - add support for Tapenade to skip checkpointing with new "_FWD" and "_BWD"
0156 versions of manually written subroutine derivatives ;
0157 - test new "no-checkpointing" feature in halfpipe_streamice experiment
0158 with new reference output.
a3ffb3b677 Jean*0159 o pkg/gmredi:
0160 - remove OLD_VISBECK_CALC code ; rename S/R GMREDI_CALC_PSI_B ;
0161 - unless restricted to only uniform Kappa (including 2-D & 1-D scaling),
0162 define local 3-d vars for Kappa-Redi and Kappa-GM to simplify Tensor
0163 setting and Psi-Bolus code.
0164
db6c4bb05b Jean*0165 checkpoint69k (2026/01/25)
b15f6f1e9f Jean*0166 o model/src:
0167 - fix scaling from cg2g/cg3d TargetResWunit to CG-Tolerance (exact scaling
0168 if rAc is uniform) by using few more domain global quantities (in GRID.h).
0169 - adjust accordingly cg2g/cg3d TargetResWunit in all forward test exp. to keep
0170 identical results but switch off cg2dTargetResWunit in most AD exp. (except
0171 if using useNSACGSolver=T) to use cg2gTargetResidual (normalize cg2d RHS).
f1b47febb7 Jean*0172 o verification:
b15f6f1e9f Jean*0173 - after moving/merging (PR 944) fwd & adm tests from global_ocean_ebm into new
0174 host-exp global_oce_latlon, move former input dir and ref. output to replace
0175 sym-link in new host-exp and remove remaining files/dir in global_ocean_ebm.
b4e9a6eb7c aver*0176 o pkg/obsfit:
0177 - fix allocation of 2 local vars in obsfit_init_fixed.F
6a83a78373 Jean*0178 o pkg/profiles:
0179 - fix typo ; this allows to compile ALLOW_PROFILES_SAMPLESPLIT_COST code.
2a2b7d0c36 Mart*0180 o pkg/gchem:
0181 - new routine gchem_insolation.F to replace pkg/bling & pkg/dic code,
0182 and now also usable on Curvilinear-Grid.
8dee4b5b73 dngo*0183 o tools/ci:
0184 - add two tapenade AD test experiments to GitHub action CI test.
0185
2578cc1182 Jean*0186 checkpoint69j (2025/12/20)
75cb2ff809 Jean*0187 o optim:
0188 - fix outdated ALLOW_SHIFWFLX_CONTROL option in "optim_read/writedata.F".
ad59256d7d aver*0189 o pkg/obsfit:
0190 - new package "obsfit" for for model-observations comparisons (and cost
0191 contribution);
0192 - add secondary "obsfit" test in TAF-AD exp. global_oce_biogeo_bling.
036aee8265 Mart*0193 o verification:
0194 - move "global_ocean_ebm" experiment forward tests to "global_oce_latlon" and
0195 adjust AD test for merging in global_oce_latlon, as a secondary "ebm" test.
0196 - disable test of global_ocean_ebm (to be removed later).
6b145becaf Jean*0197 o pkg/seaice:
0198 - fix compilation of untested SEAICE_MODIFY_GROWTH_ADJ code.
47ecd1025a Jean*0199 o model/src:
0200 - add a STOP if using selectPenetratingSW > 0 in Atmospheric set-up.
feb7fa5d1e dngo*0201 o pkg/streamice & Tapenade:
0202 - introduce fixed-point treatment of Goldberg et al 2016 (GMD) for streamice
0203 nonlinear solver using Tapenade FP-LOOP pragma ; used in halfpipe_streamice
0204 exp. (with #define ALLOW_STREAMICE_FP_ADJ) ;
0205 - rename: streamice_vel_solve_openad.F --> streamice_vel_solve_fp.F
0206 + CPP option ALLOW_STREAMICE_OAD_FP --> ALLOW_STREAMICE_FP_ADJ
0207 - skip differentiation of streamice_cg_solve.F with Tapenade, calling instead
0208 adstreamice_cg_solve (update "flow_tap" and stubs_tap_adj.F, add
0209 adFixedPoint.c in ADFirstAidKit/ + links in pkg/tapenade);
0210 - for now, disable halfpipe_streamice exp. Tapenade Tang.-Lin test.
61b91e10c1 Ivan*0211 o pkg/grdchk:
0212 - fix grdchk location to allow to span several vertical level k ; test this
0213 in secondary test exp. "global_ocean.90x40x15.kapredi".
e6feef680a Ivan*0214 o pkg/mnc:
0215 - update grid-variable names in pkg/mnc NetCDF files (mostly matching GRID.h)
0216 and provide backwards compatibility in MATLab "load_grid.m" and for Python
0217 MITgcmutils (restore_MNC_keys).
204068be6a R. S*0218 o pkg/seaice:
0219 - new parameter "SEAICE_evpAreaReg" for regularizations of denomU/V in EVP
0220 solver ; tested in exp. seaice_obcs new secondary test "regDenom".
0221
58fb4fd147 Jean*0222 checkpoint69i (2025/11/14)
c9c019d2e0 Jean*0223 o pkg/cost:
0224 - fix multi-proc initialization of Tapenade adjoint cost-function.
b7411f1a84 Jean*0225 o pkg & model:
0226 - remove pkg/timeave ; remove all ALLOW_TIMEAVE code ; remove all timeave
0227 related parameters from common blocks (in header files) and from src code
0228 and disable/retire these params.
0229 - also updates model_ad.flow, TAP_support/flow_tap, OAD_support and most
0230 */code_oad/cb2mFiles from verification.
626c6ac944 Jean*0231 o tools (Tapenade):
0232 - implement "-ncad" genmake2 option for Tapenade Makefile (similar to TAF),
0233 to append each forward src file to corresponding Tapenade-generated AD file,
0234 using new short script "append_fwd_src"; otherwise (default), put all
0235 adjoint (or Tang.Lin.) tapenade fortran files "_b.f" (or "_d.f") into a
0236 single "adj/tlm/_tap_all.f" file, to be compiled to get an object file.
0237 - simply add symbolic-links within pkg/tapenade/ to the few files from
0238 "tools/TAP_support/ADFirstAidKit/" that are needed.
0239 - fix for case-insensitive file systems (e.g., on Mac-OS) and update optfile
0240 "darwin_arm64_gfortran" to use Tapenade on Mac-OS using with "docker".
78dc053d11 Jean*0241 o pkg/diagnostics:
0242 - add diagnostic "VSHEARSQ" for the square of vertical shear.
0243
66720c264e Jean*0244 checkpoint69h (2025/10/23)
4b300c49e1 Jean*0245 o pkg/ctrl:
0246 - account for shift in record number between original xx_gentim2d_file full
f9b5d1eb8f Jean*0247 time-series and "effective" sub-set version ; this was previously missing.
4b300c49e1 Jean*0248 Also enable some debug print from ctrl_get_gen_rec.F (if debugLevel >= 3).
0fa8d50cfc Jean*0249 o pkg/seaice:
0250 - fix compilation of seaice_growth_adx.F (left from PR #750).
c3be04357d Jean*0251 o model, pkgs:
0252 - remove code within "#ifndef EXACT_CONSERV / #endif" bracket and remove
0253 completely CPP option EXACT_CONSERV.
e9828181c3 Yixi*0254 o pkg/bling:
0255 - allows to specify a 2D field of light attenuation coefficient (k0_2d) from
0256 file "bling_k0_2dFile".
0257
bbbca756c9 Jean*0258 checkpoint69g (2025/09/12)
d4a066fa68 Jean*0259 o verification/short_surf_wave:
0260 - fix Non-Hydrostatic pressure initialization issue with implicSurfPress=1/2
0261 by re-starting (nIter0=1) from pickup generated with implicSurfPress=1.
bb357ea692 Jean*0262 o tools/mpack-1.6:
0263 - fix compilation for recent version of gcc, to pass the compiler test in
0264 "configure" and md5 compilation with v15 (comply with C23 standard).
a5926ff804 dngo*0265 o pkg/streamice:
0266 - for OpenAD, adjust streamice_write_pickup.F to only write the forward
0267 components of state arrays to the binary pickups for later use.
5e44d2ea81 Jean*0268 o verification:
0269 - remove all pkg/timeave params from all exp. and no longer compile this
0270 pkg in any exp. ; also skip pkg/mnc compilation in 4 fwd test exp ;
0271 - switch few remaining exp. to #define EXACT_CONSERV so that no exp is
0272 compiled with this option undefined anymore.
13ce79fe94 Ivan*0273 o pkg/profiles:
0274 - fix "profilesDoNcOutput" feature (writing NetCDF model equivalents) so
0275 that it can be use with pkg/grdchk. Switch profilesDoNcOutput" to True in
0276 adjoint test exp. global_oce_biogeo_bling (both in TAF & Tapenade test).
0277 - improve code readability, rename cost_profiles.F to profiles_cost.F
0278 and fix obvious multi-threading issues.
0279
214bfe91bf Jean*0280 checkpoint69f (2025/07/10)
00c7090dc0 Mart*0281 o model/src, pkg/kpp:
0282 - store shortwave penetration fraction in 3D field SWFrac3D and add run-time
0283 params "selectPenetratingSW" to chose between different short-wave heating
0284 options (only =1 currently implemented);
0285 - remove local (buggy) solution in pkg/seaice ;
0286 - add runtime-flag "KPPuseSWfrac3D", set to F by default, because this code
0287 can only approximately replace the original pkg/kpp-code ;
0288 - update TAF directives in pkg/kpp (mostly related to the code changes);
0289 - fix "global_ocean.cs32x15" exp bug in "in_p" and "seaice" tests, update FWD,
0290 ADM & TLM ref. output ; set KPPuseSWfrac3D to True in "1D_ocean_ice_column"
0291 (both FWD & ADM) test exp. with updated ref. output.
b74a470d07 Jean*0292 o pkg/streamice:
0293 - fix "new_partial" initialisation in streamice_adv_front.f (helps Tapenade)
b26a461de7 Mart*0294 o pkg/bling, pkg/dic:
0295 - additional store directives to avoid hidden recomputations.
6a6c83f9ac Hajo*0296 o pkg/longstep:
0297 - add remaining GM-Redi matrix coefficients (extra-diagonal & diagonal terms)
0298 and Bolus transport stream function for time-averaging in longstep pkg and
0299 use saved values in longstep time-stepping.
871ac80009 Jean*0300 o pkg/seaice:
0301 - fix 3 output formats to allow to run with gfortran v.15
0302 - also add "deep_anelastic.vecinv" to multi-threaded tests.
31fb0e0e6d Jean*0303 o pkg/mom_{common,fluxform,vecinv}:
0304 - mom_fluxform, new option, selectCoriScheme=4: use hFac averaged transport in
0305 Coriolis term so that column integral of tendency match Coriolis time
0306 column integral U,V.
0307 - mom_vecinv, new option, selectVortScheme=4: by-pass division by hFacZ and
0308 instead apply recip_hFacW/S on final tendency. Note: this fixes Angular-Mom
0309 (AM) conservation but breaks vorticity tendency matching advection of vort.
0310 - new 3-d Coriolis option, select3dCoriScheme=2,3: Alternative discretization
0311 using averaged transport; =3 (vs 2), an other alternative discretization of
0312 vertical momentum tendency gW.
0313 - deep-model, put gU,gV NH-metric terms inside vertical advection, to exactly
0314 conserves AM (+ simplify & speed up by skipping NH metric-terms gU,gV
0315 calculation). Add CPP option "MOM_USE_OLD_DEEP_VERT_ADV" (in
0316 MOM_COMMON_OPTIONS.h) to recover the explicit NH metric-term calculation.
0317 - mom_fluxform, new spherical Metric-terms option, selectMetricTerms=2,3: More
0318 accurate discretization similar to manual eq. 2.102 & 2.103 but centered at
0319 grid-cell corner; Also option (selectMetricTerms=3) to skip the gU spherical
0320 metric term by advecting uVel*dxC (simpler, faster and exactly conserve AM).
0321 - add diagnostics for Metric-Terms.
0322 - verification exp. "deep_anelastic", new secondary "vecinv" test + also
0323 update primary test ref output.
0324
69c3e78b15 Jean*0325 checkpoint69e (2025/05/01)
86f389907b Jean*0326 o pkg/atm_ocn_coupler:
0327 - update local copy of setdir.c and CPP_EEOPTIONS.h (were left behind);
0328 - improve "run_cpl_test" step 1 (pass options to genmake2) and step 2.
c296d11a59 Jean*0329 o tools/genmake2:
0330 - use specific "ad_config.template{0,1,2}" in different stages of TAF
0331 AD/TL built to avoid race condition issue with "make -jN".
79b5d5775c Jean*0332 o model/src:
0333 - no "addMass" contribution to initial (iter=0) vertical velocity ;
0334 - with selectAddFluid=1, fix missing implDiv2DFlow factor in "addMass"
0335 contribution to solver RHS ;
0336 - add a STOP if implDiv2DFlow < 1 with exactConserv=F, (was not right with
0337 useRealFreshWaterFlux=T or selectAddFluid=1) and remove untested pieces
0338 of code dealing with this case ;
0339 - when using cg2d/cg3dTargetResWunit, add missing implDiv2DFlow factor to
0340 solver tolerance setting (cg2d/cg3dTolerance) ;
0341 - upgrade "global_ocean.cs32x15.viscA4" exp. to test selectAddFluid=1
0342 with implDiv2DFlow=1/2 ; also update "short_surf_wave" exp. output.
8908c6917c Jean*0343 o tools/genmake2:
0344 - with Tapenade, remove list NON_AD_F77_SRC_FILES from Makefile (not used),
0345 remove processing of "dontCompile", "keepOriginal" and "cb2mFiles" lists ;
0346 - otherwise, in Makefile, move NON_AD_F77_SRC_FILES and NON_AD_F90_SRC_FILES
0347 lists after AD_FILES and AD_F90FILES ;
0348 - simplify (remove intermediate targets) and improve the "-ncad" Makefile
0349 to ends cleanly when "staf" command fails.
f460f9a57e Ivan*0350 o utils:
0351 - improve gluemnc description (usage, dependencies, and example).
fbb692b4e1 Jean*0352 o tools:
0353 - replace (obsolete) "egrep" with "grep -E" (or without "-E" if not needed).
7fe51dd492 Jean*0354 o verification:
0355 - After merging (5 fwd tests + 2 AD) few exp. into new host-exp. (PR #830),
0356 move input dir and ref. output from merged exp. to replace sym-link in new
0357 host exp. and remove remaining files/dir (code, build, run) in merged-exp;
0358 - Add or update README.md in new host-exp and update list of exp. in the docs.
c8ce5f710c Jean*0359 o pkg/rbcs:
0360 - fix error/warning cases and messages.
29b81f1d21 Jean*0361 o pkg/autodiff:
0362 - alternative way (printResidualFreq >=0) to get CG2D output from cg2d_mad.F
0363 - remove 2 unused CPP options.
b7b61e618a Mart*0364 o tools, autodiff and others:
0365 - remove TAMC features, untested, unused and probably broken.
0366
b2c8bc6cea Jean*0367 checkpoint69d (2025/03/01)
5b53130725 Ivan*0368 o tools:
0369 - changes to genmake2 to allow TAF to process F90 files with modules, for now
0370 only with "-ncad" option;
0371 - re-order list of src files sent to TAF (needed with current version of TAF);
0372 - add new scrip "f90mkdepend_taf" to add dependencies form TAF generated src
0373 code (Adjoint and Tang.Lin) in a file included into Makefile.
0374 - more logical and consistent ordering in Makefile target, *.F90 first then
0375 *.F77, *.c and *.h
0376 - add 2 new variables TAF_F77_FLAGS and TAF_F90_FLAGS (set from genmake_local
0377 or adjoint-optfile) to go into the TAF command.
701e10a905 Mart*0378 o model/src and forcing:
0379 - for TEOS10, add new S/R to convert model surface Conservative Temperature
0380 to in-situ Temperature (SST) and compute and store model SST in new model
0381 field (in FFIELDS.h) "gcmSST", just a copy of model Pot.Temp with other EOS.
0382 - use model SST to compute surface forcing over open ocean in pkg/exf and
0383 pkg/bulk_force ; for now, leave ice/seaice freezing/melting unchanged.
0384 - switch test exp. global_ocean.cs32x15.in_p to use TEOS10 + update lab_sea
0385 Tapenade ref. output (affected @ machine truncation level).
f955de4ba2 Jean*0386 o tools:
0387 - remove old backward compatibility feature, so that env.var ROOTDIR is no
0388 longer recognized by genamke2 ;
0389 - re-write "suggest_optfile_names" to use parts from "genmake2".
83a53713c2 Oliv*0390 o utils/python:
0391 - make MITgcmutils compatible with numpy 2.0.0 again.
c908a600ca Jean*0392 o testreport:
0393 - improve way of sending results tar file with "scp", now allowing to combine
0394 "ssh" then "scp".
0395
efc7ba3160 Jean*0396 checkpoint69c (2024/12/06)
7bb5a8a109 Jean*0397 o pkg/mom_common,fluxform,vecinv:
0398 - remove ISOTROPIC_COS_SCALING code from pkg/mom_vecinv/mom_vi_hdissip.F (was
0399 not right); add warning (or stop if side-drag) if used with pkg/mom_vecinv.
0400 - move 2 Cos-Scaling CPP options from CPP_OPTIONS.h to MOM_COMMON_OPTIONS.h
0401 to be used in horizontal viscosity formulation; more consistent use of
0402 GAD_OPTIONS.h where these 2 CPP options are used for horizontal diffusion.
0403 - update all verification exp. customized version of CPP_OPTIONS.h,
0404 GAD_OPTIONS.h and MOM_COMMON_OPTIONS.h.
4287557481 Jean*0405 o verification/atm_gray:
0406 - gray atmosphere test exp moved from "verification_other".
80fd556159 Ou W*0407 o model/src:
0408 - add few missing option header files (RBCS, SALT_PLUME, SHELFICE) in few
0409 src files ; also illustrate how to catch these (see SALT_PLUME.h and
0410 shelfice_ad_check_lev{1,2,3,4}_dir.h).
27ce1202c5 Jean*0411 o eesupp + model:
0412 - remove FAST_BYTESWAP code and option
0413 - remove empty file AUTODIFF_MYFIELDS.h
cb406db96c Ou W*0414 o pkg/ctrl:
0415 - add a STOP when ALLOW_CTRL_OBCSN/S/W/E is defined but corresponding
0416 ALLOW_OBCS_NORTH/SOUTH/EAST/WEST is undef ; and fix the code so that, in
0417 that case, it will compile and reach the stop before running 1rst time-step
0e6a4460e5 Ivan*0418 o model,pkg:
0419 - minor spell checking and formatting updates.
9edc0e3a85 aver*0420 o pkg/bling:
0421 - size-dependent phytoplankton growth code cleaned up and related parameters
0422 can now be specified in data.bling;
0423 - clean up OPTIONS in pkg/bling code ( SIZE_NUT_LIM merged with SIZE_DEP_LIM,
0424 MULT_NUT_LIM merged with MIN_NUT_LIM ) and switch USE_QSW to #undef ; this
0425 fixes FWD exp. global_oce_biogeo_bling which a) use default BLING_OPTIONS.h
0426 and b) since no short-wave is provided, light was zero with USE_QSW defined.
d3172737dc aver*0427 o pkg/profiles:
0428 - add option to write model-equivalent profiles in a netcdf file, thus
0429 removing the need for post-processing tiled output files.
9f85ea262e Mart*0430 o pkg/grdchk:
0431 - write either "grd_ratio_ad" or "grd_ratio_ftl" depending on type of run
0432 and remove limitation to "useSingleCpuIO=F" when writing 2D files ;
0433 - write "costfunction0000" only once, from pkg/ecco.
0434
7a6b0d88e9 Jean*0435 checkpoint69b (2024/10/31)
8b7be8db08 Mart*0436 o pkg/autodiff:
0437 - TAF-store directives for saltFlux (needed for #define EXCLUDE_FFIELDS_LOAD)
0438 - little cleaning of ctrl_map_forcing.F (remove duplicated EXCH calls, ...).
71b7a3e5ac Mart*0439 o tools/genmake2:
0440 - remove step that generates *.flowdir
c9bf163375 Ivan*0441 o pkg/profiles:
0442 - fix missing pieces in this pkg for Tang-Lin model and get this tested in
0443 verification exp. global_oce_biogeo_bling.
ee480e7782 amc2*0444 o pkg/seaice:
0445 - if SEAICEaddSnowMass=T, include HSNOW in diagnostics "SIenph ".
58679b5a83 Esta*0446 o utils/python/MITgcmutils/:
0447 - augment (llc, examples, ...) and update python utils
c7a06a2c29 Mart*0448 o tools/build_options:
0449 - update darwin_arm64_gfortran to be able to compile free-format F90 files.
0450 o pkg/seaice:
5bb179ddc2 Mart*0451 - add new lateral drag parameterisation for landfast ice (Liu etal 2022, JGR)
3a00e4dea9 Jean*0452 o verification/*/results:
0453 - update 5 adm + 3 tlm ref. output affected by TAF new version 6.4.5 & 6.5.0
4c91ca28d5 Ou W*0454 o pkg/ecco:
0455 - implement sea-ice freeboard cost "m_freeboard".
f79ba37af1 Mart*0456 o tools/xmakedepend:
0457 - fix xmakedepend to accept suffix longer than 1.c and add dependencies to
0458 Makefile from included headers in F90 src files.
e6e223b277 Jean*0459 o model/src:
0460 - Add new param "cg3dTargetResWunit" to skip the normalization of cg3d RHS
0461 by specifying the CG3D target residual in term of vertical-velocity units ;
0462 - Remove header files SOLVE_FOR_PRESSURE{3D}.h ; clean-up "post_cg3d.F" ;
0463 - switch test exp. global_ocean.cs32x15.viscA4 & short_surf_wave to use new
0464 param "cg3dTargetResWunit".
95cd2dedde Ivan*0465 o tools/f90mkdepend:
0466 - add arguments to f90mkdepend to specify alternative file suffix (e.g.,
0467 for MacOS) + minor improvement in error message.
0468
b537eb461d Jean*0469 checkpoint69a (2024/09/08)
0524b7d1ff Mart*0470 o tools/genmake2:
0471 - list of src files to Differentiate: change from simply "*.list" to commonly
0472 adopted "*_ad_diff.list" (to avoid accidents).
0473 - change Makefile to enable TAF to generate Tangent-Linear code from a mix
0474 of fixed-form (.F) and free-form (.F90) src code.
0475 - test free format *.F90 code in hs94.1x64x5/code_ad/ exp. for AD and TLM.
ae2be6150b Jona*0476 o pkg/dic:
0477 - save 3D pH (for calcite saturation calculation, useCalciteSaturation=T)
0478 for next time-step and store it in pickup files (for restart).
5237154b93 Jean*0479 o eesupp/src:
0480 - new set of Global-Sum vector routines working with shared buffer
0481 (=> no needs for input/output to be in common block) and with
0482 GLOBAL_SUM_ORDER_TILES implemented ; and remove older versions.
ea893758ea Patr*0483 o tools/genmake2:
0484 - change Makefile to enable TAF to generate adjoint from a mix of fixed-form
0485 (.F) and free-form (.F90) src code. Also fix for alternative suffix (e.g.,
0486 used on MacOS) to work without -ncad.
6d7b0906cb Ivan*0487 o tools/adjoint_options:
0488 - allow to pass -f08 flag to TAF by setting TAF_FORTRAN_VERS to "F08".
a340904e5a Ou W*0489 o pkg/mom_vecinv:
0490 - add more 3-D momentum tendency diagnostics (originally from Helen Pillar)
0491 for harmonic/bi-harmonic dissipation and for bottom + top friction
0492 tendency (under new CPP option: ALLOW_MOM_TEND_EXTRA_DIAGS).
0493
6519d60651 Jean*0494 checkpoint68z (2024/07/27)
acacc28f7f Jean*0495 o pkg/diagnostics:
0496 - to allow to use ADJ-diags in DIVA runs, change call sequence regarding
0497 TURNOFF_MODEL_IO and DIAGSTATS_INI_IO and simplify (fewer tests for
0498 "costfinal") the_model_main.F (+ shorten pkg/openad version) ;
0499 - restore the use of "diag_pkgStatus" (switch & check) in AD backward sweep
0500 with new small S/R for DIVA runs ;
0501 - turn on FWD and ADJ-diags in secondary lab_sea AD test "noseaice".
4dea327916 aver*0502 o pkg/bling:
0503 - clean-up "bling_light.F" (fix typo related to PHYTO_SELF_SHADING option,
0504 move k-loop outside) ; add CHL to bling_ad_check_lev{2,3,4}_dir.h and
0505 fix TAF storage directives ;
0506 - change "global_oce_biogeo_bling" AD test exp. (both TAF & Tapenade) to
0507 use PHYTO_SELF_SHADING (with #undef USE_QSW) and update ref. output.
0508 - also clean-up MDSIO_BUFF_WH.h (avoid common block that mixes r4 & r8 vars).
af61e5eb16 Mart*0509 o pkg/obcs:
0510 - Neumann boundary conditions for sea ice variables, activate by setting
0511 new runtime parameter useSeaiceNeumann=.TRUE. in data.obcs ;
0512 - fewer (hidden) recomputations and no recomputation warnings when
0513 both ALLOW_OBCS_BALANCE and ALLOW_OBCS_STEVENS are defined.
0514 o pkg/cost:
0515 - new runtime flag for pkg/cost "cost_mask_file", which can be used
0516 for flexible cost function definition.
0517
976081d885 Jean*0518 checkpoint68y (2024/06/05)
6518e4ecc5 aver*0519 o pkg/bling:
0520 - fix bigR setting when option CARBONCHEM_TOTALPHSCALE is defined.
00f81e6785 Ou W*0521 o pkg/steep_icecavity + shelfice:
0522 - new package to be used together with pkg/shelfice to also account for
0523 melting at the vertical faces of a steep ice-shelf interface ;
0524 - allows to use non-zero (but constant) ice-shelf salinity ;
0525 - new FWD and (TAF) AD secondary test exp. (in isomip) using new pkg.
82e538d851 aver*0526 o pkg/bling:
0527 - fix/improve initialization of biomass for the 3 phytoplankton groups ;
0528 - add 2D diagnostics of optically integrated chlorophyll concentration
0529 within local-time window to be compared with satellite observation ;
0530 - improve TAF store directives (reduce recomputations).
672b822630 Jean*0531 o pkg/obcs (tides):
0532 - more efficient implementation of OB barotropic tidal velocity components,
0533 with both Cos & Sin of phase times Amplitude stored in common block ;
0534 - more flexible specification of OB tidal-components (only read-in components
0535 with non-zero tidal period) ;
0536 - allows to specify tangential component of barotropic tidal velocity at OB ;
0537 - rename all OBC tidal component input parameter (period, amplitude and
0538 phase of each OB barotropic tidal velocity component input files) ;
0539 - upgrade OB tidal example (in seaice_obcs/input.tides) with fewer tidal
0540 components (only 4) but including few tangential components.
0c90ef582a Jean*0541 o verification:
0542 - changing domain decomposition (more tiles) in global_with_exf experiment
0543 (both FWD & AD) and update ref. output ;
0544 - use correct CD-Scheme time-stepping in FWD exp. global_ocean_ebm and update
0545 ref. output ;
672b822630 Jean*0546 - simplify global_ocean.90x40x15/code_ad (undef ALLOW_GENTIM2D_CONTROL,
0c90ef582a Jean*0547 ALLOW_DIFFKR_CONTROL & ALLOW_3D_DIFFKR); remove kpp from global_oce_latlon
0548 (from both TAF & Tapenade code) ;
0549 - after adjusting new host experiment code, merge forward test:
0550 flt_example --> exp4.with_flt
0551 global_with_exf --> global_ocean_ebm.w_exf
0552 global_with_exf.yearly --> global_ocean_ebm.yearly
0553 natl_box --> lab_sea.natl_box
0554 natl_box.longstep --> lab_sea.longstep
0555 and TAF & Tapenade tests:
0556 global_with_exf --> global_oce_latlon.w_exf
0557 For now, keep original set-up in place and add symbolic links into new
0558 host exp. for input dir and ref. output to run these as secondary test.
9e0fdb4065 Garr*0559 o pkg/obcs:
0560 - fix unusual division by zero in all 4 (N,S,E,W) orlanski main S/R.
41c4545f8f Jean*0561 o pkg/diagnostics:
0562 - new header file "DIAGNOSTICS_P2SHARE.h" (for now, just for useDiag4AdjOutp),
0563 and remove DIAGNOSTICS.h in any src code outside pkg/diagnostics;
0564 - new params "diag_dBugLevel" (default = main model "debugLevel");
0565 - add new arg "seqFlag" to DIAGNOSTICS_SWITCH_ONOFF and DIAGNOSTICS_SUMMARY
0566 and prevent "diagnostics_status" to be overwritten when using ADJ-diags.
0567
5f2d22066e Jean*0568 checkpoint68x (2024/04/30)
8fabf86828 Jean*0569 o model/src:
0570 - more precise specific-volume anomaly expression for Ocean in P-coord;
0571 update reference output of all 3 Ocean in P test experiments.
598aebfcee Mart*0572 o pkg/generic_advdiff:
0573 - adjust 2 SOM (Prather advection) store directives to reduce memory overhead
0574 - include OS7MP (advScheme 7) in AD code ; switch AD test experiment
0575 isomip.htd to use this advection scheme for Temp and Salt.
720a211d38 Ou W*0576 o pkg/ecco, ctrl:
0577 - put active_read calls within #ifdef ALLOW_AUTODIFF (missing in few places)
0578 and fall back to non-active read (from pkg/rw) if undef;
0579 - change argument order in few obcs related pkg/ecco S/R.
20e951135e Mart*0580 o pkg/seaice:
0581 - for seaice-dynamics, add missing mapping of (pkg/thsice) snowHeight to HSNOW
0582 - this affects results (unless SEAICEaddSnowMass=F); update seaice parameters
0583 in test global_ocean.cs32x15.icedyn and update reference output.
0584
7456fbd729 Jean*0585 checkpoint68w (2024/03/05)
5cf4364659 Mart*0586 o pkg/ctrl, grdchk & optim:
0587 - clean and improve list of ctrl-var settings (in common blocks) and update
0588 ctrl-pack header files:
0589 a) define new character fields "ncvartype" for ctrl-var shape type and
0590 save ctrl-var (file) name "ncvarfname" ;
0591 b) re-define "ncvarindex" to point directly to genArr index (according to
0592 ncvartype) or 1,2,3,4 for N,S,E,W obcs-ctrl ;
0593 so that map of index (and grdchkvarindex) to file name, array shape and
0594 genArr specification is direct, code is simpler, more robust and efficient.
0595 - allow to specify grdchk ctrl-var by name in "data.grdchk" (more robust) ;
0596 - write ncvartype list to ctrl-pack header files ;
0597 - simplify definition of maxcvars to get much shorter "ncvar"-field lists ;
0598 - remove unnecessary common blocks, rename ctrl_init.F -> ctrl_init_fixed.F,
0599 call TURNOFF_MODEL_IO only once ;
0600 - adjust optimisation utility optim and provide backward compatibility
0601 regarding changes to ctrl-pack files ; also improve build process ;
0602 - update all "data.grdchk" in verification experiments.
a4576c7cde Juli*0603 o pkg/gmredi:
0604 - add GEOMETRIC parameterization (Mak etal, JPO, 2018) for GM coefficient,
0605 under GM_GEOM_VARIABLE_K CPP-option, turned on with "GM_useGEOM=T" and
0606 tested in exp. ideal_2D_oce, secondary test "geom".
35c4fdc74b Emma*0607 o pkg/ecco:
0608 - add option ECCO_VARIABLE_AREAVOLGLOB to use the total time-varying volume
0609 to weight contributions to m_boxmean cost functions
0610
285cda8c7b Jean*0611 checkpoint68v (2024/02/03)
427e24e121 Jean*0612 o model/src:
0613 - change param "metricTerms" to integer param "selectMetricTerms" and change
0614 param "use3dCoriolis" to integer param "select3dCoriScheme" but keep former
0615 parameters in namelist (backward compatible).
0616 - remove un-used param "writeStatePrec" + also in experiment param file "data"
0617 - rotateGrid: fix missing 3-D Coriolis term to gV ; adjust usage restriction.
d4b64b229a Jean*0618 o pkg/ecco:
0619 - remove call to ECCO_CHECK from ecco_cost_init_fixed.F (but keep the other
0620 call from packages_check.F) and move ECCO_SUMMARY call to ecco_check.F
005af54e38 Jean*0621 o pkg/shelfice:
0622 - put the update of kTopC code within "#ifdef ALLOW_SHELFICE_REMESHING/#endif"
0623 and add run-time switch "SHI_update_kTopC" to allow to turn it off.
0624 - Change the initial setting of "kTopC" to remain unaffected by machine
0625 truncation error and if using SHELFICEMassStepping, set it according to
0626 shelficeMassInit.
aef96ed361 Jean*0627 o verification/solid-body.cs-32x32x1:
0628 - update set up (faster flow, smaller planet ..) and fix initial Ps condition.
9af873c532 Hajo*0629 o pkg/ggl90:
0630 - revisit Langmuir Circulation (LC) mixing-length calculation: fix bugs in
0631 some "mxlMaxFlag" implementation and ensure it works with P-coordinate.
0632 Update vermix.gglLC ref. output and add new secondary AD test (with LC on)
0633 in global_oce_latlon experiment.
0634
fca39df4c8 Jean*0635 checkpoint68u (2023/12/10)
143d9ce879 Dami*0636 o pkg/seaice:
0637 - new/improved LSR convergence criteria (CPP: SEAICE_ALLOW_LSR_FLEX, run-time:
0638 SEAICEuseLSRflex) accounting for both Non-Lin and Linear solver residual;
0639 tested in offline_exf_seaice.dyn_lsr; also add 2-D diagnostics for residual.
f0ff6e912a dngo*0640 o pkg/streamice:
0641 - rename STREAMICE_PETSC.h to STREAMICE_PETSC_MOD.h and rename
0642 STREAMICE_ARG_PETSC_mod code module to STREAMICE_PETSC_mod;
0643 - include STREAMICE_PETSC_MOD.h in src files rather than the module directly:
0644 this obviates the need for alphabetical order in names or serial compilation
15ec8028f7 aver*0645 o pkg/bling:
0646 - fix 2 small bugs in carbonate and aragonite saturation states: a) both Ksp
0647 coeff are fct of log of temperature (and not log10); b) add missing unit
0648 conversion factor to carbonate variable in OmegaC & OmegaAr calculation.
1052c30783 Jean*0649 o pkg/grdchk:
0650 - new S/R to get CTRL var/file name from grdchk-index ; use it to simplify
0651 (with new arguments) the 3 routines that handle CTRL var/file perturbations
0652 - rename grdchk_init to grdchk_get_mask ; move GRDCHK_SUMMARY call ;
0653 - report (in summary & in results section) CTRL var/file name used in grdchk.
51e381e9c9 Jean*0654 o pkg/dic:
0655 - fix loading of forcing file for the case DIC_forcingCycle = 0 ;
0656 - fix inconsistent timing params for loading initial surface-silica file ;
0657 - clean-up initialise-varia level S/R, now all called from dic_init_varia.F
0658 and move all forcing field initialisation to dic_ini_forcing.F ;
0659 - read and process pickup_dic meta file with error/warning (depending on
0660 pickupStrictlyMatch = T/F) if missing file or field.
65754df434 Mart*0661 o pkg/ctrl:
0662 - reduce pkg/ctrl/optim.h to just "optimcycle" and rename into OPTIMCYCLE.h ;
0663 - keep optim_readparms.F namelist unchanged and define variables locally.
0664
ec9548c9e7 Jean*0665 checkpoint68t (2023/10/28)
a2c35952f2 Jona*0666 o pkg/dic:
0667 - improve carbonate dissolution options (new params: selectCalciteDissolution)
0668 and fix a minor bug in dissolution rates according to Keir et al (1980);
0669 - change exp. so_box_biogeo secondary tests caSat0/3 to test option 2 & 3.
f5509be190 Mart*0670 o pkg/gmredi:
0671 - fix setting of GM_ExtraDiag that was not (always) turned on with 3D Kappa
0672 read from file, with Bates-K3d or QG-Leith, therefore missing 2 terms in
0673 isopycnal diffusion tensor; update ref. output of MLAdjust.QGLthGM test ;
0674 - add more check and stop for the case #undef GM_NON_UNITY_DIAGONAL ;
0675 - add runtime parameter GM_isoFac_calcK to allow to scale dynamically computed
0676 Kappa contribution in the Redi-tensor (default = 1.).
018c28d301 Jean*0677 o pkg/autodiff:
0678 - adjust call to S/R DIAGNOSTICS_SWITCH_ONOFF in autodiff_inadmode_set_ad.F
0679 so that snap-shot Adjoint diagnostics are filled within the same time-step
0680 as they are written to output file.
4d72283393 Mart*0681 o pkg/ctrl:
edcd27be69 Mart*0682 - rename ctrl_dummy.h to CTRL_DUMMY.h, remove unused variables & common blocks
0683 - retire CPP-flag ALLOW_HFACC/HFACC3D_CONTROL and remove related code.
0684 o pkg/ctrl:
4d72283393 Mart*0685 - rename header file "ctrl.h" to "CTRL.h".
4ec37fd829 Jean*0686 o utils/matlab/cs_grid:
0687 - update some basic matlab-scripts for CS-grid (split_*_cub.m,
0688 rotate_uv2uvEN.m, mk_psiLine_CS.m & use_psiLine.m) to a) also work with
0689 compact-format input; and (b) always assume "long-vector" are stored one
0690 face after the other (compact-format compatible);
0691 - new script to generate broken-lines (for computing meridional transport
0692 stream-function), simpler than the previous version in cs_grid/bk_line/;
0693 - update RGB-dims in 2 latloncap/ scripts to match pkg/exch2 convention.
172933ad7e Mart*0694 o pkg/ctrl:
0695 - simplify file name handling in ctrl_map_ini_gentim2d.F to please TAF (fixes
0696 hs94.1x64x5 TL test) without upsetting Tapenade & OpenAD.
85c224e862 Ou W*0697 o pkg/autodiff + ecco:
0698 - fix a typo in AD-var output file name (addummy_in_stepping.F);
0699 - fix and improve weight output in pkg/ecco/cost_generic.F
96b006450c dngo*0700 o pkg/streamice:
0701 - implementation of parameterized depth-dependent ice-shelf melt rate ;
0702 - new subroutines added to accumulate misfit cost based on time-dependent
0703 surface elevation and velocity observations (+ calls in pkg/cost) ;
0704 - fix generic ctrl (ctrl_map_ini_{genarr,gentim2d}.F) for OpenAD and
0705 add mapping of STREAMICE arrays to generic controls ;
0706 - update exp. halfpipe_streamice OAD & Tap setup (remove customized *.F)
0707 and switch on new CPP option ALLOW_COST_STREAMICE (+adjust params files).
910e5c3e29 Mart*0708 o pkg/autodiff:
0709 - fix a bug in ALLOW_AUTODIFF_WHTAPEIO code with ALLOW_DIVIDED_ADJOINT ;
0710 - refine grad-check + update output for AD test "lab_sea.noseaicedyn".
0711
26e63756eb Jean*0712 checkpoint68s (2023/09/11)
19ced9bf8f Mart*0713 o verification:
5a54dbbd56 Jean*0714 - change default ALLOW_IB_CORR (in pkg/ecco/ECCO_OPTIONS.h) to "#undef" and
0715 test that this code compiles in experiment global_oce_biogeo_bling ;
0716 - clean/update AD related CPP header files across all experiments and reduce
0717 differences with standard version in pkg autodiff, cost, ctrl and ecco.
0718 o verification:
19ced9bf8f Mart*0719 - change global_oce_latlon TAF set-up to multi-tiles (4 tiles, as in code_oad
0720 & code_tap) and add SIZE.h_mpi to enable MPI tests (in all 3 code_* dir).
7448700841 Mart*0721 o model/src & pkgs, TAF storage dir:
0722 - rearrange and add storing of variables to reduce number of (unwarned)
0723 recomp. in fluxform & vecinv pkgs and in model/src (e.g., calc_phi_hyd.F) ;
0724 - add store directives in solve_tri/pentadiagonal.F to avoid recomputation
0725 warnings with SOLVE_DIAGONAL_KINNER defined ;
0726 - add CPP condition inside GAD SOM advection S/R (-> empty ".f" file if
0727 neither GAD_ALLOW_TS_SOM_ADV nor PTRACERS_ALLOW_DYN_STATE is defined ) ;
0728 - clean-up/refine many unnecessary store directives -> less TAF warnings ;
0729 - remove unnecessary checkpointing code from pkg/smooth_diff2/3d.F
b038e3cc4f Mart*0730 o pkg/ggl90:
0731 - move computing the mixingLength to a dedicated routine ggl90_mixinglength.F
0732 - adjust/add TAF store directives to avoid hidden recomputations.
45315406aa Mart*0733 o pkg/seaice:
0734 - new option SEAICE_BGRID_DYNAMICS allows to remove/replace
0735 SEAICE_ALLOW_DYNAMICS by ( SEAICE_CGRID or SEAICE_BGRID_DYNAMICS ) ;
0736 - exclude more code if SEAICE_CGRID is undefined and clean up/rearrange
0737 SEAICE.h to form more consistent groups and common-blocks ;
0738 - update SEAICE_OPTIONS.h in verification experiments.
57622776fd Jean*0739 o pkg/mdsio:
0740 - Add 2 new arguments (kLo & kHi) to pkg/mdsio Slice I/O routines that allow
0741 to select which levels in Slice-array to read-in or to write-out to file.
0742
2a22bb531b Jean*0743 checkpoint68r (2023/08/02)
5bc996898d Mart*0744 o verification:
0745 - adjust amplitude of perturbation (grdchk_eps) to improve Fwd/Adj gradient
0746 check comparison in exp. global_ocean.90x40x15, global_with_exf & lab_sea ;
0747 - change location of grad-check (away from freezing Temp) in exp. OpenAD
0748 and rename experiment "OpenAD" to "global_oce_latlon".
444da61630 Mart*0749 o pkg/ctrl + pkg/grdchk:
0750 - define PARAMETER nobcs = 4 in CTRL_OBCS.h instead of SIZE.h ; update SIZE.h
0751 of all code_ad/oad/tap verification exp.
0752 - in pkg/grdchk, rename grdchk.h to GRDCHK.h and adjust src code to work
0753 without "nobcs" when OBCS_ALLOW_CONTROL is undefined.
44c9a33d03 Jean*0754 o verification:
0755 - Remove duplicated parameter files from input_tap/ dir and adjust prepare_run
0756 accordingly ; remove few untested additional files (in OpenAD/ & lab_sea/).
d73d15cdef antn*0757 o pkg/seaice:
8e32c48b8f Mart*0758 - rename ZMIN/ZMAX into SEAICE_ZMIN/ZMAX to avoid potential conflicts with kpp
0759 variables with the same name ; rename swfracb into SEAICE_SWFrac ;
0760 - fix a bug in computing SEAICE_SWFrac in pressure coordinates ; update exp.
0761 global_ocean.cs32x15.in_p reference output.
0762 o pkg/seaice:
d73d15cdef antn*0763 - SEAICE_USE_GROWTH_ADX: fix a bug related to flooding and fix budget closure
0764 for linear free-surface case.
025a9bb173 antn*0765 o pkg/ecco:
0766 - in cost_gencost_sshv4.F, enable to also process monthly data (previously,
0767 only daily) for SSH cost.
c61a47f63f Mart*0768 o pkg/ctrl:
0769 - remove left-over and unused code within ALLOW_NONDIMENSIONAL_CONTROL_IO
0770 (except in OBCS_CONTROL pack/unpack code); as a consequence, switch back
0771 ALLOW_PACKUNPACK_METHOD2 to #undef in exp. tutorial_global_oce_optim.
0772 o pkgs:
de57a2ec4b Mart*0773 - for local filenames, replace character*(80) by character*(MAX_LEN_FNAM)
0774 declaration, where possible, especially in pkgs: autodiff, ctrl, ecco,
0775 profiles, smooth & grdchk.
0776
acbfbd3bbd Jean*0777 checkpoint68q (2023/06/29)
5b0716a6b3 Mart*0778 o pkg/ggl90:
0779 - non IDEMIX code: fix bug (missing hFac) in matrix coefficient computation ;
0780 - fix RI-Number calculation for IDEMIX ; new flag GGL90_IDEMIX_CVMIX_VERSION
0781 (defined by default) to update IDEMIX to CVMix version ;
0782 - add new diagnostics ;
0783 - update Fwd ref. output of exp. isomip.obcs, global_ocean.90x40x15.idemix
0784 and global_ocean.cs32x15.in_p.
b4daa24319 Shre*0785 o pkg/tapenade + other Tapenade addition:
0786 - add new capability to use Tapenade to generate Adjoint & Tang-Linear model:
0787 new package (pkg/tapenade), new tools (tools/TAP_support), update genmake2
0788 and testreport ; add some docs (in progress);
0789 - modify src code & packages to work with tapenade ; add new code_tap/ &
0790 input_tap/ dirs (+ ref output) in 9 verification experiments to get
0791 tested with tapenade.
0792
8c2ab294fc Jean*0793 checkpoint68p (2023/05/07)
8377b8ee87 Mart*0794 o pkg/seaice:
0795 - fix compile error related to ALLOW_AUTODIFF_TAMC/ALLOW_AUTODIFF mix-up
0796 in seaice_evp.F; also replace many ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF
0797 where code is not specific to TAF/TAMC;
0798 - call S/R seaice_get_dynforcing every timestep to always have valid TAUX/Y;
0799 - move most of routine body of seaice_dynsolver.F inside the
0800 SEAICE_ALLOW_DYNAMICS block.
b0b45f2373 Ou W*0801 o pkg/ecco:
0802 - fix "sterGloH" output after a restart (issue related to Greatbatch
0803 correction) by writing & reading (small) new "pickup_ecco" files.
b938a3c63b antn*0804 o pkg/ctrl:
0805 - fix record number (mostly in ctrl_map_ini_gentim2d.F) in case of restart,
0806 using corresponding xx_gentim2d_startdate1/2 as specified from data.ctrl;
0807 this finalizes (+ fix) changes made in PR #260 and #380;
0808 - also add more debug print (+new CPP option ALLOW_CTRL_DEBUG);
0809 - improve generic-control documentation in Chap.10 (State Estimation).
ab47de63dc Mart*0810 o pkg/mom_common:
0811 - new expression for quadratic drag coefficient, function of cell thickness &
0812 roughness length (logarithmic law of the wall); for now, only for z-Coords.
0813 Turned on with CPP option ALLOW_BOTTOMDRAG_ROUGHNESS (MOM_COMMON_OPTIONS.h)
0814 and run-time setting zRoughBot > 0 in data, PARMS01 namelist.
0815 Tested in exp. tutorial_plume_on_slope, new secondary test "roughBot".
cda1c18f72 Jean*0816 o model/src & pkgs:
0817 Finish to remove code within retired CPP options:
0818 - remove orphan code within (many) removed ALLOW_()_CONTROL (as listed in
0819 PR #689 comments); remove seaice_ctrl_map_ini.F;
0820 - remove code within retired CPP options, remove call to COST_TRANSPORT,
0821 remove ALLOW_ECCO_BARSTORES and the 4 "ecco_ad_check_lev?_dir.h" files;
0822 - remove (check & stop) "using_cost_bp" & "using_cost_scat" from "data.ecco";
0823 - avoid few unused variables; use default CTRL_OPTIONS.h in exp. hs94.1x64x5.
a4e168e012 antn*0824 o pkg/seaice:
0825 - SEAICE_USE_GROWTH_ADX: fix diagnostic SIatmFW and add diagnostic SIeprflx
0826 to close seaice mass and heat budgets.
a17ca5331e Jean*0827 o pkg/dic:
0828 - remove TAF storage dir for variable "OmegaC" (within wrong CPP option).
0829
628b4a6c85 Jean*0830 checkpoint68o (2023/03/13)
d9efc637ba Mart*0831 o model/src:
0832 - salt/temp/ptracer_integrate.F: optimise store directives
0833 - add mising "obcs_seaice_sponge.f" to obcs_ad_diff.list
4890e8ebab antn*0834 o pkg/ecco:
0835 - smoothing in gencost_bpv4: allow to choose between a) call to smooth_basic2D
0836 (using a constant length, with run-time params replacing hard-coded values)
0837 or b) call to smooth_hetero2D (using a 2D field to be read in).
e99fa9b078 Mart*0838 o pkg/obcs:
0839 - update OBCS configuration summary.
806785c928 Jean*0840 o eesupp/inc, model/inc & pkgs:
0841 Clean CPP header files:
0842 - remove ALLOW_GENCOST_CONTRIBUTION from COST_OPTIONS.h (is already set in
0843 ECCO_OPTIONS.h);
0844 - move ALLOW_PACKUNPACK_METHOD2 from AUTODIFF_OPTIONS.h to CTRL_OPTIONS.h;
0845 - set EXCLUDE_WHIO_GLOBUFF_2D in MDSIO_OPTIONS.h (found in some customized
0846 AUTODIFF_OPTIONS.h);
0847 - list CPP options in pkg CPP header file (as undef) when used in any
0848 experiment local set-up;
0849 - fix typo in 2 CPP option names ; rename few (unused) pkg/fizhi CPP options;
0850 - update pkg dependence rule for pkg/bling ; avoid few unused variables.
28038c27d5 Lois*0851 o pkg/kl10:
0852 - get stratification from variable "SigmaR" (passed as argument) instead of
0853 recomputing locally in-situ density (less efficient and inaccurate when
0854 using Non-Linear EOS); update (kl10) ref output for internal_wave exp.
38d78826c7 Ciar*0855 o pkg/ecco:
0856 - add new generic integral cost function "m_boxmean_vol" (e.g. to track
0857 volume of isoycnal layer); add it to lab_sea secondary AD test "noseaice"
0858 and update ref. AD output file.
c26ad343d2 Jean*0859 o tools/build_options:
0860 - fix OpenMP option in ifort optfiles for modern intel compiler.
0861
f6d206d1bd Jean*0862 checkpoint68n (2023/02/08)
2b959ba38e Mart*0863 o pkg/seaice:
0864 - make all seaice-cost code independent of pkg/ecco and remove few
0865 SEAICE_COST.h from pkg/ecco ;
0866 - remove unused code related to ALLOW_SEAICE_COST_SMR_AREA (formerly used
0867 with ECCO_CTRL_DEPRECATED, seaice_cost_driver.F and S/R called from there),
0868 ALLOW_MEAN_SFLUX_COST_CONTRIBUTION + ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION,
0869 and retire associated parameters.
2e3e8c330d Jona*0870 o pkg/dic:
0871 - rename CPP: CAR_DISS -> DIC_CALCITE_SAT and AD_SAFE -> DIC_AD_SAFE and put
0872 all carbonate-saturation code and 3D arrays inside #ifdef DIC_CALCITE_SAT
0873 block and time-ave arrays within #ifdef ALLOW_TIMEAVE ;
0874 - add run-time params: useCalciteSaturation, calcOmegaCalciteFreq, nIterCO3,
0875 selectCalciteBottomRemin, KierRateK, KierRateExp and WsinkPIC ;
0876 - switch order of arguments to "myTime, myIter, myThid" in few remaining
0877 pkg/dic S/R + S/R calls in pkg/gchem ;
0878 - update exp. so_box_biogeo (define CARBONCHEM_TOTALPHSCALE & DIC_CALCITE_SAT)
0879 + add 2 new secondary tests (caSat0 & caSat3) with useCalciteSaturation=T
0880 and using 3-D silicate input file.
edb6656069 Mart*0881 o TAF tape keys:
0882 - rename many local taf keys to use shorter and more consistent names ;
0883 - pkg/thsice: fix bug in key computations.
1d99daeaf6 Oliv*0884 o pkg/diagnostics (+doc):
0885 - fix index-loop range in diagnostics_sum_levels.F and document "fileFlags"
0886 and associated features (vertical interpolation & integral & hFac scaling).
5a6997640b Mart*0887 o pkg/gmredi:
1d99daeaf6 Oliv*0888 - in gmredi_slope_limit.F, fix tape keys by using local tapes.
9293d3c672 Hajo*0889 o pkg/ggl90:
1d99daeaf6 Oliv*0890 - cleaning: remove maskS multiplication in ggl90_calc_visc.F (no equivalent
0891 for KappaRU) and update "output_oadm.ggl90.txt" in OpenAD exp.
ea7679383f Jean*0892 o pkg/ggl90:
9293d3c672 Hajo*0893 - Add code in pkg/ggl90 to parameterize Langmuir Circulation (LC) effects on
0894 vertical mixing (useLANGMUIR=T); follows: Tak et al, Ocean Modelling, 2023;
0895 - Primary effect is to increase mixing length scale due to LC ; the stokes
0896 velocity term is also included in the momentum equation (Coriolis term);
0897 - Tested in new secondary test "gglLC" in exp. "vermix".
0a1233e81a Ou W*0898 o pkg/ecco:
0899 - fix out-of-bound array index issue in cost_gencost_sshv4.F;
0900 - fix a small bug in same S/R (skipping call to smooth_hetero2d(anom_slaobs, )
0901 if gencost_outputlevel(igen_lsc)=0.);
0902 - in same S/R, skip output of "_smooth" file when smoothing is not applied.
c69ccc91fb antn*0903 o pkg/ctrl:
0904 - enable initial sea ice area/heff controls with correct definition of control
0905 indices;
0906 - move condition on useSEAICE inside seaice_init_varia.F (always initialize to
0907 zero) when compiling pkg/autodiff. Similar changes to shelfice_init_varia.F;
0908 - fix out-of-bounds index issue in ctrl_map_ini_genarr.F (igen_shiCDrag=0).
a1d0e455fd Hann*0909 o pkg/dic:
0910 - enable to read in prescribed 3d silicate fields for calcite-saturation
0911 calculation and 3-D pH calculation (#define CAR_DISS).
0912 - add 5 new 3-D diagnostics related to calcite-saturation calculation.
0913 - fix 2-D silica input file from tutorial_global_oce_biogeo and add 3-D silica
0914 input file to so_box_biogeo exp. (currently unused).
0915
af3e3bca65 Jean*0916 checkpoint68m (2022/12/05)
5b172de0d2 Jean*0917 o pkg/gmredi:
0918 - update Redi diffusion and GM (skew-flux or advective form) to also work with
0919 P-coordinates and most current tapering schemes ; change sign of sigmaR (for
0920 now, only within pkg/gmredi) to always be the same as stratification, i.e.,
0921 positive if stratified ; add 2 arguments to GMREDI_SLOPE_LIMIT for 'ldd97'.
0922 - with p-coord, keep sign of slope component unchanged (same as dSigmaX,Y)
0923 and flip sign (-gravitySign) of Redi-tensor extra-diagonal terms ; also keep
0924 stream-function components GM_PsiX & GM_PsiY unchanged and flip sign when
0925 computing bolus-transport (left handed coord).
a1d0e455fd Hann*0926 - add unit conversion factor between p and z coord. at level center, function
0927 of vertical profile of ref. density ; used inside slope-limiter and tapering
0928 function.
5b172de0d2 Jean*0929 - stop if trying to use P-coord with not yet updated gmredi pieces of code.
0930 - add a simple secondary test in front_relax exp. using GM and p-coord.
20dee61641 Mart*0931 o pkg/autodiff:
0932 - cleanup tamc.h: remove unused parameters and nthreads_chkpkt as it is (and
0933 should be) always one; update all verification exp. code_ad versions.
0934 - simplify tape-key dependence on tile indices (remove thread grouping).
f9d7cbfb72 Ou W*0935 o pkg/ctrl:
0936 - add run-time variable ctrlDir to specify a directory different from default
0937 current directory for I/O of controls adjustment and adjoint gradient (xx
0938 and adxx), and other active files; used (as example) in lab_sea experiment.
0939 o pkg/smooth:
0940 - add run-time variable smoothDir to specify a directory different from
0941 default current directory for I/O of smoothing operators.
0942
1575dc0796 Jean*0943 checkpoint68l (2022/10/26)
cc9097e522 Oliv*0944 o pkg/longstep:
0945 - fix initialization of LS_fwFlux ;
0946 - move params report & check to new S/R LONGSTEP_CHECK.
dbb54b7d7a Jean*0947 o model/src:
0948 - fix ocean r-star pressure gradient in case model top is not uniformly at r=0
0949 - update ref output of secondary test "isomip.obcs".
d220271442 Oliv*0950 o tools/genmake2:
0951 - Remove unnecessary awk escape sequence ; this avoids a warning with recent
0952 GNU awk (5.0.1 and newer).
3924ebfa1b Mart*0953 o tools/adjoint_options:
0954 - merge five ad-optfiles into single one with compact list of generic control
0955 variables and obcs-control variables ;
0956 - to use divided adjoint (DIVA), in genmake_local, set new flag USE_DIVA=1
0957 (replacing "adjoint_diva");
0958 - select which Fortran version is sent to TAF by setting TAF_FORTRAN_VERS
0959 to either F77, F90, or F95 (replacing "adjoint_f95") ;
0960 - to replace "adjoint_tamc_compatibility", in genmake_local, set new flag
0961 TAMC_COMPATIBILITY_MODE=1 ;
0962 - remove "-server fastopt.net" to use the default server (fastopt.de)
0963 - use the staf default server (currently "fastopt.de") instead of specific
0964 server "fastopt.net" ;
0965 - remove more commented lines (remove_comments_sed) in src code sent to TAF ;
0966 - remove obsolete "ad_taf_output.f.*" diff-patches in tools/ ;
0967 - remove "ad_optfile.local" files from some verification experiments ; keep
0968 example how to specify local optfile in verification/bottom_ctrl_5x5 ;
8a34959769 dngo*0969 o pkg/streamice:
0970 - changes related to PETc solver interface to be compatible with PETSc
0971 version 3.8 and above and also available without MPI;
0972 - also make sure PETSc is not used at runtime by default.
0973
4cf519afc7 Jean*0974 checkpoint68k (2022/08/17)
cf705a6c8e Mart*0975 o pkg/ctrl, ecco, ... :
0976 Remove untested and obsolete ECCO_CTRL_DEPRECATED code: From now on it is
0977 only possible to specify control parameters through generic controls.
0978 - retire associated pkg/ctrl and pkg/autodiff flags, such as: ctrlUseGen,
0979 xx_hflux_file, xx_hflux_startdate1, ..., ctrlSmoothCorrel2D/3D,
0980 useSmoothCorrel2DinAdMode. Most of these did not have any effect with
0981 undefined ECCO_CTRL_DEPRECATED, but were still allowed in data.ctrl.
0982 Now specifying them is an error and stops the run.
0983 - remove code that assumes ctrlUseGen=F
0984 - remove empty and unused subroutines:
0985 * pkg/ctrl: ctrl_weights.h, ctrl_map_ini_gen.F, ctrl_smooth.F,
0986 ctrl_map_ini.F, ctrl_map_ini_ecco.F, ctrl_map_ini.F, ctrl_map_ini_ecco.F
0987 * pkg/ecco: cost_forcing.F, cost_hyd.F, cost_internal_params.F, cost_ssh.F
0988 ecco_cost_summary.F
0989 * pkg/smooth: smooth_correl2dw.F
0990 * pkg/seaice: seaice_cost_areasst.F
0991 - adjust parameters in verification experiment that still contained retired
0992 parameters
0993 - switch global_ocean.cs32x15.thsice to using generic control variables
0994 Note: some untested code (notably pkg/admtlm, which did not compile before)
0995 will be more difficult to resurrect without the ECCO_CTRL_DEPRECATED code.
f18a893d42 Mart*0996 o pkg/ggl90:
0997 - adjust code to also work under an ice-shelf (with pkg/shelfice); idemix
0998 under ice-shelf not fixed yet.
0999 - turn on ggl90 in isomip experiment secondary test "obcs" and update
1000 reference output file.
94a8024bbe Jean*1001 o pkg/gmredi:
1002 - allow to read-in 3-D background isopycnal (Redi) and thickness (GM)
1003 diffusivity without pkg/ctrl: new 3-D arrays, new CPP options:
1004 GM_READ_K3D_REDI & GM_READ_K3D_GM and new input files: GM_K3dRediFile &
1005 GM_K3dGMFile (replacing retired GM_isopycK3dFile & GM_background_K3dFile).
1006 - update code for ALLOW_KAPGM_CONTROL & ALLOW_KAPREDI_CONTROL to use
1007 these new 3-D arrays (from GMREDI.h) and move setting of 3-D control arrays
1008 from from ini_mixing.F to gmredi_init_varia.F (+ adjust call condition);
1009 Note: need to define new option GM_INPUT_K3D_GM and/or GM_INPUT_K3D_REDI
1010 to use KAPGM_CONTROL and/or KAPREDI_CONTROL.
1011 - remove obsolete code & CPP option ALLOW_KAPGM/KAPREDI_CONTROL_OLD
1012
f03a2f5e21 Jean*1013 checkpoint68j (2022/06/28)
cc60455fbb Mart*1014 o pkg/exf:
1015 - implement drag coefficient of Large and Yeager (2009), Climate Dynamics, 33,
1016 pages 341-364, within #ifdef ALLOW_DRAG_LARGEYEAGER09
fe1862e69b Mart*1017 o autodiff(TAF):
1018 - fix few taf recomputation and conflict warnings in: calc_3d_diffusivity.F
1019 (PCELL_MIX_CODE), pkg/bling & dwnslope_apply.F ; update reference AD output
1020 of exp. that use pkg/dwnslope (lab_sea).
f6de6620bc Mart*1021 o pkg/thsice:
1022 - fix bug in computation of ustar (case velocity=0) in thsice_calc_thickn.F;
1023 - introduce & document THSICE_REGULARIZE_CALC_THICKN flag.
20a156cdce Mart*1024 o pkg/generic_advdiff (TAF):
1025 - in gad_advection.F, replace global tapes "comlev1_bibj_k_gad" &
1026 "comlev1_bibj_k_gad" by local tapes; avoid unnecessary recomputations, but
1027 recompute full routine (only) once in ad-routine;
1028 - this affects results when useApproxAdvectionInAdMode=T, since now all tapes
1029 are computed using approximate Adv-Scheme (inAdMode=T); udate AD ref. output
1030 of exp. global_ocean.cs32x15.seaice.
3bafcf6020 Timo*1031 o pkg/shelfice:
1032 - Remove ALLOW_SHIFWFLX_CONTROL and all xx_shifwflx related code in favor of
1033 already implemented gentim2d;
1034 - move update of shelficeLoadAnomaly inside shelfice_step_icemass.F (within
1035 IF (SHELFICEMassStepping) ...);
1036 - fix storage dir for SHELFICEMassStepping, allowing to realFreshWaterFlux=T
1037 with ALLOW_AUTODIFF defined (remove STOP there). Still not working with
1038 OpenAD (add a STOP in shelfice_check.F).
1039
9bcb497701 Jean*1040 checkpoint68i (2022/04/27)
6b551785d1 Jean*1041 o eesupp/src:
1042 - simplify reading parameter file, using single scratch file (instead of 2).
2e7aec9951 dngo*1043 o verification, OpenAD:
1044 - make all OpenAD experiments use generic control variables, so that from now
1045 on, the ECCO_CTRL_DEPRECATED code is no longer tested in verification
1046 (neither in verification_other, where it never was tested), except for
1047 global_ocean.cs32x15.thsice (this is intentioal).
113b21cd45 Mart*1048 o autodiff(TAF):
1049 - avoid unnecessary local recomputations and associated warnings by storing to
1050 local tapes in: seaice/advect.F, gad_dst3fl_impl_r.F, gmredi_slope_limit.F,
1051 shap_filt_uv_s2.F, solve_pentadiagonal.F
a85293d087 Mart*1052 o pkg/thsice:
1053 - fix store directives + modify code of thsice_calc_thickn.F, thsice_extend.F
1054 and thsice_solve4temp.F to avoid 28 recomputation warnings and recomputing
1055 the state unnecessarily;
1056 - define new tape and retire two old thsice related tapes (commented out for
1057 now) in the_main_loop.F;
1058 - change offline_exf_seaice.thsice experiment to be more sensitive to changes;
1059 - fixing a bug leads to smaller gradient errors and correct TLM cost function
1060 values and requires updating (both ADM and TLM) offline_exf_seaice.thsice
1061 and global_ocean.cs32x15.thsice reference output;
07b7562e86 Ou W*1062 o pkg/ctrl:
1063 - fix issue in S/R CTRL_MAP_GENARR3D by explicitly set xx_gen to zero where
1064 wgenarr3d is zero ; also replacing 10^xx_gen with EXP(log(10)*xx_gen) for
1065 log10ctrl produces small differences at machine truncation level.
3d93c0a01e Ou W*1066 o eesupp & pkg/mdsio:
1067 - new (CPP) Macro to open read-only files with ACTION='read', added to
1068 most pkg/mdsio S/R (+ exf_interp_read.F); disable this in few old compiler
1069 optfiles (g77, pgf77) by adding EXCLUDE_OPEN_ACTION to DEFINES list.
51575f66de Mart*1070 o model:
1071 - new CPP option to exclude (= default) S/R CONVECTIVE_ADJUSTMENT_INI;
1072 to reproduce old results, define new option INCLUDE_CONVECT_INI_CALL in
1073 two verification experiments: exp2 and tutorial_tracer_adjsens.
1074 - add a check for INCLUDE_CONVECT_CALL if cAdjFreq <> 0.
fefbff5637 Mart*1075 o tools/build_options:
1076 - new optfile "darwin_arm64_gfortran" for Mac ARM 64-bit processor.
6514215240 Jean*1077 o pkg/gmredi:
1078 - add deep-factor to pkg/gmredi code to work with "deepAtmosphere=T".
a99d705983 Jean*1079 o verification/cpl_aim+ocn:
1080 - add secondary test set-up using seaice dynamics (pkg/seaice) as part of
1081 ocean component and update script to handle option to run multiple test.
adac922254 dngo*1082 o verification/halfpipe_streamice:
1083 - update OpenAD test by removing ECCO_CPPOPTIONS.h (but, for now, keep local
1084 version: ctrl_map_gentim2d.F & ctrl_map_ini_genarr.F in code_oad).
64811cb024 Jean*1085 o pkg/mypackage:
1086 - improve description (for a coding style example).
7e00d7e8f9 Jean*1087 o model:
1088 - add option to apply a correction for net global fresh-water flux imbalance
1089 proportional to, fixed in time, 2-D weight field that is read-in from file ;
1090 - new integer selector "selectBalanceEmPmR" (=0: off, =1: uniform correction,
1091 =2: correction scaled by weight) that replaces logical switch "balanceEmPmR"
1092 with backward compatibility setting.
1093
479cbc238b Jean*1094 checkpoint68h (2022/03/22)
aa93ca8e85 Ciar*1095 o pkg/ecco:
0cd0083da8 Ou W*1096 - new src files: ecco_init_fixed.F & ecco_diagnostics_init.F ;
1097 - new SSH diagnostics: SSH,SSHNOIBC (with & w-out Inv.Barometer corr.: SSHIBC)
1098 STERICHT (steric height anomaly); and Bottom-Pressure/Mass: OBP & OBPGMAP ;
1099 - add arg myTime & myIter to S/R ECCO_PHYS and adjust calls ; change to use
1100 model "rhoInSitu" (instead of recomputed rho) for Greatbatch correction ;
1101 this affects cost "m_eta".
1102 o pkg/ecco:
aa93ca8e85 Ciar*1103 - add new feature (within gencost) to evaluate cost-function contribution
1104 over specified density range (instead of depth range, see issue #483);
1105 - add few run-time parameters including logical switch: gencost_useDensityMask
1106 - test this new feature in lab_sea/input_ad.noseaice and update ref. output.
ef7fa68a19 Jean*1107 o pkg/ptracer (adjoint):
1108 - remove AUTODIFF_PTRACERS_SPLIT_FILES as it has no effect.
1109 o pkg/generic_advdiff & seaice (adjoint):
1574069d50 Mart*1110 - avoid recomputation in Second-Order Moment (SOM) advection S/R by using
1111 local tapes ; reduce local tapesize in seaice_solve4temp.F ;
479cbc238b Jean*1112 - fix key and size of tapes in multi-dimensional advection routines and adjust
1574069d50 Mart*1113 maxcube value (2 or 3 if using CubedSphereExchange) in few exp. "tamc.h".
30ad0459d6 Jean*1114 o pkg/mdsio:
1115 - retire all S/R from mdsio_rw_slice.F after replacing the last 2 calls to
1116 MDSWRITEFIELD{X,Y}Z in pkg/ctrl/ctrl_set_globfld_{x,y}z.F with calls to
1117 S/R WRITE_REC_{X,Y}Z_RL (from pkg/rw).
1118 - remove src file mdsio_rw_field.F & mdsio_rw_slice.F from NOOPTFILES list
1119 in few linux_amd64_ifort* optfiles.
1120 - move if statement out of "lengthBuff" loop in mdsio_{read,write}_whalos.F
16cc32c739 Mart*1121 o verification AD exp.:
1122 - remove ECCO_CPPOPTIONS.h from global_ocean_ebm/ and halfpipe_streamice/
1123 code_ad/ dir and replace by appropriate AUTODIFF/CTRL/COST_OPTIONS.h ;
1124 - for halfpipe_streamice AD exp., make necessary adjustments in pkg/streamice
30ad0459d6 Jean*1125 and remove ALLOW_GENTIM2D_CONTROL from store directive header files
16cc32c739 Mart*1126 streamice_ad_check_lev?_dir.h ;
1127 - remove customized version of ctrl_map_gentim2d.F & ctrl_map_ini_genarr.F
1128 from halfpipe_streamice/code_ad/ and add corresponding code to pkg/ctrl.
1129
ec9af22855 Jean*1130 checkpoint68g (2022/02/19)
0bad585a21 Navi*1131 o doc:
1132 - fix some math notation in docs.
385da9f3ec Jean*1133 o pkg/obcs:
1134 - avoid division by zero when useOBCStides=.True. and tidalPeriod=0.
8233d0ceb9 Jean*1135 o pkg/gmredi:
1136 - fix basic code to also work with dry grid cells near the top (e.g., under
1137 ice-shelf) and in this case, for now, stop if unsafe features are used ;
1138 - fix tapering 'ac02' and 'stableGmAdjTap' ;
1139 - add a secondary test, "input.top", in verification exp. front_relax to test
1140 GM with dry cells at the top (+ also 'ac02' tapering) ;
1141 - update few adm & tlm & oad ref. output from exp. global_ocean.90x40x15
1142 since adding better masking in gmredi_s{x,y}rtransport.F does affect AD &
1143 TLM gradient (@ machine truncation level).
3c775cbf98 Mart*1144 o pkg/autodiff:
1145 - new CPP-flags allow to turnoff (default) autodiff_store/restore entirely:
1146 * New flags AUTODIFF_USE_STORE_RESTORE, AUTODIFF_USE_STORE_RESTORE_OBCS to
1147 turn on autodiff_store/restore, undefined by default ;
1148 * AUTODIFF_EXCLUDE_ADEXCH_RS to skip calls to some AD-exch (if missing).
1149 - improve comments in AUTODIFF_OPTIONS.h, fix some store directives for new
1150 default, which are:
1151 #define ALLOW_AUTODIFF_WHTAPEIO
1152 c#define AUTODIFF_USE_MDSFINDUNITS
1153 #undef AUTODIFF_USE_STORE_STORE_RESTORE
1154 #undef AUTODIFF_USE_STORE_STORE_RESTORE_OBCS
1155 and update local AUTODIFF_OPTIONS.h files from verification experiments.
1156 - experiment specific setting:
1157 * define AUTODIFF_EXCLUDE_ADEXCH_RS in exp.: hs94.1x64x5, obcs_ctrl & OpenAD
1158 * increase "nWH" value in local MDSIO_BUFF_WH.h for exp.:
1159 global_oce_biogeo_bling, offline_exf_seaice & tutorial_dic_adjoffline
1160 - add a TAF "INCOMPLETE" directive for TICES and wVel to avoid a TAF bug.
1161 - fix a TAF store directive to avoid extra call of "load_fields_driver"
1162 with EXF_SEAICE_FRACTION defined.
f2389c73b0 Jean*1163 o pkg/gmredi:
1164 - rename S/R, CPP option (GM_BATES_K3D), on/off switch (GM_useBatesK3d),
1165 parameters (GM_Bates_*) and 3-D var (GM_BatesK3d) of Bates etal (JPO, 2014)
1166 scheme that computes 3-D field GM/Redi diffusivity (analog to Visbeck etal
1167 variable/option naming example).
1168
65dd265852 Jean*1169 checkpoint68f (2022/01/14)
f2389c73b0 Jean*1170 o pkg/exf:
56d13a40ed Mart*1171 - clean-up relative wind implementation so that uwind and vwind are kept
1172 unchanged (always vanilla atmospheric winds after interpolation) while
1173 relative wind is computed locally; add diagnostics for relative wind.
1174 - adjust pkg/seaice relative-wind code (+ clean-up SEAICE_GREASE code).
0c240d16ef Jean*1175 o pkg/kpp:
1176 - avoid updating input argument "kmtj" in S/R BLDEPTH (in: kpp_routines.F);
1177 this also remove/avoid 3 recomputation warnings for kmtj in adm (TAF) built.
0fbff46b46 dngo*1178 o pkg/streamice:
1179 - fix regularised coulomb basal stress impl to avoid issues with adjoint ;
1180 - cancel metric terms in stress tensor for cartesian grid ;
1181 - allow (time-indep) velocities to be imposed from external file rather than
1182 solved for ;
1183 - allow for specification of log of controls as well as sqrt ;
1184 - allow termination of adjoint fixed point loop based on relative and absolute
1185 error ;
1186 - terminate adjoint fixed point loop when change between most recent iterates
1187 begins to increase (a sign of unstable growth from linear solve errors ?);
1188 update OAD output of exp. halfpipe_streamice (affected by this modif).
c704c5a1ef Mart*1189 o pkg/seaice:
1190 - replace hard-coded parameters for JNKF line search by new runtime parameters
1191 SEAICE_JFNK_lsGamma and SEAICE_JFNK_lsLmax ;
1192 - increment line search counter after reporting and fix an if statement, so
1193 that zeroth step is not counted for more consistent debugging output.
f397060a05 dfer*1194 o tools/build_options:
3ee2cce2f5 Jean*1195 - update pleiades optfile "linux_amd64_ifort+mpi_ice_nas"
f397060a05 dfer*1196 - rename/update optfile for UK HPC Archer2.
9f5240b52a Jean*1197 o pkgs:
1198 - remove/avoid unused variables from AD verification exp. built except from
1199 halfpipe_streamice (pkg/streamice); also clean-up a bit pkg/smooth.
3b6c79e4de Mart*1200 o pkg/autodiff:
1201 - introduce separate tapes for integer arrays: the corresponding routines
1202 just convert between integer and double precision arrays and call the
1203 original adread/adwrite routines.
934d981c17 Jean*1204 o pkg/atm_compon_interf:
1205 - only with Atm-Phys pkg, allow "regional coupling", i.e. coupled only where
1206 there is ocean, keeping Atm-Phys basic mixed-layer elsewhere.
1207
d7c15ab3ba Jean*1208 checkpoint68e (2021/12/10)
ae17457769 Andr*1209 o lsopt & optim:
1210 - update Makefiles and README.
c7de4e3cb2 antn*1211 o pkg/ctrl:
37e373688b Mart*1212 - remove unused flag ALLOW_ECCO_OPTIMIZATION and associated code, always save
1213 "fcloc" to gradient vector file and save fcloc=0 to initial ctrl vector file
1214 (which is never used); also remove it from any code*/CTRL_OPTIONS.h.
1215 o pkg/ctrl:
c7de4e3cb2 antn*1216 - replace few calls to MDS_READ/WRITE_FIELD with corresponding call to
1217 pkg/rw READ/WRITE_REC_3D_RL ; also clean-up: ctrl_map_ini_gen.F
7855a13227 Mart*1218 o tape related code (adjoint):
1219 - clean-up tape code in the init-phase, mainly in the_main_loop.F and in
1220 ctrl_map_ini_gentim2d.F ;
1221 - remove unused (ecco) cost_averages_bar_directives.h ;
1222 - adjust comments in (autodiff) adread_adwrite.F & in main_do_loop.F
c3d0b098ae Lars*1223 o eesupp:
1224 - fix scratch file names when using PDAF.
6e2befed03 Oliv*1225 o pkg/exf:
1226 - fix issue in interannual monthly forcing addition (case ${fld}period=0)
bb459eb78c Jean*1227 o model/src:
1228 - skip reading kapGM and kapRedi from ini_mixing.F when useGMRedi is .FALSE.
deacece587 Oliv*1229 o pkg/exf:
1230 - add option for interannual monthly forcing with pkg/cal by setting
1231 ${fld}_period=-1. (like -12. indicates climatological monthly forcing),
1232 available with or without useExfYearlyFields ; update exp. global_with_exf
1233 SST forcing to test this new option with and without useExfYearlyFields.
d68b36a485 Mart*1234 o model/src:
1235 - define local arrays cg2d_q/v/z without overlaps in all 4 cg2d*.F
1236 and skip initialisation of cg2d_q in cg2d.F
9d0c386f0c dngo*1237 o tools/genmake2:
1238 - new option to call OpenAD compiler in a singularity container (if provided);
1239 add option to testreport too and update OpenAD doc (in section 7.5).
1240
4300da6d2c Jean*1241 checkpoint68d (2021/11/05)
71a2d60687 Jean*1242 o verification/*/results:
1243 - update few adm and tlm refence output to get closer agreement.
75c5b64bda Jean*1244 o verification/global_ocean.90x40x15:
1245 - no longer use old bug (fixed in Oct 2015) in KAPGM_CONTROL & KAPREDI_CONTROL
1246 code and update AD & TL ref. output for kapgm & kapredi tests ;
1247 - other small cleaning: finish removing OLD_THSICE_CALL_SEQUENCE code ; remove
1248 "cost_yftype" from experiments "data.ecco" ; move ALLOW_ECCO_OPTIMIZATION
1249 to the right header file.
016b84c482 Mart*1250 o pkgs pp81, my82, opps & ggl90:
1251 - remove pkg/timeave and pkg/mnc output from these mixing packages (since
1252 this functionality is available with pkg diagnostics); add 1 diagnostics
1253 to pkg/opps (to replave TAVE output).
7ea6a3439c Jean*1254 o tools/build_options:
1255 - add "-DAUTODIFF_USE_MDSFINDUNITS -DPROFILES_USE_MDSFINDUNITS" to DEFINES
1256 in g77 optfile ; this allows to run set-up with AUTODIFF_WHTAPEIO and/or
1257 with pkg/profiles using g77 (with S/R MDSFINDUNITS) while other compilers
1258 continue to use local version with extended range of I/O units number.
ebcc29af97 Jean*1259 o pkg/ecco:
1260 - fix halo initialisation for argument "active_var" in cost_genread.F ;
1261 - change "facNum" expression in cost_gencost_transp.F, to be consistent with
1262 comment in src code, by adding missing factor "nSx"; also avoid division
1263 in PARAMETER statement.
1c2b1fa3bc Mart*1264 o model/inc:
1265 - move potentially time dependent grid variable from GRID_RS to new common
1266 block GRID_VAR_RS (hFacW/S/W, etc.) and split common block CG2D_I_R into
1267 a _RL and a _RS part ; adjust AD common block accordingly.
11c3150c71 Mart*1268 o verification AD experiments:
1269 Update TAF AD exp. so that none relies anymore on ECCO_CTRL_DEPRECATED code:
1270 - remove #define ECCO_CTRL_DEPRECATED from experiments: 1D_ocean_ice_column,
1271 bottom_ctrl_5x5, global_with_exf, lab_sea, OpenAD, tutorial_dic_adjoffline,
1272 tutorial_global_oce_biogeo & tutorial_global_oce_optim ; use instead generic
1273 control and generic cost.
1274 - for now, keep experiment global_ocean.cs32x15 with both ECCO_CTRL_DEPRECATED
1275 code and generic control + generic cost.
1276 - also remove ECCO_CPPOPTIONS.h (use instead set of pkg specific OPTIONS
1277 header files) from these experiments above.
1278 - results unchanged except few digits in cost & ad-monitor for lab_sea &
1279 obcs_ctrl ; and few minor recomp. warnings count changes for
1280 tutorial_global_oce_biogeo (-4) and for tutorial_dic_adjoffline (+2).
1281 Update pkgs as needed:
1282 - pkg/ecco: fix field declarations for ecco_toolbox routines and cost_readgen,
1283 new toolbox routines ecco_offset, ecco_maskmindepth, make argument lists
1284 more consistent between ecco_toolbox routines and remove unused subroutines;
1285 - pkg/cost: fix ALLOW_COST_DEPTH contribution;
1286 - pkg/ctrl: add more "ifdef ECCO_CTRL_DEPRECATED" where necessary;
1287 - pkg/exf: add xx_snowprecip as generic control, adjust CPP-flags.
d97a730ee3 Jean*1288 o pkg/gmredi:
1289 - remove condition (ifdef GM_NON_UNITY_DIAGONAL) around 3-D arrays Kux & Kvy
1290 to simplify how GMREDI is applied (e.g., gmredi_x/ytransport); fill up these
1291 2 arrays with constant value (gmredi_calc_tensor.F & offline_get_diffus.F)
1292 when GM_NON_UNITY_DIAGONAL is undef (to reproduce old results).
1293 - also with GM_NON_UNITY_DIAGONAL undef, fix ALLOW_KAPREDI_CONTROL averaging.
c59dd234b1 Jean*1294 o tangent-linear:
1295 - fix few hand-written tangent-linear src code (in autodiff & ctrl pkgs);
1296 - add new target "ftlobj" to Makefile (similar to "obj" & "adobj" for forward
1297 and AD built) and corresponding switch in testreport ;
1298 - fix non-standard sed command (for Mac) in TLM testreport.
1299
2ffc13e2be Jean*1300 checkpoint68c (2021/10/02)
dc26f158aa Mart*1301 o pkg/seaice:
1302 - update some dynamics solver default so that now:
1303 a) SEAICEuseEVPstar = .TRUE. ; b) SEAICEuseEVPrev = .TRUE. ;
1304 c) LSR_ERROR = 1.e-5 (previously was 1.e-4) ;
1305 - put back old default in exp. lab_sea (primary test);
1306 - modify (simplify?) logic in seaice_readparms.F and seaice_check.F.
cf8a0ac466 Jean*1307 o pkg/grdchk:
1308 - allow to use "recglo" to specify a particular control time record for
1309 gradient check (was previously inactive).
f4a4b4841b Jean*1310 o pkg/exf:
1311 - new parameters to reduce AD-exf monitor output:
1312 1) exf_adjMonFreq (def= adjMonitorFreq), = 0. suppresses all output
1313 2) exf_adjMonSelect: =1 (def): less output ; =3 as before, =0 : no output
1314 - fix some AD-common block name + content to match TAF directives (in
1315 common.flow) and TAF generated code.
1316 - skip monitor of model forcing AD-variables (unless monitorSelect=4).
44d3986245 Jean*1317 o pkg/ecco + other:
1318 - fix few non-standard syntax (+ repeated setting of "gencost_msk_is3d").
7fbec11c25 Jean*1319 o pkg/bling:
1320 - fix call to S/R BLING_BIO_NITROGEN when USE_SIBLING is defined.
13d362b8c1 Ou W*1321 o pkg/ecco:
1322 - put various dimensions related to gencost out of "ecco.h" into specific
1323 (new) header file "ECCO_SIZE.h" and rename "ecco.h" to "ECCO.h" ;
1324 - add gencost param "gencost_kLev_select" to select a vertical level (from 3-D
1325 array) to form 2-D gencost ; currently only used in drifter velocity cost ;
1326 - add a couple of costs based on 1) inverse barometer (IB) corrected model sea
1327 level for altimetry data comparison 2) OBP excluding contribution from
1328 global mean atmospheric pressure for comparisons with GRACE data.
7f5c807389 Jean*1329 o pkg/autodiff:
1330 - fix type (_RS vs_RL) of AD-vars in hand-written AD routine cg2d_mad.F and
1331 in adcommon.h, common block adgrid_rs.
042d2503e1 Jean*1332 o model/src:
1333 - fix missing initialisation of local working arrays that were previously
1334 in common block in CG2D.h (needed when using blank tiles).
6b3f5dbce1 Hann*1335 o pkg/dic:
1336 - fix calculation of carbonate saturation state (with CAR_DISS defined) when
1337 #define CARBONCHEM_SOLVESAPHE ; no current test run with #define CAR_DISS.
aecc8b0f47 Mart*1338 o pkg/autodiff:
1339 - add code for Full-Adjoint of cg2d in renamed (from cg2d_sad.F) routine
1340 cg2d_mad.F (cg2d manual adjoint) ;
1341 - new runtime params cg2dFullAdjoint (data.autodiff), useNSACGSolver (data,
1342 default to "FALSE"), cg2dMinItersNSA (data, defaults to 0) ;
1343 - new sub-verification experiment bottom_ctrl_5x5.facg2d to test new
1344 Full-Adjoint capability ;
1345 - update primary test experiment bottom_ctrl_5x5 to always use a minimum
1346 number of 10 CG2D iterations (changes results but improves accuracy) ;
1347 - modify AD-experiment global_ocean.90x40x15.bottomdrag to use full nonlinear
1348 free surface (nonlinFreeSurf=4) and cg2dFullAdjoint=True.
042d2503e1 Jean*1349 - move CG2D working arrays out of CG2D.h common blocks (not necessary)
1350 to local arrays within each cg2d S/R.
aecc8b0f47 Mart*1351
93664352be Jean*1352 checkpoint68b (2021/08/24)
906a61c194 Ou W*1353 o pkg/ecco:
1354 - add time-series output of global mean steric height change at each time step
1355 (variable: sterGloH, with #define ALLOW_PSBAR_STERIC) ; turned on
1356 with run-time switch "ecco_output_sterGloH=T" ; add option to keep file open
1357 (+ single meta file writing) with "ecco_keepTSeriesOutp_open=T" switch.
31f96e9372 Jean*1358 o pkg/ggl90:
1359 - fix EXCH calls in pkg/ggl90 when IDEMIX is used: no additional EXCH when
1360 using zero horizontal diffusion of IDEMIX_E (IDEMIX_tau_h=0) but with
1361 IDEMIX_tau_h > 0, EXCH both IDEMIX_E and GGL90TKE ; this affects results
1362 of test experiment cs32.in_p and fix restart issue ;
1363 - more consistent/simpler idemix code: use model parameter value for PI,
1364 reduce number of IDEMIX global array, add TKE tendency from IDEMIX as output
1365 of S/R GGL90_IDEMIX ; use double product of IDEMIX_E instead of power of 2
1366 which affects results at machine truncation level ;
1367 - update some IDEMIX default param values (following Pollmann et al., 2017)
1368 but keep old default values in global_ocean.90x40x15.idemix ;
1369 - apply also option calcMeanVertShear to uStarSquare calculation (wind-stress
1370 magnitude) and switch on calcMeanVertShear in test experiment cs32.in_p.
0320e25227 Mart*1371 o model/src + pkgs ggl90, exf & seaice: ocean in P-coordinate
1372 - read geopotential anomaly directly into phi0surf instead of via pLoad (was
1373 a hack), specified with new input filename "geoPotAnomFile" in data&PARM05 ;
1374 - adjust MXLDEPTH diagnostic for pressure coordinates ; make sure sigmaR is
1375 computed the same way in P-coord as it is in Z-coord.
1376 - for penetrating Short-wave and geothermal heating as well as for exf forcing
1377 and seaice, use the correct P-coord vertical index for bottom and surface ;
1378 - add a flag sIceLoadFac (in "data", default=1.) to be able to turn off
1379 seaice surface pressure loading, mainly for Z-coord (since not currently
1380 supported in P-coord) ;
1381 - use diagnostics "phiHydLow" for seaice dynamics with P-coord ocean to get
1382 surface tilt term (instead of using ETAN as in Z-coord); fix restart by
1383 adding phiHydLow (only if useSEAICE and usingPCoords) to main pickup file ;
1384 - in pkg/ggl90, apply simple scaling to get mixing-length in meters (from
1385 pressure) so that no parameter changes are necessary ; significant code
1386 changes regarding surface & bottom index + direction of vertical k loop ;
1387 - add secondary test "in_p" to experiment global_ocean.cs32x15 (similar to
1388 Z-coord secondary test "seaice" but using pkg/ggl90 and without pkg/gmredi).
62748458e3 Jeff*1389 o tutorial_reentrant_channel:
1390 - add python notebook (for analysis), add python script to generate input
1391 files (+ update matlab version) and update this tutorial docs.
9c166ce5bb Jean*1392 o verification/vermix:
1393 - change ggl90 secondary test to use (pkg/ggl90) mxlMaxFlag=3 (instead of 2)
1394 and update reference output.
a78204c019 Mart*1395 o pkg/ctrl:
1396 - move S/R CTRL_MAP_GENARR2D/3D out of file "ctrl_map_ini_genarr.F" into
1397 a new file "ctrl_map_genarr.F" ;
1398 - clean-up local versions of ctrl_map_gentim2d.F and ctrl_map_ini_genarr.F
1399 from code_ad dirs (i.e., minimize diff with standard version from pkg/ctrl).
375581a429 Jean*1400 o model/src:
1401 - improve REMOVE_MEAN_RL/RS subroutines (address issues raised in issue #501)
1402 including results independent of tile to proc mapping, correction extended
1403 to overlap regions, improve accuracy of _RS version when RS is real*4 and
1404 and enable the use 2-D mask maskInC/W/S when applied to 3-D array. Change
1405 argument list (add myIter, flip order + change mask arg from 3-D to 2-D).
def7daa328 Jean*1406 o verification/global_ocean.90x40x15:
1407 - increase "grdchk_eps" from 1e-7 to 10 in AD test kapgm to improve
1408 accuracy of FD gradients ; update reference output.
ac8f9c9b75 Jean*1409 o verification/OpenAD:
1410 - add ggl90 pkg to code_ad/packages.conf to get it tested in one TAF-AD exp.
39fa6219cc Oliv*1411 o doc:
1412 - require sphinxcontrib-bibtex 2.0.0 or higher
1413
073783ff30 Jean*1414 checkpoint68a (2021/07/16)
16b9a002a2 Mart*1415 o pkg/seaice:
bcc88b4b54 Jean*1416 - clean up and simplify TAF store directives in do_oceanic_phys.F
1417 for seaice_model to avoid unnecessary recomputations ;
1418 - in testreport, count and report number of times s/r seaice_model is called.
1419 o pkg/seaice:
16b9a002a2 Mart*1420 - fix (untested) multi-threading and recomputations in seaice_solve4temp.F
4e4ad91a39 Jean*1421 o files that include "tamc.h":
1422 - add missing declaration of local keys for TAF store-dir in pkg/obcs
1423 (ALLOW_OBCS_STEVENS) and pkg/bling (USE_BLING_V1, PHYTO_SELF_SHADING) ;
1424 - add missing AUTODIFF_OPTIONS.h in few places (e.g., in pkg/ebm), needed to
1425 get ALLOW_AUTODIFF_TAMC defined ;
1426 - change few ALLOW_AUTODIFF <-> ALLOW_AUTODIFF_TAMC ;
1427 - remove included "tamc.h" in few files from pkgs seaice, streamice, bling, +
1428 in exf_radiation, longstep_thermodynamics, obcs_sponge & pp81_ri_number S/R.
1429 - define ALLOW_OBCS_STEVENS in AD exp. obcs_ctrl (to check it compiles).
93de14eac5 Jean*1430 o pkg/ecco:
1431 - fix incorrect order of array indices for "objf_gencost" and "num_gencost"
1432 in 2 gencost v4 S/R (bpv4 & sstv4).
4351f9c554 Jean*1433 o eessup/inc & pkg/thsice:
1434 - Remove 2 CPP options for deprecated code and remove corresponding code:
1435 a) USE_OLD_MACROS_R4R8toRSRL (added in May 2009) and
1436 b) OLD_THSICE_CALL_SEQUENCE (added in Jan 2013).
dcd3df3e6a Ou W*1437 o pkg/shelfice:
4351f9c554 Jean*1438 - fix missing local keys declaration in shelfice_thermodynamics.F for TAF
dcd3df3e6a Ou W*1439 storge dir. with SHI_ALLOW_GAMMAFRICT defined ;
1440 - remove included PACKAGES_CONFIG.h in many verification exp. "tamc.h".
11d5e9fc04 Gael*1441 o tools/build_options:
1442 - update gfortran optfile for MacBook Pro "darwin_amd64_gfortran" to work with
1443 gfortran version 10 (or higher), similar to linux version update.
7c50f07931 Mart*1444 o pkg/ctrl & other:
dcd3df3e6a Ou W*1445 - cleanup: move declarations of local variables from header files ctrl.h and
7c50f07931 Mart*1446 AUTODIFF.h to the local variables section in the respective routines ;
dcd3df3e6a Ou W*1447 - move declaration of local keys and variables from header file tamc.h to
1448 subroutines where they are used.
1449 ==> IMPORTANT: This requires updating all customised versions of "tamc.h",
1450 from each and every TAF-AD setup.
7c50f07931 Mart*1451 - remove tamc_keys.h + remove tamc (+tamc_keys) from all "cb2mFiles" lists ;
1452 - disentangle ALLOW_AUTODIFF/ALLOW_AUTODIFF_TAMC/ALLOW_OPENAD a bit more ;
1453 - remove unused variables where this is straightforward ;
1454 - remove a few i/jmin/max variables.
1455
b7589390f2 Jean*1456 checkpoint67z (2021/06/12)
49a029e3de Mart*1457 o veritication:
1458 - make testreport count and report the number calls of S/R load_fields_driver
1459 and do_oceanic_phys in AD-code (similar to TAF error & warning count).
2b4c90c108 Mart*1460 o pkg/kpp:
1461 - add CPP-flags to turn off diffusivity matching at bottom of boundary layer ;
1462 - add CPP-flag to turn on taper shear mixing in the case of very small shear ;
1463 - add FLAG to turn on smooth regularisation of divisions by small numbers:
1464 1/(var+eps) instead of 1/MAX(var,eps) ;
1465 - fix a small masking error ;
1466 - fix some unfortunate loop ordering and spurious recomputations ;
1467 - add new diagnostics KPPshsq, KPPdVsq ;
1468 - update exp. vermix (which has KPP_ESTIMATE_UREF defined) reference output.
aa6b2555c8 Jean*1469 o model/src:
fb2c52cfd4 aver*1470 - in the main code, add option and code for sound speed calculation with
1471 corresponding diagnostics ; turned on in exp. global_oce_biogeo_bling.
1472 o model/src:
aa6b2555c8 Jean*1473 - fix few loop range to allow to run with OLx,y=1 when momStepping=F ;
1474 - add check and stop if momStepping=T and overlap-size is smaller than 2.
1475 o pkg/ggl90:
ce9abcce9d Jean*1476 - add 3 store directives for gg90tke in ggl90_calc.F and break some loops
1477 in two to help TAF without extra storage requirements.
2383f7d4e9 Mart*1478 o pkg/seaice:
1479 - adjust store directives in seaice_growth_adx.F:
1480 *) add store directives to avoid calling seaice_solve4temp in AD-mode
1481 *) adjust/remove/reorganise for good balance between storing and recomputing
1482 *) fix a small bug (full 4D arrays were stored instead of 2D for each bi,bj)
1483 *) local option "SEAICE_GROWTH_ADX_STORE_MORE" (not recommended)
1484 reduces the recomputations but increases the memory requirements.
1485 - update ref. AD output of experiment offline_exf_seaice (the only one using
1486 SEAICE_GROWTH_ADX): no Grad-Check changes but differences in AD-Monitor.
7b8b86ab99 Timo*1487 o pkg/ctrl & pkg/shelfice:
1488 - generalize masking procedure for control parameters, fixes procedure for
1489 ice-shelf controls ;
1490 - add ability to control base 10 logarithm in generic control arrays ;
1491 - add shiTransCoeffT, shiTransCoeffS, and shiCDrag as control variables ;
1492 - add ability to compute shelfice freshwater and heat fluxes through ecco
1493 package.
9c41af81f6 Timo*1494 o store directives (model/src, pkg/exf, ...):
1495 - By adding many store directives for variables after they have been computed
1496 the corresponding s/r load_fields_driver, oceanic_phys, solve_for_pressure
1497 no longer need to be called in the AD-routine forward_step_ad.
1498 A as a consequence the forward part of forward_step is not recomputed,
1499 and there are far fewer store statements in the AD-code.
1500 - Most of the new store directives and many of the old ones are collected in
1501 two new files "check_lev1_dir_forcing.h" and "check_lev1_dir_ocephys.h" to
1502 avoid clutter in forward_step.F
1503 - More store directives in pkg/exf allow it to store the forcing fields
1504 instead of the level0/1 (e.g. aqh instead of aqh0 and aqh1), thereby
1505 reducing the number of stored exf-forcing variables by about two. This is
1506 also necessary to avoid calling load_fields_driver from forward_step_ad.
1507 - Additional small tweaks of store directives in forward_step.F have the
1508 effect that the recomputations are kept to a minimum in all of the AD
1509 verification experiments (and in verification_other/global_oce_[llc/cs32])
1510 and calling potentially expensive forward routines are not called (e.g.
1511 do_stagger_fields_exchange, which involves unnecessary exchanges).
1512 - Remove storage of gchemTendency in all checkpoint levels.
1513 - Results unaffected except if using real*4 storage (isbyte=4, e.g., in
1514 offline_exf_seaice, small changes in AD-monitor).
1515
2389d48735 Jean*1516 checkpoint67y (2021/05/05)
c96d63ff5a Jean*1517 o pkg/shelfice:
1518 - Update kTopC when using SHELFICEMassStepping if ice-shelf retreat completely
1519 from one column or advance to cover new grid-cell ; add 4 levels TAF storage
1520 of kTopC (to prevent major recomputations).
1521 - Also prevent ice-shelf mass to become negative.
70ceddf25f Timo*1522 o pkg/mom_common & gmredi:
1523 - Adjust Smag and Leith code for use in Adjoint:
1524 a) protect against derivative of SQRT(0) in mom_calc_visc.F and
1525 gmredi_calc_qgleith.F ;
1526 b) add GM-Redi QG Leith routines to ad_diff lists.
0a637c269e Ou W*1527 o pkg/gmredi:
1528 - fix/remove 2 TAF recomputations in GMREDI_WITH_STABLE_ADJOINT code.
6463ae49bb Jean*1529 o pkg/generic_advdiff:
1530 - improve "slope" calculation in DST2 Flux-Limiter advection scheme to avoid
1531 potential over-flow arithmetic in division by small slope (issue #459),
1532 similar to what has been done in gad_dst3fl_*.F routines.
e9b2d4871a Timo*1533 o pkg/diagnostics:
1534 - use Integer*8 conversion in diagnostics_out.F to get time-record to write
1535 in meta file (avoid integer overflow with large time & small diag-freq).
342b4ea43e Mart*1536 o pkg/mom_common:
1537 - initialise again hdiv in mom_calc_hdiv.F (in case it got dropped by TAF in
1538 calling S/R).
dd54a44307 Mart*1539 o model/src:
1540 - fix a bug in convective_adjustment.F AD code by adjusting store directives
1541 for theta and salt ; update experiment isomip reference AD output.
1542 - a little bit of cleanup: remove unnecessary store directives and options.
9f55dac2bf Jean*1543 o pkg/shelfice:
1544 - change expression of pLoc in shelfice_thermodynamics.F to be simply the
1545 weight of the ice-shelf (= shelficeMass * gravity) replacing inaccurate
1546 estimate from "R_shelfIce". Add TAF directive storage of prognostic
1547 variable "shelficeMass" in all 4 checkpointing levels. Update all reference
1548 output of experiments that use pkg/shelfice (isomip & shelfice_2d_remesh)
d81415648f Jean*1549 o verification/testreport
1550 - add ad-monitor of 3-D state variables to testreport summary output
638b7d19dd Jean*1551 o pkg/ggl90:
1552 - avoid division by zero in adjoint of S/R GGL90_CALC (sqrt related)
1553
aa29a5fd58 Jean*1554 checkpoint67x (2021/04/12)
c512e371cc drin*1555 o pkg/seaice:
1556 - Addition to the sea ice package of 6 sea ice rheologies with different yield
1557 curves and flow rules ;
1558 - Add 4 new verification tests in offline_exf_seaice using new rheologies ;
1559 - Update documentation with description of new rheologies and how to use them.
ba0b047096 Mart*1560 o model, pkg & doc:
1561 - replace all occurrences of incorrect "psu" and "PSU" by "g/kg" in units and
1562 comments ; update the documentation accordingly.
698b6992ee Jean*1563 o pkg/ctrl:
1564 - move to pkg/ctrl the local copy of ctrl_map_ini_genarr.F from verification/
1565 global_oce_biogeo_bling/code_ad/ with ptracers generic control. Improve for
1566 general number of ptracers control.
1567 - add missing diagnostics fill for diagnostics 'Um_ImplD' & 'Vm_ImplD' in
1568 impldiff.F (otherwise not filled when pkg/autodiff is compiled).
9c8f6b90ac Jean*1569 o pkg/autodiff:
1570 Include TICES of pkg/seaice into StoreSEAICE:
1571 - split AUTODIFF.h into two to be able to use nITD in the new AUTODIFF_STORE.h
1572 - rearrange and cleanup declarations, add CPP flags ALLOW_SEAICE/OBCS/EXF ;
1573 - clean up seaice section of autodiff_store/restore.F to remove unused storage
1574 space ;
1575 - changes AD results of global_ocean.cs32x15.seaice & seaice_dynmix, lab_sea &
1576 lab_sea.noseaicedyn => output_adm updated.
cab62edf37 Ou W*1577 o model/src:
1578 - make sure the 3 recip_hFac{C,W,S} are reset after resetting the 3 hFac
1579 in ini_nlfs_vars.F when using Non-Lin FreeSurf with pkg/autodiff compiled
1580 (#define ALLOW_AUTODIFF): this fix problems in gradient-check if recip_hFac
1581 is used, e.g., in one {PKG}_INIT_VARIA S/R.
a10c595eb6 Timo*1582 o pkg/autodiff & diagnostics:
1583 - Add interface routines to write to binary file and fill diagnostics of
1584 single (or pair) of Adjoint variable.
1585 - Rewrite addummy_in_stepping.F using set of new interface S/R to make it
1586 more compact and easier to add new control variables.
1587 - Add all current adjoint variables in addummy_in_stepping, ptracers_ad_dump,
1588 seaice_ad_dump & exf_adjoint_snapshots_ad to work with diagnostics package.
1589 - turn on Adjoint-variable diagnostics in adjoint verification experiments:
1590 *) global_oce_biogeo_bling (with ptracers AD-var diagnostics) and
1591 *) global_ocean.cs32x15.seaice (with seaice and exf AD-var diagnostics).
84cf551a2a Jean*1592 o model/src + pkg/mom_common:
1593 Fix AB time-stepping of QuasiHydrostatic with staggerTimeStep.
1594 - involves new CPP option "ALLOW_QHYD_STAGGER_TS" for storage of previous
1595 time-step Quasi-Hydro tendency to enable AB extrapolation in time when
1596 using staggerTimeStep.
1597 - field added to pickup file for restart ; allows to restart (but not perfect
1598 restart) if field is missing and pickupStrictlyMatch=F.
1599 - switch to staggerTimeStep=T in experiment "global_ocean.90x40x15.dwnslp"
1600 that uses QuasiHydrostatic to test this code; update corresponding output
1601 (as well as primary test output due to machine truncation).
1602 o verification:
1603 In experiments: global_ocean.cs32x15, isomip, obcs_ctrl and offline_exf_seaice
1604 replace CPP flag ECCO_CTRL_DEPRECATED by the much nicer generic control
1605 variables GENARR/GENTIM2D variant.
1606 Also replace ECCO_CPPOPTIONS.h by CTRL/AUTODIFF/COST/ECCO_OPTIONS.h files.
1607 This required a number of changes to the general code to make the generic
1608 control variables work in a non-ecco context:
6b47d550f4 Mart*1609 - pkg/thsice: add AUTODIFF_OPTIONS.h and COST_OPTIONS.h header files to
84cf551a2a Jean*1610 numerous routines ;
6b47d550f4 Mart*1611 - pkg/seaice: mask tendencies of HEFF/AREA/HSNOW in seaice_growth_adx.F to
84cf551a2a Jean*1612 reproduce cost function values ;
1613 - pkg/shelfice: enable GENARR/GENTIM2D methods ;
6b47d550f4 Mart*1614 - pkg/obcs: move reading control variable out of S/R obcs_prescribe_read into
1615 S/R obcs_calc to be independent of parameter values unrelated to the
84cf551a2a Jean*1616 adjoint ;
6b47d550f4 Mart*1617 - pkg/ctrl: make generic control variable work without pkg/cal (works only for
1618 time independent control variables), but issue a warning, bonus: make
84cf551a2a Jean*1619 ctrlprec a runtime parameter that defaults to 64 ;
6b47d550f4 Mart*1620 - pkg/ctrl: fix flow directives for S/R ctrl_bound_2d/3d and add tangent
84cf551a2a Jean*1621 linear versions of these subroutines ;
6b47d550f4 Mart*1622 - pkg/ecco: reorder CPP flags in ecco_cost_weights.F and remove unused
1623 variable 'wbaro', move calling S/R cost_obcs out of ECCO_CTRL_DEPRECATED
1624 code block in S/R ecco_cost_driver, reorganise CPP flags in
1625 cost_averagesinit.F, include CTRL_OPTIONS.h wherever ECCO_OPTIONS.h is
84cf551a2a Jean*1626 included, because ECCO_CTRL_DEPRECATED is now set in CTRL_OPTIONS.h ;
6b47d550f4 Mart*1627 - model/src/the_main_loop.F: fix tape initialisation, bonus: suppress a
84cf551a2a Jean*1628 benign warning ;
6b47d550f4 Mart*1629 - for each of the verification experiments remove ECCO_CPPOPTIONS.h and
1630 replace by CTRL_OPTIONS.h, CTRL_SIZE.h, sometimes COST/ECCO_OPTIONS.h,
84cf551a2a Jean*1631 EXF_OPTIONS.h, adjust data.ctrl, data.grdchk, data.ecco ;
6b47d550f4 Mart*1632 - for global_ocean.cs32x15 compile both variants by keeping
1633 ECCO_CTRL_DEPRECATED in CTRL_OPTIONS.h and use runtime parameter ctrlUseGen
1634 to switch between methods (in global_ocean.cs32x15.thsice). This involves an
1635 extra (benign) recomputation warning in this verification experiment because
1636 of an if statement with ctrlUseGen in ctrl_init_variables.F
1637
e856cdc61b Jean*1638 checkpoint67w (2021/03/06)
4b1d371a30 Jean*1639 o verification/global_ocean.cs32x15:
1640 - fix Adjoint set-up by turning off CPP option "ALLOW_AUTODIFF_INIT_OLD" (that
1641 was intended to put back an old bug) and update all 4 ADM and all 4 TLM
1642 reference output files.
1e291a3f4c Jean*1643 o pkg/exf:
1644 - replace wrong CPP option EXF_SALTFLX with ALLOW_SALTFLX in exf_monitor.F.
a5ae6d70cb Jean*1645 o model/src:
1646 - Output dxF, dyF, dxV, and dyU fields to mdsio grid output files.
dc280143ed Oliv*1647 o tools/build_options:
1648 - improve intel optfile for engaging (linux_amd64_ifort+impi_engaging).
0d75a51072 Mart*1649 o pkg/autodiff:
1650 - Improve, extend & clean-up switch to a simpler advection-scheme in AD-Mode
1651 with new parameter "useApproxAdvectionInAdMode to replace inAdMode:
1652 * If useApproxAdvectionInAdMode is True and advection scheme is set to 33
1653 use advection scheme 30 in AD-model in seaice_advection, gad_advection
1654 and gad_calc_rsh ; model stops when parameters are set inconsistently.
1655 * Defaults to False, but is reset to True if inAdExact = False to be
1656 backwards compatible.
1657 - Important change in the meaning of variable inAdMode: now it is always true
1658 after calling S/R AUTODIFF_INADMODE_SET_AD and always false after calling
1659 S/R AUTODIFF_INADMODE_UNSET_AD.
1660 The non-intuitive flags inAdTrue and inAdFalse, which could be T or F, have
1661 been removed from the code.
1662 - Remove unnecessary TAF related and inAdMode code from seaice_lsr.F, remove
1663 SOLV_MAX_TMP in LSR S/R and adjust SEAICElinearIterMax default accordingly.
1664 - Change AD exp. global_ocean.cs32x15.seaice to test this new functionality;
1665 gradient checks necessarily are poorer because AD advection is approximated.
1e25bc2551 Jean*1666 o tools/build_options:
1667 - update standard optfile "linux_amd64_gfortran" to enable to be used with
1668 gfortran version 10 (or higher); update comments and clean-up for missing
1669 "nf-config".
2ac762dbee Jean*1670 o model/src & pkg/generic_advdiff:
1671 - Implement simple isotropic 3D Smagorinsky diffusivity:
1672 Smag diffusivity is assumed to be linearly dependent on 3D Smag viscosity
1673 (just scaled by inverse of a constant Prandtl number); setting involves:
1674 a) CPP Option: ALLOW_SMAG_3D_DIFFUSIVITY in CPP_OPTIONS.h (def. #undef)
1675 b) switching on 3D Smagorinsky by setting "useSmag3D = .TRUE." in first
1676 namelist of main parameter file "data" ; and, in the same namelist,
1677 c) setting smag coeff. "smag3D_diffCoeff" for diffusivity (similar to
1678 smag coeff. "smag3D_coeff" for viscosity), which results in constant
1679 Prandtl number = smag3D_coeff/smag3D_diffCoeff.
1680 Note: Since Smag3D_diffK is lagging by 1 time-step, needs to be stored
1681 in pickup files (for restart) when using synchronous time-stepping.
1682 - code is compiled in experiment tutorial_deep_convection and ready to use
1683 except smag3D_diffCoeff setting in input.smag3d/data is commented out.
1684 - also add few missing initialisations in "ini_dynvars.F" (just for
1685 consistency with coding practice but no practical side effect).
fef3c33926 Jean*1686 o pkg/ecco:
1687 - fix type of argument in S/R MDS_READVEC_LOC call inside cost_gencost_moc.F
9b38007ffc Jean*1688 o verification/lab_sea:
1689 - change lab_sea.hb87 from testing EVP to testing aEVP with some sensible
1690 parameters ; update reference output "output.hb87.txt"
df462307fb Timo*1691 o pkg/ecco:
1692 - Addition of meridional streamfunction maximum (MOC) as objective function
1693 within ecco/gencost code ;
1694 - MOC objective function tested in verification_other/global_oce_cs32.sens ;
1695 - allows to compute sensitivity to hflux/sflux with prescribed atmospheric
1696 state (not fluxes) with new flags CALC_HFLUX_SENS and CALC_SFLUX_SENS.
1697
830e1a2c4c Jean*1698 checkpoint67v (2021/02/03)
66fe84e647 Oliv*1699 o tools/build_options:
1700 - add optfile for engaging similar to linux_amd64_ifort+impi but with -xAVX
d5254b4e3d Mart*1701 o pkg/seaice:
1702 - move store directives of uice/vice to after calling S/R SEAICE_DYNSOLVER to
1703 avoid calling this routine in S/R seaice_model_ad which may trigger
1704 potential recomputation problems (e.g., with non-exact AD) ;
1705 - move if statement inside S/R SEAICE_BOTTOMDRAG_COEFFS : this enables to
1706 remove storage of "CbotC" without triggering recomputations ; compile this
1707 code in the AD-experiments of global_ocean.cs32x15 ;
1708 - remove unnecessary store directives related to pkg/seaice ;
1709 - fix/extend diagnostic "SIenph " to work with all parameter configurations.
4240547d2d Mart*1710 o pkg/autodiff: fix/improve viscFacAdj
1711 - fix treatment of viscFacAdj in mom_vecinv.F by removing storage of 2D
1712 viscosities if new flag AUTODIFF_ALLOW_VISCFACADJ is defined ;
1713 - add a runtime parameter "viscFacInFw" in autodiff_inadmode_unset_ad.F to
1714 replace hard-coded one ;
1715 - apply viscFacAdj to both viscAh/4_D and _Z ;
1716 - test compiling this code in tutorial_global_oce_optim.
f92f728545 Jean*1717 o model/src:
1718 - move if statement out of i/j-loops in solve_tridiagnoal/pentadiagonal.F:
1719 *) this reduces TAF recomputation warnings by 4 ;
1720 *) potentially easier to optimise/vectorise for some compilers.
1721 o tools/build_options:
1722 - adjust floating point options in: linux_ia64_ifort_ollie:
32ce3e9e96 Mart*1723 o pkg/ctrl:
f92f728545 Jean*1724 - fix two bugs related to writing and reading control variables and
1725 corresponding gradients:
1726 a) replace too large loop range endrec by diffrec in ctrl_map_ini_gentim2d.F;
1727 b) skip writing meta-files in REVERSE_SIMULATION mode (active_file_control.F)
32ce3e9e96 Mart*1728
82ad7f2b88 Jean*1729 checkpoint67u (2020/12/30)
616d857f4a Mart*1730 o utils/python/MITgcmutils
f92f728545 Jean*1731 - add code to compute horizontal divergence of a vector field, gradient of a
1732 scalar field, and averages to c-points on an llc grid.
4a08d54d3a Mart*1733 o pkg/seaice:
f92f728545 Jean*1734 - fix bug in seaice_lsr, spotted by Martin Vancoppenolle, that lead to solving
1735 stationary momentum equations (du/dt -> 0) for SEAICEnonLinIterMax>2 ;
1736 - fix minor bug in seaice_bottomdrag_coeffs.F: replace OLy with correct OLx ;
1737 - changing ordering of addition (to FORCEX,FORCEY) in seaice_lsr.F results in
1738 output differences at machine truncation level: update referece output of
1739 several experiments that use LSR solver.
8fc117ecb7 Mart*1740 o pkg/autodiff: fix flow directives for self-adjoint cg2d
f92f728545 Jean*1741 - new self-adjoint cg2d routine cg2d_sad.F mimics AD-code, but neglects
1742 (purposefully) the proper sensitivity propagation
1743 - extra storage of cg2d solver coefficients and preconditioner is required
1744 - change 2 AD-verification experments (global_ocean.cs32x15 and
1745 global_ocean.cs32x15.seaice) to test this code a little better:
1746 use full NLFS and nchklev_1 = 2
8fc117ecb7 Mart*1747
8b41e6235c Jean*1748 checkpoint67t (2020/11/30)
a67734cba4 Mart*1749 o pkg/kpp:
1750 - with CPP-option KPP_ESTIMATE_UREF, fix compilation errors + fix mixed layer
1751 depth determination ;
1752 - define KPP_ESTIMATE_UREF in verification/vermix ;
1753 - a little bit of cleanup.
1754 o pkg/seaice:
4dd39c50d9 Mart*1755 - small modifications of seaice_growth_adx.F to avoid recomputation warnings
1756 and to avoid potentially inefficient code ;
1757 - remove duplicate version of seaice_solve4temp ;
1758 - exclude code of seaice_growth.F if ALLOW_SEAICE_GROWTH_ADX defined ;
1759 - switch on SEAICE_USE_GROWTH_ADX AD in experiment offline_exf_seaice and
1760 update "output_adm.txt".
76d0c749c4 Jean*1761 o eesupp/src:
1762 - add missing "stdio.h" in src code setdir.c
5dda98cf07 Jean*1763 o tools/do_tst_2+2 & tst_2+2:
08bbaa9f0f Mart*1764 - bug fix: replace some non-standard sed command with POSIX compatible syntax
5dda98cf07 Jean*1765 - remove second blank at beginning of 2 new lines in file "data".
dae83699f8 Jeff*1766 o doc:
1767 - add new SO channel tutorial
0a8794f5ee Mart*1768 - update pkg/shelfice documentation
7a4abe9124 Jean*1769 o optim:
1770 - fix a small bug by initialising myX/YglobalLo=1 in optim_nummod.F
44af98263c Jean*1771 o tools/do_tst_2+2:
1772 - for sending restart test output, add same hack in "send" option as in
1773 testreport, allowing to use "scp" (instead of an email).
1774 o model/src:
1775 - fix 2 missing TAF initialisation directives in file "the_main_loop.F";
1776 this allows to use TAF recent version 5.0.9 (that does check for missing
1777 initialisation).
6de16ba22c Jean*1778 o pkg/seaice:
1779 - fix diagnostics additions (from PR #348) for case _RS is real*4.
1780
ede86f4989 Jean*1781 checkpoint67s (2020/07/30)
b9dadda204 Mart*1782 o eesupp/src:
1783 - Improve formatting of output for large grids and many processors:
1784 adjust formats to actual length of nPx*nPy or Nx and Ny but
1785 keep minimal lengths to avoid changing the format for smaller domains;
1786 - also increase number of digits for printing tile & proc number in pkg/exch2
1787 log files and report to STDOUT.
a284455135 Matt*1788 o pkg/bling:
1789 - cleaning: remove USE_QSW_Z code ;
1790 - few more CPP options (NEW_FRAC_EXP & SIZE_DEP_LIM defined, SIZE_NUT_LIM
1791 undef) related to phytoplankton size and sinking organic matter ;
1792 - fix tiled TAF storage directives (were not right for multi-tile per proc);
1793 update ADM reference output of experiment global_oce_biogeo_bling (now
1794 gradient check are identical whether run on 1 proc - 4 tiles or 4 procs
1795 1 tile each).
5867b94c2f Mart*1796 o pkg/seaice:
1797 - Replace hard-coded minimum for DWATN by runtime parameter "SEAICEdWatMin":
1798 * allows to have zero drag by setting both SEAICEdWatMin and
1799 SEAICE_waterDrag to zero. Non-zero drag had been implemented because
1800 previous LSR solver could not handle zero entries on the main diagonal.
1801 * this fixes a bug (unexpected behavior) reported at MITgcm-support by
1802 Kaley Shrestha, but also allows to modify the somewhat arbitrary
1803 default minimum value of SEAICEdWatMin = 0.25 ;
1804 * freedrift code still requires non-zero drag coefficients,
1805 S/R SEAICE_CHECK catches this case.
3770720c1f Jean*1806 o verification/*/packages.conf
1807 - Cleaning verification experiment "packages.conf":
1808 1) add a 1 line description at the top
1809 2) use pkg group "adjoint" in some experiments
1810 3) use similar ordering of pkgs in packages.conf:
1811 a) eesupp pkgs (e.g., exch2, coupler-pkgs)
1812 b) dyn-core pkgs (e.g., gfd pkgs, mom pkgs, cd_code, gad, obcs ...)
1813 c) SGS-scheme (+ atm physics) pkgs (filters, gmredi, vert.mixing ...)
1814 d) forcing pkgs (e.g., rbcs, exf, cal, ebm, cheapaml)
1815 e) other component pkgs (e.g., ice, land, ptracers, biogeo, flt)
1816 f) diagnostics pkgs (e.g., sbo, profiles, layers, diagnostics, timeave)
1817 g) I/O pkgs, e.g., mnc (+ mypackage at the end)
1818 -- blank line --
1819 h) adjoint related pkgs (e.g., autodiff, ctrl, cost ...)
1820 4) remove unused pkgs: kpp, sbo, timeave ; this results in reduced number of
1821 TAF recomputation warning for AD exp: bottom_ctrl_5x5 & global_ocean_ebm;
1822 o tools/build_options:
1823 - add a symbolic link for optfile "linux_amd64_ifort" to "linux_amd64_ifort11"
7deacd640c Jeff*1824 o doc:
1825 - fix link and plot in doc/examples/baroclinic_gyre
5fe78992ba Mart*1826 o pkg/seaice:
1827 - Add new mechanical energy diagnostics ;
1828 - Move computation of stress diagnostics to seaice_dynsolver.F ; this change
1829 affects diagnostics SIpress, SItensil, SIpress, SIzeta, SIdelta, SIshear,
1830 because they are now filled after the current time step update, when they
1831 are actually available. Note: previously, for the first time step, these
1832 variables (and diagnostics) were not properly defined (or zero).
1833
2bc8ced27d Jean*1834 checkpoint67r (2020/06/04)
cd9df85f4a Jean*1835 o pkg/ecco:
1836 - fix character length when checking for m_trHeat, m_trSalt & m_horflux_vol.
04904a066e Timo*1837 o pkg/autodiff:
1838 - add active read and write routines for global 1D vectors, to be used for
1839 compressed cost function vectors (note: not used yet, example to come soon).
42032b6c9d Jean*1840 o model/src & pkg/exf:
1841 - Reference atmospheric pressure for seawater EOS was assumed but was not
1842 explicitly set. New constant "eosRefP0" is added to make this more clear ;
1843 - Add main model reference surface pressure (surf_pRef) so that pLoad
1844 is now defined as the atmospheric pressure anomaly relative to surf_pRef ;
1845 - Account for differences in 2 ref pressure in EOS S/R ;
1846 - Fix few EOS references (in comments) ; fix and simplify S/R EOS_CHECK ;
1847 - Keep exf "apressure" field unchanged (still full atmospheric surface
1848 pressure) but now initialised to "surf_pRef" and fill "pLoad" with atmos.
1849 pressure anomaly relative to surf_pRef.
07e785229e dngo*1850 o pkg/streamice:
1851 - add option to specify "regularised coulomb" sliding law to better reflect
1852 dependence on subglacial water pressure close to the grounding line ;
1853 - above requires CPP option (due to new arrays) STREAMICE_COULOMB_SLIDING
1854 and r/t param streamice_allow_reg_coulomb ;
1855 - add diagnostic for streamice melt rate (BDOT_SI )
1856 - add parameter STREAMICEAdotFile to specify surface mass balance ;
1857 - add parameter streamice_maxnliter_Petsc to specify maximum no. of
1858 linear solves using PETSc in a single time step (not incl. in doc
1859 since PETSc is not part of standard build) ;
1860 - update references to PETSC_DEFAULT_DOUBLE_PRECISION to PETSC_DEFAULT_REAL in
1861 streamice_cg_solve_petsc.F; former seems to be deprecated in some versions
1862 of PETSc while latter is backward compatible ;
1863 - for BJACOBI (block jacobi) PETSc preconditioner, use PCICC (incomplete
1864 cholesky) rather than PCILU (incomplete LU) ;
1865 - for BJACOBI add parameter streamice_petsc_pcfactorlevels to control level
1866 of factor fill-in.
1867
18fff58a99 Jean*1868 checkpoint67q (2020/03/19)
e1e000e69f Jean*1869 o pkg/shelfice, remeshing code:
1870 - simplify/clarify merging S/R call sequence: all done/called from main
1871 remeshing S/R SHELFICE_REMESHING :
1872 - remesh_c_mask : now only update geometry & surface fields at grid-cell
1873 center and compute merging remeshing weights for tracers;
1874 - remesh_uv_mask : now only update geometry & surface fields at grid-cell
1875 edges and prepare merging remeshing weights for velocity;
1876 also fix thin-wall setting without reading again thin-wall files ;
1877 - calls directly CALC_SURF_DR and UPDATE_SURF_DR
1878 - move adjustment of state variables into (new) dedicated
1879 S/R SHELFICE_REMESH_STATE and change loop range so that no further EXCH
1880 calls are needed ; also add missing code for ALLOW_ADAMSBASHFORTH_3 ;
1881 - move update of Rmin_surf (formerly in shelfice_remesh_rminsurf.F)
1882 before first call to S/R CALC_SURF_DR (where Rmin_surf is used)
1883 and in-line S/R SHELFICE_REMESH_RMINSURF into shelfice_remesh_uv_mask.F
1884 - add argument "wFld" and "myIter" to S/R SHELFICE_REMESH_CALC_W
1885 - fix so that it compiles and run when _RS is real*4 (#undef REAL4_IS_SLOW).
7d270b85fa Jean*1886 o model/src:
1887 - Fix for special value of R_low with pkg/shelfice:
1888 When bathymetry field value is just rF(k)+hFacMindrF(k)/2, R_low will
1889 deepen (by hFacMindrF(k)/2 ) to satisfy the hFacMin criteria. In this case:
1890 o if R_shelfIce value (from file) was exactly equal to initial bathymetry
1891 depth, original code would create a very thin grid cell of thickness
1892 factor hFacMin. Fix this problem by preventing deepening of R_low when
1893 initial R_low >= R_shelfIce.
1894 o if R_shelfIce value is deeper than original value, the problem does not
1895 show up for hFacC (column remains dry) but because of erroneous resetting
1896 of rSurfW/S (to be the MAX of rSurfW/S, rLowW/S) this could trigger the
1897 same type of artificial deepening at Western and Southern column edges
1898 (for hFacW and hFacS). Remove early resetting of rSurfW/S to fix this
1899 second issue (see issue #324).
1900 - Simplify correction for miss-match between Sum of level thickness at
1901 W & S edges and top minus bottom r-position: only adjust rSurfW/S
1902 (and not rLowW/S) as done previously for the case useMin4hFacEdges=T;
1903 - Non-lin free-surf in r coordinate: for consistency, use rSurfW & rSurfS
1904 (which account for adjustment, if any) instead of MIN of adjacent Ro_surf
1905 when calculating new thickness factor: hFac_surfW & hFac_surfS ;
1906 - Make thin-wall implementation available for sigma-coordinate ;
1907 - Record thin-wall position as kSurfW/S = Nr+2 (instead of = Nr+1 for
1908 a dry column).
1909 o tools/build_options:
1910 rename optfile "linux_amd64_ifort" to "linux_amd64_ifort10-"
9acfcdc58c Jeff*1911 o verification:
1912 - new reentrant channel tutorial experiment, doc will follow soon.
1913
260efc476e Jean*1914 checkpoint67p (2020/02/12)
bdf98ce602 Edwa*1915 o model/src:
af65683301 Jean*1916 - rename array "surfaceForcingTice" to "adjustColdSST_diag" and change the
1917 description to better reflect what it is: a diagnostic for SST adjustment.
1918 - remove most of the TAF storage directive for "adjustColdSST_diag" that were
1919 not necessary once it's properly initialized.
bdf98ce602 Edwa*1920 o pkg/gmredi:
1921 - improve error handling
1922 - additional QGLeith config checks
1923 - standardise variable name capitalizations
af65683301 Jean*1924 o pkg/mom_common, mom_vecinv, mom_fluxform:
bdf98ce602 Edwa*1925 - protect QGLeith code with ifdefs
af65683301 Jean*1926 - additional QGLeith config checks (in model/src/config_check.F)
40933c9dd3 Jean*1927 o verification:
1928 - rename dir "rotating_tank" to "tutorial_rotating_tank".
7a05b40c01 Jeff*1929 o pkg/flt:
1930 - improve pkg/flt doc and CPP brackets
1c8cebb321 Jeff*1931 o doc:
1932 - new front-page to tutorial chapter, also listing all verif experiments ;
1933 - add new section in ch3 about input file format.
1934
45ac9863cf Jean*1935 checkpoint67o (2019/12/23)
9952f046d7 dngo*1936 o pkg/shelfice:
75f34d1991 Jean*1937 - implement implicit ice-shelf drag, in the same way as implicit bottom drag,
1938 using the same run-time switch "selectImplicitDrag".
1939 - change 3-D diagnostics of ice-shelf drag tendency (SHIUDrag & SHIVDrag) to
1940 2-D diagnostics of ice-shelf drag stress (SHI_TauX & SHI_TauY).
1941 - update 4 forward reference output files of experiment "isomip".
1942 - switch on implicit drag in experiment shelfice_2d_remesh (to get it tested).
1943 o pkg/shelfice:
9952f046d7 dngo*1944 - addition of functionality described in Jordan et al (2017), "Ocean-Forced
1945 Ice-Shelf Thinning in a Synchronously Coupled Ice-Ocean Model";
1946 allows "remeshing" of grid-cells in vertical in response to changing free
1947 surface due to ice shelf mass change:
1948 At SHELFICEremeshFrequency interval, checks for cells that are too thick or
1949 too thin and adjusts R_surf & eta accordingly, and updates state variables ;
1950 - new main remeshing S/R SHELFICE_REMESHING calling additional S/R in files
1951 shelfice_remesh_c_mask.F, shelfice_remesh_uvmasks.F,
1952 shelfice_remesh_rminsurf.F and shelfice_remesh_calc_w.F
1953 and called directly from top of FORWARD_STEP ;
1954 - all new code and call protected under #define ALLOW_SHELFICE_REMESHING ;
1955 - add field "R_shelfice" to pkg/shelfice pickup files for restart ;
1956 - verification/shelfice_2d_remesh/*: new verification experiment
1957 to test remeshing functionality.
1958 - additional options to SHELFICEboundaryLayer:
1959 a) SHI_withBL_uStarTopDz, to compute uStar from uVel,vVel avergaged over
1960 top Dz thickness first and then average horizontally ;
1961 b) SHI_withBL_realFWflux, to use real Fresh-Water flux (and adjust
1962 advective surface flux) with SHELFICEboundaryLayer.
f4206cb08a Jean*1963 o pkg/ecco:
1964 - change S/R ECCO_READWEI to read in uncertainty file and compute weight
1965 as 1/sigma if nosumsq is provided as a preprocessing option, or 1/sigma^2
1966 if not. This is the expected behavior based on the "generic cost function"
1967 section of the documentation.
fb6db187ae Jean*1968 o verification:
1969 - new experiment "global_oce_biogeo_bling" move here from verification_other.
b62dee2337 Jean*1970 o pkg/cheapaml:
1971 - rewrite advection-diffusion of BL atmospheric variables to use Flux-Form
1972 formulation. Affects results (unless cartesian grid is used).
1973 - apply special treatment of diffusive flux at Northern & Southern boundaries
1974 only if .NOT.cheapamlYperiodic (previously unconditional, gad_diff_2d_y.F);
1975 - Skip calls to AB-2 when using "useFluxLimit=T" option since advection scheme
1976 used then is DST3FL which does not need AB at all. Affects results if
1977 useFluxLimit=T" is used.
1978 - clean-up (rename/remove all "gad_*.F" files) and simplify by using few more
1979 pkg/generic_advdiff S/R (instead of local copies).
1980 - update output of experiment "cheapAML_box" (and in separated PR, experiment
1981 "offline_cheapaml" in verification_other)
c8767af0b6 Timo*1982 o pkg/ctrl:
1983 - Tangent Linear mode: allows to initialise g_xx fields with user-provided
1984 g_xx file (default unchanged, i.e., initialised to zero).
1985
6bdcb6b877 Jean*1986 checkpoint67n (2019/11/26)
9906b3fb84 Jean*1987 o pkg/ctrl:
1988 - add doc & storage dir for initial velocity control option.
788c57c2b5 owan*1989 o pkg/autodiff:
1990 - sort out checkpoint_lev1_dir header file for when pkg/ecco is used
1991 with #undef NONLIN_FRSURF ; similar update in pkg/cd_code & pkg/ptracers;
1992 this fixes issue #68.
1993 - clean-up and fix pkg/autodiff checkpoint_lev?_dir to be able to compile
1994 with #define EXCLUDE_FFIELDS_LOAD.
540437b870 Jean*1995 o model/src:
1996 - allows to specify time-dependent (periodic) geothermal heat-flux
1997 with "periodicExternalForcing".
6dfad62739 Jean*1998 o pkg/diagnostics:
1999 - add diagnostics for thickness factor hFacC, hFacW & hFacS.
8dfb9d9b4c Jean*2000 o pkg/dic:
2001 - Fix carbonate chemistry coefficient issues (#269). This affects results when
2002 either CARBONCHEM_TOTALPHSCALE or CARBONCHEM_SOLVESAPHE are defined.
2003 Update output of verification experiment "so_box_biogeo".
a435e833b1 Mart*2004 o doc:
2005 - fix description of zero-layer thermoydnamics
94f0474fee Jean*2006 o verification/*/results/output.txt:
2007 - update reference machine from baudelaire.mit.edu (running fc13)
2008 to villon.mit.edu (running Ubuntu 18 LTS) and update few output.txt
2009 - change travis Docker settings accordingly + update documentation.
2010
5523dc659e Jean*2011 checkpoint67m (2019/10/16)
d67096e55c Jeff*2012 o doc/examples:
2013 - Convert remaining old doc tutorials from latex to rst files and add them
2014 to current MITgcm documentation.
18d2df1f7f Jean*2015 o pkg/ptracers:
2016 - new diagnostics Tp_gTr01, ... for ptracer total transport tendencies
2017 (before gchem_forcing_sep); this includes advection and diffusion terms,
2018 but also anything added in gchem_add_tendency.
94151a9b18 Jeff*2019 o doc & verification/tutorial_baroclinic_gyre:
2020 - split doc for tutorial experiments into separate files
2021 - update configuration for baroclinic gyre tutorial
2022 - update documentation for baroclinic gyre tutorial
2023 - formatting and font changes in algorithm chapter
5752d89cac Ed D*2024 o doc:
2025 - add rtfd config file to control build behaviour and options.
2026
b6c7ea7cf3 Jean*2027 checkpoint67l (2019/08/29)
b90cc7fedb Ed D*2028 o QG-Leith viscosity:
2029 - pkg/mom_common: bug fix for QG Leith viscosity
2030 - pkg/gmredi: bug fix for QG Leith coefficient
2031 - update output of experiments MLAdjust.QGLeith & MLAdjust.QGLthGM
abfe198bce Mart*2032 o pkg/obcs:
2033 - new feature to balance surface flux of freshwater or ice shelf mass by
2034 outflow through open boundary conditions:
2035 * requires splitting S/R obcs_calc to move call to S/R obcs_balance and S/R
2036 obcs_add_tides after S/R external_forcing_surf call in do_oceanic_phys.F
2037 * add contribution for EmPmR of the current time step and the
2038 shelficeMassDynTendency (new S/R shelfice_netmassflux_surf).
2039 - add new secondary test exp. "isomip.obcs" to text this new feature.
a004e35329 Ed D*2040 o pkg/mom_common & model/src:
2041 - new S/R MOM_U/V_BOTDRAG_COEF used both for explicit and implicit bottom drag
2042 computation (thus replacing both MOM_U/V_BOTTOMDRAG in explicit case and
2043 MOM_U/V_BOTDRAG_IMPL in implicit case) to return a drag coefficient.
2044 This modification affects results at machine truncation level.
2045 - change diagnostics 'Um_dPHdx' & 'Vm_dPHdy' to 'Um_dPhiX' & 'Vm_dPhiY'
2046 for full pressure gradient tendencies (including surf & NH contribution);
2047 - remove bottom drag tendency diags (UBotDrag & VBotDrag); add bottom stress
2048 diagnostics and implicit viscous tendency diagnostics, both accurate also
2049 if using implicit bottom drag (selectImplicitDrag=2).
d7b89710f7 Oliv*2050 o pkg/exf:
2051 - re-arrange EXF interpolation header files: move setting of "MAX_LAT_INC"
2052 from EXF_PARAM.h to EXF_INTERP_SIZE.h (more logical place). But to avoid
2053 having to include EXF_INTERP_SIZE.h each time EXF_PARAM.h is included,
2054 move EXF interpolation parameters outside EXF_PARAM.h in new header file:
2055 EXF_INTERP_PARAM.h
2056 - add S/R to define input grid setting (stored in EXF_INTERP_PARAM.h) to be
2057 used for EXF interpolated fields as default input grid.
ebbe8cf013 Jean*2058 o compon_interf pkgs:
2059 - fix bi loop range in few initialisation subroutines (2 in each pkg),
2060 fixing issue #270
2061
02b4c39948 Jean*2062 checkpoint67k (2019/07/19)
80f7dda68b Jean*2063 o model/src:
2064 - fix format in printing 1 error message from S/R SET_PARMS
9d49c8b5d1 Matt*2065 o pkg/bling:
fbb6fdf8a5 mmaz*2066 - add missing components of SIBLING
2067 - add Manizza et al 2005 light attenuation. Enable with PHYTO_SELF_SHADING
c9238c91a3 Jean*2068 - Replace hard coding of max mixing depth with runtime parameter MLmix_max
fbb6fdf8a5 mmaz*2069 o pkg/ctrl:
796fd0e220 Jean*2070 - fix reccord number setting in S/R CTRL_GET_GEN_REC ("startrec" substracted
2071 for no reason).
bc74f5a574 Jean*2072 o doc:
2073 - add a sub-section about optim_m1qn3
6c44cdc71d Jean*2074 o pkg/ctrl:
2075 - fix in rescaling option for control vector ("doscaling/noscaling" option,
2076 S/R CTRL_MAP_INI_GENARR & CTRL_MAP_INI_GENTIM2D); proper counting of
2077 non-zero control vector when weight-mask is different from ocean-mask.
2078 Expect differences only when (a) weight-mask is different from ocean mask
2079 and (b) xx_genarr2d_preproc='noscaling' (doscaling=.false.).
899473f061 Jean*2080 o pkg/exf:
2081 - new run-time parameter "diags_opOceWeighted" (default=T) to weight some exf
2082 surface diagnostics (all net and upward fluxes) with open-ocean fraction.
2083 Option is turned off when no sea-ice pkg (seaice or thsice) is used.
2084 - new S/R EXF_WEIGHT_SFX_DIAGS to do some exf diags as open-ocean weighted
2085 according to input argument ice fraction. Called from the right location
2086 in time-stepping to get diagnostics that are consistent with wind-stress
2087 and buoyancy fluxes that ocean receive.
2088
d1306ef812 Jean*2089 checkpoint67j (2019/06/18)
e0f9a7ba0b Matt*2090 o pkg/bling:
2091 - Cleanly seperate NBLING (default), BLING_V1 (enabled with USE_BLING_V1),
2092 and also add Silica option (enabled with USE_SIBLING);
2093 - New algorithm for calculating mixed layer depth (old enabled with
2094 BLING_USE_THRESHOLD_MLD);
2095 - Options for updated carbon chemistry (from J. Lauderdale) enabled with
2096 CARBONCHEM_SOLVESAPHE or CARBONCHEM_TOTALPHSCALE ;
2097 - And other minor spring cleaning changes;
2098 - update calls in pkg/gchem for BLING(V1) or NBLING (with Silica).
352c2064d4 antn*2099 o pkg/salt_plume:
2100 - fix calculation index range in salt_plume_apply.F (#ifdef SALT_PLUME_VOLUME)
3a78078268 Aras*2101 o pkg/ecco:
2102 - fix/simplify local file names in ecco_cost_init_barfiles.F (within
2103 #ifdef ALLOW_GENCOST_CONTRIBUTION ).
7843dde2de jm-c 2104 o pkg/mom_vecinv:
2105 - add 2 Coriolis schemes which satisfy: d/dt U = f V ; d/dt V = -f U
2106 (with U,V = vertically integrated flow).
2107 - add new run-time coriolis-scheme selector "selectCoriScheme" to replace
2108 "useJamartWetPoints" and "useEnergyConservingCoriolis"; but keep these 2
2109 in namelist (backward compatible) to set "selectCoriScheme" accordingly.
77f894c517 Timo*2110 o pkg/ctrl:
2111 - Fix bug in ctrl_map_ini_genarr.F regarding missing initialization of
2112 igen_uvel & igen_vvel (just like all the other variables).
6acab690ae Jona*2113 o pkg/dic:
2114 - Implement SolveSAPHE (Munhoven, 2013), a robust algorithm to calculate
2115 oceanic pH/pCO2 ; compiled when CARBONCHEM_SOLVESAPHE is defined (in
2116 DIC_OPTIONS.h) and used when (in data.dic) selectPHsolver > 0 ;
2117 Add several options for selecting dissociation coefficients, available
2118 when CARBONCHEM_SOLVESAPHE is defined.
2119 - Change experiment "so_box_biogeo" to compile with CARBONCHEM_SOLVESAPHE
2120 defined and add secondary test "saphe" (dir: input.saphe) to this experiment
2121 to test GENERAL pH solver (selectPHsolver=1).
dc54d31829 Ian *2122 o pkg/seaice:
2123 - add alternative version of seaice thermodynamics two routines that provide
2124 accurate adjoint. Switched by defining CPP option: ALLOW_SEAICE_GROWTH_ADX
66046ae6a1 Brun*2125 o pkg/mdsio:
2126 - in meta file, write number of records with longer format (10 digits vs 5
2127 previously) to accommodate large number of floats.
2128
aa900cad7e Jean*2129 checkpoint67i (2019/05/08)
f2a88c9ff8 jm-c 2130 o autofdiff:
2131 - fix to avoid TAF recomputations in ggl90 & salt_plume pkgs
2132 and in model/src PCELL_MIX_CODE.
f59d76b0dd Ed D*2133 o pkg/mom_common & pkg/gmredi:
2134 - add quasi-geostrophic variant of Leith dynamic visocity
2135 - use the quasi-geostrophic Leith dynamic visocity as GM diffusivity
2136 - new verification experiment to test QG-Leith (variant of MLAdjust)
2137 - updated documentation about new option
39cd4ae623 Ed D*2138 o pkg/seaice:
2139 - add Hlimit to seaice namelist in data.seaice
2140 - use verification seaice_itd.thermo to test this feature with default
2141 values (experiment does not change)
2142 - clean up related output in seaice_init_fixed.F a little
aad71d9e67 Mart*2143 o verification/testreport:
2144 - for file run_ADM_DIVA, fix sed search syntax so that it works with BSD-sed
6b48f6d519 Mart*2145 o model/src:
2146 - fix small bug (wrong balanceEmPmR report) in config_summary.F, spotted by
2147 Christopher Wolfe ; add report of balancePrintMean to summary.
1f2be90d9e Ed D*2148 o verification/verification_parser.py
2149 - ensure Travis test suite fails when a build or a run fails.
2150
fba140841d Jean*2151 checkpoint67h (2019/03/21)
db0c10dd53 jm-c 2152 o tools/genmake2:
2153 - fix option "-nocat4ad" for latest version of TAF: now needs to add TAF
2154 option "-fixed" to process *.flowdir files with newer (after 4.1.1) version
2155 of TAF (otherwise assumed now to be in free format).
b98355c8c5 jm-c 2156 o model/src:
dc54d31829 Ian *2157 - remove argument tFld & sFld from S/R CALC_PHI_HYD and from 2 related S/R
bcbb675387 jm-c 2158 o tools/genmake2:
2159 - allow to skip "check_fortran_compiler" part (as, e.g., in opt-file:
2160 tools/build_options/linux_ia64_cray_archer).
1c87316fba Jeff*2161 o verification/tutorial_barotropic_gyre:
2162 - add 1rst tutorial documentation to new manual and update corresponding setup
8b07a23c92 Jean*2163 o pkg/atm_phys:
2164 - add 3-D input file for stratospheric ozone
2165 - add code from Matt Kasoar for SW absorption by stratospheric ozone,
2166 based on following papers:
2167 Lacis and Hansen (JAS, 1974) and Forster and Shine (JGR, 1997).
2168 - turned on using 2 local run-time parameter: ozone_in_SW (downward)
2169 and two_stream_SW (also in upward); default are off.
2170 - clean up S/R "radiation_up": rename "net" to "flux_lw" (better name)
2171 and remove un-used local (dyn-allocated) arrays.
2172 - also avoid division by zero in Rel-Humid diagnostics (atm_phys_driver.F)
bfae2ee370 jm-c 2173 o pkg/seaice:
2174 - fix missing update of sIceLoad in the case usePW79thermodynamics=F.
80d7ca01bb Jona*2175 o pkg/dic:
2176 - Adjust unit conversions for dissociation coefficients aks, aksi, and akf
2177 (#define CARBONCHEM_TOTALPHSCALE).
516b08a580 jm-c 2178 o tools/genmake2:
2179 - improve Fortran Compiler check, section: running MPI executable ; also
2180 refine the "conclusion" printed message.
2181
29a542dcab Jean*2182 checkpoint67g (2019/01/03)
2183 o doc:
2184 - add documentation for pkg/streamice
148dd84005 jm-c 2185 o model/src:
2186 - change ordering of pkg calls in initialisation: streamice / shelfice and
2187 then seaice / salt_plume / thsice;
2188 - fix thin ice-shelf issue with pkg/seaice ; implemented by updating (recently
2189 added) seaice masks (requiring new ordering of calls).
c87895a3f5 jm-c 2190 o pkg/shelfice:
2191 - allow to include thin ice-shelf (i.e., such that hFacC(k=1) > 0 ) when
2192 using pkg/thsice, by preventing seaice to form where there is an ice-shelf.
2193 - prevent short-wave heating below an ice-shelf (previously still happening
2194 below thin ice-shelf); also fix Qnet there (but only for diagnostics).
ec0d7df165 Mart*2195 o pkg/seaice:
2196 - move initialisation of masks and metric coefficients and KGEO from
2197 seaice_init_varia.F to seaice_init_fixed.F
2198 - remove all reference to global masks maskC/maskW/maskS:
2199 * introduce new masks SIMaskU/V
2200 * initialise HEFFM/SIMaskU/V as copies of surface maskC/W/S
2201 * replace maskC/W/S with HEFFM/SIMaskU/SIMaskV; in some places this requires
2202 including SEAICE.h and as a consequence renaming a few local variables to
2203 avoid name overlap
2204 - remove TAF storage directives for "heffm" (no longer needed) and simplify
2205 seaice calls and TAF storage dir in do_oceanic_phys.F
73c0056d2e Oliv*2206 o pkg/monitor:
2207 - fix local array declaration in mon_stats_latbnd_rl.F
49fc9b4095 Oliv*2208 o tools/example_scripts:
2209 - remove all files in tools/example_scripts/
2210 (updated testing scripts are all in MITgcm_contrib/test_scripts)
2211 o verification:
2212 - remove un-tested experiments: cpl_atm2d+ocn, tidal_basin_2d and
2213 tutorial_offline
2214
9636f5994f Jean*2215 checkpoint67f (2018/11/23)
83ddf5a6c6 Mart*2216 o pkg/seaice:
2217 - add advection ppm and pqm advection schemes ;
2218 - test new scheme in verification/offline_exf_seaice.dyn_lsr
2219 o pkg/generic_advection:
2220 - regularize ppm and pqm advection schemes:
2221 - replace unsafe division in the case of numerical underflows by
2222 regularized expression sign(max(abs(uCFL),1.d-20),uCFL) and similar,
2223 in anology to other advection routines, e.g. gad_os7mp_adv_x/y/z.F
2224 - affects verification/advect_xz at truncation level -> updated
2225 o eesupp & model:
2226 - add entry points for 2-way nesting pkgs.
95edbf0004 chri*2227 o pkg/dic:
2228 - fix out-of-bounds error in S/R CAR_FLUX_OMEGA_TOP (#define CAR_DISS)
68432e7ba3 dngo*2229 o pkg/streamice:
2230 - new implementation of grounding line smoothing by smoothing of basal
2231 traction in partly grounded cell, in streamice_upd_ffrac_uncoupled.F
2232 - rename CPP directives: previous smoothing functionality now enabled with
2233 STREAMICE_SMOOTH_FLOATATION2, new functionality enabled via
2234 STREAMICE_SMOOTH_FLOATATION
2235 - affects verification/halfpipe_streamice, FWD, TAF and OpenAD adjoint.
fcc5c8b844 jm-c 2236 o pkg/atm_phys:
2237 - change IR absorption formulation regarding the dependence on Water-Vapor
2238 in the case wv_exponent = -1 ; update results of experiment "atm_gray.ape"
2239 from verification_other repos.
e0fa1cecbf Mart*2240 o pkg/seaice: clean up advection and SEAICE_ITD
2241 - make SEAICEmultiDimAdvection a global variable that is set in
2242 seaice_readparams.F
2243 - do not allow SEAICE_ITD with old 2nd order advection scheme anymore
2244 - re-organize SEAICE_ITD code in seaice_advdiff.F
2245 - make it possible to compile pkg/seaice without pkg/generic_advdiff
52dd931a85 Timo*2246 o pkg/autodiff:
2247 - created addummy_for_etan.F to correctly print adjoint variable for etaN
2248
901d0c4f7d Jean*2249 checkpoint67e (2018/10/16)
2250 o pkg/seaice:
2251 - fix possible division by zero if LSR_mixIniGuess > 0
85b328ee93 dngo*2252 o pkg/streamice:
2253 - fix bugs relating to ice front advance:
901d0c4f7d Jean*2254 streamice_advect_thickness.F -- overlap update of array passed to
85b328ee93 dngo*2255 streamice_adv_front which was leading to spurious ice area values
2256 streamice_init_varia.F -- proper initialisation of area_shelf_streamice
2257 which is used for ice front advance (only affects diagnostics)
1c882252b0 Ed D*2258 o verification/*/data
2259 - set "rhoConst" instead of "rhoNil" (unless using Linear EOS)
2260 - for net surface heat flux, set "surfQnetFile" instead of "surfQfile"
2261 (unless net surface shortwave is also specified).
2262 - fix OpenAD/input_oad.kpp set-up where net surface heat flux was used
2263 as net heat-flux minus short-wave and update the output.
2264
2df144911f Jean*2265 checkpoint67d (2018/09/04)
dcaaa42497 Jeff*2266 o doc:
2df144911f Jean*2267 - update few pieces of documentation including addition (in "getting_started"
dcaaa42497 Jeff*2268 section) of main CPP OPTIONS description and main code full list of
2269 run-time parameters.
a60aeb96a0 Oliv*2270 o pkg/generic_advdiff:
2271 - move masking of (explicit) vertical diffusive flux to S/R that compute each
2272 contribution (pass maskUp as a new argument): This ensures that diagnostics
2273 of explicit vertical diffusive flux are properly masked.
faf4966244 jm-c 2274 o tools/do_tst_2+2
2275 - Fix up to use absolute paths for results directories.
b8665dacca Mart*2276 o pkg/seaice: some new and hopefully more sensible defaults:
2277 - SEAICEscaleSurfStress = .TRUE.
2278 - SEAICEaddSnowMass = .TRUE.
2279 - SEAICEadvScheme = 77
2280 - SEAICE_useMultDimSnow = .TRUE.
2281 - SEAICE_Olx/y = Olx/y - 2
2282 - SEAICEetaZmethod = 3
2283 - SEAICE_drag = 0.001
2284 - CPP-flag SEAICE_ZETA_SMOOTHREG defined by default
2285 - change SEAICE_waterDrag default to 5.5e-3 and add reference density
2286 rhoConst to scale it. Add a warning if SEAICE_waterDrag > 1.
2287 This change also involves a slight re-organization (= simplification)
2288 in seaice_oceandrag_coeffs.F
2289 - all verification experiments are affected, so that all but four
2290 data.seaice are adjusted to restore the old defaults. The four experiments
2291 that use the new defaults are
2292 + global_ocean.cs32x15.seaice
2293 + offline_exf_seaice
2294 + offline_exf_seaice.dyn_jfnk
2295 + offline_exf_seaice.dyn_lsr
2296 - updated documentation
b4d50d3323 Oliv*2297 o pkg/dic:
a60aeb96a0 Oliv*2298 - Promote constants in S/R CARBON_COEFFS_PRESSURE_DEP and
2299 S/R CAR_FLUX_OMEGA_TOP to double precision.
1cf5741c70 Jean*2300 o pkg/seaice:
2301 - fix bug in seaice B-grid code (call to seaice_advdiff, see issue #134);
2302 Note: B-grid code not tested in any verification exp. (only compiled in one)
2303 so no need to update any output.txt
a5ec81ed49 Timo*2304 o pkg/diagnostics:
2305 - Print adjoint variables for theta, salt, uvel, vvel, wvel, and etan
2306 through diagnostics package.
4f8baf0351 Kait*2307 o pkg/shelfice:
2308 - fix ice shelf mask for very-thin ice shelf case, when hFacMin
2309 and hFacMinDr criteria leave no room for ice (hFac(k=1)=1).
2310 Note: thin ice-shelf that results in 0< hFac(k=1) <1 still need
2311 to be fixed when using any seaice pkg.
736e27304c Timo*2312 o pkg/ecco:
2313 - Replace "mskTrVol" and "gencost_errfile" with "gencost_mask" in
2314 "cost_gencost_transp", mirroring "m_horflux_vol".
2315 - Document and warn user (via STDERR) of potential issues with using
2316 "cost_gencost_transp" to compute volume, heat, or salt transport.
2317
00ab3a8557 Jean*2318 checkpoint67c (2018/06/26)
63eaf06b6a Jean*2319 o pkg/generic_advdiff:
2320 - Add per tracer run-time param to switch on/off Smolarkiewicz-Hack:
2321 Run-time switch for Temp & Salt are set from main param file "data"
2322 (default value = FALSE); and for pTracers, they are set from parameter
2323 file "data.ptracers" (default value = TRUE).
2324 - Add a test in verification exp. global_ocean.90x40x15.down_slope for
2325 Smolarkiewicz-Hack (switched on for Salt and pTracer(1)) but results
2326 remains unchanged since, in this exp., Salt & pTr(1) are well above 0.
f149b16d6e Jean*2327 o pkg/mdsio:
2328 - apply same substitution to remaining calls to MDSREADFIELD/MDSWRITEFIELD
2329 in pkg/ctrl and in pkg/seaice.
2330 - disable the use of obsolete MDSREADFIELD and MDSWRITEFIELD S/R (unless
2331 USE_OBSOLETE_MDS_RW_FIELD is defined).
f8e779c983 antn*2332 o pkg/ecco:
2333 - replace calls to (obsolete) MDSREADFIELD and MDSWRITEFIELD with calls to
2334 pkg/rw S/R: READ_REC_3D_RL and WRITE_REC_3D_RL ; this enable to use pkg/ecco
2335 without pkg/autodiff.
a51428376c jm-c 2336 o verification exp:
2337 - update few (10) adm & tlm output after latest TAF update, from version 3.9.0
2338 to version 3.9.6 on May 16-18.
2339
9ba62b8274 Jean*2340 checkpoint67b (2018/05/05)
502f242cbd Mart*2341 o pkg/exf/exf_wind.F:
9ba62b8274 Jean*2342 - fix a bug detected by Stanislav Martyanov: replace wStress by SQRT(wStress)
2343 in computing ustar ; this bug does not appear to affect the verification
2344 experiments but has been around for a while (inherited from the ecco-branch)
210ee8461e jm-c 2345 o pkg/seaice:
2346 - new run-time parameter to skip the update of ocean surface stress ; could be
2347 useful for testing or when seaice-dynamics is off (add a warning otherwise).
2348
411fbe7664 Jean*2349 checkpoint67a (2018/03/10)
2350 o pkg/layers
2351 - add Moist Static Energy coordinate in layers package
455d18a2e4 Jean*2352 o pkg/aim_v23:
2353 - change parameter "aim_abs_pCO2" default value (used if aim_select_pCO2=1,3)
2354 to calibrated value (from David Ferreira).
3ba991b895 chri*2355 o pkg/layers
210ee8461e jm-c 2356 - fixed up units reported in diagnostics for THETA and SALT term induced layer
3ba991b895 chri*2357 thickness changes.
17bd6b9422 jm-c 2358 o pkg/seaice:
2359 - move wind-stress over seaice out of SEAICE.h into local seaice_dynsolver.F
2360 common block ; move initialisation of TAUX & TAUY accordingly and add them
2361 to argument list of S/R SEAICE_OCEAN_STRESS (like SEAICE_GET_DYNFORCING).
2362 This enable to remove CPP option "SEAICE_EXCLUDE_WIND_STRESS" (hack from
2363 June 2016) in pkg/dic/dic_fields_update.F
034fdcf01f Jean*2364 o doc:
2365 - first addition of reST/sphinx documentation (formerly in
2366 https://github.com/altMITgcm/MITgcm/doc/), converted from original MITgcm
2367 LaTeX manual in: https://github.com/MITgcm/manual-archive with edits
2368 (including new sections) from @jrscott and @edoddridge ;
2369 - update section on Ocean State Estimation packages by @gaelforget ;
2370 - updated seaice pkg description by @mjlosch.
2371
78abfc2fd0 Oliv*2372 checkpoint67 (2018/02/05)
2373 o add Sphinx configuration for documentation on https://mitgcm.readthedocs.io
2374 o add Travis configuration for testing pull requests
7c72f3fed9 Oliv*2375 o migrate from CVS to Git (2018/01/31)
2376
e1a9cfe6da Jean*2377 checkpoint66o (2018/01/30)
2378 => Final CVS tag ; disable CVS check-in.
2379
9f8d0cd292 Jean*2380 checkpoint66n (2018/01/18)
4dedbda92a Jean*2381 o pkg/seaice & down_slope:
2382 - remove few files from ${pkg}_ad_diff.list (when calling S/R is not in
2383 any *_ad_diff.list)
2384 o pkg/shelfice:
2385 - account for "shelficeLoadAnomaly" in computation of initial pressure
2386 that is used in EOS (case selectP_inEOS_Zc >= 2).
457ca81085 Jean*2387 o pkg/aim_v23:
2388 - merge namelist "AIM_PAR_CO2" into "AIM_PARAMS" and replace Aim_CO2_Flag=2
2389 option with aim_select_pCO2=2 (using #define ALLOW_AIM_CO2);
2390 - add option to derive LW absorption in CO2 band as function of pCO2,
2391 using either prescribed pCO2 (aim_select_pCO2=1), or computed pCO2
2392 from well-mixed atm-box (aim_select_pCO2=3).
a88d8cd2fb Jean*2393 o pkg/gchem, changes to enable to use several geo-chemistry pkgs together:
2394 - new CPP option GCHEM_ADD2TR_TENDENCY around definition of gchemTendency
2395 array (replacing #ifndef GCHEM_SEPARATE_FORCING) ;
2396 - in GCHEM_FIELDS.h, change dimension of array "gchemTendency"
2397 from PTRACERS_num to GCHEM_tendTr_num ; this later one is set in new header
2398 file: GCHEM_SIZE.h, to be included anytime GCHEM_FIELDS.h is included ;
2399 - new set of S/R, called from GCHEM_TR_REGISTER, to record rank (in pTracer
2400 array) and number of tracers for each geo-chemistry pkg ;
2401 - check that GCHEM tracers all fit in pTracer and gchemTendency arrays ;
2402 - initialise gchemTendency array in gchem_init_vari.F ;
2403 - fix storage directives for gchemTendency ;
2404 - add some entry points for new geo-chemistry pkg SPOIL.
b82264afff Jean*2405 o verification/isomip:
2406 - update secondary test (input.htd): a) drop cd_scheme, useJamartWetPoints=T
2407 and increase viscAh ; b) use ivdc_kappa with implicit Diff & Visc ;
2408 c) switch off SHELFICEboundaryLayer, turn on pCellMix_select (=20) and
2409 use SHELFICEselectDragQuadr=1 ; add new set of pickup files.
0ce06cdb80 Jean*2410 o pkg/shelfice:
2411 - Replace CPP option: SHI_USTAR_WETPOINT with run-time parameter:
2412 SHELFICE_oldCalcUStar (default=F <--> #define SHI_USTAR_WETPOINT)
2413 but keep only original (old) formula in SHELFICEboundaryLayer code.
2414
e699be221d Jean*2415 checkpoint66m (2017/12/12)
40b8e0222d Mart*2416 o add another hook (S/R PDF_FINALIZE) for the Parallel Data Assimilation
2417 Framework PDAF (http://pdaf.awi.de/) in the_main_loop.F
d5d280a154 Jean*2418 o pkg/autodiff:
2419 - fix pkg/exf AD variable output (mainly ADJprecip), left from pkg/exf modif
2420 on Jan 27, 2017. Try also to fix ADJrunoff and TLM output (but less clear).
2421 o pkg/obcs:
2422 - add simpler setting (single value) of OB indices for the case where
2423 indices are uniform over the full section (Bruno Deremble contribution).
5421b78870 Jean*2424 o pkg/rbcs:
2425 - increase size of "relaxMaskFile" to read-in from namelist and save it
2426 (+check) into new (renamed) "relaxMaskTrFile" array.
fe8f61a7d2 Jean*2427 o model/src:
2428 - option (interViscAr_pCell, interDiffKr_pCell) to account for true vertical
2429 distance (including hFac) in vertical viscous flux and diffusive flux ;
2430 - add option to increase vertical mixing (for both momentum and tracers)
2431 near surface and/or bottom where partial cell is too thin ;
2432 - for now, both additions above are within: #ifndef EXCLUDE_PCELL_MIX_CODE ;
2433
1a6d19a1b5 Jean*2434 checkpoint66l (2017/10/24)
408a6af91c Jean*2435 o pkg/kpp, ggl90 & ebm:
2436 - read namelist without IOSTAT=errIO to force to stop if there is an error
2437 in the parameter file namelist.
11fedddd87 Jean*2438 o pkg/cheapaml: major changes to relaxation coefficient setting:
2439 - rename parameters cheapaml_taurelax & cheapaml_taurelaxocean (in days)
2440 to cheap_tauRelax & cheap_tauRelaxOce (now in seconds);
2441 - if using cheapMaskFile, set relaxation coeff to: cheapMask/tauRelax
2442 (instead of 1/cheapMask over ocean and 1/tauRelax over land);
2443 - with cheapMaskFile unset: set relaxation coeff according to land/ocean mask
408a6af91c Jean*2444 (unchanged) but skip increase near domain edges for periodic domain (in X
11fedddd87 Jean*2445 or Y dir) when cheapamlX/Yperiodic=T ; also fix linear increase (over
2446 Cheapaml_mask_width grid points) of coeff towards domain edges (previously
2447 was increasing away from edges). Update output of experiment "cheapAML_box".
2448 o pkg/cheapaml:
2449 - move setting of (fixed in time) relaxation coefficient
2450 from cheapaml_init_varia.F to cheapaml_init_fixed.F
dc84b236da Jean*2451 o pkg/exf:
2452 - add specific forcing field for tides to feed model new geopotential anomaly
2453 forcing, for now within #ifdef EXF_ALLOW_TIDES.
2454 - remove from common block unused params: exf_inscal_sst & exf_inscal_sss.
1faed850cb Jean*2455 o model:
2456 - add new 2-d forcing field for time-dependent geopotential anomaly (e.g.,
2457 tidal forcing), in m^2/s^2 ; add run-time param to allow to turn it off.
2458 o eesupp/src:
7727ad69a9 Dimi*2459 - shift standardMessageUnit in eeboot.F and I/O units in mdsfindunit.F
2460 for coupling to GEOS AGCM: HACK_FOR_GMAO_CPL option in CPP_EEOPTIONS.h
2461
3cac0e158e Jean*2462 checkpoint66k (2017/09/20)
2463 o model/src:
0442cf0340 Gael*2464 - add missing CPP brackets (ALLOW_COST, ALLOW_CTRL in load_fields_driver.F
2465 and the_model_main.F)
2466 o ctrl:
2467 - use zeroRL in place of fc when ALLOW_COST is not compiled (in ctrl_pack.F)
3cac0e158e Jean*2468 - call MDS_READ_FIELD / MDS_WRITE_FIELD instead of deprecated
0442cf0340 Gael*2469 mdsreadfield / mdswritefield (in ctrl_get_gen.F, ctrl_map_ini_gen.F,
2470 ctrl_map_ini_genarr.F, and ctrl_map_ini_gentim2d.F )
dd5f25c34f Jean*2471 o eesupp:
2472 - add CPP option to activate some pieces of code for coupling to GEOS AGCM;
2473 - shift commonly used IO unit (in eeboot.F) for coupling to GEOS AGCM.
59cd39d469 Matt*2474 o pkg/bling:
dd5f25c34f Jean*2475 - bling_production: Fix typo in calcium carbonate uptake. Also rearranging
2476 and cleaning
8880ed1f7d Jean*2477 o model/src:
2478 - move k loop inside correction_step.F (+ update calling S/R)
2479 - collect implicit pressure gradient tendencies in local 2-D array;
2480 affect results (at machine truncation level) when using 3-D solver; update
2481 output of exp.: exp4 (x1), global_ocean.cs32x15 (x2),hs94.cs-32x32x5.impIGW,
2482 rotating_tank, short_surf_wave,tutorial_deep_convection (x2)
2483 & tutorial_plume_on_slope.
2484
32f5cbc73c Jean*2485 checkpoint66j (2017/08/15)
ba2a21739f Jean*2486 o pkg/ptracers:
2487 - fix surface forcing under ice-shelf (useShelfIce=T).
2488 o pkg/atm_phys:
2489 - use hFac weighted average when applying A-grid atm-phys momentum tendency
2490 to C-grid dynamics; this ensures wind-stress match mom tendency.
03aacdc90f Mart*2491 o eesupp/src:
157398927a Mart*2492 - change default for opening scratch files to avoid STATUS='SCRATCH'
4a3a90a659 Jean*2493 - close scratch files with STATUS='DELETE'
03aacdc90f Mart*2494 - changes affect eeset_parms.F and open_copy_data_file.F and many routines
2495 that read namelists (because they close the scratch files)
4a3a90a659 Jean*2496 - you can revert to old default by setting USE_FORTRAN_SCRATCH_FILES
2497 in CPP_EEOPTIONS.h (tested in ideal_2D_oce/code & lab_sea/code_ad)
d39315aba7 Jean*2498 o pkg/atm_phys:
2499 - fix unset arguments in (unused) S/R surface_flux_0d.
5261466e31 Jean*2500 o eesupp/src:
2501 - add argument "procId" to S/R EESET_PARMS to fix scratchFile1 & 2 setting
2502 (case TARGET_BGL or TARGET_CRAYXT) for early call (from eeboot_minimal.F):
2503 called with myProcId in eeboot.F and with mpiMyWId in eeboot_minimal.F
234f0840d6 Mart*2504 o pkg/streamice:
2505 - remove blank between _EXCH_XY_RL and "()", which my Apple Xcode
2506 preprocessor /usr/bin/cpp cannot interpret; 3 instances in total in
2507 streamice_driving_stress_fd.F and streamice_advect_2dtracer.F
7d973b58e2 Jean*2508 o pkg/diagnostics:
2509 - new option to allow to cumulate thickness-factor (hFac) weighted field
2510 (if field permitted); implemented by changing sign of "jdiag" pointer
2511 (> 0: cumlulate field, < 0: cumulate hFac weighted field).
2512 a) restricted to 3-d (Nr levels), level centered diagnostics at U,V or Cell
2513 center position (gcode(2)='U','V','M' & gcode(3,5,9:10)='R',' ','MR')
2514 b) for now, activated by setting fileFlags 3rd character to 'h'.
2515
d0fc06a0a4 Jean*2516 checkpoint66i (2017/07/18)
2517 o pkg/cheapaml:
2518 - add parameter "useRelativeWind", default set to False; this change the
2519 previous setting which was always using relative wind.
036ec33ebd Mart*2520 o add hooks for the Parallel Data Assimilation Framework PDAF
d0fc06a0a4 Jean*2521 (http://pdaf.awi.de/) in eeboot_minimal.F and the_main_loop.F;
2522 to use set CPP-flag USE_PDAF in CPP_EEOPTIONS.h
fc55955988 Jean*2523 o pkg/exf:
2524 - interpolation of vector fields (exf_interp_uv.F): fix bug in calculation
a435e833b1 Mart*2525 of South-Pole mean value.
d0fc06a0a4 Jean*2526 - interpolation near the poles, case where second additional row is at the
04a6d3d2ba Jean*2527 pole (or beyond the pole and moved to the pole): change first addition row
d0fc06a0a4 Jean*2528 value to a linear interpolation between pole and 1rst (S.pole)/last (N.pole)
04a6d3d2ba Jean*2529 row (instead of just a copy of it).
fc55955988 Jean*2530 o pkg/seaice:
f720d02ca0 Mart*2531 - prevent JFNK and KRYLOV solvers from trying to reduce a residual of 0
fc55955988 Jean*2532 - add the option to compute no-slip du/dy, dv/dx (i.e.
2533 the offdiagonal strain rate e12) by a second order approximation
2534 on the boundary; works only with JFNK, KRYLOV, or EVP solvers, because
2535 it is too messy to implement for the implicit LSR matrix.
f720d02ca0 Mart*2536 SEAICE_2ndOrderBC = .FALSE. by default
50ab531fad Mart*2537
6a3f62c6cb Jean*2538 checkpoint66h (2017/06/02)
2539 o pkg/seaice:
2540 - add new routines to compute stress tensor components and stress tensor
e228c48bba Mart*2541 divergence to be reused in s/r seaice_lsr and s/r seaice_calc_lhs
2542 - change names of diagnostics SIsigI/II (commonly used for invariants)
2543 to SIsig1/sig2 (more common for principal components) to avoid confusion
5d66a6a2ec Jean*2544 o pkf/exf:
2545 - add a stop if useRelativeWind with un-updated uwind/vwind (e.g., constant);
2546 similarly, stop if rotateStressOnAgrid with constant wind-stress.
caa3182bae Jean*2547 o pkg/seaice:
2548 - remove (comment out) diagnostics SIuwind,SIvwind,SIfu,SIfv (duplicate of
2549 EXFuwind,EXFvwind,oceTAUX,oceTAUY) and point them to their equivalent.
2550 - add diagnostics of wind-stress over seaice (SItaux,SItauy) and seaice
2551 fraction weighted wind stress over ocean+seaice (SIatmTx,SIatmTy).
2552 o pkg/diagnostics:
2553 - small piece of code to rename (old) diagnostics, when namelist is processed.
e9ff366891 Jean*2554 o model/src:
2555 - new run-time param (useMin4hFacEdges) to select method for setting hFacW,S:
2556 originally, set as minimum of adjacent hFacC factor ; now (new default)
2557 computed from rSurfW,S and rLowW,S by applying same rules as for hFacC.
2558 Only matters when useShelfIce=T with particular ice-shelf cavity geometry.
caa3182bae Jean*2559 o pkg/seaice:
e9ff366891 Jean*2560 - add momemtum advection, off by default, still in test phase
2561 most of the momentum advection code is adapted and reused from mom_vecinv
caa3182bae Jean*2562 o pkg/mom_vecinv:
2563 - pass these runtime flags:
e9ff366891 Jean*2564 selectVortScheme, highOrderVorticity, upwindVorticity, useJamartMomAdv
caa3182bae Jean*2565 as formal parameters to s/r mom_vi_u/v_coriolis, mom_vi_u/v_coriolis_c4,
e9ff366891 Jean*2566 so that these routines can also be used in pkg/seaice.
fc0cb18620 Mart*2567
4207dc8bfb Jean*2568 checkpoint66g (2017/04/24)
d9c26da9d2 Jean*2569 o model/src:
2570 - more robust ordering of column thickness integral (=Sum_k(drF*hFac) )
2571 to get same expression (regarding machine truncation) in different places
2572 in ini_masks_etc.F (e.g., rSurfC,W,S is now exactly zero when it should).
2573 Update forward output of experiments: global_ocean.cs32x15 (all 5 except
2574 viscA4), isomip (x3), tutorial_global_oce_in_p & tutorial_plume_on_slope.
e3622e8a9f Jean*2575 o pkg/shelfice:
2576 - ALLOW_SHIFWFLX_CONTROL: move setting of maskSHI from shelfice_update_masks.F
2577 to shelfice_init_fixed.F
2578 - change S/R SHELFICE_UPDATE_MASKS to SHELFICE_INIT_DEPTHS (still called from
2579 ini_masks_etc.F for now) to update ocean upper boundary position according
2580 to ice-shelf topography (instead of directly updating hFacC).
559a8104ea Jean*2581 o model/src:
2582 - move call to CTRL_INIT & CTRL_ADMTLM from the middle to the bottom of
2583 packages_init_fixed.F to allow other pkgs to set mask and weight fields.
2584
902eadea41 Jean*2585 checkpoint66f (2017/04/06)
4fcf953981 Jean*2586 o model/src:
2587 - add specific run-time param to select level of printed plot-field-maps,
2588 set by default to debugLevel. Remove internal param "printDomain".
2589 o pkg/seaice:
c854efd521 Mart*2590 - add flag to add snow mass to seaiceMassC/U/V, the default is
2591 SEAICEaddSnowMass=.FALSE., not to change previous results
7d18c8ad21 Matt*2592 o pkg/bling
2593 - Bug fix in bling_production regarding unit conversion for diagnostics
2594 being put in the wrong place
bc982d58e8 Jean*2595 o model/src:
2596 - add back recomputation of rSurfW & S to ensure consistent column thickness
2597 (needed for rStar) between Sum_k(hFac*drF) and rSurf-rLow, for now only
2598 when using pkg/shelfice; was initially added on 2012/06/01 (ini_masks_etc.F
2599 revision 1.51) but was removed accidentally on 2014/02/08 (v1.53).
fe1663a66d Jean*2600 o pkg/autodiff:
2601 - clean-up "checkpoint.flow"
2602 o pkg/rw (Contribution from Jody Klymak):
2603 option to set mds file suffix as function of time in simulation:
2604 *) new input parameter "rwSuffixType" (read from PARM03 namelist)
2605 to select file suffix format; by default (=0), use iteration number;
2606 *) add simple routine to return file suffix according to rwSuffixType;
2607 *) in model/src and in most pkgs (except: atm2d, fizhi, regrid & streamice),
2608 use new S/R to get file suffix, except for debug output file (diagFreq)
2609 and pkgs offline & rbcs input files.
2610 o pkg/rw:
2611 - uniform processing of "I10" suffix across writing fld routines; used to
2612 simplify debug writing of cg2/3d_b/x in solve_for_pressure.F & post_cg3d.F
2613 (similar to cg3d.F, cg3d_ex0.F)
a94e0175c9 Jean*2614 o pkg/mom_vecinv:
2615 - highOrderVorticity in selectVortScheme=2 case: fix c4 coeff in splitted
2616 vorticity flux (keep same sum in case vBarXm=vBaXp, uBarYm=uBarYp).
1906a8e7f8 Matt*2617 o pkg/bling:
a94e0175c9 Jean*2618 - Many small changes intended to clean the code.
2619 Unnecessary ADJOINT_SAFEs removed ;
2620 removed BLING_COST.h BLING_CTRL.h bling_cost.F ;
2621 diagnostics added.
1906a8e7f8 Matt*2622
a035b63002 Jean*2623 checkpoint66e (2017/03/14)
78a0667e15 Jean*2624 o pkg/exf:
2625 - interpolation with #undef EXF_INTERP_USE_DYNALLOC: move buffer size
2626 definition outside EXF_PARAM.h in new header file: EXF_INTERP_SIZE.h;
2627 use fixed size buffer (passed to S/R EXF_INTERP & EXF_INTERP_UV) to
728f4c76b4 Jean*2628 avoid any dynamic allocation ;
2629 - S/R EXF_CHECK: add new check & stop when file-name is defined but not
2630 read-in ; add warning when file is read-in but not used within pkg/exf ;
2631 + check for buffer-size (if #undef EXF_INTERP_USE_DYNALLOC).
2632 - update exf_summary.F (print {FLD}RepCycle).
78a0667e15 Jean*2633 o verification/global_with_exf:
2634 - switch on exf interpolation in AD test (just like the forward test)
52e8352d39 Gael*2635 o pkg/mom_vecinv:
2636 - add storage directives to avoid recomputations within mom_vecinv.F
78a0667e15 Jean*2637 which were generating seg. fault with gfortran -devel
52e8352d39 Gael*2638 o pkg/ctrl, pkg/smooth:
78a0667e15 Jean*2639 - initialize array halos which were generating seg. fault with
52e8352d39 Gael*2640 gfortran -devel in adjoint mode
df8491dd93 Jean*2641 o pkg/exf:
ab74fbfba7 Jean*2642 - for each input field, enable to specify a field specific repeat-cycle
2643 ({FLD}RepCycle) which defaults to pkg/exf main "repeatPeriod".
2644 o verification/lab_sea:
2645 - update AD results of primary test and noseaicedyn test after switching
2646 to new version of TAF (5.3.13 vs 5.3.2 before); agreement with gradient
2647 check stays about the same.
2648 o pkg/exf:
df8491dd93 Jean*2649 - fix bug in exf_zenithangle.F for cases select_ZenAlbedo > 0 with useCAL=T.
d1272ed847 Dimi*2650 - exf_check: MAX_LAT_INC need only be "loc_nlat-1", not equal to loc_nlat
1a68cdf63d Jean*2651 o pkg/bling, USE_EXFCO2 code:
2652 - add parameter "apco2RepCycle" (set to pkg/exf "repeatPeriod" by default);
2653 - update calls to EXF S/R (use new version: EXF_INIT_FLD & EXF_SET_FLD).
38dcf987c9 Jean*2654 o pkg/exf:
2655 - rename S/R EXF_INIT to EXF_INIT_VARIA ;
2656 - add arguments: fldName (for debug msg) and fldRepeatCycle (set to
2657 repeatPeriod) to S/R EXF_SET_UV and to S/R EXF_SET_GEN (renamed EXF_SET_FLD)
2658 and update calls in pkg/exf calling S/R (exf_getffields.F & exf_getclim.F) ;
2659 - add argument: fldName (for debug msg) to S/R EXF_INIT_GEN (renamed
2660 EXF_INIT_FLD) and update calls in exf_init_varia.F
2661 - For now, for backward compatibility, keep a simplified version of S/Rs
2662 EXF_SET_GEN & EXF_INIT_GEN in file exf_set_gen.F
2663 - add and pass new arguments: fldName (for debug msg) and fldRepeatCycle
2664 to S/R EXF_GetFFieldRec ; update calls in pkg/obcs/obcs_exf_load.F
2665 o tools/genmake2:
2666 - replace "bc -l" (only used once) by "expr" (already used).
0e208b4985 Jean*2667 o verification/global_ocean.cs32x15:
2668 - turn off pkg/cal (useCAL=F) in secondary FWD exp. "icedyn".
2669 Note: exf setting (data.exf) can be compared to other exf secondary exp
2670 "seaice" (kept with useCAL=T) which has same time dependent forcing.
2671
68b2841201 Jean*2672 checkpoint66d (2017/02/13)
2673 o pkg/exf:
2674 - remove setting of useCAL=T when using pkg/exf (useEXF=T); add warning
2675 early on (in packages_boot.F) to stress this change in pkg setting.
2676 - In (most) verification exp. that use pkg/exf, add useCAL=.TRUE. to data.pkg
e88a30daa9 Jean*2677 o model/src:
39fa77e8d0 Gael*2678 - move call to ecco_phys to end of time step; this may induce minor
2679 cost function changes by shifting time averages by one time step
2680 for some variables; this revision resulted in changed adjoint results
2681 in MITgcm_contrib/verification_other/global_oce_cs32
e88a30daa9 Jean*2682 o pkg/exf:
2683 - Change EXF_READ_EVAP to only activate code within #ifdef ALLOW_ATM_TEMP ;
2684 this prevents to read evap when ALLOW_ATM_TEMP is undef and other fields,
2685 e.g. precip, are not available.
2686 o pkg/flt:
2687 - flt_init_varia.F: use pickupSuff if specified
2688 - add code (within #ifdef DEVEL_FLT_EXCH2) and test case as a first,
2689 intermediate, step towards completing pkg/exch2 support within pkg/flt;
2690 ifdef DEVEL_FLT_EXCH2 then:
2691 - flt_init_fixed.F: comment out stop
2692 - flt_exch2.F: conserve ipart, jpart (grid coordinates)
2693 - exch2_recv_get_vec.F: transform ipart, jpart (grid coordinates)
2694 - flt_mapping.F: attempt to fix longitude diagnostic near date-line
2695 - flt_init_varia.F: hack initialization (for testing purposes w. LLC90)
ea11a19a76 Jean*2696 o tools/genmake2 & pkg/pkg_depend:
2697 - define new type of pkg dependency rule ("=pkg_x"), less strict than
2698 the "+" rule, that add the dependent pkg (pkg_x) unless it's disabled
2699 (-pkg_x in packages.conf).
2700 - change pkg/exf dependency rule from "exf +cal" to "exf =cal";
2701 - add "+cal" to dependency list of pkg/ecco (needed to compile).
2702 - simplify FWD experiment "offline_exf_seaice" by removing pkg/cal.
127047c0ca Dimi*2703 o utils/matlab:
2704 - adding ocean_basin routines for defining basin masks.
6a96fcda5d Jean*2705 o pkg/exf:
450d2d2f88 Jean*2706 - new S/R EXF_GETFFIELD_START replacing EXF_GETFIELD_START, but with more
2707 arguments, allowing to check (and stop) if parameter setting of
2708 {FLD}startdate1 & date2 and of {FLD}StartTime are consistent with
2709 useCAL= T or F. For now, kept a simplified version of EXF_GETFIELD_START
2710 for backward compatibility.
2711 - change accordingly calls in exf_init_fixed.F + default {FLD}StartTime in
2712 exf_readparms.F ; apply same changes to pkg/icefront (for SGRunOff field).
2713 o pkg/bling (USE_EXFCO2 code):
2714 - fix missing setting of apco2StartTime according to apco2startdate1 & date2
2715 by adding a call to S/R EXF_GETFFIELD_START.
2716 o pkg/exf:
40e5c4acf5 Jean*2717 - allows to compile without pkg/cal (but disabled by current dependency
2718 rules, i.e., default "pkg/pkg_depend"). Minimal changes to enable to
2719 run with useCAL=F ; this involves setting directly {FLD}StartTime instead
2720 of {FLD}startdate1 & date2 ; consistency check not yet coded.
2721 o verification/global_ocean.cs32x15:
2722 - fix all data.exf for a shift of 1 day in all field startdate1 so that it now
2723 corresponds to middle of 1rst month; update outputs (2 fwd + 3 adm + 3 tlm).
2724 o pkg/exf:
2725 - allow to use EXF_ZENITHANGLE without pkg/cal + simplify (saving some
2726 calculations); change FWD experiment global_ocean.cs32x15
2727 (#define ALLOW_ZENITHANGLE) to test/check that this code compiles.
2728 o pkg/exf:
2729 - In preparation for addition to NAMELIST, rename internal (_RL) parameter
053dccd244 Jean*2730 {FIELD}startdate to {FIELD}StartTime
2731 Note: new name also fit better the content, i.e, a start time in second.
40e5c4acf5 Jean*2732 o eesupp/src:
2733 - add 1 argument to S/R EEBOOT & EEBOOT_MINIMAL for interface with ESMF
053dccd244 Jean*2734 o pkg/exf:
6a96fcda5d Jean*2735 - add option ALLOW_READ_TURBFLUXES (and corresponding set of parameters)
2736 to allow to read-in Sensible & Latent Heat flux ;
2737 - simplify pkg/exf main options:
2738 1) move small piece of code (case ALLOW_ATM_TEMP undef) out of
2739 exf_bulkformulae.F into exf_wind.F so that exf_bulkformulae.F is
2740 compiled only when both ALLOW_ATM_TEMP & ALLOW_BULKFORMULAE are defined;
2741 2) make call to EXF_RADIATION and to EXF_WIND independent of CPP option
2742 ALLOW_BULKFORMULAE which now only applies to S/R EXF_BULKFORMULAE ;
2743 3) improve options documentation in EXF_OPTIONS.h.
c63b11972e Gael*2744 o pkg/ecco:
6a96fcda5d Jean*2745 - cost_gencost_customize.F,ecco.h,ecco_phys.F,ecco_readparms.F, and
2746 ecco_summary.F: add passive tracer cost functions to gencost;
c63b11972e Gael*2747 m_ptracer and m_boxmean_ptracer
2748 o pkg/ctrl:
6a96fcda5d Jean*2749 - ctrl_map_forcing.F: pass myIter and myTime to ctrl_map_forcing as input
c63b11972e Gael*2750 parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing; add to list
2751 of implemented gentim2d contol parameters: xx_qnet, xx_empmr, xx_qsw,
2752 xx_sst, xx_sss, xx_pload, xx_saltflux, xx_fu, xx_fv, xx_fe, xx_fn
2753 o model/src:
6a96fcda5d Jean*2754 - forward_step.F: pass myIter and myTime to ctrl_map_forcing as input
c63b11972e Gael*2755 parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing
2756 o pkg/exf:
6a96fcda5d Jean*2757 - exf_getffields.F: add to list of implemented gentim2d contol parameters:
c63b11972e Gael*2758 xx_lwflux, xx_swflux, xx_evap, xx_apressure, xx_areamask
2759
6b39d139af Jean*2760 checkpoint66c (2017/01/19)
8611775bfe Jean*2761 o verification:
2762 - add new option "-src" to testreport to only produce source code (*.f),
2763 including taf output src code (if using '-adm'/'-tlm' option).
66f021d63a Gael*2764 o pkg/exf:
2765 - add saltflx :: Net upward salt flux in psu.kg/m^2/s
2766 o pkg/diagnostics:
bd9df6a12d Jean*2767 - add run-time variable diagMdsDir to specify a subdirectory for
66f021d63a Gael*2768 diagnostic output when mds is being used and mdsioLocalDir is not.
c34b076d9e Gael*2769 o pkg/mnc:
9922871071 Gael*2770 - mnc_utils.F: edit stop message
c34b076d9e Gael*2771 o pkg/autodiff:
66f021d63a Gael*2772 - autodiff_ini_model_io.F: PRINT_MESSAGE, clean-up comments, add _*_MASTER,
2773 add HAVE_SYSTEM bracket around system call to mkdir
c34b076d9e Gael*2774 o pkg/profiles:
bd9df6a12d Jean*2775 - profiles_findunit.F, profiles_init_fixed.F, profiles_interp.F,
c34b076d9e Gael*2776 profiles_readparms.F: call ALL_PROC_DIE before 'stop'
66f021d63a Gael*2777 - profiles_ini_io.F: use PRINT_MESSAGE, clean-up comments, add _*_MASTER,
2778 add HAVE_SYSTEM bracket around system call to mkdir
c34b076d9e Gael*2779 o pkg/smooth:
2780 - smooth_filtervar2d.F, smooth_filtervar3d.F: call ALL_PROC_DIE before 'stop'
2781 - smooth_init2d.F, smooth_init3d.F: move print statements to readparms
2782 - smooth_readparms.F: add cleaner print statements from smooth_init?d.F
7b97f426d4 Jean*2783 o pkg/exf:
2784 - check: count errors and stop cleanly at the end (call to ALL_PROC_DIE);
bd9df6a12d Jean*2785 issue error message when climsst_interpMethod.GT.0 and climsst_lon_inc > 500
2786 generalize tests on interpMethod, nlat, and lon_inc to all exf variables.
7b97f426d4 Jean*2787 - summary: skip detailed field report if not used (empty file-name).
93424431c1 Jean*2788 o tools/xmakedepend:
2789 - In case line editor "ed" is missing, switch to "sed" command to clean-up
2790 Makefile from previous dependencies (anything after "# DO NOT DELETE" line).
5d59af6b6c Jean*2791 o pkg/exf:
2792 - change definition of "hflux" input file to always include Short-Wave;
93424431c1 Jean*2793 this is now consistent with hflux computation (if using bulk-formulae)
5d59af6b6c Jean*2794 and hflux diagnostic & documentation (in EXF_FIELDS.h).
2795
cd57923099 Jean*2796 checkpoint66b (2016/12/01)
3706e6143e Jean*2797 o model & momentum pkgs:
2798 - implement fully implicit bottom friction combined with implicit surf.
2799 pressure, for now, only in hydrostic formulation:
2800 + to use: compile with #define ALLOW_SOLVE4_PS_AND_DRAG in CPP_OPTIONS.h
2801 and run with selectImplicitDrag=2 ;
2802 + currently missing diagnostics of bottom drag and vert. viscosity tendency;
2803 - partial implicit time-stepping (bot. friction + vert. visc first, then
2804 surf. press) corresponding to selectImplicitDrag=1 should be applicable
2805 to NH formulation but not available until we solve for surf. pressure
2806 increment (instead of full etaN).
499c3c4540 Jean*2807 - change exp. global_ocean.cs32x15.thsice to test implicit bottom drag
2808 with implicit vertical viscosity.
ff74c947d1 Mart*2809 o pkg/seaice: add linear remapping scheme (Lipscomb 2001) to ITD model
2810 - this is a first version that includes many regularisations that may
2811 not all be necessary, to be sorted out,
2812 - turned on by runtime parameter SEAICEuseLinRemapITD (true by default)
2813 - change one verification experiment in seaice_itd to use and test new code
3706e6143e Jean*2814 - seaice_growth: catch a case where the argument of log can be zero
ff74c947d1 Mart*2815 or smaller (important for code stability)
c68e15e2a9 Jean*2816 o model/src:
2817 - modify SOLVE_DIAGONAL_LOWMEMORY version of solve_tridiagonal.F
2818 & solve_pentadiagonal.F to enable to re-used inverse matrix for solving
2819 similar A.X'=Y' system (with same matrix A) in subsequent calls;
2820 switch based on errCode (In/Out) argument value; in calling routines,
2821 initialise errCode before first call.
2822
4a59b36843 Jean*2823 checkpoint66a (2016/10/18)
2661ed7c00 Matt*2824 o pkg/bling:
4a59b36843 Jean*2825 - BLING package now loads in atmospheric pCO2 file using exf package routines
2826 Enable with #define USE_EXFCO2 in BLING_OPTIONS.h
8372d9421d Jean*2827 o model/src & pkg/ptracers:
2828 - with INCLUDE_IMPLVERTADV_CODE defined, also call MOM_U,V_IMPLICIT_R &
2829 GAD_IMPLICIT_R (instead of IMPLDIFF) when just implicitViscosity and
2830 implicitDiffusion (respectively) are used (even without momImplVertAdv
2831 or temp,salt,PTRACERS_ImplVertAdv).
25215968c0 Jean*2832 o model/src & generic_advdiff:
2833 - add parenthesis in main diagonal calculation of implicit vertical
2834 diffusion matrix (impldiff.F & gad_implicit_r.F).
2835 This affects results at machine truncation level; update output of many
2836 verification experiments (31 fwd ; 10 adm ; 8 tlm ; 3 oad).
caec104026 Jean*2837 o pkg/mom_commom & generic_advdiff:
2838 - add deep atmosphere and anelastic scaling factor in implicit vertical
2839 advection routines (mom_u,v_implicit_r.F & gad*_impl*_r.F).
2840 o model/src:
2841 - remove few unnecessary temp array copies in solve_tridiagonal.F
2842 & solve_pentadiagonal.F
2843
434f2a808d Jean*2844 checkpoint65z (2016/09/28)
2845 o pkg/seaice: fix multithreading for seaice_fgmres.F
4d686fb526 Mart*2846 - remove unecessary variables from common blocks
434f2a808d Jean*2847 - use extra dimension MAX_NO_THREADS for all variables of the Krylov space
2848 basis, that are stored in commom blocks (including integer variable i1)
2849 - clean up code a little by removing commented lines that refer to
4d686fb526 Mart*2850 original code
434f2a808d Jean*2851 - turn on multi-threaded test for experiment offline_exf_seaice.dyn_jfnk.
6c3fcd2d73 Gael*2852 o MITgcm manual:
caec104026 Jean*2853 - add uptodate pkg/ecco documentation to the manual (section 8.1; ecco.tex),
2854 preliminary documentation for generic controls (8.3; ctrl.tex),
2855 a placeholder for smooth (8.4; smooth.tex), and comment out the deprecated
2856 ecco_costfunction.tex
b3b78d9534 Gael*2857 o pkg/ecco:
caec104026 Jean*2858 - update and cleanup list of CCP options
2859 - re-assign gencost_mask to specify masks rather than gencost_errfile; 'c'
2860 is now always passed to cost_generic; gencost_mask is now MAX_LEN_FNAM
2861 - add checks that retired run-time options are not used, and in relation
2862 to gencost_mask and gencost_errfile
2863 - finish deprecating gencost_scalefile, gencost_smooth2Ddiffnbt, and
2864 gencost_nrecperiod
2865 - fix m_eta computation for virtual salt flux case
2866 - add m_horflux_vol case (selected via gencost_barfile) that computes
2867 transports via cost_gencost_boxmean (gencost_flag=-3)
2868 - use gencost_flag more systematically (i.e., avoid using gencost_name)
2869 for code switches (aside from physical variable selection)
290bbecc29 Mart*2870 o pkg/seaice: make seaice_fgmres.F fit for multithreading; this first
2871 attempt appears to be a bit of a hack and my need some repair down the road
423bece461 Jean*2872 o pkg/exf:
2873 - interpolation near South Pole: fix criteria on input field latitude.
772c88b829 Jean*2874 o pkg/icefront & pkg/exf:
2875 - move setting of icefront Sub-Glacial RunOff forcing (currently unused)
2876 from pkg/exf (read from data.exf) to pkg/icefront (read from data.icefront)
6708d8dfd2 Jean*2877 o pkg/exf:
2878 - replace CPP option ALLOW_EXF_OUTPUT_INTERP with run-time parameter
2879 "exf_output_interp" (in namelist: EXF_NML_04); change output file name
2880 (add suffix "_out" instead of a prefix); keep same record number as in
2881 input file but always write record 1 first (to avoid a STOP in I/O S/R).
2882 Change output file content by writing interpolated field before applying
2883 land-sea mask (helpful for debug).
2884 - 2 compon. vector interpolation with rotation: apply scaling factor on
2885 each compon. (Eastward and Northward) just before rotation.
7e2b7aaecb Matt*2886 o pkg/bling:
6708d8dfd2 Jean*2887 - Cleaned package. Removed not needed code and comments.
2888 - adjoint example now works
7e2b7aaecb Matt*2889 (MITgcm_contrib/verification_other/global_oce_biogeo_bling/code_ad)
33d60f0145 Jean*2890 o pkg/ptracers:
2891 - add Bruno Deremble's code to complete the linear surface correction
2892 for tracer conservation;
0aacb0e819 Oliv*2893 - enabled for individual ptracers by PTRACERS_linFSConserve(iTr)=.TRUE.
c16ff5b7c8 Mart*2894
94ff1e4393 Jean*2895 checkpoint65y (2016/07/29)
92de52e82f Jean*2896 o pkg/debug (stats):
2897 - change GLOBAL_SUM to GLOBAL_SUM_TILE (result independent of tile to
2898 proc/thread mapping);
2899 - fix Min & Max for case where 1 thread has only empty tiles;
2900 - use RL variable to count number of wet grid points (with big domain,
2901 can be too large to fit into integer*4).
c21a057aef Jean*2902 o pkg/monitor:
92de52e82f Jean*2903 - use RL variable to count number of wet grid points (but used only for del2)
c21a057aef Jean*2904 - add new routine to compute Advective CFL within tracer time-stepping with
2905 writing delayed until next monitor output.
880a06ccd8 Jean*2906 o pkg/obcs:
2907 - fix bug in OBCS_BALANCE_FLOW (OBCS_balanceFacN misspelled OBCS_balanceFacW)
33d60f0145 Jean*2908 o pkg/cal:
2909 - calandar-dump: treat case myTime < timePhase in the same way as in
2910 eesupp/src/diff_phase_multiple.F (when not using calandar-dump).
20bafebaa1 Jean*2911 o pkg/dic & seaice:
2912 - fix compilation of ocean component for coupled atm+ocn model with
2913 seaice dynamics & dic.
2914
1fc3f67886 Jean*2915 checkpoint65x (2016/06/11)
2916 o add a license text file in main MITgcm tree.
dca45a136c Matt*2917 o added pkg/bling:
c721362620 Jean*2918 - intermediate complexity biogeochemical model
dca45a136c Matt*2919 - see bling_description.txt for details
c721362620 Jean*2920 - verification experiment is global_oce_biogeo_bling (for now, in
2921 Contrib/verification_other/); tested daily on baudelaire with gfortran.
2922 - add entry point in pkg/gchem for new pkg "bling".
dd56bd054f Mart*2923 o pkg/seaice: fix tensile stength computation
2924 - replace global field tensileStrength by tensileStrFac
2925 - tensileStrFac can be computed once in S/R seaice_init_varia
2926 - fortunately that does not affect any verification results
2927
4973639fa7 Jean*2928 checkpoint65w (2016/05/12)
b509abd770 Mart*2929 o pkg/ctrl/ctrl.h: fix a comma in common block list, so that code compiles
2930 with ECCO_CTRL_DEPRECATED defined
9cecfd71bf Jean*2931 o verification/global_ocean.cs32x15:
2932 - change secondary test "viscA4" to also test "selectP_inEOS_Zc=3"
2933 with "selectNHfreeSurf=1".
99dd8840a4 Jean*2934 o model/src (non-hydrostatic free-surface):
2935 - More "natural" expression of NH free-surface term (case selectNHfreeSurf=1):
2936 was: tmpSurf/(1+tmpSurf); changed to: 1/(1+Gamma) with Gamma=1/tmpSurf.
2937 - Calculate surface vertical velocity after 2-D solver adjustment (accounts
2938 for EmPmR if RealFreshWaterFlux); used in RHS (cg3d_b) if exactConserv
2939 and used to compute dPhiNH (in post_cg3d.F) if selectNHfreeSurf=1.
2940 This fixes EmPmR contribution when selectNHfreeSurf=1 & RealFreshWaterFlux.
2941 - Update output (changes at machine truncation level) of verification exp:
2942 exp4 (11 digits for cg2d), global_ocean.cs32x15.viscA4 (11.d),
2943 short_surf_wave (13.d) and tutorial_deep_convection.smag3d (12.d).
ca41d54747 Mart*2944 o pkg/seaice: ITD code
99dd8840a4 Jean*2945 - fix picking up from a single category model by initialising
ca41d54747 Mart*2946 heff/area/hsnowITD = 0. in seaice_itd_pickup.F
2947 - split a long warning message in seaice_check_pickup.F into two lines,
2948 because NEC SX-ACE cannot deal with the long line.
8c8ba31314 Jean*2949 o model/src:
2950 - fix missing dPhiNH in pressure_for_eos.F (case: selectP_inEOS_Zc=3)
4ecb7ca1c7 Mart*2951 o pkg/seaice:
2952 - add missing checks for SEAICE_ALLOW_KRYLOV and SEAICE_ALLOW_BOTTOMDRAG
8c8ba31314 Jean*2953 o pkg/seaice:
02ecb7194f Mart*2954 - add basal stress as parameterisation for grounding ice
2955 following Lemieux et al. (2015)
8c8ba31314 Jean*2956 - turn on by setting new parameter SEAICEbasalDragK2 to a value
2957 larger than 0. Lemieux et al. (2015) recommend 15.
02ecb7194f Mart*2958 - The adjoint complains with extra recomputations so there is also a
2959 new cpp-flag SEAICE_ALLOW_BOTTOMDRAG that is undefined by default in
2960 order to postpone the problem
2961 - compile the new code in lab_sea
026b44969e Jean*2962 o verification/halfpipe_streamice:
2963 - update both TAF and OpenAD adm output (machine truncation differences)
2964
8692139b79 Jean*2965 checkpoint65v (2016/04/08)
77f624c4e1 Jean*2966 o verification/advect_xz:
2967 - increase overlap size from 3 to 4 and add new secondary test for PQM
2968 advection scheme (with mono & wino limiter).
2969 - change main exp. to test PPM (with weno limiter) adv.scheme on Temp.
ef0910b248 Jean*2970 o model/src:
2971 - new parameters "top_Pres" & "seaLev_Z" (replacing Ro_SeaLevel and recently
2972 added phi0Ref) to set vertical axis origin and phiRef origin;
2973 keep Ro_SeaLevel for backward compatibility (with a warning).
2974 According to coordinate and fluid type:
2975 OCN in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(1), @ the top)
2976 ATM in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(Nr+1) @ bottom)
2977 OCN in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(Nr+1)/g, @ the top)
2978 ATM in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(1)/g, @ the bottom)
77f624c4e1 Jean*2979 - remove Ro_SeaLevel from ATM experiment parameter files;
2980 - in tutorial_global_oce_in_p, remove Ro_SeaLevel and set top_Pres to the
2981 complement; update output.txt (changes at machine truncation level).
9af9059269 Mart*2982 o pkg/seaice/seaice_evp.F
2983 - simplify computation of deltaZ and zetaZ to simple averaging following
2984 Bouillon et al. (2013). This removes a lot of code, but also changes
2985 verification experiment lab_sea.hb87 -> updated
2986
1ec3766700 Jean*2987 checkpoint65u (2016/03/14)
2c76214192 Jean*2988 o pkg/generic_advdiff:
2989 - from Darren: add PPM and PQM advection schemes (number 40-42 and 50-52)
2990 with 2 types of limiter (see: Engwirda & Kelley, submit. to JCP);
2991 Note (from Darren): unlimited PPM/PQM scheme (40 & 50) are just for
2992 testing and not for actual use.
fc40089cb1 Jean*2993 o model/src:
2994 - add parameter "phi0Ref" to specify reference [pressure/geo] potential at
2995 origin r = rF(1);
2996 - add options (parameter selectP_inEOS_Zc) to select which pressure to use
2997 in EOS for height coordinate: enable to include NH Pressure or to use
2998 more accurate pressure vertical profile; options not linked to EOS type
2999 (as previously, e.g., JMD95P/JMD95Z) but set default according to EOS type;
3000 - start to implement variable gravity (along vertical): for now, only with
3001 z-coords (not even z*).
3002 - add Ideal Gas equation of state for height coordinate.
2c76214192 Jean*3003 - update OpenAD output (affected at machine truncation level) of exp:
3004 global_ocean.90x40x15, OpenAD (std) and tutorial_global_oce_biogeo.
564694d02e Gael*3005 o pkg/exf:
3006 - add ALLOW_EXF_OUTPUT_INTERP cpp switch to output the result
fc40089cb1 Jean*3007 of exf interpolation (before any rescaling, rotation or interpolation
3008 to velocity point) for each field that gets loaded from file. This option
3009 identically mimics the input file organization (e.g. record numbers in year
3010 by year input files) besides the change in horizontal grid.
564694d02e Gael*3011 - add rotateStressOnAgrid run-time switch so that wind stress fields
fc40089cb1 Jean*3012 can be provided on the A-grid in zonal/meridional direction and
3013 rotated on the fly. This only applies to the case when the exf
3014 interpolation is off and rotateStressOnAgrid is false by default.
dc293ceb82 Jean*3015 o model/src:
3016 - rename internal parameter "useDynP_inEos_Zc" to "storePhiHyd4Phys" (since
3017 it's also used with pkg/atm_phys) and add few more parameters (but still
3018 inactive, src code yet to come)
3019
388e260d1d Jean*3020 checkpoint65t (2016/02/10)
6eeba9ca6b Jean*3021 o pkg/atm_phys:
3022 - from Ruth Geen: add optical depth dependence on CO2 concentration.
74dbf591da Jean*3023 o model/src:
3024 - fix vertical inter/extra-polation of density factor rhoFacF (for anelastic)
3025 for the case setCenterDr=T (delRc set from "data"); add output of rhoFacC&F.
3026 Update output of exp. deep_anelastic (changes at truncation level).
42d6c3122b Jean*3027 o tools:
3028 - add a hack in "remove_comments_sed" (used only with TAF) for recent
3029 version of OpenMPI (shipped with FC.23): comment out the new header
3030 file "mpif-sizeof.h" which causes problems to TAF.
142f5afeb1 Mart*3031 o pkg/seaice:
c9f636aca9 Mart*3032 - change the termination criterion so that maxits (SEAICElinearIterMax)
3033 has an effect
142f5afeb1 Mart*3034 - unify iteration parameters for implicit solvers (JFNK and Picard)
3035 SEAICEnonLinIterMax replaces SEAICEnewtonIterMax/NPSEUDOTIMESTEPS
3036 SEAICElinearIterMax replaces SEAICEkrylovIterMax/SOLV_MAX_ITER
3037 SEAICEpreLinIterMax replaces SOLV_MAX_ITER in preconditioner
3038 SEAICEpreNL_IterMax replaces NPSEUDOTIMESTEPS in preconditioner
3039 SEAICEnonLinTol replaces JFNKgamma_nonlin
3040 - remove S/R SEAICE_FGMRES_DRIVER and put content into S/R SEAICE_JFKN
3041 - add new Picard-Krylov solver, compile with SEAICE_ALLOW_KRYLOV and
3042 use with SEAICEuseKrylov
3043 o pkg/seaice/seaice_lsr.F
42d6c3122b Jean*3044 fix small bug: replace zetaZ by zetaZloc in S/R seaice_lsr_rhsu/v; only
3045 relevant if SEAICEuseStrImpCpl=T, and even then it does not seem to have
3046 an effect.
e42d0c73e8 Mart*3047 o pkg/seaice: add two new parameters
42d6c3122b Jean*3048 - SEAICEuseLSR to simplify the logic in seaice_dynsolver (this
e42d0c73e8 Mart*3049 parameter is not in any namelist)
42d6c3122b Jean*3050 - SEAICEusrPicardAsPrecon to allow s/r seaice_lsr to be used as
3051 a preconditioner for the non-linear Newton iteration of the JFNK
e42d0c73e8 Mart*3052 solver
2d057da76f Mart*3053 o pkg/seaice/seaice_lsr.F: replace 1./SEAICE_deltaTdyn with recip_deltaT,
42d6c3122b Jean*3054 affects some experiments at truncation level:
3055 - global_ocean.cs32x15.icedyn (11 digits),
3056 - global_ocean.cs32x15.seaice (11 digits),
2d057da76f Mart*3057 - seaice_itd (12 digits), seaice_itd.lipscomb07 (12 digits) -> update
3058 - also update global_ocean.cs32x15 adjoint and tangent-linear results
3d01549ccd Jean*3059 o pkg/salt_plume & pkg/thsice:
3060 - for coupled set-up with pkg/thsice in ATM and pkg/salt_plume in OCN,
3061 connect salt_plume flux to ATM-OCN coupling pkgs interface:
3062 a) in ATM: also cumulate salt-plume flux in S/R THSICE_SALT_PLUME (for
3063 export to coupler interface) even without compiling pkg/salt_plume ;
3064 b) in OCN: apply coupler salt-plume flux to pkg/salt_plume field
3065 (saltPlumeFlux) just before exch call, in S/R SALT_PLUME_DO_EXCH.
467753bb05 Jean*3066 o pkg/dic:
3067 - use the updated seaice fraction (from seaice pkgs) for DIC forcing
3068 instead of the previous time-step value ; done in new S/R DIC_FIELDS_UPDATE
3069 called from the top of dic_biotic_forcing.F (instead of in DIC_FIELDS_LOAD);
3070 - move also update with values from ATM-OCN Coupler in the same new S/R
3071 (previously done in ocn_apply_import.F).
3072 o tools/adjoint_options:
3073 - specify explicitly "-f77" or "-f90" in default ad-optfile since TAF (default)
3074 has been changed on Jan 14, 2016.
3075 o pkg/ggl90:
3076 - add alternative discretisation of vertical shear (off by default), to
3077 compute the mean (@ grid-cell center) of vertical shear compon instead of
3078 vertical shear of mean flow (@ grid-cell center).
3079 - add correct parenthesis in ALLOW_GGL90_SMOOTH code to get the same truncated
3080 results on adjacent faces of cubed-sphere grids; this fix the restart.
86104489ad Jean*3081 o pkg/atm_compon_interf:
467753bb05 Jean*3082 - skip time-ave over cpl_atmSendFrq of Sea-Level Pressure (atmSLPr) and just
86104489ad Jean*3083 pass last value, stored directly before export to CPL ;
3084 Note: this affects results of Coupled set-up where OCN uses useImportSLP=T
3085 - remove atmSLPr from pickup files (no longer needed for restart)
3086
96ead4aa58 Jean*3087 checkpoint65s (2016/01/13)
9d1bad620f Jean*3088 o eesupp & genmake2:
3089 - first check for Function ETIME and, if it fails, then check for subroutine
3090 ETIME and consistent output; use the appropriate version in timers.F
0e1fe683c9 Jean*3091 o model/src:
3092 - to check restart test, add option to apply EXCH to U,V earlier, just before
3093 integr_continuity; turned off by default.
3094 o pkg/dic:
3095 - remove CPP option USE_ATMOSCO2 (not needed)
3096 o tools/tst_2+2:
3097 - try to ignore difference between +0 and -0 in binary file, causing test
3098 to fail for no good reason.
3099 o eesupp & genmake2:
3100 - put back modif from Jinxuan Zhu - change etime fct call to S/R call -
3101 but also check (in genmake2) that test runs and returns meaningful results.
a4406a661e Jean*3102 o coupler pkgs:
3103 Finish implementation of optionally-exchanged variable switches (started on
3104 Nov 12) with addition of few more exchanged fields, including 2-way exchange
3105 of pkg/thsice vars to allow to use seaice dynamics (from pkg/seaice) & seaice
3106 advection in OCN component; this requires sequential coupling.
3107 coupler (pkg/atm_ocn_coupler):
3108 - add argument msgUnit and iter number to CPL_SEND/RECV_ATM/OCN_FIELDS
3109 routines (useful for debug).
3110 - only export/import optionally exchanged fields (RunOff, seaice, Salt-Plume
3111 flux, DIC fields) if corresponding switch is ON.
3112 - add option to export RunOff to OCN (to use for DIC river input)
3113 - add 2-way thSIce vars exchange; check for consistent cpl_sequential setting.
3114 components (pkg/atm_ & ocn_compon_interf):
3115 - to save memory space in ATM & OCN comp: add some #ifdef ALLOW_${PKG} around
3116 optionally exchanged fields; add a check & stop in cpl_readparms.F.
3117 ATMCPL.h: ALLOW_LAND for RunOff, ALLOW_THSICE for seaice, ALLOW_AIM for CO2;
3118 OCNCPL.h: ALLOW_SALT_PLUME, ALLOW_DIC for DIC, ALLOW_THSICE for 2-W thsice.
3119 - rename: fracIce -> sIceFrac_cpl (<- match coupler var name)
3120 + in ATM: fracIceTime -> sIceFracTime ; seaIceTime -> sIceMassTime.
3121 - add 2-way thSIce vars exchange ; add Salt-Plume flux ; add RunOff in OCN.
3122 - hold in common block coupler optionally-exchanged variable switch
3123 and set default "useImportXXX" accordingly; + check & stop if inconsistent.
3124 - add diagnostics for all imported fields from coupler (in both OCN & ATM);
3125 this is intended to replace the OCN cplFldtave.* output files (not updated
3126 to contain new additional exchanged fields).
826e3022ab Jean*3127 o pkg/dic:
3128 - fix an other bug (also from 2014/08/30) in dic_atmos.F, in dic_int1=3 code.
3129 o pkg/thsice:
3130 - when coupled to ATM (useCoupler) with thSIce_skipThermo=T, skip reading
3131 and writing of thsice pickup files.
3132 o pkg/atm_compon_interf:
3133 - move all field individual export-call out of cpl_export_import_data.F
3134 into new S/R ATM_EXPORT_FIELDS
df3ba02ef4 Jean*3135 o pkg/atm_compon_interf:
3136 - store state variables (for now, only thSIce fields) just before beeing
3137 exported (in cpl_export_import_data.F, like on ocean side) instead of from
3138 atm_store_my_data.F like all exported fluxes.
3139 - new version of pickup_cpl: write field names into meta file and read meta
3140 file to find field postion in pickup. Also only write/read fields meeded for
3141 restart (same logic as main pickup file ; also using pickupStrictlyMatch)
cc55ade87f Jean*3142 o pkg/dic:
3143 - fix bug (added on 2014/08/30) in dic_atmos.F for the case dic_int1= 2 or 3.
238b281666 Mart*3144 o pkg/seaice: add new parameter SEAICEpressReplFac to choose between
cc55ade87f Jean*3145 pressure replacement method (=1., default) or original Hibler (1979) (=0.)
3146 value can be from domain [0,1] to average between the two methods
8f2cc0ef18 Jean*3147 o pkg/atm_phys:
3148 - allow to provide 2-d map of albedo and mixed-layer depth from files (but
3149 hold fixed in time).
3150
df5ab41a91 Jean*3151 checkpoint65r (2015/12/21)
3152 o pkg/seaice:
3153 fix bug in tridiagonal solvers for SEAICE_OLx/y>0, this affects the JFNK
3154 solver (offline.dyn_jfnk) and global_ocean.cs32x15.seaice -> updated
3155 o pkg/seaice:
3156 - fix a bug in computing areaS in (J-J -> J-1) that affects runs
d5321ae2f9 Mart*3157 when SEAICEscaleSurfStress=.TRUE.,
3158 - apply areaW and areaS in S/R seaice_calc_lhs
0b8d317bbe Jean*3159 o pkg/atm_phys:
3160 - add diagnostics for 3-D, Nr+1 levels diagnostics of radiative fluxes
3161 (shortwave & longwave, net & downward) and diagnostics of temp. tendency
3162 for individual contribution (convection, LSC cond, radiation)
8c8ba31314 Jean*3163 - add Ruth Geen etal, GRL 2016, radiation options (see paper supp.
0b8d317bbe Jean*3164 information); activated with: solar_exponent=0. and wv_exponent=-1.
3165 o pkg/ggl90:
e4d707b911 Mart*3166 - within IDEMIX add upper limit for horizontal group velocity to
3167 avoid instability problems in the explicit horizontal diffusion term for
3168 long time steps or high resolution
0602590031 Jean*3169 o pkg/diagnostics:
3170 - simplify setting of local-array size in diagstats_output.F: uses "numLevels"
3171 (from DIAGNOSTICS_SIZE.h) to allow to write out more than Nr levels.
3172 o testreport:
3173 - remove "-v" (verbose option) in default mpirun command.
c162643754 Mart*3174 o pkg/seaice/seaice_growth:
0602590031 Jean*3175 - catch potential division by zero in ITD code, does not change
c162643754 Mart*3176 verification results
b8a0aa824d Gael*3177 o pkg/ecco:
0602590031 Jean*3178 - retire old codes to the Attic. The calls to retired functions are
3179 left in a commented form in case they ever need to be re-activated.
b8a0aa824d Gael*3180 - ecco_check.F: issue warning if any old CPP option is
3181 defined that corresponds to retired codes -- then stop.
4240d2d6ae Jean*3182 o pkg/atm_compon_interf:
3183 - change seaice fraction (use for OCN dic surf.flux) stored and sent to
3184 coupler: use last time-step value instead of average over cplSendFrq_iter
3185 time-step, similar to what is done for seaIceMass.
3186 This will affect results (pkg/dic) of coupled ATM-OCN+dic set-up.
f439370875 Jean*3187 o eesupp & genmake2:
4240d2d6ae Jean*3188 - from Jinxuan Zhu: change etime fct call to S/R call (fix gfortran ETIME);
3189 <= remove until a fix is found for some ifort version on ia32 machine.
8e20d992b4 Mart*3190 o pkg/seaice/seaice_evp:
3191 - refine residual computation
3192
4d2bb60bd2 Jean*3193 checkpoint65q (2015/11/18)
3194 o pkg/seaice/seaice_evp:
acd0bab53d Mart*3195 - fix residual computations so that they no longer affect the actual
3196 simulation code
391b36ba77 Mart*3197 - fix seaice_readparams to be able to actually set new parameters
3198 SEAICEaEVPcStar and SEAICEaEVPalphaMin, also fix logic a little
fbe544c5ad Jean*3199 o model/src:
3200 - fix wrong truncation (single prec) from "FLOAT" function in expressions
3201 like: deltaT*FLOAT(myIter) when myIter is large:
3202 a) replaced by DFLOAT (if not seen by TAF);
3203 b) remove "FLOAT" and use implicit type conversion (if seen by TAF).
3204 o pkg/aim_v23:
3205 - write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading
3206 when pickupSuff is set ; do write rolling pickups + at the end of the run.
a90d2d6d41 Jean*3207 o pkg/atm_ocn_coupler + ocn_compon_interf:
3208 - in prep for using pkg/seaice Dyn in coupled set-up, implement sequential
3209 coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ;
3210 add corresponding call in DO_OCEANIC_PHYS.
728fbdfa55 Jean*3211 o coupler pkgs:
3212 Start a new way to set-up optionally-exchanged variables (previously, only
3213 there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler
3214 data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ;
3215 send switch to ATM & OCN compon before reading their own "data.cpl" (so that
3216 compononent param default can be set accordingly).
3217 Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch
3218 but rather applies to a group a fields (going both ways like for DIC)
3219 and corresponds to an option of coupling config.
3220 coupler (pkg/atm_ocn_coupler):
3221 - change parameter file from "data" to "data.cpl" (in cpl_read_params.F),
3222 and read namelist directly (without eessup S/R calls) instead of
3223 in the very un-flexible old way, 1 param per line, in fixed order;
3224 - add error-counter to track errors (e.g., missing "data.cpl") and to stop
3225 cleanly in CPL_CHECK_CPLCONFIG
3226 - add new coupling-exchange selectors (some not yet active) including
3227 cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h
3228 and ocnCpl_exchange_DIC=T in OCNIDS.h);
3229 - add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each
3230 component ; called directly from coupler.F, after comp. registrations;
3231 - rename few variable-ID names (in ATMIDS.h & OCNIDS.h):
3232 atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name ->
3233 -> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName
3234 components (pkg/atm_ & ocn_compon_interf):
3235 - add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding
3236 CPP header file in all pkg source files.
3237 - move checking of comp. configs out of cpl_exch_configs.F into new S/R
3238 ATM/OCN_CHECK_CPLCONFIG;
3239 - add error-counter to track errors (e.g., in "data.cpl") and to stop
3240 cleanly in ATM/OCN_CHECK_CPLCONFIG;
3241 - add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors
3242 from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and
3243 before PACKAGES_READPARMS;
3244 verification/cpl_aim+ocn/:
3245 - update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file
3246 "data.cpl" for coupler (in input_cpl).
2f968f5f13 Jean*3247 o eesupp/inc:
3248 - change the MPI-global-sum default (in CPP_EEOPTIONS.h) to:
3249 #define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F)
3250 to always cumulate tile local-sum in the same order (still uses
3251 MPI_Allreduce like standard code).
3252 - in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files
3253 that are now identical to standard version (in eesupp/inc).
4014d9eb9b Dimi*3254 o pkg/shelfice:
3255 - add SHELFICETransCoeffTFile for initializing spatially varying
3256 heat and salt transfer coefficients
1f88340446 Jean*3257 o pkg/atm_compon_interf & ocn_compon_interf:
3258 - combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous
3259 S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA
3260 - move bi,bj loops inside S/R OCN_STORE_MY_DATA
3261 o pkg/atm_ocn_coupler:
3262 - initialise to zero ATMVARS.h & OCNVARS.h arrays.
06e0575ae0 Jean*3263 o pkg/rbcs:
3264 - select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows
3265 to compile with maskLEN=1 when all tracers use the same RBCS-mask.
3266 - add a short report (to STDOUT) about RBCS-mask settings.
3267
87c2bed99f Jean*3268 checkpoint65p (2015/10/23)
53fe7f7443 Mart*3269 o pkg/seaice/seaice_evp.F: fix store directives and key computations, since
87c2bed99f Jean*3270 there is no adjoint test for EVP, we don't know what it does to the adjoint
3271 solution, but at least there are no more recomputation warnings left
5790bd3152 Mart*3272 o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands
87c2bed99f Jean*3273 a chance of giving the same results as a fully converged VP (JFNK) solver
8187002e7a Jean*3274 o tools/adjoint_options/adjoint_diva:
80f3898c9c Jean*3275 - fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA
4323a006ce Dani*3276 o pkg/streamice:
8187002e7a Jean*3277 - spotted bug in streamice_driving_stress using dyG where should have been dxG
fcf4f25c01 Jean*3278 o pkg/exf:
3279 - remove STOP statement that prevented to use wind or (wind-)stress
3280 interpolation for constant-in-time forcing fields (wind/stress period = 0).
3281 o pkg/seaice:
31d3f56edc Mart*3282 - replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires
3283 5 additionals 2D fields and 6 new store directives
3284 - change logic in seaice_readparms.F: EVP code can now be turned on in
fcf4f25c01 Jean*3285 various ways, setting SEAICE_deltaTev is no longer required,
3286 alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev,
31d3f56edc Mart*3287 or SEAICEaEVPcoeff
443b4c77b9 Dimi*3288 o pkg/shelfice/shelfice_thermodynamics.F
3289 - redefining uLoc/vLoc to u/v, instead of 2u/v
0a62312758 Mart*3290 o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz
3291 - this is an intermediate state of a truely converging EVP that has
3292 the potential of outperforming implicit VP methods, I do not recommend
3293 using it yet.
3294 - for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION
3295 and all parameters are hardwired
3296 - for convergence it still requires very smooth regularisations, that means,
3297 if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is
3298 different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also
3299 specific averaging appears to be required, still subject to tuning
3300 - still needs cleaning and I need to turn parameter into runtime parameters
3301 - add code to compute and print residuals of iteration, compile with
3302 defining ALLOW_SEAICE_EVP_RESIDUAL to enable it
912323e508 Mart*3303 o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq)
3304 that entered with r1.54 on Sep04, 2015, -> update results
3305
40fe6f59c8 Jean*3306 checkpoint65o (2015/09/14)
4c3e5a1532 Jean*3307 o pkg/mom_vecinv & mom_common:
3308 - add deep-atmosphere geometry factor in mom_calc_visc.F + in routines
3309 called from there.
3310 - add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this
3311 allows to use Vector-Invariant form in deep atmos and anelastic formulation
7d06cac49c Mart*3312 o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015)
3313 and Koenig-Beatty+Holland (2012)
3314 - two new parameters SEAICE_tensilFac and SEAICE_tensilDepth
3315 - global 2D field tensileStrength, computed in seaice_calc_ice_strength
3316 - requires an extra input argument for S/R seaice_calc_viscosities
3317 - tensileStrength's depth dependence is different from Itkin et al. (2015)
3318 (to be changed and played with, for now exponential)
22864ea3d8 Mart*3319 o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.)
3320 - if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice
3321 by AREA according to Connelly et al. (2004), JPO.
3322 - For EVP and the LSR solver, the implicit part of the drag term is
4c3e5a1532 Jean*3323 the only non-zero term in the denominator when there is no ice (which
22864ea3d8 Mart*3324 prevented running the model with zero ice-ocean drag). If
3325 SEAICEscaleSurfStress = .TRUE., this results in a division by zero
3326 (or zero main diagonals BU/BV) which need to be caught. A practical
3327 consequence is that for open water, the momentum equation reduce
4c3e5a1532 Jean*3328 to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if
22864ea3d8 Mart*3329 they happen to be zero, often leading to a non-zero solution over
3330 open water.
4c3e5a1532 Jean*3331 o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more
eac2f17d92 Mart*3332 efficient EVP method.
4c3e5a1532 Jean*3333 - introduce area-weighted averages for e12 (analogously to
eac2f17d92 Mart*3334 seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits
3335 remain, but also changing the order of terms in the previous average
3336 changed the results as much) -> update experiment
3337 - add SEAICE_DELTA_SMOOTHREG code
4c3e5a1532 Jean*3338 - disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for
eac2f17d92 Mart*3339 TEM-code
3340 - adjust loop bounds so that only required fields are computed
4c3e5a1532 Jean*3341 - add new averaging code for zetaZ/deltaZ (again similar to
eac2f17d92 Mart*3342 seaice_calc_viscosities.F), inactive by default for now (will change
3343 results again), but will replace old code eventually
4b86bb6ef3 Jean*3344 o eesupp/src:
3345 - add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F)
3346 to always cumulate tile local-sum in the same order
3347 (option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h).
3348 Still uses MPI_Allreduce (like standard code) but on array of tiles
3349 and should be faster than GLOBAL_SUM_SEND_RECV code.
3350 - switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV
3351 (defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead.
40fe6f59c8 Jean*3352 - add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.:
4b86bb6ef3 Jean*3353 aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40,
40fe6f59c8 Jean*3354 fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example,
3355 natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre,
3356 tutorial_baroclinic_gyre and tutorial_held_suarez_cs.
4b86bb6ef3 Jean*3357
1e127b2371 Jean*3358 checkpoint65n (2015/07/29)
3359 o pkg/thsice:
3360 - add a warning when used with pkg/aim but without updating SST
3361 (stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ).
d167cbe4e6 Jean*3362 o pkg/offline:
65bcd0f1ad Jean*3363 - change where Offline-Fields are loaded, from load_fields_driver.F to
3364 directly within FORWARD_STEP, just after updating iter number and time;
3365 - move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new
3366 S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS;
3367 These changes allow:
3368 a) to recover exactly on-line results using deltaToffline=deltaTClock,
3369 tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2)
3370 both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous
3371 time-step, both with GM & KPP files and with recomputing these fields;
3372 b) no needs to switch on staggerTimeStep anymore;
3373 c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf.
56d308cb5a Jean*3374 - update output of experiment tutorial_dic_adjoffline (only 3 digits left).
65bcd0f1ad Jean*3375 o pkg/offline:
d167cbe4e6 Jean*3376 - change (rarely used) offset-iteration parameter to an offset time (in s):
3377 can easily recover previous offset-iter effect by setting offset-time
3378 (offlineTimeOffset) to offset-iter x deltaToffline;
3379 - do not turn-off Temp & Salinity surface relaxation when using KPP (used
3380 in KPP as part of surface buoyancy forcing) in offline run.
4a2e3073c9 Jean*3381 - fix ptracers KPP non-local term in the case where KPP is re-computed.
2a36d1b911 Patr*3382 o OpenAD
d167cbe4e6 Jean*3383 - Adding preliminary ggl90 test to OpenAD verification.
3384 Config. with ggl90 currently diverges after 64 time steps
3385 so will need more work to become more stable
3386 - Adding preliminary kpp test to OpenAD verification.
3387 required small tweakes in kpp_routines.F
3388 - Merge and update from Krishna Narayanan's contrib area:
3389 * Add one variable for preliminary OpenAD DIVA
3390 * Add replacement time-stepping for OpenAD DIVA
3391 * genmake2 flag -diva (but only for OpenAD; preliminary)
3392 * required modifs for OAD_support
3393 successful preliminary test for tutorial_global_oce_biogeo/
e81dec19cb Mart*3394 o pkg/seaice:
d167cbe4e6 Jean*3395 - initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr
3396 - add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising
3397 delta with a smooth function in s/r seaice_calc_viscosity
3398 (no effect on EVP)
3399 - rename local suffix "sqr" into "sq" for more consistent variable names
3400 o pkg/seaice:
3401 add new parameter SEAICE_deltaMin that is used ***only***
3402 for regularizing Delta (and nothing else, like the parameter
3403 which is also used for all sorts of things SEAICE_EPS).
3404 Defaults to SEAICE_EPS for backward compatibility only.
c9fe27f0ce Mart*3405 o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with
d167cbe4e6 Jean*3406 the wrong key by inialising it before use -> fixes a recomputation
3407 problem but does not fix the gradient
abafc19a3b Jean*3408 o pkg/layers:
a3d5c99c9c Ryan*3409 - move resetting of flux arrays to outside the iLa loop
3410 (this caused layers_diapycnal to not work with more than one layer coord.)
3411 - fix bug in calculation of layers_recip_delta in layers_init_fixed.F
3412 o pkg/layers:
abafc19a3b Jean*3413 - remove from common block 3D layers fields (used to diagnose transport
3414 in tracer coords) and declare them as local arrays in layers_calc.F
d0a27699e8 Mart*3415 o pkg/seaice:
3416 - Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it
3417 in lab_sea forward experiment (changes results -> updated)
229dc91f74 Mart*3418 - update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v
d167cbe4e6 Jean*3419 o pkg/seaice: modify seaice_lsr.F in order to improve the gradient
3420 computations; for SEAICE_VECTORIZE_LSR
d0a27699e8 Mart*3421 - move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v)
abafc19a3b Jean*3422 sweep to the outside,
d0a27699e8 Mart*3423 - remove store directives and add "CADJ loop sequential" directives
3424 in analogy to model/src/solve_tridiagonal.F
3425 - replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop
3426 boundaries to yield more readable code. This has also the charming side
abafc19a3b Jean*3427 effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without
3428 SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in
d0a27699e8 Mart*3429 seaice_lsr_tridiagu/v now requires either of these flags, vectorization
3430 still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as
3431 an additional option)
abafc19a3b Jean*3432 The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F
3433 but the adjoint gradients (which are affected by this change) still explode.
15da1f08b8 Jean*3434 o coupler (atm & ocn _compon_interf):
3435 - avoid using Exch2 IO mapping if not suitable.
3436
30863fa6ad Jean*3437 checkpoint65m (2015/06/15)
7139ed4ee5 Ryan*3438 o pkg/layers:
18e9f37a89 Jean*3439 - clean-up old parameters setting (from Sep 2012):
3440 + remove old parameters setting from common block (declared locally);
3441 + stop if any old parameter is mixed with new parameters;
3442 + check for valid or consistent parameter setting (e.g., layers_name)
3443 - check that layers_bounds for Pot.Density are in the right range;
3444 this is supposed to catch un-updated setting after recently shifting
3445 potential density field "prho" by -1000 (now in "sigma" scale).
3446 o pkg/layers:
edd113ba3f Ryan*3447 - Added missing call to layers_fill for keeping track of tottend in
3448 pkg/diagnostics/diagnostics_fill_state.F
3449 o pkg/layers:
cdcbace143 Ryan*3450 - added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning
3451 of diapycnal fluxes
3452 o pkg/layers:
f6012f0463 Ryan*3453 - reverted changes to interpolation to previous treatment; there
3454 was never actually a problem
3455 o pkg/layers:
7139ed4ee5 Ryan*3456 - fix interpolation of layers tracers in the presence of partial cells
3457 - add lots of new functionality to compute water mass transformation
3458 (enabled by CPP flag LAYERS_THERMODYNAMICS)
3459 - add new calls from main code (diags_oceanic_surf_flux.F,
3460 thermodynamics.F, impldiff.F) and gad to save the necessary fields
3461 for layers_thermodynamics calculations
152ce31913 Gael*3462 o pkg/ptracers:
18e9f37a89 Jean*3463 - add capability of stepping a passive tracer forward without advection
3464 by setting PTRACERS_advScheme to 0.
9152c0f425 Jean*3465 o pkg/diagnostics:
3466 - add few (threads) _BARRIER around any update of "diag_pkgStatus".
9cf13f2e40 Jean*3467 o pkg/layers:
eee4907c3b Jean*3468 - shift potential density field "prho" by -1000 for density layer averaging so
3469 that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000);
3470 Note that density bin boundaries (layers_bounds in data.layers) have
3471 to be set accordingly (i.e., shifted, in sigma scale).
3472 o pkg/layers:
9cf13f2e40 Jean*3473 - fix snap-shot output of layer thickness @ V.pt and output of pot.density
3474 - fix calculation of layer non-weighted velocity and layer probability
3475 - add diagnostics for pot.density used for layer averaging
3476 o pkg/seaice:
f81cc74571 Mart*3477 - seaice_calc_viscosity.F: change computation of deltaC**2 to ensure
9cf13f2e40 Jean*3478 positiveness, modify a few comments and improve variable names,
3479 - the changed computation of deltaC affects most seaice-related
3480 experiments at the truncation level.
f81cc74571 Mart*3481 seaice_itd.thermo is affected by far the most, with
3482 only 7 digits of agreement remaining; update experiments.
3483
adc564fd15 Jean*3484 checkpoint65l (2015/05/04)
b357f162e4 Dani*3485 o pkg/shelfice:
adc564fd15 Jean*3486 - in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set
3487 factor drKp1 to zero where it is negative (ie. do not use
b357f162e4 Dani*3488 SHELFICEBoundaryLayer if hFacC>1)
3489 - the same for factor drLoc in shelfice_forcing.F
307b498a12 Mart*3490 o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem
adc564fd15 Jean*3491 with modules in ptracers, when using testreport option "-small_f"
36a331ccdf Mart*3492 o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD)
3493 - replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1))
43f4321b67 Mart*3494 o verification/testreport
3495 - add new option -small_f
3496 with this option testreport first makes the target small_f (*.f files)
adc564fd15 Jean*3497 before running make (all). This is useful for explicit inlining when
43f4321b67 Mart*3498 all sources need to be full available.
adc564fd15 Jean*3499 o pkg/exf/exf_interp.F:
3500 remove previous changes related to reverse (decreasing) input grids latitude
43f4321b67 Mart*3501
d4262ce583 Jean*3502 checkpoint65k (2015/04/01)
3503 o pkg/ecco:
3504 fix missing cosphi initialization; use eccoiter in place of optimcycle;
3505 if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL
3506 instead of active read/write
3507 o pkg/ctrl:
3508 if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL
3509 instead of active read/write.
3510 o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F
b905f133e5 Gael*3511 return if .NOT.useAUTODIFF
3512 o pkg/seaice: add CPP brackets (cost function related).
d4262ce583 Jean*3513 o model/src:
3514 add useAUTODIFF run time switch.
3515 o pkg/exf/exf_interp.F:
3516 add code to allow input grids with latitude starting in the north (i.e. when
3517 j=1 corresponds to northern edge of field); modify global_with_exf to test
3518 this feature.
0d0ef3b590 Mart*3519 o verification/testreport:
3520 - replace "grep -A3" with POSIX conformal sed command, because there are
3521 implementations of grep that cannot do contextual searches
3522 - replace "cat -n" by "nl" (two occurrences), because not all implementations
3523 of "cat" have the option "-n"
d4262ce583 Jean*3524 o model/src:
3525 add new file gsw_teos10.F that contains 3 functions, more or less a copy
3526 of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to
3527 convert from conservative to potential temperature. For now they are not
3528 called anywhere.
8686b61ec1 Mart*3529 o pkg/ggl90: make "useIDEMIX" useful
3530 - re-organize code in s/r ggl90_calc a little to move computations that
d4262ce583 Jean*3531 are different for idemix into separate loops (changes verification
8686b61ec1 Mart*3532 experiment idemix at truncation level, 12 digits remain -> updated)
3533 - requires 2 new 2D fields KappaM, verticalShear
3534 - make hFacI and recip_hFacI local 3D variables that are passed to
3535 s/r ggl90_idemix
3536 - fix and improve some comments
3537
fec3c1643a Jean*3538 checkpoint65j (2015/02/25)
71e702ab4f Mart*3539 o pkg/openad
fec3c1643a Jean*3540 - synchronize seawater.F with version in model/src: replace routine
3541 body of sw_temp by calling sw_ptmp and fix/add a few comments.
2808e60b18 Jean*3542 o pkg/mnc:
3543 - change default value of pickup_read/write_mnc params to FALSE
3544 (since few features are missing in reading MNC pickup files).
3545 o model/src:
3546 - change default (background) vertical diffusivity for salt to be the
3547 temperature (background) vertical diffusivity.
3548 - change background vertical diffusivity in vertical mixing pkgs ggl90,
3549 kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity.
3550 This makes ptracers default diffusivity (that uses salt diffKr) more
3551 consistent with vertical mixing schemes.
0948a11536 Jean*3552 o verification/testreport:
3553 - fix typo in "-pcls" option ;
3554 - put temp files in /tmp (instead of in local dir)
3555 - add option "-ncad" to use genmake2 new option "-nocat4ad"
3556 - allow to use "-j" option (for multi-procs make) for AD, OAD and TLM.
418827f27e Jean*3557 o pkg/ggl90 (idemix code):
3558 - apply few fixes ; add some missing "_d 0" ; update output of exp.
3559 global_ocean.90x40x15.idemix
c7c1da2019 Patr*3560 o OpenAD
3561 - enable active file I/O and begin removal of work-around code
3562 for OpenAD for handling control variables (memory vs. active files)
3563 - new CPP options file OPENAD_OPTIONS.h
ed1e2fbc34 Patr*3564 - revert to genarr2d gradient check for hs94.1x64x5
3565 - (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens)
3566 - gentim2d works for halfpipe_streamice but not yet hs94.1x64x5
7da87823d7 Jean*3567 o tools/genmake2:
3568 - add option for an alternative Makefile (from Martin) where multiple
3569 source files are sent to TAF (instead of all in one file).
689aab8014 Mart*3570 o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013)
d4a41e9da2 Mart*3571 - code provided by Carsten Eden as an extension of ggl90
7da87823d7 Jean*3572 - so far the code is turned on within ggl90 by setting a CPP-flag at
d4a41e9da2 Mart*3573 compile time; a runtime flag implementation is not yet complete
3574 - tested in new verification experiment global_ocean.90x40x15.idemix
c9dca15fbe Jean*3575 o verification:
3576 - reduce length of the AD test run by half for experiments
3577 global_ocean.cs32x15 (std + thsice) and isomip
c7c1da2019 Patr*3578 - enable active file I/O for OpenAD, adjust verifications accordingly
3579 - halfpipe_streamice: change gradient check from genarr2d to gentim2d
58a2b24c42 Mart*3580 o verification/testreport:
3581 - fix two non-POSIX sed statements so that there are no error messages
c9dca15fbe Jean*3582 on Mac OS X
58a2b24c42 Mart*3583 - replace hostname -s with hostname | sed 's/\..*$//'
c9e57a3110 Mart*3584 o model/src/seawater.F:
3585 - simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged
3586 (following the matlab code), which would have avoided the bug caught
3587 by Matt (see below) in the first place
a208a455d6 Jean*3588 o pkg/shelfice:
3589 - implement alternative discretisation of quadratic drag (selectBotDragQuadr)
3590 and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag.
3591 - fix sign of friction tendency (no-slip BC) and fix u,v drag for thin
3592 ice-shelf case (i.e., within surface level).
c9e57a3110 Mart*3593 - add config summary in shelfice_check.F
3594 - remove global variable recip_SHELFICElatentHeat and replace by a local
3595 variable recip_latentHeat
3596 - introduce diagnostics for friction velocity uStar (in case of
c9dca15fbe Jean*3597 SHELFICEuseGammaFrict)
c9e57a3110 Mart*3598 - change verification experiment isomip.htd:
3599 + start from pickup (as input_ad at nIter0=8640)
3600 + start from SHELFICEmassFile instead of SHELFICEloadAnomaly file
3601 + test SHELFICEuseGammaFrict = .TRUE.
3602 + test SHELFICEadvDiffHeatFlux = .TRUE.
93bf9c0d32 Jean*3603 o model/src:
3604 - fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to
3605 in-situ Temp) and in routine SW_TEMP (in pkg/openad);
3606 update output of experiments global_with_exf.yearly and isomip (all 6).
ad3ad8f6cb Jean*3607 o pkg/shelfice:
3608 - change setting of kTopC to also be zero where there is no ice-shelf.
93bf9c0d32 Jean*3609 - zero out surface forcing arrays (for now, for T & S + EmPmR) where
e2b17d5756 Jean*3610 ice-shelf is.
3611 - first attempt to get RealFreshWaterFlux effects: for now, only without
3612 SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping.
3d23c2b9e0 Mart*3613 o pkg/seaice: add the option to prescribe a fixed thickness PDF
3614 for thermodynamic calculations
ad3ad8f6cb Jean*3615 - because of divisions of the type 7/7 not exactly equal to 1, this change
3d23c2b9e0 Mart*3616 affects results of some verification experiments by up to 4 digits:
ad3ad8f6cb Jean*3617 global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume,
3d23c2b9e0 Mart*3618 seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides
3619 adjoint: lab_sea, lab_sea.noseaicedyn
3620 -> updated
3621
982dd9a048 Jean*3622 checkpoint65i (2015/01/23)
f01a61ff96 Jean*3623 o model/src:
3624 - change units of frictionHeating field from W to W/m^2
3625 - fix bug in frictional heating from stratospheric drag in
3626 S/R ATM_PHYS_TENDENCY_APPLY_V
982dd9a048 Jean*3627 - with synchronous time-stepping: move resetting to zero of frictionHeating
01d0a60981 Jean*3628 field from load_fields_driver.F to thermodynamics.F ;
3629 - add diagnostics for frictional heating.
172fd5e8fd Jean*3630 o model/src & gmredi K3D:
3631 - add frictionHeating field to pickup-files (for synchronous time-stepping)
3632 - move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h
3633 - rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name
3634 and name in pickup file).
3635 - fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F
a55487f421 Jean*3636 o model/src:
3637 - move (from ini_forcing.F) initialisation of all arrays in header file
3638 FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart
3639 (since Nov 2012) with option selectAddFluid=1.
376915f8ee Jean*3640 o pkg/shelfice:
3641 - change units (+ document) of newly added field "shelfIceMassDynTendency"
3642 - upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays.
12e9160284 Mart*3643 o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers
376915f8ee Jean*3644 o pkg/seaice: two new runtime parameters:
3645 - SEAICE_cStar replaces the hard wired "20" in the strength formulation,
12e9160284 Mart*3646 long overdue
376915f8ee Jean*3647 - SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012)
12e9160284 Mart*3648 parameterization of tensil stress for fast ice (does not do anything yet)
3649 o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method
376915f8ee Jean*3650 for LSR: move checking overlaps out of JFNK-if-block
ff2a7562da Jean*3651 o pkg/atm_phys:
3652 - move copy of grid and dynamical fields out of atm_phys_driver.F into
3653 new S/R ATM_PHYS_DYN2PHYS.
3654 - fix level height for Linear Free-Surf case (to be consistent with
3655 fixed-in-time pressure levels).
5811c5042c Jean*3656 o pkg/mom_common (bottomdrag):
3657 - average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center
3658 to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG;
3659 update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag.
3660 o pkg/shelfice (u/v_drag):
3661 - add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG;
3662 - use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F
3663 (now similar to shelfice_u_drag.F)
3664 - remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG
3665 from mom_vecinv.F (similar to mom_fluxform calls).
3666 o pkg/mom_common (bottomdrag):
3667 - add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG;
3668 - add options for alternative discretisation of velocity norm in quadratic
3669 bottom drag: averaging of grid-cell-center KE to U.point and V.point
3670 (selectBotDragQuadr=0, original code) can produce noisy patterns; this
3671 improves when averaging only the other component (e.g. vVel for U bottom
3672 drag) using wet-point method (selectBotDragQuadr=2) or not (=1).
3673 - add options (bottomVisc_pCell) to account for partial-cell in bottom
3674 friction (no-slip BC) thus getting the true distance from the bottom;
3675 off by default since this also reduces model stability (explicit bottom
3676 friction). Changes produce different machine truncation with linear-drag
3677 + no-slip BC: update output of experiments exp4.stevens (10 digits) and
3678 front_relax (bvp & mxl, 10 & 11 digits).
cda18d4551 Jean*3679 o model/src & mom pkgs:
3680 - add one more level to vertical viscosity local arrays (Nr+1, previously Nr)
3681 since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k
3682 - for now and until vertical mixing scheme are updated to fill up level Nr+1,
3683 just copy level Nr value to level Nr+1.
3684 o doc:
3685 - add notes form Abhisek Chakraborty on how to close Heat & Salt budgets.
c721362620 Jean*3686 o pkg/shelfice:
07201d0927 Dani*3687 - shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F,
3688 SHELFICE.h: move array shelficemass to init_varia, initialise
3689 from array shelficemassinit, which is set in init_fixed and
3690 has option to be set from file; introduce array
3691 shelficeMassDynTend array, set thru file in init_fixed
3692 - NEW FILE: shelfice_step_icemass.F: update shelficemass from either
cda18d4551 Jean*3693 shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in
07201d0927 Dani*3694 pkg/streamice
cda18d4551 Jean*3695 - shelfice_thermodynamics.F: call shelfice_step_icemass if
07201d0927 Dani*3696 SHELFICEMassStepping = .true.
cda18d4551 Jean*3697 - shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f
07201d0927 Dani*3698
eabebaa9d2 Jean*3699 checkpoint65h (2014/12/17)
83c35e2265 Gael*3700 o verification/global_ocean.90x40x15, global_ocean_ebm:
3701 - update to generic controls.
3702 o pkg/ctrl:
3703 - ctrl_map_ini_genarr.F: test for igen>0
3704 - ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D.
eabebaa9d2 Jean*3705 - move gentim2d part of ctrl_map_ini_genarr.F to
83c35e2265 Gael*3706 new separate routine : ctrl_map_ini_gentim2d.F
3707 - ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F:
eabebaa9d2 Jean*3708 add time variable weights and cyclic controls (time mean,
83c35e2265 Gael*3709 seasonal cycle, etc) capabilities to gentim2d
3710 o pkg/ecco:
3711 - move reading of error, conversion to weights from
3712 ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei)
3713 o global_oce_llc90, cs32:
3714 - activte sbo.
3715 - CTRL_SIZE.h : add maxCtrlProc.
3716 - activate the new genctrl capabilities.
a435e833b1 Mart*3717 - update following reorganization of global_oce_input_fields.tar.gz
83c35e2265 Gael*3718 o pkg/ctrl/ctrl_ad_diff.list:
3719 - add missing ctrl_init_rec.f
3720 o tools/OAD_support/keepOriginal:
3721 - add ctrl_init_rec.F
3722 o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F:
3723 - avoid recomputations of xx_gentim2d_dummy.
a3e6888a7e Jean*3724 o momentum diagnostics:
3725 - move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and
3726 mom_vecinv.F to timestep.F (to include Smag-3D contribution).
3727 o pkg/seaice/seaice_lsr.F:
3728 - fix computation of BU/BV, make sure they are non-zero, only necessary
3729 for cubed sphere exchanges and SEAICE_OLx/y>0.
3730 This makes calling s/r fill_cs_corner_rl obsolete (removed).
07df50d3e2 Mart*3731 o verification/global_ocean.cs32x15/input.seaice
3732 - add test for strong implicit coupling and restricted addtive Schwarz
3733 methods for LSR
3734 - update results/output.seaice.txt
e0b9102457 Jean*3735 o verification/tutorial_global_oce_biogeo:
171611a792 Jean*3736 - AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up)
3737 and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK);
3738 update output_adm,_oadm,_tlm.txt
3739 o pkg/dic:
3740 - change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h
3741 - add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn
3742 for tracer 1 & 2 is set (to avoid double counting of dilution effect).
3743 o verification/tutorial_global_oce_biogeo:
e0b9102457 Jean*3744 - AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since
3745 dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ;
3746 update output_adm,_oadm,_tlm.txt
171611a792 Jean*3747 o eesupp/src:
3748 - add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F)
e0b9102457 Jean*3749 and call it in seaice_lsr when using nonzero SEAICE_OLx/y
1a814ccfcd Mart*3750 o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing
3751 LSR (following Hutchings et al. 2004)
3752 - introduce zetaZ as a global variable (requires adjustments in
3753 seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ
e0b9102457 Jean*3754 in seaice_calc_viscosities.F
1a814ccfcd Mart*3755 - new flag SEAICEuseStrImpCpl (default off)
3756 - add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the
3757 momentum equations
3758 - JFNK-solver (preconditioner) adjusted to allow using this method
3759 (where it does not have any positive effect)
d6f9f4aeb9 Mart*3760 o pkg/seaice
3761 - add overlap for restrictive additive Schwartz method also to LSR, but
3762 turn it off by default (because it only seems to work for non-cubed
3763 sphere/llc topologies)
c8020f78c8 Mart*3764 o pkg/autodiff
3765 - add extra exchanges in addummy_in_steppging also for mnc output
3766 o pkg/seaice:
3767 - add extra exchanges before dumping adjoint fields in seaice_ad_dump.F
3768 to avoid stripes in the adjoint output (similar to addummy_in_stepping.F)
e87a86147c Jean*3769 o pkg/obcs:
3770 - add option to specify domain-connected piece Id along OB though files
3771 (for now, only used to diagnose PhiVel; default =1 -> global correction)
3772 - modify obcs_diag_balance.F to process each connected-part separately;
3773 exclude OB where Id = 0 but keep the full divergence there (-> constant
3774 Psi along this portion of OB and all inflow derived from grad(Phi))
3775 - add example of OB-conect files in verification/so_box_biogeo/input.
3776 o pkg/diagnostics:
88137b1de0 Jean*3777 - improve treatment of Open-Boundaries in Velocity-Potential calculation:
3778 a) use non zero matrix element across OB and solve for Phi 1 grid point
3779 outside OB (i.e, where tracer OBCS are applied).
3780 b) global imbalance of inFlow/outFlow across OB: instead of modifying
3781 velocity across OB, spread it uniformly along the OB in the RHS.
3782
790de314fc Jean*3783 checkpoint65g (2014/11/19)
3784 o pkg/diagnostcis:
3785 - add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param
075f468e41 Jean*3786 o pkg/my82,pp81,kl10:
3787 - fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D
3788 field diffKr as background diffusivity to set minimum diffusivity value.
3789 o pkg/seaice:
3790 - add new parameter SEAICEuseEVPrev (for revisited EVP by
d6ef696f9b Mart*3791 Bouillon et al 2013)
3792 - add SEAICE_evpAlpha/Beta to namelist
075f468e41 Jean*3793 - modify seaice_evp code to able to use SEAICEuseEVPrev. These changes
d6ef696f9b Mart*3794 involve trivial re-ordering of divisions/multiplications that should not
3795 have any effects, but ... they do change the results of lab_sea.hb87 so
075f468e41 Jean*3796 that only 2 digits of agreement remain, in line with the general
d6ef696f9b Mart*3797 instability/fragility of the evp-code. For now, I do not care and just
3798 update the verification experiment
ce66b4105d Gael*3799 o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc)
075f468e41 Jean*3800 - remove xx_genarr2d_numsmooth etc
ce66b4105d Gael*3801 - use xx_genarr2d_preproc etc instead
075f468e41 Jean*3802 - carry out smooth_correl2D at initialization stage rather than during
3803 time stepping.
ce66b4105d Gael*3804 - get smoothOpNb from xx_gentim2d_preproc
3805 o global_oce_cs32 :
3806 - add test of generic ecco capabilities.
3807 o pkg/exf/exf_getsurfacefluxes.F :
3808 - add to tmpUE/tmpVN rather than re-initializing them (conventional behavior).
3809 o pkg/ctrl,ecco :
075f468e41 Jean*3810 - omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED
3811 is defined.
efb8db572a Mart*3812 o pkg/seaice: add diagnostics for Delta (deformation parameter)
c604292c00 Jean*3813 o model/src:
075f468e41 Jean*3814 - when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical
c604292c00 Jean*3815 diffusivity (background) is specified but ignored.
3816 o verification:
3817 - in testreport, convert hostname to lower case for default output dir name
bb3b849103 Gael*3818 o model, pkg : add useCTRL, useECCO parameters (on/off run time switch).
7c3a77b9ab Jean*3819 o pkg/dic: add modifications from Hajoon:
3820 - add iron sedimentation flux function of the flux of PO4 out of bottom layer
3821 - light attenuation: add self-shading effect by climatological Chlorophyll
3822 (read from file).
3823 o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also
3824 compiles when SEAICE_ALLOW_DYNAMICS is undefined
3825 o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate
3826 AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than
3827 ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted,
3828 approach where CPP_OPTIONS.h includes an omnipotent
3829 ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h').
3830 o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where
3831 ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong.
7c5e2c853b Gael*3832 o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF
7c3a77b9ab Jean*3833 to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included
3834 (it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...)
7c5e2c853b Gael*3835 o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl :
3836 add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed
3837 - ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h
3838 - AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h
3839 - CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc
7c3a77b9ab Jean*3840 o pkg/ctrl,ecco,exf :
3ae7845edf Gael*3841 - remove variables associated with NON-generic costs,
3842 unless ECCO_CTRL_DEPRECATED is defined.
7c3a77b9ab Jean*3843 - remove NON-generic NON-obcs controls,
3ae7845edf Gael*3844 unless ECCO_CTRL_DEPRECATED is defined.
3845 o pkg/ctrl : added ctrl_local_params.h
3846 o pkg/ecco : added ecco_local_params.h
7c3a77b9ab Jean*3847 o verification : added ECCO_CTRL_DEPRECATED to most as and oad
3848 experiments, which will progressively be removed once the
3849 experiments are revised to use only generic controls/costs.
3ae7845edf Gael*3850
f9e490a40b Jean*3851 checkpoint65f (2014/10/13)
e9cfc0e399 Gael*3852 o pkg/ctrl, ecco, seaice : minor changes in headers
edcd1bebe3 Gael*3853 o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic
7c3a77b9ab Jean*3854 cost function and control capabilities added since checkpoint65c.
675cbb9806 Gael*3855 o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h.
f6a9bac81e Gael*3856 o pkg/ecco: increase modularity and improve logic
f0a41ddc00 Gael*3857 - ecco_toolbox.F (new) : basic operations that are often used,
3858 including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk,
3859 ecco_addcost, ecco_add, ecco_div, ecco_readbar.
f6a9bac81e Gael*3860 - cost_gencal.F (new) : determine filnames and records.
f0a41ddc00 Gael*3861 - cost_genread.F, cost_generic.F : condense code using ecco_toolbox.
f6a9bac81e Gael*3862 - cost_generic.F : use spzeroloc rather than hard-coded -9999,
3863 and exploit the above functions leading to more compact code.
f0a41ddc00 Gael*3864 - cost_genread.F : rm un-necessary arguments, re-arrange args order.
f6a9bac81e Gael*3865 - ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj,
3866 using_ers, using_gfo, using_mdt is now only defined within gencost)
6a200487bb Gael*3867 o pkg/ecco: extend generic cost capabilities
3868 - pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost
f9e490a40b Jean*3869 capabilities via gencost_preproc (+ _c,_i,_r related params),
45a442938f Gael*3870 gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod,
3871 gencost_outputlevel arguments to cost_generic
6a200487bb Gael*3872 - pkg/ecco/cost_genread.F (new) : interface between cost_generic
3873 and active_read, making room for gencost_preproc to take effect.
45a442938f Gael*3874 Added preproc code ('climmon') to replace GENERIC_BAR_MONTH.
6a200487bb Gael*3875 - pkg/ecco/cost_generic.F :
3876 compute and store misfit maks*(model-data) in localdif that is
3877 then used in cost and for output, output misfit if outlev.GT.0
3878 - pkg/ecco/cost_averagesfields.F : depend on gencost_barskip
3879 rather gencost_barfile for deciding whether to write barfile
3880 - pkg/ecco/ecco_cost_driver.F : extract call to cost_profiles from cost_hyd
3881 - pkg/ecco/ecco_cost_init_fixed.F : extract gencost weights from
3882 ecco_cost_weights, re-activate ecco_summary, determine gencost_barskip
3883 - pkg/ecco/ecco_summary.F : report gencost variables
f6a9bac81e Gael*3884 - pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs
6a200487bb Gael*3885 o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA
a883885bf1 Gael*3886 o pkg/ecco: internal re-organization
f9e490a40b Jean*3887 - resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl
a883885bf1 Gael*3888 (rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter,
f9e490a40b Jean*3889 mv relevant variables definition from ecco_cost.h to ecco.h,
a883885bf1 Gael*3890 make sure gencost routines only include ecco.h)
3891 - throughout : add missing CCP switches, rm unused variables,
3892 and rm un-necessary CPP switches
f9e490a40b Jean*3893 - throughout gencost routines : replace modelstartdate with
a883885bf1 Gael*3894 gencost_startdate when needed
3895 - cost_bp_read.F : use arguments, instead of common blocs
f9e490a40b Jean*3896 so that it can be used also by (new) cost_gencost_bpv4.F
a883885bf1 Gael*3897 - ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0
3898 - ecco_phys.F : compute etanFull
3899 - ecco_readparms.F : rename using_topex as using_tpj, add
3900 bpv4-grace to gencost list, initialize added parameters
3901 - ecco_summary.F : include SIZE.h needed for augmented ecco.h
3902
82fee2871e Jean*3903 checkpoint65e (2014/09/28)
8d1168a02a Dimi*3904 o pkg/obcs:
432b2a4585 Dimi*3905 - replaced the just-added CPP options with run-time variables
3906 (see pkg/obcs/OBCS_PARAMS.h for details)
3907 o pkg/obcs:
3908 - add additional CPP options for sponge boundary layers
8d1168a02a Dimi*3909 (see pkg/obcs/OBCS_OPTIONS.h for details)
5de066abfb Jean*3910 o pkg/atm_phys:
3911 - implement simple (obliquity only, assuming circular planet orbit)
3912 seasonal cycle for incoming insolation ; used when run-time parameter
3913 "select_incSW" is set to 1 ; by default (=0), uses old unchanged formula.
ba60baccdb Gael*3914 o pkg/exf, pkg/ecco, pkg/ctrl:
82fee2871e Jean*3915 - add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets
3916 - activate gentim2d for xx_atemp,xx_aqh,xx_swdown,xx_lwdown,xx_precip
3917 - implement gentim2d for xx_tauu, xx_tauv
3918 o pkg/ctrl, pkg/ecco :
3919 - fix and complement the generic controls implementation
f673b530c1 Gael*3920 o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F,
5de066abfb Jean*3921 pkg/shelfice/shelfice_thermodynamics.F,
3922 verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F,
3923 verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F :
3924 - add weight in CTRL_GET_GEN calls
f673b530c1 Gael*3925 o pkg/ctrl :
5de066abfb Jean*3926 - ctrl_get_gen.F : add weight as input parameter, and apply
3927 it directly rather than using smooth_correl2Dw (to be retired).
3928 - ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call
f673b530c1 Gael*3929 o pkg/ctrl :
5de066abfb Jean*3930 - introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F,
3931 ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F)
3932 - re-activate ctrl_summary (call in ctrl_init.F)
d797bbd6d6 Gael*3933 o pkg/ctrl/ctrl_cost_gen.F :
5de066abfb Jean*3934 - fix CCP brackets, remove un-necessary myiter, mytime
ba60baccdb Gael*3935 o pkg/ecco, pkg/ctrl :
5de066abfb Jean*3936 - remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F)
3937 - remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F)
3938 - add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F)
3939 - add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F)
5e10000fa1 Gael*3940
2334e86337 Jean*3941 checkpoint65d (2014/09/15)
139514ed64 Gael*3942 o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F :
2334e86337 Jean*3943 - add xx_genarr2d_bounds,xx_genarr3d_bounds,
3944 xx_genarr2d_numsmooth, xx_genarr3d_numsmooth
139514ed64 Gael*3945 o pkg/ctrl/ctrl_map_ini_genarr.F :
2334e86337 Jean*3946 - remove compilation failure
3947 - replace hard coded example
3948 - use ctrl_map_ini_gen2D, 3D
139514ed64 Gael*3949 o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F :
2334e86337 Jean*3950 - on/off switch based upon xx_genarr2d_weight,3d
15e98114ad Gael*3951 o src/packages_init_variables.F :
3952 - regroup pkg/estimation calls
3953 - remove CTRL_MAP_INI, CTRL_MAP_INI_ECCO
3954 (moved to ctrl_init_variables)
3955 o cost/cost_init_varia.F :
3956 - remove ecco_cost_init_varia
3957 (moved to ecco_init_varia)
3958 o ctrl/ctrl_init_variables.F :
3959 - add CTRL_MAP_INI, CTRL_MAP_INI_ECCO
3960 - add CTRL_MAP_INI_GENARR, SEAICE_CTRL_MAP_INI
3961 o ctrl/ctrl_map_ini.F :
3962 - remove ctrl_map_ini_genarr, seaice_ctrl_map_ini
3963 (moved to ctrl_init_variables)
3964 o ctrl/ctrl_map_ini_ecco.F :
3965 - remove ECCO_PHYS (mv to ecco_init_varia)
3966 - remove seaice_ctrl_map_ini (mv to ctrl_init_variables)
3967 o ecco/ecco_ad_diff.list :
3968 - add ecco_init_varia.f
3969 o ecco/ecco_init_varia.F
3970 - new routine
291ff6be85 Jean*3971 o pkg/streamice:
3972 - move call to STREAMICE_INITIALIZE_PETSC from the_model_main.F
3973 to streamice_init_fixed.F ; fix setting of STREAMICEisOn.
3974 - from model/src, only call pkg/streamice routines if useStreamIce is TRUE.
c4f4094732 Oliv*3975 o pkg/generic_advdiff:
3976 - fix bug causing negatives in GAD_SMOLARKIEWICZ_HACK, introduced 8/8/2014.
291ff6be85 Jean*3977 o pkg/exf:
3978 - exf_getffields.F : add xxg_atemp, xxg_aqh, xxg_swdown, xxg_lwdown,
3979 xxg_precip capability
f3207a5bb2 Gael*3980 - exf_wind.F : no need for ALLOW_WSPEED_CONTROL cpp switch
291ff6be85 Jean*3981 o pkg/ctrl:
f3207a5bb2 Gael*3982 - ctrl_pack.F, ctrl_unpack.F : omit (un)packing of undefined xx_gentim2d
291ff6be85 Jean*3983 o model/src/load_fields_driver.F :
f3207a5bb2 Gael*3984 - move call to CTRL_MAP_GENTIM2D ahead of BULKF_FIELDS_LOAD, EXF_GETFORCING
3985 so xx_gentim2d can be applied to e.g. exf fields in a timely manner.
43187e68ca Jean*3986 o OpenAD verification experiments:
3987 - Include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, and CTRL_OPTIONS.h
3988 in src files (to enable to skip the ECCO_CPPOPTIONS.h);
3989 for now, only in pkgs used in OpenAD verification experiments.
3990 - Change all except one (halfpipe_streamice) OpenAD experiments to use pkg
3991 specific option file (AUTODIFF_OPTIONS.h, COST_OPTIONS.h & CTRL_OPTIONS.h)
3992 instead of using ECCO_CPPOPTIONS.h (with all relevant options in it).
3993 This applies to both TAF (*/code_ad/) and OpenAD (*/code_oad/) tests.
3994 o OpenAD verification tests:
3995 - finish removing ALLOW_AUTODIFF_OPENAD (replaced by ALLOW_OPENAD);
3996 - finish replacing ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for
3997 tape/storage which are specific to TAF/TAMC) in pkgs used in OpenAD exp.
3998 - leave ALLOW_AUTODIFF_TAMC undef in OpenAD verification tests (*/code_oad/)
3999 and remove local copy of "tamc.h" (needed only if ALLOW_AUTODIFF_TAMC).
781c4efe3e Jean*4000 o model/src & generic_advdiff:
4001 - change hard-coded loop-range in S/R APPLY_FORCING_T/S to set T & S
4002 forcing over 0:sNx+1, 0:sNy=1 (instead of just 1:sNx,1:sNy): Model
4003 dynamics requires valid tracer forcing only over tile interior but, for
4004 some diagnostics, may need to extend it over 1 point in tile halo region.
4005 - in gad_calc_rhs.F, update calls to gmredi_x/ytransport to get valid
4006 tendency over i,j_Min,Max range. This allows to simplfy i,j_Min,Max
4007 setting in temp/salt/ptracer_integrate.F
8b57565bf5 Jean*4008 o pkg/dic:
4009 - multiply tracer tendencies by maskInC (if ussing OBCS) before updating
4010 gchem tracers: this allows to skip the 2nd call to OBCS_APPLY_PTRACER
4011 in gchem_forcing_sep.F
4012 o pkg/autodiff & obcs:
4013 - add storage of current OB values for U & V (was already done for T & S).
4014
34ab325b96 Jean*4015 checkpoint65c (2014/08/30)
649425d785 Jean*4016 o pkg/dic:
4017 - take out of dic_atmos.F the initialisation part (corresponding to istate=0)
4018 and move it to new S/R DIC_INI_ATMOS ; also simplify the dependencies for
4019 AD compilers (but still a Pb with multi-threading and Ajoint dependencies).
4084975ddf Jean*4020 o verification:
649425d785 Jean*4021 - new experiment testing OBCS and DIC pkgs, using params & output from
4022 tutorial_global_oce_biogeo but limited to a sub-domain around Drake
4023 passage: take OBCS from the last year of a 2 yrs simulation and initial
4084975ddf Jean*4024 conditions from t=1.yr while keeping the same forcing.
e564aebabb Jean*4025 o model/src:
4026 - when allowFreezing=T, only reset below freezing initial Temp to Tfreezing
4027 (at any k) if checkIniTemp is not set to FALSE (default checkIniTemp=T).
a14051dc1f Jean*4028 o pkg/diagnostics (Stats-Diags):
4029 - re-write S/R DIAGSTATS_CALC (more similar to TARGET_NEC_SX part) to:
4030 a) refine region where stats are computed, excluding where arrhFac=0 ;
4031 b) fix missing interior mask (use with OBCS) in 3-D fields statistics;
4032 c) extend regional stats over the region edges (for U or V pt location).
ec7eae4c86 Jean*4033 o pkg/gchem:
4034 - add a (2nd) call to OBCS_APPLY_PTRACER in gchem_forcing_sep.F (needed since
4035 pkg/dic is currently changing/updating ptracers values beyond the OB).
cd979ff82b Jean*4036 o verification (hs94):
4037 - convert Held & Suarez external_forcing.F (from hs94.cs, with Sigma-coords
4038 bits) to apply_forcing.F and undef USE_OLD_EXTERNAL_FORCING in experiments
4039 hs94.cs-32x32x5 and tutorial_held_suarez_cs ; also use the same version of
4040 apply_forcing.F in 2D hs94 (fwd, ad & oad) but keep LatLon hs94 unchanged.
1097960fb8 Jean*4041 o pkg/ptracers:
4042 - implement Adams-Bashforth on pTracers (instead of on tracer tendency),
4043 switched on by setting PTRACERS_doAB_onGpTr=F (default set to doAB_onGtGs)
4044 - change exp4 secondary test (input.nlfs) to test AB on T & S & pTracer
4045 with AB-2 code (so that it get tested).
4046 o model/src:
4047 - allow to apply Adams-Bashforth on Temp & Salt (instead of on gT,gS)
4048 with AB-2 code (previously only available with AB-3 code).
4049 Also move the code (call to ADAMS_BASHFORTH S/R) form thermodynamics.F
4050 to temp/salt_integrate.F (since the 2nd part of gt/sNm1 update is done
4051 there, by calling CYCLE_AB_TRACER).
4052 o pkg/generic_advdiff:
4053 - change Tracer argument (drop bi,bj indices) in S/R GAD_CALC_RHS,
4054 GAD_C2_ADV_R, GAD_U3_ADV_R, GAD_C4_ADV_R, GAD_DIFF_R, GAD_BIHARM_R
4055 + also in GMREDI_X/Y/RTRANSPORT ; and update corresponding calls in
4056 S/R temp/salt/ptracers_integrate.F
54809f081d Jean*4057 o model/src & pkg/ptracers:
1097960fb8 Jean*4058 - remove common block variables gT,gS (in DYNVARS.h), except when
4059 USE_OLD_EXTERNAL_FORCING is defined; update TAF storage accordingly.
54809f081d Jean*4060 - remove common block variable gPtr.
b613689ef8 Jean*4061 o model/src & pkgs:
4062 - change gTracer (and/or tracer) argument (drop bi,bj indices) in S/R
4063 ADAMS_BASHFORTH(2&3), CYCLE_(AB_)TRACER, FREESURF_RESCALE_G,
4064 IMPLDIFF, SOLVE_TRIDIAGONAL & _PENTADIAGONAL, GAD_SOM_ADVECT,
4065 GAD_ADVECTION, GAD_CALC_RHS, GAD_IMPLICIT_R, TIMEAVE_CUMUL_DIF_1T
4066 + change accordingly all calling S/R.
4067 - use local temperature/salinity/ptracer tendency array (without bi,bj)
4068 in S/R temp/salt/ptracers_integrate.F
da10b40ad9 Mart*4069 o pkg/seaice:
b613689ef8 Jean*4070 - move computation of stress contributions to rhsU/V in s/r seaice_lsr
da10b40ad9 Mart*4071 to separate s/r seaice_lsr_rhsu/v in order to be able to re-use code
4072 - make u/vIceC local variables if SEAICE_CGRID is defined only to be used
b613689ef8 Jean*4073 in seaice_lsr
4074 - seaice_lsr.F: make local 4D arrays UXX, VYY, etc 2D
4075 in s/r seaice_lsr_calc_coeffs
4076 o pkg/mdsio:
4077 - in MDS_READ/WRITE_FIELD, stop if file-name (+prefix) is too long
4078 (e.g., > MAX_LEN_MBUF -90 ) or, in INI_MODEL_IO, if mdsioLocalDir is
4079 too long (e.g., > MAX_LEN_FNAM/2 )
da10b40ad9 Mart*4080
175cc7f2f5 Jean*4081 checkpoint65b (2014/08/12)
3a54eed890 Jean*4082 o pkg/matrix:
4083 - pass, as argument, updated tracer field to S/R MATRIX_STORE_TENDENCY_EXP
4084 o model/src:
4085 - fix initialisation of geothermalFile; compile geothermal-flux code in
4086 natl_box verification experiment.
09c3b72571 Jean*4087 o model/src & pkg/down_slope:
4088 - push the k loop inside S/R TIMESTEP_TRACER (now called outside the k loop).
4089 - in dwnslp_apply.F, update tracer tendency instead of the future tracer
4090 field and call S/R DWNSLP_APPLY before TIMESTEP_TRACER; this affects
4091 results at machine truncation level: update output of experiments
4092 global_ocean.90x40x15.dwnslp (FWD) and lab_sea.noseaicedyn (AD).
4093 o pkg/diagnostics (Stats-Diags):
4094 - do not cumulate the full volume when DIAGNOSTICS_FILL is
4095 called with bibjFlg < 0 (no increment of the counter for 2D/3D diag);
4096 This fix the mean statistics when DIAGNOSTICS_FILL is called multiple
4097 times (but Min,Max and StD are still wrong).
66f9b25d49 Jean*4098 o model/src:
597fa58847 Jean*4099 - add geothermal flux forcing: read in ini_forcing.F as time-constant
4100 field "geothermalFlux" applied in S/R APPLY_FORCING_T (apply_forcing.F)
4101 o model/src:
4102 - move CYCLE_TRACER calls from tracers_correction_step.F to temp/salt/ptracer
4103 _integrate.F so that, when leaving S/R THERMODYANMICS, theta,salt and pTrac
4104 arrays are already updated while adjustments (filters, conv.adjustment) are
4105 still applied later, in S/R TRACERS_CORRECTION_STEP.
4106 o model/src:
66f9b25d49 Jean*4107 - store in common bloc array "rhoInSitu" the virtual potential temperature
4108 anomaly that is used to compute geopotential: this make the atmos code
4109 more similar to ocean code which already uses rhoInSitu in calc_phi_hyd.F
549401e3a9 Mart*4110 o pkg/seaice/seaice_lsr.F
4111 - rename integer variable ilcall to ipass (that's what it is called
4112 in the residual diagnostics
4113 - change time stepping for NPSEUDOTIMESTEP > 2 (does not change the
66f9b25d49 Jean*4114 default) for improved non-linear convergence of the first few steps
2344d2d5a9 Mart*4115 - adjust a few comments and add new ones to explain some of the store
66f9b25d49 Jean*4116 directives
4117 o pkg/generic_advdiff (& ptracers):
4118 - re-work the code to check for valid advection scheme and for minimum
4119 size of overlap (now stored in local common bloc in gad_advscheme.F)
d192729d83 Mart*4120 o pkg/seaice: another attempt to make the adjoint work for sea ice dynamics
4121 - re-initialize more variables in seaice_lsr: u/vIceC, u/vIceNm1
4122 - add an auxilliary variable "bet" and fix store directives and keys in
4123 seaice_lsr_tridiagu/v, this seems to do the trick (i.e. more or
4124 less exact gradients in my tests); but there are still
4125 recomputation warning (although gradients are sort of OK), when
4126 SEAICE_LSR_VECTORIZE is not defined, so this flag and
4127 SEAICE_LSR_VECTORIZE_ZEBRA are recommended for efficiency.
66f9b25d49 Jean*4128 - update verification experiments lab_sea.
d192729d83 Mart*4129 - change some comments in S/R seaice_calc_viscosities
a25b59d486 Jean*4130 o model/src:
4131 - if staggerTimeStep=T, always apply exchange to velocity field in
4132 do_stagger_fields_exchanges.F instead of in do_fields_blocking_exchanges.F
4133 (independent of using multi-dim advection or not); no effect on FWD run
4134 but affects AD results (at machine truncation level): update output of
4135 experiment 1D_ocean_ice_column (ad: 12 digits), hs94.1x64x5 (ad,oad: 13.d)
4136 and isomip (oad: 12.d).
4137 o pkg/generic_advdiff:
4138 - stop if doAB_onGtGs is set to FALSE but ignored
4139 - refine warning related to stability of tracer time-stepping
4140 regarding internal wave dynamics.
4141 - setting of AdamsBashforth_T,S when doAB_onGtGs=F: remove condition
4142 on staggerTimeStep & implicitIntGravWave (will now get a warning
4143 if potentially unstable).
56bf0dc039 Jean*4144 o pkg/kl10:
4145 - add new pkg "kl10" for mixing due to internal wave breaking, from
4146 http://www.sciencedirect.com/science/article/pii/S1463500310000144
4147 (contribution from Jody Klymak), tested in verification experiment
4148 verification/internal_wave/input.kl10/
b4dd8aa52b Jean*4149 o isomip experiment:
4150 - test pkg/shelfice with Non-Lin Free-Surf in one of the FWD set-up
4151 (input.htd) and update the output.
4152 o cd_code experiments:
4153 - use default cd_code options (#undef CD_CODE_NO_AB_MOMENTUM &
4154 #undef CD_CODE_NO_AB_CORIOLIS) in experiments: cfc_example (fwd)
4155 global_ocean.90x40x15 (ad & oad) and OpenAD (ad & oad) and
4156 update the corresponding output.
4157 o pkg/seaice:
2a89c844fd Mart*4158 - reduce the number of include files and store directives in
4159 S/R seaice_lsr_tridiagu/v
4160 - change the order of loops in one case in S/R seaice_lsr_tridiagv
4161 (only for SEAICE_VECTORIZE_LSR_ZEBRA defined), which allows me to
b4dd8aa52b Jean*4162 get rid off one store directive (a TAF bug?)
2a89c844fd Mart*4163 - add one more instance of ifdef SEAICE_VECTORIZE_LSR_ZEBRA in
4164 S/R seaice_lsr_tridiagv to change the loop range for consistency
b4dd8aa52b Jean*4165 - remove ilcall, m from parameter list of S/R seaice_lsr_tridiagu/v
2a89c844fd Mart*4166 - fix a bug that affects the JFNK solver: replace sNx/y by i/jMax in
4167 S/R seaice_lsr_tridiagu/v (requires update of
b4dd8aa52b Jean*4168 offline_exf_seaice/input.dyn_jfnk)
2a89c844fd Mart*4169
391aedad50 Jean*4170 checkpoint65a (2014/07/27)
262a665438 Jean*4171 o model/src:
90ac475d2f Jean*4172 - Non-Lin Free-Surf in p/z coords: allows hFacW,S to be larger than
4173 surrounding hFacC=1 @ edge of a step with different kSurfC on either side
391aedad50 Jean*4174 (topo in p-coords, ice-shelf in z-coords); update output of experiments
4175 tutorial_global_oce_in_p and isomip (both AD and OpenAD output).
90ac475d2f Jean*4176 o model/src:
262a665438 Jean*4177 - collect momentum forcing tendency into local 2-D array (passed as argument
4178 to apply_forcing S/R); this simplifies mom. Forcing diagnostics and CD_CODE
4179 parts in timestep.F (without CD_CODE_NO_AB_MOMENTUM defined = the default);
4180 affects results at machine truncation level (e.g., if using OBCS_SPONGE).
4181 - collect T & S forcing tendency into local 2-D array (passed as argument to
4182 apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency.
4183 affects results at machine truncation level (e.g., ocean: if using
34ab325b96 Jean*4184 SHORTWAVE_HEATING ; atmos: if using FrictionHeating or (atm_Rq<>0) moist
4185 correction due to vertical advection).
262a665438 Jean*4186 - update output of experiments: fizhi-cs-32x32x40 (13 digits),
4187 global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml:
4188 seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13),
4189 obcs_ctrl (ad & fwd grd @ 12 & 7).
a991652077 Jean*4190 o pkg/ptracers & diagnostics:
4191 - use ptracers (short) name (instead of long one) to make ptracers diagnostics
4192 title (to avoid some unexpected truncation); sort out ptracers diags units.
262a665438 Jean*4193 - collect ptracer forcing tendency into local 2-D array (passed as argument
4194 to apply_forcing S/R); add 3-D diagnostics for ptracers forcing tendency.
a991652077 Jean*4195
77d0805fa2 Jean*4196 checkpoint65 (2014/07/18)
09aa940b92 Jean*4197 o pkg/fizhi:
4198 - add parenthesis around fizhi tendencies in fizhi_tendency_apply.F: this
4199 affects results at machine truncation level. Update output of experiments
4200 fizhi-cs-32x32x40 (12 digits for cg2d) & fizhi-cs-aqualev20 (13 digits).
48bef89a30 Mart*4201 o pkg/seaice: more clean up
4202 - rename TAF common block tapes to be more consistent and remove
4203 unnecessary duplicates
09aa940b92 Jean*4204 - add store directives to remove more recomputations, but use smaller
4205 tapes (and adjust keys) when SEAICE_LSR_ADJOINT_ITER is undefined.
4206 The idea behind this flag is to reduce the memory footprint when the
4207 adjoint of the LSR is not required. As of now, defining the flag
15c6e2792a Mart*4208 SEAICE_LSR_ADJOINT_ITER increases 4 common block tapes for 2D field by
09aa940b92 Jean*4209 a factor of SOLV_MAX_FIXED (=500 by default in SEAICE_SIZE.h).
4210 For experiment offline_exf_seaice, this means on a linux box with gfortran
4211 nearly a factor of 10 (but keep in mind there is mostly seaice code in
77d0805fa2 Jean*4212 this experiment):
15c6e2792a Mart*4213 > size mitgcmuv_ad
790de314fc Jean*4214 text data bss dec hex
4215 5100659 1216 220458952 225560827 d71c8fb
48bef89a30 Mart*4216 5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER)
09aa940b92 Jean*4217 but only a moderate increase of 36% for global_ocean.cs32x15:
48bef89a30 Mart*4218 text data bss dec hex
4219 6695027 1648 1014578664 1021275339 3cdf6ccb
4220 6695203 1648 1382505320 1389202171 52cd8afb (SEAICE_LSR_ADJOINT_ITER)
4221 - note: there are still recomputations in global_ocean.cs32x15 and
15c6e2792a Mart*4222 offline_exf_seaice and the gradient agreement changes (gets a
4223 little worse) for global_ocean.cs32x15 (-> update output_adm.seaice.txt)
48bef89a30 Mart*4224 - in general, the AD gradients still are wrong
53bebe4a64 Patr*4225 o OpenAD
4226 - clean up code_oad/ directories somewhat by moving files
4227 dontCompile, dontTransform, keepOriginal to OAD_support/
f398288312 Jean*4228 o model/src:
930ff12251 Jean*4229 - using MOM fluxform and Non-Lin Free-Surf with momDissip_In_AB=F
4230 (not currently tested): add dissipation terms before NLFS rescaling of
4231 tendencies (previously done after).
4232 o pkg/diagnostics:
4233 - write stats-diags in ascii file with more digits (same as in monitor).
4234 o pkg/down_slope:
4235 - drop the bi,bj dimension of argument recip_hFac in S/R DWNSLP_APPLY; with
4236 NLFS (not tested), use new recip_hFac value in order to conserve tracer.
4237 o model/src:
f398288312 Jean*4238 - new file "apply_forcing.F" containing all the code previously in
4239 external_forcing.F, but with new argument list: pass, as new argument,
4240 the current level tendency array to update (instead of a direct update
4241 of the common bloc array). Change the corresponding calls.
4242 - add CPP option USE_OLD_EXTERNAL_FORCING (default is undef) to use
4243 EXTERNAL_FORCING_U,V,T,S subroutines (for backward compatibility).
5e1701d480 Mart*4244 o pkg/seaice/seaice_lsr, a little bit of clean up
4245 - rearrange some code blocks, so that now all calculations for
f398288312 Jean*4246 setting up the right-hand-sides done within one single block
5e1701d480 Mart*4247 (I find that easier to read and understand)
4248 - rearrange freedrift-code to reduce the number of ifdefs
4249 - adjust some indentations and comments
4250
6544591561 Jean*4251 checkpoint64z (2014/07/10)
c1d95c335c Jean*4252 o model/src and several pkgs:
4253 - change argument list of all S/R called from external_forcing.F and
4254 called from ptracers_forcing.F (renamed to ptracers_apply_forcing.F)
4255 to pass, as argument, the current level tendency array to update
4256 (instead of a direct update of the common bloc array).
4257 - change also (in the same way) argument list of PTRACERS_APPLY_FORCING;
4258 - rename taueddy_external_forcing.f to taueddy_tendency_apply.F
a122714692 Mart*4259 o pkg/seaice/seaice_lsr.F
4260 - always initialize local arrays in seaice_lsr_tridiagu/v
4261 - add more local tapes to seaice_lsr_tridiagu/v
c1d95c335c Jean*4262 - move storing u/vice(:,:,bi,bj) out of seaice_lsr_tridiagu/v, but
a122714692 Mart*4263 keep it in bi/bj loop; this seems to be essential
4264 - gradients are still wrong but only by 4-7 orders of magnitude
4265 instead of 15 orders of magnitude, lab_sea improves a little
822f9de729 Mart*4266 o pkg/seaice
4267 - (pkg/autodiff) remove storing/restoring of seaiceMaskU/V that
4268 generates unnecessary code in seaice_lsr_ad
4269 - add more store directives in seaice_lsr to avoid unnecessary code
4270 in seaice_lsr_ad
4271 - exclude some residual computations in seaice_lsr when
4272 ALLOW_AUTODIFF_TAMC is defined in order to avoid unnecessary code
c1d95c335c Jean*4273 in seaice_lsr_ad
822f9de729 Mart*4274 - add more storing, a new tape (model/src/the_main_loop.F) and
4275 another key for SEAICE_LSR_VECTORIZE_ZEBRA (the local keys ilockey
c1d95c335c Jean*4276 and klockey should be checked by a specialist)
822f9de729 Mart*4277 - modify ( define SEAICE_VECTORIZE_LSR and SEAICE_LSR_ADJOINT_ITER )
4278 and update lab_sea after previous changes in pkg/seaice below
c1d95c335c Jean*4279 o pkg/autodiff:
4280 - introduce useSmoothCorrel2DinAdMode, SEAICEapproxLevInAd, and
d572335125 Gael*4281 viscFacInAd : run time parameters allowing for adjoint switches
4282 note : logic for useSmoothCorrel2DinAdMode is in ctrl_readparms.F
c1d95c335c Jean*4283 o pkg/ecco:
4284 - introduce cost_gencost_boxmean.F that computes a box mean
d572335125 Gael*4285 temperature (for use in adjoint sensitivity studies).
4286 o model/src/set_defaults.F : initialize viscFacAdj to 1.
c1d95c335c Jean*4287 o pkg/mom_common/mom_calc_visc.F:
d572335125 Gael*4288 - ifdef ALLOW_AUTODIFF then include viscFacAdj factor.
c1d95c335c Jean*4289 o pkg/seaice/seaice_summary.F:
d572335125 Gael*4290 - statement for SEAICEadjMODE now in autodiff_readparms.F
c1d95c335c Jean*4291 o pkg/seaice:
1fa25402a0 Mart*4292 - remove some store directives and add new ones in an effort to get
4293 finally rid off the recomputation warnings. This is successful
1d0e5c687d Mart*4294 when SEAICE_VECTORIZE_LSR ***and*** SEAICE_LSR_ADJOINT_ITER are
4295 defined (i.e. no extensive recomputation warnings left), but there
4296 are still too many recomputations on the solver iteration level
0e792109e6 Mart*4297 - define SEAICE_VECTORISZE_LSR in offline_exf_seaice/code_ad/SEAICE_OPTIONS.h
e06bd90b00 Mart*4298 - move definition of MPSEUDOTIMESTEPS into TAMC-block in
4299 SEAICE_SIZE.h
4300 - add a store directive in S/R seaice_calc_viscosities
fdfdc49113 Jean*4301 o pkg/seaice (ITD code):
4302 - fix definition of Hlimit for multi-threaded case
4303 - use double precision arithmetic to compute Hlimit: this affects results;
4304 update output of experiment seaice_itd.
7f033dc113 Mart*4305 o replace content of verification/seaice_itd
4306 - instead of a 1D column use the configuration of offline_exf_seaice
4307 to test the ice thickness distribution code with ridging
4308 - this is a first shot at this experiment
4309 - change of some defaults of ridging parameters SEAICEhStar (from
4310 100 to 25) and SEAICEmuRidging (from 5 to 3) in seaice_readparms.F
fdfdc49113 Jean*4311 and lot of new comments.
7f033dc113 Mart*4312
4fddc18258 Jean*4313 checkpoint64y (2014/06/20)
4314 o pkg/seaice/seaice_reg_ridge.F:
4315 - modify the regularization of very small volumes of ice; only check
4316 total volume HEFF, and do not apply correction to individual ice
4317 classes because that leads to funny patterns in the heat and fw-fluxes
c7c86ceb32 Mart*4318 into the ocean. Adjust seaice_itd/results/output.txt
4319 - replace nITD by SEAICE_multDim in loop-ranges
0a1362090f Jean*4320 o pkg/exf:
4321 - add code to process the case field period = -12. with UV interpolation.
4322 - move debug print (formerly active when exf_verbose=T) from EXF_getFFieldRec
4323 into S/R that calls it (i.e., exf_set_gen.F, exf_set_uv.F & obcs_exf_load.F)
f893122504 Jean*4324 o verification/global_with_exf:
4fddc18258 Jean*4325 - switch all fields period to -12. (was previously untested) in input/data.exf
f893122504 Jean*4326 (but keep secondary test ".yearly" unchanged); update the reference output.
4327 o pkg/cal:
4328 - new calendar type "noLeapYear" for 365 days calendar without any leap year.
4329 o pkg/exf:
4330 - new integer parameter "exf_debugLev" (default set to main model debugLevel)
4331 to replace logical switch "exf_verbose"
4fddc18258 Jean*4332 - report in STDOUT when loading a new record (if exf_debugLev >= 3)
3d5a62f3cd Jean*4333 o pkg/sbo:
4334 - update from Katherine Quinn: evaluate mass directly from density and SSH
4335 (budget using Finite Volume method) instead of from bottom pressure.
8471337f5d Jean*4336 - allow testreport to collect few selected SBO output ; tested in exp.
4337 global_ocean.90x40x15 (after updating the results, to include SBO output).
4338 - fix some multi-threading issues (in output part).
39a405bbb4 Jean*4339 o model/src & most packages:
4340 - always call {PKG}_READPARMS even if corresponding use{PKG}=F;
4341 - in {PKG}_READPARMS, in case use{PKG}=F: add a call to new S/R
4342 PACKAGES_UNUSED_MSG to print a weak warning when parameter file
4343 "data.{pkg}" exist ; and leave the S/R (return) just after.
f459cc48d3 Jean*4344 - more standard LAND pkg interface (land_init_fixed.F, land_check.F).
4345 + call LAND_READPARMS from packages_readparms.F
39a405bbb4 Jean*4346 o pkg/seaice:
efc672bc35 Mart*4347 - remove code that resets useThSice in S/R seaice_readparms and
c7c86ceb32 Mart*4348 replace it by a warning in S/R seaice_check
efc672bc35 Mart*4349 - remove parameter MULTDIM, replace with nITD and runtime
4350 parameter SEAICE_multDim (still hard-wired to nITD if
4351 SEAICE_ITD is defined)
4352
32263cf74c Jean*4353 checkpoint64x (2014/05/24)
bb8f3ffecf Patr*4354 o verification/lab_sea:
32263cf74c Jean*4355 - update adjoint and TLM output following changes to pkg/salt_plume
4356 - un-do the update after putting back local recip_Cp in few places.
bb8f3ffecf Patr*4357 o pkg/salt_plume: modifications by An Nguyen:
32263cf74c Jean*4358 - add capability to do brine rejection (salt-plume) as function of
bb8f3ffecf Patr*4359 volume+tracers (instead of only salinity tracer).
32263cf74c Jean*4360 - conserve volume by exchanging volume from each kLev to above to
bb8f3ffecf Patr*4361 accommodate in-coming brine volume
4362 - store surface and klev exchanged fraction + volume in 4 new 3-d arrays
32263cf74c Jean*4363 - switch KPP surf buoyancy due to brine forcing to 3-d
bb8f3ffecf Patr*4364 (3 more 3-d arrays, 2 for SPforcing[T,S], 1 for boplume)
4365 - add salt_plume_volfrac, salt_plume_apply, salt_plume_tendency_apply_t
32263cf74c Jean*4366 - unrelatedly, also add ad-hoc capability to vary salt_plume scheme
bb8f3ffecf Patr*4367 in East/West Arctic.
751362a27d Jean*4368 o pkg/sbo:
32263cf74c Jean*4369 - incorporate modifications from Katherine Quinn to enable the use of sbo
751362a27d Jean*4370 pkg in ECCO-v4 set-up ; remove SBO-TimeAve output ; add monitor-like
4371 output for future testreport verification (unfinished).
60958941f8 Jean*4372 o pkg/atm_phys:
4373 - change diagnostics (AtPh_Trf & AtPh_Qrf) of DARGAN_BETTSMILLER S/R:
4374 skip the reseting of t_ref & q_ref to initial t & q ; this preserve the
4375 output of S/R CAPECALCNEW (Parcel temp & q) for diagnostics.
0ad17fdd8c Mart*4376 o pkg/seaice
60958941f8 Jean*4377 seaice_calc_ice_strength.F: modify expression to avoid divisions
0ad17fdd8c Mart*4378 (affects truncation)
4379 seaice_do_ridging.F: clean up the insectarium
3fba0517c3 Mart*4380 - fix a bug that was compensated by areaScaling (-> remove areaScaling code)
4381 - added SEAICEsnowFracRidge to redistributed snow (2nd bug)
4382 - set closing/openingRate to zero where no extra iteration is need (3rd bug)
60958941f8 Jean*4383 - add some debugging information and error messages (warnings)
b062ea86d0 Jean*4384 o model/src: modifications relatd to atmosphere p*:
4385 - Switch to more accurate p* coordinate slope term (calc_grad_phi_hyd.F)
4386 - With p* or Sigma-P, use constant reference Pot.Temp (thetaConst) instead
4387 of vertical profile tRef in geopotential background and anomaly.
4388 - Acount for true p* correction in theta <-> T conversion in pkg/aim_v23
4389 and pkg/atm_phys.
4390 - Update FWD output of experiments: aim.5l_cs (x2), fizhi-cs-32x32x40,
4391 fizhi-cs-aqualev20, fizhi-gridalt-hs, tutorial_held_suarez_cs, cpl_aim+ocn.
419c1f0b27 Mart*4392 o pkg/seaice: fix a bug in seaice_prepare_ridging.F, forgot a sqrt
1c0e70142a Oliv*4393 o pkg/ptracers: compute ptracer source/sink due to linear free surface.
4394 not used right now, but can be used in BGC packages to fix conservation.
4395 o pkg/dic, pkg/gchem: move tracer_meanarea to gchem, so it can be used by
4396 other packages too.
b062ea86d0 Jean*4397 o pkg/seaice/seaice_calc_ice_strength.F: replace SEAICE_rhoSnow by
4398 SEAICE_rhoIce in the Rothrock (1975)-type strength calculations (bug fix)
728a44199c Jean*4399 o model/src:
4400 - since we have several heat capacity (even in model/src), define "recip_Cp"
4401 as local variable (no longer in common block) to avoid any confusion.
4402 - add thetaConst in PARAMS.h (to be used with pStar or sigma-P coords).
7bb11c2f45 Jean*4403 o pkg/exf:
4404 - from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local
4405 air density as function of air Temp, Humidity and atm pressure.
4406
80e9662843 Jean*4407 checkpoint64w (2014/05/02)
4faee70d47 Jean*4408 o verification:
4409 - update output_adm.txt files for experiment global_ocean.cs32x15 (seaice &
4410 seaice_dynmix) and lab_sea (primary test & noseaicedyn): moving/changing
4411 code from seaice_growth.F & seaice_advdiff.F to new ridging routines
b062ea86d0 Jean*4412 seaice_reg_ridge.F seaice_do_ridging.F affects AD gradient
419c1f0b27 Mart*4413 (down to 8-7 matching digits for global_ocean and 5-6 for lab_sea).
bcc533dbd4 Jean*4414 o model/src: for atmosphere in p* coords:
4415 - store factor rStarFacC**atm_kappa (= pStarFacK) in common block
4416 - implement more accurate p* coordinate slope term (in calc_grad_phi_hyd.F),
4417 but not yet activated.
cabb1e150c Mart*4418 o pkg/seaice: fix restart problem for ITD with new ice strength parameterisation:
4419 - move computation of opnWtrFrac = 1-AREA to before computing ice strength
bcc533dbd4 Jean*4420 - this changes the results (but not for any verification experiment, because
4421 none tests this), but avoids having an extra field in the restart files
97d542e805 Mart*4422 o pkg/seaice: remove global variable TICE (not needed)
bcc533dbd4 Jean*4423 - replace by TICES or local variable where necessary (cost_seaice_test,
97d542e805 Mart*4424 seaice_diagnostics_state)
4425 - move copying TICE to TICES from seaice_check_pickup to seaice_read_pickup
4426 - use specific read/write routines for reading and writing individual leves
4427 of a multilevel field
b1bf8777db Jean*4428 o pkg/ctrl & model/inc:
4429 - move additional anomaly fields of control vars (related to options:
4430 ALLOW_KAPGM_CONTROL, ALLOW_KAPREDI_CONTROL and ALLOW_BOTTOMDRAG_CONTROL)
4431 from DYNVARS.h into new header file: CTRL_FIELDS.h
cc5e1bc684 Mart*4432 o pkg/seaice: some small modifications to the ridging code
4433 - make fw2ObyRidge a global variable and add the freshwater flux to
4434 seaice_growth
b1bf8777db Jean*4435 - pass actual thickness from seaice_prepare_ridging, so that it is
cc5e1bc684 Mart*4436 computed only in one place and compute it in the same way as in
4437 seaice_growth
4438 - initialise more fields in seaice_do_ridging that where cause floating
4439 point exceptions over land
e990a77247 Mart*4440 o pkg/seaice: preparations for ridging code and first real ridging code
b1bf8777db Jean*4441 - move most of "PART 1" of S/R seaice_growth into a new and separate
e990a77247 Mart*4442 S/R seaice_reg_ridge that will both regularize the state variable after
4443 advection call the actual ridging routine;
b1bf8777db Jean*4444 - requires to make 5 fields global fields: d_HEFFbyNEG,d_HSNWbyNEG,
e990a77247 Mart*4445 d_AREAbyRLX,d_HEFFbyRLX,saltFluxAdjust;
4446 - remove ridging code from seaice_advdiff
b1bf8777db Jean*4447 - clean up remaining part 1 of seaice_growth in an attempt to make it
e990a77247 Mart*4448 more readable (this is probably subjective)
4449 - call seaice_itd_redist once in the initialisation phase to have the initial
4450 conditions in the correct category
4451 - finally: add new ridging routine for ITD code
4452
e36f9ede36 Jean*4453 checkpoint64v (2014/04/11)
9994e4e8cb An T*4454 o pkg/ecco:
4455 - add runtime parameters mdt[start,end]date[1,2]
4456 - rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile"
e36f9ede36 Jean*4457 o pkg/seaice:
4458 - make deltaC a global variable, so that it can be used in ridging code
67f02628d2 Mart*4459 - first step towards ridging: introduce new routines that compute
4460 ice strength based on ridging parameters
79793b3c13 Mart*4461 - add diagnostic for HSNOWITD
4462 - add opnWtrFrac as a global variable (required for ridging scheme)
9994e4e8cb An T*4463 o pkg/salt_plume + pkg/seaice/seaice_growth.F
4464 - add SALT_PLUME_IN_LEADS flag to activate pkg/salt_plume only when ice
4465 AREA exceeds a threshold (code contributed by I.Fenty in 2011)
684ea763ea Jean*4466 o verification/hs94.1x64x5:
4467 - leave ALLOW_AUTODIFF_TAMC undefined in code_oad/AUTODIFF_OPTIONS.h
4468 - do not use ECCO_CPPOPTIONS.h anymore for TAF & OpenAD Adjoint tests.
4469 o autodiff:
4470 - Start to include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h,
4471 and CTRL_OPTIONS.h in src files (to enable to skip the ECCO_CPPOPTIONS.h)
4472 For now, only in pkgs used in verification/hs94.1x64x5.
4473 - Replace ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for tape/storage
4474 which are specific to TAF/TAMC).
4475 - Replace ALLOW_AUTODIFF_OPENAD by ALLOW_OPENAD:
4476 since ALLOW_OPENAD is defined in PACKAGES_CONFIG.h (any time pkg/openad
4477 is compiled), this simplifies/reduces which *_OPTIONS.h file to include.
4478 - OpenAD: change Makefile to generate the appropriate AD_CONFIG.h when
4479 building mitgcmuv_ad (make adAll).
d85e4bb9df An T*4480 o pkg/ecco:
4481 - cost_gencost_seaicev4.F:
4482 reformulate proxy cost as function of sst and local param SEAICE_freeze
4483 change cost names from siv4-[sst,vol] to siv4-[deconc,exconc]
4484 - add stop statement if old names siv4-[sst,vol] are used
4485 - add snapshots + cost reports for atmospheric longwave
4486 - remove factor 0.1 in front of wtau[u,v]
4487 - replace never used flag ALLOW_TMI_COST_CONTRIBUTION with
4488 ALLOW_TMI_SST_COST_CONTRIBUTION
684ea763ea Jean*4489 o pkg/atm_phys:
d68eb785a9 Jean*4490 - add some diagnostics for Short-wave and for convection S/R.
684ea763ea Jean*4491 o pkg/seaice/seaice_growth:
ea66a54ac4 Mart*4492 - fix a bug in the lateral melt parameterization for SEAICE_ITD
4493 in seaice_growth; tempFrz needs to be computed inside the i/j-loop
4494 - rearrange loop order for better vector code in the same code block
4495 - rewrite the floeDiameter formula to have fewer divisions
4496 - (miraculously) none of this changes the results of seaice_itd
684ea763ea Jean*4497 o pkg/smooth:
4498 - move param smooth2Ddiffnbt to pkg/ecco
4499 o pkg/salt_plume:
4500 - salt_plume_frac.F:
4501 clean up local param names
4502 reformulate (1-frac) to frac; original 1-frac was based on swfrac code
6d2104f414 Jean*4503 o pkg/rw:
4504 - add RS version of S/R READ_MFLDS_LEV.
4505 o pkg/streamice:
4506 - fix the restart test by writing/reading pickup_streamice files.
4507 o pkg/seaice:
0e4bf54f91 Mart*4508 - refine checks for jfnk-related parameters
4509 - comment out if statement with SEAICEuseIMEX parameter as long as there
4510 is no IMEX code to avoid confusion and surprises
4511
1b217122f8 Jean*4512 checkpoint64u (2014/03/07)
85157af967 Jean*4513 o verification/MLAdjust:
4514 - rename secondary test suffix:
4515 1.leith -> A4FlxF + switch to flux-form & add side-drag
4516 0.leithD -> AhFlxF + switch to flux-form
4517 0.smag -> AhVrDv (use Vorticity-Div. visc form) + add side-drag
4518 0.leith -> AhStTn (use Strain-Tension visc form) + add side-drag
f0b594ffe2 Jean*4519 o pkg/mom_vecinv:
4520 - remove unused arguments from S/R MOM_VI_HDISSIP & MOM_HDISSIP (as it used
4521 to be before mom_calc_visc.F)
4522 - skip the call to MOM_CALC_TENSION & MOM_CALC_STRAIN if not needed.
4523 - add 2nd copy of vort3 & strain that knows about lateral BC (free/no slip):
4524 this is simpler for the adjoint and for diagnostics.
7ab8a42a9d Jean*4525 o model/src + pkg/momentum:
4526 - add input files for 2-D additional Western and Southern cell-edge wall
4527 (e.g., to add "thin-wall" where it is =1).
4528 - fix sideDrag option for thin-walls with Non-Lin Free-Surf
4529 using 2nd hFacZ that is computed from initial (fix domain) hFac
4530 - known limitations of thin wall implementation: not yet coded for sigma
4531 coords; not working with CD-scheme neither.
21cfbf5d41 Jean*4532 o pkg/seaice:
65555308b7 Mart*4533 - rename recently introduced parameters from (wrong name) AB to
4534 BDF (backward difference time discretisation)
4535 - retire runtime parameters SEAICEuseAB2, SEAICE_abEps
21cfbf5d41 Jean*4536 o tools/adjoint_options:
4537 - remove setting of "OPENAD=true" (now set by command line "genmake2 -oad")
65555308b7 Mart*4538
0819a3aef8 Jean*4539 checkpoint64t (2014/02/01)
d85e4bb9df An T*4540 o pkg/ecco
4541 - add compile flag ALLOW_GENCOST_TIMEVARY_WEIGHT in ECCO_OPTIONS.h and
4542 runtime logical flag gencost_timevaryweight to read daily sea-ice sigma
4543 - replace hard-coded record number and period which only work for monthly
4544 with read-in runtime param that works for other periods (month,day,year)
a4e96d71ae Patr*4545 o pkg/thsice
4546 - corrected store directive fixes thsice adjoint gradient checks
c610335cdc Jean*4547 o genmake2 & testreport:
4548 - add genmake2 option "-oad" to generate a Makefile for OpenAD built and
4549 in this case, use tools/adjoint_options/adjoint_oad as default AD optfile.
4550 Update testreport accordingly. No need to set "export OPENAD=true"
4551 in adjoint_options/adjoint_oad anymore (will be removed later).
9a846a36d2 Jean*4552 o pkg/shelfice:
4553 - put T & S shelfice forcing into model surfaceForcing_T,_S (for now,
4554 only if SHELFICEboundaryLayer=F); Change model/src/external_forcing.F
4555 so that surface forcing applies to k=kSurf if using pkg/shelfice.
62997f5aad Patr*4556 o pkg/ctrl, pkg/grdchk, pkg/ecco:
9a846a36d2 Jean*4557 - Changes to make GENARR more modular (i.e. invisible if not used)
cde67b4ce1 Gael*4558 o model/src/temp_integrate.F and salt_integrate.F
9a846a36d2 Jean*4559 - re-include store directives that were removed on Dec 27th.
3dbdd94ad6 Gael*4560 o model/src/external_forcing_surf.F
9a846a36d2 Jean*4561 - add storage directives for EmPmR and PmEpR to avoid recomputation of
4562 seaice_model in the adjoint that is problematic when seaice_model is
4563 turned off in the adjoint. The resolved issue dated back to July when
4564 EXTERNAL_FORCING_SURF call was moved.
4565 Update global_ocean.cs32x15/*/output_adm.seaice_dynmix.txt accordingly.
20bd954105 Mart*4566 o pkg/exf/exf_check.F
9a846a36d2 Jean*4567 - fix a small bug again (originally found by Wentao Liu, now found again)
4568 - streamline error output
20bd954105 Mart*4569 o pkg/streamice and aim_v23:
9a846a36d2 Jean*4570 - replace a few "_EXCH_XY_RL (" with "_EXCH_XY_RL(", so that
4571 Apple's /usr/bin/cpp knows what to do:
4572 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
4573 Target: x86_64-apple-darwin13.0.0
20bd954105 Mart*4574
f23338cc5b Jean*4575 checkpoint64s (2014/01/05)
ce5f09424a Jean*4576 o tools/adjoint_options:
4577 - switch to fastopt.net TAF server (instead of default fastopt.de) for
4578 AD optfiles adjoint_diva & adjoint_f95 (similar to adjoint_default).
4579 o model/src:
4580 - remove some unnecessary TAF storage directives in forward_step.F and
4581 in dynamics.F (note: not always removed by TAF, e.g., double storage
4582 of kappaRU,kappaRV in former version of dynamics.F).
f2a2ecef28 Jean*4583 o model/src & pkg/ptracers:
ce5f09424a Jean*4584 - call directly GAD_IMPLICIT_R & IMPLDIFF + DWNSLP_APPLY from temp_integrate.F
f2a2ecef28 Jean*4585 salt_integrate.F and ptracers_integrate.F (instead of from thermodynamics.F)
4586 and remove ptracers_dwnslp_apply.F & ptracers_implicit.F
4587 - call MATRIX_STORE_TENDENCY_EXP for each tracer (in ptracers_integrate.F)
4588 - add fZon & fMer as output argument of S/R GAD_CALC_RHS.
4589 - update TAF AD-output of experiments global_ocean.90x40x15 (13 for AD-grad).
e71dbcdc66 Jean*4590 o useSingleCpuInput separates single-CPU input from single-CPU output;
4591 for now only implemented for in exf_interp_read.F
4592 o verification/advect_xy:
4593 - fix missing EXCH call in local version of ini_salt.F and update output.
4594 o momentum diagnostics:
4595 - fix which deltaT is used in Total-Tendency diagnostics.
4596 - fix typo in diagnostics for momentum tendency from AB.
4597 o pkg/seaice/seaice_lsr.F: fix an initialisation bug for the
4598 SEAICE_VECTORIZE_LSR_ZEBRA option that lead to NaNs on a NEC-SX8
05b3bcee70 Mart*4599
49ba07ded8 Jean*4600 checkpoint64r (2013/12/08)
21fae43a0a Jean*4601 o verification/*/results:
4602 - Update reference output of experiments that were passing with just 13 digits
4603 (make it easier to detect future changes in results)
4175fa5a6c Jean*4604 o model/src & pkg/ptracers:
4605 - move calls to GAD_ADVECTION (Multi-Dim advection) from thermodynamics.F to
4606 inside temp_integrate.F and salt_integrate.F and from ptracers_advection.F
4607 to inside ptracers_integrate.F ; remove ptracers_advection.F
13e111d31a Jean*4608 o coupling interface pkgs:
4609 [atm_compon_interf, ocn_compon_interf & atm_ocn_coupler]
4610 - change the config check to test the agreement of Ocean Depth
4611 with ATM land/sea mask (instead of ATM orography);
4612 - send to coupler the number of coupler time-steps to do for this run:
4613 this allows to check for consistency and don't need anymore to be
4614 specified in parameter file "data";
4615 in coupler:
4616 - check consistency of RunOff map versus Ocean Depth and ATM land/sea mask.
4617 - improve report to log-file of config setting (pass log-file unit to few S/R)
4618 o pkg/compon_communic:
4619 - add coupling send/receive for non-tiled integer vector;
4620 - add S/R to check and stop if any proc has an error (similar to
4621 eesupp/src/stop_if_error.F but single thread and across Comm_World).
b7f9d4a417 Jean*4622 o pkg/exch2:
4623 - in exch2*_get_rx[1,2]: use new list "W2_tileIndex" to replace search
4624 through list of all tiles my proc owns.
4625 o model/src:
4626 - AUTODIFF only: in calc_adv_flow.F, recompute rTransKp (instead of copying
4627 from rTrans) to simplify dependencies (no need to store rTrans anymore in
4628 calling S/R); this affects AD results at machine truncation level:
4629 update AD-output (TAF) of experiments: 1D_ocean_ice_column,
4630 bottom_ctrl_5x5 & obcs_ctrl (12 digits for AD grad, same FWD grad).
1088379d6a Jean*4631 o tools/build_options:
4632 - simplify Warnings options (-ieee & -devel cases) in linux_amd64_gfortran
4633 o coupling interface pkgs:
4634 [compon_communic, atm_compon_interf & ocn_compon_interf]
4635 - move declaration of local array "ibuf" out of header file "CPLR_SIG.h"
4636 to each S/R that needs it; remove un-used variables.
4637 - change component tile registration (cpl_register.F in both compon_interf
4638 and mitcomponent_tile_register.F) to pass the full list of tiles
4639 information (including bi,bj) in 1 vector (instead of in a bi,bj matrix).
4640 - with pkg/exch2: adopt the same convention used for I/O to define mapping
4641 towards coupler global array (unless W2_useE2ioLayOut=F):
4642 a) can now use different tiling between atm & ocn comp.
4643 b) no needs to modify the run-Off map when changing tiling (was needed
4644 even if using the same tiling between atm & ocn).
4645 c) will allow to run with blank-tiles in 1 component (e.g., for ocean
4646 full land tiles); not yet tested.
4647 - check for valid mapping from comp. tile to coupler global array
4648 - improve report of tile registration results to log file.
4649 o pkg/exch2:
4650 - in eesupp/src/eeboot.F: move call to W2_EEBOOT before Coupler
4651 tile-registration (CPL_REGISTER);
4652 - activate (un-comment) definition and setting of "W2_tileIndex" list to
4653 store the local bi,bj indices of each tile;
4654 - also print bi,bj in local report to log file;
4655 - fix pkg/debug/debug_cs_corner_uv.F for the case nSy > 1 (left from
4656 Jun 2009 modif of pkg/exch2).
4657 o testing on baudelaire:
4658 - run 2 tests at a time: no significant slow down (since enough cpu) and
4659 get the full set of test done earlier
4660 - switch the ifort test to "-devel" ; run the OpenAD test everyday.
a9265de95a Jean*4661 o model/src/thermodynamics.F and routines called from it:
4662 - pkg/gmredi: gmredi_residual_flow.F (replacing gmredi_calc_uvflow.F &
4663 gmredi_calc_wflow.F) to update eulerian velocity (input) into residual
4664 velocity (outp) by adding bolus velocity.
4665 - model/src: calc_adv_flow.F (replacing calc_common_factors.F) to compute
4666 mass transport from velocity + lateral grid cell area
4667 - rename calc_gt.F to temp_integrate.F (includes call to TIMESTEP_TRACER)
4668 - rename calc_gs.F to salt_integrate.F (includes call to TIMESTEP_TRACER)
4669 in thermodynamics.F
4670 - remove k from thermodynamics.F and move it to temp_integrate.F
4671 salt_integrate.F and ptracers_integrate.F (now done inside the tracer
4672 loop).
4673 - compute locally (in thermodynamics.F) 3-D velocity field that is used to
4674 advect tracers; pass it as argument to GAD_ADVECTION, GAD_SOM_ADVECT,
4675 PTRACERS_ADVECTION, TEMP_INTEGRATE, SALT_INTEGRATE, PTRACERS_INTEGRATE,
4676 GAD_IMPLICIT_R and PTRACERS_IMPLICIT
4677 - update AD-output (TAF & OAD) of experiments: 1D_ocean_ice_column,
4678 global_ocean.90x40x15, tutorial_global_oce_biogeo and
4679 tutorial_tracer_adjsens (+ TLM output).
1088379d6a Jean*4680 o tools/OAD_support and (verification/*/) code_oad:
8f959368b3 Jean*4681 - OAD_support/cb2mGetModules.csh: add PACKAGES_CONFIG.h in header file to
4682 module conversion ; remove unneeded CPP_EEOPTIONS.h.
4683 - code_oad/CPP_OPTIONS.h: remove PACKAGES_CONFIG.h and use a more standard
1088379d6a Jean*4684 version (closer to model/inc/CPP_OPTIONS.h).
8f959368b3 Jean*4685 o model/src:
4686 - remove parameter "useOldFreezing" from PARAMS.h and push it to the
4687 retired list of parameters (routine FREEZE has been replace by surface
4688 freezing (10.yrs ago) and by pkg/frazil (interior freezing).
4689 o pkg/gmredi:
4690 - add option (GM_CALC_TRANSP_FROM_VEL) to compute transport directly from
4691 velocity (same scheme but affects machine truncation) for GM_AdvForm.
4692 - update output of FWD experiments: front_relax.bvp,
4693 global_ocean.90x40x15.dwnslp, global_ocean.cs32x15 and ideal_2D_oce.
4694
ccabb03de3 Jean*4695 checkpoint64q (2013/11/17)
7669301999 Jean*4696 o verification:
4697 - generate new output on baudelaire (gfortran, -ieee) for OpenAD experiments
4698 tutorial_global_oce_biogeo and global_ocean.90x40x15.
4699 - generate new output (growth & melt) for seaice_itd experiment after
4700 updating the input pickup_seaice files (previously wrong).
d498609aae Jean*4701 o pkg/cost:
4702 - define a "final cost function" for each tile, and use GLOBAL_SUM_TILE_RL
4703 (instead of _GLOBAL_SUM_RL) to get the final cost from all procs & threads:
c610335cdc Jean*4704 o this fixes global-sum value if multi-threads (since GLOBAL_SUM_RL
d498609aae Jean*4705 cannot be applied to var in common block).
4706 o allows to get results independent of tile-per-proc setting (if using
4707 slower GLOBAL_SUM_SEND_RECV option).
4708 - update accordingly: seaice_cost_final.F, shelfice_cost_final.F,
4709 thsice_cost_final.F and ecco_cost_final.F (this one affects lab_sea
4710 forward gradients: update output).
4711 - update */code_oad/externalDummies.F by adding dummy GLOBAL_SUM_TILE_RL
4712 S/R and, for most exp., also comment out GLOBAL_SUM_R8.
586c949ecf Jean*4713 o pkg/mom_common:
4714 - move to pkg/mom_common and model/src (previously in tutorial_deep_convection
4715 code) 2nd version of isotropic 3-D Smagorinsky code interface: strain and
4716 viscosity are locally declared in dynmics.F and pass as argument to CALC_GW;
4717 ensure that all field value that are used are set.
4eccb07ab1 Jean*4718 o tutorial_deep_convection (smag3d):
4719 - add missing scaling in mom_calc_smag_3d.F;
4720 - set smag3D_coeff in input.smag3d such that results do not change.
4721 o pkg/dic:
4722 - change dic_cost.F to compute cost on each tile first and then apply
4723 GLOBAL_SUM_TILE_RL: this affects forward gradient of AD experiments
4724 tutorial_dic_adjoffline & tutorial_global_oce_biogeo; update output.
35050126c6 Oliv*4725 - remove kLev argument and use GLOBAL_SUM_TILE_RL in tracer_meanarea.
a5d44ed107 Jean*4726 o eesupp/src & pkg/mdsio:
4727 - remove gather/scatter_vector.F (from eesupp) and mdsio_read/writevector.F
4728 (from pkg/mdsio) since they are no longer used for tape IO.
4729 - move simple C subroutine "setdir.c" from pkg/compon_communic to eesupp/src
4730 (+ keep a copy in pkg/atm_ocn_coupler).
2e81182906 Jean*4731 o verification/isomip:
4732 - split domain in 8 squared tiles (instead of just 2) for FWD, AD & OAD tests.
4733 o tools/build_options:
4734 - optfile linux_amd64_ifort11, fast (no ieee) case:
4735 to get a working restart for all experiments, add "-fp-model source"
4736 to FOPTIM (also remove "-opt-streaming-stores auto" <- this is the default).
4737
a01940b562 Jean*4738 checkpoint64p (2013/10/20)
5bfbd26026 Jean*4739 o pkg/autodiff:
4740 - adread_adwrite.F: when type and length do not match ALLOW_AUTODIFF_WHTAPEIO
4741 criteria, return to simple (default) tape IO format.
645a01b465 Jean*4742 o pkg/mdsio (+ eesupp/src):
4743 - rewrite/simplify tape-IO S/R (new S/R MDS_READ/WRITE_TAPE replace
4744 previous MDSREAD/WRITEVECTOR) with 2 array argument from each type (R4/R8);
4745 - fix globalFile and singleCpuIO options using simpler global mapping.
4746 - new pairs of scatter/gather vector S/R (one for each type, generated from
4747 template) corresponding to simpler global mapping.
4748 - adread_write.F: switch to new S/R (but leave old calls commented) and write
4749 to globalFile when parameter globalFiles is set to True.
4750 - switch on useSingleCpuIO in AD experiments: global_ocean.90x40x15 & isomip.
b798a7d810 Jean*4751 o pkg/autodiff:
5bfbd26026 Jean*4752 - adread_adwrite.F: add a hack for RS arrays (when RS=real*4);
4753 with ALLOW_AUTODIFF_WHTAPEIO defined, since corresponding (real*4) is
b798a7d810 Jean*4754 missing, just add a STOP if array type do not match.
dc136770de Jean*4755 o pkg/exf:
4756 - to allow to use seaice-fraction from pkg/exf in other pkgs than pkg/seaice:
4757 rename CPP option EXF_ALLOW_SEAICE_RELAX to EXF_SEAICE_FRACTION
4758 and rename array obsSIce to exf_iceFraction.
94e0cca872 Jean*4759 o tutorial_deep_convection:
4760 - add 1rst version of isotropic 3-D Smagorinsky code (from Louis-Philippe),
4761 for now all in this exp. code dir.
4762 - add secondary test using Smag-3D viscosity (keep very low backgroud visc for
4763 testing) and flux-limter advection scheme for Temp. (no explicit diffusion).
4764 o eesupp/src:
4765 - added SINGLE_DISK_IO option because reading of parameter files on
4766 very large number of processors did not work with existing set-up
4767
cc89d07104 Jean*4768 checkpoint64o (2013/09/25)
4769 o pkg/atm_phys & atm_compon_interf:
4770 - allows for coupling of gray-atmosphere (atm_phys) with ocean.
6bd6f7be12 Jean*4771 o tools/build_options:
4772 - switch from "-fPIC" to "-mcmodel=medium" in optfiles: linux_amd64_gfortran
4773 & linux_amd64_ifort11 and in linux_amd64_g77 & linux_amd64_open64 also
4774 remove CPP setting (was identical to genmake2 default).
1115280ea7 Mich*4775 o pkg/gmredi & model/src: Some updating and work done on the residual model.
4776 - created new file model/src/calc_eddy_stress.F to calculate the eddy stress.
6bd6f7be12 Jean*4777 - fixed up the calculation of the eddy stress and how it is added to the
1115280ea7 Mich*4778 external forcing via taueddy_external_forcing.F
4779 - at the moment, it is very experimental and only works with the variable eddy
4780 diffusivity calculated in gmredi_k3d.F
6bd6f7be12 Jean*4781 o pkg/seaice/seaice_check.F: add a check to catch the case of specifying
4782 lw/swfluxfile instead of lw/swdownfile in data.exf together with pkg/seaice
4783 o testreport (& tools/do_tst_2+2):
4784 - for MPI test, set default COMMAND to 'mpirun -v -np TR_NPROC ./{executable}'
addfa94074 Jean*4785 o tools/build_options: linux_amd64_gfortran & linux_amd64_ifort11:
4786 - remove CPP='cpp -traditional -P' (this is genmake2 default)
4787 - add switch (for big setups) to use 'medium' memory-model (but leave it
4788 commented out for now). Note: needed with FC 19 to compile big setups.
3dca81485c Jean*4789 o pkg/atm_compon_interf:
4790 - regroup per field origin (model & pkgs) the coupling storage routines
4791 (which accumalate in time each coupling field)
addfa94074 Jean*4792 - move bi,bj loops inside atm_store_my_data.F and store also wind-stress;
3dca81485c Jean*4793 update accordingly + simplify aim_do_physics.F
4794
8f1243bebb Jean*4795 checkpoint64n (2013/08/26)
5f5cc705f4 Dimi*4796 o pkg/bbl:
4797 - update formulation to reduce dispersion of tracer properties in bbl
4798 - replaced horizontal and vertical transport parameters with velocities
4799 - changes results for verification/global_with_exf.yearly
ffbb57e6f3 Dani*4800 o verification/halfpipe_streamice:
4801 - change to matrix construction; update both Fwd & AD output.
c91228a3b5 Jean*4802 o verification/tutorial_tracer_adjsens:
4803 - OpenAD test: switch to vector-invariant momentum since fluxform with
4804 rStar causes problems with OpenAD; update output.
983705b2af Jean*4805 o tools:
c91228a3b5 Jean*4806 - genmake2: define a common prefix for all temp-file names ; move them
4807 to local /tmp disk (but would be easy to move them back);
4808 - xmakedepend: apply the same switch for temp-files.
983705b2af Jean*4809 o pkg/offline:
c91228a3b5 Jean*4810 - changes for use with rStar (NLFS): assume that we continue to provide
983705b2af Jean*4811 UVELMASS/hFacW_ini & VVELMASS/hFacS_ini (hFacWi,S_ini as written in grid
4812 output files) and apply r* scaling at each time-step (function of the time
4813 varying Eta field); use normal pickup files (needed for restart with NLFS).
28e8749e94 Oliv*4814 o adjoint with OpenAD:
4815 - move OpenAD-specific files from verification/OpenAD/code_oad_all to a new
4816 package openad. This package has to be compiled for all runs with OpenAD
4817 instead of specifying code_oad_all as a modification directory.
4818 - link the fortran templates from tools/OAD_support to the build directory
4819 for preprocessing to avoid conflicts between different setups compiled
4820 simultaneously and simplify cleanup.
96b2fd29af Jean*4821 o pkg/exf:
4822 - in exf_getforcing.F: comment out most of the EXCH calls (fields used by
4823 main model or other pkgs are exchanged in EXF_MAPFIELDS).
4824 o model/src:
4825 - do_stagger_fields_exchanges.F: skip EXCH calls when using pkg/offline
4826 (similar to do_fields_blocking_exchanges.F).
4827 o tools/genmake2:
4828 - remove TAF output src code just before calling staf (when not doing a fresh
4829 built, will stop if things go wrong with staf).
4830 - fix target "adobj" (left from TAF version-2 transition)
2cbfd59e75 Jean*4831 o pkg/diagnostics:
4832 - add a parameter to track the status of pkg/diagnostics activation;
4833 this replace/extend the use of logical param "settingDiags" (to check
4834 when adding diag to the list) to also check any DIAGNOSTICS_[]FILL* call.
4835 New S/R to print error message and stop when pkgStatus is not right.
4836 - to try: add a warning when "data.diagnostics" exist but useDiagnostics=F.
4837
45d3f75a8f Jean*4838 checkpoint64m (2013/08/13)
ee9d1fdd8f Jean*4839 o model/inc:
4840 - move FCORI_MACROS.h from PARAMS(_MACROS).h to GRID_MACROS.h (left from
4841 8 yrs ago modif when Coriolis arrays were moved from PARAMS.h to GRID.h)
4842 o pkg/kpp & aim_v23:
4843 - only call DIAGNOSTICS_FILL when useDiagnostics=TRUE.
19c1d5675e Jean*4844 o pkg/seaice:
4845 - restore (last time on 2011/12/24) ability to compile pkg/seaice with
4846 undefined pkg/exf ALLOW_ATM_TEMP or ALLOW_RUNOFF CPP-options.
ee9d1fdd8f Jean*4847 - only call DIAGNOSTICS_FILL when useDiagnostics=TRUE.
4848 o eesupp/src:
4849 - fix check for overlap-size argument (myOLn.GT.MAX_OLY_EXCH)
4850 in exch1_rx[_ad].template (thanks to Francois Lefeuvre report).
51fc369eef Jean*4851 o switch to TAF version-2:
4852 - add flow directives to "freeze" naming convention for ad-routines that
4853 are used in I/O routines of adjoint state and associated common blocks
4854 that are used in adcommon.h (backward compatible with version-1)
4855 - update all ad-optfiles (in tools/adjoint_options + few local to some
4856 verification exp) to switch to latest TAF version (currently 2.5.5);
4857 merge "*_mpi" adoptfiles into the corresponding non-mpi (but commented
4858 out except for diva).
4859 - the major change with TAF version-2 is that both the differentiated
4860 routines and the forward routines (new) are returned as part of the TAF
4861 output source code. Update genmake2 accordingly.
4862 - new output for AD experiment tutorial_global_oce_biogeo (better AD gradient
4863 with version-2 when compared to TLM or FWD gradient); other experiments
4864 output show minor changes (machine truncation level); update the few AD &
4865 TLM output with 12 matching digits only (some prior to version-2 switch).
4866
5ed109e8ff Jean*4867 checkpoint64l (2013/08/05)
f66939121e Jean*4868 o model/src:
4869 - in dynamics.F, skip the call to CALC_VISCOSITY if momViscosity=F
ea7e42c5a8 Jean*4870 - main_do_loop.F: no longer includes additional (AUTODIFF) header files
4871 when using TAF but only if using OpenAD.
c7389f7fae Jean*4872 o pkg/mom_common+fluxform+vecinv:
4873 - always set horiz. viscosity arrays to background value before calling
4874 MOM_CALC_VISC (in MOM_FLUXFORM & MOM_VECINV) and call S/R MOM_CALC_VISC
4875 only when using variable horiz. viscosity (useVariableVisc=T);
4876 - simplify mom_vecinv.F (only 1 block for momViscosity).
d9f9cc1105 Jean*4877 o pkg/mom_common: variable horiz. viscosity in NH code
4878 - move horiz-viscosity 3-D arrays viscAh_W & viscA4_W (used in calc_gw.F)
4879 from model/inc/NH_VARS.h to pkg/mom_common/MOM_VISC.h
4880 - store in common block (in MOM_VISC.h) logical parameters: useHarmonicVisc,
4881 useBiharmonicVisc & useVariableVisc.
4882 - fix old bug (already in 1rst implementation of variable horizontal viscosity
4883 in calc_gw.F, version 1.27, 2006/06/20):
4884 horizontal bi-harmonic viscosity in gW was missing when wiscA4W=0
4885 even if variable bi-harmonic viscosity (e.g., viscA4Grid) was non-zero.
4886 - change background horiz viscosity in vertical momentum (gW) to always be
4887 viscAhW,viscA4W (instead of switching to viscAhD, viscA4D when using
4888 any type of variable viscosity, e.g., viscAh/4Grid)
4889 - change default value of viscAhW,viscA4W to viscAhD,viscA4D (instead of
4890 viscAh,viscA4) which default to viscAh,viscA4 : this avoid missing
4891 horiz. viscosity in W eq when just setting viscAhD/Z,viscA4D/Z (since
4892 default viscAh,viscA4 is zero).
e636cf27b8 Jean*4893 o model/src:
4894 - extend length of drC & recip_drC from Nr to Nr+1.
e8ed922ed3 Jean*4895 o Divided Adjoint (DIVA) with MPI:
4896 - genmake2: do not create local ./mpi_headers dir when no file to copy into.
4897 - remove option ALLOW_DIVIDED_ADJOINT_MPI (replaced by ALLOW_DIVIDED_ADJOINT
4898 and ALLOW_USE_MPI) from model/src code and from ECCO_CPPOPTIONS.h.
4899
8dca956637 Jean*4900 checkpoint64k (2013/07/23)
dee062a69c Jean*4901 o tools/OAD_support:
8dca956637 Jean*4902 - avoid the need for file "oadtempflile" in insertTemplateDir.bash
4903 and remove it from genmake2.
dee062a69c Jean*4904 o tools/build_options:
4905 - remove MPI_HEADER_FILES_INC setting (no longer used) and comment out
4906 MPI_HEADER_FILES list (let genmake2 find the missing headers)
4be02e3b08 Dani*4907 o verification/halfpipe_streamice:
dee062a69c Jean*4908 - change to driving stress formulation; update both Fwd & AD output.
4909 o tools/genmake2 and Divided Adjoint with MPI:
4910 - remove default setting of MPIINCLUDEDIR from $MPIHOME (always been broken);
4911 - only create local ./mpi_headers dir if using MPI and MPIINCLUDEDIR is set;
4912 - add new variable (LOCAL_MPI_HEADERS, replace MPI_HEADER_FILES_INC) in
4913 Makefile, which is set by genmake2, and check which mpi-headers are needed.
4914 Note: need to update adjoint_options/adjoint_diva_mpi accordingly.
4915 - update target "CLEAN" (to also remove ./mpi_headers/ dir).
bcf312c024 Jean*4916 o testreport:
4917 - changes for Divided Adjoint Run: when file "run_ADM_DIVA" is present,
4918 perform additional runs (number of additional runs is "add_DIVA_runs" taken
4919 from file run_ADM_DIVA ; should match "nchklev_3" in file "code_ad/tamc.h").
4920 o verification/lab_sea (AD test):
4921 - change to test Divided Adjoint Run in this set-up (both standard AD test
4922 and 2 secondary AD test: noseaice + noseaicedyn); drop the evp AD test.
0f31045802 Jean*4923 o pkg atm_ & ocn_compon_interf:
4924 - remove cpl_earlyExpImpCall=F option (was mainly a hack added for the old
4925 staggerTimeStep implementation) and disable (retired) corresponding
4926 parameter.
d761a6c43f Jean*4927 o pkg/offline:
4928 - comment out unused field-array: ICEM, ConvectCount, hflx[01], icem[01];
4929 - add S/R OFFLINE_CHECK to print offline parameter summary
4930 and stop if loading a file that is not used;
4931 - enable to calculate GMRedi tensor, KPP mixing and convective index
4932 when the corresponding file(s) is/are not specified (but pkg is used).
2bbc535596 Jean*4933 - comment out resetting of monitorFreq (to endTime) since it still useful
4934 for monitoring CFL numbers and checking offline fields.
e44d40886c Jean*4935 o OpenAD:
4936 - do not define OAD_DEBUG (in tools/adjoint_options/adjoint_oad) to get
4937 smaller standard output) and generate new (smaller) output (on baudelaire
4938 using gfortran with -ieee) for exp. tutorial_tracer_adjsens
5c3afaf8cf Jean*4939 o model/src:
4940 - call EXTERNAL_FORCING_SURF outside bi,bj loops (in do_oceanic_phys.F),
4941 (where external_forcing_adjust was called) and change list of arguments;
4942 - merge external_forcing_adjust.F into external_forcing_surf.F
4943 - put surface relaxation of SST & SSS in new S/R (forcing_surf_relax.F)
4944 which also contains balancing surface relaxation (ALLOW_BALANCE_RELAX,
4945 previously in file "balance_relax.F", now removed); remove corresponding
4946 arrays in FFIELDS.h.
4947 - EXTERNAL_FORCING_SURF is now called when using pkg/offline; implement
4948 a hack for getting back surfaceForcingS (loaded from file) when using
4949 ALLOW_OLD_VIRTUALFLUX (pkg/dic, in DIC_OPTIONS.h) in offline set-up.
4950 - update output of AD test experiment global_ocean.cs32x15.seaice_dynmix
4951 (was getting only 11 digits for AD-grad, due to different truncation
4952 error in AD code).
4953
f15d0780a7 Jean*4954 checkpoint64j (2013/07/04)
b9ef6e0869 Jean*4955 o pkg/offline:
4956 - to enable the use of other features with pkg offline (e.g., obcs),
4957 also call S/R DO_OCEANIC_PHYS in offline run - more modifs to come.
4958 - comment out "allowFreezing" (now active) in 2 offline testing exp.
27ebbc08f6 Dimi*4959 o pkg/exf ALLOW_RUNOFTEMP
4960 - fix sign and make compatible with temp_EvPrRn .NE. UNSET_RL
5c3afaf8cf Jean*4961 - ahdded RUNOFTEMP test to verification/global_ocean.cs32x15/input.seaice
684284fdda Dimi*4962 - changes verification/global_ocean.cs32x15/results/output.seaice.txt
d2e18b684b Jean*4963 o pkg/atm_phys:
4964 - allows to add some damping on uVel,vVel (strength only function of k).
978ac82129 Jean*4965 o verification, ad-tests:
4966 - reduce length of the simulation for AD test: global_ocean.cs32x15.seaice,
4967 global_ocean_ebm and offline_exf_seaice.thsice.
b8dffaf82f Dani*4968 o verification/halfpipe_streamice:
4969 - found a bug in s/r pkg/streamice/streamice_advect_thickness which caused
4970 flux input boundary conditions to be ignored; a fix for this bug changed
978ac82129 Jean*4971 verification results for forward test.
4972 - add adjoint test.
7ee27107e3 Jean*4973 o pkg/ptracers:
4974 - allow to restart without SOM pickup (resetting SOM to zero).
0d1e4b948d Mich*4975 o pkg/gmredi:
4976 - New parameterisation for the calculation of K and (GM_PsiX,GM_PsiY) added.
4977 - It uses mixing length theory and suppression by steering level effects to
4978 calculate a diffusivity used in the Redi tensor (see Bates et al., submitted
4979 to JPO, for more details).
4980 - It also uses the diffusivity to calculate an eddy induced streamfunction
4981 based on a PV closure (rather than a buoyancy closure as in GM).
7ee27107e3 Jean*4982 - New files added to pkg/gmredi:
0d1e4b948d Mich*4983 gmredi_k3d.F calculates the diffusivity for the Redi tensor and the eddy
4984 induced overturning streamfunction (called from gmredi_calc_tensor)
4985 gmredi_calc_eigs.F calculates the eigenvalues and eigenvectors required
4986 for use in gmredi_k3d
4987 gmredi_calc_urms.F calculates the the rms eddy velocity used to calculate
4988 the eddy diffusivity
ffc1393533 Mich*4989
fe0ec941c0 Jean*4990 checkpoint64i (2013/06/18)
e68ed13a81 Jean*4991 o pkg/cheapaml:
4992 - take src files from MITgcm_contrib/verification_other/offline_cheapaml/code
4993 that enable the use of seaice (pkg/thsice thermo & pkg/seaice dynamics)
4994 with pkg/cheapaml.
4995 o utils/python: add subpackage for cubed sphere function, first example is
4996 simple cs.pcol to plot 2D fields on a map
531678d622 Dani*4997 o pkg/streamice:
4998 - This is a new package in MITgcm, which solves dynamic equations for ice
4999 sheets and ice streams
e68ed13a81 Jean*5000 - At the moment it is independent of atmosphere/ocean dynamics, or any
531678d622 Dani*5001 other physical packages in MITgcm, even ShelfIce (although it is anticipat-
5002 ed that this will change)
e68ed13a81 Jean*5003 - There is a new verification exercise that tests it, halfpipe_streamice,
531678d622 Dani*5004 evolves a 40x80 km ice stream/ice shelf (at coarse resolution) in a
5005 rectangular embayment
5006 - halfpipe_streamice is forward-only for now, will have TAF test soon
5007 - for questions, email dgoldber@mit.edu
04cb5dc10d Jean*5008 o pkg/thsice:
5009 - fix filling of snow-precip diagnostic (SIsnwPrc) (left from the removing
5010 of snowPrc from common bloc, on May 2nd, thsice_step_fwd.F revision 1.40);
5011 - remove diagnostics 'SI_FrcFx' ( now identical to 'SI_Fract' with new
5012 call sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect );
5013 - allow precip from pkg/cheapaml to make snow over seaice.
a5f3de150b Jean*5014 o pkg/cfc:
ac5b32ca4b Jean*5015 - move in separated header file (CFC_ATMOS.h) time-serie arrays of Atmos CFC
5016 - remove atmos CFC 2-D arrays from common bloc (now local variables)
5017 - change some hard-coded constant to run time parameter for reading and
5018 and interpolating atmospheric CFC ; keep same default as previously.
5019 - more flexible reading of Atmos CFC (number of records no longer hard-coded)
5020 - put arguments in standard order: myTime, myIter, myThid
5021 - use standard S/R GET_PERIODIC_INTERVAL for time interpolation of
5022 atmospheric CFC ; fix for the case myIter < PTRACERS_iter0.
5023 - fix calculation of surf tendencys for partial-cell and/or Non-Lin Free-Surf
5024 - new routine to print summary of CFC params and check for consistency.
7a8082e765 Mart*5025 o pkg/seaice: add uice/vice to the parameter list of s/r seaice_advdiff,
5026 similar to thsice_advdiff.
5027 Note that for the B-grid case the routine parameters uc/vc are overwritten.
ac5b32ca4b Jean*5028 o pkg/cfc:
a5f3de150b Jean*5029 - change time interpolation for atmospheric CFC-11 (now same as for CFC-12);
5030 update output (CFC-11) of experiment cfc_example and tutorial_cfc_offline.
ac5b32ca4b Jean*5031 - fix interpolation of atmphspheric CFC between Sorthern and Northern
5032 hemisphere value.
5dd9cc40ef Jean*5033 o pkg/seaice:
5034 - allow to use seaice dynamics without pkg/exf (e.g., using pkg/cheapaml)
a8ebf896c4 Mart*5035 o pkg/seaice: add Adams-Bashforth2 time discretization for ice dynamics;
5036 so far only for JFNK-solver, turn on with SEAICEuseAB2 = .TRUE.
5037 - requires an additional time level that is stored in the pickup
5038 - you can start with AB2 from a pickup without this time level with
5039 pickupStrictlyMatch = .false.
5040
2d517edcde Jean*5041 checkpoint64h (2013/05/26)
06294f69b9 Jean*5042 o pkg/cheapaml:
5043 - replace one ()**.5 with SQRT + use temp var "cdu = tau/Du" (coare3_flux);
5044 affect machine truncation (but exp cheapAML_box still pass with 13 digits).
5045 - consistent treatment of uWind,vWind location: assume everywhere in
5046 pkg/cheapaml that they are on C-grid (@ uVel,vVel location)
5047 (Note: was already the case for Tair,Qair advection);
5048 add option (INCONSISTENT_WIND_LOCATION) to recover old results.
5049 - compute diabatic forcing only in the interior (excluding overlap regions)
5050 - fill in array "Qsw" (for short-wave heating);
5051 - add diagnostic for precip ; fill-in diagnostics for cheapAML state vars
5052 before any update (consistent with MITgcm state var diagnostics);
5053 - cheapaml_fields_load.F & cheapaml_init_varia.F : only fill outer edges if
5054 non periodic ; + adjusted for uWind,vWind (C-grid).
5055 o pkg/seaice:
5056 - remove dependence of pkg/seaice versus pkg/exf (file: pkg/pkg_depend) and
5057 add explicitly pkg/exf in experiments that currently use pkg/seaice.
5058 - allows to compile pkg/seaice without pkg/exf.
142cc892c8 Jean*5059 o tools/OAD_support:
5060 - use a local copy (ourRWCPinBd) to ensure index ourRWCP stays within bounds
5061 of array "ourStepOf" in function rvNextAction (revolve.F90).
723a22990a Jean*5062 o pkg/aim_compon_interf renamed to pkg/atm_compon_interf
5063 - change pkg name (to be used with other atmospheric physics pkg)
5064 but by-pass CVS when making the new pkg so that we keep the CVS history.
a280c86ad5 Jean*5065 o pkg/offline:
5066 - call OFFLINE_FIELDS_LOAD from pkg/offline/offline_init_varia.F
5067 (previously called from pkg/dic_surfforcing_init.F)
5068 o model/src:
5069 - re-order sequence of calls within packages_init_variables.F, using
5070 standard order, except for:
5071 DIAGNOSTICS_INIT_VARIA and OFFLINE_INIT_VARIA (called @ the top),
5072 CTRL_MAP_INI and OBCS_INIT_VARIABLES (called @ the bottom)
ac0d2c71f0 Jean*5073 o new pkg: atm_phys
2edfb1b43c Jean*5074 - add entry point and source code (previously in contrib
5075 verification_other/atm_gray/code_gray/) for new pkg "atm_phys"
5076 (atmospheric physics pkg from P. O'Gorman and T. Schneider, JCl, 2008).
ac0d2c71f0 Jean*5077 - re-order sequence of calls within packages_readparms.F,
5078 packages_init_fixed.F and packages_write_pickup.F
5079 (but skip packages_init_variables.F because of TAF issues).
2edfb1b43c Jean*5080 - update contrib/*/atm_gray/ experiment.
b7399a7436 Jean*5081 o pkg/seaice (ITD code):
76166139ef Jean*5082 - simplify and fix the writing of pickup-files for ITD case
5083 o pkg/seaice (ITD code):
b7399a7436 Jean*5084 - introduce floe size dependent lateral melt for ITD case;
5085 - cleaning (avoid division by zero, change to f77 syntax, remove tabs)
5086 - update seaice_itd experiment main output.
ffa44e5be9 Jean*5087 o pkg/thsice:
5088 - remove snowPrc from common block THSICE_FLUX, in THSICE_VARS.h and
5089 declared it locally (without bi,bj) in thsice_main.F & aim_do_physics.F;
5090 changed accordingly pkg/atm2d.
5091
134aa64c5b Jean*5092 checkpoint64g (2013/05/01)
8f8fcb55e3 Dimi*5093 o pkg/exf ALLOW_RUNOFTEMP
5094 - if defined, river and glacier runoff temperature can be read-in from
5095 runoftempfile; runoftempfile needs to have same format as runofffile
a665b019b3 Jean*5096 o pkg/thsice (& pkg/bulk_force):
5097 - In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account
5098 for energy content of Precip + RunOff & Evap (like with pkg/exf).
5099 - change computation domain to always be the interior (without overlap).
5100 - fix bug (wrong overlap) when using EXF and stressReduction > 0.
690aeca19f Oliv*5101 o verification/tutorial_global_oce_biogeo:
5102 - add preliminary OpenAD setup (still has problems)
134aa64c5b Jean*5103 o pkg/seaice:
6c4c641ea1 Mart*5104 - turn some parameters for choosing the convergence criterion of
5105 the inexact Newton method (JFNK) into runtime parameters for convenience
134aa64c5b Jean*5106 - clean up seaice_calc_viscosities.F: remove/retire two options for
6c4c641ea1 Mart*5107 SEAICetaZmethod (1,2), introduce area weighting for method 3; this changes
5108 the results of lab_sea/input because a division has been replaced by
5109 a multiplication with the reciprocal (sumNorm)
5110 - modify offline_exf_seaice/input.dyn_jfnk/data.seaice to improve
134aa64c5b Jean*5111 convergence of solver (changes results, of course), and to test some
6c4c641ea1 Mart*5112 new features
14111182a7 Jean*5113 o model/src:
5114 - remove unused (since Aug 2006) S/R SET_WRITE_GLOBAL_PICKUP and its call.
5115 - remove unused forcing field "dQdT" and associated parameter "dQdTFile".
5116 - move forcing adjustment (balancing surface forcing) in specific S/R
5117 where might also be applied exchanges (if needed) to forcing arrays.
f63796dcfc Jean*5118 o pkg/shelfice:
5119 - allow to specify the Ice-Shelf mass per unit area (instead of
5120 shelficeLoadAnomaly) and do the conversion from one to the other
5121 - move loading from file of shelficeLoadAnomaly from SHELFICE_INIT_VARIA
5122 to SHELFICE_INIT_FIXED: (a) avoid some TAF recompution issues and
5123 (b) will be loaded in time (before calling INI_PRESSURE) in case it is
5124 needed in phi0surf for initial pressure calculation when useDynP_inEos_Zc
5125 - update isomip experiment forward output (get machine truncation error
5126 from conversion shelficeLoadAnomaly -> shelficeMass -> shelficeLoadAnomaly)
01fb631dba Jean*5127 o verification/offline_exf_seaice:
5128 revise data.seaice in input.thermo and input_ad and update results accordingly
b57d4b5259 Gael*5129 HO = 0.2, SEAICE_areaLossFormula = 2,
01fb631dba Jean*5130 SEAICE_growMeltByConv = .TRUE.,
b57d4b5259 Gael*5131 SEAICE_doOpenWaterMelt = .TRUE.,
01fb631dba Jean*5132 Improve consistency with input.thsice and fix the spurious 500m ice corners
5133 o verification/global_ocean.cs32x15:
5134 - set Energy Reference Level to liq. water @ 0 degC: temp_EvPrRn=0.,
5135 in icedyn (thsice+seaice-dyn) test and update output.
5136 o verification/offline_exf_seaice:
5137 - adjust list of tested variables (with testreport) and update
5138 standard test output with better slection of monitored fields.
8fe5c1e95b Jean*5139 o pkg/cd_code:
5140 - swtich off Adams-Bashforth on the 1rst iteration. Update output of
5141 experiment lab_sea.hb87
9f4f698356 Jean*5142 o tools/genmake2:
5143 - change default makedepend from the system default to tools/xmakedepend:
5144 When no makedepend is specified, select tools/xmakedepend it the test pass,
5145 otherwise select the system default (if exist and pass the test) or
5146 try to build cyrus-makedepend ; stop if none of the 3 works.
329d560e65 Jean*5147 o pkg/exf & pkg/thsice:
5148 - In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account
9f4f698356 Jean*5149 for energy content of Precip + RunOff & Evap. Assumes:
329d560e65 Jean*5150 1) Rain has same temp as Air.
5151 2) Snow has no heat capacity (consistent with seaice & thsice pkgs)
5152 3) Run-Off comes at the temp of surface water (with same Cp)
5153 4) Evap over ocean is released to the Atmos @ surf-temp (=SST); should be
5154 put directly into Latent Heat flux & should use water-vapor heat capacity.
5155 5) Evap over snow/seaice (pkg/thsice) assumes constant Lf+Lv (consistent
5156 with snow having no Cp) => water vapor is released to Atmos @ 0^oC (=ERL).
f21dfbc609 Mart*5157 o pkg/seaice: simplify the use of CPP flags in JFNK-related files
5158 (compile when SEAICE_ALLOW_JFNK is defined)
47259ecf74 Jean*5159 o pkg/thsice:
5160 - fix oceanic flux diagnostics & timeave (left from new sequence of calls
5161 implementation): move THSICE_AVE call after the advection (called directly
5162 from thsice_do_advect.F).
0005dc42e3 Patr*5163 o verification/global_ocean.90x40x15 and OpenAD:
5164 New experiment for OpenAD is identical to the one in input_ad except that
5165 multiDimAdvection=.FALSE.,
5166 There is still an issue with this.
b105fb69b1 Jean*5167 o pkg/thsice:
5168 - account for ice velocity (ocean relative velocity) in turbulent heat flux
5169 at the base of the ice; update output of global_ocean.cs32x15 (icedyn)
5170 and offline_exf_seaice (main test).
5171
490ead03b8 Jean*5172 checkpoint64f (2013/03/31)
5173 o verification/OpenAD:
5174 - new (smaller, without OAD_DEBUG) output_oadm.txt generated using gfortran.
5175 o verification/isomip, pkg/shelfice and OpenAD:
789efdf83c Patr*5176 - add OpenAD setup to this exp and make shelfice package work with OpenAD
490ead03b8 Jean*5177 o verification/tutorial_global_oce_biogeo:
5178 - update AD and TLM output after turning off ALLOW_FE (in DIC_OPTIONS.h)
5179 o verification/offline_exf_seaice:
5180 - replace adjoint experiment (now similar to fwd input.thermo/ setup).
ee82888721 Oliv*5181 o verification/tutorial_tracer_adjsens, pkg/ptracers and OpenAD:
5182 - add OpenAD setup to this exp and make ptracers package work with OpenAD
490ead03b8 Jean*5183 o pkg/seaice/seaice_evp.F:
5184 mask the asymmetric contribution of the ice-ocean stress (when
5185 the turningAngle is non-zero) over open water to avoid stripes
5186 in the EVP-solutions after many EVP-substeps. This does not change
5187 the verification experiment (because turningAngle=0 in that experiment),
5188 but will affect other EVP solutions with turningAngle.ne.0
d38c2a4135 Jean*5189 o verification, AD & TLM output:
5190 - new TAF version 2.3.10 (previously 2.3.8) add more parenthesis in multiple
5191 additions and multiplications which affect results at machine truncation
5192 level. Update few AD output (1D_ocean_ice_column, bottom_ctrl_5x5,
5193 lab_sea.noseaicedyn & offline_exf_seaice) and TLM output
5194 (1D_ocean_ice_column & tutorial_tracer_adjsens.som81) which had only 12
5195 digits of matching.
b3668e95f2 Mart*5196 o pkg/seaice:
d38c2a4135 Jean*5197 modify lsr-algorithm so that it vectorizes AND converges by using a
5198 "zebra" method: split vector loop into two with step size 2; this
5199 solves a general convergence problem for the JFNK solver on a vector
5200 computer. It has the potential to even improve convergence for
5201 non-vector machines, but it does change the results so it is turned
5202 off by default. To turn on define CPP-flags SEAICE_VECTORIZE_LSR and
5203 SEAICE_VECTORIZE_LSR_ZEBRA in SEAICE_OPTIONS.h
b3668e95f2 Mart*5204
06b25f9a40 Jean*5205 checkpoint64e (2013/03/05)
59b6bd98c8 Patr*5206 o pkg/ecco and several verification experiments:
06b25f9a40 Jean*5207 Remove special versions of the_model_main.F, the_main_loop.F, forward_step.F
5208 from ecco package, and revert to unified routine in model/src/
5209 Adjust verification experiments accordingly, especially gloal_oce_llc90
5210 Should conclude long-standing work by Gael to reconsile the_main_loop with
5211 ECCO and will enable OpenAD's revolve loop in ECCO setup.
7c6b6a09d0 Jean*5212 o pkg/generic_advdiff:
ccf9e62cda Jean*5213 - implement compressible flow method for multi-dim advection (similar to
5214 gad_som_advect.F); add new option "GAD_MULTIDIM_COMPRESSIBLE" (since
5215 TAF generates many recomputations) to use it; no yet coded with implicit
5216 vertical advection.
5217 - change experiment advect_cs (new output) and advect_xy (same output)
5218 to test compressible flow multi-dim advection.
5219 o pkg/generic_advdiff:
7c6b6a09d0 Jean*5220 - fix SOM advection for unusual cases (linear Free-Surf in r*, other
5221 cases where linear Free-Surf is not @ k=1, e.g., useShelfIce)
5222 o pkg/seaice:
cfab924fcb Mart*5223 - fix bug in the no-slip implementation in seaice_calc_strainrates.F, this
7c6b6a09d0 Jean*5224 bug affects two verification experiments (lab_sea and lab_sea.hb87),
5225 recover old (wrong) results by setting noSlipFac = 2. in
cfab924fcb Mart*5226 seaice_calc_strainrates.F;
8c657eb247 Mart*5227 - add another averaging method for etaZ (etaZmethod=3), a mix of 2 and 0
7c6b6a09d0 Jean*5228 - add runtime parameter SEAICE_JFNKepsilon for that finite difference
8c657eb247 Mart*5229 gradient in the Jacobian times vector operation (s/r seaice_jacvec)
5230 - fix line search in seaice_jfnk.F (s/r seaice_jfnk_update)
c59d410006 Mart*5231 o pkg/seaice: reorganize seaice_lsr.F to be able to reuse more code:
5232 - new subroutines seaice_lsr_tridiagu/v
5233 - introduce loop bounds i/jmin/max to be able to use a restricted
5234 additive Schwarz method, but not used for now.
5235 - rename SEAICE_CALC_LSR_COEFFS into SEAICE_LSR_CALC_COEFFS
5236 - use new subroutines seaice_lsr_tridiagu/v in s/r seaice_preconditioner
9743b80f75 Patr*5237 o OpenAD support
06b25f9a40 Jean*5238 Reorganize S/R call for overall time-stepping loop to facilitate
5239 OpenAD revolve loop replacement
5240 (new S/R main_do_loop.F)
6dd77b4354 Jean*5241 o model/src:
5242 - add 3-D array 3rd dimension to argument list of S/R ADAMS_BASHFORTH2/3;
5243 - pkg/cheapaml: remove local S/R ADAMS2d and use instead standard S/R
5244 ADAMS_BASHFORTH2.
7bfbef8b82 Jean*5245 o pkg/cheapaml:
5246 - add new parameter (default=F, same as before) to disable full domain
5247 (including land) periodicity in X & Y dir.
5248 - new S/R CHEAPAML_COPY_EDGES to copy relaxation field into edges of
5249 prognostics field ; merge the 2 S/R cycle_2d_tracer and timestep_2d_tracer
5250 into single S/R CHEAPAML_TIMESTEP.
5251
544247e9eb Jean*5252 checkpoint64d (2013/02/17)
11fe9ae9a2 Jean*5253 o pkg/monitor (angular momentum):
5254 - do not add Eta contribution to the total AM if using rigid-lid;
5255 - correct for Adams-Bashforth in zonal-wind part (instead of in AM_eta).
5256 - horizontal discretisation: compute Zonal wind contribution separately for
5257 each component (instead of from cell centered averaged) and use the 4
5258 grid-cell corner averaged value of Omega*(R*cos_Phi)^2 in AM_eta part.
5259 - Check that AM is conserved with linear dynamics (momAdvection=F and linear
5260 FreeSurf) if using vectorInvariant momentum.
5261 o model/src (horizontal grid):
5262 - move initialisation of all horizontal grid arrays to null value
5263 from specific horizontal grid S/R to main S/R INI_GRID;
5264 - add 2 new arrays to project model C-grid velocity on to zonal direction
5265 (similar to AngleCosC & -AngleSinC but at U and V point location) and
5266 compute them in S/R CALC_GRID_ANGLES.
48a47574f9 Mart*5267 o pkg/seaice: replace a hard coded parameter by a runtime parameter
11fe9ae9a2 Jean*5268 SEAICE_JFNK_tolIter
a1321f078e Mart*5269 o pkg/seaice: introduce a restricted additive Schwarz (RAS) method in
5270 preconditioner for JFNK (run LSR into the overlaps as far as possible,
5271 i.e OLx/y-2, but overwrite the solution in the overlaps)
5272 - extend loop range in seaice_calc_viscosity
5273 - add new parameters SEAICE_OLx/y (default = OLx/y-2)
5274 - add flexible loop ranges to seaice_preconditioner, seaice_calc_lsr_coeffs
5275 - slightly modify loops in tridiagonal solver lsr-preconditioner
5276 - by default remove the extra exchange in seaice_preconditioner with a
5277 replacement of an undocumented CPP flag by SEAICE_PRECOND_EXTRA_EXCHANGE
5278 - modify offline_exf_seaice so that old results without RAS are reproduced
5279 for output.dyn_jfnk.txt
5280 in seaice_fgmres.F (unrelated to RAS)
5281 - add a cpp-flag option for a re-ordered mapping (potentially more
5282 efficient), but because this changes the results, turn it off by
5283 default
5284 - replace the save statement by local common blocks
4a6b51e826 Jean*5285 o utils/matlab:
5286 - fix tile-offset in rdmnc.m when output was produced using EXCH2.
5287 - update cs_grid/bk_line scripts to use load_grid.m (in utils/matlab)
5288 instead of local script "load_cs.m".
0d86f34c41 Mart*5289 o pkg/seaice:
5290 - fix a serious bug in seaice_fgmres.F, s/r seaice_scalprod, connected
5291 to the scalarProductMetric and the unrolling. By chance this does not
4a6b51e826 Jean*5292 change the verification experiment, because of the particular domain
0d86f34c41 Mart*5293 decomposition
4956a0134a Jean*5294 o pkg/diagnostics:
5295 - change default missing_value from UNSET_RL to -999.
b24144b856 Mart*5296 o pkg/layers: improve vectorization of layers_fluxcalc.F
4a6b51e826 Jean*5297 - step 1: split loops, make TatU/V 2D arrays. This alone reduces the cpu
b24144b856 Mart*5298 time spent in this routine by more than a factor of 3 on an NEC-SX8
5299 - step 2: replace search algorithm by a bisection algorithm found in
4a6b51e826 Jean*5300 Press et al. Numerical Recipes in Fortran. This algorithm can be
b24144b856 Mart*5301 vectorized and finds the correct bin in approx. log2(Nlayers) steps.
5302 For now, use this algorithm only for TARGET_NEC_SX defined.
5303 - moved the search algorithm into a separate subroutine, that is kept
5304 within the same file for automatic inlining.
5305 - modified catching potential errors
4956a0134a Jean*5306 o pkg/ecco:
27b515a5c9 Gael*5307 - add compile switches ALLOW_SHALLOW_ALTIMETRY and ALLOW_HIGHLAT_ALTIMETRY.
4956a0134a Jean*5308 o model/src, pkg/autodiff, pkg/ctrl, pkg/grdchk :
27b515a5c9 Gael*5309 - modifications for ALLOW_GENTIM2D_CONTROL
5310 -- forward_step.F, the_main_loop.F : pass options and arrays for adjoint tapes.
5311 -- load_fields_driver.F : add call to CTRL_MAP_GENTIM2D( myTime, myIter, myThid )
5312 -- add xx_gentim2d0/1 in ctrl_ad_check_lev1_dir.h checkpoint_lev1_directives.h etc
5313 -- use ctrl_swapffields.F (new) instead of exf_SwapFFields.F in ctrl_get_gen.F
f193ea8b76 Jean*5314 o model/src:
5315 - account for moist thermodynamics in (dry) potential temperature equation;
5316 update results of experiments: aim.5l_cs (x2), fizhi-cs (std + aqualev)
5317 and cpl_aim+ocn.
25fdd6d933 Jean*5318 - also switch to standard compiler (gfortran, was using ifort previously)
5319 for fizhi-cs experiments reference output.
f193ea8b76 Jean*5320 o pkg/ctrl:
93e42e1e05 Patr*5321 - 1st step toward generic time-varying control variable (2D) via CPP option
5322 ALLOW_GENTIM2D_CONTROL
5323 - note new namelist ctrl_nml_genarr in data.ctrl
df3d2037ba Jean*5324 o verification/global_ocean.cs32x15:
5325 - switch off OLD_THSICE_CALL_SEQUENCE (both forward and AD code) to use new
5326 thsice calling sequence and update "output.icedyn.txt" output file.
a618488a45 Jean*5327 o pkg/ptracers:
5328 - from Ryan A.: code to allow to restart a tracer at regular time interval
5329 specifying a reset frequency and a reset-phase (for each tracers).
8d7c0d8037 Jean*5330 o pkg/thsice:
b8ed299f9d Jean*5331 - implement new sequence of calls for thsice+seaice:
5332 previously: ice-Dyn,ice-Advect,ice-Thermo(thsice)
5333 new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect
5334 - allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE"
5335 in CPP_OPTIONS.h) to recover old sequence;
5336 - update diagnostics for Intermediate State thsice diagnostics: now filled
5337 just before advection (instead of just after advection in old sequence);
5338 - update output of experiment offline_exf_seaice (standard test);
5339 - in global_ocean.cs32x15 exp., postpone output.icedyn.txt update
5340 by setting #define OLD_THSICE_CALL_SEQUENCE in CPP_OPTIONS.h
5341 o pkg/aim_v23:
5342 - use tiled array for aim_CO2 and surface wind speed for export to coupler;
5343 - use standard pkg/mdsio routines to read & write CO2 pickup file;
5344 - in-line S/R AIM_AIM2DYN_EXCHANGES in aim_do_physics.F;
5345 - Implement new sequence of calls for seaice advection (with thsice and
5346 seaice diffusion): do ice advection after ice-Thermodynamic (previously
5347 was done before); change aim_do_physics.F (split the bi,bj loops block);
5348 - use same CPP option (OLD_THSICE_CALL_SEQUENCE) to recover old sequence;
5349 o pkg/thsice:
8d7c0d8037 Jean*5350 - add a missing EXCH of sIceLoad in thsice_main.F (ocean set-up) for the case
5351 where just seaice diffusion is used without seaice-dynamics.
5352
9f6899b968 Jean*5353 checkpoint64c (2013/01/18)
5354 o pkg/seaice:
5355 - add a parameter JFNKres_tFac that can replace JFNKres_t
9ebe58d4fa Mart*5356 (= JFNKres_tFac*JFNKresidual before JFNK solver)
5357 - add a line search option to the JFNK solver
9f6899b968 Jean*5358 - move update of u/vIce and computation of initial residual into a separate
c937d257c3 Mart*5359 routine (same file); makes the code a little easier to read (?)
5360 - the line search requires computation of the residual and for some reason
9f6899b968 Jean*5361 I cannot do the update of u/vIce at the beginning of the Newton loop
c937d257c3 Mart*5362 without changing the results, so we move computation of the new residual
5363 also to the end of the Newton loop, even without the line search
3b4e62adf7 Jean*5364 o pkg/mdsio:
5365 - write missing value (corresponding to undefined array value) to meta files;
9f6899b968 Jean*5366 skip this if missing value is one (UNSET_RL would be a better value for the
3b4e62adf7 Jean*5367 case of undefined missing value but it's current the default missing-value);
5368 Also update mdsio_read_meta.F (reading timeInterval & missing-value).
93ace0b1be Jean*5369 o pkg/exf & thsice:
9f6899b968 Jean*5370 - for diagnostics purpose, fill-up and update Qsw array (+ fill the
9ebe58d4fa Mart*5371 diagnostics) even when SHORTWAVE_HEATING is #undef;
93ace0b1be Jean*5372 o verification/cfc_example:
9f6899b968 Jean*5373 - turn on pkg/layers with pkg/diagnostics (to test pkg/layers and to
9ebe58d4fa Mart*5374 illustrate how to use it).
7f496449e0 Jean*5375 o verification/offline_exf_seaice:
5376 in input: add SEAICErestoreUnderIce=.TRUE., and reduce size of forcing
5377 files to only one time-record.
5378 in input.thermo: narrow the 2 bands of low initial ice-concentration near
5379 N & S edges; switch on SEAICErestoreUnderIce=T; use pkg/diagnostics for
9f6899b968 Jean*5380 snapshot output; same mcPheePiston value as in thsice with
9ebe58d4fa Mart*5381 surf-current=0.2m/s.
7f496449e0 Jean*5382 in input.thsice: similar set-up as in input.thermo (channel with same seaice
5383 initial conditions).
a504296e19 Jean*5384 o verification/cfc_example:
5385 - update file "data" with more standard choice (default rotationPeriod,
5386 exactConserv=T, reduce ivdc_kappa to 10, remove multiDimAdvection=F,
5387 set deltaTFreeSurf to deltaTtracer) and update the output.
5388 o pkg/layers:
5389 - fix bolus part so that it compiles with #undef GM_BOLUS_ADVEC;
5390 - ensure that "layers_bolus" is switched to False when useGMRedi=False.
5391 o verification/offline_exf_seaice:
5392 - set all {field}period to zero for constant-in-time forcing (not tested
5393 anywhere else).
bde2cd981d Jean*5394 o verification/offline_exf_seaice:
5395 - dyn_lsr : use pkg/seaice S/R (instead of pkg/thsice) to advect sea-ice;
5396 - dyn_jfnk : use pkg/thsice S/R (instead of pkg/seaice) to advect sea-ice.
a4ef5db77d Jean*5397 o model/src:
5398 - implement Finite-Volume method for (hydrostatic) presure gradient
5399 from S.-J. Lin (QJRMS 1997), for atmosphere using sigma-coordinate.
5400 o pkg/seaice: implement EVP* by Lemieux et al. (2012).
5401 - In order to be compatible with the default EVP code, this requires changing
5402 the EVP code around a little; and because any small change immediately
5403 breaks the lab_sea.hb87 verification experiment, the reference output is
5404 updated two times (each time the remaining aggrement was only 2 digits):
5405 - after replacing 1/dt by 1*recip_dt with a precomputed recip_dt
5406 - after replacing 1/(1+0.5*dt/tau) by a/(a+1), with a=2*tau/dt
5407 The adjoint test lab_sea.evp also needed to be updated.
5408 - Turn on EVP* by setting SEAICE_deltaTevp as before, and setting
5409 SEAICEuseEVPstar=.true.; for EVP* SEAICE_deltaTevp does not need to be
5410 a factor of SEAICE_deltaTdyn, and you can set the number of EVP steps
5411 explicitly with SEAICEnEVPstarSteps (thereby overriding the default of
5412 INT(SEAICE_deltaTdyn/SEAICE_deltaTevp)). Controlling EVP* is deliberately
5413 kept obscure, because I need to test it a little more.
9902b68429 Jean*5414 o pkg/cheapaml:
5415 - fix few incorrect type (_RL/_RS) in subroutine calls.
5416 o pkg/seaice:
5417 - new S/R SEAICE_MAP_RS2VEC (similar to SEAICE_MAP2VEC) to map _RS arrays
5418 to _RL vector; this fixes JFNK code when compiling with "-use_r4" option.
8ecbb13ed3 Jean*5419 o model/src:
5420 - add a warning if using select_rStar=2 with nonlinFreeSurf <> 4;
5421 change (in input_ad*/data) select_rStar from 2 to 1 for AD verification
5422 experiments global_ocean.cs32x15 & tutorial_tracer_adjsens (+ update output)
01e3fdb926 Jean*5423 o pkg/cheapaml:
5424 - replace "273.1 _d 0" by celsius2K in pkg/cheapaml/cheapaml.F and
5425 update output of experiment cheapAML_box.
d9f9739596 Jean*5426 - store in CHEAPAML.h coeffs ssq[0:2] for saturation specific humidity,
5427 and set them only in one place (cheapaml_readparms.F).
5428 - replace "273.16 _d 0" by celsius2K & replace "3.14159 _d 0" by constant "PI"
5429 - remove re-setting of main-model parameter "celsius2K" (in cheapaml_readparms)
5430 and re-setting of cheapAML params "lath" & "p0" (in cheapaml_init_varia).
69e136acfe Gael*5431 o model/src/the_main_loop.F:
5432 - fix revision 129 : need both ALLOW_ECCO and ALLOW_ECCO_EVOLUTION.
5433 o pkg/seaice:
5434 - remove legacy branch code.
5435 - retire SEAICE_GROWTH_LEGACY and SEAICE_CAP_HEFF accordingly.
5436 o verification/*/code*/SEAICE_OPTIONS.h:
d9f9739596 Jean*5437 - remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY,
01e3fdb926 Jean*5438 SEAICE_CAP_HEFF).
b4639cc807 Jean*5439 o pkg/cheapaml:
5440 - use standard routine (S/R GET_PERIODIC_INTERVAL) to decide when it is time
5441 to load new forcing fields.
5442 - add missing "_d 0" where it's needed; + some editing (improve indentation).
5443 - remove switch to "-r8" compiler option (no longer needed) in verification
5444 cheapAML_box, keep same output (small trucation error differences).
692e8490be Jean*5445 o verification/offline_exf_seaice:
54b88f0722 Gael*5446 - add thermodynamics only test.
692e8490be Jean*5447 o verification/cheapAML_box:
5448 - split the domain in 8 (2x4) tiles; add MPI and multi-threaded test;
5449 keep same output (same 14 digits for cg2d).
5450 - switch on "-r8" compiler option (some numerical values are missing
5451 the "_d 0") and update output (only 6 digits for cg2d were preserved).
54b88f0722 Gael*5452
026a4385c5 Jean*5453 checkpoint64b (2012/12/24)
51ad14de13 Jean*5454 o pkg/cheapaml:
5455 - remove un-used variables (Qnet,EmPmR) from pickup files.
5456 - store tendency of advected variables into cheapaml pickup file
5457 and fix the AB-2 restart.
0ef659ed72 Gael*5458 o verification/offline_exf_seaice and lab_sea adjoint:
51ad14de13 Jean*5459 - switch to new code (#undef SEAICE_GROWTH_LEGACY).
5460 - switch to 4 time steps in offline, consistent with lab_sea.
026a4385c5 Jean*5461 - match parameters from SEAICE_GROWTH_LEGACY branch in data.seaice.
51ad14de13 Jean*5462 - update results after change of experiment seaice.
026a4385c5 Jean*5463 o pkg/seaice:
5464 - remove option SEAICE_MULTICATEGORY; has been replaced with run-time
5465 parameter SEAICE_multDim. Issue a warning if SEAICE_MULTICATEGORY is
5466 still defined since SEAICE_multDim needs to be set to MULTDIM value (from
5467 SEAICE_SIZE.h) to recover previous #define SEAICE_MULTICATEGORY default.
7755429b93 Jean*5468 o model/src:
5469 - add run-time parameter to select CG2D solver minimum-residual solution
5470 (in case of a poor convergence).
262f1a37c5 Mart*5471 o pkg/seaice/seaice_lsr.F
7755429b93 Jean*5472 - move calculation of matrix coefficients into new
ed8217d1df Mart*5473 S/R SEAICE_CALC_LSR_COEFFS; for now this routine remains in the same
5474 file; the main purpose of this change is to be able to reuse the code
5475 in S/R SEAICE_PRECONDITIONER
262f1a37c5 Mart*5476 - modify the computation of the residual so that the mass of sea-ice
026a4385c5 Jean*5477 is not used twice; this simplifies the calculations, but since
262f1a37c5 Mart*5478 the residual is never used except when LSR_mixIniGuess.ge.4---and this is
5479 not tested in testreport---this does not affect the testreport results.
adb13907c3 Dimi*5480 o verification/seaice_obcs:
5481 - disable SEAICE_GROWTH_LEGACY; reset input files to match those of
5482 verification/lab_sea/input.salt_plume; changes results/output.txt*
c178b9393a Jean*5483 o model/src:
5484 - adapt quasi-hydrostatic formulation to work with p or p* coordinate.
7e9893ac33 Mart*5485 o pkg/seaice:
5486 - improve description of parameters in seaice_fgmres.F and start
5487 cleaning up the code
c178b9393a Jean*5488 - change name of SCALPROD to SEAICE_SCALPROD and modify meaning of
7e9893ac33 Mart*5489 second argument
5490 - add a metric based on grid cell area to SEAICE_SCALPROD; update
5491 results of offline_exf_seaice.dyn_jfnk
5492 - compute initial residual norm in seaice_jfnk based on SEAICE_SCALPROD
e4684a75d6 Jean*5493 o pkg/aim_v23:
5494 - fix an other bug in dissipation heating (grid-cell area was missing).
2dc84f624e Jean*5495 o model/src + pkg/seaice:
5496 - add global (multi-tile) linear solver for pair of tri-diagonal system
5497 along X and Y lines, respectively for U and V component.
5498 Note: 1) MPI and cube-exchange not yet coded.
5499 2) probably not accurate for poorly conditioned / large size problem.
5500 - add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver;
5501 default: not compiled and not used.
88a8f1f812 Mart*5502 o pkg/seaice:
5503 - first attempt at a multi-threaded fgmres solver for the JFNK solver:
2dc84f624e Jean*5504 introduce bi/bj loops and use global_sum_tile_rl instead of
88a8f1f812 Mart*5505 mpi_allreduce in seaice_fgmres.F
5506 - improve diagnostics output for fgmres solver (seaice_fgmres.F)
5507 - replace a few unnecessary goto statements by if-blocks (seaice_fgmres.F)
5508 - add a verification experiment for JFNK in offline_exf_seaice
d5a9a292e9 Jean*5509 o verification:
6531f48833 Jean*5510 - change (for now, only fwd test) offline_exf_seaice experiment:
026a4385c5 Jean*5511 use a re-entrant channel with idealized coastline (trapezoidal shape)
6531f48833 Jean*5512 at southern boundary to explore seaice dynamics and thermodynamics
5513 with simple forcing. Main set-up has dynamics+thermo and SST relaxation;
5514 secondary test (input.thsice) use thermodynamics only with SST relaxation.
5515 - add seaice-dynamics only secondary test using LSR and pkg/thsice advection.
5516 o pkg/exf:
5517 - disable "sstExtrapol" when Nr=1
5518 o verification:
d5a9a292e9 Jean*5519 - add new experiment "cheapAML_box" (simple 1 layer set-up from Bruno Deremble)
5520 to test pkg/cheapaml.
46af042642 Jean*5521 o pkg/aim_v23 & pkg/shap_filt:
5522 - fix dissipation heating (erroneous gravity multiplication factor).
5523 o pkg/seaice:
7729ab9475 Mart*5524 - remove unused field pressPre from jfnk solver
5525 - rename two subroutines in seaice_preconditioner.F
e5a4e727cd Jean*5526 o eesupp/src:
5527 - S/R MDSFINDUNIT avoids reserved unit numbers (scrUnit1, eeDataUnit ...)
6ac4f1544e Mart*5528 o pkg/seaice/seaice_preconditioner.F: fix preconditioner once again
5529 - remove wrong parts of the rhs and the lhs (were in there
5530 because I did not understand the concept of this preconditioner)
5531 - add an exchange between u- and v-sweep. This increases communication
5532 by a factor of two but improves the convergence of jfnk. Ideally,
5533 one would like the u- and v-sweep to be independent. So far within
5534 undocumented ifdefs
5535 - reorganize the extra computations for printing the residuals
24fc5488c9 Jean*5536 o tools/genmake2:
5537 - comment out the "mpif.h" include in NetCDF test programm (for MPI built)
5538 since it's not necessary (and was preventing to use MNC in some cases).
5539
3b68c5ef24 Jean*5540 checkpoint64a (2012/11/16)
0e1d0943d5 Jean*5541 o pkg/autodiff:
5542 - improve pkg-internal logical parameter switch (inAd/inFwd mode) so that
5543 autodiff_readparms.F no longer depends on calling order (within
5544 packages_readparms.F) and no longer requires to include ${PKG}_PARMS.h):
5545 rename param turnFreeDriftInAdMode to SEAICEuseFREEDRIFTswitchInAd
5546 and change param SEAICEuseDYNAMICSinAdMode to SEAICEuseDYNAMICSswitchInAd.
ed6db82373 Dimi*5547 o pkg/obcs:
5548 - adding tidal velocity forcing capability to obcs
5549 for usage example, see verification/seaice_obcs/input.tides
7972e6de33 Mart*5550 o pkg/seaice:
0e1d0943d5 Jean*5551 - turn the LSR-relaxation parameters WFAU/V into runtime parameters
7972e6de33 Mart*5552 SEAICE_LSRrelaxU/V
356e5485d1 Mart*5553 - introduce runtime parameter SEAICEetaZmethod (=0 by default)
be55e6379a Jean*5554 o pkg/aim_v23:
5555 - implement heating from friction (bottom friction and stratospheric drag).
5556 o pkg/shap_filt:
5557 - fix diagnostic "SHAP_dKE" (was 2 time smaller); implement heating from
5558 dissipation but only for Shap_funct=2, active when addFrictionHeating=T.
0c723af82e Jean*5559 o model/src:
5560 - move AddMass common block from DYNVARS.h to FFIELDS.h; allow to read-in
5561 time-constant addMass field from file (addMassFile);
5562 - support for heating due to friction (and Kinetic Energy dissipation):
5563 add option, run-time switch and 3-D field array + support code ; each pkg
5564 or S/R can add heating contribution (if there is a sink of KE); the sum is
5565 accounted for as a Temperature tendency term (EXTERNAL_FORCING_T).
93029454d2 Mart*5566 o pkg/seaice:
96c8307cd6 Patr*5567 - complete merge of ITD code into seaice_growth.F
5568 from MITgcm_contrib/torge/itd/code/
5569 no verification so far, but Torge Martin tested
5570 "1-D test case and Beaufort set up;
5571 deliver okay results after 1 model year."
5572 - complete merge of SEAICE_SIZE.h into all relevant routines
db6b283965 Mart*5573 - move computation of eta at Z-points into calc_viscosities
5574 + introduce global field etaZ
5575 + add different methods for computing etaZ, for now the old
5576 method (simple averages of eta to Z-points) is hardwired
0c723af82e Jean*5577 + replace etaMeanZ by etaZ in seaice_lsr, seaice_calc_residual,
db6b283965 Mart*5578 seaice_preconditioner
5579 - simplify computations for SEAICE_ZETA_SMOOTHREG
0c723af82e Jean*5580 - seaice_preconditioner:
773a0cee43 Mart*5581 + replace one remaining press by pressLoc (mistake)
5582 + adjust printing of residuals
54dc59c155 Mart*5583 - improve I/O of diagnostics of JFNK in seaice_jfnk.F:
0c723af82e Jean*5584 + add (SEAICE.h) and rename some counters (initiliased in
54dc59c155 Mart*5585 seaice_init_fixed.F)
5586 + add _BEGIN/END_MASTER (myThid) around print statements
5587 + print total number of iterations and failures over SEAICE_monFreq
5588 interval to STDOUT
5589 - move control over output-messages by fgmres to seaice_jfnk to save
5590 some operations
93029454d2 Mart*5591 - move resetting initial guess for fgmres outside of seaice_fgmres_driver
5592 in order to make restarts with sol .ne. zero (fgmres with restarts)
5593 (seaice_jfnk.F, seaice_fgmres.F)
5594 - seaice_calc_l/rhs.F: replace maskW/S by maskInW/S; this fixes
5595 a serious convergence problem when open boundaries are involved
0c723af82e Jean*5596 o pkg/ggl90: fix computation of control volumes for the case of
58e6249dd7 Mart*5597 ALLOW_GGL90_HORIZDIFF (probably not used very often): move control volumes
5598 up half a grid cell from C-centered to W-centered (pointed out by C. Eden)
8e17d76640 Mart*5599 o pkg/seaice: simplify seaice_evp by avoiding use of extra fields u/vIceC
48ffb9e808 Patr*5600 o pkg/autodiff
5601 - Add inAdMode switch for SEAICEuseDYNAMICS:
0c723af82e Jean*5602 SEAICEuseDYNAMICSinAdMode
48ffb9e808 Patr*5603 (extend logic in ADAUTODIFF_INADMODE_SET)
17353ce854 Patr*5604 o pkg/seaice
5605 - Step 1 of merging ice-thickness distribution (ITD) code from
5606 MITgcm_contrib/torge/itd/ (author: Torge Martin)
5607 The code implements concept laid out in Thorndike et al. (1975);
5608 code is enabled via CPP flag SEAICE_ITD
5609 nITD (in SEAICE_SIZE.h) defines number of ice thickness categories;
5610 code is not complete yet!!
48ffb9e808 Patr*5611 - SEAICE_SIZE.h now included in almost all seaice routines
d28bbf0830 Jean*5612 o verification (using seaice):
5613 - switch back seaice-dynamics (+ lower SOLV_MAX_ITERS) in ADM exp.
5614 global_ocean.cs32x15.seaice ; update results.
5615 - compile B-grid dynamics in FW test exp 1D_ocean_ice_column ;
5616 - compile C-grid dynamics with #define SEAICE_ALLOW_JFNK in FW test exp
5617 offline_exf_seaice (previously compiling B-grid).
b3a1d973db Jean*5618 o pkg/exf:
5619 - fix some STOP conditions in exf_check.F (from Aug 28, modifs did not allow
5620 to specify neither just 1 comp of wind or wind-stress, nor no surface momentum
5621 forcing): just replace CPP option ALLOW_ATM_WIND with run-time param useAtmWind.
c6bd7aced7 Jean*5622 o pkg/layers (adjust changes from Sept 19):
dfcf827164 Jean*5623 - do snap-shot output and fill diagnostics from inside iLa loop (layers_calc.F)
5624 this allows to remove "layers_maxNum" dimension from all layers arrays.
5625 o pkg/layers (adjust changes from Sept 19):
c6bd7aced7 Jean*5626 - remove ALLOW_LAYERS_OUTPUT ; fix snap-shot and time-ave output ;
5627 - snap-shot extended to all type of layers (not just the 1rst type);
5628 - remove layers variables when corresponding CPP option is undef.
5629 o pkg/layers:
5630 - rename pkg/layers variable and add new output (layer exist & un-weighted
5631 velocity in layer)
5632 o pkg/seaice:
2c43bfffcf Mart*5633 - simplify (?) ocean-drag coefficent computations by using
5634 the same routine in all three solvers (saves some code lines)
5635 - remove global fields DRAGA and DRAGS from C-grid code and
5636 declare them locally in lsr.F (the only place where they are
5637 still used)
0db5f1068d Jean*5638 - update AD output of lab_sea.evp (very sensitive anyway).
8c62e844bf Mart*5639 o pkg/seaice: add Jacobian-free Newton Krylov solver for ice dynamics
5640 (Lemieux et al. 2010, 2012). Turn on with the usual SEAICE_ALLOW_JFNK
5641 and SEAICEuseJFNK=.true. A few things to note:
5642 - involves a FGMRES, that is parallel but very inefficient,
5643 because of many scalar products (global sums) in the Gram-Schmidt
5644 orthogonalization method. Needs to be replaced. Original code
5645 from J.-F. Lemieux
5646 - preconditioner for FGMRES is a stripped down version of LSOR
c6bd7aced7 Jean*5647 - SOLV_MAX_ITERS is now used for LSOR as a solver and as a
8c62e844bf Mart*5648 preconditioner. For the preconditioner, the default is set to 10.
5649 - Jacobian times vector is computed with finite differences
5650 - marginally related to JFNK-solver: add a smooth regularization for
5651 zeta with tanh that will improve convergence (Lemieux and Tremblay,
5652 2009) for any implicit solver (not implemented for EVP because EVP
5653 does not need this regularization in the first place). Define
5654 SEAICE_ZETA_SMOOTHREG in SEAICE_OPTIONS.h to use.
8e5804ab61 Jean*5655 o eesupp/src:
5656 - check in genmake2 that intrinsic S/R flush is available.
5657 - add S/R to flush IO unit (if intrinsic S/R flush is available)
5658 - flush standard & error msg unit before MPI termination
5659 - if debugMode, flush IO unit after printing msg
5660 o pkg/ctrl:
5661 - ctrl_unpack.F, ALLOW_GENARR3D_CONTROL code: fix missing argument in call
5662 to ctrl_set_unpack_xyz.
5663
f9281bf7f3 Jean*5664 checkpoint64 (2012/10/09)
6ae30b06da Patr*5665 o pkg/shelfice
f9281bf7f3 Jean*5666 - in mom_fluxform.F, mom_vecinv.F:
5667 CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid)
5668 Bug fix KappaRU -> KappaRV
5669 does not change verification/isomip but may change other setups
5670 (presumably constant KappaRU=KappaRV)
9574f2afeb Mart*5671 - fix diagnostics SHIU/Vdrag (thanks to Tom Millgate)
5e26aed318 Dimi*5672 o pkg/obcs:
5673 - fixed some indexing bugs in obcs_seaice_sponge.F
5674 - added obcs relaxation subroutines for HSALT and HSNOW
5675 - changes verification/seaice_obcs/results/obcs_seaice_sponge.F
78e0c35225 Mart*5676 o pkg/seaice:
5677 - add "multicategory" parameterization for snow in analogy to ice,
5678 default is off for now.
fd94cbb100 Jean*5679 o pkg/obcs:
c7c4b57180 Dimi*5680 - added obcs_seaice_sponge.F for obcs relaxation of seaice variables;
5681 see verification/seaice_obcs/input.seaiceSponge for example application.
fd94cbb100 Jean*5682 - remove local commom bloc "OBCS_GLOBAL" in obcs_readparms.F and do all the OB
5683 index setting by master-thread. This fix multi-threads Pb in previous modifs.
4d8bc9f16f Gael*5684 o pkg/layers :
fd94cbb100 Jean*5685 - add diagnostics to pkg/layers
5686 - move the meat of pkg/layers from layers_calc.F to layers_fluxcalc.F
5687 (from R.Tulloch). Layers_calc.F now calls layers_fluxcalc.F accordingly.
4d8bc9f16f Gael*5688 o pkg/generic_advdiff/gad_implicit_r.F :
fd94cbb100 Jean*5689 - fix ADVr diagnostics in case of both implicit vertical advection and diffusion.
5690 o pkg/seaice/seaice_growth.F:
4d8bc9f16f Gael*5691 - fix SItflux diagnostics in virtual salt flux + balanceEmpmr case.
9bb13a83a0 Jean*5692 o pkg/obcs:
f9543ec2af Jean*5693 - change default setting of OBCS_UVICE_OLD from defined to undef;
5694 - use new parameter OB_indexNone for null index value (instead of hard-coded 0)
5695 in all pkg/obcs code and in other pkgs; remove k loop in obcs_check_depths.F;
5696 - pass OB_indexNone as (new) argument to S/R CTRL_MASK_SET_[X,Y]Z;
5697 - change OB null index value (OB_indexNone) to -99 ; this fix the problem
5698 with Southern & Western OB at a tile edge (at least in a simple set-up).
5699 o pkg/obcs:
9bb13a83a0 Jean*5700 - change settings of OB index in case OB coincides with tile edge (shared by
5701 2 tiles), so that common OB location is registered by both tiles (instead of
5702 only 1). However, for Southern and Western OB, index value = 0 is not
5703 recognized as valid OB index (=default null value) and needs to be fixed.
5704 - modify accordingly OBCS_BALANCE_FLOW and OBCS_MONITOR (avoid double counting)
f9543ec2af Jean*5705 - new parameter "OB_indexNone" for null index value (for now, still zero)
9bb13a83a0 Jean*5706 to replace hard-coded null index value of zero.
c783d09169 Jean*5707 o pkg/exch2:
5708 - improve W2_USE_E2_SAFEMODE (faster) and W2_E2_DEBUG_ON:
5709 always check buffer-size (but outside the loop); move checking for valid
5710 index from W2_USE_E2_SAFEMODE to W2_E2_DEBUG_ON; in W2_E2_DEBUG_ON,
5711 print each tile and point connection only if |W2_printMsg|>= 2 and 3.
307cef9ba4 Jean*5712 o pkg/ctrl (pack & unpack):
5713 - in ctrl_pack.F & ctrl_unpack.F, use the same local file-name variable
5714 (locally defined) for different variables (+ remove the variable-specific
5715 file name in CTRL_GENARR.h). For now, only implemented for GENARR2/3D_CONTROL
5716 (to be extended to other local file names in ctrl.h).
5717 o pkg/flt:
5718 - add a FLT_Iter0 option (similar to PTRACERS_Iter0).
31ef3766a3 Jean*5719 o pkg/mdsio:
5720 - fix missing STOP in mdsio_readvec_loc.F (case ioUnit=0) when file is missing
4308379183 Jean*5721 o tools/genmake2:
5722 - add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE
5723 (added by Alistair in version 1.51 for building without make depend);
5724 - remove Header files list (H_SRC_FILES) from the dependence of targets
5725 ad_input_code.f & ftl_input_code.f (not clear why it was added in the first
5726 place in version 1.23): this save going through staf when unrelated header
5727 file has been modified.
5728 Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without
5729 "make depend" step, still need to do "make links" before "make adtaf".
e4daa51e76 Jean*5730 o eesupp/src (+ few pkg src files) & genmake2:
5731 - finish to remove ALWAYS_USE_MPI in source code that TAF does not see;
5732 - no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2).
4308379183 Jean*5733 - improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish
e4daa51e76 Jean*5734 upper/lower case ; account for space between "#" and undef/define)
5735 o pkg/flt (with exch2):
5736 - cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F;
4308379183 Jean*5737 - simplify threads synchronisation; fix (many issues) multi-threaded with MPI.
e4daa51e76 Jean*5738
441c88984f Jean*5739 checkpoint63s (2012/09/05)
8de17d15ea Gael*5740 o pkg/ecco:
f1085458a2 Jean*5741 - remove #ifdef ALLOW_SMOOTH_CORREL3D brackets.
5742 - add more relevant #ifdef ALLOW_SMOOTH ones.
5743 - sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D.
8de17d15ea Gael*5744 o pkg/ctrl:
5745 - CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D,
5746 ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D.
f1085458a2 Jean*5747 - ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag,
5748 doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and
5749 ctrlSmoothCorrel3D (new).
8de17d15ea Gael*5750 The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP.
5751 - ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist.
f1085458a2 Jean*5752 - ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress
8de17d15ea Gael*5753 controls when useAtmWind, and vice versa.
5754 - ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers.
5755 - ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with
f1085458a2 Jean*5756 #ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH.
5757 - ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with
5758 #ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH.
5759 - ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F:
5760 replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D.
8de17d15ea Gael*5761 o pkg/smooth:
f1085458a2 Jean*5762 - remove un-necessary includes.
5763 - remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets.
5764 Those CPP options were never defined, and not necessary.
8de17d15ea Gael*5765 o model/src:
5766 - fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi).
5767 - standard treatment of useSMOOTH.
5768 o pkg/autodiff:
f1085458a2 Jean*5769 - add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode,
5770 useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint.
dace8652ae Jean*5771 o pkg/exch2:
5772 - add "if usingMPI" where it was missing (in exch2_rx?_cube*.template)
8de17d15ea Gael*5773 + start to remove ALWAYS_USE_MPI in source code that TAF does not see.
dace8652ae Jean*5774 - make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag
5775 and tiles to process mapping.
5776 - re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h)
5777 moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h;
5778 rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX
5779 from w2_eeboot.F to w2_readparms.F.
5780 o eesupp/src:
5781 - set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of
5782 ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F;
5783 also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F
5784 - in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI
5785 is defined (remove condition on usingMPI) to match cases where MPI_INIT
5786 has been called.
5787 - fix bug I put in previous modif of exch_sm_3d_rx.template (not much used);
5788 - change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings
5789 (so that on 1 proc, get same myPid independently of usingMPI)
5790 - add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and
5791 useCubedSphereExchange with EXCH-1 (safer).
5792 - add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI).
e2a9470322 Jean*5793 o pkg/ggl90:
5794 - fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call)
5795 used in ALLOW_GGL90_SMOOTH code.
5796 o pkg/flt:
5797 - fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping
5798 floats at the Southern end of the domain).
5799 o eesupp/inc:
5800 - add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h);
5801 but not used (and not to be used) anywhere, just for documentation.
c7b36da2b3 Jean*5802 o pkg/autodiff, exf, ptracers & seaice (AD & TL output):
5803 - comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since:
5804 a) can damage previously written records in any other multi-record files.
5805 b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S.
32c6b8e3e2 Jean*5806 o tools/genmake2:
5807 - define variable MAKE within Makefile and use it in place of 'make';
5808 - update AD_CONFIG.h (if needed) before building any of the executable
5809 (forward, adjoint or tangent-lin); this involves a 2nd invocation of make;
5810 and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h;
5811 - always print usual warning comment 'this file is automatically generated'
5812 from script convert_cpp_cmd2defines (+ remove this warning from genmake2).
c7b36da2b3 Jean*5813 o pkg/cheapaml:
5814 - updated to correspond to the code used in accepted paper (Nico Wienders).
32c6b8e3e2 Jean*5815 o pkg/exf:
5816 added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch.
5817 ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F)
5818 and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h).
5819 o pkg/exf, autodiff, ctrl, ecco and seaice:
5820 remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones.
5821 o pkg/ctrl, ecco:
5822 allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL.
5823 Depending on useAtmWind, one is inactive, and the other is active (see
5824 exf_getffields.F/exf_getsurfacefluxes.F).
4681beea4a Jean*5825 o tools/genmake2:
5826 - improve error msg when failing in 2nd test of check_for_broken_Ff
5827 - fix option '-makefile' short-name (-mf according to genmake2 -help)
5828 - source local config file "genmake_local" just after processing the genmake2
5829 command arguments (previously done before processing arg).
07c8ca60a9 Jean*5830 o pkg/grdchk:
5831 - add a call to TURNOFF_MODEL_IO for Tangent-Linear run (in this case, call
5832 to this routine from cost_final has been dropped in g_cost_final)
5833 - improve printed information (more explicit msg, no longer using "print *,"
5834 fix fcpertminus printed value).
0c39183c54 Jean*5835 o model/src:
5836 - move call to COST_INIT_VARIA out of packages_init_variables.F directly
5837 into initialise_varia.F (just after calling PACKAGES_INIT_VARIABLES):
5838 this prevents getting cost-funct reset in adinitialise_varia recomputations.
2b983d7243 Jean*5839 o pkg/dic:
5840 - move initialisation of "freefe" array from from dic_biotic_forcing.F to
5841 fe_chem.F: this prevents TAF from dropping this initialisation in TLM code.
5842 o pkg/grdchk:
c78fad8e88 Gael*5843 - grdchk_main.F : added CALL GLOBAL_SUM_INT( ierr , myThid )
2b983d7243 Jean*5844 - grdchk_getadxx.F etc. : omit I/O if ierr.EQ.0
5be1b702e4 Gael*5845 o pkg/autodiff/ctrl/grdchk :
2b983d7243 Jean*5846 - attempt to sort out what works and what does not,
5be1b702e4 Gael*5847 with regard to I/O, and to warn/stop accordingly.
2b983d7243 Jean*5848 o pkg/grdchk:
5be1b702e4 Gael*5849 - attempt to fix grdchk in the case of useSingleCpuIO.
5850 - "if ( myProcId .EQ. grdchkwhichproc .AND. ierr .EQ. 0 )"
5851 statements were moved from grdchk_main.F and into
5852 grdchk_getadxx.F grdchk_getxx.F grdchk_setxx.F.
5853 - a global sum is applied to record numbers icvrec/layer
5854 out of grdchk_loc so that they be passed to I/O routines.
2b983d7243 Jean*5855 o pkg/smooth:
5856 - fix recomputation that appeared with nlfs : use smooth_recip_hFacC,
5be1b702e4 Gael*5857 smooth_hFacW, smooth_hFacS (copied at init_fixed) in 3d case.
97ed0955b8 Jean*5858 o verification/testreport:
5859 - add option '-tlm' for Tangent-Linear test (-adm,-oad,-tlm are all exclusive);
5860 - can also use compressed (gzip) reference output file;
5861 - change format (in pkg/grdchk) of TLM output (+ add forward gradient)
5862 to be easier to collect by testreport.
5863 - update existing TLM output (half out-of-date by more than 3 yrs).
090e7aded7 Jean*5864 - report NETCDF & LAPACK settings (from genmake2) in output dir.
5865 - report run-time in each individual summary (previously only for AD test);
5866 for TLM test, add also TAF version.
5867 - add daily TLM test on (old) aces cluster + weekly test on baudelaire.
97ed0955b8 Jean*5868
5ea440c02d Jean*5869 checkpoint63r (2012/08/15)
5870 o tools/genmake2:
5871 - fix Makefile for target ftlall (+ update files to clean after make ftlall)
a7fab58b1c Gael*5872 o pkg/ecco/ecco_cost_final.F :
5ea440c02d Jean*5873 - fix fc print statements (to stdout and costfunction0000) so
a7fab58b1c Gael*5874 that the printed value is always after the global sum.
5875 o pkg/seaice/seaice_dynsolver.F :
5876 - fix ice strength assymptote at SEAICE_area_max<1
5877 (no change for the standard case of SEAICE_area_max=1)
f0c312b070 Jean*5878 o some cleaning:
5ea440c02d Jean*5879 - pkg source files: ensure that all *.F files from each pkg included the
f0c312b070 Jean*5880 corresponding ${PKG}_OPTIONS.h file (except stand-alone src file which
5ea440c02d Jean*5881 only includes CPP_EEOPTIONS.h); fix S/R CTRL_SMOOTH ; update AD experiment
f0c312b070 Jean*5882 code_ad/*.F src files; add new option-file in pkg/admtlm + corresponding
5ea440c02d Jean*5883 includes;
f0c312b070 Jean*5884 - model/src: add PACKAGES_CONFIG.h wherever ALLOW_AUTODIFF[_TAMC] is used.
5ea440c02d Jean*5885 - ALLOW_DIFFKR_CONTROL: add a stop in S/R CTRL_CHECK in case ALLOW_3D_DIFFKR
5886 is undef; also define /DYNVARS_DIFFKR/ common block in DYNVARS.h when
f0c312b070 Jean*5887 ALLOW_DIFFKR_CONTROL is defined, to allow to compile and reach this stop.
5888 - update option-file CPP_OPTIONS.h of all AD experiments:
5ea440c02d Jean*5889 * no longer include PACKAGES_CONFIG.h ;
5890 * includes ECCO_CPPOPTIONS.h if PACKAGES_CONFIG.h has been included ;
5891 * def/undef ALLOW_3D_DIFFKR independently of ALLOW_DIFFKR_CONTROL (before
f0c312b070 Jean*5892 including ECCO_CPPOPTIONS.h).
0185f8e796 Jean*5893 o pkg/cost, pkg/ctrl, pkg/ecco option-file:
5894 - clean-up and split content of old pkg/ecco/ECCO_CPPOPTIONS.h file into
5895 separated pkg option-file (done according to old doc from ECCO_CPPOPTIONS.h,
5896 not necessary accurate).
5897 - add a template for option-file ECCO_CPPOPTIONS.h, mostly empty, in
5898 pkg/autodiff, i.e., the 1rst pkg to compile for adjoint built, with lines to
5899 deliberately break compilation (a remainder that it needs to be customized)
5900 - in pkg/ecco, includes ECCO_OPTIONS.h instead of COST_OPTIONS.h
5901 - rename COST_CPPOPTIONS.h to COST_OPTIONS.h
5902 - rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h
5903 o tools/genamke2:
5904 - check for lapack.
53ea01923d Gael*5905 o pkg/cost and pkg/ecco : attempt to sort out some of the limiting intricacies.
0185f8e796 Jean*5906 - pkg/cost.cost_final.F : allow for use of pkg/ecco and pkg/cost cost functions
5907 jointly. The exclusive ifdefs were removed, to add costs terms (when defined)
5908 from both packages.
53ea01923d Gael*5909 - the fc global sum in pkg/ecco/ecco_cost_final.F was removed accordingly.
5910 - for objf_atl we use either the pkg/ecco or the pkg/cost term depending on CPPs.
0185f8e796 Jean*5911 - pkg/ecco and model/src : add CPP brackets around pkg/cost and pkg/ctrl includes
5912 of "CTRL_SIZE.h" "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly.
53ea01923d Gael*5913 o pkg/cost : add comments to explain special and/or untested setups.
6e25847946 Jean*5914 o pkg/exf:
5915 - use EXF_OPTIONS.h to set pkg/exf options except if done in ECCO_CPPOPTIONS.h
5916 (previously, ALLOW_AUTODIFF_TAMC was controling this switch).
5917 o verification/*/code_ad:
5918 mimimal cleaning of AD experiments ECCO_CPPOPTIONS.h option-file:
5919 - reccord when this file is included (define ECCO_CPPOPTIONS_H)
5920 - remove the most obvious obsolete features (e.g., #define ALLOW_COST not
5921 allowed since Oct 2003 in any option-file except in PACKAGES_CONFIG.h)
c67a77c8bb Gael*5922 o pkg/seaice :
6e25847946 Jean*5923 - added possibility to change ice strength/PRESS0 relationship to
5924 HEFF, according to the following run time parameters
5925 SEAICEpresPow0 :: HEFF exponent for ice strength below SEAICEpresH0 (integer, >0)
5926 SEAICEpresPow1 :: HEFF exponent for ice strength above SEAICEpresH0 (integer, >0)
5927 SEAICEpresH0 :: HEFF threshold for ice strength (m)
c67a77c8bb Gael*5928 o pkg/ggl90 :
6e25847946 Jean*5929 - added run time flag mxlSurfFlag to include the code that ensure
c67a77c8bb Gael*5930 mixing between first and second level (previously included as a comment)
135650b823 Gael*5931 o verification/1D_ocean_ice_column/input_ad/data.autodiff :
6e25847946 Jean*5932 - add test of newly added dumpAdByRec=T option where
135650b823 Gael*5933 we write all records to one file per variable.
5934 o verification/global_ocean.cs32x15/code_ad/CPP_OPTIONS.h :
5935 - switch to #define ALLOW_BALANCE_RELAX and ALLOW_BALANCE_FLUXES
5936 to check that this code is ok with taf and compiles in adjoint.
5937 o pkg/autodiff :
5938 - added run time param dumpAdByRec : ad dump format switch.
6e25847946 Jean*5939 If true then write all records to one file per variable.
5940 Else write one file per record (remains the default).
135650b823 Gael*5941 - revise seaice_ad_dump.F and exf_adjoint_snapshots_ad.F accordingly.
e9b3a4dec3 Gael*5942 o pkg/seaice:
5943 - Added SEAICEuseTILT run time switch : if set to
6e25847946 Jean*5944 false then omit the tilt term in seaice dynamics.
e9b3a4dec3 Gael*5945 - Fix free drift calculation.
a8eec7f730 Patr*5946 o pkg/shelfice:
6e25847946 Jean*5947 When initializing SHELFICEDragQuadratic, set default to be
5948 consistent with shiCdrag in case SHELFICEuseGammaFrict is used,
a8eec7f730 Patr*5949 but retain option to set it independently
5950 (inconsistenty spotted by Veronique Dansereau)
fe9611ab7a Jean*5951 o eesupp/inc:
5952 - in EEPARAMS.h, add real-type constant for some frequently used simple number
5953 (0,1,2,1/2), with name explicitly referring to RS/RL type.
5954 o model/src:
5955 - move balancing of relaxation terms to new S/R balance_relax.F.
9eb8003f99 Jean*5956 o pkg/autodiff:
5957 re-write active I/O high-level (control) S/R:
5958 - rename S/R ACTIVE_READ/WRITE_RL to ACTIVE_READ/WRITE_3D_RL
5959 - add 1 more argument (useCurrentDir) to replace the "_LOC" 2nd set of S/R.
5960 - use standard pkg/mdsio I/O routines (MDS_READ/WRITE_SEC_XZ/YZ and
5961 MDS_READ/WRITE_FIELD); change loops to multi-threads.
5962 - update and merge active_file_control_slice.flow into active_file_control.flow
5963 - update the calls in lower level S/R (active_file.F, active_file_g.F and
5964 active_file_ad.F) keeping the argument list and function unchanged.
ee91acaaf9 Jean*5965 - also update lower-level "_LOC" version (call same S/R with "useCurrentDir
5966 =.TRUE.") and remove high-level (control) _loc version (not called anymore).
75bd0a9954 Jean*5967 - new low-level active I/O routines, one for each type (RL/RS), for active var
5968 of various (XY,XZ,YZ) shape and level number (arguments: arrShape, myNr);
5969 fix ctrl_init_wet.F & ecco_cost_weights.F by calling the new S/R with the
5970 right type.
9eb8003f99 Jean*5971 o autodiff and RS=real*4:
5972 - call the right type (_RS instead of _RL) of S/R in few output S/R (pkg/exf
5973 ad-monitor and snapshots); disable arrType='RS' in mdsio_gl*.F ;
5974 - change argument type of 3-D mask argument to _RS to match type in the call
5975 (in seaice_cost*.F, ctrl_*_gen.F and *ctrl_bound.F); to be continued.
4cdea015c1 Jean*5976 o pkg/thsice:
5977 - re-anable balanceEmPmR when useSEAICE=T with useThSIce=T.
5978 - option to correct ocean fresh-water flux for imbalance of Atmos+Land
5979 fresh-water flux: uniform correction or proportional to local precip.
10741bb907 Patr*5980 o pkg/ctrl:
5981 - new header file CTRL_SIZE.h for parameters maxCtrlArr2D, maxCtrlArr3D
5982 - redefine CPP option ALLOW_BOTTOMDRAG_CONTROL to
5983 ALLOW_BOTTOMDRAG_CONTROL_NONGENERIC
5984 - verification/hs94.1x64x5/ tests ALLOW_GENARR{2D,3D}_CONTROL
4cdea015c1 Jean*5985
5ba9855446 Jean*5986 checkpoint63q (2012/07/30)
09b7b7656d Jean*5987 o pkg/autodiff:
5988 note about monitor and snap-shot of ad-variables:
5989 a) need to apply ADEXCH before monitor or output of ad-vars to include
5990 overlap contributions (was done for adjDump but missing for monitor).
5991 b) since ADEXCH implies adding overlap values to interior array, machine
5992 truncation error is expected when adding an ADEXCH call in the middle of
5993 the time-stepping (although mathematically identical).
5994 modifs:
4d079479ad Jean*5995 - fix some incorrect type (RL/RS, UV/scalar) in ADEXCH calls and ad-vars
5996 declaration (adEddyPsiX,adEddyPsiY in adcommon.h).
09b7b7656d Jean*5997 - add new run-time params (dumpAdVarExch & mon_AdVarExch) to select how to
5998 apply ADEXCH before monitor or snap-shot of ad-variables:
5999 =0 : no ADEXCH ; =1 : do ADEXCH ; =2 : apply ADEXCH on a local copy.
6000 - implement new method (copy+adexch) for snap-shot and monitor of main model
4d079479ad Jean*6001 ad-vars (initially not used by default -> output unchanged).
6002 - change default (set to 2) to use new method and update few output_adm.txt
6003 with accurate ad-monitor (global_ocean.90x40x15, tutorial_global_oce_biogeo
6004 and both tutorial_tracer_adjsens tests).
6005 - switch 2 global_ocean.cs32x15 AD-tests to AB-2 (seaice_dynmix & thsice)
6006 and turn off momDissip_In_AB in the 2 other (needed for stable AB-3).
01d011442e Patr*6007 o pkg/ctrl:
6008 enable the use of a variable number (maxCtrlArr2D, maxCtrlArr3D) of
6009 generic control variables via
6010 #define ALLOW_GENARR2D_CONTROL and/or #define ALLOW_GENARR3D_CONTROL
6011 Only required customization should be S/R ctrl_map_ini_genarr.F
6012 (routine in repository contains example)
7f14c670e9 Jean*6013 o pkg/exf:
6014 - fix and refine checking of surface-relaxation setting when using EXF
cda8c5ef00 Jean*6015 o verification (adjoint exp):
6016 - reduce length of simulation by half for experiment global_ocean.cs32x15
6017 (std, seaice & seaice_dynmix) and exp tutorial_dic_adjoffline; update output.
a2b6ec31fa Mart*6018 o pkg/mom_common (mom_u/v_bottomdrag), pkg/shelfice (shelfice_u/v_drag)
cda8c5ef00 Jean*6019 - replace if statements KE.ne.0 with KE.gt.0 to avoid sqrt of negative numbers
a2b6ec31fa Mart*6020 of KE that can occur with aggressive optimization
cda8c5ef00 Jean*6021 + put quadratic bottom drag calculation in separated loops (only done if
6022 using bottomDragQuadratic)
fb5ebe7993 Jean*6023 o model/src: CG2D_NSA
6024 - clean-up: stop if cg2dNormaliseRHS=T and AUTODIFF
6025 and replace GLOBAL_SUM calls with GLOBAL_SUM_TILE.
6026 - in test-exp that uses CG2D_NSA (bottom_ctrl & tutorial_tracer_adjsens),
6027 change cg2d residual target to be expressed in Wunits (=> do not normalise
6028 RHS ; this fix global_max Pb with TAF); update output.
04c0091821 Jean*6029 o verification/tutorial_tracer_adjsens:
fb5ebe7993 Jean*6030 improve parameter consistency (and get rid of warnings):
04c0091821 Jean*6031 - use deltaTFreeSurf=deltaTtracer (better with NonLin FreeSurf);
6032 - switch Temp Adv Scheme from 81 to 80 (no limiter since theta < 0 is physical)
6033 - use staggerTimeStep (for stability) in som81; use default rotation period.
0288336348 Jean*6034 o pkg/exch2:
6035 - with empty facet: fix compact-format (W2_mapIO=1) definition (was previously
6036 reset to 0 = 1 long line in X)
6037 o pkg/mdsio:
6038 - fix reading of dimensions from meta file for large-size domain
02de2b8dd0 Jean*6039 o model/src:
6040 - fix saltIsActiveTr setting for IdealGas eosType (eosType is 6 character long);
6041 - to refine CS-grid check, add logical flag "hasWetCSCorners": true if using
6042 Cubed-Sphere Exch with CS-corners inside the domain;
6043 make new S/R INI_GLOBAL_DOMAIN from code in ini_linear_phisurf.F to calculate
6044 globalArea and to set hasWetCSCorners.
6045 - add warning if usingCurvilinearGrid and momAdvection in flux-form (missing
6046 metric terms); stop if hasWetCSCorners=T and momAdvection in flux-form.
6047 - re-activate the stop if useCDscheme and hasWetCSCorners=T (previously if
6048 useCDscheme and useCubedSphereExchange).
b1b02f4641 Gael*6049 o pkg/seaice/seaice_growth.F :
02de2b8dd0 Jean*6050 - compute the SEAICE_DISABLE_HEATCONSFIX term accordingly
6051 for the (.NOT.useRealFreshWaterFlux).OR.(nonlinFreeSurf.EQ.0)
6052 when the previous code was not correct.
6053 - in all cases diagnoze the boundary condition mismatch to SIaaflux
6054 - in the case of useRealFreshWaterFlux.AND.(nonlinFreeSurf.GT.0) add
6055 that term to QNET (essentially to set the melt/freeze water to 0degC).
6056 when SEAICEheatConsFix is true, so that the ocean+ice budget heat is closed.
82e953e38c Gael*6057 o verification/global_ocean.cs32x15/input.seaice :
02de2b8dd0 Jean*6058 - add SEAICEheatConsFix in data.seaice, ensuring closed ocean+ice heat budget.
6059 - add diagnostics (commented out) for budget test using my matlab codes (gcmfaces).
6060 - update results (output.seaice.txt) accordingly.
82e953e38c Gael*6061 o verification/lab_sea/input/data.seaice :
02de2b8dd0 Jean*6062 - remove SEAICEheatConsFix, which is now be tested
6063 in global_ocean.cs32x15. The presently coded fix
6064 is only consistent with real fresh water + nlfs.
6065 - update results (output.txt) accordingly.
b0139591bd Gael*6066 o pkg/salt_plume: added diagnotic for salt tendency (oceSPtnd).
81055d8424 Jean*6067 o AD_CONFIG.h file:
02de2b8dd0 Jean*6068 - in genmake2: remove "#undef ALLOW_ECCO_OPTIMIZATION" from AD_CONFIG.h;
6069 - remove #include "AD_CONFIG.h" from all included OPTIONS files and
6070 add it explicitly in each fortran src file where it is needed.
6071 motivation: header file AD_CONFIG.h is generated/modified after "make depend"
6072 thus introducing potentially wrong dependency; therefore, better to include
6073 it only where it's really needed, and after any other included OPTIONS file
6074 (less tempting to bring conditional includes according to ALLOW_ADJOINT_RUN
6075 or ALLOW_TANGENTLINEAR_RUN).
81055d8424 Jean*6076
361210b820 Jean*6077 checkpoint63p (2012/07/06)
94af53ae23 Jean*6078 o pkg/autodiff:
6079 - rename S/R INI_AUTODIFF to AUTODIFF_INIT_VARIA ;
6080 - create new header file "AUTODIFF_PARAMS.h" for pkg/autodiff parameters
6081 which are now read from new parameter file "data.autodiff" (inAdExact
6082 previously in "data", use{KPP/GMRedi/SEAICE}inAdMode previously in data.pkg)
6083 - add file "data.autodiff" in all verification/*/input_ad/ directories.
6101a96b98 Jean*6084 - add run-time parameter to turn On/Off SEAICEuseFREEDRIFT in adjoint/forward
6085 mode (used in global_ocean.cs32x15.seaice_dynmix test exp.)
aa94224112 Patr*6086 o verification/tutorial_tracer_adjsens/
6087 - add extra sub-verification which uses "SOM" advection scheme
6088 (2nd Order-Moment Advection Scheme, Prather Limiter) with
94af53ae23 Jean*6089 #define GAD_ALLOW_TS_SOM_ADV in GAD_OPTIONS.h
aa94224112 Patr*6090 and in data:
94af53ae23 Jean*6091 multiDimAdvection=.TRUE.,
6092 tempAdvScheme=81,
6093 saltAdvScheme=81,
d3350d435b Gael*6094 o model/src:
6095 - introduce ALLOW_BALANCE_RELAX which allow the removal
6096 of the global mean of relaxation terms by setting
6097 balanceThetaClimRelax and balanceSaltClimRelax
361210b820 Jean*6098 - disable balanceEmPmR and balanceQnet in the case when useSeaice.
d3350d435b Gael*6099 This case is now treated appropriately in seaice_growth.F
6100 o pkg/seaice:
361210b820 Jean*6101 - do balanceEmPmR and balanceQnet based on the net fluxes
6102 (SItflux) that enter the ocean+ice system rather than QNET
6103 and EMPMR. Works best in real fresh water.
6104 - SIatmFW, SIatmQnet, and SItflux computations had to be moved
6105 out of the diagnotics bloc, and stored in global arrays.
aa94224112 Patr*6106
e03d424aa5 Jean*6107 checkpoint63o (2012/06/29)
7ea3641d7d Jean*6108 o vertical mixing schemes:
6109 - remove unused S/R CALC_BUOYANCY (left from branch-atmos merging)
6110 - replace computation of density (in Function STATE1, opps_calc.F) by a call
6111 to S/R FIND_RHO_SCALAR
6112 - pass sigmaR to S/R PP81_CALC, MY82_CALC (but not yet used) and to GGL90_CALC
6113 and use it for N^2 calculation in ggl90_calc.F (save 2 density computations);
6114 affects output (vermix.ggl90) at truncation level.
de24565c3d Jean*6115 o testreport:
6116 - change adjustment of SIZE.h for mpi+mth testing: preserve enough tiles
6117 (nSx,nSy) for the number of threads (from eedata.mth)
11491399e8 Jean*6118 o model/src:
6119 - remove 2nd set of calls at the top of initialise_varia.F (Adjoint part)
6120 related to Non_Lin Free-Surf or Bottom-Control (but not longer necessary).
f7139038cb Patr*6121 o verification/tutorial_tracer_adjsens/
6122 - compile with ALLOW_CG2D_NSA
6123 - run with nonlinFreeSurf=3
6124 - update reference output_adm.txt
69c15f0fc5 Jean*6125 o tools/genmake2:
6126 - add "-DHAVE_NETCDF" to the DEFINES list when NetCDF is available ;
6127 refine usePROFILES switching off (only when NetCDF is not available).
781a2dcf80 Jean*6128 o verification (atmospheric set-up):
6129 - change eosType='IDEALGAS' to eosType='IDEALG' to match variable declaration
89f2ec68ea Gael*6130 o pkg/profiles : refine profiles and files handling.
6131 o model/src and pkg/ecco : introduce run-time switch usePROFILES.
c8b7080413 Gael*6132 o model/src/the_main_loop.F, forward_step.F and pkg/exf/EXF_OPTIONS.h :
6133 - changes to use model/src/the_main_loop.F rather than the ecco version
6134 in ecco type adjoint runs.
18d45ae82f Jean*6135 o model/src:
781a2dcf80 Jean*6136 - move computation of recip of grid distance & area from INI_MASKS_ETC to INI_GRID
6137 - move setting of h0Fac[C,W,S] from INI_LINEAR_PHISURF to INI_MASKS_ETC
6138 - update_masks_etc.F: rename SMOOTH*_R4,R8 function to the corresponding type (RS,RL)
6139 o model/src:
6140 - fix S/R UPDATE_CG2D for ALLOW_DEPTH_CONTROL case (was empty before);
18d45ae82f Jean*6141 update output of test experiment bottom_ctrl_5x5.
d8428293bd Jean*6142 o pkg/generic_advdiff:
6143 - implement vertical bi-harmonic diffusion (for now, only for T & S and
6144 only explicitly).
1beab3301f Patr*6145 o verification/bottom_ctrl_5x5/
6146 update reference output (results changed quite some time ago,
6147 not sure when; but new reference results look ok in terms of grdchk)
2478d50aeb Patr*6148 o verification/1D_ocean_ice_column/
6149 For verification purposes, the exact adjoint rather than an approx.
6150 should be used (e.g., to comare against F.D. or TLM).
6151 removed autodiff_inadmode*_ad.F routines in code_ad/
6152 Update results/ accordingly.
2889362499 Jean*6153 o pkg/cal:
6154 - change cal_getdate.F so that output date is function of input time only
6155 (less ambiguous, not mixed up with input iteration number).
6156 - fix calendarDumps for non-zero phase-lag (S/R CAL_TIME2DUMP).
3078ffbadd Jean*6157 o pkg/diagnostics:
6158 - implement calendarDumps also for stats-diags
6159 - implement calendarDumps also for snap-shot output (negative freq)
6160 - for now, ignores calendarDumps if non-zero phase-lag.
6161
fb29d0ce0b Jean*6162 checkpoint63n (2012/06/04)
e2c4129169 Jean*6163 o model/src:
6164 - recompute rSurfW & S to ensure consistent column thickness (needed for rStar)
6165 between Sum_k(hFac*drF) and rSurf-rLow, for now only when using pkg/shelfice;
95205589aa Jean*6166 - use h0FacC, W & S to compute hFac_surfC, W & S in calc_surf_dr.F (more
6167 similar to calc_r_star.F); update results of experiment internal_wave and
e2c4129169 Jean*6168 tutorial_global_oce_in_p (affected @ truncation level).
6169 o pkg/shelfice:
6170 - add parameterisation of advective-diffusive flux into the ice shelf
c1ef53a9f3 Mart*6171 according to Holland and Jenkins (1999), eq.22-33, as suggested by Jan De Ryd
6172 - simply eps3/3a computation
83625f7fb2 Jean*6173 o eesupp:
6174 - add new CPP option (DISCONNECTED_TILES) to disconnect tiles (no exchange
6175 between tiles, just fill-in edges assuming locally periodic subdomain) and
6176 add corresponding exchange subroutines (EXCH0);
6177 - new CG-solver version (_EX0) for disconnected-tiles special case.
30e5f8e0a0 Jean*6178 o model/src (CG-solvers):
6179 - modify Single-Reduction version (CG2D_SR) in case cg2dMaxIters is reached
6180 (similar final residual output and max-Iter number as with standard version);
6181 - allows to store and use lowest-residual solution (standard & _SR versions);
6182 - cleaning up (remove old, commented out code, LETS_MAKE_JAM ...).
6183 - by default, also compile CG2D_SR version (define ALLOW_SRCG in CPP_OPTIONS.h)
6184 o eesup/src:
6185 - global_vec_sum.F cleaning: add a BARRIER ; update comments ; remove ndef
6186 ALWAYS_USE_MPI (no longer needed after fixing usingMPI settings - March 2012)
0f5e9791d2 Patr*6187 o pkg/salt_plume added to lab_sea/input_ad.noseaicedyn
6188
b4f2dc2460 Jean*6189 checkpoint63m (2012/04/27)
fa1b72b057 Jean*6190 o pkg/shelfice:
6191 - account for partical cells in surface level below ice-shelf for hydrostatic
6192 pressure calculion (set uniformFreeSurfLev to F); update isomip experiments.
f74931b354 Jean*6193 o ad test experiments:
6194 - update and rename to "ad_optfile.local" local AD-optfile specific to a
6195 particular adjoint verification experiment (in verification/*/code_ad/)
fb5f9f12be Patr*6196 o pkg/seaice & pkg/exf:
f74931b354 Jean*6197 - Part two of ECCO-CLIVAR code merges.
fb5f9f12be Patr*6198 Completes merge of seaice area relax. code.
6199 Requires unified CPP option EXF_ALLOW_SEAICE_RELAX
6200 to be set in EXF_OPTIONS.h since this pkg controls its I/O
6201 (and avoids second CPP option in SEAICE_OPTIONS.h)
f74931b354 Jean*6202 - change default value of costIceStart & costIceEnd to a valid date.
f053446eb2 Dimi*6203 - add snowPrecip to HSNOW in seaice_growth
2db9a89c59 Jean*6204 o pkg/ptracers:
6205 - move ptracers summary and setup check into separated S/R ; add a check for
6206 valid PTRACERS_Iter0 value (error+stop or just warning).
9afd0876bd Jean*6207 o pkg/cal (+ pkg/ecco):
6208 - avoid calling a S/R with 2 times the same arg (FWD: unless both are only used
6209 as input; and for AD, unless both are not differentiable (e.g., k index)).
546970fc27 Jean*6210 o model/src:
6211 - define internal flag "uniformFreeSurfLev" (=T when free-surface level-index
6212 is everywhere k=1) to speed-up some calculations (by pass kSurf reference);
6213 temporary set to usingZCoords value (to be changed to F when using shelfice).
6214 - hydrostatic pressure: implement partial cell near the surface also for
6215 Z-coordinates (for the case where uniformFreeSurfLev=F); replace test on
6216 usingZCoords with test on uniformFreeSurfLev where needed (in NonHyd code).
6217 o pkg/ctrl/ctrl_init.F:
6218 - add a formal parameter to s/r ctrl_init_rec to print
d993cf017d Mart*6219 xx_$(ctrl_valiable)_file for easier debugging
6220 - move call of cal_* routines into the if-block where they are really
546970fc27 Jean*6221 needed so that xx_$(ctrl_variable)_period can be 0 or -12 without having
d993cf017d Mart*6222 to specify a startdate
5b4194ac9e Jean*6223 o pkg/seaice:
6224 - update comments in SEAICE_OPTIONS.h (+ similar update of lab_sea/code and
6225 global_ocean.cs32x15/code versions).
6226 - turn on seaice Multi-category (in data.seaice, SEAICE_multDim=7) for
6227 verification experiment global_ocean.cs32x15.seaice and update results.
0c1f58d8ac Jean*6228 o pkg/exf:
6229 - new S/R EXF_GETFIELD_START to return starting-time of a forcing field
6230 (according to useExfYearlyFields).
e876af632a Jean*6231 o pkg/cal:
6232 - move calendar setting & summary (previously in cal_readparams.F) into new
6233 S/R CAL_INIT_FIXED to be called later in the initialisation process, once
6234 length of the simulation is set (after SET_PARMS call); This is an attempt
6235 to fix Pb when, e.g.: pkg/longstep, modifies the length of the run.
6236 - For safety: keep a record of pkg/cal parameter settings status
6237 to allow to STOP if one pkg/cal S/R is called too early.
0c1f58d8ac Jean*6238 - add a stop in all basic pkg/cal subroutines if called before setting is done.
6239 - modify cal_getdate.F: stop when nothing was returned;
6240 if called with myIter=-1, simply retrun modelBaseDate (1,2 = startDate_1,_2);
6241 this allows to remove "cal.h" from seaice_read_parms.F & init_mnc_vars.F.
e876af632a Jean*6242
c0d26944d6 Jean*6243 checkpoint63l (2012/04/04)
39e65f8d9e Jean*6244 o pkg/bbl:
6245 - fix call to FIND_RHO_2D in bbl_calc_rho.F (case multi-tiles per proc);
6246 update global_with_exf output.yearly.txt file.
ceea6e3706 Jean*6247 o pkg/cal:
6248 - start to clean-up cal_set.F ; fix for the case where baseTime is non-zero.
6249 - remove 2 unsused and very short (1 line only) functions ;
6250 - remove unsused subroutines from AD-Diff list.
e8bf169f85 Jean*6251 o model/src:
6252 - start to implement clean wait to stop in initialization S/R (config_check.F,
c0d26944d6 Jean*6253 packages_check.F, ini_parms.F and pkg/obcs/obcs_check.F + pkg/mypackage)
e8bf169f85 Jean*6254 o folowing PRINT_MESSAGE changes:
6255 - remove reminder multiple print to the same file (STDOUT) when multi-threads.
28ed837189 Dimi*6256 o pkg/bbl:
6257 - modification so it can work with z*
6258 - replace deltaT with dTtracerLev(k) for asynchronous time stepping
6259 - global_with_exf/input.yearly verification; changes output.yearly.txt
c064649ac0 Jean*6260 o eesupp/src:
6261 - PRINT_MESSAGE: use OpenMP critical instruction (similar to PRINT_ERROR);
6262 writing to unit 0 (if unit=errorMessageUnit) extended to the case myThid=1
6263 - CHECK_THREADS: specific code if using OpenMP threading: improve checking of
6264 # of threads across processors (e.g., different env OMP_NUM_THREADS setting)
6265 - improve special preliminary call to EESET_PARMS (if eedata is read 2 times).
6266 - when using MPI, always set usingMPI=T ; set default accordingly and stop
6267 if not consistent.
6268 - ALL_PROC_DIE: add a BARRIER after MPI_FINALIZE call ; skip this when thread
6269 argument is zero (in case called within single-thread section).
45e37a1efd Jean*6270 o pkg/fizhi:
6271 clean-up turbulence cold-start switch: decided in fizhi_init_vars.F, stored
6272 in common bloc (fizhi_coms.h) and then passed as argument up to S/R TURBIO.
12a35945df Jean*6273 o pkg/exch2:
6274 - add argument "updateCorners" to S/R exch2_get_uv_bounds (enable to
6275 activate EXCH_IGNORE_CORNERS in vector EXCH S/R).
6276 - switch 1rst EXCH call to IGNORE_CORNERS (instead of UPDATE_CORNERS)
6277 but keep the 2nd with UPDATE_CORNERS: this prevents overwriting good data
6278 with bad ones coming from a not-yet-updated halo.
6279 This should fix the problem when sNx <> sNy and GCD(sNx,sNy) < 2*Olx.
bb86b07795 Dimi*6280 o pkg/frazil:
12a35945df Jean*6281 move FrzForcT diag from frazil_diagnostics_state.F to frazil_calc_rhs.F
6282 http://mitgcm.org/pipermail/mitgcm-devel/2012-March/005384.html
16e5bb3e87 Mart*6283 o model/src/config_check.F: add a check for OLx>sNx/OLy>sNy
709f986fa5 Patr*6284 o verification/lab_sea
6285 * #undef SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING
6286 * #define ALLOW_SST_CONTROL & ALLOW_SST_CONTROL
6287 * nTimeSteps 3 -> 4
6288 * changed reference output accordingly
6289 o pkg/ctrl:
6290 * fix ctrl_get_gen for xx_sst, xx_sss
0a88b6db42 Jean*6291 o pkg/fizhi:
6292 - fix 2 calls to S/R GRD2MSC (argument igrd) in update_earth_exports.F
6293 update results of exp. fizhi-cs-32x32x40 (fail with only 6 digits for cg2d)
6a018349c4 Jean*6294 - by default, use new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE);
6295 fix few out-of-bounds indices in referencing vars (initialise igrd to 1);
6296 clean-up fizhi_turb.F (remove unused & uninitialised qdiaglsm array).
4afb828a3b Jean*6297 o pkg/gmredi:
6298 - add diagnostic of Redi (main diagnonal) vertical diffusive flux of Temp
e39d8c1644 Jean*6299 o pkg/fizhi:
6300 - fix few initialisation and multi-tile Pb: aqualev & gridalt now pass the
6301 (old)aces open64 tuv test.
fe82383027 Dimi*6302 o pkg/icefront: fix bug and reorder loop in icefront_init_varia.F
55118a358d Jean*6303 o pkg/mom_vecinv:
6304 - fix 1 loop range in mom_vecinv.F to be like all the other loops which
6305 set/update gu,gv/Diss (fix Pb of uninitialised fVerUkp in admom_vecinv
6306 with non-lin free-surf).
6307 o model/src: move k-loop outside of i/j-loops when (re-)computing R_low
6308 in ini/update_masks_etc.F in order to avoid -O3 optimization problems with
a826ffe6b9 Mart*6309 some compilers (gfortran 4.6.0 on MacOS)
71f40693ee Jean*6310 o momentum:
6311 - separate fVer?(:,:,kUp) & fVer?(:,:,kDown) in argument list of MOM_FLUXFORM
6312 & MOM_VECINV subroutines (to help TAF). This fixes Pb of uninitialised
6313 fVer?(kUp) in admom_fluxform with non-lin free-surf or bottom control.
6314
104669e183 Jean*6315 checkpoint63k (2012/03/17)
ecdd0492fa Jean*6316 o model/src:
6317 - selectAddFluid (ALLOW_ADDFLUID): add missing term in horizontal momentum
6318 flux-form (mom_fluxform.F) and vertical momentum (calc_gw.F) equations.
6319 - SOLVE_DIAGONAL: switch default to use adjoinable & vectorized version
6320 (#undef SOLVE_DIAGONAL_LOWMEMORY); update output of exp. front_relax.bvp.
20e7fd8d99 Jean*6321 o model/src: solve_*diagonal.F
6322 - replace division with multiplication by inverse (similar to original version)
de7acf9ff6 Jean*6323 update output of AD exp. global_ocean.90x40x15.
20e7fd8d99 Jean*6324 - fix pkg/gmredi/gmredi_calc_psi_bvp.F & pkg/ggl90/ggl90_calc.F
6325 to enable the use of the vectorized & differentiable solve_tridiagonal.F
de7acf9ff6 Jean*6326 - test exp. global_ocean.90x40x15/input_ad: switch to advection scheme 20 for
6327 vertical advection (to get solve_tridiagonal tested in AD mode).
20e7fd8d99 Jean*6328 o pkg/seaice: ECCO-CLIVAR merge:
6329 1. seaice AREA relaxation
65e93cc4f0 Patr*6330 * CPP option: SEAICE_ALLOW_AREA_RELAXATION
6331 * runtime flag: SEAICE_tauAreaObsRelax
20e7fd8d99 Jean*6332 2. modified global mean cost imbalance code: CPP option
6333 ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION
b0f7f403cf Patr*6334 o another iteration on solve_*diagonal.F
20e7fd8d99 Jean*6335 Make choices independent of AUTODIFF
6336 Default will be the adjoinable vectorized version.
6337 Alternative choices are:
6338 * non-adjoinable original version with low memory footprint:
6339 #define SOLVE_DIAGONAL_LOWMEMORY
6340 * still adjoinable but does not vectorize (k as inner-most loop):
6341 #define SOLVE_DIAGONAL_KINNER (keeping SOLVE_DIAGONAL_LOWMEMORY undef)
49c840e1d0 Jean*6342 o testreport
6343 - add option to use a home made wrapper around "make"
6344 - remove MITGCM_IEEE env. variable (no longer active)
fa18eab287 Mart*6345 o pkg/shelfice
6346 - improve computation of friction velocity for velocity dependent
6347 exchange coefficients: include velocities into SHELFICEBoundaryLayer
6348 block to average velocities vertically
6349 - add TAF store directives for SHI_ALLOW_GAMMAFRICT
ac52667c1a Patr*6350 o Modify diagonal solvers, now three versions (upon request):
6351 #ifndef SOLVE_DIAGONAL_AUTODIFF
6352 1. default version (dating back a while ago)
6353 #else /* def SOLVE_DIAGONAL_AUTODIFF */
6354 # ifdef SOLVE_DIAGONAL_KINNER
6355 2. adjoinable version with k-innermost loop (G. Forget)
6356 # else
6357 3. adjoinable vectorized version of 2.
6358 # endif
6359 #endif /* SOLVE_DIAGONAL_AUTODIFF */
6360 All flags are currently set within routines, but could/should be moved to CPP-options.
6361 Array bounds for 1. are as before, for 2.,3. cover the entire domain
6362 (could be changed for 1. too).
cc29266a93 Jean*6363 o verification/lab_sea (fwd):
6364 - update the 4 fwd lab_sea test experiment: no longer SEAICE_GROWTH_LEGACY,
6365 use 7 categories (except hb87), new solve4temp params (except salt_plume),
6366 constant salinity (=4) or variable salinity (salt_plume) done through
6367 SItracer.
05513da3da Jean*6368 o pkg/seaice:
6369 - rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0;
6370 - remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t,
6371 SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz)
6372 from SEAICE_PARMS.h ; still need to fix seaice_cost_sst.F (broken when
6373 SEAICE_freeze got retired) but already better than previously with
6374 SEAICE_freeze=123456.7 deg.C;
6375 - move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS
6376 (safer multi-threaded setting); always set SEAICEuseEVP;
6377 - setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to
6378 SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report);
6379 stop if multiple specifications for the same coeff; make sure default
6380 SEAICE_mcPheePiston is compatible with drF(1) & deltaT.
e6a9f2bf3c Jean*6381 o pkg/obcs:
6382 - allow to switch to upwind 1rst order advection scheme for the advective
6383 flux computation at the open-boundary; disabled for adjoint built.
e5a3138db8 Jean*6384 o pkg/ptracers:
6385 - rename PTRACERS_RESTART.h -> PTRACERS_START.h
6386 - rename ptracers_fields_blocking_exchanges.F -> ptracers_fields_blocking_exch.F
6387 - add parameter to decide when to start a tracer; use internal flag to
6388 know which tracer to step-forward; switch this internal flag at the top
6389 of forward_step.F (new S/R PTRACERS_SWITCH_ONOFF); for now, not enabled
6390 for adjoint built.
3e983913d2 Jean*6391 o pkg/seaice:
6392 - add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ;
6393 - move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ;
6394 - keep experiment offline_exf_seaice truly single category (set MULTDIM=1).
ecde946d49 Jean*6395 o pkg/ecco:
6396 - fix writing of output file DiagnosCost_ClimSalt/Theta
6397 and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc).
3e983913d2 Jean*6398 o pkg/seaice:
e8787c77e2 Jean*6399 - add missing initialisation of COR_ICE array in dynsolver.F
6400 - merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is
6401 compiled either way, and is tested in all exps (multidim was only tested
6402 in lab_sea ad before).
6403 - cosmetic change to prepare for future addition of ITD. no change to results.
6404 no defaults change.
4ed98c0a60 Gael*6405 - added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise).
e8787c77e2 Jean*6406 - by lack of adequate verification experiments, I further used custom versions
6407 of global_ocean.cs32x15 to test multicat or not, with pickup or not. All
6408 should be correct.
4ed98c0a60 Gael*6409 - avoid recomputations in ad.
7c31770a0d Jean*6410 o array initialisation in adjoint mode:
6411 1) pkg/mom_common/mom_calc_ke.F:
6412 add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC):
6413 The S/R which calls MOM_CALC_KE initialises KE but in some recomputation
6414 part this initialisation is gone, resulting in Floating Point Exception
6415 (caught by open64 compiler with debug option).
6416 2) model/src/convective_weights.F
6417 set output convectCount over the full array range (instead of doing
6418 an update): this fix a similar issue when called within recomputation (adjoint)
6419 which could by-pass the initialisation (normally done in the caller S/R).
6420 o pkg/seaice:
c5b170d8ca Gael*6421 - final version of turbulent flux params, as agreed at MIT ice meet:
6422 SEAICE_mcPheePiston (default is ~ 0.000875)
6423 SEAICE_mcPheeTaper (default is 0.)
6424 SEAICE_frazilFrac (defualt is 1.)
6425 SEAICE_mcPheeStepFunc (default is false)
610e3cd50d Dimi*6426 - changes results at trunction error level
6427 - ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo
7c31770a0d Jean*6428 o added pkg/frazil:
6429 - see frazil_description.tex for details
a7657da9ef Dimi*6430 - verification experiment is global_with_exf/input.yearly; changes output.yearly.txt
bc661abca1 Mart*6431 o pkg/shelfice/shelfice_thermodynamics.F
7c31770a0d Jean*6432 - fix exponents for velocity dependent exchange coefficients: change
bc661abca1 Mart*6433 from 2/3(=0) to 0.66666666666666667
7c31770a0d Jean*6434 - move computation of velocity dependent exchange coefficients into
bc661abca1 Mart*6435 separate loop, so that it applies to both thermodynamics
6436 - move some divisions by constants out of loops
6437
3d1eabb9e3 Jean*6438 checkpoint63j (2012/02/16)
6439 o pkg/seaice:
6440 - overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc.
6441 - SItracer: added run time params, and allow coupling to ocn salinity.
df0f758af6 Jean*6442 o pkg/seaice: remove (almost) all divisions by constants within loops
6443 in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d
a54a2ad240 Mart*6444 results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only
df0f758af6 Jean*6445 those, caused by 1/QI -> recip_QI) -> update output.seaice.txt,
6446 output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt
6447 o pkg/seaice :
3d1eabb9e3 Jean*6448 - simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula
6449 = 1 or 2, using newly added run time parameter SEAICE_availHeatTaper.
84662a0e96 Gael*6450 - fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148.
df0f758af6 Jean*6451 - add permanent SItflux diag that corresponds to TFLUX but includes
3d1eabb9e3 Jean*6452 ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget.
df0f758af6 Jean*6453 - allow activation/testing of a fix for suspected missing term in
3d1eabb9e3 Jean*6454 ocn-ice heat budget (to be confirmed). To test this, you want to
6455 undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param
6456 SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic.
84662a0e96 Gael*6457 - no change in results, fwd or ad.
3d1eabb9e3 Jean*6458 o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below:
df0f758af6 Jean*6459 - switch to variable freezing point.
dbf649edf9 Gael*6460 Results change : cg2d -> 1 digits; ad -> 3-6-6 digits.
6461 - bug fix : the sublimation term that was missing is now activated.
6462 Results change : cg2d -> 2 digits; ad -> 8-6-6 digits.
df0f758af6 Jean*6463 - bug fix : flooding sign term for SIsal0.NE.0.
dbf649edf9 Gael*6464 Result change : cg2d -> 8 digits; ad -> 11-12-9 digits.
6465 o pkg/seaice:
6466 - unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT
3d1eabb9e3 Jean*6467 is now the default, and the old default constant freezing point is recovered
6468 with SEAICE_tempFrz0 = -1.96,
6469 SEAICE_dTempFrz_dS = 0.,
6470 - retire SEAICE_freeze (= the old way of specifycing the constant freezing point)
dbf649edf9 Gael*6471 - remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there.
df0f758af6 Jean*6472 - bug fix (thanks to M. Losch) : the sublimation term that was missing is now
3d1eabb9e3 Jean*6473 activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM.
df0f758af6 Jean*6474 - bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211)
3d1eabb9e3 Jean*6475 was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail).
df0f758af6 Jean*6476 - bug fix (thanks to O. Jahn) : area loss for melting got messed up in
3d1eabb9e3 Jean*6477 seaice_growth r149 for legacy branch (no results change).
6478 - introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code
6479 from I. Fenty).
6480 - results did not change except for global_ocean.cs32x15, mostly due to the
6481 switch to variable freezing point (see above item for detail).
74dd18420e Jean*6482 o pkg/thsice:
6483 - fix and simplify interface to salt_plume pkg ; diagnose directly amount of
6484 seawater freezing in thsice_calc_thickn (not used).
c2dec35684 Gael*6485 o pkg/seaice: turbulent flux term specification via run time params.
6486 - replace CPP switches with run time switches to facilitate testing
3d1eabb9e3 Jean*6487 - retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX,
6488 GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
c2dec35684 Gael*6489 - added runtime parameter : SEAICEturbFluxFormula
6490 - move Mcphee constants to SEAICE_PARAMS.h
6491 - seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula;
3d1eabb9e3 Jean*6492 SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply);
6493 remove seaice_summary call (moved to seaice_init_fixed)
74dd18420e Jean*6494 - seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on
6495 SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms)
3d1eabb9e3 Jean*6496 - seaice_summary.F : add missing report of read turbulent flux term set up
6497 and SITRACER.
6498 - seaice_check.F : check range; inform and stop if retired CPPs are used
6499 (incl. SEAICE_AGE).
74dd18420e Jean*6500 - seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without
3d1eabb9e3 Jean*6501 CPP switch, same computation as before for the different options.
c2dec35684 Gael*6502 - change results at the truncation level.
1a36f96c43 Jean*6503 o pkg/seaice:
6504 - remove un-used parameters LAD & MAX_TICE ; add new run-time parameters:
6505 useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and
6506 SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY.
6507 - update verification/*/input*/data.seaice:
6508 to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY
6509 code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ;
6510 and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code,
6511 set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0.
5355c2bbd8 Jean*6512 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY):
6513 - remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same
6514 algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0);
6515 difference in results only due to machine truncation.
6516 - remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using
6517 MaykutPolySatVap; keep MIN_LWDOWN.
6518 - adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation.
6519 - update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87,
6520 + 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits).
f1369fd6d4 Jean*6521 o pkg/salt_plume:
5355c2bbd8 Jean*6522 - isolate saltPlumeFlux array exch into a specific S/R called from
6523 do_oceanic_phys.F
6524 - add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice.
f1369fd6d4 Jean*6525 o verification:
5355c2bbd8 Jean*6526 - move untested set-up to MITgcm_contrib/verification_other.
4a20d767d7 Jean*6527 o pkg/seaice:
ba96883e1a Gael*6528 - retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER.
6529 o pkg/seaice:
4a20d767d7 Jean*6530 - seaice_solve4temp.F (keeping results unchanged):
6531 * add 2 future run-time params to select which saturation vapor pressure
6532 formula is used and how post-iteration fluxes are set.
6533 Temporary set these 2 params according to option SOLVE4TEMP_LEGACY;
6534 * New piece of code (not used) to update surf. atmos. heat flux F_ia using
6535 the linearized expression to stay consistent with tsurf finding.
6536 - seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x
6537 can be < 0.
2953de52a5 Jean*6538 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef):
6539 - remove from F_ia (and from it's derivative dFiDTs1) the contribution of
6540 conductive heat flux F_c , and add it explicitly when updating tsurf as
6541 solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf
6542 so that now F_ia has a consistent meaning through the entire routine.
6543 This causes differences at truncation level: update output of fwd exp.
6544 global_ocean.cs32x15.seaice.
0c26ee70ab Jean*6545 o pkg/seaice:
c714f5b2dc Jean*6546 - lots of editing/cleaning in seaice_solve4temp.F + better documentation
6547 of arrays, sign/direction of fluxes; no effect on results.
6548 - replace hard coded 273.16 (=previous value of celsius2K) by celsius2K
6549 in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part);
6550 note: this should have been done before changing celsius2K default.
6551 - to keep results unchanged, add back old value of celsius2K in verification
6552 exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs
6553 - replace hard coded seawater freezing temp in seaice_solve4temp.F (part
6554 SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default
6555 value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater
6556 freezing temp is consistent with value in seaice_growth.F ; this causes
6557 differences at machine truncation level: update lab_sea AD output (3/4).
6558 o pkg/seaice:
0c26ee70ab Jean*6559 - mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask
6560 and climsst/sss even when using seaice (to prevent calculation that might
6561 use SST on land); does not affect any verification exp.
6562 - apply mask to taux,tauy (in seaice_get_dynforcing.F); update output
6563 of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix.
4091800f77 Mart*6564 o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness
6565 over land (non-legacy code)
0c26ee70ab Jean*6566 o vectorize salt_plume package:
d797683660 Mart*6567 - add extra code to salt_plume_frac and salt_plume_tendency_apply_s
6568 - this code computes plumebk everywhere (also over land), thus requires
6569 code to avoid divisions by zero and catch the case of kLev=Nr.
6570 - efficiency of salt_plume_frac is still sub-optimal
a355e8fb2b Jean*6571 o tools (genmake2):
6572 - fix makefile NAME specification (option: -makefile NAME) by adding
6573 "-f $MAKEFILE" in few places where it was missing including makedepend
6574 command (contribution from Paul).
6575
6b11434b7a Jean*6576 checkpoint63i (2012/01/24)
fcc1645548 Jean*6577 o model/src:
6b11434b7a Jean*6578 - add factorized versions of some EOS code to find_rho.F,
23bdfc896d Mart*6579 define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX)
6b11434b7a Jean*6580 o model/src:
fcc1645548 Jean*6581 - add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h;
6582 - change default celsius2K from 273.16 to 273.15
6583 - to keep results unchanged, add back old value of celsius2K in verification
6b11434b7a Jean*6584 exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd),
6585 global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm).
b730078f53 Mart*6586 o model/src: add a little initialisation trick to find_rho.F and find_alpha.F
6587 to make TAF generate vectorizable code
6588 o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows.
6589 Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers
6590 have flags that do this more efficiently.
70ade2cedc Mart*6591 o pkg/diagnostics/diagstats_calc.F
6592 - for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact
bd19520b1a Jean*6593 o pkg/obcs (with exch2):
6594 - derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F)
6595 and remove code (in obcs_readparms.F) which was based on EXCH of indices
6596 (through buffer) and did not account for exch2 (e.g., CS-grid) topology.
5759772599 Jean*6597 o pkg/exf and seaice exp:
6598 - change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0)
6599 so that switching off area & heff advection flags does not affect results.
6600 - change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h
19182668ca Jean*6601 - keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef
6602 EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update
6603 results of verification experiments: 1D_ocean_ice_column(fwd),
6604 global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8)
6605 and offline_exf_seaice (all 4).
fac86b0a61 Jean*6606 o pkg/seaice:
6607 - remove array YNEG, RIVER, TMIX (replaced by local var) from common block;
6608 remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef.
6609 - fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY)
6610 but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and
6611 not multi-dim advection;
6612 - fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and
6613 SHORTWAVE_HEATING #undef.
89b3de8a81 Mart*6614 o optim: make Makefile more robust (?)
7e9d85ac6b Patr*6615 o pkg/obcs:
6616 * fix treatment of obcs_read_pickup for TAF
fac86b0a61 Jean*6617 o pkg/shelfice:
7e9d85ac6b Patr*6618 * add missing initialisation of num_shifwflx
6619 * new adjoint verification exp. for isomip
6620 * change Prandtl and Schmidt numbers from generic formulations
fac86b0a61 Jean*6621 (in terms of model diffus. and visc.) to separate runtime
7e9d85ac6b Patr*6622 parameters, with Holland and Jenkins (1999) default values.
85fbbba158 Jean*6623 o pkg/exf (interpolation):
6624 - extended input field (2 rows) near the N & S poles:
6625 * fill in with the symetric value (when even Nb of data in longitude)
6626 * add average value at the poles only for scalar quantities ; for vector
6627 component interpolation, skip the averaging and keep duplicated values,
6628 unless the 2 components have same location (uvInterp=T) in which case
6629 interpolate the 2 components together using S/R EXF_INTERP_UV.
6630 - new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field
6631 together: this allows to account properly for local orientation when
6632 averaging at N & S pole.
6633 - add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding
6634 exf-interpolation near N & S poles. Undef by default.
6635 - add debug check/print on 1rst iter if debugLevel >=2.
45bd772f0f Jean*6636 o pkg/exf:
6637 - change masking flags definition (no longer "parameter"), put them in
6638 common block and set them in S/R EXF_INIT_FIXED.
6639 - change recognized masking flag from s,u,v to c,w,s since the mask
6640 to use (maskC,W,S) depends on position on model grid and has little to
6641 do with scalar/vector difference; fix masking if using P-coordinates.
6642 - fix masking of wind-stress (was wrong if interpolated or read on A-grid)
6643 and update results of exp. global_with_exf (x2).
6644 - fix setting of zenith-angle table when SHORTWAVE_HEATING is undef.
dd08a0bdad Mart*6645 o pkg/obcs
6646 - S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate)
473f3cfaa4 Jean*6647 o pkg/exf (interpolation):
6648 - assume periodicity in X only if input field cover full longitude range.
6649 - improve search for lat. index (supposed to be faster, in ~log2(ny) steps,
6650 and should vectorise).
6651 - fix input lat of the 2 added row (in case we provide N.pole data).
6652
afd13745c6 Jean*6653 checkpoint63h (2011/12/30)
d0a750d46b Jean*6654 o pkg/seaice:
6655 - change declaration of UVM from _RL to _RS in order to get B-grid
6656 uIce,vIce monitor when _RS = real*4
35af42145b Jean*6657 o pkg/offline:
6658 - new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags);
6659 - compute vertical velocity if not read from file (switch on exactConserv
6660 & staggerTimeStep);
6661 - fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq.
02149d96ab Jean*6662 o verification:
6663 - update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input)
6664 with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m":
6665 fix Pb in yG definition @ 2 missing corners (previously yG was averaged);
6666 - update output of exp. global_ocean.cs32x15.viscA4 after changing
6667 grid-file angles (used here for coriolis-3d);
6668 - remove (or gzip) few files not needed to run fizhi-cs experiments.
473f3cfaa4 Jean*6669 o pkg/exf (vector interpolation):
4ee3919357 Jean*6670 - rotate vector component toward local grid-axis orientation using grid-angles
6671 (stored in GRID.h) instead of locally computed rotation angle; keep old code
6672 available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default).
6673 o pkg/seaice:
6674 - allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION
6675 undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined.
5803321947 Jean*6676 o pkg/PKG_OPTIONS.h files:
6677 - move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h",
6678 outside of the #ifdef ALLOW_THISPKG / #endif block.
6679 - update verification/*/code/PKG_OPTIONS.h files.
dd0bbd259d Mart*6680 o add a verification experiment (offline_exf_seaice/input.seaice) that test
6681 the B-grid LSOR solver
5d7b3caf45 Mart*6682 o pkg/seaice: sort out emissivity and long wave radiation step 2:
5803321947 Jean*6683 - add emissivity for snow and ice as new run-time parameters
6684 (unfortunately) that default to the corresponding exf values; this
5d7b3caf45 Mart*6685 changes results in most verification experiments so that for backward
6686 compatibility these parameter have to be set explicitly to inconsistent
5803321947 Jean*6687 values (ugly);
5d7b3caf45 Mart*6688 - the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired
6689 emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp
6690 until we agree how to handle this bug properly
a2895221f1 Jean*6691 o pkg/exf (interpolation):
6692 - add a set of run-time param ({inputfield}_interpMethod), one for
6693 each interpolated input field, to select the interpolation method
6694 with a value of zero switching off the interpolation;
6695 - print interpolation parameters to standard output;
6696 - refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined
6697 (to use instead runoff_interpMethod=0 in data.exf).
f156ca0fb7 Jean*6698 - simplify default setting of interpolation parameters (for all fields,
6699 set position to match model grid cell-center position, leading to trivial
6700 interpolation in case of regular Lat-Lon grid) and fix for the case of
6701 non-uniform delY.
a2895221f1 Jean*6702 o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for
1ca970e947 Mart*6703 within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1.
a2895221f1 Jean*6704 this factor is absolutely required, because the lw exitance (= out-going
6705 long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown,
1ca970e947 Mart*6706 where the reflectivity rho = 1-emissivity for conservation reasons. Once
6707 this is established, we can remove the CPP-Flag (if we want to).
a2895221f1 Jean*6708 o pkg/seaice:
31c8334354 Mart*6709 - qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and
6710 ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined
3fa95d7893 Mart*6711 - sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity
6712 what the name implies (and not emissivity*BoltzmannConstant), this means
a2895221f1 Jean*6713 the old default value of 5.5e-8 now means
6714 5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in
3fa95d7893 Mart*6715 S/R exf_readparms
6716 - FV-discretization of the B-grid LSOR solver, turn on with
1ca970e947 Mart*6717 SEAICE_LSRBNEW. This new solver also involves a slight re-organization
6718 of the calling routine dynsolver, so that B and C-grid code look a
6719 little more alike.
31c8334354 Mart*6720 - fix index bugs in ostres.F (B-grid code)
03e90c79ad Mart*6721 o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better
b7727eb6f8 Mart*6722 o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the
6723 default for SEAICE_emissivity, if useEXF; requires setting a wrong
6724 parameter value in global_ocean.cs32x15/input.seaice/data.seaice for
6725 backward compatiblity
6726 o model/src: use sigmaR in calc_ivdc
6727
b1b3dce3a2 Jean*6728 checkpoint63g (2011/12/16)
abaf70634e Gael*6729 o pkg/seaice/seaice_growth.F:
6730 fix heat conservation of the coupled ocean-seaice system.
6731 when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of
6732 solid vs liquid water treatment is resolved via QNET.
6733 o pkg/seaice/seaice_growth.F:
6734 add missing term for sublimation in saltFlux, which was breaking conservation.
6735 o pkg/seaice/seaice_model.F:
6736 Remove this patholigical case treatment in evolution branch,
6737 where it is un-necessary and breaks conservation.
a2895221f1 Jean*6738 Update global_ocean.cs32x15/results accordingly for
6739 output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt
bf53796fe2 Jean*6740 o model/src:
6741 useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in
6742 external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE.
6743 o pkg/obcs:
6744 modify Stevens boundary conditions so that S/R obcs_calc_stevens computes
6745 tendency for temperature and salinity that is then applied to update
6746 theta and salt in S/R obcs_apply_ts; this requires proper masking of all
6747 horizontal advection and diffusion contributions on the boundary (in
6748 S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and
6749 removing the mask in S/R timestep_tracer. The advantage of this approach is
6750 that the updated tracer values include contributions from the surface
6751 forcing and vertical diffusion.
c0f0db71ad Mart*6752 This modification changes exp4.stevens because of vertical diffusion.
c947c6ddc4 Jean*6753 o model/src:
c79ab16fdf Jean*6754 change non-curvilinear grid setting to also work with exch2 + blank tiles:
6755 - move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst
6756 face dimensions.
6757 - new S/R INI_LOCAL_GRID to define model tile-local grid (using same units
6758 as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID
6759 and INI_SPHERICAL_POLAR_GRID.
6760 change test-experiment global_ocean.90x40x15:
6761 - split the domain in many more tiles (9x4 tiles of 10x10 each);
6762 - switch to exch2 and remove 1 blank-tile (but only for MPI test).
6763 - update results of both test (std & dwnslp).
bf53796fe2 Jean*6764 o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in
c0f0db71ad Mart*6765 tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation
c79ab16fdf Jean*6766 o model/src:
f9a1d5f8b7 Jean*6767 - take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS
6768 and fix initialisation when using sigma-coords.
6769 o model/src:
6770 - improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc.
6771 to their current value at the beginning of forward_step.F": add a new run-time
c947c6ddc4 Jean*6772 switch "doResetHFactors" (default=false) and use it to do (or not) the resetting.
6773 - set doResetHFactors=T in the following test exp:
6774 global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS),
6775 global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS)
6776 and tutorial_global_oce_in_p (nonLinFS in p)
64ea3e84ce Matt*6777 o pkg/ecco
6778 - added IES cost term
be6cb3adad Jean*6779 o verification/advect_xz
6780 - scale down the depth by 1/100 (from 200 km to just 2.km)
6781 - add secondary test using divergent flow, r-star and implicit vertical advection.
1bf7a90a0b Jean*6782 - add note (check_conserve_TS.txt) and matlab script to check global
6783 conservation of T & S with NonLin-FreeSurf and Adams-Bashforth.
be6cb3adad Jean*6784 o pkg/rbcs:
6785 - add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F).
212c574d0b Mart*6786 o pkg/obcs (Stevens BCs):
be6cb3adad Jean*6787 - fix various problems in the phase speed computations of the Stevens
212c574d0b Mart*6788 boundary conditions:
6789 - sign error for western and southern boundaries,
be6cb3adad Jean*6790 - time tendencies were underestimated by factor of dTracerLev and some just
212c574d0b Mart*6791 zero (for multidim advection schemes) -> now estimate time tendencies
6792 from difference between previous (n) time level and the one before (n-1);
be6cb3adad Jean*6793 this requires storing a field per tracer per boundary, also in the pickup
212c574d0b Mart*6794 files.
6795 - replace deltaTmom in cflMer/Zon computation with dTracerLev
6796 - set default phase velocity to cflMer/Zon
6797 - update verification experiment exp4.stevens
2232bea0cd Jean*6798 o pkg/generic_advdiff (implicit_r):
6799 - fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf
6800 (remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F);
6801 - fix implicit vertical diffusion or advection with NonLin FreeSurf
6802 (was using current recip_hFacC instead of future recip_hFacC): set future
6803 recip_hFac in thermodynamics.F and pass & use it in all vertical implicit
6804 solver S/R ;
6805 - fill diagnostics of vertical advective fluxes (computed from tendency)
6806 when using implicit vert. advection;
6807 - update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion:
6808 global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD),
6809 tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD)
6810 and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5.
6811 o pkg/diagnostics:
6812 - add diags for T & S tendency which goes through Adams-Bashforth.
6813
3cb41ba0ef Jean*6814 checkpoint63f (2011/11/30)
764028acbf Mart*6815 o pkg/obcs/obcs_calc_stevens.F:
5bef8326ad Mart*6816 - join some loops to reduce number of if-statements
764028acbf Mart*6817 - fix a bug in code for northern and southern boundaries.
564b34aefd Mart*6818 o pkg/seaice/seaice_init_varia.F
3cb41ba0ef Jean*6819 - undo resetting UVM=0 that has slipped in unnoticed in r1.49 and
564b34aefd Mart*6820 caused zero ice-velocities for the B-grid code
2876330f22 Mart*6821 o pkg/seaice/seaice_init_fixed.F
3cb41ba0ef Jean*6822 - fix a bug in the initialisation of the second metric terms
2876330f22 Mart*6823 k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0.
6824 - this affects all seaice configurations with useCurviLinearGrid = .true.
6825 and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms
6826 = .true. (default)
6827 - the only verification experiment affected is global_ocean.cs32x15:
6828 icedyn, seaice, and seaice_dynmix (AD)
6829 o pkg/thsice/thsice_diagnostics_state.F
6830 - only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does
6831 not contain garbage that can lead to surprises in diagstats_calc.F
431cbbbe2d Jean*6832 o model/src:
6833 - move bi,bj loops inside INTEGR_CONTINUITY ;
6834 - call INTEGR_CONTINUITY directly from forward_step.F
6835 (previously called from momentum_correction_step.F)
6836 - call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F,
6837 forward_step.F and pkg/ecco/the_main_loop.F
fbc9c53f7c Jean*6838 o model/src/do_oceanic_phys.F:
6839 - reset addMass to zero only if useICEFRONT ;
6840 - separated k-loop for rhoInSitu calculation ;
6841 - add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P)
6842 and at constant T,S (= WdRHOdP);
6843 NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport
6844 of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical
6845 transport of locally-referenced potential density);
6846 to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP)
f2d1e2a4fc Mart*6847 o gluemnc:
6848 - replace ncrcat with ncks when adding variables to *.glob.nc
6849 - change the way variables without record dimensions are handled so that
6850 files that have variables with and without record variables can be glued:
6851 add a record dimension with a new unique name to be able to differentiate
6852 between variable with and without a-prior record dimensions. Remove
6853 this record dimension before adding the variable to the *.glob.nc file.
6854 This procedure automatically works also for grid.*.nc files that do not
6855 have any record dimension.
7f71bb5257 Jean*6856 o verification/cpl_aim+ocn:
6857 - generate new reference output on baudelaire (gfortran, mpich2) (previously
6858 from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script.
6859 o pkg/obcs/obcs_calc_stevens.F:
b81f64aee3 Mart*6860 - add code for northern and southern boundaries.
6861 - reorder some loops to save some operations and so that drFBar can be scalar
12d8e73fbb Jean*6862 o model/src:
6863 - re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine
6864 truncation) and add diagnostics for Adams-Bashforth tendency increment.
6865 - update test-exp. AD output:
6866 1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl;
6867 and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20,
6868 front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5),
6869 global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4),
6870 matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre,
6871 tutorial_global_oce_in_p, tutorial_global_oce_latlon and
6872 tutorial_plume_on_slope.
b06a6ce7ab Mart*6873 o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX
6874 that vectorises. This code uses 3 extra 2D fields, F90 array assignments
6875 and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX
6876 does not even come with an F77 compiler anymore, this should not be
6877 a limitation
6878
34f1dd7af6 Jean*6879 checkpoint63e (2011/11/06)
16b186ab26 Patr*6880 o pkg/seaice adjoint of LSR:
6881 - substantially rework STORE dirs.
6882 - add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED
6883 this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields
6884 and only perform SOLV_MAX_FIXED adjoint iters.
37e94e8cfb Patr*6885 If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration
6886 always goes to same record, meaning that the last forward field will be
6887 the one used in the adjoint - an approximation.
16b186ab26 Patr*6888 - now produces non-zero LSR-related gradients, and acceptable gradients for
6889 An's zonal (x-z) test case (to be checked in)
6890 - lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR
6891 (but these are screwed up by the thermodynamics in the first place);
6892 reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution;
6893 output_adm.txt also reflects changes to seaice_lsr
34f1dd7af6 Jean*6894 - global_ocean.cs32x15:
16b186ab26 Patr*6895 * the "default" input_ad.seaice has been re-defined to always exclude dynamics
6896 (output_adm.seaice.txt was updated)
6897 * new input_ad.seaice_dynmix tests a forward LSR / backward free-drift
6898 (output_adm.seaice_dynmix.txt)
ca66b179c0 Jean*6899 o test-exp. exp4+stevens:
6900 - switch off pTracers and nonHydrostatic (restart problems with NH); update output
de0cda9935 Jean*6901 o pkg/seaice (lsr solver):
6902 - put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only);
6903 update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15
6904 - fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD)
6905 - new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution
6906 into initial guess for linearised solver; use weight ~ (1/err)^2,4.
6907 - compute (with new S/R) and print initial (+ free-driff sol. if available)
6908 and final residual of linearised system.
8a3a83c787 Mart*6909 o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity
6910 (requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F)
383735f3ce Mart*6911 o pkg/obcs: Stevens BCs (still only for east and west)
6912 - fix Stevens BCs by using intermediate velocities of previous
6913 time step as "baroclinic" contribution rather velocity of one grid cell
6914 inside the boundaries; more consistent but makes the entire treatment
de0cda9935 Jean*6915 more complicated, requires new pickup files and two new S/Rs:
383735f3ce Mart*6916 obcs_copy_uv_n and obcs_save_uv_n
de0cda9935 Jean*6917 keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY
383735f3ce Mart*6918 (undefined by default)
de0cda9935 Jean*6919 - silently move computation of some grid factors into separate loops to
383735f3ce Mart*6920 save some recomputations
6921 - add a hack for non-linear free surface
6922 - add a verification experiment to exp4 that tests this code
14398673cd Mart*6923 o make gluemnc/xplodemnc work with (moron) non-GNU shell tools
6924
77e57aaf77 Jean*6925 checkpoint63d (2011/10/25)
ffb3679b95 Jean*6926 o pkg/obcs + seaice-dynamics:
6927 - new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before
6928 solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB
6929 values (consistent with an implicit method).
6930 - add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to
6931 return to older implementation (same results as before); note that none of
6932 the "experimental" OBCS_SEAICE options are implemented in the new version.
2d58d55cc0 Jean*6933 - switch test exp. seaice_obcs to use new version (update output).
6b9597f12c Jean*6934 o pkg/seaice:
ffb3679b95 Jean*6935 - add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS)
6936 - add parenthesis in Water-Ice drag calculations (evp & lsr);
6937 - in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1;
6b9597f12c Jean*6938 and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice)
6939 - update output of test exp lab_sea that uses evp or lsr (fwd+ad)
6940 and global_ocean.cs32x15 (icedyn & seaice fwd+ad).
026da5ed8a Davi*6941 o pkg/layers:
6942 - Include potential density as new coordinate (Thanks to David Munday)
6943 o pkg/dic:
6944 - Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add
6945 carbonate computation/output to CALC_PCO2_APPROX
d1527a124d Mart*6946 o pkg/generic_advdiff
77e57aaf77 Jean*6947 - make TAF generate code that vectorizes:
d1527a124d Mart*6948 gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F
77e57aaf77 Jean*6949 o model/src:
6950 - improve vectorization also for adjoint code of
713532b2ce Mart*6951 solve_tridiagonal and solve_pentadiagonal. As this requires up to
6952 5 new 3D-fields, this code is only turned on for the combination of
d1527a124d Mart*6953 ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message
6954 for singular matrix check (only for TARGET_NEC_SX).
713532b2ce Mart*6955 - remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to
ffb3679b95 Jean*6956 ALLOW_AUTODIFF. This flag now needs to be set outside of
713532b2ce Mart*6957 solve_tri/pentadiagonal.F
6857319532 Jean*6958 o pkg/exf:
6959 - fix previous modif in exf_readparms.F (revision 1.66: treatment of
6960 optional namelist EXF_NML_OBCS).
6961 - add many debug-print (to trace down where pkg/cal error msg comes from)
71df2e2fe0 Mart*6962 o pkg/mom_vecinv/mom_vi_hdissip.F
6963 - rearrange loops so that vectorization is improved and in particular
6857319532 Jean*6964 the adjoint routine vectorizes. The code is a little longer now, but I
6965 think easier to read.
71df2e2fe0 Mart*6966 Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested.
69771f84cc Jean*6967 o pkg/seaice:
6968 - allow to specify initial seaice velocity from files (uIceFile,vIceFile)
69238317a2 Jean*6969 o pkg/exch2:
6970 - alternative code (without tile x tile matrix) for cumulated (global) sum;
6971 used as default; keep using matrix version in adjustment.cs-32x32x1.
5f3dfa25b7 Jean*6972 o tools/build_options:
6973 - after merging some MPI and/or multi-threads specific optfiles so that
6974 the modified default optfile support both built (using genmake2 -mpi
6975 for the MPI built, using genmake2 -omp for OpenMP built),
6976 move now obsolete optfiles to tools/build_options/unsupported/
6977 (add copy of email sent to support list in doc/optfiles_changes.txt)
6978
348beac9cc Jean*6979 checkpoint63c (2011/09/28)
b0522d7987 Jean*6980 o pkg/ebm:
348beac9cc Jean*6981 - fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of
b0522d7987 Jean*6982 test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d)
f2b8a2f2ef Patr*6983 o pkg/seaice (SItracer pickup)
6984 * Simple code for pickup of SItracer fields (#define ALLOW_SITRACER)
6985 To be done:
6986 - thorough testing of missing fields in S/R seaice_read_pickup
6987 - thorough matching between generic tracers and specific fields used
6988 (e.g. volume-weighted age, area-weighted age, salinity, ...)
2475d1c482 Jean*6989 o pkg/grdchk:
6990 - all procs calculate and print finite-difference gradient (for testreport)
6991 - change description output used by testreport;
6992 - AD testing: also compare and report Finite-difference gradient;
6993 => update all output_adm*.txt
6994 o test exp. global_ocean_ebm:
6995 - switch back useRealFreshWaterFlux (no problem anymore with run-off);
6996 and turn on exactConserve; update (fwd) output.
22a5e4b7f8 Jean*6997 o pkg/seaice (LSR):
6998 - print to STDOUT number of solver iterations at SEAICE_monFreq interval.
6999 - modify solver to deal cleanly with u/v switch at face edges (CS-grid):
7000 * identical results with non-CS topology (but save up to half of EXCH calls)
7001 * no much changes in cs-32 verification tests since no ice at face edges
7002 (differences due to convergence criteria, since nb of iterations changed)
7003 * expect some differences on lat-lon-cap grid.
7004 update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice)
21773ac32d Jean*7005 o pkg/exch2:
7006 - add new CPP option to disable Cumul-Sum matrix (to save storage when using
7007 many tiles); until alternative coding is added, just add a stop.
7c74433c3f Jean*7008 o pkg/kpp:
7009 - move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F
7010 to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list).
7011 o optfiles:
7012 - merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles
7013 into corresponding standard one, which now support different build:
7014 (when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built)
7015 - add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael)
a9fbe2edc0 Jean*7016 o pkg/obcs (seaice):
7017 - add missing EXCH for uIce,vIce after applying OBCS;
7018 - remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding
7019 argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R
7020 EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F;
7021 - fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared)
7022 - verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi
7023 and eedata.mth for MPI and mutlti-threaded testing.
ecd451586c Jean*7024 o pkg/flt:
7025 - make FLT EXCH working with multi-threads (and MPI + multi-threads);
7026 - use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h;
7027 - fix pickup and trajectories + profiles output with multi-threads;
7028 - add parameter to select group of fields to write along trajectory and
7029 profile (default unchanged);
7030 - only call PORT_RAND* function when flt_noise <> 0;
7031 - add multi-threaded test for verification exp. flt_example.
7032 o eesupp/src:
7033 - fix S/R ALL_PROC_DIE for MPI+multi-threads.
7034 - USE_OMP_THREADING: check that number of threads (from eedata) matches
7035 actual number (from env.var. setting).
2e701c809e Jean*7036 o pkg/ebm:
7037 - fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file.
7038 - add multi-threaded test for verification exp. global_ocean_ebm
7039
a51afa12b8 Jean*7040 checkpoint63b (2011/08/29)
1554b54595 Jean*7041 o pkg/ebm:
7042 - fix sign of runoff;
7043 - update directly forcing fields (Qnet,EmPmR) to use standard
7044 external_forcing_surf.F (remove ebm_forcing_surf.F);
7045 - avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F);
7046 - set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm)
7047 and apply relaxation towards corresponding SST field (2-D map or ZonAver).
7048 - update global_ocean_ebm parameters file data and update output (fwd+ad).
753be3d4e2 Jean*7049 o verification/matrix_example:
fcfc72a991 Jean*7050 - split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for
7051 MPI and mutlti-threaded testing.
7052 o pkg/matrix:
7053 - change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ;
7054 - fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter);
7055 - fix for multi-threaded (remove DATA statement);
7056 - use standard DIFFERENT_MULTIPLE function;
7057 - add MATRIX_OPTIONS.h
7058 o verification/matrix_example:
753be3d4e2 Jean*7059 To allow to split the domain in several tiles, change the domain size
7060 from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on
7061 Western side) of land points.
7062 o (*_)write_pickup:
7063 - fix few bugs in mypackage_read/write_pickup.F
7064 - in MDS_WR_METAFILES calls, replace "myTime" by a local copy into
7065 array of length 1 (was caught by compiler syntax-check).
6768a51e8b Jean*7066 o pkg/diagnostics (velocity potential solver):
7067 - fix initialisation of main diagonal matrix (for overlap values)
02665fe70b Jean*7068 o tools/build_options:
7069 - towards single optfile for MPI and non-MPI built: merge few +mpi optfile
7070 into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11)
7071 - linux_amd64_gfortran: merge +mpi_generic version into standard optfile:
7072 * move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ;
7073 * FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list;
7074 and use "-devel" testreport option for standard testing on baudelaire.
b6649ac208 Jean*7075 o pkg/grdchk:
7076 - Assume that all gradient-check position are within the same tile
7077 corresponding to global indices (iGloTile,jGloTile) and that
7078 positions (i,j indices or nbeg) are local to this tile;
7079 - set tile local-indices and proc. number according to tile global-indices;
7080 - remove grdchkwhichproc from namelist (retired param);
7081 - send adjoint gradient to all procs so that all procs print it to STDOUT;
7082 - switch on MPI test for global_ocean.90x40x15 AD test experiment.
15338fa568 Dimi*7083 o adding package bbl (Bottom Boundary Layer)
7084 description in MITgcm/pkg/bbl/bbl_description.tex
7085 example/test experiment in MITgcm_contrib/bbl
50d533af19 Patr*7086 o adjoint verifications
1c8f7d3c14 Jean*7087 - changed 5 experiments to multi-tiles
50d533af19 Patr*7088 * global_ocean.90x40x15
7089 * obcs_ctrl
7090 * offline_exf_seaice
7091 * tutorial_dic_adjoffline
7092 * tutorial_tracer_adjsens
7093 changed reference output for those that crossed tile boundaries
7094 (changed choices of gradient check positions)
1c8f7d3c14 Jean*7095 - with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi)
50d533af19 Patr*7096 - temporary bug fix in grdchk_loc.F for obcs
d5826a2b12 Jean*7097 o genmake2 & testreport
7098 - add target "obj" (just for OBJFILES files) to Makefile;
7099 - add option to specify FEXTRAFLAGS on command line.
ea9625adec Jean*7100 o pkg/mypackage:
7101 - remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS
7102
975e02919b Jean*7103 checkpoint63a (2011/08/02)
ff219d41cf Jean*7104 o pkg/diagnostics (velocity potential):
7105 - fix velocity-potential calculation when using OBCS: balance net inflow
7106 at each level (new S/R OBCS_DIAG_BALANCE).
7107 - fix some of the problems with OBCS in stream-function calculation.
773313b0d2 Mart*7108 o pkg/exf/exf_readparms.F
ff219d41cf Jean*7109 - make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF,
773313b0d2 Mart*7110 EXF_NML_OBCS) more consistent, so that you need not have these lists
7111 in data.exf when they are not used.
45b245ccf5 Mart*7112 o optim/optim_readdata.F:
7113 - add some output about obcs variables that might help debugging
daab778156 Mart*7114 - add a check about nvarlength
d602d84af0 Mart*7115 o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec
4750cf8833 Jean*7116 o pkg/diagnostics (velocity potential):
7117 - fix mask for OBCS (still problems in stream-function with OBCS);
7118 - add specific parameter (default = main code CG2D params) for solver;
7119 - in case of poor convergence, use solution corresponding to lowest residual.
a045c08a46 Mart*7120 o pkg/seaice/seaice_growth.F: small changes that permit vectorizable
7121 adjoint code. In general statements like tmpscal=fld(i,j) are problematic
7122 and should be avoided where possible.
40639c975a Jean*7123 o model/src (rStar):
7124 - include r* effect on reference-state (PhiRef) in totPhiHyd
7125 (so that it's really the potential anomaly at the cell center);
7126 affect solution only if z* with full pressure in EOS.
7127 - test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and
7128 update output (because of z* in totPhiHyd and viscA4 changes);
7129 - keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly
7130 @ constant r) until interpolation at constant r is implemented.
7131 o pkg/diagnostics
7132 - fix RCENTER diagnostics in case cell center is not at interface middle
6a4d8594a7 Mart*7133 o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use
7134 this eos with eosType = 'TEOS10', in data (PARM01). This eos implies
7135 that THETA and SALT are "conservative temperature" and "absolute
7136 salinity"
7137 o pkg/ctrl
7138 - fix computation of endrec in s/r ctrl_init_rec
7139 - ctrl_pack/unpack_*: remove unused variables and some obsolete code
aa222beea6 Mart*7140 o pkg/seaice/seaice_growth.F
7141 - fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code,
7142 remove then obsolete STORE directives
7143 - fix STORE directives for tice and tices, so that only the
7144 appropriate part of the fields are stored (and not the entire
40639c975a Jean*7145 field); update global_ocean.cs32x15.seaice AD output.
aa222beea6 Mart*7146 - cosmetic changes: adjust CPP flags and indentation for better
7147 legibilty
7148 o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by
7149 Chris Wilson)
5c5b0c67fc Jean*7150 o pkg/gmredi:
7151 Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF),
7152 and test it in verification exp. "front_relax.bvp" (update output.bvp.txt)
7153
975e02919b Jean*7154 checkpoint63 (2011/07/11)
0efa36856a Jean*7155 o pkg/exch2:
7156 - rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h
7157 - exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the
7158 (2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y
7159 increments, calculates Cumul-Sum @ tile origin and sends results to each tile.
9ec7daa021 Jean*7160 o pkg/diagnostics:
7161 - deal with pairs of post-processed diags which are computed together; in
7162 particular, re-order list of diags within 1 file to save 2nd computation.
7163 - add S/R to compute velocity stream-function (called after velocity-potential
7164 calculation) from divergence free transport -> new diagnostics "PsiVEL".
32f824cd14 Jean*7165 - add parameter to select grid-point location where PsiVEL == 0.
9ec7daa021 Jean*7166 o eesupp/src:
7167 new S/R to calculate cumulated sum on tiled array, corner grid-cell location
7168 (specific S/R needed with exch2 topology - for now, just print an error msg)
f3cfd88687 Patr*7169 o pkg/shelfice
7170 - Implement friction velocity-dependent transfer coefficients following
7171 Holland and Jenkins, JPO, 1999
7172 Original code by M. Losch with small modifs.
7173 Enable with CPP option SHI_ALLOW_GAMMAFRICT
7174 and runtime flag SHELFICEuseGammaFrict
a8b943f1d9 Jean*7175 o verification lab_sea & global_ocean.cs32x15:
7176 - use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local):
7177 does not miss some dependencies (but is slower) and also works with many files
7178 (default makedepend limitation for AD built).
7179 - use cyrus_makedepend in adjustment.128x64x1 (so that it still tested).
c5e360349a Jean*7180 o pkg/diagnostics:
7181 - add run-time parameter "useMissingValue" (def=False) to fill land-point
7182 (i.e., where mask=0) with MissingValue ; used only in MNC output file.
7183 This replaces CPP-option DIAGNOSTICS_MISSING_VALUE.
7184 - Extend the use of "missing_value" setting from data.diagnostics for the case
7185 of counter-diagnostics (where fraction-weight is zero). This applies both to
7186 MNC and MDS output files.
f3bb97e385 Gael*7187 o pkg/seaice/seaice_growth.F:
b7df5ca569 Ian *7188 - add 'a priori' cap of latent heat flux based on actual mass considerations
7189 when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the
7190 non-legacy seaice_solve4temp.
7191 - add diagnostic of the residual sublimation freshwater flux (the freshwater
9ec7daa021 Jean*7192 flux taken from the ocean if the total actual latent heat fluxes exceed
b7df5ca569 Ian *7193 the maximum)
f3bb97e385 Gael*7194 - remove the CPP switch around the *_FWbySublim unit change and move diagnostic
7195 fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F.
7196 - add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef
7197 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim).
7198 - bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET.
7199 - bug fix : missing part to Martin's r_FWbySublim pathological case fix.
12f262973b Ian *7200 o verification 1D_ocean_ice_column:
7201 made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet
7202 update results
43043edca4 Jean*7203 o pkg/diagnostics:
7204 - Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P')
7205 which are not filled-up but computed from other diags ; In this case, the mate
7206 diag points to the primary (filled-up) diag to used for post processing.
7207 - Update Velocity-potential computation using post-processed diag framework.
234bdec1fe Jean*7208 ==> Change the ordering of fields and time-periods in MDS output file
9b34d3ce48 Jean*7209 when using periodic averaging: now writes one time record with the full set
7210 of fields for this time period, then the next time reccord (it used to be
7211 one field with the full set of time records then the next field).
234bdec1fe Jean*7212 Note: this is now similar to NetCDF (MNC) output file. <==
43043edca4 Jean*7213
19985267f5 Jean*7214 checkpoint62z (2011/06/21)
fb247706a7 Patr*7215 o adjoint monitor:
7216 - Add adjoint monitor output for packages exf, seaice
a18fc746e5 Patr*7217 and update relevant testreport output
6de796d755 Gael*7218 o pkg/seaice:
7219 - re-order diags inits so that they appear in order in available_diagnostics.log
7220 - added diags: hsnow thermo. rates of change, area preceeding ridiging process,
7221 area/heff/hsnow preceeding thermodynamic growth/melt.
7222 - modified diag: SIdA; output actual effect, as the description states.
7223 - modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW.
7224 - retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh.
3897a97e38 Jean*7225 (SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO;
6de796d755 Gael*7226 and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO)
7227 - modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates.
3897a97e38 Jean*7228 - added diagnostics for seaice generic tracers (SItr*).
6de796d755 Gael*7229 - added SItrUnit and SItrNameLong run time param (for SItr* diags).
7230 - in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'.
d7d0e261c7 Patr*7231 I. Fenty: 18-Jun-2011:
7232 Minor changes to seaice package:
7233 1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and
7234 added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor)
3897a97e38 Jean*7235 - Differentiated "regularization variables" from "floor variables"
d7d0e261c7 Patr*7236 * areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor
7237 * hiceMin became SEAICE_hice_reg (old hiceMin)
7238 (with _reg meaning regularization variable)
7239 - SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion
7240 so as to ensure energy conservation when going between phases
3897a97e38 Jean*7241 - A22 was not used anywhere
d7d0e261c7 Patr*7242 2) Changed regularization procedure for heffActual and hsnowActual to ensure
7243 well-boundedness and smooth adjoint in seaice_growth.F
7244 3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells
7245 because the old regularization always set heffActual >= 0.05 cm
7246 4) Changed the model so that the default behavior is to put a small (10^-5) "floor"
3897a97e38 Jean*7247 on AREA when HEFF > 0.
7248 - went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to
7249 requiring that DISABLE_AREA_FLOOR *not* be defined
d7d0e261c7 Patr*7250 Affected verifications:
7251 - 1D_ocean_ice_column (output.txt output_adm.txt)
7252 - global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt)
4c5a4fb4d7 Jean*7253 o pkg/diagnostics:
7254 - move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R).
7255 - rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument
7256 (was _RL, now integer) with option = 0 to retrieve all levels.
2d3c84b138 Jean*7257 - add pieces of code to compute velocity potential at each level (new diagnostics
7258 PhiVEL, works only when UVELMASS & VVELMASS are also turned on);
7259 for now, using same params as CG2D (target-resisual, max Nb of iter ...).
3897a97e38 Jean*7260 - fix few issues with counter diagnostics in diagnostics_setdiag.F &
7261 diagstats_setdiag.F (if diagnostic counter is itself a counter diag)
7262 and in diagnostics_fract_fill.F (do not need a valid pointer for the
7263 diagnostics counter-mate); check that definition of counter-diagnostic
7264 includes a valid counter-mate (in diagnostics_set_levels.F).
d2ffb46800 Jean*7265 o model/src (rStar):
7266 - add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F);
7267 affect solution only if z* with full pressure in EOS;
7268 update output of test-exp global_ocean.90x40x15.
7269 o pkg/seaice:
3b6fc6245d Gael*7270 - introduce siEps=1e-5 parameter
7271 - use areaMax in AREA update (part 4), consistent with ridging step (part 2.5).
7272 - re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code.
d2ffb46800 Jean*7273 - introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer.
3b6fc6245d Gael*7274 For now it covers, and was tested for, ice salinity and age (attached to HEFF),
7275 as well as ice cover age and ridging index (attached to AREA).
d2ffb46800 Jean*7276 For now the run time parameters (in data.seaice/SEAICE_PARM03) are
7277 SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA').
3b6fc6245d Gael*7278 Up to SItrMaxNum=3 tracers can be used simultaneously.
7279 o pkg/salt_plume:
d2ffb46800 Jean*7280 -introduce SPsalFRAC run time parameter that sets the fraction of the
7281 salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically)
7282 that gets vertically redistributed (fluxed down) by pkg/salt_plume.
43306f4baa Jean*7283 o model debug options:
7284 - Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored
7285 in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h).
7286 - Refine debug-msg printing selection (3 new levels):
7287 debugMode : controls printing of debug messages (sequence of S/R calls).
7288 debugLevel : controls printing of algorithm-relevant auxiliary/debug messages
7289 debLevZero = 0 ; /* level of disabled aux. msg printing */
7290 debLevA = 1 ; /* level of minimum aux. msg printing */
7291 debLevB = 2 ; /* level of low aux. print (report read-file opening)*/
7292 debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */
7293 debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */
7294 debLevE = 5 ; /* level of extensive debug printing */
7295 New debugLevel default: with default debugMode value (=F),
7296 = 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.;
7297 and if debugMode=T, default debugLevel = 4 (debLevD).
7298 Relation with previous settings:
7299 debLevB (=2) corresponds to former debLevA (=1)
7300 debLevD (=4) corresponds to former debLevB (=2)
7301 Note:
7302 a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before);
7303 b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs);
7304 to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5)
7305 - Add new parameter (printResidualFreq, read from PARM02 namelist) to print
7306 detailed CG solvers convergence; off (=0) by default, except if debugLevel=5.
8a9e9a473a Jean*7307 o pkg/obcs:
7308 - change OBCSfixTopo default from True to False (should not change the results);
7309 keep OBCSfixTopo=T in verification-exp. seaice_obcs.
cc3bbdb6bb Jean*7310 o pkg/thsice:
7311 - fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in
7312 2nd layer seaice sublimation (unlikely to happen)
7313 - use Interior mask for OBCS in thsice_advection.F (similar to what is
7314 done in gad_advection & seaice_advection).
bd46b07a96 Patr*7315 o adjoint:
7316 bug fix spotted by Gael Forget:
7317 seaice_advection and thsice_advection still had
7318 legacy CPP options to avoid CS corner updates for adjoint
0c22b81a88 Jean*7319 o pkg/seaice:
7320 => Change some of the defaults (2011/05/29):
7321 - change SEAICEuseFluxForm default (from False to True)
7322 - change DIFF1 default (from 0.004 m/s to 0. m/s)
7323 And print warnings if DIFF1 is not set in data.seaice and centered
7324 avection scheme is used without any diffusion.
7325 also:
7326 - fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F;
7327 - set SEAICEdiffKh[] default in the same way as SEAICEadvSch[]
7328 - stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any
7329 other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with
7330 #undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE.
7331 update results of test exp.:
7332 lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20)
7333 output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200)
7334 output_adm.noseaicedyn (SEAICEuseFluxForm=T)
7335 offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T)
7336 seaice_obcs: output (SEAICEuseFluxForm=T)
7337 and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004)
7338 for standard fwd & AD lab_sea tests (to keep the same output).
fc3b49c003 Gael*7339 o pkg/seaice/seaice_growth.F:
0c22b81a88 Jean*7340 - use Ian Fenty's capping formulas for actual ice
fc3b49c003 Gael*7341 thickness thoughout EVOLUTION branch.
7342 - put treatment pathological case #2) in CPP brackets
7343 (ALLOW_AVOID_INFINITESIMAL_AREA, undef by default).
0c22b81a88 Jean*7344 - update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly.
fc3b49c003 Gael*7345 o pkg/seaice:
7346 - seaice_diffusion.F : remove the min(DX,DY) factor permanently;
0c22b81a88 Jean*7347 pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter;
7348 also pass fac as a param, which can be 1. (to update the tendency
fc3b49c003 Gael*7349 field) or the time step (to update the field itself).
0c22b81a88 Jean*7350 - seaice_advdiff.F: for multidim, call seaice_diffusion with
fc3b49c003 Gael*7351 e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call
7352 seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step.
0c22b81a88 Jean*7353 - SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F :
fc3b49c003 Gael*7354 hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc.
a6e3308c72 Jean*7355 o pkg/seaice:
7356 diffusion with centered advection scheme (diffus.F & advect.F):
7357 - simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside)
7358 to just compute the laplacian of input-field.
7359 - unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call.
7360 - fix flux-form version in diffus.F to conserve tracer.
7361 update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects
7362 machine truncation) and lab_sea.salt_plume (conservative flux-form modif)
7363
f23903c179 Jean*7364 checkpoint62y (2011/05/26)
b9ea5855ae Gael*7365 o pkg/seaice:
f23903c179 Jean*7366 - seaice_growth.F : in EVOLUTION branch, always include
b9ea5855ae Gael*7367 a_QSWbyATM_cover in qnet (as it should be).
7368 - verification/global_ocean.cs32x15 : update results accordingly
f23903c179 Jean*7369 (output.seaice.txt output_adm.seaice.txt).
665e1cc782 Jean*7370 o pkg/seaice + obcs:
7371 - use maskInW & maskInS in multi-dim advection and biharmonic diffusion:
7372 equivalent of assuming no tracer gradient outside the OB region.
7373 update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion)
7374 - remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed
7375 after changes above);
7376 - obcs+seaice cleaning: apply seaice-tracer OB values to tracer field
7377 only at OB location (instead of over a band of OLx width).
7378 o pkg/seaice:
7379 - fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F
7380 (dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid)
ae7ba49648 Jean*7381 o pkg/obcs:
ae802b970e Jean*7382 - split header file "OBCS.h" into 4 separated files:
7383 OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h
7384 Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h
435c8dd190 Jean*7385 (contain no conditional statement which depends on OBCS options).
7386 - move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h)
7387 to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h).
ae802b970e Jean*7388 o ctrl, cost, grdchk & autodiff pkgs:
7389 - make options file more standard (like other {PKG}_OPTIONS.h file but
7390 with AD_CONFIG.h); clean-up some of the included header files.
7391 o pkg/obcs:
ae7ba49648 Jean*7392 - do not mask tracer when applying OB (tracer == 0 could generate problems)
7393 - apply tracer OB values to tracer field only at OB location (instead of
7394 over a band of OLx width)
7395 - clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R)
7396 - remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove
7397 obcs_apply_tloc.F & obcs_apply_sloc.F
7398 o obcs in model/src:
7399 - call OBCS_APPLY_W only if NonHydrostatic.
7400 - call OBCS_APPLY_ETA only if NonLinFreeSurf.
7401 - reset dEtaHdt and wVel to zero outside OB interior region ;
7402 - leave tracer unchanged outside OB interior region: This has no effect
7403 on the solution but just to prevent unrealistic tracer value outside OB.
7404 - zero out velocity outside OB interior region: This has no effect on
7405 the solution but just to prevent unrealistic velocity outside OB.
1228ad56fc Jean*7406 o obcs and non-lin free-surf:
7407 move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F
7408 and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F
7409 + add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR:
7410 this fixes missing EXCH + get consistent eta OB value (+ fix restart).
7411 update results of test-exp. exp4(nlfs).
b642a711f1 Jean*7412 o exp4 (nlfs) test-exp:
7413 use OBC for Eta at Western & Eastern OB (to test prescribing Eta
7414 with NonLin-FreeSurf); update output.nlfs.txt
691f44a031 Jean*7415 o obcs and 2d/3d solver norm:
b642a711f1 Jean*7416 use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB
7417 and outside OB interior region (will allow to place OB further inside the
7418 domain). Depending on the domain, can affects cg2d-Norm (previous
ae7ba49648 Jean*7419 cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl,
691f44a031 Jean*7420 and cg3d-Norm (previous Norm was computed before canceling OB terms),
7421 e.g. in tutorial_plume_on_slope.
7422 - update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope.
6202f959ce Jean*7423 o pkg rbcs:
7424 - split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h
7425 - add capability to apply relaxation to horizontal velocity uVel & vVel.
5f47d9d3a7 Mart*7426 o pkg/grdchk: add gradient check for control variable xx_shifwflx
7427 o pkg/shelfice/shelfice_init_fixed.F
7428 fix CPP-flag combinations
2706e7ceae Patr*7429 o pkg/seaice: Merge iceage code of Pierre Rampal
7430 * update/change/correct ice age calculations
b642a711f1 Jean*7431 * add age updates for pathological cases
2706e7ceae Patr*7432 Probably needs more testing...
5f47d9d3a7 Mart*7433
fb01456aea Jean*7434 checkpoint62x (2011/05/13)
7435 o pkg/mom_vecinv:
6202f959ce Jean*7436 high-order vorticity scheme: use interior masks (maskInW & S)
fb01456aea Jean*7437 to zero-out (outside OB) gradient of vorticity.
94a41b18e5 Jean*7438 o verification exp.:
7439 turn on "useEnergyConservingCoriolis" (better discretisation) in exp.
7440 hs94.128x64x5 and seaice_obcs ; update results.
abb2d742f7 Oliv*7441 o pkg/obcs:
7442 fix bug in OBeta for YZ sections in obcs_exf_load.F
94a41b18e5 Jean*7443 o pkg/ctrl, pkg/shelfice, and optim:
7444 - add new control variable xx_shifwflx (fresh water flux underneath ice
7445 shelves). This is almost as tedious as obcs-ctrl, because the
c39d626e4c Mart*7446 variables needs its own mask.
94a41b18e5 Jean*7447 - add a cost function term that penalizes the deviation of xx_shifwflx
c39d626e4c Mart*7448 from the first guess (zero) in analogy to other control variables
40171df3a2 Patr*7449 o pkg/shelfice:
7450 - start basic adjoint
94a41b18e5 Jean*7451 o pkg/ctrl:
a14e708176 Mart*7452 - remove extra 2D field "for good measure" when initializing in
7453 ctrl_set_globfld_[xy/xz/yz].F
00525899b2 Mart*7454 - replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec
7455 - improve error messages in ctrl_set_unpack_*
cb8d4055f8 Jean*7456 o OBC implementation in momentum:
7457 use interior masks (maskInC,W & S) in momentum S/R:
7458 - multiply divergence, tension and some del^i.u or del^j.v by maskInC
7459 - multiply del2u,del2v by maskInW/S (biharmonic viscosity)
7460 - multiply horiz. grad of vorticity by maskInW/S (in Leith scheme)
7461 - multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd)
7462 Motivation: fix/clean implementation of OBC with biharmonic-viscosity
7463 (and also with Leith/Smagorinsky harmonic-viscosity).
7464 Update output of experiment dome and exp4 (+nlfs).
19fda1148c Jean*7465 o exp4 test-exp:
ce8a4681c6 Jean*7466 - turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F)
7467 and prescribe time-varying OB (without pkg/exf) for zonal-velocity
7468 at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe
7469 time-varying OB at Western-side for wVel (NonHyd); update output.
19fda1148c Jean*7470 - add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv
ce8a4681c6 Jean*7471 and biharmonic-viscosity ; also use prescribed time varying OB.
19fda1148c Jean*7472 o pkg/obcs:
7473 fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F
cd0d82611c Jean*7474 o model/src:
7475 - fix startTime setting when baseTime<>0 & nIter0=0 are specified ;
7476 - initialise startTime & nIter0 with unlikely values: allows to set one
7477 from the other without ambiguity.
e27288cd7f Jean*7478 o seaice_obcs test-exp.:
7479 add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output.
575d4c6487 Jean*7480 o pkg/obcs:
7481 - remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer:
7482 no longer needed with maskInC,W,S in pkg/generic_advdiff.
81db1d5414 Ian *7483 o pkg/seaice:
575d4c6487 Jean*7484 - retired SEAICE_SALINITY and SEAICE_salinity in favor of
81db1d5414 Ian *7485 SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively.
575d4c6487 Jean*7486 - fixed bug in the initialization of sea ice salinity variable HSALT
81db1d5414 Ian *7487 in seaice_init_varia.F (removed dependence on ICE2WATR)
3fb96de6bc Jean*7488 o fizhi-cs test exp.:
7489 switch reference output convention for these 2 non-standard test-exp,
575d4c6487 Jean*7490 from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5)
3fb96de6bc Jean*7491 to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11)
7492 reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran
38710791cb Jean*7493 o model/inc:
7494 - change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4")
7495 of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS)
c5deacd5a8 Ian *7496 o pkg/seaice:
7497 - fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY
7498 o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15
81db1d5414 Ian *7499 - updated output*.txt files due to bug fixes in salt, saltPlumeFlux,
7500 and initial HSALT
c5deacd5a8 Ian *7501
1c58c84abe Jean*7502 checkpoint62w (2011/04/26)
0585a400b7 Jean*7503 o pkg/mom_fluxform:
7504 - fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf.
7505 - use parameter "sideDragFactor" in no-slip BC side-drag part.
7506 - update output of exp. global_ocean.90x40x15
f79fbf5b9f Jean*7507 o pkg/mom_vecinv:
7508 mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform)
1c58c84abe Jean*7509 o update seaice exp.:
7510 use more consistent parameter values (remove "backward compatability only":
7511 ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh)
7512 related to thermodynamics seaice. Update output (fwd+AD) of exp.:
7513 1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs
f79fbf5b9f Jean*7514 o update test-exp global_ocean.90x40x15:
7515 o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis).
7516 o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.)
7517 o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params)
7518 o turn on zStar & viscA4 in standard set-up (dir input/)
7519 and update output files: output.txt & output.dwnslp.txt
37df334812 Jean*7520 o new AD-test experiment: obcs_ctrl
7521 (From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector.
7522 o pkg/dic:
7523 fix two bugs in handling water vapour pressure in carbonate chemistry
7524 and air-sea fluxes. Found by Val Bennington and Galen McKinley
7525 (add DIC Option = WATERVAP_BUG to recover old results)
7526 update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline
7c642b2a2b Dimi*7527 o adding allowInteriorFreezing option to check for water below freezing point
7528 at depth and bring the negative heat anomaly to the surface level
37df334812 Jean*7529 o pkgs _fields_load:
7530 - extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs)
7531 - use new S/R GET_PERIODIC_INTERVAL in pkgs:
62852f670d Jean*7532 bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and
7533 rbcs to get interpolation weights and time reccord number.
37df334812 Jean*7534 - fix multi-threading in aim_fields_load.F
7535 - apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F
83f3340abe Jean*7536 o external_fields_load:
7537 new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear
7538 interpolation weights) to use in a periodic time-series ; do not divide by
7539 time-step to convert to integer:
7540 - this fixes case where externForcingPeriod is not multiple of time-step
7541 (Thanks to Christopher L. Wolfe)
7542 - this fixes case where externForcingPeriod is an odd multiple of time-step
7543 (was wrong by half of time-step); update results of tutorial_global_oce_in_p.
7544 store index of time-record which is currently loaded:
7545 - works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ;
7546 - needed for the adjoint but not yet used because of extensive recomputations;
7547 (to be fixed soon)
7548
aea6723cc0 Jean*7549 checkpoint62v (2011/04/02)
d0b6c8f47c Ian *7550 o verification/1D_ocean_ice_column added to test Ian Fenty's
7551 pkg/seaice_growth.F modifications for improving sea ice code differentiability
aea6723cc0 Jean*7552 o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope
7553 (new velocity statistics after changing maskInW & maskInS definition)
75620d6d39 Jean*7554 o pkg/generic_advdiff with OBCS:
7555 use maksInW & maskInS in advective flux and in biharmonic diffusion calculation:
7556 equivalent to assumption of no tracer gradient outside the OB region.
7557 This will affect the results if using obcs+biharmonic diffusion.
7558 update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc)
1634337404 Jean*7559 o pkg/obcs:
7560 change definition of maskInW & maskInS: leave OB edges inside (maskIn=1)
7561 (e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still
7562 in Interior region. No impact on solution but affects Velocity monitor stats.
5933dabdc8 Patr*7563 o pkg/ptracers (adjoint)
1634337404 Jean*7564 New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate
5933dabdc8 Patr*7565 tape file for each tracer
1634337404 Jean*7566 o model/inc/src and pkg/autodiff: add parameters that allow to turn
7567 of parts of the adjoint code at run time. For now, there are only
7568 useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These
7569 parameters are set in data.pkg.
7570 This is the lazy coward's version of doing this, but still useful for
7571 debugging. In order to do it right, everything needs to be moved to
d6ce1e6c67 Mart*7572 pkg/autodiff.
1634337404 Jean*7573 o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at
d6ce1e6c67 Mart*7574 the end; this fixes the adjoint balancing code for open boundaries.
ae6e7b0b9d Mart*7575 o pkg/ctrl:
7576 - change behavior of xx_${varname}period to be analogous to exf-conventions:
7577 xx_${varname}period = 0., means time-independent control part
1634337404 Jean*7578 xx_${varname}period = -12., means one-year-periodic monthly control part
ae6e7b0b9d Mart*7579 - introduce helper routine ctrl_init_rec (part of ctrl_init.F) to
7580 clean up ctrl_init a little, remove unused variables
e7fdbcdd62 Mart*7581 - ctrl_init: fixed the handling of the start/endrec for obcs-variables
ae6e7b0b9d Mart*7582 - move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec
7583
61d23e1802 Mart*7584 checkpoint62u (2011/03/15)
4866a81958 Jean*7585 o model/src:
7586 - for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in
7587 h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ;
7588 - in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to
7589 INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF.
7590 o pkg/ctrl/obcs/ecco:
633dbf7240 Mart*7591 - remove obsolete, unused, and partially broken code:
4866a81958 Jean*7592 ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within
633dbf7240 Mart*7593 ALLOW_CTRL_OBCS_BALANCE
4866a81958 Jean*7594 - put a stop statement into ecco/cost_obcsvol.F, but also add
633dbf7240 Mart*7595 cost_obcsvol to ecco_ad_diff.list
d9c90338d2 Mart*7596 o pkg/ecco: fix counting cost function contributions for obcs (code
7597 by Matt M.) and diffkr for diagnostics
a5506f4305 Patr*7598 o pkg/ecco, pkg/ctrl, pkg/grdchk:
7599 add cost penalty terms for initial uvel, vvel, eta controls
7600 and I/O for prior error files
a2fd64e7bb Jean*7601 o pkg/mdsio:
7602 move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option
7603 (new argument) to check for tiled file in mdsioLocalDir : this fix the
7604 restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir.
fbadcb8ae6 Mart*7605 o pkg/ctrl:
7606 - ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by
7607 ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove
7608 unused and superfluous variables
7609 - ctrl_get_gen_rec.F: catch the case of xx_genperiod=0.
8bc4946ad4 Mart*7610 o pkg/ecco
7611 - enable adjoint of Stevens OB
a2fd64e7bb Jean*7612 o pkg/ctrl/ecco/grdchk:
ac86e3d04f Mart*7613 - remove global declaration of tmpfldx/yz and tmpfldx/yz2.
8bc4946ad4 Mart*7614 Fortunately, we do not have any tests for the numerous cpp-flagged
ac86e3d04f Mart*7615 option of "obcs as control parameters" so we will never know
7616 if this is an improvement (but at least now things compile).
7617 - remove an obsolete initialization from ecco_cost_init_barfiles.F
a2fd64e7bb Jean*7618 - fix some problems within never used ifdefs to make the code compile
7ee9bd2cad Jean*7619 o pkg/obcs:
7620 - Refine Interior mask definition to work with more complex OB (e.g.
7621 if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to
7622 read in Interior mask from file. Check if Interior mask is consistent
7623 with OB list of indices.
19ebde807c Patr*7624 o pkg/seaice
7625 - beginning code for a seaice tracer package,
7626 but currently only used for seaice age: SEAICE_AGE
7627 SEAICE_num = 4
7628 iTracer = 1: area-weighted ice age
7629 = 2: volume-weighted ice age
7630 = 3, 4: template for one-year vs. multi-year ice
7631 data.seaice has new namelist SEAICE_PARM03 for arrays related to
7632 SEAICE_num
7633
954840cffd Patr*7634 checkpoint62t (2011/03/05)
686e612f13 Jean*7635 o pkg/obcs:
289f5415be Jean*7636 - obcs_apply_uv.F: change to a 2 steps method, first tangential component;
7637 then normal component. This ensures that the normal component is set
7638 correctly even when it conficts with tangential setting from an other OB.
7639 Affects results of test-experiment seaice_obcs: update the output.txt
7640 o pkg/obcs:
686e612f13 Jean*7641 - add code to monitor statistics of dynamical fields at OB.
7642 - take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW :
7643 - fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection).
7644 - change default: balance the Net inflow through all OB (instead of balancing
7645 each OB separately); keep the old method if setting OBC_balanceFacX < 0.
7646 - switch on useOBCSbalance in dome experiment: only correct Western OB outflow
7647 to match Nortern OB inflow (OBCS_balanceFacN=0).
7f2854329f Dimi*7648 o pkg/seaice:
7649 - redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL
2afe30fba0 Dimi*7650 o pkg/seaice (seaice_growth v 1.113):
7651 - reverting seaice_growth to v 1.111 in order to have code with exact bit
7652 compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge
7653 CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced
7654 runtime flag SEAICEareaFormula is kept but is inactive
fa83c0daea Jean*7655 o model/src:
7656 - add new param to scale curvilinear grid distance and area when using
7657 a different sphere radius from the grid-files.
7658 - test/check multi-threads EXCH applied to local variable (cg2d_x)
878ab8c79d Patr*7659 o adjoint:
7660 - enable adjoint of Stevens OB
7661 - add dummy_in_dynamics to enable extraction of ADJrhoinsitu
7662 (a bit delicate because of potentially modified adj. common block structure;
7663 current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later)
fa83c0daea Jean*7664
d6110c5749 Jean*7665 checkpoint62s (2011/02/15)
2afe30fba0 Dimi*7666 o pkg/seaice (seaice_growth v 1.112):
83f1d2d932 Gael*7667 - introduce SEAICEareaFormula run time parameter, which selects the recipe for
d6110c5749 Jean*7668 computing the ice cover tendency from effective thickness tendencies. Include
7669 Ian Fenty's formula.
7670 - remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using
7671 SEAICEareaFormula.
83f1d2d932 Gael*7672 - simplify notations for the various d_HEFF/d_AREA terms.
6555d1e696 Jean*7673 o pkg/gmredi:
7674 - add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code
7675 from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative;
7676 add a verification test-run (front_relax.bvp) to test GM_useBVP.
2afe30fba0 Dimi*7677 o pkg/seaice (seaice_growth v 1.111):
dbc3f8d6b1 Gael*7678 - for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's.
d6110c5749 Jean*7679 - the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to
7680 also melt ice.
6555d1e696 Jean*7681 o pkg/seaice:
13127f64f6 Gael*7682 - McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty).
7683 - can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h
6d3c37bddc Jean*7684 o pkg/cheapaml:
7685 - from Nico Wienders: New version of this package.
ffaad0659f Jean*7686 o pkg/flt:
7687 - add CPP options to prevent floats to re-enter the opposite side of
7688 a periodic domain (default: keep periodicity)
520f9effa6 Jean*7689 o pkg/gmredi:
7690 - apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners
7691 (needed for multi-dim advection).
20e9cc15d6 Jean*7692 - switch on GM Advective form in global_ocean.cs32x15 and update output.txt
520f9effa6 Jean*7693 o model/src:
7694 - fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run.
f40e476a49 Patr*7695 o tutorial_tracer_adjsens
7696 - extend to NLFS and replace maskC by hFacC
7697 (change reference output accordingly)
520f9effa6 Jean*7698
24aac58d71 Jean*7699 checkpoint62r (2011/01/24)
b8c827cb68 Jean*7700 o testreport:
7701 - add option -deloutp (-do) to remove output file after successful run
7702 - add option -mfile (-mf) for MPI machile-file and for each test-exp,
7703 extract exact list of procs from this file ; adjust COMMAND by
7704 replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs.
ab3c25e729 Mart*7705 o pkg/ecco: replace old ineffective way of penalizing deviations from
7706 first guess (of obcs) with code by Matt Mazloff
b8c827cb68 Jean*7707 o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without
aad046c5da Mart*7708 exf/cal
7709 - ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl
7710 and handle case of obcs?period == 0
7711 Not affected by these changes: There is still an inconsistency in
b8c827cb68 Jean*7712 the computation of start/endrec for the obcs variables for ALLOW_CAL
aad046c5da Mart*7713 defined (see comment by Menemenlis, 7-Mar-2003)
7714 - make S/R ctrl_get_gen_rec return something meaningful even if
7715 ALLOW_CAL is not defined
b8c827cb68 Jean*7716 - ctrl_getobcs?: simplify code so that it does not need to use
aad046c5da Mart*7717 S/R exf_swapfields
28266d9344 Jean*7718 o testreport:
7719 allow to test MPI with different number of processors for each experiment:
7720 create file "SIZE.h.mpi" in each build dir.
7721 Note: update of "-command" argument not yet implemented.
96bd925d69 Gael*7722 o model/src, pkg/autodiff, pkg/ecco, pkg/seaice:
7723 alleviate the need for additional 3D tapes when using
7724 the non-inear free surface in the adjoint. This is done
b8c827cb68 Jean*7725 by adding an 'update' of hfacc etc. to their current
7726 value at the beginning of forward_step.F.
484f2586c6 Mart*7727 o pkg/seaice
7728 seaice_lsr: move stress-divergence computations out of outer pseudo-
3d83c2ccc1 Jean*7729 timestepping loop
484f2586c6 Mart*7730 o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD'
7731 up, so that the calls of the ctrl_* subroutines are really at the end
7732 of the routine.
3d83c2ccc1 Jean*7733 o pkg/gmredi:
7734 allow to specify a 2-D horizontal map and a 1-D vertical profil
7735 as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity.
96bd925d69 Gael*7736 o pkg/seaice:
7737 move lsr iterations from seaice_dynsolver to seaice_lsr.
7738 o pkg/seaice:
7739 reduce memory footprint of seaice mutldim advection tapes,
7740 by using a 2D tape independent of the generic_advdiff ones,
7741 and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc.
484f2586c6 Mart*7742
aaf4b7889a Jean*7743 checkpoint62q (2010/12/29)
56906110dd Jean*7744 o model/src:
7745 - check horizontal grid-spacing for unset or zero/negative values.
7746 - change AD test hs94.1x64x5 to be truly a 2-D set-up.
9827e6a18a Jean*7747 o pkg/flt:
7748 - use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR
7749 - precision of input and output files set according to readBinaryPrec
7750 and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits.
7751 - initial float position from tiled file was not converted to index space
7752 (looks like a bug): fixed to make it similar to initial pos. global file.
7688b175d1 Jean*7753 o global_ocean.cs32x15:
7754 change SIZE.h of AD set-up to get same tiling as with MPI.
7755 Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11)
7756 o model/src:
7757 add flag to control printing of domain fields (bathymetry, hFac ...) in
7758 ini_mask_etc (call to plot_fieds_xy*).
7759 o pkg/thsice:
7760 if useEXF, some forcing fields are not valid in overlap: fixed by computing
7761 over the interior only + apply EXCH at the end (like with SEAICE advection).
71e006c2cc Jean*7762 o pkg/mdsio:
7763 - add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer
7764 to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS.
7765 - change barrier call for safe multi-threads access to 3-D shared buffer.
7766 - MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones)
7767 - replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and
7768 remove the 4 S/R MDS_PASS_WH_R4/8toRL/S.
1d0c7afaa8 Oliv*7769 o pkg/flt:
7770 - add fourth-order Runge-Kutta integration
7771 - add basic exch2 support (only 1 facet supported so far!)
824747e6ac Jean*7772 o pkg/mdsio+rw:
7773 new S/R to read local (or tile independent) vector (read counterpart of
7774 mds_writevec_loc, and front-end write_glvec_rl/rs).
1196ad766d Gael*7775 o global_ocean.cs32x15: additional input_ad.seaice experiment
7776 that uses pkg/seaice rather than pkg/thsice.
7777 (using multidim advection for seaice)
bba939b996 Jean*7778 o towards more F95 syntax for array specification in namelist:
7779 - change "data.diagnostics" (data.ptracers was changed before checkpoint62p)
7780 of all verification experiments.
7781 e.g.: line: fields(1,3)='ETAN ','ETANSQ ',
7782 was changed to: fields(1:2,3)='ETAN ','ETANSQ ',
7783 - finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles
a913ac327f Gael*7784 o global_ocean.cs32x15: additional input.seaice experiment
7785 that uses pkg/seaice rather than pkg/thsice.
bba939b996 Jean*7786
38e5b192c3 Jean*7787 checkpoint62p (2010/12/17)
b8373d841d Gael*7788 o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it
7789 to THSICE_SIZE.h to avoid conflict with pkg/seaice.
7790 o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint.
7791 allow for use of multim. advection in seaice adjoint.
a71dccbd8b Mart*7792 o pkg/seaice: add diagnostics for snow precipitation and sublimation flux
7793 - first attempt to close budgets by taking into account the freshwater
38e5b192c3 Jean*7794 flux implied by the sublimation of snow and ice. So far only the
a71dccbd8b Mart*7795 volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag
7796 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET
0e4cbd8946 Jean*7797 o eesupp/src:
7798 new S/R with new option (NML_EXTENDED_F77) to change array specification
7799 from F95 standard to commonly accepted extended F77 form.
7800 This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5)
7801 and to revert back to the original syntax (with -DNML_EXTENDED_F77)
7802 for less tolerant f77 compiler (e.g., pgf77, g77).
8da37cabce Jean*7803 o globalFiles:
7804 commented out in parameter file "data" since it's not safe with MPI
7805 (e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much
7806 in this case); no longer commented out in restart test (tst_2+2).
7807 o add adTapeDir to specify a special directory where adjoint tapes are
7808 written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05
0e71fc82ff Mart*7809 and cannot be used together with mdsioLocalDir.
372ecbd193 Jean*7810 o nesting pkgs:
7811 - packages_init_variables : put call to OBCS_INIT_VARIABLES in last position
7812 - update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
7813 - add parameter files + utils dir + output from short run on beagle.
99f78b5547 Gael*7814 o pkg/seaice:
7815 fix seaice_growth.F store directives; update results of exp. lab_sea.ad
372ecbd193 Jean*7816 o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid
b3992b16ea Mart*7817 unnecessary copying in adjoint code, requires new parameter NMAX_ITER
7818
810405d6e0 Jean*7819 checkpoint62o (2010/11/25)
b2aaf537fd Jean*7820 o pkg/exf:
7821 - change CPP option EXF_VERBOSE to run-time logical param exf_verbose.
810405d6e0 Jean*7822 o pkg/seaice:
7823 - seaice_ocean_stress: split a loop for better vectorization of the
7824 adjoint code
bb0aaa13c1 Mart*7825 - seaice_growth.F: fix bug in conservation of freshwater connected to
475a61469a Mart*7826 capping of heff, put contribution into d_HEFFbyNEG
bb0aaa13c1 Mart*7827 - replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat
7828 by something more sensible (parameters that are what their name implies)
7829 - change some defaults, so that by default exf-parameters are used for
7830 things like rhoAir, cpAir,latent/sensible heat parameters, in order
7831 to reproduce the old results, many data.seaice now contain funny values
7832 for cpAir and latent heat of sublimation
810405d6e0 Jean*7833 o packages_readparms.F: move exf_readparms up in line so that
bb0aaa13c1 Mart*7834 exf-parameters are visible for other packages (e.g. seaice)
a7e5ab30a6 Jean*7835 o debugMode & debugLevel=2:
7836 - differentiate between debugMode & debugLevel=2:
7837 debugMode: controls printing of debug messages (sequence of S/R calls).
7838 debugLevel: controls printing of algorithm intermediate results and stats.
7839 - remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2";
7840 => allows to print debug-stats without all sequence of call messages.
7841 - switch control of debug print from debugLevel to debugMode in many S/R.
7842 o pkg/obcs (obcs-sponge):
7843 fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the
7844 call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge)
db3f21a7ea Jean*7845 o pkg/generic_advdiff:
7846 - record overlap minimum size for each advection scheme;
7847 - refine criteria on overlap minimum size;
7848 - check and stop (in gad_check) if overlap size is too small.
7849 o pkg/obcs:
7850 - with ptracers: remove multiple calls to obcs_apply_ptracer (only done
7851 once, in ptracers_implicit.F)
7852 - with seaice: remove test on empty file name in obcs_apply_seaice (always
7853 apply OB values when tile has OB)
c4900f4204 Jean*7854 o model/src, coriolis setting:
7855 - integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical
7856 useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from
7857 files (selectCoriMap=3) with any grid.
7858 - add parameter "fPrime" for constant second Coriolis coeff (default=0).
7859 o pkg/seaice/seaice_growth.F:
7860 a few cosmetic changes that reduce the number of lines of code
36f4ad1be7 Mart*7861 o pkg/obcs: add boundary conditions following Stevens (1990)
7862 - the code follows old MOM/NAOSIM code
7863 - so far it is only implemented for the eastern and western boundaries
7864 and NOT for pTracers
3710b30939 Oliv*7865 o pkg/rbcs:
7866 - replace rbcsInIter by rbcsForcingOffset, the time in seconds at the
7867 beginning of the first rbcs forcing period.
7868 - add option rbcsSingleTimeFiles that makes rbcs read forcing data like the
7869 offline package, i.e., one file per time, labeled by iteration number;
7870 deltaTrbcs sets the timestep with which the data was generated;
7871 rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset.
7872 - rbcsForcingCycle=0 makes forcing non-cyclic.
7873 - make arithmetic safe for negative times and odd forcing periods.
7874
19b92f2fb3 Jean*7875 checkpoint62n (2010/11/09)
501625885e Mart*7876 o pkg/seaice:
2a7b0e3fd3 Jean*7877 fix masking in free-drift S/R ; update results of exp. lab_sea.fd
7878 o pkg/obcs:
7879 New S/R to copy tracer value from the OB location to narrow band region
7880 (width = same as overlap) beyond the OB: preserve OB value (needed for
7881 high-order scheme) which were overwritten by EXCH call if in overlap
7882 region. Applied to theta, salt, ptracer and advected seaice variables.
7883 With seaice: use maskInC in similar way as in gad_advection.F,
7884 in seaice_advection.F and advect.F.
7885 Update output of experiment seaice_obcs and change exp4 to test OBCS with
7886 4th order Adv.Scheme. for pasive salt and ptracer.
7887 o tools/genmake2:
7888 - when looking for an optfile (not specified), only search for Fortran compiler
7889 (remove sym-link test + setting of CPP + makedepend check + C-compiler check)
7890 - in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm
7891 (instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong)
7892 - set default for CPP to "cpp -traditional -P" (was the case without specifying
7893 an optfile, but otherwise default was just "cpp".
7894 - comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from)
7895 - when "CC" is not set in the optfile, look for possible C compiler
7896 (instead of just setting CC=cc)
7897 - put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes:
7898 => add a ".F" to ".o" rule for source files with no "#include" (such as
7899 port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS.
7900 - move gfortran before g77 in list of possible Fortran compiler (consistent
7901 with reference compiler switch from g77 to gfortran)
7902 o pkg/seaice:
7903 o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to
501625885e Mart*7904 seaice_check that stops the model, when the CPP flag is used.
7905 o seaice_growth.F: make capping of ice volume conserving by returning the
7906 capped ice as freshwater to EmPmR. This does not change the verification
7907 experiments but will change runs where the capping is acutally active
b25aab9f85 Jean*7908 o change reference platform+compiler from faulks+g77 to baudelaire+gfortran
7909 (except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5,
7910 global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD),
7911 lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd)
7912 o tools/genmake2:
7913 - merge genmake_warnings & genmake_errors into 1 log file: "genmake.log")
7914 - change DUMPSTATE default to false (can use "-ds" option to switch it to T)
7915 - clean previous genmake log files before anything else.
7916 - change Makefile to remove testreport log files (*.tr_log) and genmake log
7917 files only with "CLEAN" target (instead of "Clean");
8488313509 Jean*7918 o pkg/generic_advdiff:
7919 Change OBCS in multiDim advection (gad_advection.F):
7920 Use maskInC to prevent intermediate update of tracer-field in OB regions,
7921 thus keeping current-time-step OB values; and remove the call to OBCS_APPLY
7922 which were applying future time-step OB values.
7923 This way, all explicit calculations use current-time-step OB values
7924 (simpler and more consistent).
7925 Affects results when set-up uses time-varying OBC and multi-dim advection;
7926 update output of experiment seaice_obcs.
7b24ec4b62 Jean*7927 o pkg/seaice:
7928 move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h:
7929 this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH &
7930 SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY.
7931 Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY
7932 but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp
7933 unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h)
cc732d4fb4 Davi*7934 o pkg aim (2010/10/26):
7935 - Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation
7936 formulation with obliquity, eccentricity, ... as run-time parameters,
7937 - Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and
7938 upward shortwave radition at the surface (all-sky and clear-sky).
f84aaa453a Jean*7939 o pkg/obcs:
11aa53a8c7 Dimi*7940 - writing sections with globalFiles=T does not work: switch to tiled-files
7941 when writing sections for OBCS (change pkg/rw/write_rec.F accordingly).
7942 - fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F
7943 - apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs
f84aaa453a Jean*7944
dfe4303922 Jean*7945 checkpoint62m (2010/10/21)
f4c40b0961 Mart*7946 o pkg/seaice: vectorize seaice_solve4temp.F
7947 - move iterations loops outside of i/j-loops
7948 - requires 2D arrays for TB and effConduct
dfe4303922 Jean*7949 - add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is
f4c40b0961 Mart*7950 modified in this routine
7951 - a little bit of clean up, adjusting indentation, etc.
dfe4303922 Jean*7952 - replaced a few TEN**a by exp(a*log(10.)) in new code for better
7953 performance and '**TWO' by '**2' (because TWO is a float),
f4c40b0961 Mart*7954 replaced ONE, ZERO
2708f6625c Jean*7955 o eesupp/src:
7956 fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube
473a1d0f79 Gael*7957 o pkg/seaice/seaice_growth.F
2708f6625c Jean*7958 Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and
7959 merging process. The merged routine has two branches, and one activates the 'evolution'
473a1d0f79 Gael*7960 branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now).
7961 In summary, here is what the '10/10 revision' did consist of
2708f6625c Jean*7962 part 1: seaice_growth.F revisions 1.71 to 1.75
473a1d0f79 Gael*7963 - Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged.
2708f6625c Jean*7964 The emphasis here was on improving readability (e.g. by trying to use meaningful
473a1d0f79 Gael*7965 variable names) and modularity (e.g. by adding arrays to store heff etc. updates).
2708f6625c Jean*7966 part 1.5:
7967 - revising the lab_sea experiment to make it a more useful (i.e. stable
7968 and representative of an actual model run). This was done by generating a
7969 (winter) pickup to start from, switching back the main experiment dynamic
473a1d0f79 Gael*7970 solver from evp to lsr, having one of the experiments use the free drift solution.
2708f6625c Jean*7971 part 2: seaice_growth.F revisions 1.76 to 1.85
473a1d0f79 Gael*7972 - Sorting out hard-coded constants that prevented heat and fresh water conservation.
2708f6625c Jean*7973 - Sorting out the various fields units and sign (set early on and reset at the end)
7974 to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and
7975 fresh water stock is 'effective ice meters', and >0 implies more ice/snow.
7976 - Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks,
473a1d0f79 Gael*7977 and simplifying logical expressions to further improve readibility.
7978 part 3: seaice_growth.F revisions 1.86 to 1.89
7979 - Re-organize the blocks of code more logically.
7980 - Merging the '_if.F' pieces that add something new.
2708f6625c Jean*7981 o pkg/thsice:
7982 - vectorize thsice_solve4temp and thsice_get_exf.
65de7ad9cd Mart*7983 Problem: thsice_solve4temp has an unvectorizable statement that
7984 might also be problematic for TAF
2708f6625c Jean*7985 - thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This
7986 does not change the verifcation experiment, but will change all
65de7ad9cd Mart*7987 experiments that have this flag undefined (not tested in verification);
7988 a little reorganization to save a few 2D fields and recomputations
0d66e9256f Patr*7989 - 1st step of revisiting thsice adjoint (major recomp. sorted out)
07a36c38a7 Patr*7990 - 2nd step: fix some store dirs
7991 o seems to work somewhat, i.e. using ifort but not g77
7992 o likely cause are incomplete init. or recomputation
7993 o start verification/global_ocean.cs32x15/input_ad.thsice
cce7f684db Oliv*7994 o pkg/obcs: add support for exch2
7995 - the position of the boundary and prescribed values are specified using
7996 a global domain with exch2 facets stacked
7997 - in x for N,S boundaries (like W2_mapIO=-1)
7998 - in y for E,W boundaries (so E,W boundaries do not overlap)
7999 o pkg/mdsio: add support for writing global sections with exch2
8000 file layout is as for obcs described above:
8001 - for x-z sections, facets are stacked in x (like W2_mapIO=-1)
8002 - for y-z sections, facets are stacked in y
8f33527490 Jean*8003 o pkg/thsice:
033392cf3f Mart*8004 - change a few routines for better vectorization: thsice_albedo.F,
8005 thsice_step_temp.F, and in thsice_calc_thickn.F. Results are
8006 not affected, but in particular the latter routine has changed
8007 dramatically (not necessarily easier to read now).
8008 - re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops
8f33527490 Jean*8009 iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF.
7117852a81 Gael*8010 o verification/lab_sea:
8011 - overhaul of the forward model experiments. The main motivation
2708f6625c Jean*8012 for this revision is that lab_sea has proven quite fragile (when
7117852a81 Gael*8013 changing the sea-ice code, and switching platforms) to a point
8014 when failures were very hard to attribute to specific code problems.
2708f6625c Jean*8015 - the suspected reason for this fragility is noise amplification by evp so,
7117852a81 Gael*8016 to start with, we decided to replace evp with lsr in the main experiment.
8017 - the input.lsr experiment thus became obsolete and was removed.
2708f6625c Jean*8018 - it was replaced with the input.fd experiment that uses an
7117852a81 Gael*8019 analytical "free drift" solution as the ice velocity field.
8020 - Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp)
8021 will hopefully allow us to discriminate problems due to dynamic solvers
8022 from problems due to the thermodynamic code. input.salt_plume (lsr) allows
8023 us to test additional options, along with the salt plume package.
2708f6625c Jean*8024 - Finally a pickup was generated (at the end of a one year run) to
7117852a81 Gael*8025 make the tests more representative of an actual model run. Previously
8026 the tests starting point was a 1m thickness of ice everywhere.
2708f6625c Jean*8027 o pkg/seaice:
7117852a81 Gael*8028 - introducing S\R seaice_freedrift.F that compute the
2708f6625c Jean*8029 analytical solution to an approximate ice momentum
7117852a81 Gael*8030 equation (i.e. the simple stress/coriolis balance).
8031 - define SEAICE_ALLOW_FREEDRIFT to trigger the computation
2708f6625c Jean*8032 of the free drift velocity field, and enable its use.
8033 To actually use the free drift solution as the model ice
8034 velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice.
9aa451bbe6 Mart*8035 o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata"
8036
512c5638c7 Jean*8037 checkpoint62l (2010/10/04)
6915e96d9b Jean*8038 o pkg/seaice:
8039 -fix the USE_ORIGINAL_SBI version (for variable freezing point);
8040 -use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new
8041 version (with USE_ORIGINAL_SBI undef);
ddb00487db Mart*8042 o add hooks for new packages OASIS, the package will follow
8043 (hooks exclude the seaice pkg for now)
63712fce08 Gael*8044 o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO
6915e96d9b Jean*8045 Option to use mdsio_read_whalos.F/mdsio_write_whalos.F,
63712fce08 Gael*8046 rather than mdsio_readvector.F/mdsio_writevector.F, within
8047 adread_adwrite.F to read/write adjoint-related tapes to disk.
6915e96d9b Jean*8048 o eesupp and pkg/mdsio: ALLOW_WHIO
8049 Option to write/read 2D fields to files including tiles halos.
8050 The main purpose is for adjoint related "tape I/O".
b7f33b42e8 Gael*8051 The secondary purpose is for debugging phases.
8052 A word on those rather specifically intended purposes.
8053 The code was meant to be stripped down to the bare minimum.
6915e96d9b Jean*8054 Typically, there is a unique and basic mapping to the global
b7f33b42e8 Gael*8055 buffer (tile by tile, then proc by proc, then level by level), and
8056 byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not
6915e96d9b Jean*8057 meant to generate user friendly outputs of various shapes and forms.
b7f33b42e8 Gael*8058 Rather it is intended, for the knowledgeabale developers,
8059 to be largely independent of the many mdsio options, to allow
6915e96d9b Jean*8060 outputs of tiles+halos in debugging phases and in adjoint runs,
b7f33b42e8 Gael*8061 and to allow some flexibility in tuning (adoint) I/O depending on each
6915e96d9b Jean*8062 file system behavior. With regard to tuning, most of the potential knobs
b7f33b42e8 Gael*8063 (to leave files open, to allocate the I/O indep. of usesinglecpuio,
8064 to specify directories, to specify the typical size of I/O calls, etc.)
8065 are not yet included, and will be added if they prove useful.
2ec921609d Jean*8066 o pkg/seaice:
65c3c27d2c Jean*8067 fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F
8068 o pkg/seaice:
2ec921609d Jean*8069 new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty
8070 code (seaice_budget_ice_if.F) which enable to recover old standard
8071 code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined.
8072 temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F.
8073 o model/src (rStar):
8074 use simple average (not area weighted) of rStarFac at U,V point when using
8075 vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection)
8076 update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20.
813dd65ac9 Jean*8077
e356351660 Jean*8078 checkpoint62k (2010/09/17)
05855df642 Patr*8079 o adjoint
8080 * changed verification/global_ocean.cs32x15 ; adjoint now tests
8081 Adams-Bashforth 3 + NLFS + RSTAR
8082 * some more modifs required for ECCO-GODAE v4
54f6436301 Dimi*8083 o pkg/seaice
8084 add SEAICE_AGE_VOL option to use volume instead of area for
8085 integrating SEAICE_AGE
a89a34c510 Jean*8086 o model/src:
8087 first check-in of sigma & hybrid-sigma coordinate code ; also includes
8088 non-linear free-surface parts ; but pressure-gradient not yet coded.
96a7eb29e8 Jean*8089 o pkg/ptracers:
8090 option for ptracer to convert Salt Relax into additional EmP.
8091 tested in exp. global_ocean.90x40x15.dwnslp (update output)
8092
3eaaf3fa4e Jean*8093 checkpoint62j (2010/08/25)
4d3d3c392f Jean*8094 o pkg/ggl90:
8095 other minor changes: remove 3-D temp array gTKE (+ add argument myIter)
deff84d11b Mart*8096 o pkg/dic: car_flux.F, phos_flux.F
8097 - reduce number of exp-calls in order to improve performance
4d3d3c392f Jean*8098 - clean up a little (replace fields by their macros, etc., fix
deff84d11b Mart*8099 typo in CPP-flag)
fa4ac57b5c Gael*8100 o pkg/ggl90: minor changes
8101 - GGL90diffKrS was removed --> always use GGL90diffKr
8102 - GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV
4d3d3c392f Jean*8103 - hack of mxlMaxFlag=2 --> ensure mixing between first and second level
8104 (commented out for now)
fa4ac57b5c Gael*8105 - change in max/min operations to ensure that smoothing is ok
8106 - smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr)
8107 - always use diffKrNrT as background profile (i.e. never use diffKr field)
3983b1167c Mart*8108 o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj)
c3c9befee2 Mart*8109 o pkg/dic:
1cfcce3655 Mart*8110 - model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better
8111 vectorization
33b1baef56 Mart*8112 - small bug fix in insol for the unlikely case of a cartesian grid
8113 - towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F
8114 + now vectorize, which also removes adjoint recomputations;
8115 + replace integer maksp1 by _RL maskp1
1cfcce3655 Mart*8116 + replace a**x by exp(x*log(a)) in phos_flux.F for speed
c3c9befee2 Mart*8117
ee1e0f95df Jean*8118 checkpoint62i (2010/07/21)
1e3aeb8ba1 Jean*8119 o pkg/flt:
8120 - with OBCS: stop floats which enter the OB region
8121 o model/src:
8122 - use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones)
8123 for implicit vertical advection.
ac416c45e2 Jean*8124 o pkg/seaice:
8125 - account for melting in seaice age evolution.
1e3aeb8ba1 Jean*8126 - remove double counting of seaice ridging effect on seaice age.
ac416c45e2 Jean*8127
283e101b7e Jean*8128 checkpoint62h (2010/06/18)
ad5bd052a0 Jean*8129 o pkg/exch2:
8130 - remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1).
8131 o tools/genmake2
8132 - remove "-pdefault" option: redundant with the use of "packages.conf";
8133 - remove file pkg/pkg_default : set the default as a pkg group
8134 ("default_pkg_list") defined in pkg/pkg_groups;
8135 - fix for case pkg/pkg_depend is missing (was hanging before);
8136 - add option "-pgroups" to specify a different pkg_groups than the default.
82644c0ee5 Jean*8137 o verification/adjustment.cs-32x32x1:
8138 add a "minimal" set-up test (code_min & input_min) which only compiles
8139 eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc.
f30b73b1e2 Jean*8140 o tools/genmake2
8141 - extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg]))
8142 - fix details of checking for mnc & profile pkg when NetCDF is unavailable.
c5f3ee7c60 Mart*8143 o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these
8144 files are nearly the same anyway.
8145 Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04:
8146 - redefinition of tau(i,i) (by a factor of ustar)
8147 - 1./exf(Const/T) -> exf(-Const/T) (big change in the results)
8148 - replace rhonil by rhoConstFresh in computation of evap (bug fix)
8149 - replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results)
6f9d992eff Jean*8150 - replace
c5f3ee7c60 Mart*8151 rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh )
8152 shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j)
8153 by
8154 shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh )
8155 (changes results)
6f9d992eff Jean*8156 -> exf_bulkformulae v1.22,
c5f3ee7c60 Mart*8157 update verification experiments lab_sea, offline_exf_seaice, seaice_obcs
8158 (lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13,
6f9d992eff Jean*8159 output.txt 1.63
c5f3ee7c60 Mart*8160 offline_exf_seaice: output.seaicetd.txt 1.7
8161 seaice_obcs: output.txt 1.10)
8162 Step 2: do the actual merge and remove exf_bulk_largeyeager04.F
8163 -> exf_bulkformulae v1.23,
8164 unfortunately requires updating lab_sea.salt_plume (6 matching digits),
8165 and global_ocean.cs32x15.icedyn (only 11 matching digits)
6f9d992eff Jean*8166 Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice.
48a7bf5f11 Jean*8167 o adjoint of exch-1:
8168 - pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list)
8169 (note: was already like this when using EXCH-2) and remove flow dir
8170 and hand-written AD version of high-level EXCH S/R (pkg/autodiff);
8171 - provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow);
8172 - update pkg/exch2 diff list.
8173
1431f62bbf Jean*8174 checkpoint62g (2010/05/19)
0bb3693507 Jean*8175 o eesupp/src (exch-1):
8176 - split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F)
8177 and remove argument "simulationMode"; same thing for all exch_*rx_cube.F
8178 (renamed to exch1_*rx_cube.F).
8179 - change accordingly exch_*_rx.template and AD version in pkg/autodiff
8180 to call new exch1 S/R ; update Makefile and .cvsignore.
8181 - replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove
8182 exch2_xy_rx later)
8183 Note: after updating your code, need to run "make clean" in eesupp/src
71519bb137 Jean*8184 o test experiment bottom_ctrl_5x5:
0bb3693507 Jean*8185 new output_adm.txt with fewer grdchk & less monitor output.
71519bb137 Jean*8186 o model/src:
8187 remove the call to ini_cori in initialise_varia.F (just keep the usual one
0bb3693507 Jean*8188 in initialise_fixed.F). More consistent with coriolis & horizontal grid
71519bb137 Jean*8189 beeing treated in the same way (ini_grid is not called a 2nd time).
0bb3693507 Jean*8190 o pkg/exf:
1c4c64c172 Mart*8191 - rewrite exf_bulk_largeyeager04.F for better vectorization, changes
ba8369cbfe Mart*8192 global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated
1c4c64c172 Mart*8193 - fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now)
a435e833b1 Mart*8194 - cosmetic changes to exf_bulkformulae.F to make it look more like
8195 exf_bulk_largeyeager04.F
f286872c74 Jean*8196 o eesupp/src (exch-1):
8197 - Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1).
8198 - Separate buffer filling and MPI sending: allow EXCH-1 to work for local
8199 array (non-shared) when using MPI+MTH. Also reduces number of BARRIER
8200 (even without using MPI).
8201 - Message mode: move RecvAck setting (indicator of buffer being ready)
8202 from send_put to recv_get S/R (was useless before, but not sure if
8203 it's much more useful now);
71519bb137 Jean*8204 - Switch the order of sync: MPI-proc 1rst and then threads;
f286872c74 Jean*8205 - take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead.
71519bb137 Jean*8206 - fix AD code for communication mode ='get' (but not used).
b74efa0efe Jean*8207 o model/src:
8208 initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does
8209 not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp).
b42ffdc64e Mart*8210 o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API
46e98d66db Mart*8211 o pkg/ctrl: require a specific set of control variables and exf-flags for
8212 adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied)
c3aa58ac7a Gael*8213 o model/src:
4caeefbbc4 Jean*8214 a) 1rst version of a new driver S/R to turn-off output freq and flags after the
8215 1rst forward sweep, to avoid over-writing output files during recomputations
8216 recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?)
8217 b) 2nd version:
8218 - add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO);
8219 - switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast,
8220 writePickupAtEnd) + seaice & ptracers output;
8221 - do not switch off MNC flags (otherwise, won't get admonitor netcdf file)
958aba4d71 Jean*8222 o model/src:
c3aa58ac7a Gael*8223 - new S/R rotate_uv2en_rl (..._rs) that rotates vector fields.
7b55f0c147 Jean*8224 o pkg/exch2:
958aba4d71 Jean*8225 - remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ;
7b55f0c147 Jean*8226 - add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch).
6f7f051ae5 Jean*8227 o pkg/autodiff & exch2:
8228 process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF
8229 (for now, only if ALLOW_EXCH2 is defined).
72ca7aff83 Jean*8230 o pkg/autodiff:
958aba4d71 Jean*8231 - include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F
72ca7aff83 Jean*8232 (not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly.
8233 + clean-up comments (_RS is not always real*4)
8234 - fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R)
8235 - add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2:
8236 was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs.
e4c55a32ae Jean*8237 o testreport (AD-tests):
8238 no longer link files from dir "../input" (1rst link files from
8239 "../input_ad.[xx]" if secondary test "xx" and then from "../input_ad")
8240
39ab2f324f Jean*8241 checkpoint62f (2010/04/29)
dd69ba5157 Mart*8242 o model/src/the_main_loop.F:
8243 adjust store directives for seaice evp and multicategory according to
8244 pkg/ecco/the_main_loop.F
ec74c4ec27 Patr*8245 o adjoint:
e4c55a32ae Jean*8246 global_sum_ad was incomplete (noted many times by many people ;)
ec74c4ec27 Patr*8247 nice description by Jean U. as follows:
e4c55a32ae Jean*8248 * allreduce(var) in global_sum.F can be interpreted as
8249 reduce(sum) followed by broadcast of sum.
8250 * The adjoint of that is
8251 sum(adjoint) followed by broadcast(summed adjoint value)
ec74c4ec27 Patr*8252 or in other words, allreduce(sum, adjoint vars)
8253 We were missing the sum(adjoint)!
8254 Benign, except(!) for "global" scalars appearing in tile loops (bi,bj)
8255 (noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset).
8256 The fix should produce 16-digit accuracy between
8257 single-CPU multi-tile (e.g. nSx=2, nPx=1) and
8258 multi-CPU single-tile (e.g. nSx=1, nPx-2)
8259 We'll probably change this yet again shortly
3b017f85c7 Jean*8260 o eesupp/src:
8261 - fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?)
94ec5b807d Dimi*8262 o pkg/icefront
8263 - ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving
8264 specification of addmass array based on a 2D field, which is added
8265 at bottommost wet level at each horizontal location.
c99b00e28d Jean*8266 o model/src:
8267 horizontal grid initialisation (other than curvilinear): add code for Exch2 IO
8268 layout; (not always compatible with delX,delY setting; commented out for now).
062357823a Jean*8269 o pkg/exch2:
8270 change tile to processor setting (case nSy*nPy > 1): allows default model mapping
8271 (myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config.
8272
e98d34196c Jean*8273 checkpoint62e (2010/04/15)
a175514333 Jean*8274 o pkg/obcs:
8275 - fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert).
6526bf38ab Jean*8276 o pkg/dic:
8277 -fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up;
8278 (note: not presently tested in any forward verification exp.)
8279 update tutorial_global_oce_biogeo AD output file.
8280 o pkg/exf:
a294fb3ca0 Gael*8281 - account for the variation of albedo as a function of zenith angle
6526bf38ab Jean*8282 by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h
e8d83fb93d Jean*8283 o build_options:
8284 - rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas"
8285 o pkg/dic:
8286 change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart:
8287 - use binary pickup file for restart;
8288 - initialise atmos-CO2 box from dic_pCO2 parameter;
8289 - fix multi-threaded.
186276afbe Jean*8290 o pkg/rbcs:
8291 - clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ;
8292 change (+ fix IO calls) type of array RBC_mask from _RL to _RS.
8293 - add RBCS to exp4 passive tracer 01 (rbcs was previously untested)
8294 and update output.txt
faaf90f2c5 Jean*8295 o pkg/kpp:
8296 - add diagnostics for KPP non-local flux of Temp, Salinity and pTracers;
8297 - change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS
e8d83fb93d Jean*8298 (= ratio of KPP non-local (salt) flux relative to surface-flux) when
faaf90f2c5 Jean*8299 using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat ');
8300 - change pkg/offline to read-in average KPPghat*KPPdiffKzS from file
8301 KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile).
1a6563ae72 Davi*8302 o pkg/offline:
4daea5a88d Jean*8303 fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor
8304 (bug was added in version 1.10 on 2007-08-23).
8305 o pkg/offline:
1a6563ae72 Davi*8306 - no need to specify periodicExternalForcing, etc ... to use offline pack
8307 - offline input files no longer just single prec --> parameter offlineLoadPrec
3d5d3248cf Patr*8308 o verification/lab_sea:
4daea5a88d Jean*8309 change AD test to multi-tile setup and update all 4 AD output.
3d5d3248cf Patr*8310 NOTE: while cost function values remain very similar,
8311 gradients are very different, although gradient checks are self-consistent
8312 Should try to get to the bottom of this (cost function summation order?)
0978c8a77f Jean*8313 o pkg/dic:
8314 in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid
8315 a weakness of TAF that drops part of double precision in log10 derivative.
d7e064ff4e Jean*8316 <= changes removed since problem has been fixed in current TAF version 1.9.71
0978c8a77f Jean*8317 update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo.
5fd4ec8263 Jean*8318 o pkg/ecco:
8319 add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F
8320 update all 4 lab_sea AD output.
8321
9f4cf29369 Jean*8322 checkpoint62d (2010/03/22)
8323 o build_options:
8324 remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles.
b9024a78e5 Jean*8325 o remove unbalanced quote (single or double) in commented line of source code
8326 (may cause some warning with some preprocessor/makedepend versions).
8327 o pkg/seaice:
87ed893815 Jean*8328 fix seaice_model.F for adjoint (gael) and update AD results of experiments
8329 lab_sea (std + evp + noseaicedyn) and offline_exf_seaice.
3b0f45b28f Jean*8330 o testreport:
8331 add option '-runonly' (short: '-ro') to just do the run part (without make).
2956a926ec Jean*8332 o eesupp: remove JAM communication code (obsolete).
8194302c25 Jean*8333 o add option to genmake2 & testreport to switch "_RS" type to "real*4"
a435e833b1 Mart*8334 (if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return
8194302c25 Jean*8335 to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1
8336 (update also the output).
8337
f916330b2a Jean*8338 checkpoint62c (2010/03/02)
c805d90c6c Jean*8339 o tools/build_options :
8340 move (some) old optfiles from build_options/ to build_options/unsupported/
74230ba5cf Gael*8341 o model/src and pkg/exf
8342 surface relaxation -- separating data and data.exf options
8343 The point is to ensure that we specify the surface relaxation
a435e833b1 Mart*8344 either in data or in data.exf (but not half and half) and to
8345 avoid an accidental relaxation to 0 (which happened if a time
74230ba5cf Gael*8346 scale was specified but the file name was left empty)
4b97e458f0 Gael*8347 o model/src model/inc and pkg/mom_common
8348 ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity
8349 => addition to the viscosity field as computed by others schemes
a435e833b1 Mart*8350 o tools/build_options:
076c0d73b3 Jean*8351 - rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile)
8352 but keep the former optfile for few weeks for smooth transition
01d7251472 Gael*8353 o pkg/ecco
8354 - allow user defined cost function contributions
cc732d4fb4 Davi*8355 CPP: ALLOW_USERCOST_CONTRIBUTION
8356 USAGE: compute contributions in cost_usercost_all.F
01d7251472 Gael*8357 - note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was.
8358 the two options are complementary.
5939a6479f Gael*8359 o pkg/smooth
8360 - migration from contrib to the main repository
076c0d73b3 Jean*8361
e7a2735eaf Jean*8362 checkpoint62b (2010/01/26)
075e0d2187 Jean*8363 o pkg/monitor:
a435e833b1 Mart*8364 - change back mon_printstats_rl.F & mon_stats_rl.F and add a stop
075e0d2187 Jean*8365 (in case someone forgot to update customized pieces of code)
8366 o nonHydrostatic:
af06fd5b92 Jean*8367 - add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested);
8368 - add a simple 2-D experiment (short_surf_wave) to test it.
8369 o pkg/icefront:
8370 adding the shell of, and the hooks to, a new package that
5da8ce63fa Dimi*8371 will model melting and freezing of vertical glacier ice fronts
af06fd5b92 Jean*8372 o momentum:
451e002b6f Jean*8373 add diagnostics of momentum tendency from Hydrostatic pressure gradient
8374 (without surf.pressure term: would need a 2nd filling since implicit term).
af06fd5b92 Jean*8375 o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace
8376 two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR
8377 cannot deal with the former
884840d195 Jean*8378 o cleaning:
451e002b6f Jean*8379 - remove all (except OpenAD) old TLM output from results_ad dirs.
884840d195 Jean*8380 - remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R)
8381 - comment out maskH definition (replaced by maskInC)
8382 o pkg/monitor:
8383 - change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl
075e0d2187 Jean*8384 & mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs.
884840d195 Jean*8385
0be9783367 Jean*8386 checkpoint62a (2010/01/15)
e95eb1d512 Jean*8387 o model/src:
8388 - bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4)
987f6e1ae3 Jean*8389 o pkg/diagnostics:
8390 - add optional level number diagnostics (i.e., level number to be define
8391 explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X".
8392 - strictly check for valid parser-code(10) ;
8393 - check if adding diag to the list from the right place.
09d7c96a8d Oliv*8394 o pkg/longstep:
8395 - change parameters and fix tracer conservation with rstar/nonlinear free surface
f8b182d288 Jean*8396 o diagnostics:
8397 - in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer
8398 S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics.
75ecb6f722 Jean*8399 o pkg/diagnostics:
8400 - Add option for writing vertical integral (sum of selected levels) of an output
8401 field instead of writing output field levels. Activate this option on a per
8402 output-file basis, by setting the 2nd character of fileflag to 'I'.
8403 - Add field-specific information relative to level integral in 3rd postion
8404 of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate
8405 vertically (x level-thickness x hFac), "r"=same but without hFac.
281db5ef19 Jean*8406 o do_the_model_io:
8407 - pass end-of-model-run flag as argument, from forward_step to diagnostics_write:
8408 in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before
8409 writing pickups and stopping.
8410 o pkg/diagnostics (for now, only with mdsio):
8411 - write time information to meta file (and modify accordingly rdmds.m) :
8412 time-averaged diagnostics output: write starting and ending time of the
8413 time-averaging interval ; snap-shot diagnostics output remains unchanged;
e9ac57b72c Jean*8414 o pkg/timeave:
8415 - S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously
8416 always Nr), now assumed to be equal to number of levels of averaged field;
8417 only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F
8418 o pkg/sbo:
8419 - fix ocean bottom pressure global-average & 2-D time-ave output (was
8420 neither initialised nor filled).
8421 - add starting iteration in suffix of global-average output file
8422 (to avoid over-writing the file after a restart)
8423 - use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb).
8424 o time-average:
8425 - use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj)
8426 (pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf,
8427 ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice)
8428 this fix DIC_COST cumulative-time array (previously: bi,bj,k)
8429 - fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice)
8430 - fix missing accumulation for pkg/opps.
8431 - cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0)
8432 (pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81);
8433 - fix initialisation of time-ave vars and do only full time-step increment
8434 (i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81);
580b2d0e2d Jean*8435 o pkg/layers:
8436 - use standard RW pkg S/R to write the output
8437 and remove local write_fld version (which had a problem).
8438 - use simple cumulative-time array (no level index) to fix time-ave S/R calls.
8439 - fix LAYERS_CALC argument list.
8440 o pkg/timeave:
8441 - store cumulative-time in a simple tiled array (drop the level index)
8442 - add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array.
b59b551857 Jean*8443 o pkg/ocn,aim_compon_interf
8444 - changes for multi-threaded coupled run. (tested with ifort-11 on danton)
8445
6a7fcc88c2 Jean*8446 checkpoint62 (2009/12/23)
c32120bcda Jean*8447 o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output.
8448 (was not previously tested in any other exp.)
262f5d9bf0 Jean*8449 o pkg/monitor:
8450 - clean-up _RL/_RS version: add specific S/R for statistics with mask & volume:
6a7fcc88c2 Jean*8451 mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one
262f5d9bf0 Jean*8452 (mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics.
8453 - use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F).
8454 - change del2 calculation.
8455 - use interior masks (instead of maskH, <- to be remove).
8456 - shorter monitor suffix for forcing stats ("forcing" instead of "extforcing").
8457 o mask & obcs:
8458 - define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S).
6a7fcc88c2 Jean*8459 - move global area computation from ini_masks_etc.F to ini_linear_phisurf.F
262f5d9bf0 Jean*8460 (called after packages_init_fixed)
3a86c9b47d Oliv*8461 o pkg/obcs:
8462 - move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once.
8463 Fixes bug in obcs+exf with nSx*nSy.GT.1
8464 - fix multi-tile handling in obcs balance code
c93c5f4bd8 Jean*8465 o nonHydrostatic:
8466 - Implement AB-3 for non-hydrostatic vertical momentum ;
8467 (change ordering of var. stored in pickup file when using NH)
8468 - move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D.
8469 - add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x
8470 (in prep. for new NH free surface form).
4d27a257dc Jean*8471 o pkg/obcs:
8472 add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe
6a7fcc88c2 Jean*8473 o model/src:
4d27a257dc Jean*8474 fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography
8475
0e6056cd20 Jean*8476 checkpoint61z (2009/12/01)
4848a3791a Jean*8477 o nonHydrostatic:
8478 Fix missing vertical flux of vert. momentum near surface (k=1). This fixes
8479 a spurious source of energy in simple baroclinic adjusment test case.
8480 Update all non-hydrostatic exp output.
8481 o model/src (3-d solver):
8482 Change again 3-D solver free-surface RHS term when exactConserv=T:
8483 simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1
8484 (which was not the case with previous formulation).
8485 To recover previous version, just reset "oldFreeSurfTerm" to previous value.
8486 Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW.
8487 o nonHydrostatic:
8488 - compatible with implicDiv2Dflow < 1 ; + implement implicit factor
8489 for Non-Hydrostatic pressure gradient (similar to implicSurfPress).
8490 - change 3-D solver to work with r* (for now, only with linear free-surf.)
8491 - add few debug diagnostics (cg3d_x, residual)
85d256894a Jean*8492 o model/src:
8493 fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b).
8494 update output of exp. global_ocean.cs32x15.viscA4
f470880b96 Jean*8495 o update output of exp. global_ocean.cs32x15.icedyn after removing
8496 #define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h
8497 o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
a435e833b1 Mart*8498 o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output
2a44bd20e3 Mart*8499 for complex grids, for now only to "state", "adstate", "adexf", "adseaice"
043540edbe Mart*8500 o model: add Christopher Wolfe's implemetation of the single reduction cg2d
f470880b96 Jean*8501 (d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and
a435e833b1 Mart*8502 runtime flag useSRCGSolver. Modify verification experiment global_with_exf
f470880b96 Jean*8503 to test this code
eb4cdc75fa Jean*8504 o pkg/cd_code:
8505 Change defaut D-grid time-stepping to get the same for D-grid momentum as for
8506 C-grid momentum. D-grid velocity used to be stepped forward in time with
8507 Adams-Bashforth only on surface pressure term. Tests show that using AB on
8508 D-grid coriolis term improves stability (as expected from CD-scheme paper).
8509 To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h).
8510 Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2),
8511 lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD),
8512 tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens.
8513 Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2,
4d27a257dc Jean*8514 global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD.
4a2ef1ee39 Jean*8515 o pkg/obcs:
eb4cdc75fa Jean*8516 - fix bug in initialisation (broken since Oct 1rst modification)
4a2ef1ee39 Jean*8517 for useOBCSprescribe without useEXF.
8518
0e6056cd20 Jean*8519 checkpoint61y (2009/11/15)
10b70e5d9c Mart*8520 o pkg/seaice
8521 - change (once again) the discretization for the evp solver: rather than
8522 squaring the averages of strain rates, average the squares to give
8523 a better approximation to VP behavior (in simple test); this breaks
8524 verification experiments that use EVP (lab_sea and lab_sea.hb87)
8525 --> update outputs
dde99557d4 Jean*8526 o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit)
b2a741ef12 Mart*8527 to improve vectorization of adjoint code on TARGET_NEC_SX
29d62326d0 Davi*8528 o verification/vermix:
a435e833b1 Mart*8529 - change vermix to a more "classical" 1d column with high vertical
8530 resolution, seasonal heat flux forcing and constant wind forcing
10b70e5d9c Mart*8531 --> update outputs
6636ec7a94 Mart*8532 o pkg/seaice
8533 - fix diagnostics of principal stress components for EVP
8534 - add optional diagnostics of non-linear convergence for LSOR solver
8eb548676f Mart*8535 - make maximum zeta a runtime parameter
d7bdbe3409 Jean*8536 o model/src (3-d solver):
8537 Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49),
8538 which consisted in removing the Surf. Non-Hydrostatic pressure from the
8539 whole column and adding it to Eta (inspired from Casualli, 1999):
8540 Only affects 3-D solver initial guess and only if using ExactConserv,
8541 but tests did show a degradation of solver convergence. For this reason,
8542 decide to disable this piece of code.
8543 to recover previous version, just set zeroPsNH = exactConserv (line 78).
8544 Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW
a435e833b1 Mart*8545 o pkg/ggl90:
8f048929ff Jean*8546 - fix previous modif (unfortunatly has not been documented here).
ef30cce719 Mart*8547 o pkg/seaice/autodiff:
e69eb16cf6 Mart*8548 - add CPP flag to include clipping of zeta in EVP code;
8549 although clipping of zeta is not necessary for EVP and not recommended
8550 it was done by default, now clipping is disabled by default
d68173436e Mart*8551 - modify computation and store zetaC/Z in seaice_evp for TAF
043891c656 Mart*8552 - add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default)
6636ec7a94 Mart*8553 - change seaice_calc_viscosities/strainrates for better
043891c656 Mart*8554 vectorization after AD by TAF
9fb8a4afa4 Jean*8555 - rearrange common blocks in SEAICE.h once again for easier dumps of
ef30cce719 Mart*8556 adjoint output, adjust adcommon.h and g_common.h
8557 - change flux form of default advection scheme for better vectorization
8558 of adjoint code
a435e833b1 Mart*8559 - modify lab_sea/input.lsr to test the flux form of default advection
ef30cce719 Mart*8560 scheme
8c04a08a06 Mart*8561 o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level
8562 transition in checkpoint61r)
8563
0e6056cd20 Jean*8564 checkpoint61x (2009/10/19)
3ccf557bdf Patr*8565 o adjoint: adding two new verification experiments
a435e833b1 Mart*8566 * tutorial_global_biogeo: an online dic sensitivity experiment
3ccf557bdf Patr*8567 (work with G. Forget)
8568 * tutorial_dic_adjoffline: an offline dic sensitivity experiment
8569 (an update of the Dutkiewicz et al., 2006 paper)
8570 Both use the same CO2FLUX cost function, but different controls
8571 Gradient checks look good, but some recomp. could still be traightened out
8572 Should add xx_dic control variable to test at some point
51b66c683d Jean*8573 o model/src:
8574 add run-time parameters to check and/or mask initial Temp & Salt
7744ec9132 Jean*8575 o pkg/ptracers:
8576 apply zonal filter (if used) to all passive tracers
8577
0e6056cd20 Jean*8578 checkpoint61w (2009/10/12)
d5930766d9 Patr*8579 o adjoint:
8580 * update and finish work on adjoint of dic package (G. Forget)
8581 * start adjoint of offline package
8582 * bug fix for cube-sphere TLM code (active_file_g.F)
5ff9d8d8a4 Jean*8583 o tutorial_global_oce_optim:
8584 now tested with 4 tiles (change data.grdchk and update output_adm.txt)
7784d9f62a Jean*8585 and add SIZE.h_mpi for MPI testing
442ec6ef47 Mart*8586 o pkg autodiff
8587 - fix bug in autodiff_restore
a435e833b1 Mart*8588 - make genmake2 remove comments and empty lines from ad_input_code.f in
442ec6ef47 Mart*8589 order to reduce file size (new script file remove_comments_sed)
54e442a4cf Jean*8590 o allows to specify vertical profile of vertical viscosity (viscArNr)
38d9d89a2d Mart*8591 o pkg autodiff
a435e833b1 Mart*8592 autodiff_ini_model_io: comment out writing of grid information to netcdf
8593 files, because at this time the grid fields are a bunch of zeros
8594 (this is analogous to ini_mnc_vars.F)
74b7cbac64 Mart*8595 o pkg seaice/autodiff:
a435e833b1 Mart*8596 left-over from removing the 3-time-level fields:
74b7cbac64 Mart*8597 - small rearrangement of common blocks (SEAICE.h)
a435e833b1 Mart*8598 - fix field declaration in order to get meaningful output in
8599 adseaice.*.nc (adcommon.h)
7532a9f33f Jean*8600 o pkg obcs:
8601 - go through NH code only if nonHydrostatic=T
8602 - fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart)
7784d9f62a Jean*8603 - move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields
53056a14f9 Jean*8604 => Update output of experiment seaice_obcs
8605 - useOBCSbalance: code is wrong with multi-tile / proc: add a stop.
8546425e3d Jean*8606 - fix NH+Orlanski restart (add wvel OBC value in pickup file)
6463eff00c Jean*8607 - fix restart for useOBCSprescribe + useEXF
793e0bf23c Mart*8608 o pkg ctrl
8609 - make obcs as control parameter work also with useSingleCPUio
8610 - replace a few sny and snx by Ny and Nx to be consistent with
8611 ctrl_set_globfld_x/yz.F
cffcf702d2 Mart*8612 o pkg seaice
a435e833b1 Mart*8613 - re-introduce global field frWtrAtm for the case of
cffcf702d2 Mart*8614 ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F)
8615 - catch the case of an empty filename in seaice_cost_init_fixed.F
8616 o pkg ecco:
8617 - small bug fixes in the_main_loop
8618 . fix order of monitor arguments
8619 . change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY
8620 . move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so
8621 that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF
a435e833b1 Mart*8622 - replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the
8623 imbalance diagnostics for wmean_h/sflux = 0
cffcf702d2 Mart*8624 - add actual values to f_obcsn/s/w/e in ecco_cost_final.F
a435e833b1 Mart*8625 - catch the case of empty filenames in ecco_cost_init_fixed.F
cffcf702d2 Mart*8626 and ecco_readparms.F
8627 - fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta)
793e0bf23c Mart*8628 to make this statement meaningfull in ecco_cost_weights.F
339ad6c3b5 Jean*8629 o pkg zonal_filt:
8630 - change ZONAL_FILTER S/R interface (allows to filter 2-D fields)
8631 - when using rStar, filter uVel*hFacW instead of uVel
8632 (tested without topography: fix a Pb of growing instability with NLFS)
9fba1b3510 Davi*8633 o pkg/aim/thsice:
8634 -Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F
8635 (works as SST restoring)
55b32f1302 Davi*8636 o pkg/thsice:
8637 -add specific parameter for salt restoring in slab mixed-layer
8638 (by default equal to the temperature restoring)
8639
0e6056cd20 Jean*8640 checkpoint61v (2009/09/21)
e5d361f9aa Mart*8641 o pkg/kpp:
a435e833b1 Mart*8642 -add double diffusive contributions as a hack, turned off by default
8643 for now, and the code can be excluded with a CPP-flag
e5d361f9aa Mart*8644 EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX
8645 -add a verification experiments to "vermix" to test this code
f81982db08 Davi*8646 o pkg/mom_common:
8647 Move computation of length scales to mom_init_fixed.F (avoid recomputation
8648 at each time-steps*levels).
0dd6d0e826 Ryan*8649 o pkg/layers:
8650 Created a new package for computing volume fluxes in temperature or
8651 [not yet implemented] density layers, e.g. for calculating residual
a435e833b1 Mart*8652 overturning circulations.
8653 o pkg/diagnostics:
f4e6557763 Jean*8654 implement a RS type version for the set of DIAGNOSTICS-FILL subroutines
8655 o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option)
f88b29d124 Jean*8656 o pkg/mdsio (& pkg/rw): rework high level S/R interface:
8657 To avoid mixing type (RS/RL) of input/output array argument,
8658 replace single mixed-type array with a pair from each type (RS/RL).
03e0cc6d31 Jean*8659 o setting pickupSuff force to start from a pickup (even if nIter0=0): this
a435e833b1 Mart*8660 is now implemented for all pkgs (previously only done for the main pickup)
03e0cc6d31 Jean*8661
0e6056cd20 Jean*8662 checkpoint61u (2009/08/25)
7b5bc55348 Mart*8663 o pkg/obcs:
23ff66f209 Mart*8664 - change OB?eta from _RS to _RL and put them into a separate commen block
8665 - add code to read OB?eta from a file via obcs_prescribe_read: the code
8666 compiles and does not destroy any other experiments, the data is read
8667 properly, but the code is not tested in actual applications
a435e833b1 Mart*8668 o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to
8669 create a meaningful unit attribute for the time coordinate variable
b6045d9739 Jean*8670 o pkg/ebm: add plenty of missing "_d 0" ;
a435e833b1 Mart*8671 update results of experiment global_ocean_ebm (fwd + adjoint tests)
b6045d9739 Jean*8672 Notes: several pieces of code only works for (very) specific set up
a435e833b1 Mart*8673 (domain size, lat range, etc ...); should be documented & stop if one
b6045d9739 Jean*8674 of those assumptions is not meet.
6b1574ad60 Jean*8675 o pkg/seaice: add missing "_d 0" in HSNOW initialisation
a435e833b1 Mart*8676 update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests)
6b1574ad60 Jean*8677 and offline_exf_seaice (seaicetd + adjoint).
70d7fbc59b Jean*8678 o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC):
a435e833b1 Mart*8679 update results of experiments: lab_sea (4 fwd tests + 3 adjoint),
70d7fbc59b Jean*8680 seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2).
a435e833b1 Mart*8681 o few changes to pass when compiling with strick checking of arguments
70d7fbc59b Jean*8682 across S/R (allow to find few bugs in S/R calls).
d5724f98ed Mart*8683 o pkg/seaice:
a435e833b1 Mart*8684 - seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new
d5724f98ed Mart*8685 2d-fields, for slightly better performance
70d7fbc59b Jean*8686
0e6056cd20 Jean*8687 checkpoint61t (2009/07/22)
a435e833b1 Mart*8688 o pkg/seaice:
f503466573 Mart*8689 - remove unused variables in seaice_evp
8690 - reduce number of SQRT in seaice_evp and seaice_calc_viscosities
570ee1ae01 Jean*8691 o eeset_parms.F, open_copy_data_file.F & ini_parms.F:
8692 named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT):
5a08ea66a4 Jean*8693 each processor opens a different file (a fix from Matt).
78e9a5d276 Jean*8694 o cg2d:
8695 use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F :
8696 this reduces number of EXCH calls by 2 when using exch2.
a435e833b1 Mart*8697 For now, keep previous size array for gc2d_nsa.F to avoid Pb with store
78e9a5d276 Jean*8698 directives and missing simple EXCH (exch_s3d_rx) adjoint code.
a435e833b1 Mart*8699 o pkg/thsice:
78e9a5d276 Jean*8700 add code for Near Infra-Red albedo (from Jeff)
f3e78cec2b Jean*8701 (turned on with run-time flag: thSIce_calc_albNIR, in data.ice).
78e9a5d276 Jean*8702 o ini_model_io:
8703 move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F
8704 MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F
8705 to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice.
f3e78cec2b Jean*8706
0e6056cd20 Jean*8707 checkpoint61s (2009/06/30)
2afd155f68 Jean*8708 o pkg/exch2 (exch2_rxN_cube*):
8709 remove last BARRIER (no need to synchronise after getting data from shared
8710 buffer (get) as long as any change to buffer (put,recv) is between BARRIER)
78c0da63a8 Jean*8711 o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH
8712 and generate new output (for the 2 tests) using default rotationPeriod.
e33637256c Jean*8713 o pkg/exch2:
8714 - always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F
8715 (was already the case with AUTODIFF_EXCH2 defined)
8716 - add bj in exch2 arrays and S/R.
78c0da63a8 Jean*8717 - can now use pkg/exch2 for regular (non CS) set-up; switch test experiment
8718 MLAdjust to exch2 (identical results except with MPI -> truncation diff);
e8488bfd93 Oliv*8719 o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep
8720 - adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY
8721 GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT
8722 - verification experiment natl_box.longstep
02bc4aeec0 Jean*8723 o build_options: ifort+mpi_aces optfile (following Constantinos advise):
8724 allow different versions of ifort (8 or 9) and different versions
8725 of mpi (mpich or mpich2) to be used with the same optfile.
8726 requires to load a netcdf module and set MPI_INC_DIR (see comments inside
8727 optfile). Change testing scripts (example_scripts/ACESgrid) accordingly.
a435e833b1 Mart*8728 o pkg/seaice:
8729 fix previous modif (3-level field removed) for old-pickup reading
02bc4aeec0 Jean*8730
0e6056cd20 Jean*8731 checkpoint61r (2009/06/25)
a435e833b1 Mart*8732 o pkg/seaice:
88ddcec046 Mart*8733 - clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps:
64469ab2ce Mart*8734 1. introduce fields for time step (N-1)
88ddcec046 Mart*8735 2. do not use levels 2 and 3 anymore (but keep them)
a435e833b1 Mart*8736 3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This
8737 includes changes to pkg/thsice/thsice_get_velocity.F,
88ddcec046 Mart*8738 model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and
8739 pkg/obcs/obcs_apply_uvice.F.
8740 - completely remove code for leap-frog time stepping for second order
8741 advection
2e0a6baf06 Patr*8742 - adjusted adjoint accordingly;
8743 gradient checks have improved by an order of magnitude!
a435e833b1 Mart*8744
0e6056cd20 Jean*8745 checkpoint61q (2009/06/22)
bfa01eb1b6 Mart*8746 o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver
8747 - the boundary conditions along open boundaries are unclear, because the
8748 associated masks are set to zero and are thus treated as closed when
8749 applying the slip-boundary conditions.
8750 - move initialisation of grid variables from seaice_init_varia to _fixed
14ff2fe9e4 Dimi*8751 o adding doc/diags_changes.txt
a435e833b1 Mart*8752 o model/src:
8753 do_the_model_io: rename few pkg S/R which are called from do_the_model_io,
dddd7d8ee5 Jean*8754 to avoid "_diags" naming if no relation to pkg/diagnostics.
a435e833b1 Mart*8755 ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF
dddd7d8ee5 Jean*8756 file and only call PLOT_FIELD_XYZ if debugMode=T.
8757 remove few PLOT_FIELD_XY calls outside initialisation.
8758 remove few unnecessary BARRIER.
1aca59cbdd Dimi*8759 o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling
a435e833b1 Mart*8760 of salt_plume package in Southern Ocean
8761 o pkg/thsice:
8762 - fix hOceMxL in overlap (needed for sea-ice advection);
a870da40f8 Jean*8763 update output of experiment global_ocean.cs32x15.icedyn.
a435e833b1 Mart*8764 o pkg/seaice:
2fe56e7563 Mart*8765 - make the (placeholder-)tracer IceAge a little more meaningful
0ccf00deac Mart*8766 by avoiding ridging of age due to convergent ice flow
14ff2fe9e4 Dimi*8767 - add diagnostics for surface temperature, atmospheric and oceanic
8768 heat flux, and atmospheric and oceanic ice growth
0ccf00deac Mart*8769
0e6056cd20 Jean*8770 checkpoint61p (2009/06/10)
7b728547f6 Jean*8771 o eesupp (global_max & global_sum):
8772 - add one more element to buffer (start at index 0) for GL_MAX/SUM output;
8773 - remove starting & endding barrier (no longer needed)
4877fb20d9 Jean*8774 o pkg/mdsio, writelocal:
8775 works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined
8776 (remove the STOP): uses shared buffer IO to store data from all threads
8777 and then let master-thread write nThreads tiles.
1f0f779d4b Jean*8778 o pkg/mdsio (read/write field):
8779 - tiled IO done in 1 piece (all levels at a time);
4877fb20d9 Jean*8780 - new header file "MDSIO_BUFF_3D.h" with 3-D buffers.
1f0f779d4b Jean*8781 - multi-threaded: allow to read/write local (non-shared) array
8782 (was already working with singleCpuIO ; now works also without);
8783 => no longer needs barrier call after reading a file (added inside
4877fb20d9 Jean*8784 mds_read/write field).
1f0f779d4b Jean*8785 - move barrier calls outside gather/scatter_2d to mds_read/write_field
b54505b067 Mart*8786 o pkg/obcs/exf
a435e833b1 Mart*8787 - exf_getffieldrec.F: add a few ". _d 0" and
8788 add code to catch the case fldperiod = 0.
8789 - obcs_precribe_read.F: change if statements so that they match
b54505b067 Mart*8790 the variable type (_RL)
a435e833b1 Mart*8791 - add a separate exf_iprec_obcs to exf_set_obcs (by default equal to
b54505b067 Mart*8792 exf_iprec) as part of namelist EXF_NML_01
70cbc60ad4 Jean*8793 o pkg/mdsio:
8794 - read/write tiled (local) files: read/write 1-level tile chunk at a time
8795 (instead of segment of length sNx); expected to speed up tiled IO.
8796 o pkg/exch2:
c53c960d6f Jean*8797 - take buffer copy from/to array out of S/R exch2_send/recv into new
8798 S/R exch2_put/get ; Exch of local variable now works with MPI+MTH
8799 (tested by removing commom block statement in SOLVE_FOR_PRESSURE.h).
8800 - ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get)
70cbc60ad4 Jean*8801 - simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds
c53c960d6f Jean*8802 (which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by
8803 including Topology header file (and common blocks).
8804 - implement EXCH_IGNORE_CORNERS in scalar exchange (rx1);
8805 remove 2nd exch call in exch2_s3d_rx (no longer needed).
8806 - document S/R arg. list (+ update some comments)
1ce2a5cdfd Dimi*8807 o pkg/seaice:
8808 - added SEAICE_CLIM_AIR code, which permits modulation of surface air
8809 temperature and humidity over sea ice based on climatological values.
3827b3ff39 Mart*8810 - clean up computation of Hibler+Bryan (1987) stress coupling for the case
a435e833b1 Mart*8811 of LSR (this change is expected to change the results slightly because now
3827b3ff39 Mart*8812 it uses slightly difference moduli from the second last LSR solution, but
a435e833b1 Mart*8813 that is more consistent with the stress computations; this part of the code
3827b3ff39 Mart*8814 is not tested in the verification experiments)
7beac62984 Mart*8815 - fix diagnostics for flux of ice in case of B-grid
a435e833b1 Mart*8816 - turn strain rates eij and press into global fields within global
7beac62984 Mart*8817 common block in SEAICE.h for more straighforward diagnostics
8818 - fix diagnostics for principal stress components, press, zeta, eta
8819 to give something meaning full
607aea417f Jean*8820 o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate
8821 new output (all 4 tests) using default rotationPeriod.
37512d714c Davi*8822 o pkg KPP:
8823 - add flag (LimitHblStable) to avoid limiting BL depth under stable conditions
8824 - fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1
8825 and normal grid from 1 to Nr)
6a8a92ceb1 Davi*8826 o Fix computations of L4rdt in mom_calc_visc.F
4444d50a00 Jean*8827 o eesupp:
8828 new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg):
8829 should be called before a "stop" if we know that all process are going
8830 to stop; if one Proc does call this S/R, will hang in MPI_FINALISE.
8831
0e6056cd20 Jean*8832 checkpoint61o (2009/05/26)
52b3903673 Jean*8833 o pkg/exch2: change check_depths to issue just a warning (instead of error+stop)
8834 o model/src/ini_curvilinear_grid.F:
680765c772 Mart*8835 compute angleSin/CosC when they are not read from a file
52b3903673 Jean*8836 o pkg/seaice:
680765c772 Mart*8837 add pseudo time stepping for LSOR
cfdf8f6dc3 Jean*8838 o pkg/exch2:
8839 temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW
f834b21bef Dimi*8840 o pkg/seaice:
f81e0cd482 Dimi*8841 Adding separate sea ice albedo, drag coefficients, and HO in Southern
8842 Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h
39f815874d Jean*8843 o SingleCpuIO:
8844 fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used.
8845 o pkg/seaice:
affccff0e4 Jean*8846 put exchanged variable in (local) common block for MPI+Multi-Threads
8847 to work (necessary with exch1, and for now with exch2 too).
8d614a5ef7 Jean*8848 o verification: to get more experiments tested with mpi, mth and mpi+mth,
8849 change tiling of:
8850 aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15,
8851 hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope
8852 update output of exp:
8853 exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5),
8854 tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod)
8855 + ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU
8856 (note: output.txt generated on faulks using only 1 tile)
505fa6b5f0 Jean*8857 o eesupp & mdsio (SingleCpuIO):
8858 - remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time
8859 parameter "W2_useE2ioLayOut" (read from file "data.exch2").
8860 Note: was not effective for globalFile & useSingleCpuIO=F; now fixed.
8861 - move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc).
8862 - fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same
8863 gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array).
8dd64871a3 Jean*8864 o pkg/exch2:
8865 - new code to set-up W2-Exch2 topology (replace matlab-topology-generator):
8866 read parameter file "data.exch2" if it exists; otherwise try default regular
8867 cube without blank-tile; new header file "W2_EXCH2_SIZE.h";
8868 - update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible
8869 with new code (not to be used, just as a backup solution).
a435e833b1 Mart*8870 - add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2"
505fa6b5f0 Jean*8871 in utils/exch2/input.
8dd64871a3 Jean*8872
0e6056cd20 Jean*8873 checkpoint61n (2009/05/12)
6805d023a2 Jean*8874 o eesupp & mdsio (SingleCpuIO):
8875 - move mapping to global io-buffer inside gather_2d/scater_2d: this save
8876 memory (1 less 2D global RL array); skip 1 buffer copy; and only send/
8877 receive real*4 array (instead of real*8) to read/write 32.bit files.
8878 (new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S
8879 and remove new mapping S/R)
b983b0a9f3 Jean*8880 o pkg/mdsio: in preparation for topology-generator within pkg/exch2:
8881 - Change declaration of SingleCpuIO buffer, reduced to only 1 dim.:
8882 xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h
8883 when using exch2. Add S/R to map global io-buffer to global model array.
8884 - uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt.
8885
0e6056cd20 Jean*8886 checkpoint61m (2009/04/29)
b983b0a9f3 Jean*8887 o write_utils : change WRITE_1D_R8 to WRITE_1D_RL
8888 and add 3 other S/R for other types (R4,R8,RS).
5ae9fbe2f9 Jean*8889 Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument.
8890 o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros):
8891 - ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ;
8892 - reduce number of macro definitions (keep only those which are used);
8893 can always call directly the corrresponding S/R if needed.
b983b0a9f3 Jean*8894 - everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix
5ae9fbe2f9 Jean*8895 _R4/_R8 to _RS/_RL when applied to _RS/_RL variable.
8896 Fixed wrong type of arg in:
b983b0a9f3 Jean*8897 atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F
5ae9fbe2f9 Jean*8898 ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F
8899 To fix: global_sum of var in common block is wrong (multi-threaded) in:
8900 dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F
8901 To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops)
b983b0a9f3 Jean*8902 o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd
8903 "nlfs" mpi test is going to stop when checking for unconnected tile egdes.
52af3a32f7 Jean*8904 o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error
8905 o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile
8906 edges are closed (zero depth); might happen with "blank tiles";
b983b0a9f3 Jean*8907 for now, disabled if using OBCS.
52af3a32f7 Jean*8908 o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi":
855948c4e0 Jean*8909 link *_mpi files from "MODS" dir) to return to a strait-forward behavior.
52af3a32f7 Jean*8910 o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D)
6e7414edd7 Jean*8911 to reduce length of 1.D array print in STDOUT.
71c716cb9b Jean*8912 o adjustment.cs-32x32x1: changed to oceanic test with 1 continent
8913 + use 48 tiles (16x8): this will allow to test "blank tiles".
8914 o start to test MPI + multi-threaded (change testreport to skip tests
8915 where number of tiles do not match).
8916 o genmake2: add option "-omp" to turn on Open-MP ;
8917 passed to testreport (if using -mth) ; merge few (*+mth) optfiles.
0ab0cf443f Jean*8918 o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them)
8919 and keep the original tile numbering. Note: compatible with old
8920 W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files.
8921
0e6056cd20 Jean*8922 checkpoint61l (2009/04/07)
5a8046a779 Jean*8923 o Overlaps had been forgotten in calculating ijk keys : fixed
8924 o fix cyrus makedepend for gcc 4.4
54b0077775 Jean*8925 o experiment fizhi-cs-aqualev20:
8926 switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE)
71c716cb9b Jean*8927 and generate new output. Note: new output is much closer to the old
8928 one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from
54b0077775 Jean*8929 the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007.
8930 o pkg/fizhi:
8931 - change to avoid indices going deliberately over array-bounds
8932 - remove unnecessary MPI stuff
8933 - perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY"
8934 - new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE:
8935 does not go over array-bounds and therefore returns reliable output.
8936 - in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls:
8937 this S/R has 4 output arguments, which are used inside "get_alarm";
8938 when it is called with the same variable "ndum" in place of several
8939 output arguments, this produces weird side effect inside "get_alarm"
8940 (e.g., datein=dates(n) is overwritten by timein=times(n) since both
8941 datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum"
8942 address) and produces error.
855948c4e0 Jean*8943 o tools/gemake2: (March 27-29 2009)
a435e833b1 Mart*8944 with option "-mpi": link *_mpi files from "MODS" dir (this is what
855948c4e0 Jean*8945 testreport does).
405ae5a3ac Jean*8946 o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output
54b0077775 Jean*8947 o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F:
405ae5a3ac Jean*8948 update lab_sea.lsr & lab_sea.salt_plume results
a435e833b1 Mart*8949 o pkg/seaice:
90652fd079 Mart*8950 Major overhaul of the LSOR solver: change discretization from original
8951 finite differences to finite volume. The old routine is still in the
8952 file seaice_lsr.F and can be turned on with the CPP-flag
8953 SEAICE_OLD_AND_BAD_DISCRETIZATION
8954 Along with this change, the discretization of the strain rates is changed.
8955 The same flag turns on the old discretization in seaice_calc_strainrates.F
a435e833b1 Mart*8956 All verification experiments with seaice are affected (except for
90652fd079 Mart*8957 seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old
8958 results by setting the above flag.
8959 Further changes involve changes in defaults:
8960 - ALLOW_FLOODING is defined and turned on by default
f6450d3114 Patr*8961 - SEAICEadvSnow = .true. is now the default
8962 - SEAICEadvSalt = .true. is now the default
8963 - SEAICEadvAge = .true. is now the default
a435e833b1 Mart*8964 - SEAICE_clipVelocities = .false. is now the default
5d15d4162f Mart*8965 (as per J. Zhang's recommendation)
90652fd079 Mart*8966 - B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE
8967 is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS
8968 - seaice_growth: replace computation of UG by a simple copy from wspeed
8969
0e6056cd20 Jean*8970 checkpoint61k (2009/03/18)
4acbf6fef8 Mart*8971 o pkg/seaice: a few bug fixes mostly concerning the metric terms:
8972 seaice_lsr: fixed a few metric terms,
8973 affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs
8974 add more debugging diagnostics
8975 seaice_evp: removed superfluous many metric terms of FV discretization
8976 of stress divergence
8977 affects lab_sea, lab_sea.hb87
8978 seaice_ocean_stress: removed superfluous many metric terms of FV discretization
a435e833b1 Mart*8979 of stress divergence for non-evp solver
4acbf6fef8 Mart*8980 (this part is not tested anywhere)
8981 seaice_calc_strainrates: fixed a bug in no-slip boundary conditions,
8982 they were effectively only half slip
8983 affects lab_sea.hb87
71a18d0f38 Jean*8984 updated all relevant verification experiments (except lab_sea//output_adm.txt
8985 which was left over, but fails at level 7 & 6)
4acbf6fef8 Mart*8986
0e6056cd20 Jean*8987 checkpoint61j (2009/03/17)
78416b4f31 Mart*8988 o pkg/seaice: turn a few hard wired parameters into run time parameters
a435e833b1 Mart*8989 o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model
3393e77079 Mart*8990 time in seconds as promised by the usints in seaice_monitor and exf_monitor
a32626876a Mart*8991 o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids
8992 that are not cubed-sphere grids
f577077207 Mart*8993 o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR
2db8cfe50f Jean*8994 o pkg/ctrl:
8995 fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low)
0ad8ad6f0c Jean*8996 o non-hydrostatic (calc_gw.F):
8997 fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec
8998 update output of exp. global_ocean.cs32x15.viscA4
8999 o remove backward compatibility for thetaMin,phiMin
ece53aa93e Jean*9000 (replaced by xgOrigin,ygOrigin on Jan 27, 2009)
a435e833b1 Mart*9001 o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the
9002 interpolated wind field not only for curvilineargrid=.true., but also
514437540a Mart*9003 for a rotated grid (rotateGrid=.true.)
58378fc26e Mart*9004 o pkg/exf: add capability to bypass interpolation for runoff
9005 by setting yet another CPP-flag
ece53aa93e Jean*9006 o eesupp/src, B-grid exchange:
9007 add simple (6 tiles, non MPI) CS exch + standard interface S/R.
bb9388b6fb Patr*9008 o autodiff
9009 new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV
9010 allows to switch to single-prec common blocks;
9011 corresponding switch occurs in tamc.h, integer isbyte
9012 TAF store directivs "byte" and "kind" seem equivalent;
9013 Most tamc.h have been updated correspondingly.
9014
0e6056cd20 Jean*9015 checkpoint61i (2009/02/13)
05fc4302e4 Patr*9016 o autodiff:
9017 fix autodiff_sore/_restore indices for obcs
9018 (spotted by I. Hoteit, M. Mazloff)
685514cedc Patr*9019 o pkg/autodiff, pkg/ctrl:
a435e833b1 Mart*9020 Add flag to reduce all tapelev I/O to single-prec.
685514cedc Patr*9021 In data.ctrl set
9022 doSinglePrecTapelev = .TRUE.
ece53aa93e Jean*9023 o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2:
9024 check in hack for SX8 compiler (for dxV, dyU); remove it afterwards.
a435e833b1 Mart*9025 o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for
6870c5ed6c Mart*9026 real fresh water flux (not yet)
a94d876c45 Jean*9027 o pkg/mdsio & rw:
9028 - add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta)
9029 - add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX.
6be08e3e5c Jean*9030 o pkg/flt:
9031 - replace FLT_INIT by 3-steps standard initialization S/R: readparms,
9032 init_fixed & ini_varia.
71a5d709a0 Jean*9033 - clean-up & simplify linear interpolation S/R:
9034 move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid.
9035 - fix some indices (mainly vertical index) ; add IMPLICIT NONE.
a94d876c45 Jean*9036 - more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R.
b57550bbcf Jean*9037 - add vert. coordinate & horiz. indices to output files.
9038 - change vertical position in initial condition, from index to depth [m].
1cae6a1a9f Jean*9039 - store horizontal (decimal) indices i,j in common block (instead of coord. x,y)
9040 (easier to get to a curvilinear grid) ; delX,delY no longer used.
97caae06d7 Davi*9041 o pkg/ggl90: a few modifications:
9042 - fix bottom boundary condition, and interpolation of KappaE
9043 near top and bottom
a435e833b1 Mart*9044 - use same set of viscosity/diffusivity for TKE/momnetum/tracer
97caae06d7 Davi*9045 - add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH)
a435e833b1 Mart*9046 - add a few options for mixing-length upper limit (--> mxlMaxFlag)
d236014eb6 Jean*9047 o rename thetaMin,phiMin -> xgOrigin,ygOrigin
9048 (maintain temporary backward compatibility, until next checkpoint)
9049
0e6056cd20 Jean*9050 checkpoint61h (2009/01/27)
021d69ec69 Jean*9051 o pkg/diagnostics with "periodic averaging diagnostics":
a435e833b1 Mart*9052 fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output.
794d630b5b Jean*9053 o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82
de15b00af7 Mart*9054 o pkg/obcs: fix loop ranges for balancing code
de52daaeea Jean*9055 o pkg/flt:
9056 - improve criteria for finding which tile owns a float.
9057 - fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case.
d7a6322cee Davi*9058 o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg
9059 aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling
9060 with ocean biogeo)
5de0afb7f6 Jean*9061 o pkg/flt:
9062 - do some cleaning and fix the restart ;
9063 - add output.txt in flt_example/results to get this pkg tested.
9064 o genmake2: add an EXTENDED_SRC option and flag.
9065 for now, cannot be turned on on command line (only through genmake_local)
b5cd61a537 Jean*9066 o pkg/mdsio: read/write vector:
9067 - singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS
5de0afb7f6 Jean*9068 - singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR
b5cd61a537 Jean*9069 & MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS.
9070 - affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO)
9071 (drop to 4 digits matching for grad). But this test does not look very
9072 reliable (was already failling on eddy, fc5, at 6.digits). Update output.
9073
0e6056cd20 Jean*9074 checkpoint61g (2008/12/29)
ca04df591d Jean*9075 o pkg/flt:
9076 - move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name)
9077 + make OPTIONS file more standard.
9078 - rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name)
9079 - fix _BYTESWAPIO CPP-Flag
9080 - standard reading of file-parameter "data.flt"
b95b67d7aa Jean*9081 - fix argument list of S/R FLT_RESTART
ca04df591d Jean*9082 still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F
d67bffc17c Mart*9083 o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell
46b3c62480 Mart*9084 o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to
9085 a still unfixed compiler/optimization bug
9086
0e6056cd20 Jean*9087 checkpoint61f (2008/11/21)
a435e833b1 Mart*9088 o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ;
45b6388240 Jean*9089 update results of global_ocean.cs32x15.icedyn test.
aa713d5dbf Jean*9090 o move getcon.F from model/src to pkg/fizhi.
a435e833b1 Mart*9091 o pkg/exf: add parameter for extrapolation of temp up to the surface
df444da92e Jean*9092 and option to prevent negative evap (in bulk_largeyeager04 only).
a78ca545b5 Jean*9093 o Prather Advection scheme: fix tracer conservation for divergent flow
9094 (e.g., when using NonLin Free-Surface).
e18a7f3164 Davi*9095 o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead
db624d91db Jean*9096 o gmredi (Visbeck-variable-K):
9097 - add more parameters to Visbeck-variable-K.
9098 - use a 5 points average for dSigmaR in Visbeck-K calculation
9099 (more "homogenous": same stencil and same weights as in dSigmaH)
9100 - update output of ideal_2D_oce experiment.
a435e833b1 Mart*9101 o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4
8d0c7e204b Mart*9102 (#undef REAL4_IS_SLOW)
a435e833b1 Mart*9103 - pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4
8d0c7e204b Mart*9104 coordinate variable
a435e833b1 Mart*9105 - pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables
8d0c7e204b Mart*9106 (surface forcing fields), removes some of the functionality
a435e833b1 Mart*9107 - model/src/write_grid.F: write _RS variables as RS-netcdf variables
9108 - model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but
9109 probably not all: copy _RS surface flux fields to RL field before
8d0c7e204b Mart*9110 calling DIAGNOSTICS_FILL
a435e833b1 Mart*9111 - model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into
c983541b6d Mart*9112 real*4 (CALL EXCH_*_RS) versions.
04c02cca57 Jean*9113 - tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1
9114 (generate new output).
8d0c7e204b Mart*9115
0e6056cd20 Jean*9116 checkpoint61e (2008/10/23)
c01397a2cf Jean*9117 o gmredi (Visbeck-variable-K):
9118 - fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h
a435e833b1 Mart*9119 - change computation of Visbeck-K where Slope > Smax :
c01397a2cf Jean*9120 now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct)
9121 previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output.
bd21fff799 Jean*9122 o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic
9123 to be the same as with Z-coord. (i.e., m/s & no-units respectively).
9124 o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc)
c3fe1ef4e7 Jean*9125 o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz
c01397a2cf Jean*9126 does not become too large (to avoid precision problems in implicit-diffusion
c3fe1ef4e7 Jean*9127 solver); update ideal_2D_oce output.
9b7442ecc8 Davi*9128 o pkg ggl90:
9129 - in ggl90_cal.F: compute only one set of visc/diff, used to
9130 step forward TKE/T/S/momentum
9131 - default value of GGL90viscMax/GGL90diffMax larger and equal (to
9132 have Prandlt =1)
c01397a2cf Jean*9133 o gmredi (fm07):
284c68fd43 Jean*9134 - add lower limit on Transition layer thickness + lower limit on 1/lambda
883da68718 Jean*9135 - allow to set few more params from data.gmredi
5c4169b4ba Davi*9136 o pkg ggl90:
a435e833b1 Mart*9137 - add missing sqrt(2) factor in computation of mixing length
5c4169b4ba Davi*9138 scale in ggl90_calc.F
9139 (see Eq. (2.35) in Blanke and Delecluse, JPO, 1993)
9140
0e6056cd20 Jean*9141 checkpoint61d (2008/09/25)
900e7deb27 Patr*9142 o adjoint modifs
9143 - adapt to new field rhoInSitu
9144 - allow to revert from StoreDynVars2D, StoreDynVars3D
9145 to individual fields
9146 (switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D)
9021e26bd9 Jean*9147 o store 3-D (in-situ) density in commom block (DYNVARS.h)
9148 - save 1 rho computation.
9149 - no longer modify T & S inland when using down_slope pkg.
a435e833b1 Mart*9150 o gad_som : allow to switch to SOM advection for T & S without corresponding
b3d25f406d Jean*9151 pickup files (using new S/R: MDS_CHECK4FILE).
9152 o keep removing _BEGIN/_END_MASTER between MDSIO S/R call
9153 (for useSingleCpuIO to work in multi-threaded)
30b946f21e Mart*9154 o pkg/shelfice:
9155 - disentangle parameters: retire shelfIceFile in data/PARM05 and substitute
9156 with SHELFICEtopoFile in data.shelfice
9157 - move code for reading ice shelf topography and modifying hFacC into separate
9158 subroutines of the shelfice package
9159 - separate initialisation of "fixed" and "variable" variables
9160 - kTopC is not (yet) replaced by kSurfC, although this is possible
b3d25f406d Jean*9161 o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s
1c7cf036e1 Jean*9162 o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors)
9163 and rename:
9164 ini_phiref.F --> set_ref_state.F (+ set anelastic factors)
9165 ini_reference_state.F --> load_ref_files.F (- set anelastic factors)
9166 o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst)
9167
0e6056cd20 Jean*9168 checkpoint61c (2008/08/30)
a435e833b1 Mart*9169 o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid"
9170 to add mass source/sink of fluid in the interior (3-D generalisation
f035afc50f Jean*9171 of oceanic real-fresh water flux).
9172 o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max)
aa106dc1b1 Jean*9173 o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before)
4d4605f96d Jean*9174 o new pkg: down_slope
9175 density-driven downsloping flow parameterisation (Tellus, 1999, 412-430).
9176 - presently, modify T & S inland (dwnslp_calc_rho.F).
9177 can be avoided if rho was stored in common bloc and used in calc_phi_hyd.
9178 - implementation for ocean in P-coords not tested.
9179 - add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg.
9180 o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC)
50f1c7ab80 Jean*9181 (to facilitate conversion of oceanic pkg to p-coordinate).
a435e833b1 Mart*9182 o change FIND_RHO to FIND_RHO_2D :
f257f8b0f6 Jean*9183 pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK.
9184 o new pkg: cheapaml
9185
0e6056cd20 Jean*9186 checkpoint61b (2008/08/05)
a435e833b1 Mart*9187 o exch2:
37ee8575fd Jean*9188 change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS)
9189 - no longer depend on the order sequence (N,S,E,W).
9190 - 3rd exchange no longer needed (tested with 24 tiles).
9191 - same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff)
9192 - exch_UV_A-grid readily available (but not yet tested).
a435e833b1 Mart*9193 comment out 3rd exch call and remove copy of V to U at SE & NE face-corners
9194 (both are no longer needed) in exch_uv: no effect in forward run; but
37ee8575fd Jean*9195 get truncation error differences with adjoint exch.
a435e833b1 Mart*9196 o exch2:
0e9f2e49ad Jean*9197 - change index-bounds storage (moved from target to local tile,
9198 more intuitive this way) ; rename/remove some variables.
37ee8575fd Jean*9199 - change utils/exch2/matlab-topology-generator & code_mods accordingly.
0e9f2e49ad Jean*9200
0e6056cd20 Jean*9201 checkpoint61a (2008/07/29)
a435e833b1 Mart*9202 o exch2/matlab-topology-generator:
9d45a8c11b Jean*9203 fix bug in index bounds for N-S internal exchange (hard to tell if this
9204 had any effect on the solution).
677d07a6b5 Mart*9205 o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf
9206 is exceeded
a435e833b1 Mart*9207 o testreport: modify syntax of awk, so that it works also with
0d1768695f Mart*9208 awk, and not only with nawk and gawk
9209
0e6056cd20 Jean*9210 checkpoint61 (2008/06/24)
0a92c8c20d Patr*9211 o autodiff
9212 Change default for TAF usage by removing argument '-nonew_arg'
9213 This changes TAF subroutine argument list (ordering of active var.)
9214 Omission of this flag leads to incompatibility w.r.t. TAMC
9215 To restore TAMC-compatibility, need following modifs:
9216 * use adoptfile tools/adjoint_options/adjoint_tamc_compatibility
9217 * use CPP option #define AUTODIFF_TAMC_COMPATIBILITY
9218 Tested TAF version is 1.9.22
9219 N.B.: exch2 hand-written adjoint code currently not TAMC compatible
9220
0e6056cd20 Jean*9221 checkpoint60 (2008/06/19)
f8c2a15654 Patr*9222 --->>> This is the last checkpoint for which generating the adjoint
9223 --->>> is done via the TAMC-compatibility TAF-flag "-nonewarg"
9224 --->>> by default.
9225 --->>> Future checkpoints will ommit this flag by default.
40cd24c888 Jean*9226 o pkg/generic_advdiff, os7mp: simplify and avoid division by zero.
1b63dc87ac Gael*9227 o pkg/grdchk: Add gradient check to etan0 perturbations.
a435e833b1 Mart*9228 o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK).
9229 o pkg/autodiff: more flexibility in zeroadj.
9230 model/src: modifying do_oceanic_phys.F accordingly.
fa59c87170 Gael*9231 o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation.
9232 o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option
a435e833b1 Mart*9233 special setup of gmredi for which the adjoint is stable
fa59c87170 Gael*9234 enough for parameter optimization.
e67ddf28f4 Gael*9235 o bridging the gap between eddy stress and GM.
9236 -> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi)
9237 along with a change in CPP option (now ALLOW_EDDYPSI).
a435e833b1 Mart*9238 -> when using GM w/ GM_AdvForm:
e67ddf28f4 Gael*9239 The total eddy streamfunction (Psi = eddyPsi + K x Slope)
9240 is applied either in the tracer Eq. or in momentum Eq.
9241 depending on data.gmredi (intro. GM_InMomAsStress).
9242 -> ALLOW_EDDYPSI_CONTROL for estimation purpose.
9243 The key modifications are in model/src/taueddy_external_forcing.F
9244 pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F
40cd24c888 Jean*9245
0e6056cd20 Jean*9246 checkpoint59r (2008/05/29)
0d306f558f Jean*9247 o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array
9248 from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F);
9249 fix option to read coriolis(@ cell-corner) from files with CS-grid.
aa539d5971 Mart*9250 o pkg/mnc: add some attributes to standard 1D-coordinate variables
79e37afef0 Mart*9251 o pkg/diagnostics: enforce missing_value attribute for scalar variables at
9252 mass points, when using mnc for output
a435e833b1 Mart*9253 - add runtime parameter (missing_value, missing_value_int) to override
79e37afef0 Mart*9254 default (which is the value of getcon('UNDEF'))
9255 o pkg/mnc: prepare mnc for the actual use of missing values with the
9256 diagnostics package: small fix in mnc_cw_readwrite.template and more
9257 initialisation of never used fields
cebfffcf05 Mart*9258 - replace mnc_common.h and mnc_id_header.h with corresponding upper case
9259 versions
a435e833b1 Mart*9260 o pkg/thsice/thsice_ini_vars.F added default initial values so that
9261 thermodynamics sea ice solver does not blow up when some initial fields
cebfffcf05 Mart*9262 are missing.
87838921ba Jean*9263 o move from external_forcing_surf.F to ini_forcing.F
9264 the p-coord. hack consisting in using pLoad to set phi0surf ;
9265 update output of tutorial_global_oce_in_p (affected @ truncation level).
a435e833b1 Mart*9266 o Freshen up a bit hs94.1x64x5, notably:
9267 remove rotationPeriod and tRef=5*0. (adjoint only), and add
cebfffcf05 Mart*9268 exactConserv=.TRUE.
34e240c0d3 Jean*9269 o pkg/generic_advdiff:
9270 change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only
9271 applies to files where Temperature & Salinity 2nd Order moments are used.
bc2cda07c1 Oliv*9272 o pkg/ptracers: add second-order moment advection schemes (80 and 81);
9273 this uses a dynamically allocated internal state data structure
a435e833b1 Mart*9274 (#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h)
bc2cda07c1 Oliv*9275 and requires a fortran 90 compiler
9276
0e6056cd20 Jean*9277 checkpoint59q (2008/05/06)
934822fb62 Jean*9278 o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3)
9279 (from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977)
bb5c940526 Davi*9280 o Refresh tutorial_global_oce_biogeo, notably:
9281 - change bathymetry (put back seamounts in ACC, use hFacs)
9282 - change EOS (POLY3 --> JMD95Z)
9283 - use Bryan-Lewis vertical diffusivity
9284 - use multidimensional advection
9285 - remove old virtual virtual in dic pkg, now done through ptracer pkg
9286 - change a couple of parameters in dic pkg
b488248973 Gael*9287 o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F
a435e833b1 Mart*9288 o pkg/obcs: change default to OBCSfixTopo = .true.,
37d6577e8a Mart*9289 - set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result
9290 - replace "debugMode" with "debugLevel .GE. debLevB"
a435e833b1 Mart*9291 o implementation of TAF directives for gchem,cfc,dic
c668f876bd Jean*9292 o remove "exp5" (replaced by tutorial_deep_convection).
ba199509e7 Mart*9293 o pkg/obcs: add code to fix topography gradients normal to open boundaries;
9294 this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms;
9295 the code can be turned on by setting OBCSfixTopo = .true. in data.obcs
68dbdb7bfc Mart*9296 --> changes results in exp4, seaice_obcs
c668f876bd Jean*9297 o tutorial_deep_convection :
4c59896cb2 Jean*9298 update the set-up and increase resolution and domain size ; start
9299 from pseudo initial conditions = output at t=120mn in order to see
9300 something happening when running testreport.
e3f6e77e00 Mart*9301 o pkg/seaice: add os7mp as an advection scheme
9302 add check for advection schemes
f414077a87 Mart*9303 add a flag for restoring T and S underneath sea ice
a435e833b1 Mart*9304 o pkg/my82: add netcdf-support and diagnostics
ea0ee0d61a Davi*9305 o thsice pkg:
ba199509e7 Mart*9306 - Now hsMax limits snow height by turning it into ice following
ea0ee0d61a Davi*9307 flooding scheme (and now conserving energy)
9308 - Slight rewriting of the formula in thsice_calc_thick.F
9309 - Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos
a435e833b1 Mart*9310 --> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice
ea0ee0d61a Davi*9311
0e6056cd20 Jean*9312 checkpoint59p (2008/04/10)
2fbf89db82 Jean*9313 o gchem / dic / cfc :
9314 - add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h);
9315 - add new parameter files: "data.dic" & "data.cfc" ;
9316 - various re-arrangement in initialisation & header file ;
9317 - fix tutorial_global_oce_biogeo for multi-threaded test.
9318 o pkg/dic: test for "pickup_dic" file when restarting ;
9319 if no pickup-file, can restart with a re-initialised pH (same as it did
b3b930c218 Jean*9320 before) providing pickupStrictlyMatch is set to False.
eec9c6a066 Jean*9321 o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP
9322 + fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP
9bfbe2231e Jean*9323 o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2
9324 and staggerTimeStep is off (needed for stability of Internal-wave dynamics).
9325 o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax,
9326 & lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers
9327 (note: not clear to me what lambdaTr1ClimRelax is still used for ...)
2f4da9d91b Jean*9328 o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which
9329 scheme to use for vorticty-term ;
a435e833b1 Mart*9330 - compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F
2f4da9d91b Jean*9331 (with default selectVortScheme, return to original discretisation)
9332 - remove weird combination (e.g.: upwindVorticity & highOrderVorticity)
0b784ff841 Mart*9333 o pkg/seaice: add a line to the summary to indicate grid type (B/C)
81ea2c715a Jean*9334 o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the
9335 bottom ; only used with variable horizontal viscosity and non-hydrostatic.
9336 also fix diagnostics VISCAHW & VISCA4W.
9337
0e6056cd20 Jean*9338 checkpoint59o (2008/03/07)
92268978d1 Jean*9339 o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran).
360ad14abb Mart*9340 o change the loop ordering in most gad_*_adv_x.F to improve vectorization:
9341 move a few statemens out the main loop into separate loops
a435e833b1 Mart*9342 o pkg/shelfice:
9343 - sort out freshwater flux; convert freshwater fluxes to mass fluxes
674cb80ca8 Mart*9344 (kg/m^2/s), does not break tests, because in verification/isomip,
9345 rhoConstFresh=rhoConst (by accident)
e3465203db Mart*9346 - rearrange computation of tLoc, sLoc, pLoc to make code more efficient
9347 - move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into
9348 new file model/src/seawater.F, so that they are available for all pkgs.
9349 - convert potential temperature into in-situ temperature. This changes the
9350 isomip tests => update tests
a435e833b1 Mart*9351 o add a flag writePickupAtEnd (default=true) to be able to suppress
97a8c939f6 Mart*9352 writing a pickup at the last timestep
a435e833b1 Mart*9353 o tools/mpack-1.6 :
7739cd8f78 Jean*9354 - disable automake (not working) and autoconf (not needed).
9355 - update to version 1.6.4 which fix MD5 code on some 64 bits platforms
9356 also cleaner with much less compilation warnings.
a435e833b1 Mart*9357 o pkg/profiles:
9e1d042ca2 Gael*9358 rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg
9359 (for "less than 32 characters name" compiler requirement)
212017a383 Dimi*9360 o pkg/obcs and pkg/exf: added capability to specify seaice open boundary
9361 conditions that have a different sampling frequency than S/T/U/V obcs
a435e833b1 Mart*9362 o pkg/diagnostics (stats-diags):
cae4654411 Jean*9363 - fix global Min/Max in case 1 processor get only empty tiles
e89c0084d6 Mart*9364 o genmake2: replace (4 times)
9365 make genmake_tc_1.o >> genmake_warnings 2>&1
9366 with
9367 COMM="$CC $CFLAGS -c genmake_tc_1.c"
9368 echo $COMM >> genmake_warnings
9369 $COMM >> genmake_warnings 2>&1
9370 to make genmake2 always see the value of CC as specified in the optfile.
2c62398d5b Jean*9371 o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid.
9372 - add diagnostics for 1srt & 2nd Order moments and sub-grid variance.
9373 - modify verification advect_cs test to test SOM-advection on CS-grid.
239c38208f Gael*9374 o pkg/ctrl:
a435e833b1 Mart*9375 - Rewrite of ctrl_map_ini_ecco.F,
239c38208f Gael*9376 introducing a generic routine (ctrl_map_ini_gen.F).
9377 - Modification of ctrl_bound/adctrl_bound handling control vector bounds.
2c62398d5b Jean*9378
0e6056cd20 Jean*9379 checkpoint59n (2008/02/09)
a435e833b1 Mart*9380 o pkg/diagnostics: for large number of diagnostics, store diagnostic mate
ae37e502a3 Jean*9381 number in dedicate array "hdiag":
9382 - new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST
9383 with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST.
9384 - many small changes (integer format) for large number of diagnostics
9385 - start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with
9386 a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23.
7514c1bd55 Mart*9387 o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For
9388 usingSphericalGrid, this allows to define the rotated grid coordinates
9389 via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the
9390 geographical coordinates according to the inverse of the rotation defined
a435e833b1 Mart*9391 by the Euler angles, so that Coriolis parameter and online-interpolation by
7514c1bd55 Mart*9392 exf works with the geographical coordinates on XC/YC/XG/YG.
a435e833b1 Mart*9393 Naturally, this feature does not work with all packages, so some
9394 combinations are prohibited in config_summary (flt, flt_zonal, ecco,
9395 profiles), because there the coordinates are assumed to be regular
9396 spherical grid coordinates.
c9e4a2e67d Gael*9397 o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc:
9398 - introduce isopycnal diffusion coefficient control.
a435e833b1 Mart*9399 o tools/adjoint_options:
c9e4a2e67d Gael*9400 - additional control vector components.
8b4eff4f81 Mart*9401 o pkg/mnc: have mnc create marginally meaning full coordinate variables
a435e833b1 Mart*9402 (that is the grid indices) if usingCurvilinearGrid and NOT EXCH2
9403 o pkg/mypackage:
9404 - add example of read/write pickup for state-var ;
1c85ab9892 Jean*9405 - add entry points to the main code for state-vars diags & write-pickup.
659d0ae881 Dimi*9406 o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year
9407 transitions for useExfYearlyFields
a435e833b1 Mart*9408 - add new subroutine that determines the file to read from for
510778fc01 Mart*9409 use*YearlyFields = .TRUE. and .FALSE.
a435e833b1 Mart*9410 - add a verification experiment to global_with_exf that tests
23f0d70669 Mart*9411 useExfYearlyFields with USE_EXF_INTERPOLATION defined
a435e833b1 Mart*9412 o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in
9413 analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new
9414 subroutines (which could be generated from a template, because they are
7c7f4c7f71 Mart*9415 almost identical), for now they are included in obcs_prescribe_read.F for
9416 simplicity
e189b52423 Mart*9417 o pkg/exf:
a435e833b1 Mart*9418 - add a little more diagnostic to exf_interp_read (in analogy to
e189b52423 Mart*9419 mds_read_field, can be turned off with debugLevel < debugLevA=1)
9420 - improve vectorizability of exf_interp for TARGET_NEC_SX, makes code
a435e833b1 Mart*9421 ugly but fast by unrolling short inner loops, inserting a unroll=8
4f5a52ae80 Mart*9422 directive in routine lagran, and splitting a loop and making do while the
9423 outermost loop (the latter requires the intoduction of index arrays)
0f64a7d6fb Dimi*9424 o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice
02aabb8fe5 Dimi*9425 o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver
9426 http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html
3b88786c4e Dimi*9427 o verification/seaice_obcs: updated for restart test and latest options
dadd13178c Mart*9428 o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different
9429 ice rheology (so-called truncated ellipse, that gets rid of tensile stress);
9430 for now this is only available for the C-grid code and also within
9431 #ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code
9432
0e6056cd20 Jean*9433 checkpoint59m (2008/01/14)
b1bf47d3b3 Dimi*9434 o pkg/seaice: use different time constant for melting (SEAICE_gamma_t)
9435 and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature
a435e833b1 Mart*9436 o gad_som : fix flux output (& diagnostics) to have same units as other
9437 advection scheme fluxes (was previously multiplied by deltaT).
41fb919ba6 Dimi*9438 o added verification/seaice_obcs both to test seaice open boundaries
9439 and to provide an example matlab scrpt for generating them
9440 o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume
5968a91b01 An T*9441 o pkg/salt_plume: clean up salt_plume_frac.F to
9442 remove redundancy in PlumeMethod 1 and 4
30c6f5b1cd An T*9443 o pkg/kpp: added saltplume diagnostics
49834856da Dimi*9444 o pkg/obcs and pkg/seaice:
9445 - do not set uice and vice to zero when OB*icefile are unspecified
9446 - OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default
9447 - moved seaice tracer obcs after call to seaice_growth
824966555a Dimi*9448 o pkg/salt_plume: added various options for salt plume depth
9449 criterion and for vertical distribution of the salt
c98c324ec7 Jean*9450
0e6056cd20 Jean*9451 checkpoint59l (2007/12/18)
94059a384d Jean*9452 o pkg/ptracers: new version of ptracers pickup:
9453 read meta file and write only fields which are needed to restart.
9454 ( same logic as main pickup file ; also using pickupStrictlyMatch )
e6b0d1006c Dimi*9455 o pkg/seaice:
f2446b8a43 Mart*9456 - add timescale for melting due to warm mixed layer as a means of
9457 setting SEAICE_availHeatFrac more conveniently
9458 - add a CPP-flag/runtime parameter check for flooding algorithm
e6b0d1006c Dimi*9459 - reformulated availHeat in seaice_growth.F to be independent of AREA
f2446b8a43 Mart*9460 o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent
9461 unit changes
00127a5872 Dimi*9462 o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint
ef5afff8c1 Mart*9463 o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC
9464 SX vector computer.
6eb23881b9 Dimi*9465 o pkg/seaice:
9466 - removed SEAICE_FFIELDS.h and seaice_get_forcing.F
9467 seaice forcing fields can now be read only through pkg/exf
9468 - removed some unused halos
21234f54a9 Jean*9469 o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP
0b49ffce6f Dimi*9470 o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL
9471 or U/VICE from U/VWIND before computing U/VSTRESS
cd7677e357 Dimi*9472
0e6056cd20 Jean*9473 checkpoint59k (2007/11/30)
409b09eb42 Dimi*9474 o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between
9475 dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results.
62e148683f Jean*9476 o fix un-initialised variable problem (in mom_vecinv & shap_filt):
94059a384d Jean*9477 all experiments pass when compile with un-initialised var. checking option.
e4775240e5 Dimi*9478 o added pkg/salt_plume
c28f57ed2e Jean*9479 o script to test restart (for now, in MITgcm_contrib/jmc_script)
a435e833b1 Mart*9480 o pkg/seaice: new read/write pickup version.
c28f57ed2e Jean*9481 read meta file and write only fields which are needed to restart.
9482 ( same logic as main pickup file ; also using pickupStrictlyMatch )
df45546054 Mart*9483 o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates)
b030fd2059 Jean*9484 o lab_sea.hb87: modify the domain & update output.hb87.txt :
9485 lat-long grid & no-slip BC in seaice-dynamics produce different sigma12
9486 at j=1 & j=Ny+1 : this case is not treated correctly in the restart
9487 process. Fixed here by closing the domain at the Northern boundary.
9488 o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD.
9489 o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing
9490 a set of consecutive levels in/from a 3-D array.
a435e833b1 Mart*9491 o pkg/ptracers:
b030fd2059 Jean*9492 use a 2 characters string ioLabel to identify tracer (if more than 99 tracers).
74f73e83d7 Jean*9493 to-do: fix pkg/diagnostics when large number of diagnostics are defined.
9494
0e6056cd20 Jean*9495 checkpoint59j (2007/11/09)
054a6ca04b Jean*9496 o in pkgs: dic, obcs, offline, rbcs:
9497 standard way to compute coeff. for time interpolation between 2 time reccords
9498 which retains full precision (& make results less dependent on compiler).
9499 update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo.
f82f0d1e3a Mart*9500 o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those
9501 packages instead of reading ice cover and wind speed separately
dee09995de Jean*9502 o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h
9503 (keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad
9504 to allow to compile customized code before the update)
a435e833b1 Mart*9505 o cleaning-up:
1330311b36 Jean*9506 - fix CPP instruction syntax in pkg/obcs
9507 - replace (some) call to MDSIO S/R with call to RW interface S/R ; and
9508 add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio)
9509 - fix some threads issue in IO parts.
7f2d5ae7b4 Davi*9510 o pkg/dic:
9511 - add tons of "_d 0" (--> much better testreports !)
9512 and then update outputs of tutorial_global_oce_biogeo
7d697fe457 Jean*9513 o pkg/mom_fluxform:
9514 add a special version of momentum advection intended to conserve momentum
9515 next to a bathymetry step or a coastline edge. (default = off = #undef)
715883b931 Jean*9516 o new read/write pickup version:
9517 - for now, only implemented for main (mdsio) pickup file.
9518 - write out only what is needed to restart; merge pickup_nh , pickup_ph
9519 and main pickup together.
9520 - read meta file; read only what is needed to restart; stop if a field
9521 is missing (if pickupStrictlyMatch=T, = the default) or try to restart
9522 if it make sense (even if the restart is not perfect).
9523 - if no meta file, assume that pickup to read corresponds exactly to
9524 a pickup that would currently be written.
9525 - read pickup written in the old format (until checkpoint59i) if it
9526 recognizes an old meta file (no field-list).
9527 - add a meta file in exp. which starts from a pickup: 2 cases:
9528 a) minimal meta file (with just file precision) + pickupStrictlyMatch=F
9529 e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta
9530 b) a meta file describing the content of the associated pickup file
9531 e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta
9532 o pkg/mdsio & pkg/rw:
9533 - new routine to read a meta file ; new set of routine to read
9534 Multiple-fields file (with meta file).
5459643feb Dimi*9535 o added open boundary conditions capability for seaice
9536 HSNOW, HSALT, UICE, and VICE
fa757486b0 Dimi*9537
0e6056cd20 Jean*9538 checkpoint59i (2007/10/21)
3420897bc6 Patr*9539 o adjoint:
a435e833b1 Mart*9540 * fix multiDimAdvection adjoint
3420897bc6 Patr*9541 (partial recomputation problem by TAF for fVerT(:,:,kDown)
9542 and comlev1 size definition (maxpass vs. max. number of tracers)
9543 * verification/global_ocean.90x45x15 adjoint now tests
9544 NLFS and multiDimAdvection using DST3 (=30)
9545 * verification/lab_sea now tests multiDimAdvection using DST3 (=30)
a435e833b1 Mart*9546 o pkg/kpp: add "_d 0" to real constant (if missing);
846ec3a65a Jean*9547 update output of exp: natl_box (10.digits); vermix (std, 7.digits)
9548 and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits).
97b9193f01 Jean*9549 o prepare for "clever pickup" implementation: add new header file "RESTART.h"
9550 for internal parameters related to restart process (formerly from PARAMS.h)
9551 and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2.
9552 o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed
9553 as argument. (only atm2d & obcs write_pickup have not yet been updated)
fc36747b80 Jean*9554 o pkg/monitor:
9555 - use GLOBAL_SUM_TILE instead of _GLOBAL_SUM
9556 - fix mon_stats_rs (statistics over the full domain, even where field is zero)
9557 - account for deep Atmosphere factor and density factor (anelastic)
b48f786726 Dimi*9558 o added open boundary conditions capability for seaice HEFF and AREA
11b7991b31 Mart*9559 o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989)
9560 thermodynamics
a435e833b1 Mart*9561 - requires a little reorganization, which affects the testreport results
11b7991b31 Mart*9562 of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment,
9563 so that now the conservative form is tested
9564 - add a few comments
fc36747b80 Jean*9565 o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code*
5cc78a2bb0 Mart*9566 o add a little bit of code to gad_os7mp_adv_?.F to help vectorization
37de51ebf5 Mart*9567 o add new diagnostics to seaice: advective, diffusive fluxes (only for
a435e833b1 Mart*9568 multidim-advection, for scheme 2 they are not filled) and transports,
37de51ebf5 Mart*9569 thermodynamic growth rates
5c9e11f575 Jean*9570 o change units of EmPmR (inside the code, + within coupling interface)
9571 from m/s to kg/m2/s (mass flux) but leave input file unchanged.
a435e833b1 Mart*9572 Affects results @ truncation level (cg2d match) and update output of
5c9e11f575 Jean*9573 experiments: lab_sea(6), global_ocean.90x40x15(10),
8106187dda Jean*9574 global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11)
9575 + adjoint results: global_ocean_ebm(11) and lab_sea (12).
5c9e11f575 Jean*9576 Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T).
8106187dda Jean*9577 Next: will retire convertEmP2rUnit (simply using mass2rUnit instead).
9578
0e6056cd20 Jean*9579 checkpoint59h (2007/09/29)
a435e833b1 Mart*9580 o pkg/exf:
97f0a6ab4c Mart*9581 - improve vectorization by moving if-statement out of loops in
9582 exf_mapfields, exf_radiation
9583 - exf_bulkformulae.F: introduce 2D fields and vectorize code
63ceaaa79c Dimi*9584 o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package
a435e833b1 Mart*9585 o testreport:
9586 - allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE
b60e6e79c3 Jean*9587 monitor & update offline_exf_seaice exp. output.
9588 - AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost)
f09197aee0 Mart*9589 o pkg/seaice:
9590 - bug fix in the evp solver: boundary conditions were affected be
9591 masking of zMax/zMin (changes results)
a435e833b1 Mart*9592 - minor bug fix in boundary conditions in seaice_calc_strainrates
f09197aee0 Mart*9593 (changes results for no_slip)
9594 - seaice_lsr.F: make interpolation of eta dependent on boundaries
9595 - replace hardcoded lower limit for zeta (zMin) by runtime parameter
9596 - add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean
9597 stress formulation and no-slip boundary conditions
453b5521e5 Jean*9598 o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP
9599 in gad_calc_rhs.F ; add few safety stops in initialisation phase.
e06023d8a7 Dimi*9600 o pkg/seaice: a first HSALT time stepping equation has been checked in
6aebec07e1 Dimi*9601 o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV
9602 in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem
9603 without requiring DO-IF statements
acdf6745c2 Jean*9604 o pkg/thsice:
9605 use continuous power-law function for partition of energy between lateral
9606 melting/freezing and thinning/thickening ; old code using step function
9607 still available with #undef THSICE_FRACEN_POWERLAW
9608 update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice
9609 o testreport: change AD testing : check against results/output_adm.txt
9610 using same scripts as for forward test.
6aebec07e1 Dimi*9611
0e6056cd20 Jean*9612 checkpoint59g (2007/09/17)
6d61a12d79 Jean*9613 o adjoint testing: in preparation for changing testreport:
9614 - output format: cost and grad written on separated lines
9615 - ad output results in directory "results" (instead of "results_ad")
fdfa8e151f Dimi*9616 o pkg/seaice: adding ice salinity HSALT as a prognostic variable
06687b5615 Dimi*9617 o pkg/seaice: changes for using pkg/seaice with pkg/obcs
a435e833b1 Mart*9618 o pkg/ecco: allow user defined cost function contributions
a3953b5266 Jean*9619 o testreport:
9620 Allow to choose (per experiment) the list of tested output variables
9621 and the main variable (used to issue a pass/FAIL ) ;
9622 - for now, done by adding the specific list in file: [exp]/input/tr_checklist
6d61a12d79 Jean*9623 - default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ;
a3953b5266 Jean*9624 Also modify printing of summary:
9625 a) ">" NN "<" indicates the "main" variable (used for pass/FAIL)
9626 b) echo the list of tested variables in the individual summary.txt of
9627 each experiment.
768f1a0767 Jean*9628 o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of
9629 threads and number of processes (with #define GLOBAL_SUM_SEND_RECV)
9630 (but still depend on the tile decompostion of the domain).
a435e833b1 Mart*9631 o pkg/seaice: change a discretization detail to make the B-grid code
9632 "more symmetric". This change is likely to remove all "ridges/leads" that
9633 where quasi-aligned with the grid in B-grid solutions. It may also be
9890ce5b02 Mart*9634 the solution to the stress coupling issues with the B-grid.
746e4b22c8 Jean*9635 o each tested exp: add a "run" directory with a standard ".cvsignore" file ;
9636 remove .cvsignore from input dir. (since testreport no longer run here).
00f1a01b56 Jean*9637 o pkg/thsice:
746e4b22c8 Jean*9638 - cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h"
00f1a01b56 Jean*9639 - fix reshaping of sea-ice just after advection:
9640 melt all the ice only if ice-volume is too small.
9641 - re-visit lateral/thinning repartition of melting (modifs from May 04, 2007):
9642 prevent lateral melting if sea-ice fraction is too close to iceMaskMin ;
9643 and update experiment global_ocean.cs32x15.icedyn (+start from pickup files).
be8537d9a0 Jean*9644 o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water
9645 tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged.
a435e833b1 Mart*9646 o define mass2rUnit & rUnit2mass as units conversion factor, used for surface
de702e22c7 Jean*9647 forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit
9648 (z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse;
9649 and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error
9650 of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16
9651 -> update output.txt
9652 o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME):
9653 this affects truncation error: -> update output.txt of exp:
9654 global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr,
9655 ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon.
9656
0e6056cd20 Jean*9657 checkpoint59f (2007/08/21)
a435e833b1 Mart*9658 o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode)
9659 o pkg/ctrl: ctrl_bound forces parameter corrections to stay in
5e4d837505 Gael*9660 a bounded range (in forward mode)
59227d8f71 Gael*9661 o pkg/ecco, ctrl, autodiff and mom_common:
9662 internal parameter controls, completements of implementations
7cb9ec3ac0 Jean*9663 o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy.
9e6f983930 Jean*9664 o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ;
9665 (not seem any difference in testing results).
a435e833b1 Mart*9666 o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains
7cb9ec3ac0 Jean*9667 at face corners.
a435e833b1 Mart*9668 o pkg/generic_advdiff:
c3947d579e Jean*9669 - in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR)
9670 loop range indices for computing vertical advection tendency
9671 and do the calculation in the interior only (no overlap) ;
9672 for now, only implemented for SOM advection (to save CPU time).
9673 - add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment)
ffa5f4b126 Patr*9674 o exch2 adjoint
9675 First set of changes:
9676 - add exch2 hand-written adjoint templates
9677 - exch2 hand-written no longer use TAF-flag 'nownew_arg'
9678 This will require cleanup in pkg/autodiff/*.F
9679 (changed routines currently kept separate in verif. code/)
9680 - Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC
9681 that used to hide exch2 or cubed-sphere specific code
9682 (commented via 'cph-exch2')
eb0337bb06 Dimi*9683 o pkg/seaice
9684 - Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE.
a435e833b1 Mart*9685 o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update
142f944c15 Jean*9686 output of global_ocean.cs32x15.thsice .
ffa5f4b126 Patr*9687
0e6056cd20 Jean*9688 checkpoint59e (2007/07/26)
eed8e492b5 Jean*9689 o exch2: new S/R that only use the cube-tracer (center-position) exchange:
9690 for B-grid vector (not yet tested) and C-grid vector (<- only used
9691 when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined).
8c3259a14c Dimi*9692 o starting implementation of Duffy et al. (GRL 1999) salt plume scheme
9693 (#ifdef ALLOW_SALT_PLUME)
713e6ff2ab Dimi*9694 o gather_2d/scatter_2d: removed halo regions
ca76150054 Jean*9695 o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007
9696 scheme and the corresponding test case (under front_relax dir). For now,
9697 only available with Skew-flux form and not yet tested in realistic set-up.
a614482486 Patr*9698 adjoint: store directives updated, but gradient checks deteriorated,
9699 so maybe GM/Redi adjoint is now broken.
7dadb0325c Patr*9700 o seaice adjoint
9701 * add AREA, HEFF, HSNOW as control variable
9702 (should not change lab_sea results)
9703 * CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40
09379e5080 Dimi*9704 o pkg/seaice:
9705 * added computation of saltFlux in seaice_growth;
9706 For time being, sea ice salinity is assumed constant
9707 contribution of snow flooding to freshening of sea ice is neglected.
9708 SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it
9709 defaults to 0.0 in order to maintain backward compatibility.
9710 Typical values for SEAICE_salinity are 4 to 10 g/kg.
9711 * replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F
9712 * added SEAICE_availHeatFrac, which specifies fraction of surface level
9713 heat content used to melt or grow ice
c7cb92a732 Dimi*9714 * commented out cap of HICE: it helps keep ice thinner
9715 * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option
a6d2313c04 Dimi*9716 * applied OBCS T/S mask to HEFFM sea ice mask
7dadb0325c Patr*9717
0e6056cd20 Jean*9718 checkpoint59d (2007/06/21)
d2b8341951 Jean*9719 o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array
9720 for {PKG} state variables, and called from DO_STATEVARS_DIAGS.
9721 (keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics)
9722 o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0"
9723 and change default value of parameter "GM_Small_Number";
9724 update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15,
a435e833b1 Mart*9725 global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf,
d2b8341951 Jean*9726 tutorial_global_oce_biogeo, tutorial_global_oce_latlon
f79922cd31 Gael*9727 o pkg/ecco: cost function when applying pkg/smooth to controls
9728 o pkg/ctrl: add forcingPrecond run time parameter
6ac96a67e3 Mart*9729 o pkg/seaice:
9730 - replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code
a435e833b1 Mart*9731 - fix bug in metric terms of u-equation in LSR solver (implicit part),
6ac96a67e3 Mart*9732 changes verification/lab_sea
9733 - rearrange implicit part of u-equation in LSR solver to make it easier to
9734 read, understand, and debug. This causes changes at the truncation level.
a435e833b1 Mart*9735 - fix (serious) bug in the boundary conditions (sign error in the implicit
6ac96a67e3 Mart*9736 part) of the LSR solver. Changes all LSR results.
de31ea8481 Dimi*9737 - fixed problem with HSNOW initialization to avoid thick snow when AREA
9738 is initilized with small values - does not change lab_sea results.
9739 - added HsnowFile initialization capability
a435e833b1 Mart*9740 o pkg/smooth: addition to model/src and pkg/ctrl so allow
bf0c19d334 Gael*9741 initialization of pkg/smooth and application to control vector
19ab789a27 Mart*9742 o pkg/seaice: fix another bug in the LSR no-slip boundary conditons
249fe8e752 Gael*9743 o dependencies: pkg/profiles requires pkg/cal
8d3088d3d7 Gael*9744 o pkg/profiles:
9745 - added option ALLOW_PROFILES_GENERICGRID
9746 -> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming
a435e833b1 Mart*9747 that interpolation information (grid points and coefficients) is provided
8d3088d3d7 Gael*9748 within the netcdf input files.
9749 -> sample matlab scripts can be found in MITgcm_contrib/gael
9750 that allow you to prepare netcdf input files.
a435e833b1 Mart*9751 - also modified: cleaner include statements, cleaner error print statements,
8d3088d3d7 Gael*9752 cleaner stops when error, and more tests of the netcdf input files consistency.
a0c93d7fd2 Jean*9753 o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs.
04b45d6d21 Mart*9754 o pkg/seaice:
583c1cf330 Mart*9755 - move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this
9756 requires a new routine: seaice_diagnostics_fill.F
acaec430f5 Mart*9757 - make sure that seaice does not move if not forced (pressure replacement
9758 method, Hibler and Ip, 1995), changes results
04b45d6d21 Mart*9759 - and new damping criterion for EVP solver according to Hunke, JCP, 2001
a435e833b1 Mart*9760 - SEAICE_evpDampC = > 0. turns it on (615. is the recommended value).
04b45d6d21 Mart*9761 It is turned off by default (=-1.), because it changes the results.
b1e9686d05 Mart*9762 - make it possible to read AREA from a file, too.
04b45d6d21 Mart*9763
0e6056cd20 Jean*9764 checkpoint59c (2007/06/04)
93133b7df9 Jean*9765 o add S/R and diagnostics for oceanic mixed-layer depth
9766 o move GMRedi call after all vertical mixing schemes (including KPP)
a435e833b1 Mart*9767 o pkg/thsice:
93133b7df9 Jean*9768 - ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs
9769 (melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice
de3611c1c1 Mart*9770 o pkg/obcs:
9771 - bug fix for balance code
2d85697240 Mart*9772 o pkg/seaice:
6bfbbed422 Mart*9773 - allow values of SEAICE_elasticParm > 1
a435e833b1 Mart*9774 - add new parameter SEAICE_evpTauRelax as an alternative
b559ca9c5c Mart*9775 to SEAICE_elasticParm
6bfbbed422 Mart*9776 - make lsr boundary conditions free slip (by default), changes result
887a79a904 Mart*9777 - add code for no slip boundary conditions for lsr
2d85697240 Mart*9778 - set minimum of zeta to zero (and not 4e8) (changes results)
b559ca9c5c Mart*9779 - add a cap on AREA after advecting AREA if seaice_growth is not called
04010225bf Jean*9780 o change calculation of Visbeck K:
a435e833b1 Mart*9781 - no longer depend on tapering scheme; instead, compute slope (limited
04010225bf Jean*9782 by GM_maxSlope). this is equivalent to what was comuted before with
9783 clipping or linear tappering.
93133b7df9 Jean*9784 - fix vertical averaging (wrong by 1/2 level)
04010225bf Jean*9785 - leave the old version (but will not be maintained) within
9786 #ifdef OLD_VISBECK_CALC / #endif
93133b7df9 Jean*9787 - update output of exp. ideal_2D_oce
ae6dbd4886 Mart*9788 o change error catch in calc_r_star to improve vectorization
fc0ec0c7ea Jean*9789 o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and
9790 add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf).
5728d4a98b Patr*9791 o adjoint:
9792 Re-organized adjoint checkpointing according to Matt Mazloff
9793 (but with modifs/completions/cleanups)
9794 Storing is now bundled into large arrays to optimized I/O
9795 (and second step in cleanup of the_main_loop)
fc0ec0c7ea Jean*9796
0e6056cd20 Jean*9797 checkpoint59b (2007/05/16)
59d7b34837 Jean*9798 o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d):
9799 - export/import (between ocean & coupler) fields needed for ocean DIC.
a435e833b1 Mart*9800 o pkg/seaice:
9801 - get rid of three more exchanges seaice_calc_viscosities (required
17cb3b1135 Mart*9802 different loop boundaries in seaice_lsr and seaice_ocean_stress)
9803 - bug fix in seaice_ocean_stress (update of lab_sea required)
9804 - reduce loop boundaries to necessary minimum also in seaice_evp
a435e833b1 Mart*9805 - go back to the old way of computing deltaC/Z as the adjoint likes that
17cb3b1135 Mart*9806 better
ec0736eb1a Davi*9807 o Refresh of tutorial_global_oce_latlon (includes changing salinity-like
9808 passive tracer to an Age Tracer) + update output.txt
93f8102905 Jean*9809 o pkg/exf:
7bb7cdd467 Jean*9810 - implement A-grid / C-grid selection for wind-stress input files.
9811 - clean-up exf_wind.F (remove us, use wspeed instead ; add wStress)
9812 for now, in exf_bulk_largeyeager04.F only :
9813 - change implementation for case where windspeed + 2. components wind-stress
9814 are read-in. AND use rhoConstFresh to convert evap.
9815 o pkg/seaice:
9816 - use correct EXCH_UV for wind-forcing (on A-grid).
9817 - change SEAICE_OPTIONS.h to limit the number of option combinations (regarding
9818 SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops.
9819 o pkg/exf:
93f8102905 Jean*9820 - default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC)
a435e833b1 Mart*9821 EXF_INTERPOLATION:
93f8102905 Jean*9822 - merge global_with_exf/code version of exf_interp_read.F
a435e833b1 Mart*9823 to the main code ;
9824 - Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when
9825 reading the file ; Important: This options needs to be defined to recover
93f8102905 Jean*9826 previous code.
9827 otherwise, use fixed size array to read in (size=exf_interp_bufferSize).
9828 - no longer loose real*8 precision along the way when using exf_iprec=64.
2f88b60189 Mart*9829 o pkg/seaice: rearrangement of common blocks (really needs more cleaning up)
b3e6145587 Mart*9830 - change discretisation of evp-solver in order to avoid another exchange
9831 (changes lab_sea) and clean up a little
a435e833b1 Mart*9832 - replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS)
b3e6145587 Mart*9833 help the adjoint (this also changes the results slightly)
9834 - add a few "_d 0" where they had been missing in seaice_evp.F
9835 - cleaning up: remove unused seaice_calc_rhs.F
35a74aa2c2 Jean*9836 o pkg/exf: some cleaning-up:
9837 - change various "constants" into runtime parameters
9838 - cleaned-up Large&Yeager04 routine which should eventually
9839 replace exf_bulkformulae.F (changed names of S/R and CPP)
9840 and merged various ALLOW_ATM_WIND options
9841 only used with thsice pkg (in thsice_get_exf.F):
9842 - implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04)
9843 which are used when useStabilityFct_overIce=TRUE (= the default)
9844 - change default values of ice & snow emissivity and scale downward LW
9845 by ice & snow emissivity.
9846 o pkg/thsice:
0a9955b282 Jean*9847 fix few little problems, in thsice_calc_thickn.F:
9848 - growth vertically (and not laterally) if iceFrac == iceMaskMax
93133b7df9 Jean*9849 - melt only laterally if hIce < hThinIce (as the comments say)
0a9955b282 Jean*9850 and in thsice_extend.F:
9851 - allow to form ice even when iceFrac == iceMaskMax (by increasing thickness)
9852 - start to form ice as soon as the minimum ice-volume is reachable.
a435e833b1 Mart*9853 update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice),
0a9955b282 Jean*9854 and cpl_aim+ocn
66b38c4c51 Mart*9855 o pkg/kpp
9856 - move computation of surface related input fields to KPP into a new
9857 subroutine kpp_forcing_surf.F
0a9955b282 Jean*9858 - remove wrong (within bi,bj loops) EXCH calls.
9859 - little cleaning (add argument myThid in last position, cvs header ...)
a435e833b1 Mart*9860 - for now, fix conservation problem by exchanging KPPviscAz (may not
0a9955b282 Jean*9861 be the best fix)
f83c00719e Mart*9862 o pkg/seaice
9863 - check for inconsistent evp parameter/cpp-flag combination
9864 - remove leftover errIO flat for obsolete name list error handling
4b058176c1 Patr*9865 o OpenAD
9866 - changed verification/OpenAD to full baroclinic setup (including GM/Redi)
f83c00719e Mart*9867
0e6056cd20 Jean*9868 checkpoint59a (2007/05/01)
09e3b53265 Mart*9869 o pkg/seaice: some parameter clarifications and a little bit of clean up
f8fa27d193 Jean*9870 o pkg/thsice: rename run-time parameters:
9871 himin -> hIceMin
9872 himin0 -> hThinIce
9873 hihig -> hThickIce
9874 i0 -> i0swFrac
9875 transCoef -> bMeltCoef
9876 frac_energy -> fracMelting
9877 add new parameters: hNewIceMax, fracFreezing, dhSnowLin
9878 with default values (for now) that do not change the results.
9879 remove old version of thsice vars advection in pkg/seaice.
a435e833b1 Mart*9880 o in FFIELDS.h:
18ca872a92 Jean*9881 - replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD
9882 - make pLoad & sIceLoad always available (but still only used if
9883 ATMOSPHERIC_LOADING is #define).
fe66051ebd Dimi*9884 o pkg/kpp: replaced _KPP_RL with _RL
059d9fc14f Dimi*9885 o bug fixes for vertical diffusivity computations when both KPP and
a3b5d49db3 Dimi*9886 3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F
9887 are no longer updating the vertical diffusivity array
9888 (passed as argument) but are (re-) setting those arrays.
2e88c0564a Mart*9889 o pkg/seaice: fix bug in evp solver, while doing that
9890 - change (improve?) discretization of stress computations for both
9891 cgrid-lsr and evp solver
9892 - add a new routine to compute strain rates
ed84a09795 Mart*9893 - the above changes lab_sea results
9894 - add no slip conditions for evp solver (off by default), lsr-version
9895 may follow
9896 - fix exchange for shear at Z-points (does not change lab_sea)
9897 - retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp
9898 (to force the user to pick a time step since there is not "safe" way
9899 of choosing it)
4686684434 Mart*9900 - add principal stress diagnostics
a435e833b1 Mart*9901 - rearrange fields for evp a little to avoid having to call a: too many
9902 exchanges and b: exchanges for stress trensor components which we do
fe367969c0 Mart*9903 not have.
9904 - modify Hibler+Bryan (1987) stress coupling so that it reuses information
9905 of evp, complete rewrite for lsr case (latter is does not yet work
9906 in all cases)
efab83c021 Mart*9907 o pkg/kpp: add code to have mixing in shelf ice caverns
cb6682d07b Mart*9908 - add myThid to all kpp routines (long overdue)
efab83c021 Mart*9909
0e6056cd20 Jean*9910 checkpoint59 (2007/04/19)
a435e833b1 Mart*9911 o pkg/exf:
62cf11cfe0 Patr*9912 - fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND &
9913 ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid
a435e833b1 Mart*9914 - move exf header files from lower_case.h to UPPER_CASE.h ;
62cf11cfe0 Patr*9915 add missing cvs Header & Name
9916 - add adjoint routines and flow dirs for newly used exch_uv_agrid routines
d9a285b784 Patr*9917 - add namelist param. selectStressGridPosition, exf_monFreq
a435e833b1 Mart*9918 - retire many _CLIM routines, and remove data.exf_clim
d9a285b784 Patr*9919 + params moved to data.exf
9920 + climsst, climsss now handled by exf_set_gen, i.e.
9921 climss?period=0 refers to constant field,
9922 climss?period=-12 to monthly forcing
9923 - split up namelists in data.exf
e1d22dfae3 Mart*9924 o pkg/seaice:
9925 - remove seaice_exch and seaice_exch_uv
9926 - remove superfluous exchange of theta
9927 - add myThid to seaice_budget_ocean/ice
039e537654 Mart*9928 - add new interface for atmospheric wind forcing (C-grid only)
9929 + new routine
9930 + two new field (taux, tauy for stress over ice)
9931 + removed one global field (DAIRN) for C-grid case only
62cf11cfe0 Patr*9932 o pkg/thsise
9933 - 2nd set of modifs for thsice adjoint in conjunction with exf
d9a285b784 Patr*9934 o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.)
e1d22dfae3 Mart*9935
0e6056cd20 Jean*9936 checkpoint58y_post (2007/04/15)
0aefc24df1 Dimi*9937 o Added capability for latitudinal dependence of Bryan and Lewis, 1979
e40c34e398 Dimi*9938 vertical diffusivity, similar to that in MOM4; turned on using
9939 #define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using
9940 diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file.
a7c5f770ff Dimi*9941 o Added capability for 3D specification of background vertical diffusion
9942 coefficient. This is done by (i) #define ALLOW_3D_DIFFKR
9943 in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime
9944 "data" file that contains the 3D vertical diffusivity coefficients.
a10167ebd7 Jean*9945 o ice dynamics (pkg/seaice) with thsice thermodynamics:
9946 - add code within pkg thsice to advect & diffuse sea-ice fields
9947 similar to (and will replace) what has been added in seaice_advdiff.F,
9948 but: - conserving Mass, Heat & Salt.
9949 - better when using non-linear advection scheme (not yet fully tested)
9950 - can also be used in atmospheric set-up (for now, only the diffusion).
bf363e629f Dimi*9951
0e6056cd20 Jean*9952 checkpoint58x_post (2007/04/04)
fa535b8213 Jean*9953 o IO option for global-file compact format:
9954 - add options when generating topology (utils/exch2/matlab-topology-generator)
9955 - add I/O capability (pkg/mdsio).
9956 - adapt utils/matlab/rdmds.m to read this format.
9957 for now long-line format not yet supported by pkg/mdsio (& exch2).
4c0efb30d8 Mart*9958 o shelfice: add a few diagnostics
9959
0e6056cd20 Jean*9960 checkpoint58w_post (2007/03/13)
db8fa666e0 Jean*9961 o p-coord. non-hydrostatic using reference profile for w <-> omega conversion:
9962 rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref
9963 (and replace horiVertRatio in NH code).
a435e833b1 Mart*9964 Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !)
db8fa666e0 Jean*9965 and tutorial_plume_on_slope (sensitive to truncation)
2496f367f4 Mart*9966 o seaice: if ALLOW_ATM_WIND is undefined use wind stress
9967 directly to drive seaice model (C-grid only)
9968 o exf: when input wind-stress (#undef ALLOW_ATM_WIND):
a435e833b1 Mart*9969 - reintroduce computation of wind from stress,
9970 - compute tau (in exf_bulkformulae.F) from windstress averaged to
2496f367f4 Mart*9971 mass points to avoid tau = 0
b3d6cfe67b Mart*9972 - fix serious bug: (1/3) in Fortran is not the same as (1./3.)
2496f367f4 Mart*9973 o rdmnc.m: make it work with "global" files created with gluemnc
fedb0baa62 Jean*9974 o rdmnc.m : some improvements in dealing with singleton dimension
9975 (tested on all testreport mnc output files).
9976 o genmake2: disable pkg/profiles if netcdf test fails.
108c7eb2d4 Jean*9977 o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output.
462fd48b6a Mart*9978 o move call to cal_readparms up to make calendar parameters/variable available
9979 to all packages
9980
0e6056cd20 Jean*9981 checkpoint58v_post (2007/02/08)
bafc84b6a4 Jean*9982 o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get
9983 useDynP_inEos_Zc tested.
5d2261ac89 Dimi*9984 o pkg/exf: changes to properly interpolate/mask/scale initial fields
7c705f78f8 Dimi*9985 o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields
9986 and portions thereof. See read_cs.txt for description and examples.
c4b9b1e3e9 Jean*9987 o utils/matlab/cs_grid/bk_line: to compute transport through passages,
9988 add a script (grt_circ_bkl.m) to generate broken-line between 2 points,
9989 following the great-circle arc between those 2 points.
9990 o trap un-initialized variable with pathscale compiler on weddell.mit.edu
9991 (thanks to Constantinos): fix few problems and get (almost) all exp to pass.
95c3249206 Jean*9992 o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in
9993 - enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h)
9994 - used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81)
9995 - still needs work (not working with some options ; efficiency to improve)
9996 and serious testing.
9997 - use this scheme for temperature & salinity in 2 advection test exp.:
9998 advect_xy & advect_xz, respectively.
9999
0e6056cd20 Jean*10000 checkpoint58u_post (2007/01/12)
42a486092f Jean*10001 o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels.
31fd7701e4 Jean*10002 o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA.
10003 o testreport: add option "-skipdir" to skip some test.
a435e833b1 Mart*10004 o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent
31fd7701e4 Jean*10005 momentum calculation.
10006 o gad_advection: fix vertAdvecScheme (if different from advectionScheme)
10007 o some cleaning: usePickupBeforeC35 no longer supported ; remove this option.
10008 remove checkpoint.F and the_correction_step.F (no longer used);
10009 do the k loop inside CYCLE_TRACER (supposed to be more efficient).
a435e833b1 Mart*10010 o add option (linFSConserveTr) to correct for tracer source/sink due to
31fd7701e4 Jean*10011 Linear Free surface
0e1f0a567f Mart*10012 o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine
10013 o pkg/thsice: fix reading mnc-pickups
10014
0e6056cd20 Jean*10015 checkpoint58t_post (2006/12/30)
62990a23c1 Jean*10016 o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F)
10017 o pkg/mdsio:
10018 - clean-up mdsio_readfield.F & mdsio_writefield_new.F and
10019 move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) &
10020 mdsio_write_field.F (S/R MDS_WRITE_FIELD);
10021 - fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD
10022 - collect old S/R in one file: mdsio_rw_field.F (now just a call to
10023 either MDS_READ_FIELD or MDS_WRITE_FIELD )
10024 - new S/R (to replace MDSWRITEMETA), which allows to write more
10025 informations (variable names, time ...) to meta files.
10026 - modify rdmds.m to give back the meta file content.
f0676079d6 Jean*10027 o pkg/diagnostics: change vertical interpolation to be safer, and more
10028 flexible (define p-levels to interpolate to in data.diagnostics);
a435e833b1 Mart*10029 add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right
f0676079d6 Jean*10030 diagnostic pointer.
494a260c71 Mart*10031 o pkg/seaice: more cleaning up of seaice_growth, added many comments
0e1f0a567f Mart*10032 o pkg/exf: put runoff0 and runoff1 into the appropriate common block
72f428a311 Mart*10033 o fix multi-category seaice:
a435e833b1 Mart*10034 - change cpp flag SEAICE_MULTILEVEL to more meaningful name:
72f428a311 Mart*10035 SEAICE_MULTICATEGORY
10036 - fix short wave heat flux
ac10466ef6 Jean*10037 o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics
a435e833b1 Mart*10038 and allow to use EVP solver. Change forward lab_sea: test both EVP
ac10466ef6 Jean*10039 solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint)
13ac555e3c Patr*10040 o Initial check-in of lab_sea adjoint
10041 (very similar to natl_box_adjoint/code_seaice)
10042 * used C-grid and EVP solver
10043 * used KPP, GM/Redi
10044 * uses inAdExact=.TRUE.
10045 * gradient checks fail for both ADM and TLM
10046 due to sensitive snow melt code in seaice_grwoth (look for "JZ")
10047 f.d. gradients actually seem more problematic than ADM, TLM gradients;
10048 issue is related to forward mismatch between g77 an ifort
66cb0aa2f6 Mart*10049 o pkg/seaice: overhaul of thermodynamics
10050 - growth.F and groatb.F are replaced by new routine seaice_growth.F
10051 - budget.F is replaced by two new routines seaice_budget_ocean/ice.F
10052 - move a few global fields out of SEAICE.h into seaice_growth.F and
10053 make them 2D (FICE/QNETO/ ...)
10054 - remove FO (it is the same as QNETO)
10055 - introduce a few local fields to avoid modifying external fields such
10056 as atemp, etc.
10057
0e6056cd20 Jean*10058 checkpoint58s_post (2006/12/11)
58d34f56b6 Dimi*10059 o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F
10060 changed exf_set_gen.F so that
10061 genperiod=0 means input file is one time-constant field and
10062 genperiod=-12 means input file contains 12 monthly means
475943d866 Jean*10063 o CG2D: use pre-computed solver main-diagonal (stored in common block);
10064 this affects truncation error ; generate new output file for exp. which
10065 fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d),
10066 global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d),
10067 ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d),
10068 MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d),
10069 tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d),
10070 vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d)
c5d33297c7 Jean*10071 o start implementation of deep-atmosphere and anelastic formulation
d83c991b0e Jean*10072 o verification: remove 2nd copy of input files and use script "prepare_run"
10073 to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M)
1c10df8cad Mart*10074 o mom_common/vecinv/fluxform: fix a few initialisation isssues
544c96562c Gael*10075 o profiles: fix for multithreaded case
10076
43ae10a9d8 Jean*10077 o diagnostics: rename few diags:
10078 s/'PRESSURE'/'RCENTER '/g
10079 s/'TICE '/'oceFreez'/g
10080 s/'TAUX '/'oceTAUX '/g
10081 s/'TAUY '/'oceTAUY '/g
10082 s/'SWFLUX '/'oceQsw '/g
10083 s/DIFx/DFxE/g
10084 s/DIFy/DFyE/g
10085 and add few ocean-forcing diagnostics:
10086 atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS
ab48336167 Dimi*10087 o modifications to pkg/seaice/growth.F and budget.F, which change results of
10088 lab_sea experiment: HSNOW was sometimes treated as effective and sometimes
10089 as actual snow thickness. It now refers everywhere to effective snow
10090 thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA.
43ae10a9d8 Jean*10091
0e6056cd20 Jean*10092 checkpoint58r_post (2006/11/17)
8307959141 Dimi*10093 o modifications to pkg/seaice/growth.F, which change results of
10094 lab_sea experiment: fixes pertain to melting snow over open water, to
10095 masking EVAP under sea ice, and to using the correct AREA variable for
10096 computations of EVAP, PRECIP, HSNOW, and GHEFF
5f4df5533c Ed H*10097 o add ability to read bathy, salt, and theta using MNC (off by def)
eefc792916 Mart*10098 o add flooding algorithm and advection of HSNOW for pkg/seaice;
10099 both are turned off by default and do no change any results
a435e833b1 Mart*10100 o seaice advection with pkg/thsice: a step toward the use of non-linear
cc4235ab79 Jean*10101 advection scheme, but #ifdef or commented out for now (requires more EXCH).
23209571d0 Jean*10102 o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens
10103 (identical results) and the standard version of EXTERNAL_FIELDS_LOAD
10104 in natl_box (affects results @ truncation level: update output.txt)
10105 o multi-threading and IO:
ba51931058 Jean*10106 - replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R.
10107 - remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls
10108 (needed to work with SingleCpuIO): tested in all verif. exp.
874c68b9c9 Jean*10109 o GAD: use simpler DST3 formulation as default (old version left within #ifdef)
10110 affects the results (but none of the verification test uses this scheme).
9913de8fec Patr*10111 o Adding some pkg/diagnostics capability to pkg/seaice
10112 (will certainly be subject to changes)
983e72444d Patr*10113 o ctrl: adding new control variables:
10114 lwflux, lwdown, evap, snowprecip, apressure, runoff
9913de8fec Patr*10115
0e6056cd20 Jean*10116 checkpoint58q_post (2006/10/20)
f5cbf7b96d Dimi*10117 o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up
10118 1/6-deg Southern Ocean configuration by 8% on IBM Datastar and
10119 high_res_cube configuration by 4% on Columbia.
a615280822 Jean*10120 o clean-up multi-threaded problems (reported by debugger tcheck on ACES);
10121 add (in global_with_exf/code) a version of EXF_INTERP_READ without
10122 dynamical allocation (seems to work in multi-threaded).
10123 o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using
10124 single CPU io) so that TAF does not have to see EESUPPORT.h
725982e0dd Jean*10125 o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux)
10126
0e6056cd20 Jean*10127 checkpoint58p_post (2006/09/08)
fc187b9c6d Mart*10128 o obcs: stop if obcs is used with useCDscheme = .true.
a435e833b1 Mart*10129 o shelfice:
4fd1c14d86 Mart*10130 - fix a sign error so that no slip at shelfice interface works
a435e833b1 Mart*10131 - remove stop for combination non-hydrostatic code and shelfice. That does
4fd1c14d86 Mart*10132 not mean, that the results are correct, but at least they are numerically
10133 stable
bd91f7dab7 Davi*10134 o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted)
9dd22fcf15 Patr*10135 o added adjoint exch routined for all exch*3d* routines
10136 and updated flow directives
bd91f7dab7 Davi*10137
0e6056cd20 Jean*10138 checkpoint58o_post (2006/08/28)
acd22c6e91 Jean*10139 o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ;
10140 remove old subroutines (_XY_ & _XYZ_); update the adjoint version.
d0ebb46870 Jean*10141 o change controling S/R for writing pickup file (new S/R do_write_pickup)
10142 and clean-up reading/writing of pickup files.
10143 o fix local version of read/write pickup (NH part) in rotating_tank/code
49423ca970 Jean*10144 o simplify EXCH interface:
10145 - change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list)
10146 - not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version
134f469a8d Ed H*10147 o added the regrid package
a435e833b1 Mart*10148 o shelfice:
29ffe622cd Mart*10149 - add a simple boundary layer scheme to reduce noise
10150 - fix the indexing in shelfice_u/v_drag so that there will be actually drag
49423ca970 Jean*10151
0e6056cd20 Jean*10152 checkpoint58n_post (2006/08/14)
a435e833b1 Mart*10153 o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to
bbc1d9f1e8 Jean*10154 local variable (not in common block).
a435e833b1 Mart*10155 o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass.
10156 - still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more);
da8bc3fbe0 Jean*10157 - still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls
10158 to work with SingleCpuIO.
a435e833b1 Mart*10159 o add "_d 0" to real constant of pkg/cfc subroutines ;
d77b191e54 Jean*10160 update exp. cfc_exemple & tutorial_cfc_offline output files.
15d8704b4b Jean*10161 o multi-threading and IO:
a435e833b1 Mart*10162 - all threads call READ_FLD S/R (needed if using SingleCpuIO):
15d8704b4b Jean*10163 (no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R.
10164 - barrier before and after reading.
10165 - stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE)
10166 - avoid using MDS_WRITELOCAL for LAND pkg output.
10167 - new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics
10168 common-block variables ; Allows multi-threading with master-thread IO.
a435e833b1 Mart*10169 o change default MAX_NO_THREADS from 32 to 4 ;
10170 and stop cleanly when MAX_NO_THREADS is too small.
e20ba03425 Jean*10171 o add S/R BAR_CHECK to check multi-threaded barrier synchronization
10172
0e6056cd20 Jean*10173 checkpoint58m_post (2006/07/17)
ade0862df3 Jean*10174 o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc.
10175 and side-drag) on CS-grid : global_ocean.cs32x15.viscA4
4641b6f2a1 Jean*10176 o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp.
a435e833b1 Mart*10177 keep global_ocean.90x40x15 (for AD testing) with former secondary test
4641b6f2a1 Jean*10178 (".qshyd") as the main test (mv output.qshyd.txt to output.txt)
10179 o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos;
10180 add MITgcm_tutorials (= code + all the tutorials)
61b89af843 Gael*10181 o ecco, option to compute cost for total ssh (mean+anom)
fe8bfd2a85 Gael*10182 o consistent with addition of ptracer and ssh in pkg/profiles
021f06a8d1 Gael*10183 o profiles: adding ptracer and ssh
a435e833b1 Mart*10184 o testreport: change multi-test output-file name
a91df43a18 Jean*10185 (from output.txt.{name} to output.{name}.txt)
da8bc3fbe0 Jean*10186 o profiles: now ok for mutli-tiles case
a435e833b1 Mart*10187 o seaice: add 4 parameters for different advection schemes for area,
1633c22cfc Mart*10188 (effective) seaice thickness, enthalphy, and snow height. Their default
10189 is the standard parameter SEAICEadvScheme
a435e833b1 Mart*10190 o calc_gw:
78de812e24 Jean*10191 - add cosFacU in zonal viscous flux (harmonic.visc.).
10192 - put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt.
10193 of tutorial_plume_on_slope.
10194 o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria).
1fa758ce8e Jean*10195 o calc_gw: true flux-form, account for horizontal grid spacing.
a435e833b1 Mart*10196 update rotating_tank results, but not plume_on_slope (affected at
1fa758ce8e Jean*10197 truncation level, 11 digits).
10198
0e6056cd20 Jean*10199 checkpoint58l_post (2006/07/12)
a435e833b1 Mart*10200 o calc_gw:
1fa758ce8e Jean*10201 - take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V
10202 - remove side-drag for now (need to fix it); update plume_on_slope results.
10203 - fix for partial-cell & non-uniform dz; update plume_on_slope results.
066de0bcd6 Patr*10204 o commit code to make SST/SSS weights spatially variable
10205 (based on either variable in-situ or variable initial T/S weights)
9c7011b92a Patr*10206 o pkg/ecco:
10207 * commit code to relax deviations of xx_theta, xx_salt to 5*sigma,
10208 now based on horizontally varying weights wthetaLev, wsaltLev
10209 * cost_averagesflags now returns year indices in addition to day, month
a435e833b1 Mart*10210 * sflux balance is performed on annual basis
9c7011b92a Patr*10211 (sflxumm, sfluxmm2, bal_sfluxmm)
10212 * for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO,
10213 including separate counting and multipliers
11d329f17a Patr*10214 o pkg/rbcs
10215 * add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing
926e82ae0e Jean*10216
0e6056cd20 Jean*10217 checkpoint58k_post (2006/07/06)
a75fd4a3a0 Jean*10218 o testreport:
a435e833b1 Mart*10219 - always build in dir. "build" (if not there, mkdir build instead of building
a75fd4a3a0 Jean*10220 & running in input)
10221 - run in dir run (if it exists), in build otherwise.
10222 - call prepare_run (if input/prepare_run exists)
10223 - run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists.
6519624399 Dimi*10224 o pkg/exf modifications to interpolation and rotation routines for more
10225 reasonable treatment of North Pole singularity: for tracers North Pole
10226 value is set to northernmost zonal-mean value, for zonal velocity it is
10227 set to zero, and for meridional velocity it is set to northernmost value.
35141c3376 Mart*10228 o pkg/exf/exf_check_range.F
a435e833b1 Mart*10229 - add tile index to diagnostics and move stop statement to the very
10230 end of the routine.
05aa25be39 Jean*10231 o pkg/diagnostics: (diagnostics_main_init.F)
10232 define title of isomorphic variables according to the current config.
842bb5f1d9 Jean*10233 o pkg/thsice with pkg/seaice dynamics:
6789e1f33d Jean*10234 - fix domain of computation (interior only, required for exf) and do exchanges
10235 - seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient
ae35500ca3 Jean*10236 o towards a standard way of dealing with multi-threading in MONITOR
10237 and ${PKG}_MONITOR (all except ptracers_monitor) subroutines.
a435e833b1 Mart*10238 o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith)
10239 to W momentum equation in nonhydrostatic and quasihydrostatic runs.
6f6b52a4f5 Jean*10240 o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor.
e03f83af3c Jean*10241 o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block)
10242 o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL
10243 (problems ? with gradient check in bottom_ctrl_5x5 adjoint test)
a435e833b1 Mart*10244 o tracer advection:
d8d36aa8bb Jean*10245 - clean-up and simplify calc_common_factors.F
a435e833b1 Mart*10246 - make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer
d8d36aa8bb Jean*10247 advection subroutine (but still not used within DST advection S/R)
2baa3a4f30 Jean*10248 o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim)
10249
0e6056cd20 Jean*10250 checkpoint58j_post (2006/06/15)
95f2c2ae3f Patr*10251 o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields
10252 from file (collects calls previously in FORWARD_STEP)
10253 o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS
a0d26c252a Patr*10254 o adjoint store dir. adjusted accordingly
95f2c2ae3f Patr*10255 o genmake2
10256 replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list.
a0d26c252a Patr*10257
0e6056cd20 Jean*10258 checkpoint58i_post (2006/06/14)
a435e833b1 Mart*10259 o pkg/seaice: add parameter that allows to scale/turn off effect of seaice
c9058eda34 Mart*10260 on wind stress (SEAICEstressFactor defaults to 1.)
4a7f47048d Jean*10261 o Total number of Timers is finite (<=40): comment out 2 non-essential one
10262 in the_main_loop.F to avoid Pb (e.g., when running fizhi test)
a435e833b1 Mart*10263 o vector_invariant: fix highOrderVorticity(=4.th.Order) advection
b161d628fb Jean*10264 on CS-grid: no longer loosing mass.
6be7d7dc38 Jean*10265 o exf & curvilinear-grid: no longer modify longitude xC & xG.
5ea0c8294d Mart*10266 o pkg/ggl90: fix sloppy output and fix a bug
d558d05cf5 Dimi*10267 o pkg/seaice: added SEAICEuseEVPpickup parameter
10268 - Set to false in order to start EVP solver with
10269 non-EVP pickup files when using SEAICEuseEVP
b53f333527 Mart*10270 - fix sign error in diffusion in seaice_calc_rhs
5ea0c8294d Mart*10271
0e6056cd20 Jean*10272 checkpoint58h_post (2006/06/07)
4a4ac2b6f4 Patr*10273 * Modifications for bottom topography control
10274 o replace hFacC by _hFacC at various places
10275 o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL
10276 o add non-self-adjoint cg2d_nsa
10277 o update autodiff support routines
10278 o re-initialise hfac after ctrl_depth_ini
10279 o works for 5x5 box, doesnt work for global_ocean.90x40x15
10280 * Adding verification for 5x5 box (4-layer) bottom topography control
10281
0e6056cd20 Jean*10282 checkpoint58g_post (2006/06/07)
6f0ec9a199 Jean*10283 o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g.,
10284 used for mean seasonal cycle, mean diurnal cycle); add an example
10285 in verification/global_ocean.cs32x15/input.thsice/data.diagnostics
a435e833b1 Mart*10286 o pkg/ggl90:
2539abbd59 Mart*10287 - add parameter (minimum surface kinetic energy)
10288 - fix bug (avoiding division by zero)
a5d3c9e070 Mart*10289 o couple pkg/thsice to pkg/seaice:
10290 - modify advection in seaice to accomodate new scalar fields to be advected
10291 - only muliDimAdection scheme work with seaice/thsice
10292 - mapping of thsice-variables to seaice-variables, back and forth
10293 - does not break the verification experiments, but does not give the
10294 desired results either
10295 o pkg/seaice
10296 - make (default) second order advection a bit less confusing?
10297
0e6056cd20 Jean*10298 checkpoint58f_post (2006/06/05)
a435e833b1 Mart*10299 o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice
10300 to pkg/seaice):
25f8242518 Mart*10301 - new routines thsice_map_exf and thsice_get_exf provide the interface
a435e833b1 Mart*10302 - add an additional formal parameter to thsice_solve4temp
558a6f8862 Patr*10303 o pkg/exf:
10304 - add new fields wspeed, snowprecip (to be able to couple to thsice)
10305 - correct Stefan-Boltzmann constant
10306 - new parameter for longwave surface emittance
a435e833b1 Mart*10307 - separate some stuff from exf_bulkformulae into new routines
558a6f8862 Patr*10308 exf_radiation, exf_wind
a435e833b1 Mart*10309 - add new parameters and constants: longwave emissivity for ocean, ice
25f8242518 Mart*10310 and snow, evaporation parameters over ice
51cdae4cbe Mart*10311 - decouple wind/stress computation from ALLOW_BULKFORMULA: always compute
10312 either wind from stress or stress from wind
766e50be03 Jean*10313 o pkg/thSIce:
10314 - split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F
10315 - put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND
10316 and THSICE_CALC_THICKN
10317 - for now, call to THSICE_GET_BULKF remains inside i,j loops.
10318 - add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h
10319 to make debugging easier.
10320 - affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output
a435e833b1 Mart*10321 o pkg/bulk_force:
10322 - clean-up comments and parameters ;
766e50be03 Jean*10323 - add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ;
086faee439 Jean*10324 o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched;
10325 generate new output for test-experiment: aim.5l_cs.thSI
de56cb35d0 Jean*10326 o results_ad : rename "output.txt_adm" to "output_adm.txt" and change
558a6f8862 Patr*10327 testreport accordingly
de56cb35d0 Jean*10328
0e6056cd20 Jean*10329 checkpoint58e_post (2006/05/17)
23424617f8 Patr*10330 o SEAICE_CGRID adjoint done
f66b450460 Patr*10331 o R_STAR adjoint implemented.
10332 * Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ )
10333 * need to sort out init. of h0facc, etc.
5ff8d4a5cf Patr*10334 o Make pkg/profile fully independent of ecco,cost, etc. stuff
10335 to be able to use it in pure forward.
2619b6fb59 Patr*10336
0e6056cd20 Jean*10337 checkpoint58d_post (2006/04/21)
3112405dc7 Jean*10338 o upgrade simple test-experiment to tutorial example:
10339 step.1: duplicate the experiment and (step.2) will remove the old copy.
10340 tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box)
10341 tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere)
10342 tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation)
10343 tutorial_global_oce_biogeo <- copy of dic_example
10344 tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection)
10345 tutorial_plume_on_slope <- copy of plume_on_slope
10346 tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity)
10347 tutorial_global_oce_optim <- empty for now (David ?)
10348 tutorial_global_oce_in_p <- copy of global_ocean_pressure
10349 some tutorials (R1) were already checked-in under tutorial_examples in release1_branch
4c5f492b95 Gael*10350 o correct a sign problem in cost_scat.F
a435e833b1 Mart*10351 o obcs and ptracers: fix boundary conditions for advections schemes
10352 with larger stencil
2057f5cbae Patr*10353 o thsice adjoint: start
a435e833b1 Mart*10354 o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for
9108661f3b Mart*10355 completeness
a435e833b1 Mart*10356 o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING
562e0a15fe Mart*10357 and COSINEMETH_III, add comments in default CPP_OPTIONS.h
a4d028af27 Patr*10358 o ptracers adjoint:
10359 * avoid extensive recomputatations
10360 * fix missing re-init. of gptr (missed by TAF)
a435e833b1 Mart*10361 o obcs: add a flag (OBCSprintDiags, defaults is true) that allows
8ef23b4c75 Mart*10362 me to turn off the excessive output to STDOUT that this package produces
b030b75637 Jean*10363 o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common
10364 and add those terms in Vector-Invariant formulation.
a435e833b1 Mart*10365 o in ctrl pkg, if ALLOW_CAL, use monthly mean controls
d4f53c1fd3 Gael*10366 if the control period (xx_hfluxperiod etc) is 0
10367 o in profiles pkg, clean routines and fix details
a435e833b1 Mart*10368 o in ecco pkg, reading ssh data:
d4f53c1fd3 Gael*10369 fix problem in case the model does not start at iter0=0
587564817e Mart*10370 o fix mnc-pickup/restart for ptracers
b970da0492 Patr*10371 o new package prifiles:
10372 code to compute profile-based cost by Gael Forget
01c71301a9 Patr*10373 (modifs in ecco, ctrl, autodiff)
b970da0492 Patr*10374 o Benign bug fix in initialization (spotted by M. Mazloff) of
10375 ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F
01c71301a9 Patr*10376
0e6056cd20 Jean*10377 checkpoint58c_post (2006/03/23)
5f86d55b22 Patr*10378 o adjoint: finish NLFS adjoint and provide reference output in
10379 verification/global_ocean.90x40x15/results_ad_nlfs
a435e833b1 Mart*10380 o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the
c401c03915 Mart*10381 documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in
a435e833b1 Mart*10382 SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only
c401c03915 Mart*10383 with SEAICE_CGRID defined.
eaf6816ef6 Jean*10384 o move calendarDumps from "data" to "data.cal" and clean-up the code
10385 with a simple call to pkg/cal S/R: CAL_TIME2WRITE
10386 o add useEXF & useCAL flags (for now, set in hard-coded way)
8f72ee0f86 Jean*10387 o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum
10388 (were missing in NH mode, and wrong in quasihydrostatic mode).
10389 waiting for Chris updated version of calc_gw to add those CALLs.
10390 o fix bug in quasihydrostatic S/R ;
10391 add a test for this option: global_ocean.90x40x15.qshyd
808cde9ea6 Jean*10392 o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs.
10393 (called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS)
10394 o add on/off flag useOffLine for package OFFLINE
a435e833b1 Mart*10395 o seaice:
ed94531ee9 Mart*10396 - modify advection so that it works also on the C-grid
a435e833b1 Mart*10397 - extend loop ranges in seaice_lsr and seaice_dynsolver; fixes
ed94531ee9 Mart*10398 problem in multi-tile runs with C-grid
362dbfa680 Mart*10399 - add flags for clipping ice velocities and/or masking solver forcing
8582a6e33f Mart*10400 - fix drag (ocean on ice) formulation and a bug that caused noise in the
10401 C-grid solver
3dce9279c3 Mart*10402 - added a few comments to seaice_diffusion.F
10403 - separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V
10404 are now exclusive)
a435e833b1 Mart*10405 - add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which
3dce9279c3 Mart*10406 required re-ordering the code a little:
10407 + make DAIRN global variable (defined in SEAICE)
10408 + move computation of the viscosities eta and zeta into a new separate
10409 routine (because I need to recompute them in seaice_ocean_stress.F)
0946cb6a20 Mart*10410
0e6056cd20 Jean*10411 checkpoint58b_post (2006/03/13)
a435e833b1 Mart*10412 o AIM+thSIce: fix sign of Short-Wave through the Ice ;
12cf6f073b Jean*10413 update output.txt of exp. aim.5l_cs.thSI
9705a0d5c6 Ed H*10414 o various mnc cleanups and improvements:
10415 + shrink lookup tables by factor of ~4
10416 + better error reporting when running out of lookup space
10417 + able to handle longer path/file names (up to 500 chars)
07c24e37c2 Patr*10418 o adjoint:
10419 - Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations.
10420 - TBD: "hidden" mom_vecinv recomp. in dynamics
3975cf6076 Jean*10421 o change forcing_In_AB to affects both T,S forcing and Momentum forcing
10422 (allow to differentiate between forcing components using new integer flags:
10423 momForcingOutAB=1/0 & tracForcingOutAB=1/0)
10424 and add new flag to put Dissipation tendency out of Adams-Bashforth.
d7e0df64ad Patr*10425 o ecco
10426 - enable trend removal from SSH anomaly obs.
10427 o adjoint
10428 - a fix for PmEpR when #undef EXACT_CONSERV
10429 - fix of "hidden" recomp. in thermodynamics (no TAF warnings)
10430 - try to fix "hidden" recomp. in forward_step for NLFS
10431 (NLFS seems broken sometimes after I checked it in)
a435e833b1 Mart*10432 o seaice:
73792e16df Mart*10433 - add c-grid version of the dynamic solver:
10434 + three new routines that are the c-grid substitute lsr, dynsolver
10435 and ostres
10436 + put a few fields that were local to dynsolver into global common
10437 blocks, so that I can move the computation of stresses etc into
10438 seaice_lsr (saves coding but may break the adjoint).
10439 - replace more hardwired parameters by runtime parameters
10440 - add ice masks that mask the rhs of the implicit solvers where there
10441 is no ice (commented out in seaice_dynsolver, because i am not sure
10442 if this works properly), eventually this should replace the clipping
10443 of ice velocities in seaice_dynsolver to +/-40cm/s.
a435e833b1 Mart*10444 o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly
2f7dcdd863 Ed H*10445 include it only where its needed
a69f02f073 Mart*10446 o move balancing of fluxes before the call of external_forcing_surf
6ed81927e7 Mart*10447 o seaice:
10448 - correct units of turning angles (now they are really in degrees)
10449 - move computation of GWATX/Y out of main routine into dynsolver
10450 - initialize GWATX/Y in seaice_init
6f005fadde Jean*10451 o Apply mask on Fresh-Water flux (needed for SSH forcing).
a435e833b1 Mart*10452 update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual)
03a9a80809 Mart*10453 o seaice: add runtime flags for turning angles (default to zero)
a435e833b1 Mart*10454 o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean
4bf6063982 Patr*10455 and trend from exf forcing and ctrl control adjustments
10456 o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF
10457 (since checkpoint57x_post)
f5e99809b0 Jean*10458 o change the default rotation period to 86164.s = the Earth rotation
6fdf842d4f Jean*10459 o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T)
10460 and based on a reference stratification. Tested within hs94.cs-32x32x5.
009bbbd3aa Mart*10461 o seaice advection: add code for choosing between the default (2nd order
10462 central differences) and multiDim advection schemes provided by
10463 pkg/generic_advdiff
7d6367e3db Mart*10464 o seaice:
a435e833b1 Mart*10465 - removed all references to SEAICE_GRID.h fields from
7d6367e3db Mart*10466 dynsolver, advect, diffus, lsr, without changing the results of lab_sea
10467 (cubed-sphere configuration will change a little)
10468 - grid computations in seaice_init are obsolete now.
10469 - cleaned up code a little so that is easier to read (hopefully).
009bbbd3aa Mart*10470 - added new (better?) discretizations of default advection and diffusion
10471 (turn on with SEAICEuseFluxForm)
10472 - replace 1 in 3d global fields by kSurface in growth.F
a435e833b1 Mart*10473
0e6056cd20 Jean*10474 checkpoint58a_post (2006/02/13)
14e9b6a754 Mart*10475 o seaice:
10476 - bug fix in advect.F
a435e833b1 Mart*10477 o shelfice:
10478 - separate shelfice load anomaly from pload (breaks with time
70b0991389 Mart*10479 dependent forcing), => introduce constant field shelficeLoadAnomaly.
10480 Its default is 0., but it may be computed more cleverly from (unknown)
10481 t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
10482 done offline. A good approximation of the pressure load anomaly is
a435e833b1 Mart*10483 necessary to avoid large initial adjustment processes underneath
70b0991389 Mart*10484 deep-reaching shelfice.
e5cc225f5e Mart*10485 - small fix in ISOMIP shelfice_thermodynamics
a435e833b1 Mart*10486 - add more sophisticated thermodynamics of Hellmer (1989), this is
e5cc225f5e Mart*10487 now the default
10488 - give a few constants more intuitive names
d5413e2490 Mart*10489 o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful
10490 if bulk formulae are used in long integration (especially EmPmR). Turn
10491 on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01
10492 if balancePrintMean, the imbalance that is substracted is printed to
10493 STDOUT.
48ddec2149 Jean*10494 o fix bug (typo) in obcs_apply_eta.F
506298a7d9 Mart*10495 o add a new package shelfice which enables us to model the circulation
10496 underneath shelf-ice with draughts of hundreds of meters.
10497 - works
10498 - to do: + include improved thermodynamics
10499 + check whether kSurfC (from model/inc/SURFACE.h) can be used
10500 instead of new field kTopC
a435e833b1 Mart*10501 + can we use topoFile, Ro_surf and existing code in ini_depth.F
506298a7d9 Mart*10502 instead of new field R_shelfIce and new code in ini_depth.F
10503 and ini_mask_etc.F?
70b0991389 Mart*10504 + adjust vertical mixing schemes?
a435e833b1 Mart*10505 o seaice pkg:
10506 - add a cpp-flag to include a simple formula for a salinity dependent
f2368faea9 Mart*10507 freezing point of sea water at the surface
10508 - change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and
10509 meridional stresses are now different (and hopefully correct)
da87ea6f08 Jean*10510 o AIM pkg: change threshold on large-scale condensation to conserve Heat.
10511 update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics
10512 and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG)
a435e833b1 Mart*10513 o pkg/diagnostics: add options and parameters for regional-statistics
10514 diagnostics ; define regions by reading a region-mask from a file
575f9a835c Jean*10515 (might add other options later)
bae467ec49 Jean*10516 o pkg/bulk_force:
10517 - add option and parameters to use AIM surface-flux formulae.
10518 - Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ;
a435e833b1 Mart*10519 others forcing fields (defined in PARM05, parameter file "data") are loaded
bae467ec49 Jean*10520 from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F).
a435e833b1 Mart*10521 - initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F
bae467ec49 Jean*10522 - use the right EXCH call for uwind,vwind (to work on CS-grid).
10523 - re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h)
10524 and parameters (note: calcWindStress replaces .NOT.readwindstress).
10525 - cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP).
10526
0e6056cd20 Jean*10527 checkpoint58 (2006/01/12)
a435e833b1 Mart*10528 o add "--embed-source" option to genmake2 which, when the supporting
10529 tools can be compiled (as determined by genmake2) will turn on the
10530 embed_files package which then embeds the entire MITgcm source code
d79bbe5ed9 Ed H*10531 (*.[fFhc] + Makefile) used for the build within the executable
10532 - requested by CNH but off by default
10533 - adds a paltry <9MB to the mitgcmuv executable in most cases
10534 - only writes the output when useEMBEDSRC in eedata is true
f4ab189f71 Patr*10535 o clean up 3-dim. relaxation codes:
10536 * Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec
10537 * Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs)
10538 * Thanks to Tom Haine for testing!
10539
0e6056cd20 Jean*10540 checkpoint57z_post (2005/12/31)
b83f88edb2 Jean*10541 o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate):
10542 affects output (@ truncation level) of exp. plume_on_slope ; updated.
b00d0b5f70 Mart*10543 o fix the pickup behavior for obcs in combination with ptracers
10544 o fix a bug in ptracers_external_fields_load
10545 o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...)
10546 affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!)
10547 o transfered surface NH pressure to eta field (if exactConserv).
0330ceca59 Jean*10548 o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign)
10549 and update lab_sea output.txt file.
7276a6414c Patr*10550 o completing 3-dim. relaxation code: additional term
10551 1/tau*( theta(i,j,k) - thetaStar(i,j,k) )
10552 in S/R EXTERNAL_FORCING_T (file external_forcing.F)
10553 * At compile time, in "EXF_OPTIONS.h" set
10554 #define ALLOW_CLIMTEMP_RELAXATION
10555 #define ALLOW_CLIMSALT_RELAXATION
10556 * At runtime in "data", under &PARM03 set (e.g., units in seconds)
10557 tauThetaClimRelax3Dim = 15552000.0,
10558 tauSaltClimRelax3Dim = 15552000.0,
10559 * 3 cases:
10560 1) Use a constant-in-time 3-dim. field
10561 2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec.
10562 3) Real-time relax. to time-evolving prescribed field
a435e833b1 Mart*10563 o Adding Laplacian-type smoothness constraint on
3ed7687b4d Patr*10564 initial and boundary (forcing) controls (ic, bc)
a435e833b1 Mart*10565 * enable at compile-time via
3ed7687b4d Patr*10566 ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION
10567 * enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1
1014465bd0 Patr*10568 * Absolute scale somewhat unclear so far
10569 * no area weighting was included since no other cost term does so far
0330ceca59 Jean*10570
0e6056cd20 Jean*10571 checkpoint57y_post (2005/12/08)
3488aaba5f Patr*10572 First step for a NLFS adjoint
10573 o initially suppress rStar (new flag DISABLE_RSTAR_CODE)
10574 o new init. routines for calc_r_star, calc_surf_dr
10575 o still need to deal with ini_masks_etc
10576 o testreport seemed happy
0e6056cd20 Jean*10577 checkpoint57y_pre (2005/12/08)
7df36fd6a0 Patr*10578
94e76af995 Jean*10579 o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs.
1023fa2ba2 Step*10580 o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc)
81b06b0cda Step*10581 o add new offset feature to offline pkg (plus minor cleanup)
10582 o cfc fixes for final year of integration
10583 o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should
10584 be in GCHEM_OPTIONS).
10585
0e6056cd20 Jean*10586 checkpoint57x_post (2005/12/04)
7392df2720 Jean*10587 o fix testreport Pb in multiple test experiment.
4212cfbd21 Ed H*10588 o cleanup our namelist syntax in verification:
10589 - make it more F95 standards compliant (some work still needed)
10590 - allows the vast majority of our tests to work with gfortran
f3a828f7e4 Jean*10591 o Non-Hydrostatic:
10592 - put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h
10593 - fix exchange calls for CS-grid using the new EXCH_S3D_RL.
f56826ff51 Jean*10594 o Allow to apply AB on T,S rather than on AB(gT,gS):
10595 - implemented within #ifdef ALLOW_ADAMSBASHFORTH_3
10596 - use the same arrays (gtNm,gsNm) to hold tracer field at previous
10597 time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)).
10598 - need a "clever" read_pickup to restart from the other AB formulation
a435e833b1 Mart*10599 o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h
31a33cd878 Jean*10600 o remove some unused variables (reduces number of compiler warnings)
812e613baf Patr*10601 o adjoint
10602 * Disable useVariableViscosity for adjoint for time being
10603 (there are a number of extensive recomputations)
10604 * Initialize certain variables needed for adjoint
31a33cd878 Jean*10605
0e6056cd20 Jean*10606 checkpoint57w_post (2005/11/03)
b0d5c3a79b Jean*10607 o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names
10608 fix the singleCpuIO RS version of MDSWRITEFIELD
10609 and add a WARNING if using globalFiles=T with multi-processors.
1b9b94d610 Jean*10610 o write grid-file(s) in only one format (MDS or MNC): default=MNC (if
10611 using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc
b0d5c3a79b Jean*10612 o tracer advection scheme:
a435e833b1 Mart*10613 add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get
10614 those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile,
dcc36c3b47 Jean*10615 was not very convenient).
a435e833b1 Mart*10616 add implicit version for DST-3 & DST3_Flux_Limit vertical advection;
dcc36c3b47 Jean*10617 (further tests needed for the implicit DST & Flux-Limiter schemes).
1ccb4070a2 Mart*10618 o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef
10619 and sRef for convenience, handy, when you want to initialize
10620 ptracers in a large domain with a constant non-zero value. Also,
10621 untangle ptracers_init.F a little.
10622
0e6056cd20 Jean*10623 checkpoint57v_post (2005/10/13)
5e507d5445 Jean*10624 o change dome exp. to use variable viscosity in side-drag terms.
2f98dc7b12 Ed H*10625 o remove all the files from the cfc_offline test since they are now
10626 incorporated into tutorial_cfc_offline which has been producing
10627 identical results for a few days of testing
7053a0bdbe Jean*10628 o add new parameter: sideDragFactor to enable half-slip-side BC
10629 and change side-drag S/R to use viscosity from mom_calc_visc
a435e833b1 Mart*10630 (can switch back by setting sideDragFactor=0.); affects results at
10631 truncation level; regenerate output for exp.: global_ocean.cs32x10(x3),
7053a0bdbe Jean*10632 global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5).
a435e833b1 Mart*10633 o vorticity & strain are now computed without masking, to account for
cc95ee1c31 Jean*10634 no-slip-side BC in variable viscosity calculation ; mask is applied
10635 anyway later on, before computing advection/coriolis terms.
1ccb4070a2 Mart*10636 o modify exp4 to test new obcs support for reading from external files
58bf89d65c Mart*10637 and for passive tracers
a435e833b1 Mart*10638 o fix behavior of ptracers_monitor when monitor output is written to a
c760cf3af0 Mart*10639 netcdf-file; still not independent of monitor.F (writes in the same
10640 file).
a435e833b1 Mart*10641 o change default value of tRef (put a uniform, meaningful value for ocean
9807caa0b1 Jean*10642 & atmos) and initialize sRef (was missing, as Martin mentioned).
a435e833b1 Mart*10643 o Redefine viscC?Leith*. Change the coefficients of Leith viscosity
e2b2bf4d90 Bayl*10644 to be proportional to enstrophy dissipation length. Thus,
10645 viscC?leith?_new=pi*(viscC?leith?_old)^(1/3)
10646 This is now consistent with Smagorinsky and with the manual.
10647
ca1cda04e8 Mart*10648 checkpoint57u_post
ae51cb4320 Mart*10649 o OBCS and PTRACERS: add open boundary support for passive tracers
a435e833b1 Mart*10650 - either use homogenous (pseudo) v.Neumann conditions or prescribe
ae51cb4320 Mart*10651 OB-values from file; this is not different from the way theta and salinity
10652 are treated
10653 - however, Orlanski-radiation conditions are not supported, and the model
a435e833b1 Mart*10654 will stop if you use pTracers and Orlanski at the same time.
ae51cb4320 Mart*10655 - beefed up the rountine obcs_external_fields_load: now only those open
a435e833b1 Mart*10656 boundary values are overwritten with values from files for which there
ae51cb4320 Mart*10657 are really files, otherwise the OB-fields remain untouched. This makes
a435e833b1 Mart*10658 it possible to use different OBs at different ends of the domain (as
ae51cb4320 Mart*10659 with EXF)
a435e833b1 Mart*10660 o reduce number of exch calls in shap_filt (s2).
10661 o CS-grid: fix divergence contribution to Leith viscosity. Affects (@
20e058fdde Jean*10662 truncation level) 4/5 MLAdjust test results (11&12 digits match).
10663
0e6056cd20 Jean*10664 checkpoint57t_post (2005/10/03)
c126063c4a Jean*10665 o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4
10666 o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get
10667 same truncation, independent of the face number: affects affects several
10668 test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5).
02b02f5c36 Jean*10669 o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times);
c126063c4a Jean*10670 note that biharmonic viscosity + no-slip was not tested in any experiment.
76b60848db Jean*10671 o fix bug in non-linear free-surf side-drag ; generate new output for
10672 global_ocean.cs32x15(+.thsice) & global_ocean_pressure.
b22b541fe9 Ed H*10673 o make mnc honor the writeBinaryPrec flag for most kinds of output
8b81bca38d Ed H*10674 o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum
f28ad821d5 Jean*10675 o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation
10676 error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5).
b39b0f289d Jean*10677 o add brackets in multi-terms sum to get same truncation, independent of
10678 the face number (manage to get exactly same value of gU,gV at the cs-edge)
10679 affects several test. exp. Update global_ocean.cs32x15 (+.thsice).
1e9e8678dd Bayl*10680 o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax
10681 and viscA4Remax, which allow one to limit the minimum viscosity by specifying
10682 a maximum grid-scale Reynolds number. Also, changes all length calculations
10683 in the case of grid anisotropy to geometric mean of dx**2 and dy**2.
a435e833b1 Mart*10684 Suggested values of viscosity parameters found in mom_calc_visc.
1e9e8678dd Bayl*10685 Many new viscosity diagnostics available.
96c813b2a5 Jean*10686
0e6056cd20 Jean*10687 checkpoint57s_post (2005/09/20)
a435e833b1 Mart*10688 o Add clearing-house for viscosity calculations, mom_calc_visc and
10689 correct numerous bugs in LeithD and Smagorinsky discretizations.
10690 mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be
10691 used simultaneously, and to be used in mom_vecinv and mom_fluxform.
188fd32c24 Bayl*10692 Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F)
a435e833b1 Mart*10693 and with Strain-Tension viscous term calculation (mom_hdissip.F).
188fd32c24 Bayl*10694 The Strain-Tension form is now called with useStrainTensonVisc=.true.
10695 ViscAhStrain and viscAhTension are now retired.
96c813b2a5 Jean*10696 o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4".
f7f6e70984 Ed H*10697 o In response to JMC's bug report, genmake2 now ignores any soft-links
10698 that it finds in the *current* directory when searching for files.
10699 Soft-links found in any other source directories will still work as
10700 they did before.
a435e833b1 Mart*10701 o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls
df91541502 Ed H*10702 a C routine to unlimit the stack size
157ea9ae8e Ed H*10703 o mnc-ify pkg/aim snapshot vars
cf701ea57b Ed H*10704 o mnc-ify pkg/land as requested by Daniel
5bc9611487 Ed H*10705 o various changes to mnc including:
10706 - all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format
a435e833b1 Mart*10707 - output can now be grouped so that all files within a group
5bc9611487 Ed H*10708 change the ITER portion of their names in lock-step together
10709 - can now read ("global") PER-FACE (in addition to PER-TILE) files
10710 and works with both EXCH1 and EXCH2 (but needs more testing)
10711 - writing works for all verification test cases w/ g77 on Linux
10712
0e6056cd20 Jean*10713 checkpoint57r_post (2005/09/07)
88d5fee2bf Ed H*10714 o make MNC variable initialization happen earlier
84386989cd Jean*10715 o add diagnostics for (almost) each term of the momentum Eq.
66f83c2ede Jean*10716 o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics.
2be058fac5 Jean*10717 o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups)
a435e833b1 Mart*10718 o remove MINIMAL_TAVE_OUTPUT option ;
2be058fac5 Jean*10719 add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT).
69a417565e Jean*10720 o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src
10721 allows to compile without pkg/mdsio (& test successfully hs94.1x64x5)
5d1838d198 Patr*10722 o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice)
10723 o add time-dependent SST, SSS control
7e2510a0ae Patr*10724 o cost terms in ecco/ modularized (new cost_generic.F)
10725 o cost_averages routines are modularized (new cost_averagesgeneric.F)
10726 o new infrastructure for seaice model vs. obs misfits in seaice/
10727 * driver from the_main_loop.F is seaice_cost_driver.F
10728 * first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA)
10729 * gradient check in Exp. 6a of natl_box_adjoint/
10730 o natl_box_adjoint input_seaice for Lab. Sea now available online via wget
10731 (see README file)
69a417565e Jean*10732
0e6056cd20 Jean*10733 checkpoint57q_post (2005/08/19)
fa355923ad Jean*10734 o fix initialisation Pb in calc_gw (get NANs in exp5 with g77)
1660a6b12d Ed H*10735 o fix annoying months-old bug in mnc/mdsio output for seaice pkg
10736 - bug was reported by Jean-Michel and Ian Fenty
e8d8f0b10f Jean*10737 o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F)
a435e833b1 Mart*10738 update exp. cpl_aim+ocn output.
9caa94febf Patr*10739 o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT
a435e833b1 Mart*10740 Needed for high-res. runs with large global files
9caa94febf Patr*10741 to be able to limit tapelev size
10742 o Changed some tests for adjoint:
10743 * carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT
10744 * natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT
10745 * global_ocean.90x40x15/ back to default 3-level checkpointing
9094bd878c Patr*10746 o Modifications to enable scripted COMMON to MODULE conversion
10747 * verification/OpenAD/code/ has necessary scripts and description;
10748 * converts, compiles and runs successfully;
9caa94febf Patr*10749
0e6056cd20 Jean*10750 checkpoint57p_post (2005/08/01)
62807350a8 Jean*10751 o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F
10752 o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED
10753 (already the case for some pkgs, including recent MNC_init, e.g. thsice)
10754 o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP)
f39b9d8a97 Jean*10755 o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F
10756 (was already the case for dissipation with mom_vecinv,
10757 and also the case for grad.PhiHyd when staggered-timeStep)
10758 This will allow to put dissipation out-off the AB time-stepping.
10759 Unfortunately, affects truncation error. Update output of exp. that "fails"
10760 (cg2d matching number) and leave the others for later: front_relax(10),
10761 global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12),
10762 matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2).
10763
0e6056cd20 Jean*10764 checkpoint57o_post (2005/07/30)
a435e833b1 Mart*10765 o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and
50653b81f1 Ed H*10766 (2) its ready to be documented during the 20050801 DocFest
a435e833b1 Mart*10767 o MNC-ify the gmredi package -- tested and works w/ and w/o mnc
e2d47178e0 Ed H*10768 for ideal_2D_oce and lab_sea on linux_ia32_g77
f48a8b1137 Patr*10769 o set to #undef CTRL_SET_OLD_MAXCVARS_30
10770 in global1x1_tot/code_seaice_adj to access indices 32, 33
10771 (worth another tag)
e2d47178e0 Ed H*10772
0e6056cd20 Jean*10773 checkpoint57n_post (2005/07/29)
fbb2516727 Patr*10774 o adding precip control xx_precip 32
10775 o adding swflux control xx_swflux 33
53a1c5d19a Patr*10776 o Replacing 10 forcing penalty cost routines by 1 generic.
10777 o Implementing partitioning in time-mean and variable adjustment
10778 for atmos. state.
10779 o Time-mean constant error is now read in data.ecco (instead of hard-coded)
08f22f958d Patr*10780 o in natl_box_adjoint:
a435e833b1 Mart*10781 * updated exp 1 to 10
53a1c5d19a Patr*10782 (but does not have time-mean vs. variable split results yet)
455751fbdb Patr*10783 o updated global1x1/*_seaice_adj/
10784 to incorporate latest changes
df05ad6e2a Patr*10785 o enable useSingleCpuIO for mdsio vector routines
10786 (applies in particular to tapelev I/O)
10787 o removed inefficient K-loop in all active_file*control*.F
3d0327d769 Patr*10788
0e6056cd20 Jean*10789 checkpoint57m_post (2005/07/28)
c0c2091c08 Jean*10790 o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into)
10791 and advect_cs (use EXCH-2 and standard cs-32 grid files).
a435e833b1 Mart*10792 o pkg/exch2: filling of face-corner halo regions is optional
d6f0fdc2ab Jean*10793 (ifdef W2_FILL_NULL_REGIONS) and is turned off by default.
10794
0e6056cd20 Jean*10795 checkpoint57l_post (2005/07/14)
a435e833b1 Mart*10796 tag before updating tutorials (pre-release-2)
9ce7209758 Jean*10797 o add cos & sin of grid-direction orientation angle (curvilinear grid only,
10798 for output and interpolation of input fields onto model grid)
10799 o fix radius in mom_v_metric_cylinder.F (wrong by dy/2).
10800 Affects results of exp. rotating_tank ; update output.txt.
27356e724c Jean*10801 o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor
6e29458d64 Jean*10802 and taking the square quantity and/or using a fraction-weight field.
27356e724c Jean*10803 o fix aim_diagnostics_init.F mate numbers.
10804 o add mnc output capability to diagnostics/diagstat and update
106a65ba8a Ed H*10805 our cvsignore files for the ACSII output generated
10806
0e6056cd20 Jean*10807 checkpoint57k_post (2005/07/02)
508b8225ad Patr*10808 o lab_sea now uses diagnostics package and provides a suite of
10809 new EXF diagnostics output.
10810
0e6056cd20 Jean*10811 checkpoint57j_post (2005/06/30)
61b6aef6a7 Patr*10812 o exf
10813 * bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton):
10814 Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982);
10815 terms -2*ATAN(x) + pi/2 were added to both stable and unstable case.
10816 * extended diagnostics output
10817 - now includes all EXF variables
10818 - hs, hl moved to common block
10819 - separate S/R for diagnostics, called after ctrl vector is added
10820 - name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
10821 - EXFqnet contains true Qnet (i.e. includes qsw)
10822 * updated verif. lab_sea, global_with_exf
10823 * Rearranging hflux (exf_mapfields -> exf_getforcing)
10824 to ensure that diagnostics sees a true EXFqnet
f529aaf45d Jean*10825 o add matlab scripts for CS-grid vectors (in utils/cs_grid)
f4f7b96c0e Jean*10826 o diagnostics pkg: change pointers so that 1 diagnostic can be used
10827 several times with different frequencies.
df4e8f7bcf Ed H*10828 o mnc-ify the thsice package as requested by Daniel Enderton
10829 - the monitor--MNC output needs work
10830 - many attributes need to be added (most are currently blank)
10831 o mnc-ify theaim_v23 package as requested by Daniel Enderton
10832 - many attributes need to be added (most are currently blank)
24babd248d Jean*10833 o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign)
cafbc21546 Jean*10834 o add Sadourny like discretization to the 4th.O vorticity advection scheme
a435e833b1 Mart*10835 o fix bug in rStar code (calc_r_star.F) when used with topo/bathy.
a3075797a1 Jean*10836 update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn,
10837 fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice).
85f899f51b Jean*10838 o fix few little things to avoid floating error with -ftrapuv (ifort v9)
10839 (ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F)
10840
0e6056cd20 Jean*10841 checkpoint57i_post (2005/06/19)
d1a9b8a2b9 Andr*10842 o Diagnostics package was changed: diagnostic allocation is now deactivated
10843 by setting an empty file name in the namelist (used to be by setting 0 frequency)
78a781bbae Jean*10844 o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ;
10845 add 1rst Order upwind vertical Shear.
eb47174845 Ed H*10846 o add a quick fix for A/B checkpointing in OFFLINE mode
4b08b6ee66 Ed H*10847 o add IGNORE_TIME define and -ignore_time option to genmake2 as an
10848 end-run around the C/Fortran linking horror in eesup/src/timers.F
2e9be4c81e Alis*10849 o added pkg/runclock: allows user to terminate run based on wall clock
10850 o added non-hydrostatic scaling parameter: nh_am2
8fef4b1a57 Mart*10851 o pkg/my82: futile attempt to make results compiler-independent by adding
10852 some "_d 0", etc. no effect.
a435e833b1 Mart*10853 o for mnc output, fill the 'T' coordinate var with myTime and create a
987ff12cb6 Ed H*10854 separate 'iter' variable for iteration count
a435e833b1 Mart*10855 o pkg/diagnostics:
37224b77cb Jean*10856 add new capability: output of Global/Regional & per-level statistics ;
10857 tested against monitor output (including land & thSIce) on various exp.
10858 o make seaice-pkg I/O type flags (MNC/MDS) more standard.
b9d81c4350 Jean*10859
0e6056cd20 Jean*10860 checkpoint57h_done (2005/05/19)
a435e833b1 Mart*10861 tag after changing user customized files (DIAGNOSTICS_SIZE.h,
74630d4888 Jean*10862 data.diagnostics, data.gchem, data.ptracers) is done.
10863
a435e833b1 Mart*10864 o pkg/diagnostics: prepare for Global/Regional statistics.
10865 add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h
83f253cab3 Jean*10866 o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
10867 and rename it: DIFFERENT_MULTIPLE
10868
0e6056cd20 Jean*10869 checkpoint57h_post (2005/05/14)
8e5ee067a3 Jean*10870 o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers
0da48370b7 Jean*10871 o pkg/diagnostics: change output frequency, now in seconds (instead
10872 of Nb of iterations). This requires to change data.diagnostics.
0e6056cd20 Jean*10873 checkpoint57h_pre (2005/05/12)
51dd5bf40e Jean*10874
41ce3f2380 Ed H*10875 o in mnc, let the user create the output dir if both mnc_outdir_date
10876 and mnc_outdir_num are false
06fffa8fd5 Ed H*10877 o add fflags() to pkg/diagnostics which allows one to specify, on a
10878 per-file basis, the file precision [default behavior is unchanged]
7e819019d5 Dimi*10879 o added diagnostics to pkg/kpp, including computation of mixed layer
10880 depth based on a temperature/density criterion
10881 o updated verification/natl_box to test the new pkg/kpp diagnostics
7bc0d239f7 Jean*10882 o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T)
300c0d54fc Jean*10883 o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4)
9a87ea5e43 Ed H*10884 o fix mnc flags in pkg/seaice so that they are "owned" by seaice,
10885 not mnc -- this mistake was found by JMC and is now corrected
10886
0e6056cd20 Jean*10887 checkpoint57g_post (2005/04/15)
79e87d2e6d Jean*10888 o add Adams-Bashforth 3rd Order time stepping:
10889 - default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3)
10890 - not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ...
0e6056cd20 Jean*10891 checkpoint57g_pre (2005/04/15)
af908d3f0e Jean*10892
5ab5d7f263 Patr*10893 o make lambda[Theta,Salt]ClimRelax spatially varying
10894 (default remains spatially uniform constant based on tau)
ce442b4534 Patr*10895 o added new control variables
10896 * init. uVel, vVel, etanN
10897 * lambda[Theta,Salt]ClimRelax
10898 o separate masks used for ctrl_pack/unpack 'from write_grid' output
10899 (suggested by G. Forget)
5ab5d7f263 Patr*10900
0e6056cd20 Jean*10901 checkpoint57f_post (2005/04/06)
a80a5e8cfd Jean*10902 o add parameter "baseTime" = model base time = time at iteration zero
a435e833b1 Mart*10903 new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to
a80a5e8cfd Jean*10904 account for baseTime shift
10905 o move Coriolis arrays from PARAMS.h to GRID.h
0e6056cd20 Jean*10906 checkpoint57f_pre (2005/04/06)
ee61c20a30 Jean*10907
de859229b1 Ed H*10908 o mnc-ifying the seaice package
de01be390b Alis*10909 o introduced an alternative length scale calculation for use in the limiting
10910 maximum viscosity (off by default, see mom_vi_hdissip.F for details)
2d80ef5b25 Patr*10911 o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S
a435e833b1 Mart*10912 o added modified Leith scheme with viscosity proportional to grad(Hdiv)
b4b9669a6b Bayl*10913 as well as grad(vort3). Made it compatible with both approximate form
10914 for the cubed sphere and full form of these gradients. Added flag
a435e833b1 Mart*10915 useFullLeith to select between approximate and full form.
02718ea810 Jean*10916 o add "d0" in getcon.F to reduce differences between compilers/platforms
10917 update output.txt of exp. fizhi-gridalt-hs
5103c42ce9 Jean*10918 o change port_rand funtion to allow to set the seed.
409155d7b6 Ed H*10919 o fix obscure MNC bug involving conversion between reals and integers
a435e833b1 Mart*10920 - it caused no problems with certain (eg. gcc, ifc) compilers but the
409155d7b6 Ed H*10921 new version is now more standards-compliant
4645654aba Patr*10922 o adjoint-related modifications
10923 * gad_dst3_adv_?: to be able to use advscheme=30 in adjoint
10924 * gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33
10925 * mom_vi_hdissip: to be able to use Leith scheme in adjoint
409155d7b6 Ed H*10926
0e6056cd20 Jean*10927 checkpoint57e_post (2005/02/28)
a4f6b487ba Patr*10928 o Adding eddy stress controls a la Ferreira et al.
5245708a89 Jean*10929 checkpoint57e_pre (actually was tagged: eckpoint57e_pre)
f30908c65d Patr*10930
eee5dc53df Jean*10931 o fizhi pkg: fix AtoC and CtoA when called with same input & output array
10932 update output.txt of exp. fizhi-gridalt-hs
2cc3b69a26 Ed H*10933 o add more "Z" dimensions and associated coordinate vars to MNC
c098ac3e0d Dimi*10934 o pkg/exf: added twoDigitYear capability for option useExfYearlyFields
fc64655a31 Dimi*10935 o parameter calendarDumps: when set, approximate months (30-31 days) and years
10936 (360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq,
10937 KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar
10938 months and years. Requires pkg/cal.
ee2e7fad64 Ed H*10939 o diagnostics: add pickup functionality
10940 - off by default for backwards compatibility
10941 - current version only uses MDSIO -- MNC will be added
9723cb5244 Jean*10942 o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies.
26c7db4c78 Jean*10943 o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2)
10944
0e6056cd20 Jean*10945 checkpoint57d_post (2005/02/11)
06d5464476 Jean*10946 o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing
a435e833b1 Mart*10947 o modify verification/ideal_2D_oce so that it tests the creation of mnc
91cf1175df Ed H*10948 output from the diagnostics package
24ef99fe7f Jean*10949 o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up
6554790d1c Ed H*10950 o make genmake2 more portable by using ".$FS" instead of ".f" for more
10951 of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys)
e8743b4419 Ed H*10952 o add coordinate variables to the MNC output from the diagnostics package
a629410b0b Jean*10953 o change MNC-flags default value: true when useMNC=TRUE
e808c5b132 Ed H*10954 o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F
a435e833b1 Mart*10955 the ability (off by default) to read the grid information using MNC
7a3f7c0b47 Jean*10956 o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt
0557aa5c83 Jean*10957 o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging
a435e833b1 Mart*10958 o do snap-shot diagnostics at the middle of the time-interval (instead of
fde699a81e Jean*10959 at the end).
40893cb58a Jean*10960 o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add
10961 new test for AIM with thSIce + slab-ocean
dd3fb239f5 Jean*10962 o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h)
440b7157f3 Jean*10963 o move state variable diagnostics to the beginning of the time step ;
10964 (note: still needs some work specially for snap-shot diagnostics)
10965 duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z
10966
0e6056cd20 Jean*10967 checkpoint57c_post (2005/01/27)
c130fcff71 Jean*10968 o Change testing option (-ieee) to get closer agreement between g77 & ifort
10969 o generate new output.txt files on faulks with g77 & the new -ieee option
0e6056cd20 Jean*10970 checkpoint57c_pre (2005/01/27)
7ba28f2af1 Jean*10971
10972 o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF);
5a35007c50 Jean*10973 update output.txt of exp. global_ocean.90x40x15
a435e833b1 Mart*10974 o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer
6643de8305 Jean*10975 results; update global_ocean_pressure & global_ocean.cs32x15 output.txt
5f46ec9135 Jean*10976 o add saltFlux(+File) forcing capability with periodicExternalForcing
97038d3c07 Jean*10977 o allow to use pkg diagnostics for GM-Redi & ThSIce output
10978 o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc.
35ef3a0982 Ed H*10979 o improvements for the MNC output from DIAGNOSTICS:
10980 - correct handling of the unlimitied dimension
10981 - all dims now have associated coordinate variables
10982 - variables located at U, V, and Corner ("Z") points are now written
a435e833b1 Mart*10983 with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that
35ef3a0982 Ed H*10984 *all* data points are output
8d9f2d1888 Dimi*10985 o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice
e1a538cff8 Dimi*10986 o added pkg/seaice/seaice_monitor.F
fcf5946e08 Dimi*10987 o mdsio_readfield.F can now read files visible only to master MPI process.
714116e714 Dimi*10988 o pkg/seaice: some test code for ice-modified ocean stress
4aa81846e7 Dimi*10989 o exf_getffields interpolation defaults to bilinear for all scalar forcing
10990 fields (remains bicubic for wind velocity and stress). This avoids, e.g.,
10991 spurious negative numbers for precipitation and humidity. Will cause
10992 some small numerical differences for integrations using pkg/exf/exf_interp.F.
a3296ad516 Patr*10993 o pkg/ctrl/
10994 * Add ctrlvec diagnostics in pack/unpack for nondimensional I/O
10995 May be enabled via doPackDiag
a435e833b1 Mart*10996 * introduce z-scaling of
10997 + gradient (doZscalePack) and
a3296ad516 Patr*10998 + control (doZscaleUnpack)
10999 o pkg/mdsio/
11000 * enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F
11001 * N.B.: leave tiled I/O for tapelev (i.e. mds...vector)
4aa81846e7 Dimi*11002
0e6056cd20 Jean*11003 checkpoint57b_post (2004/12/20)
0cf6e0ada1 Jean*11004 o simplify options in diagnostics_fill arguments (remove weird combinations)
2f38f768b3 Ed H*11005 o fix MNC coordinate variables so that they now contain per-face index
a435e833b1 Mart*11006 values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in
2f38f768b3 Ed H*11007 general, EXCH2 grids are only aligned to a "local" coordinate system
34bd0f9de0 Jean*11008 o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput)
11009 o Implement instantaneous output within pkg diagnostics:
11010 setting a negative frequency in data.diagnostics produces
11011 "snap-shot" output (as opposed to time-average if freq > 0)
ed27c6ee8e Jean*11012 o move out off EQUIVALENCE all diagnostics that fizhi does not use ;
a435e833b1 Mart*11013 NOTE: change ptracer diagnostics name: use 2 characters to work with
ed27c6ee8e Jean*11014 more than 9 tracers. Add also diagnostics of advect & diffus flux.
a435e833b1 Mart*11015 o more CF compliance: convert all MNC 'iter' variables to 'T' so that it
18eb3f79fd Ed H*11016 becomes the coordinate variable for the 'T' dimension
d77e828db7 Ed H*11017 o add CF-style coordinate variables to MNC
a435e833b1 Mart*11018 - just a first cut: numbers are meaningless on the cubesphere and
d77e828db7 Ed H*11019 missing along the T axis but otherwise it works!
e07cbe4110 Dimi*11020 o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX
047c5644f3 Jean*11021 o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC.
9a922069e0 Jean*11022 o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon)
11023 this is based directly on what the model compute, so that the content of
11024 each diagnostics might be affected by switching options (e.g., implicitDiffusion)
11025 o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F)
a435e833b1 Mart*11026 o clean up build options files for SunOS, in particular
e8f00bfc75 Mart*11027 - remove -traditional from xmakedepend
11028 - change -xarch=v9 to -xarch=native for f77
11029 - restore use of make (not gmake)
11030 - add CC=gcc if using g77
7af35f0733 Ed H*11031 o changes per discussion of AM, JMC, & EH3 today:
a435e833b1 Mart*11032 - move redundant "grid" variables out of "state" -- in preparation of
11033 creating proper CF-style coordinate variables and in recognition
11034 that any/all grid variables can be easily copied (eg. w/NCO) from
7af35f0733 Ed H*11035 the grid files into any of the other NetCDF files
a435e833b1 Mart*11036 - *always* output grid variables with MDSIO (this will eventually be
7af35f0733 Ed H*11037 changed)
11038 - output MNC grid file if useMNC is true
a435e833b1 Mart*11039 o every instance of _END_MASTER() has been found and replaced with
11040 _END_MASTER( myThid ) in order to satisfy certain picky Sun
ea6e02f692 Ed H*11041 preprocessors
ee5c9de779 Jean*11042 o re-arrange diagnostics pkg initialisation:
11043 - allow each package to extend the available diagnostics list
11044 - add some checking and fix small problems (multi-threaded, ...)
11045 - new S/R diagnostics_fill (replace fill_diagnostics):
11046 look through the short list of active diag. (instead of the long list)
11047 create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active
617e9c07f6 Ed H*11048
0e6056cd20 Jean*11049 checkpoint57a_post (2004/12/10)
6ff6896d7d Patr*11050 o this set of changes restores TAMC compatibility
11051 tested for global_ocean.90x40x15 adjoint on trough
11052 (what a pain)
11053
0e6056cd20 Jean*11054 checkpoint57a_pre (2004/12/10)
4161b94ac5 Patr*11055 o some modifs in tools/build_options for sunos
11056 o call ctrl_pack for ctrl at end for optimcycle=0
11057
0e6056cd20 Jean*11058 checkpoint57 (2004/12/09)
7bcb6cc723 Mart*11059 o add horizontal bi-harmonic viscosity for vertical velocity
11060 - new parameter viscA4W (defaults to viscA4)
11061 - affects only non-hydrostatic code
11062 - to be done: no-slip lateral boundary conditions
af994d39e8 Dimi*11063 o switch back to "sflux = sflux - runoff" in exf_getforcing.F
f9712caa2c Jean*11064 o implement Implicit Vertical advection for pTracers
2c4cea51ae Jean*11065 o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k)
e97e7f4284 Jean*11066 (implemented also for implicit vertical diffusion & advection)
5428496056 Mart*11067 o OBCS: extend application of tracer open boundary conditions
11068 to a strip beyond the boundary of width Olx/Oly
14137e831b Patr*11069 o add call monitor to TAF set of required calls (flow directives)
11070 and include in natl_box_adjoint
11071 o untangle a few ifdefs related to cost, ctrl, autodiff
11072 untangel a few ALLOW_ECCO_OPTIMIZATION
e5d44c8b0d Patr*11073 o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr)
11074 (theta2, salt2 in ecco_cost_weights)
5428496056 Mart*11075
0e6056cd20 Jean*11076 checkpoint56c_post (2004/12/03)
93ea71777b Mart*11077 o OBCS as control variables
11078 - update ctrl_ad_diff.list, obcs_ad_diff.list
11079 - remove balance of obcs controls from default
11080 - fix index bug nobcs in ctrl_init
11081 - fix dummy fields filen in ctrl_pack
11082 - add dummy weights for obcs
11083 o lsopt: comment out fort.94 output
a435e833b1 Mart*11084 o optim:
93ea71777b Mart*11085 - remove unnecessary header files
11086 - adjusted namelists
11087 - add xerbla.F to Makefile
a435e833b1 Mart*11088 o exf:
93ea71777b Mart*11089 - multiple modifications of exf_check_range
11090 - unit change in exf_init_runoff from [m/year] to [m/s]
11091 o mdsio:
11092 - i/o-vector change debugLevel from debLevA to debLevB
11093
0e6056cd20 Jean*11094 checkpoint56b_post (2004/12/01)
8a588e179e Mart*11095 o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that
11096 is called from DO_THE_MODEL_IO
11097 - rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE
11098 - introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq)
11099 - clean up PTRACERS_WRITE_TIMEAVE a little
233b414ed8 Mart*11100 o add another verification experiment that tests both the cfc-pkg and
a435e833b1 Mart*11101 the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with
233b414ed8 Mart*11102 reactive tendencies treated inline with regular timestepping
d8c583b49a Mart*11103 o testreport previously did a lousy job of comparing small numbers, so
11104 we (Ed and Martin) changed the way the cut-off of 1.e-12 is
11105 implemented in the little c-progam tmp_cmpnum.c which is embedded in
a435e833b1 Mart*11106 testreport.
d8c583b49a Mart*11107 o ptracers_monitor: bug fix for MPI
11108
0e6056cd20 Jean*11109 checkpoint56a_post (2004/11/28)
bdb2728325 Mart*11110 o GCHEM: finish reorganizating the package
a435e833b1 Mart*11111 - forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency
bdb2728325 Mart*11112 (introduces another 3D-array for each passive tracer, but only if
11113 GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING
11114 gchemTendency is not needed because the timestep is done separately)
11115 - gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY
11116 - GCHEM is now---more or less cleanly---separate from PTRACERS
11117 - to bo done: handling of surfaceForcingPtr that is needed for KPP not
11118 so clear to me how that should be done in a general way.
11119 o CFC: improve formatting of output in CFC_ATMOS
11120 o PTRACERS:
11121 - rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so
11122 that ALL experiments with ptracers enable can be checked. This makes
11123 GCHEM_MONITOR obsolete.
11124 - include a runtime parameter PTRACERS_monitorFreq that defaults to
11125 monitorFreq
a435e833b1 Mart*11126 - set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true
68c34fd102 Ed H*11127 o add PTRACERS (PTR0[1-5]) to testreport output
b3bbb0d458 Patr*11128 o exf_check_range:
11129 * default changed to .TRUE.
11130 * will check values for niter0 if debLevA, every timestep if debLevB
11131 * STOP in exf_check_range if 'out of range'
11132 * range chosen generous to allow for potential extema
11133 TBD: a version with stricter range
11134 permitted range would be runtime parameters
5f42c34bbe Jean*11135 o GMredi:
11136 - fix ldd97 slope limit ; extend valid domain of Psi-Bolus ;
11137 - change S/R GRAD_SIGMA to be valid in the overlap on CS-grid.
11138 - change the default GMREDI_OPTIONS.h: compile everything except Visbeck
a435e833b1 Mart*11139 o GCHEM:
31940778af Mart*11140 - move call to GCHEM_FORCING_SEP, so that it is now called before
11141 the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP
a435e833b1 Mart*11142 - introduced a useGCHEM runtime flag and applied it everywhere.
26bcdcd4f0 Mart*11143 - renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING;
11144 this flag is now only visible within GCHEM-pkg routines.
11145 - moved gchem_forcing_int temporarily into ptracers_forcing, this will
a435e833b1 Mart*11146 be replaced by a 3D array that is computed before thermodynamics; for
26bcdcd4f0 Mart*11147 this, the tracer ID iTracer had to be included into the parameter list
11148 of ptracers_forcing
a435e833b1 Mart*11149 - set up forward_step to call gchem_forcing, that will replace
26bcdcd4f0 Mart*11150 gchem_forcing_int in ptracers_forcing
11151 - cleaning up
3e021cd85f Jean*11152 o small cleaning of exch2: remove files that are also in eesupp/src
30a55c64a0 Mart*11153
0e6056cd20 Jean*11154 checkpoint56 (2004/11/17)
0608749963 Jean*11155 o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0
2f14a1f812 Ed H*11156 o mnc: cleanup "full" files--fixes out-of-memory problem
c715d0b027 Patr*11157 o ECCO-GODAE
11158 * model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup
11159 * fully merged and updated from SIO code
11160 windstress sign change affects
11161 - exf_inscal_[u/v]stress
11162 - sign of xx_tau[u/v] adjustments
11163 - signs in cost_scat
11164 * ctrl_get_gen: avoid update of tau[u/v] for first few days
11165 * natl_box_adjoint updated and compressed
11166 * 2-level checkpoint switch added
11167 (tested in EXP. 1 of natl_box_adjoint)
11168 * new switch doInitXX to avoid init. of xx_... in optimcycle=0
11169 o SVD
11170 * first complete, non-hacked version for SVD calculations
11171 * all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_...
11172 performed via direct access files admtlm_vector.it????
11173 (via ctrl_[un]pack)
11174 * optimcycle is used for ARPACK iteration counter
11175 (note: adxx_... is iterated, rather than xx_...; latter is constant!)
11176 * EV problem ok w.r.t. L2-norm in tangent space; need to check other norms
a435e833b1 Mart*11177 and add linear transforms where necessary
c715d0b027 Patr*11178 * controls are initial/final SST, SSS (can be extended; need to check
11179 ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F
11180 o mdsio: filename info to both stderr, stdout
11181 o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec]
a435e833b1 Mart*11182 from sign change
2f14a1f812 Ed H*11183
0e6056cd20 Jean*11184 checkpoint55j_post (2004/11/10)
4c23dd3d61 Jean*11185 o isolate dissipation tendency (allow to keep it out off AB) in V.I form.
11186 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
617e9c07f6 Ed H*11187 o add consistent build directories and .cvsignore files to verification
070e727a0d Dimi*11188 o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity
a435e833b1 Mart*11189 o make all subroutines 30 or less characters in length for certain older
11190 compilers to work (a thorough search only turns up two routines in
064f472621 Ed H*11191 pkg/ptracers)
a435e833b1 Mart*11192 o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity;
7066de6cf6 Jean*11193 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
11194
0e6056cd20 Jean*11195 checkpoint55i_post (2004/10/28)
92cbe40bc9 Jean*11196 o change arrays for total vertical diffusivity (2.D if explicit,
11197 3.D if implicit) ; each ptracer uses its own background value.
73983c4f5f Ed H*11198 o added mnc/NetCDF output capability to ocn_compon_interf
a435e833b1 Mart*11199 - added bits to verification/cpl_aim+ocn so that it can run on
73983c4f5f Ed H*11200 ITRDA and other clusters without the mpirun "-wd" option
0de9c264f0 Andr*11201 o fixed wayward endif in mom_fluxform.F that messed up cyclindrical
a435e833b1 Mart*11202 configuration
11203 o give MNC the ability to create additional files rather than
11204 exceeding a specified file size limit "MNC_MAX_FILESIZE"
11205 - the default is just less than 2GB which is a practical limit
ab11ba1276 Ed H*11206 on many systems
a435e833b1 Mart*11207 o Compute the non-local term using either KPP vertical diffusivity (=default)
60fa91c126 Jean*11208 or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T)
9f675e95f9 Jean*11209
0e6056cd20 Jean*11210 checkpoint55h_post (2004/10/20)
19afae78f4 Jean*11211 o add verification test "vermix"
ff63a227b0 Ed H*11212 o remove all the *_ioinc flags and replace with the single global
11213 outputTypesInclusive flag
69377f8682 Jean*11214 o allow to set a vertical profile of vertical diffusivity for T & S
19afae78f4 Jean*11215 o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS
11216 o useMNC moved from data.mnc to data.pkg
69377f8682 Jean*11217
0e6056cd20 Jean*11218 checkpoint55g_post (2004/10/14)
6b1c25ae7b Patr*11219 o Renaming carbon AD experiments to comply with testreport conventions
11220 o Updating adjoint of Held-Suarez hs94.1x64x5
11221 o Fixing directives for non-ECCO forward_step, after ECCO directives
11222 have been fixed to avoid recomp. of do_oceanic_phys
11223 Works well for global_ocean.90x40x15,
11224 but recomp. issue remains for carbon
a435e833b1 Mart*11225 o Updating adjoint output for natl_box_adjoint after
6b1c25ae7b Patr*11226 pkg/ecco has been modified (see taga c55d_post)
11227
0e6056cd20 Jean*11228 checkpoint55f_post (2004/10/13)
8a3e9d877a Ed H*11229 o rename to timeave_init_fixed
11230
0e6056cd20 Jean*11231 checkpoint55e_post (2004/10/13)
d6be6cad8f Patr*11232 o some delicate re-shuffle of store directives to avoid one
11233 extra call of do_oceanic_physics
11234 affects ecco_the_main_loop.F, do_oceanic_physics.F
11235 checkpoint_lev1_directives.h
11236 o NB: this may break global_ocean adjoint temporarily,
11237 but it is clear how to fix it. Will do later, need this now.
11238
0e6056cd20 Jean*11239 checkpoint55d_post (2004/10/11)
75d667876f Patr*11240 o ECCO specific cost function terms (up-to-date with 1x1 runs)
11241 o ecco_cost_weights is modified to 1x1 runs
11242 o modifs to allow observations to be read in as
11243 single file or yearly files
11244 o enable to read exf forcing fields as either
11245 single file or yearly files (flag useExfYearlyFields)
0e6056cd20 Jean*11246 checkpoint55d_pre (2004/10/08)
75d667876f Patr*11247
11248 o switch between 2-level and 3-level checkpointing
a435e833b1 Mart*11249 o add ability of MNC to write local and "partial" (eg. 2D slices where
cb356b4c5f Ed H*11250 the full 3D field is never actually stored) arrays to NetCDF files
a435e833b1 Mart*11251 with the correct (that is, the complete multi-dimensional) set of
cb356b4c5f Ed H*11252 array indicies
11253 - used in mom_vecinv() to write the diagFreq output
11254 - tested (demonstrated) in verification/aim.5l_cs
c9c3d7103f Ed H*11255 o further mnc-ification
11256 - add verification/lab_sea to the list with mnc setups
11257 - fix undefined mnc v-names in cd_code
11258 - add kpp to mnc output (both snapshot and timeave)
6deb815953 Mart*11259 o non-hydrostatic code
11260 - added horizontal viscosity parameter viscAhW for w, that replaces viscAh
11261 in calc_gw.F
11262 - defaults to viscAh
11263 - this is useful, when I want to use viscAh=0 (e.g., only biharmonic
a435e833b1 Mart*11264 friction or Leith) in non-hydrostatic mode, as long as there is
6deb815953 Mart*11265 no biharmonic friction and/or Leigth or equivalent for vertical velocity.
449f3c105b Patr*11266 o pkg/cost
11267 extend simple cost functions to treat time mean quantities
11268 (T,U,V) via cost_accumulate_state from cost_tile
4ddf54cc90 Jean*11269 o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to
11270 be 2 times larger than the minimum size the advection scheme requires.
11271 now get a perfect conservation of salt in advect_cs test-exp (updated)
76f580e1f0 Mart*11272 o GGL90 (Gaspar's TKE mixed layer)
a435e833b1 Mart*11273 - add horizontal diffusion of TKE, requires exchanges in
11274 do_fields_blocking_exchanges, horizontal diffusivity is zero by
11275 default. In OPA there is no horizontal diffusion of TKE but the
76f580e1f0 Mart*11276 mixing coefficients are computed from a horizontal average of TKE of
11277 6 points or so. I think that diffusion has a little more physical
11278 justification.
a435e833b1 Mart*11279 - clean up ggl90_calc in the hope of reducing memory usage (this hope
76f580e1f0 Mart*11280 was in vain)
11281 - mask tke-variable in ggl90_init
3c38934f04 Jean*11282 o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass)
11283 o fix biharmonic diffusion on CS-grid.
78800a222d Mart*11284 o more obcs stuff
11285 - added obcs_external_fields_load as an alternative to the EXF-pkg option
a435e833b1 Mart*11286 for reading boundary values. This routine is called from
78800a222d Mart*11287 obcs_prescribe_read
11288 - updated obcs_check
965df15d92 Mart*11289 - changed sponge layer relaxation parameter units for days to seconds
11290 - turned off sponge layer by default
5720994acc Patr*11291 - changed argument list of OBCS_CALC to myTime+deltaTclock
b67ae883c8 Mart*11292 - fixed about 35 bugs in obcs_external_fields_load
78800a222d Mart*11293
0e6056cd20 Jean*11294 checkpoint55c_post (2004/09/23)
38224ac59a Patr*11295 o obcs stuff
11296 - new runtime flags useOBCSprescribe, useOBCSbalance
11297 - re-arranged obcs_calc
11298 - moved exf_getobcs to obcs_prescibe_read
11299 obcs_prescibe_read is called after ORLANSKI stuff
11300 and independent of it (executable can contain all).
11301 - updated obcs_check
64e4c8fd27 Patr*11302 - added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE.
11303 These may be necessary only if tangential velocities are
11304 prescribed at OB, not sure, needs testing.
2509c39694 Ed H*11305 o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments
11306 which simplifies the calls and passes the ifc check-bounds test
11307
0e6056cd20 Jean*11308 checkpoint55b_post (2004/09/22)
6fdcc18f80 Jean*11309 o add a 2D scalar, Z location, exchange_2 routine.
9f675e95f9 Jean*11310 o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows
11311 to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)]
11312 affects advect_cs results (for the wrong reason): update output.txt
a435e833b1 Mart*11313 o use a more standard discretization for biharmonic viscosity ;
df39a169f0 Jean*11314 (original version still available with #define MOM_VI_ORIGINAL_VISCA4 )
a435e833b1 Mart*11315 affects results of dome set-up: update output.txt
df39a169f0 Jean*11316 o fix gad_advection.F (CubedSphere part), back to version 1.23
11317 o fix bug in mom_vi_del2uv.F (CubedSphere part).
58031354dd Mart*11318
0e6056cd20 Jean*11319 checkpoint55a_post (2004/09/20)
a435e833b1 Mart*11320 o merged code to
96bbd4e2a5 Patr*11321 * prescribe/read time-dependent open boundaries
11322 (works in conjunction with exf, cal)
11323 * sponge layer code for open boundaries
11324 * each boundary N/S/E/W now has its own CPP option
11325 (healthy for the adjoint)
11326
0e6056cd20 Jean*11327 checkpoint55 (2004/09/17)
334b55a5b0 Patr*11328 o up-to-date adjoint of previous breaks
11329 - natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix
11330 - global_ocean_ebm: adjoint still needs fix (TLM ok)
11331 - global_ocean.90x40x15: extended GMREDI_OPTIONS.h
11332 - carbon: * remove tr1-related adjoint verification
11333 * add ptracer as control variable
11334 o remove all tr1-related code (ALLOW_PASSIVE_TRACER)
11335 (adjoint stuff still has some tr1 'names', but all use ptracer arrays)
11336
0e6056cd20 Jean*11337 checkpoint54f_post (2004/09/16)
d3c81fef04 Patr*11338 o in verification/carbin/ remove experiment related to
11339 ALLOW_PASSIVE_TRACER (array tr1 etc)
11340 code_ad/ input_ad/ results_ad
11341
b8e554ea44 Mart*11342 o add two new packages
11343 - ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993)
11344 + subject to optimization (memory)
11345 - opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997)
11346 + subject to reordering (many GOTOs in the original code)
11347 + so far opps is called for every (i,j) point, and then operates in
11348 the vertical; one may want to reorder the scheme in order operate in
a435e833b1 Mart*11349 horizontal slabs at the cost of (a lot of) memory, at least ten new 3D
b8e554ea44 Mart*11350 fields)
e05d966902 Ed H*11351 o overhaul of IO so that we now have flags for MDSIO and/or MNC
11352 - all verification tests compile and run with linux_ia32_g77
a435e833b1 Mart*11353 - defaults are compatible with current input files--nothing
e05d966902 Ed H*11354 should change if you were not previously using MNC
11355 - MNC output has been added in numerous places (eg. timeave)
11356 but there are still a few writes not yet do-able with MNC
11357 (this is in progress)
a435e833b1 Mart*11358 - flags now allow for either/or/both use of MDSIO and MNC and
e05d966902 Ed H*11359 documentation will soon follow
11360 - numerous small formatting cleanups for ProTeX
1f6288729b Ed H*11361 o add version info (via BUILD_INFO.h) to MNC and stdout
11362
0e6056cd20 Jean*11363 checkpoint54e_post (2004/09/02)
58031354dd Mart*11364 o add two new packages
a435e833b1 Mart*11365 - pp81 (Packanowski and Philander, 1981), Richardson number and
58031354dd Mart*11366 stratification dependent mixing
11367 - my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme
a435e833b1 Mart*11368 - these scheme operate in a similar manner as KPP (without ghat, of
58031354dd Mart*11369 course), however there is only one diffusivity that is used for both
58378fc26e Mart*11370 temperature and salinity (and passive tracers)
ff0dde6fdb Step*11371 o add offline package
c7bf664228 Ed H*11372 o add "verification/dic_example" which contains a dic-gchem-ptracer setup
11373 provided by Stephanie Dutkiewicz
e8a04cb645 Ed H*11374 o genmake2: add ability to search for C compilers and cleanup test output
11375 - fixes recent SX-6 problems and should help with others (eg. HP-UX)
11376
0e6056cd20 Jean*11377 checkpoint54d_post (2004/07/27)
999e18a3ba Alis*11378 o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed
a435e833b1 Mart*11379 o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong,
1c7ec5d18e Jean*11380 leading to additional shift by 5 days each year of integration
11381 (i.e. leading to considerable offset over the years)
3eb6e74bad Jean*11382 o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep
11383 o start with no AB and no initial filtering (staggerTimeStep):
11384 change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5
11385 o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F
11386 (external loading & cpl import/export stay in forward_step.F)
11387 o update coupling interface to work with new staggerTimeStep
11388 o change MDSIO ptracers_pickup.
f8f693c946 Jean*11389 o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F);
353dc202ae Ed H*11390 o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*")
f8f693c946 Jean*11391 o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell)
353dc202ae Ed H*11392
0e6056cd20 Jean*11393 checkpoint54c_post (2004/07/18)
1a73c8a0cc Jean*11394 o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr
11395 this affects (truncation error) output.txt of test-exp:
11396 global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box
11397 o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array)
b59159bd17 Jean*11398 o change Qnet to always be the net heat flux, (+upward).
11399 affects (truncation error) output of natl_box exp.: updated
43f9f92e51 Jean*11400 o define the max number of passive tracers in PTRACERS_SIZE.h
11401 o start to test mnc routinely in exp0
11402 o add sea-ice loading (sIceLoad) as a new forcing field.
11403
0e6056cd20 Jean*11404 checkpoint54b_post (2004/07/08)
a435e833b1 Mart*11405 o add testreport "-j JOBS" option for parallel builds (tested and pretty
8c9e835c69 Ed H*11406 impressive on Altix and Opteron systems)
bc1bd3388a Ed H*11407 o diagnostics can now write NetCDF files through the mnc package
b71b8cc969 Jean*11408 o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output
a435e833b1 Mart*11409 o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added
f04695194c Jean*11410 o staggerTimeStep & NLFS: rescale T & S surface tendencies.
11411 affects (truncation error) output of lab_sea & natl_box exp.: updated
11412 o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.)
11413
0e6056cd20 Jean*11414 checkpoint54a_post (2004/07/06)
89aa0d86bf Jean*11415 o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order).
11416 o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.)
11417 o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished)
11418 o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D)
11419 + internal_wave (shift in writing cg2d_ini_res)
0e6056cd20 Jean*11420 checkpoint54a_pre (2004/07/05)
33e1cd7241 Jean*11421
0f1d4cfc8d Dimi*11422 o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice
11423 - modified verification/lab_sea and natl_box_adjoint accordingly
11424
0e6056cd20 Jean*11425 checkpoint54 (2004/07/02)
11426 checkpoint53g_post (2004/07/02)
e5b80f023f Jean*11427 o prepare splitting of thermodynamics: store convect.counter in common block
8ac0de89ba Jean*11428 o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error)
11429 output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave
e73e2206ff Dimi*11430 o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection
1cf497b67b Jean*11431 o new parameter "nShapS": allow to treat differently S from T (nShapT)
11432 o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S)
9e38639d14 Patr*11433 o restore adjointability
1cf497b67b Jean*11434
0e6056cd20 Jean*11435 checkpoint53f_post (2004/06/25)
f4437bef13 Jean*11436 o modifications that affect AIM experiment results (update output.txt):
a435e833b1 Mart*11437 - no advection of S at top interface Nr (pkg/generic_advdiff)
f4437bef13 Jean*11438 - air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F)
71989a1d2f Jean*11439 o AIM pkg:
11440 - include stability function into surf.Flux derivative relative to Tsurf
11441 - calculate clear-sky radiation & surface temp. change (for diagnostics)
a435e833b1 Mart*11442
9583d821f1 Andr*11443 checkpoint53e_post
11444 o merged cylindrical coord configuration
11445 o added rotating_tank experiment
db2e27b728 Andr*11446 checkpoint53e_pre
11447
0e6056cd20 Jean*11448 checkpoint53d_post (2004/06/14)
27134ca433 Jean*11449 o faulks upgraded: re-generate output.txt that have changed:
11450 global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box
19ec94aecc Alis*11451 o Added Bryan and Lewis, 1979, vertical diffusivity profile
a435e833b1 Mart*11452 o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing.
5d5fff3a81 Alis*11453 o added Sadourny discretization of Coriolis
11454 - moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h
11455 - re-enabled use of omega3 (useAbsVorticity)
e46ec53fc5 Alis*11456 o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for
52f1ebc9d7 Jean*11457 vector-invariant equations
e46ec53fc5 Alis*11458 - note: does *NOT* yet use same variable visc. for no-slip BC's.
8a9329e700 Mart*11459 o recoded the lateral boundary conditions for non-hydrostatic w, this time
11460 hopefully without new bugs
11461 - still to do: biharmonic friction for non-hydrostatic w
4855f667f0 Alis*11462 o bug fix for mom_*_sidedrag: rA -> rAs,rAw
11463 o regenerated output for global_ocean_ebm (using -ieee)
647a06f20c Alis*11464 o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation
11465 of mom_common/
11466 - simple re-arrangement of instructions within computing loop
0e6056cd20 Jean*11467 checkpoint53d_pre (2004/05/21)
647a06f20c Alis*11468
0e6056cd20 Jean*11469 checkpoint53c_post (2004/05/21)
1ad8306ce0 Jean*11470 o new version of coupler for AIM+thSIce and Ocean models
11471 - new fields (SSS,h_MixLayer ...) are exchanged through the coupler
11472 - land: change Evaporation of snow
11473 - aim with thSIce: fix bug in snow-precip.
fbdf55c31a Mart*11474 o changes to calc_gw.F
11475 - bug fix for w^2 term near the bottom boundary
11476 - (hopefully) improve the lateral slip boundary condtions for use with
11477 partial/looped cells
11478 - because the bug fix changes two verification experiments anyway (exp5
11479 and plume on slope), change the lateral boundary condition from half slip
11480 to the value of no_slip_sides
4e8c9bded2 Patr*11481 o ebm package wasnt quite up to the parallel task. Fixed that.
8c7ad6d151 Patr*11482 o Adjoint of EBM package + verification
11483 * TLM OK
11484 * ADM not sufficient accuracy yet (needs further testing)
fbdf55c31a Mart*11485
0e6056cd20 Jean*11486 checkpoint53b_post (2004/05/14)
f86a3c0e0c Patr*11487 o Commiting new energy balance model to repository
11488 * package is pkg/ebm
11489 * verif. is verification/global_ocean_ebm
11490 * references are in ebm_driver.F
11491 C * X. Wang, P. Stone and J. Marotzke, 1999:
11492 C Global thermohaline circulation. Part I:
11493 C Sensitivity to atmospheric moisture transport.
11494 C J. Climate 12(1), 71-82
11495 C * X. Wang, P. Stone and J. Marotzke, 1999:
11496 C Global thermohaline circulation. Part II:
11497 C Sensitivity with interactive transport.
11498 C J. Climate 12(1), 83-91
11499 C * M. Nakamura, P. Stone and J. Marotzke, 1994:
11500 C Destabilization of the thermohaline circulation
11501 C by atmospheric eddy transports.
11502 C J. Climate 7(12), 1870-1882
11503 o Will need long integration testing.
0e6056cd20 Jean*11504 checkpoint53b_pre (2004/05/14)
89dadec0f0 Patr*11505
9c05b3873e Alis*11506 o created pkg/mom_common in preparation for variable viscosity code
11507 o renamed and split ini_mnc_io
f4a07a4bc7 Jean*11508 o pkg/land: only liquid water can diffuse or run-off
11509 o AIM using land: soil wetness availability account for snow
53c7d996f6 Dimi*11510 o added printMapIncludesZeros to EEPARMS namelist
11511
0e6056cd20 Jean*11512 checkpoint53a_post (2004/05/11)
e7f1536c88 Patr*11513 o restore TAMC compatiility for exf_constants.h
11514 (no usage of _d in .h)
11515 o Additional storing in KPP in an attempt to fix
11516 TAMC problem with adjoint of KPP code.
11517 (no success...)
11518 Identical code works fine with TAF.
0b07ed3507 Dimi*11519 o Fixed verification/natl_box_adjoint experiments.
11520 Initial conditions for Experiments 4 and 5 are now
11521 set to "SEAICE_initialHEFF=0", which is more reasonable,
11522 and hence gives results closer to that of Experiment 2.
11523 Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again.
e7f1536c88 Patr*11524
0e6056cd20 Jean*11525 checkpoint53 (2004/05/06)
8522e3c798 Chri*11526 o stable checkpoint with up to date adjoint
11527 TLM tests only run for 1st grdchk at the moment. Its unclear if
11528 this is a code problem or a problem with resetting code for g_
11529 variables that is being autogenerated wrong.
11530 Otherwise:
a435e833b1 Mart*11531 o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix.
11532 o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ)
8522e3c798 Chri*11533 are both still in chaos following their security messes.
11534
0e6056cd20 Jean*11535 checkpoint52n_post (2004/05/06)
f989ca6313 Ed H*11536 o various build (mostly genmake2) changes including:
11537 - ability to build/run more easily within Cygwin and MacOS X
11538 - more complicated Makefiles with a stronger dependence on Gnu Make
4634ed4578 Dimi*11539 o pkg/seaice modifications
f4fcd985ee Dimi*11540 - added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost
11541 of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer
11542 and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm
a435e833b1 Mart*11543 - changed proxy for geostrophic velocity and updated
28d826540b Dimi*11544 verification/lab_sea/results/* accordingly
4634ed4578 Dimi*11545 - removed ADI dynamic solver from pkg/seaice
11546 - replaced all occurrences of 1/CSTICE or 1/CSUICE
11547 they caused a segmentation fault under certain circumstances
9976df0ac5 Mart*11548 - removed unused field WATR
b055761890 Mart*11549 o bug fix in exf-package:
11550 - u/vwind are defined at tracer/pressure points. The values of u/vwindmask
11551 now reflect that.
386eadb044 Mart*11552 o small fixes in the cal-package:
11553 - set reference date to first of January for the 'model'-calendar
11554 - failing of cal_CheckDate in cal_FullDate now actually results in a
11555 warning
df66ce88b0 Mart*11556 o small modifications in exf-package to increase flexibility:
11557 - change climtempfreeze from a constant to a runtime parameter that
11558 is specified in data.exf_clim (default = -1.9)
11559 - introduce runtime parameter windstressmax (default = 2.0) that is
11560 specified in data.exf
351ee82bec Jean*11561 o fix in pkg/thsice:
11562 - update Evap (Tsf changes) to be consistent with Latent heat flux
11563 - maintain snow precipitation unchanged (even if Tsf >=0).
11564 both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice
11565
0e6056cd20 Jean*11566 checkpoint52m_post (2004/04/18)
329dcc48c4 Mart*11567 o commented out call to cal_GetMonthsRec in swfrac.F and added some comments;
11568 this does not change any of the results, because myIter=0 in swfrac always
11569 lead to jwtype=2 (the default anyway), but the call makes little sense
11570 as a default
222786db83 Jean*11571 o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated
1395c36e8a Jean*11572 o re-work pkg/thsice interface with ocean & bulk_force pkg to allow
11573 atmospheric model (AIM) to use it ; add a "slab ocean" component.
11574 o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice)
11575 o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice
7b6ef96a80 Dimi*11576 o extending useSingleCpuIO option to work with new exch2 I/O format
11577 - old-style, missing-tile I/O is still accessible by defining CPP
11578 option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h
7e019df062 Ed H*11579 o monitor package can write to NetCDF files and/or STDOUT
11580 o fix re-definition bug in MNC_GRID_INIT_ALL()
8a37d3da43 Ed H*11581 o doc/api_reference added
11582 - a framework for building an API Reference Manual using all
11583 the "protex" comments embedded in the code
11584 - see pkg/generic_advdiff, pkg/mnc for examples
b297381f9a Ed H*11585 o MNC:
11586 - make myThid the last argument for all subroutines
11587 - new default for the grid files: NO halos
cba009f524 Ed H*11588 - add useMNC and other run-time flags
11589 - separate per-file-group handling of the unlimited dimension
a435e833b1 Mart*11590 - early initialization of MNC w/ flags read at the eeboot stage
cba009f524 Ed H*11591 and lookup tables set in initialize_fixed
11592 - write all MNC output to a freshly-created directory
47e4defd15 Jean*11593 o thermodynamics sea-ice (thsice) is now tested with testreport.
11594 o test exp. advect_cs: use the standard cs32 grid ; update output.
cd56948b28 Patr*11595 o Added functionality to grdchk:
11596 pick global i,j,k position (or nearest wet) where to perform check.
9fa8dff5bb Jean*11597
0e6056cd20 Jean*11598 checkpoint52l_post (2004/03/11)
63585e25d4 Jean*11599 o new land formulation:
11600 a) use ground enthalpy as prognostic variable to ensure exact
11601 energy conservation.
11602 b) account for water temperature and for latent heat of freezing
11603 in all processes (rain, run-off, ground storage)
11604 c) compute surface and ground temperature implicitly.
11605 o aim_v23 modification for new land model:
11606 a) Treat separately land / ocean / sea-ice surface fluxes
11607 to allow implicit computation of land & sea-ice surface temp.
11608 b) add snow precipitation.
0e6056cd20 Jean*11609 checkpoint52l_pre (2004/03/11)
9fa8dff5bb Jean*11610
af5663a801 Jean*11611 o fix problem (when 1 tile is empty) in min/max monitor.
a435e833b1 Mart*11612 o fix bug in timeAve (u,vZetatave in common block)
76a3a9dce3 Dimi*11613 o no restoring terms under ice for pkg/seaice
36f6faaf99 Dimi*11614 o moved SEAICE_DO_DIAGS to S/R do_the_model_io
11615 o bug fix for pkg/seaice pickups
070ec0f1ad Ed H*11616 o change MNC call locations and add coordinate attributes
3777bd4e33 Jean*11617 o mask vorticity at the corner ; affects global_ocean.cs output
11618 o fix ini_curvilinear_grid ; test CS experiments with mpi
831771ecb4 Jean*11619 o aim.5l_cs: modify sea-ice fraction input file ; update output
73ca73937b Patr*11620 o exf: Adding simple range check routine for exf fields after read
e06eab71ce Jean*11621
0e6056cd20 Jean*11622 checkpoint52k_post (2004/02/23)
c99437d93a Alis*11623 o removed top-level directory "diags"
11624 - we migrated these functions to pkg/timeave a long time ago
11625 o fixed bug introduced in pkg/monitor
171b0dbf72 Patr*11626 o accuracy ctrlprec = 32 insuffient for gradient checks using
11627 averaged fields (I/O via cost_averages)
11628 -> use ctrl.h in active_file*.F to control I/O precision.
11629 o paramter list of CALL ADTHE_MAIN_LOOP
11630 o added initial do_the_model_io to ecco
11631 o set all ...Freq to zero after cost_final
11632 taveFreq, dumpFreq, pChkptFreq
4f02768964 Patr*11633 o MAIN and ECCO differentiability restored
c99437d93a Alis*11634
0e6056cd20 Jean*11635 checkpoint52j_post (2004/02/18)
37b568618c Patr*11636 o fix nchklev in tamc.h for global_ocean...
11637 o Bringing flow and store directives up-to-date
11638 o Really weird thing!
11639 call do_the_model_io from the_main_loop with parameters
a435e833b1 Mart*11640 starttime, niter0, instead of mytime, myiter, screws up the adjoint:
37b568618c Patr*11641 TAF places a faulty re-call of initialise_varia
11642 after cost_final call which should not be there!
0e6056cd20 Jean*11643 checkpoint52j_pre (2004/02/03)
37b568618c Patr*11644
63ae023a6f Andr*11645 o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and
11646 error messages
e06eab71ce Jean*11647 o fix errorMessageUnit problem. remove old version of mdsio from eesup/src
7ecbd3c2aa Andr*11648 o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating
11649 debug output
bd481ce0ad Andr*11650 o modfied mdsio_writefield.F to handle non-global files under exch2
65c905ad22 Jean*11651 o update AIM Cubed-Sphere exp (aim.5l_cs):
11652 use land, p*, and Franco.M forcing fields with fractional land-sea mask.
11653 o update AIM Equatorial Channel exp:
11654 use standard aim_v23 pkg and change the SST fields to be more realistic.
6b7f81d27b Andr*11655 o globalFile now works with exch2
a435e833b1 Mart*11656 o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and
e06eab71ce Jean*11657 mon_vort3.F to make exch2 friendly with >1 tile per cube face
e7f0a9dbe1 Dimi*11658 o limit timeave output for hi-res integrations
404487e0d3 Andr*11659
0e6056cd20 Jean*11660 checkpoint52i_post (2004/01/21)
6989afdf96 Alis*11661 o removed CPP_EEOPTIONS.h from verification/*/code
11662 o updated the tiling for global_ocean_pressure
0e6056cd20 Jean*11663 checkpoint52i_pre (2004/01/20)
6989afdf96 Alis*11664
a435e833b1 Mart*11665 o update aim.5l_LatLon using the standard aim_v23 pkg (instead of
1e2193d0c9 Jean*11666 the old pkg/aim).
11667
0e6056cd20 Jean*11668 checkpoint52h_pre (2004/01/20)
27e400a76e Andr*11669 o shortened offending lines in exch2_send_rx?.template
8c93ce9839 Andr*11670 o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator
65592d1bf7 Ed H*11671 o genmake2: add build & execute test for NetCDF code
52d06eb5f9 Andr*11672 o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed
11673 old grid files, moved CPP_EEMACROS.h to pkg/exch2
f02794c1c2 Dimi*11674 o added useSingleCPUIO flag to monitor.F and mon_out.F
d3ec31b5f6 Dimi*11675 o added temporary hack for sea-ice dynamics on the cube:
11676 metric terms are ignored and it is assumed that
11677 there is no sea-ice on cube faces 1, 2, 4, and 5.
f02794c1c2 Dimi*11678
0e6056cd20 Jean*11679 checkpoint52f_post (2004/01/09)
046fd16d1c Andr*11680 o added exch2 cube routines to pkg/exch2
11681 o modified hs94.cs-32x32x5 to use it
11682 o added new grid files to hs94.cs-32x32x5
0e6056cd20 Jean*11683 checkpoint52f_pre (2004/01/07)
046fd16d1c Andr*11684
0e6056cd20 Jean*11685 checkpoint52e_post (2004/01/07)
67b14118a3 Jean*11686 o first attempt to solve vertical advection (momemtum & T,S) Implicitly
11687 for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom)
1cead955c0 Jean*11688 o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F)
11689 to work with implicit vertical advection and AB ;
11690 o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme.
11691 o update output (gad_calc_rhs.F changes affect truncation error) of exp:
11692 front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box
0e6056cd20 Jean*11693 checkpoint52e_pre (2004/01/02)
caad9f4c67 Jean*11694
11695 o fix bug in impldiff when Nr=1 or Nr=2.
7d401e1f11 Jean*11696 o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt
11697 o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test.
157d0c5b42 Jean*11698 o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2
11699 ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure
7e230c5c02 Dimi*11700 o added exf_offset_atemp for Celsius to Kelvin conversion of atemp
7fd609fd20 Dimi*11701 o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024
11702 o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations
7e230c5c02 Dimi*11703
0e6056cd20 Jean*11704 checkpoint52d_post (2003/12/16)
8b7b5f4e88 Alis*11705 o re-tiled many expts to allow comparison in multi-processor mode
11706 - updated output accordingly
11707 - changed hs94.128x64x5 to use intial T from file rather than use the
11708 random number generator
bcea5a4765 Andr*11709 o add infrastructure in model routines for fizhi and gridalt packages
6b0a2bb136 Jean*11710 o change global_ocean.cs32x15 because of Pb with GM on CS-grid.
8ac0e9b3ce Dimi*11711 o changes to permit hi-res, cubed-sphere, configuration
11712 - added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
11713 - added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F
11714 - added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation
11715 of surface winds for the cube
11716 (A verification experiment, based on global_ocean.cs32x15, but with
11717 pkg/seaice turned on and with on-the-fly interpolation from the NCEP
11718 Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice,
11719 complete with example surface forcing files and matlab scripts to look
11720 at the output and compare it with that of global_ocean.cs32x15.)
4b82b202ac Jean*11721 o packages pickup: $PKG_write_pickup called from packages_write_pickup ;
11722 but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code
11723 to conform to the common rule.
a435e833b1 Mart*11724 o check-in the first version of the coupler + interfaces for multi-components
bf18de4739 Jean*11725 set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI.
11726 - imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD).
a435e833b1 Mart*11727 - atmosphere: use pkg aim_v23 ; no sea-ice for now.
bf18de4739 Jean*11728 - ocean and atmos. share the same horizontal grid (no interpolation).
11729 - exchanges between component and coupler is done in forward_step
a435e833b1 Mart*11730 o new verification experiment, cpl_aim+ocn:
11731 coupled ocean - AIM atmosphere on cs32 grid.
6b0a2bb136 Jean*11732
0e6056cd20 Jean*11733 checkpoint52d_pre (2003/12/06)
a435e833b1 Mart*11734 o surface flux time-av diagnostic modified for NLFS & RealFreshWater
803573887e Jean*11735 o add call to AIM pendant S/R in external_forcing & external_fields_load.F
269d31530a Jean*11736
0e6056cd20 Jean*11737 checkpoint52c_post (2003/11/25)
7c799abcad Patr*11738 o Fixing OPTIONS files for use of exf:
11739 - ALLOW_ECCO not needed
11740 - ECCO_CPPOPTIONS.h should not be included from
11741 EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h
11742 as has been the case in the past
11743 - All cal/exf related options are currently set in
11744 single header file. Should remain so until we
11745 agree on a consistent new policy.
2a563ee529 Patr*11746 o Removed all CPP options for cal package.
11747 cal has no more CPP options.
9682a51356 Patr*11748 o modified STOREs in GAD_ADVECTION
11749 o corrected key comp. for passkey
7c799abcad Patr*11750
0e6056cd20 Jean*11751 checkpoint52b_post (2003/11/23)
dfac86e1ec Jean*11752 o new version: "thsice" of thermodynamic sea-ice pkg:
a435e833b1 Mart*11753 - only 1 call from "forward_step"; conserve energy, fresh-water & salt.
dfac86e1ec Jean*11754 - modify fluxes but do not change theta directly;
11755 - light cleaning of bulk_force pkg (still needed with thsice).
a435e833b1 Mart*11756 - add forcing fields + data files in global_ocean.cs32x15/inp_thsice
dfac86e1ec Jean*11757 + output_thsice.txt to test thsice & bulk_force pkgs.
11758 o put back grid & coriolis monitor output.
0e6056cd20 Jean*11759 checkpoint52b_pre (2003/11/23)
7966caf364 Jean*11760
a435e833b1 Mart*11761 o call "do_the_model_io" at the beginning (=> dump initial state)
7966caf364 Jean*11762 o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P)
6dbdc867be Patr*11763 o sort out interplay between tamc.h and PTRACERS_OPTIONS.h
11764 (need info on NUMBER_OF_PTRACERS)
11765 o missing PTRACERS headers in some routines
11766 o default tamc.h in pkg/autodiff supposed to crash
11767 to ensure proper customization
11768
0e6056cd20 Jean*11769 checkpoint52a_post (2003/11/17)
fa690556aa Jean*11770 o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp
9d36aec500 Dimi*11771 - moved surfaceTendencyTice from pkg/seaice to main code
fa690556aa Jean*11772 - subroutine FREEZE_SURFACE now limits only surface temperature
11773 and is called in FORWARD_STEP (if allowFreezing=.TRUE.)
11774 => new output.txt for global_ocean.cs32x15 & global_with_exf
11775 - keep the old version of FREEZE for backward compatibility;
11776 global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE.
915eb1cffa Patr*11777 - corresponding modifs for TAF directives
9d36aec500 Dimi*11778 o added surface flux output variables to TIMEAVE_STATVARS
11779 o time-averaged output for pkg/ptracers
915eb1cffa Patr*11780 o fix problem with ECCO-related divided adjoint
11781 snapshot file was missing some ad-variables,
11782 but no warning issued by TAF
fa1dae9534 Dimi*11783
0e6056cd20 Jean*11784 checkpoint52a_pre (2003/11/12)
fa1dae9534 Dimi*11785 o some bug fixes for #undef REAL4_IS_SLOW
11786
aca4df70a2 Patr*11787 checkpoint52 = ecco_c52_e35
11788 o after testing adjoints of checkpoint51u_post
11789
0e6056cd20 Jean*11790 checkpoint51u_post (2003/11/06)
909a9f878d Patr*11791 o this is the post-merge tag of the ecco-branch
11792 (needs another clean checkout and re-testing)
11793 o various natl_box_adjoint configs and results
11794 but no input fields
11795 o obcs adjoint not yet merged!
11796 o adding ECCO global 1x1 and 2x2 degree configs
11797 o updated/extended some store directives for seaice
11798 o pkg/ecco now containes ecco-specific part of cost function
11799 o top level routines the_main_loop, forward_step
11800 supersede those in model/src/
11801 previous input data.cost now in data.ecco
11802 (new namelist ecco_cost_nml)
11803 o in ctrl/ cleaned some cross-dependencies and updated CPP options
11804
0e6056cd20 Jean*11805 checkpoint51t_post (2003/11/04)
909a9f878d Patr*11806 o this is the pre-merge tag of the ecco-branch
11807
0e6056cd20 Jean*11808 checkpoint51s_post (2003/11/04)
ef651d0d5f Ed H*11809 o cleanup: removed various obsolete #define-s
909a9f878d Patr*11810 o pkg/grdchk
11811 - renamed 'ph-grd 3' to 'grad-res'
a435e833b1 Mart*11812 - merged from ecco-branch
909a9f878d Patr*11813 (remaining bug fixes for obcs gradient checks)
11814 - additional high-precision output for testreport
11815 (grep for 'precision_grdchk_result')
ef651d0d5f Ed H*11816
0e6056cd20 Jean*11817 checkpoint51r_post (2003/11/03)
16add2227d Ed H*11818 o cleaned up or removed CPP_OPTIONS.h files
11819 o updated results for some of the tests to reflect the new
11820 optfiles (-ieee: -O0 instead of -O3)
11821
0e6056cd20 Jean*11822 checkpoint51q_post (2003/10/30)
cb574bfa04 Patr*11823 o cd_code:
11824 - moved cd_scheme.F -> cd_code_scheme.F
11825 - separate read_checkpoint from cd_code_ini_vars.F
11826 - separated cd_code part from write_checkpoint
11827 - updated AD_SOURCE, generated .flow
11828 - added CD_CODE_VARS.h to the_main_loop
11829 - Moving cd_code specific store dir.s to pkg/cd_code
11830 o ctrl package totally restructured
11831 - pack/unpack now optional and decoupled from
11832 xx_/adxx_ I/O
11833 - ctrl_pack/unpack cleaned
11834 (new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F)
11835 - confined inclusion of AD_CONFIG.h to where necessary.
11836 o genmake2: changed AD dependencies from SRCFILES to AD_FILES
11837
0e6056cd20 Jean*11838 checkpoint51p_post (2003/10/30)
138482fdf6 Ed H*11839 o create initial cd_code package
a5bd9cbb61 Ed H*11840 - WARNING: the initialization of fields within packages
11841 is broken because INI_FIELDS (where READ_CHECKPOINT is
11842 called) is called *before* PACKAGES_INIT_VARIABLES.
11843 This seems to be backwards since
a435e833b1 Mart*11844 1) its important to initially zero the entire field including
a5bd9cbb61 Ed H*11845 the "halo" region
11846 2) zeroing needs to be done *before* reading pickup info
a435e833b1 Mart*11847 and the pickup call might or might not happen in any
a5bd9cbb61 Ed H*11848 particular run
11849 - this needs an overhaul for R2
138482fdf6 Ed H*11850 o cleanup verification/*/code/GMREDI_OPTIONS.h
11851 o cleanup testreport
11852
0e6056cd20 Jean*11853 checkpoint51o_post (2003/10/27)
8a8c81fb3e Patr*11854 o bringing AD-related verif's up to date with genmake2
11855 - carbon/
11856 - global_ocean.90x40x15/
11857 - hs.94.1x64x5/
11858 - (front_relax/ )
11859 o (more) consistent directory structure for AD-related verif.'s
11860 o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK
11861 o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF
11862 o bug fix in find_alpha.F for MDJWF:
11863 - modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for
11864 change rho -> rho-rhoConst
11865 - replace call find_rho to find_rhonum
11866 o initialisation of rFlx extended to full array (required by TAF)
11867 and shifted to thermodynamics
11868 o removed PTRACERS.h in ptracers routine
11869 o added surfacetendencyPtr to S/R parameter list pracers_forcing
11870 o Correcting initialisations for fVerU, fVerV.
11871 o helping TAF to recognize dependency on kUp for
11872 fVerU, fVerV
11873 o Replacing delZ by delR in pkg/ctrl/
0e6056cd20 Jean*11874 checkpoint51o_pre (2003/10/24)
8a8c81fb3e Patr*11875
51701379d8 Ed H*11876 o undid all of cp51 pending some cleanups and discussion
a435e833b1 Mart*11877 o added the [#include "AD_CONFIG.h"] statement to all files that need
406902c2ea Patr*11878 it for adjoint/tl #defines
11879 o re-worked the build logic in genmake2 to support AD_CONFIG.h
11880 o removed tools/genmake since it no longer works
c9cb668a47 Dimi*11881
0e6056cd20 Jean*11882 checkpoint51n_post (2003/10/23)
c9cb668a47 Dimi*11883 o modifications to make FREEZE flux visible to pkg/kpp
11884 - moved surfaceTendencyTice from pkg/seaice to main code
11885 - FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
11886 - subroutine FREEZE now limits only surface temperature
11887 (this means new output.txt for global_ocean.90x40x15,
11888 global_ocean.cs32x15, and global_with_exf)
11889 o added surface flux output variables to TIMEAVE_STATVARS
11890
0e6056cd20 Jean*11891 checkpoint51n_pre (2003/10/23)
d7f6e03355 Dimi*11892 o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F
4a967b9107 Ed H*11893 o added [#include "AD_CONFIG.h"] to all files that use the following
11894 defines:
11895 - ALLOW_ADJOINT_RUN
11896 - ALLOW_TANGENTLINEAR_RUN
11897 - ALLOW_ECCO_OPTIMIZATION
d7f6e03355 Dimi*11898
0e6056cd20 Jean*11899 checkpoint51m_post (2003/10/21)
668b211e58 Ed H*11900 o incorporating changes to get TAMC/TAF working in genmake2
11901 - added new TAMC/TAF targets to the Makefile
11902 - various cleanups related to package handling
fea3c3e36d Ed H*11903 - these changes should have no impact on the forward model
668b211e58 Ed H*11904
0e6056cd20 Jean*11905 checkpoint51l_post (2003/10/20)
c84f6b7c89 Dimi*11906 o changes to pkg/cal and pkg/exf that allow and speed-up long integrations
11907 - faster algorithm for cal_addtime.F
11908 - higher precision arithmetic, where needed
11909 - pkg/exf *startdate variables changed from calendar date to
11910 model integration time
11911
0e6056cd20 Jean*11912 checkpoint51l_pre (2003/10/17)
d33aea2a79 Jean*11913 o add salt flux to forcing fields (used when salty sea-ice forms or melts)
11914 o enable to apply restoring on S & T only in a latitude band.
11915 o update output (external_forcing_surf modif. change truncation errors)
11916 global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box
06c869d156 Patr*11917
0e6056cd20 Jean*11918 checkpoint51k_post (2003/10/16)
f9e188eb72 Jean*11919 o change default to: useNHMTerms=.FALSE.
11920 - new output.txt for atmos. exp (NHMTerms were wrong but now turned off):
11921 adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5
11922 - new output.txt for idealized oceanic exp (NHMTerms are now turned off):
11923 exp1, ideal_2D_oce
11924 - change data file of oceanic exp (leave the results unchanged for now)
11925 exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box
11926 o set gravitySign automatically according to the vertical coordinate used
11927 (and change sign: back to "logical" value: +1 when R increases downward)
a435e833b1 Mart*11928 o added an include barrier to the default CPP_OPTIONS.h and
9eb494b0cb Ed H*11929 removed the #include "PACKAGES_CONFIG.h" from it
f9e188eb72 Jean*11930 o fix a bug in mom_fluxform (from chk51j_post)
9eb494b0cb Ed H*11931
0e6056cd20 Jean*11932 checkpoint51j_post (2003/10/10)
0b85d93038 Patr*11933 o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/
11934 o adjusted some flow directives (dynamics, thermodynamics)
11935 o added cubed-sphere case to test cost function
11936 o heckpoint_lev?_directives.h now include
11937 pkg-specific directives, whenever those are enabled.
11938 o Moving pkg-specific flow directives to corresponding pkg
11939 Moving pkg-specific differentiation list to corresponding pkg
11940 Moving pkg-specific checkpoint-lev storing to corresponding pkg
11941 ---> conventions are
11942 - pkg_ad.flow
11943 - pkg_ad_diff.list
11944 - pkg_ad_check_lev?_dir.h
11945
0e6056cd20 Jean*11946 checkpoint51i_post (2003/10/09)
6d54cf9ca1 Ed H*11947 o merge of the branch-genmake2
11948 - knowingly breaks the older genmake
11949 - automatic generation of all ALLOW_${PKG_NAME} defines
11950 - new testreport supersedes older testscript
11951 o large number of package inclusion and header cleanups
0e6056cd20 Jean*11952 checkpoint51i_pre (2003/10/08)
6d54cf9ca1 Ed H*11953
b95c3843ab Ed H*11954 o new output for adjoin of global ocean vector invariant
11955 o fix for checkpoint of thermodynamic seaice and bulk_force
11956 o Steph gchem various cleanups
11957
46a4243beb Step*11958 checkpoint 51h_pre
b95c3843ab Ed H*11959 o fixed some single quotes
46a4243beb Step*11960 o modify gchem pkg to be more versatile
11961 o modifications to clean up dic pkg
11962 o add pkg/cfc
11963
0e6056cd20 Jean*11964 checkpoint51g_post (2003/10/02)
8c13754326 Patr*11965 o provide links for ARPACK and ADM*TLM
11966 o start removing verification/vero/
11967 o update AD-related stuff
11968 (in particular some IF-statements in model/src/ routines)
11969 o adding to verification/global_ocean.90x40x15/ adjoint of
11970 vector invariant setup
11971
0e6056cd20 Jean*11972 checkpoint51f_post (2003/10/02)
57c1eda489 Jean*11973 o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif)
6eb9516f3f Dimi*11974 o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation
34fdea0d95 Dimi*11975 of tracer Green's fucntions for ocean inversion project.
11976
0e6056cd20 Jean*11977 checkpoint51f_pre (2003/08/07)
981f32514d Dimi*11978 o Added on-the-fly spatial interpolation capability
11979 "USE_EXF_INTERPOLATION" to pkg/exf.
bda7c25f4a Dimi*11980 - This is a temporary Cartesian-grid hack until
981f32514d Dimi*11981 the super-duper ESMF coupler becomes available.
bda7c25f4a Dimi*11982 - See verification/global_with_exf/README for usage example.
11983 - Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
11984 flags and modified pkg/seaice accordingly.
981f32514d Dimi*11985 o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
11986 and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
11987 non-local transport term.
11988
0e6056cd20 Jean*11989 checkpoint51e_post (2003/08/03)
a435e833b1 Mart*11990 o pkg/mom_vecinv:
542c6d36a4 Jean*11991 - changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec)
11992 - add time-ave diagnostic of vorticity advection.
11993 o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV.
a435e833b1 Mart*11994 o atmospheric geopotential: - include water vapor effect;
542c6d36a4 Jean*11995 - use p^kappa in p* scaling.
c886fcc85e Jean*11996 o land pkg: read initial state from files.
11997 o AIM : add stratospheric drag in the upper level
11998
0e6056cd20 Jean*11999 checkpoint51d_post (2003/07/18)
c886fcc85e Jean*12000 o change function ILNBLNK (=> last non-blank char.) to return zero
12001 (instead of the string length) when the string. char is empty
8cd26a84aa Jean*12002 o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid)
06c869d156 Patr*12003 o modif's to restore TAMC compatibility
12004 - avoid "_d" constructs in PARAMETER declarations
12005 - avoid interrupting lines by comment lines
12006 o Use cluster local disks for purely local I/O
12007 vs. globally visible disks needed for ctrl stuff
12008 (merged from ecco-branch)
12009 - new active_file_loc... and mdsio_..._loc routines
12010 - affected packages: autodiff, ctrl, grdchk, mdsio
f171be8f2a Alis*12011
0e6056cd20 Jean*12012 checkpoint51c_post (2003/07/08)
494ad43bae Patr*12013 o introducing integer flag debugLevel
12014 - debLevZero: suppress all output
12015 - debLevA: standard
12016 - debLevB: equivalent to current debugMode=.TRUE.
12017 o introducing pathname variable mdsioLocalDir for mdsio
12018 that can be specified at runtime
12019 (relevant for cluster I/O to local disk)
12020 `
f35a23c575 Patr*12021 >>>checkpoint51b_post
12022 adjoint of ptracers
12023 o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM
12024 o extended state in checkpoint_lev?, etc.
12025 o alternative ctrl/cost with tr1 or ptracer
12026 o new comlev1_bibj_ptracers
12027 o new ptracers.flow
12028 o made ptracers_forcing same as external_forcing_s
12029 o added verification for adjoint with ptracers
12030 - adm. grdchk fail so far
12031 - tlm. grdchk OK
12032 - checked tapelev/comlev recomputations: OK
12033 <<<checkpoint51b_pre
12034
0e6056cd20 Jean*12035 checkpoint51a_post (2003/06/25)
f04468175c Step*12036 o added code for biogeochemistry package
12037 - new pkgs: dic, gchem
12038 - new subroutine in ptracers
12039 o modify code for biogeo packages
12040 - in model/src and pkg/ptracers
12041
0e6056cd20 Jean*12042 checkpoint51 (2003/06/24)
5949b565e2 Patr*12043 o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN
12044 - autodiff, ctrl, exf, grdchk, seaice
12045 kept separate packages
12046 - cost, ecco, obcs
f535eb56d5 Patr*12047 o updating verification/internal_wave, verification/lab_sea
12048 (all verif's pass on faulks.lcs.mit.edu RH7.3, g77)
5949b565e2 Patr*12049
0e6056cd20 Jean*12050 checkpoint50i_post (2003/06/23)
3cd89c6ea4 Patr*12051 o Preparing next differentiable checkpoint and sync
12052 of MAIN vs. ecco-branch
12053 - 1st step: this one is differentiable
a435e833b1 Mart*12054 - 2nd step: next(! not this) checkpoint will have updated packages
3cd89c6ea4 Patr*12055 from ecco-branch)
12056
0e6056cd20 Jean*12057 checkpoint50h_post (2003/06/20)
8f5c8e08bc Jean*12058 o new package "land": provide surface BC for AIM.
12059 o pkg/ptracers: apply exchange to all tracers after reading a pickup.
a435e833b1 Mart*12060 o AIM: use true log-P extrapolation for near surface temp (= as in
568bb87ebb Jean*12061 F.Molteni paper) ; update aim.5l_cs output.
8aafdaabe9 Alis*12062 o New variable in PARM03 for more flexible pickups
61893791a0 Patr*12063 o somewhat cleaned package initialisation sequence for
12064 ctrl/ cost/ ecco/ in packages_... routines
568bb87ebb Jean*12065
0e6056cd20 Jean*12066 checkpoint50g_post (2003/05/23)
09510da3bb Dimi*12067 o merged with release1_p17 (pkg/seaice and verification/lab_sea)
12068 - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
12069 - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
12070 made the default because of faster convergence than ADI
12071
0e6056cd20 Jean*12072 checkpoint50f_post (2003/05/23)
5192502418 Patr*12073 o exf totally restructured
12074 - replaced all exf_set_ routines by one generic exf_set_gen.F
12075 and made sure it's still differentiable
12076 - split exf_getffields.F into new exf_bulkformulae.F
12077 - exf_inscal_/exf_outscal_ suffixes consistent with field names
12078 - updated adjoint/makefile and relevant verif. accordingly
12079
0e6056cd20 Jean*12080 checkpoint50f_pre (2003/05/23)
b8d7339ac7 Jean*12081 o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ;
12082 + change Evap over land. (update aim.5l_cs output)
f171be8f2a Alis*12083 o added missing .cvsignores and made uniform across expts
12084 o changed configuration of tidal_basin_2d expt
12085 o added pkg/debug functions for tracing code in fatal crashes
12086 o tidied pkg/monitor to use MONITOR_OPTIONS.h
12087 o new fn in pkg/monitor to stop model if solution grows too big
12088 o removed lots of single quotes from comments
12089
0e6056cd20 Jean*12090 checkpoint50e_post (2003/05/14)
1a1e1d268a Mart*12091 o make KPP work with PTRACERS
12092 - fix gad_calc_rhs to call new routine kpp_transport_ptr, which is
12093 nearly a copy of kpp_transport_s
a435e833b1 Mart*12094 - there is no analogue to SurfaceTendencyS, so I have to use
1a1e1d268a Mart*12095 gPtr(of the surface layer) instead
12096 o add a new platform SunFire+mpi (SunFire 15000) to genmake
0e6056cd20 Jean*12097 checkpoint50e_pre (2003/05/13)
1a1e1d268a Mart*12098
0e6056cd20 Jean*12099 checkpoint50d_post (2003/05/13)
a435e833b1 Mart*12100 o change kpp output from multiple-record state files to single-record state
3ff61f337e Mart*12101 files analogous to write_state.F
a435e833b1 Mart*12102 o reduce the output frequency of cg3d-related stuff to the monitor frequency,
12103 analogous to the cg2d-related output.
12104 o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512,
1a1e1d268a Mart*12105 so that writing to internal file fn (with length 512) fails.
0e6056cd20 Jean*12106 checkpoint50d_pre (2003/05/12)
dd4e4e2846 Patr*12107
0e6056cd20 Jean*12108 checkpoint50c_post (2003/05/12)
36b01f3eb4 Jean*12109 o fix problem in ini_procs.F when using MPI (was there since checkpoint48f)
a07df11acd Jean*12110 o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy.
956742bd08 Jean*12111 o add time-average diagnostic of U*V and vertical diffusive flux for theta.
12112 o bug fixed in convective adjustment diagnostic (multi-tile set-up).
12113 o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries.
12114
0e6056cd20 Jean*12115 checkpoint50c_pre (2003/04/30)
460cb5f999 Dimi*12116 Merging from release1_p13:
12117 o bug fix for pkg/seaice dynamic solver
12118 o Added SEAICE_initialHEFF to pkg/seaice
12119
0e6056cd20 Jean*12120 checkpoint50b_post (2003/04/17)
b95ba5a50f Jean*12121 o store u*,v* in gU,V instead of in guNm1,gvNm1
12122 o in order to put the momForcing out of the Adams-Bashforth:
12123 move forcing & CD-scheme calls from mom_fluxform & mom_vecinv
12124 to timestep.F
12125 o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays
12126 o re-generate output for highly sensitive test-exp:
12127 global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box
12128
0e6056cd20 Jean*12129 checkpoint50b_pre (2003/04/17)
3228e22c96 Jean*12130 o restore the use of momAdvection & useCoriolis flags (mom_vecinv)
a435e833b1 Mart*12131 o corrected CPP option mismatch in exf_Bulk... functions for case
5ef1561d49 Patr*12132 #define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP
12133
0e6056cd20 Jean*12134 checkpoint50a_post (2003/03/21)
011884106d Patr*12135 o Bug fix for merging between c50 and KPP.
12136 ikey was passed from thermodynamics to kpp_calc via
12137 common block rather than being recomputed in kpp_calc,
12138 in contradiction with new key itdkey.
12139 New key ikppkey created, and tamc.h headers updated.
12140
0e6056cd20 Jean*12141 checkpoint50 (2003/03/08)
19c7b39f75 Patr*12142 - 2nd step of merge with ecco-branch:
12143 merge changes in ecco-branch back into main trunk
12144 - bug fix in find_alpha
12145 - more storing in gmredi_calc_tensor.F, kpp_routines.F
12146 - avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC
12147 - merged some sliced AD support routines
12148
0e6056cd20 Jean*12149 checkpoint49 (2003/03/06)
a2ac993b88 Patr*12150 merged from ecco-branch:
12151 o exf:
a435e833b1 Mart*12152 - Enable initialisation of forcing fields to constant
a2ac993b88 Patr*12153 (runtime) values.
12154 - in exf_getffields.F
12155 Reduce i-/j-loop to interior domain, discarding overlaps.
12156 That also fixes wrong TAF-key computations for key_1, key_2
12157 with bulf formulae.
12158 - exf_init.F modify #ifdef for exf_init_evap
12159 - exf_getffieldrec.F, ctrl_getrec.F
12160 The following INT-usages are not safe:
12161 fldsecs = int(fldsecs/fldperiod)*fldperiod
12162 fldcount = int(fldsecs/fldperiod) + 1
12163 and were modified.
12164 o autodiff: checkpoint_lev...
12165 - updated storing for bulk formulae (some arrays were missing)
12166 - added state for seaice package
12167 - synchronized with main branch
12168 o DIVA:
12169 Modif.s in
19c7b39f75 Patr*12170 - the_main_loop.F
12171 - the_model_main.F
a2ac993b88 Patr*12172 and added cost_final_restore.F cost_final_store.F
12173 o With these changes, it is possible to fully separate
12174 the first forward run to compute the cost function (mdthe_main_loop)
12175 and adjoint runs over individual DIVA intervals (adthe_main_loop)
12176 into separate model executions.
12177 This enables better tuning of DIVA to given queue sizes.
12178 o Loss of cost function value in consecutive DIVA runs is
12179 fixed by storing to 'costfinal' file.
a435e833b1 Mart*12180 o Appropriate call of ctrl_unpack/_pack,grdchk_main at
a2ac993b88 Patr*12181 beginning/end of adjoint integration is accounted for.
12182 The current changes apply to TAF-1.4.26.
12183 TAF has one remaining bug, requiring one manual change
12184 (see MITgcm manual).
12185 o cal: synchronized between MAIN and ecco-branch
12186
0e6056cd20 Jean*12187 checkpoint48i_post (2003/03/05)
eae13cfd04 Patr*12188 o Changes to restore differentiability of code w.r.t. previous tag
12189 (mostly adding new routines to make list and replacing
12190 pressure by totPhiHyd).
12191 o Updated and merged grdchk package
12192 - has both ADM and TLM checks
12193 - works for single- and multi-proc.
12194 - output cleaned
12195 - worked successfully for parallel DIVA
12196 o genmake:
12197 - Adding -platform=SP4
12198 - Modif. for DEC Alpha (many don't have makedepend; use mkdep instead).
12199 o Modif. for DIVA:
12200 ctrl_unpack should not be called in intermediate DIVA interval.
12201 (similar thing would apply for active files such as
12202 tbar, sbar, psbar, which should not be reinitialised;
12203 only relevant for ecco-branch)
12204
0e6056cd20 Jean*12205 checkpoint48h_post (2003/02/28)
c05a259eac Jean*12206 o improve "ini_p_ground" when using finite difference form for calc_phi_hyd
190e1777cb Dimi*12207 o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F
12208 o Added SEAICE_initialHEFF to pkg/seaice
d0702b49e9 Dimi*12209 o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT
190e1777cb Dimi*12210
0e6056cd20 Jean*12211 checkpoint48g_post (2003/02/18)
2959c7b521 Jean*12212 --- EOS:
12213 o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF
12214 store total Potential in totPhyHyd for diagnostics & EOS.
12215 o fix restart and overlap Pb when using Z-coord and EOS funct. of P
12216 --- Pressure/geopotential gradient:
12217 o use Ro_surf & R_low instead of hFac in cal_phi_hyd:
12218 o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind
12219 ( changes results of global_ocean_pressure )
12220 o NLFS + z-coord.: add eta*Rho' contribution.
12221 o accurate phiHyd when using interface-W at the middle between 2 centers
12222 ( changes results of ideal_2D_oce )
12223 o includes r* 2nd term in potential gradient.
12224
0e6056cd20 Jean*12225 checkpoint48f_post (2003/02/18)
6060ec2938 Dimi*12226 Merging from release1_p12:
12227 o Modifications for using pkg/exf with pkg/seaice
12228 - improved description of the various forcing configurations
12229 - added basic radiation bulk formulae to pkg/exf
12230 - units/sign fix for evap computation in exf_getffields.F
12231 - updated verification/global_with_exf/results/output.txt
12232 o Added pkg/sbo for computing IERS Special Bureau for the Oceans
12233 (SBO) core products, including oceanic mass, center-of-mass,
12234 angular, and bottom pressure (see pkg/sbo/README.sbo).
12235 o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F
12236 to avoid negative values in shallow regions.
12237 - updated verification/natl_box/results/output.txt
12238 - updated verification/lab_sea/results/output.txt
12239 o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F
12240 o Added useSingleCpuIO option (see PARAMS.h).
12241 o Updated useSingleCpuIO option in mdsio_writefield.F to
12242 work with multi-field files, e.g., for single-file pickup.
12243 o pkg/seaice:
12244 - bug fix in growth.F: QNET for no shortwave case
12245 - added HeffFile for specifying initial sea-ice thickness
12246 - changed SEAICE_EXTERNAL_FLUXES wind stress implementation
12247 o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf,
12248 kpp_transport_t.F, forward_step.F, and the_main_loop.F
12249 o pkg/seaice:
12250 - adjoint-friendly modifications
12251 - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
12252
0e6056cd20 Jean*12253 checkpoint48e_post (2003/02/12)
6f90d97ce9 Jean*12254 o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post)
5f7a0a65d1 Jean*12255 o dynamics: change definition of computational domain & adapt mom_fluxform
a435e833b1 Mart*12256 accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2.
5f7a0a65d1 Jean*12257 o following exp works with Olx=Oly=2 (and pass through checkbounds option):
12258 adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1
bc5ef4cea8 Jean*12259 exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5
a435e833b1 Mart*12260 global_ocean.90x40x15 global_with_exf global_ocean_pressure
5f7a0a65d1 Jean*12261 inverted_barometer solid-body.cs-32x32x1
12262 (high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure)
6f90d97ce9 Jean*12263
0e6056cd20 Jean*12264 checkpoint48d_post (2003/02/09)
fa86c7bd0e Jean*12265 o in preparation for r*:
12266 a) use pre-computed gradient of hydrostatic potential:
12267 changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce
12268 b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd:
a435e833b1 Mart*12269 => affects results of glob_oce_pressure (different truncation error)
fa86c7bd0e Jean*12270 update output.txt of ideal_2D_oce & global_ocean_pressure
12271
0e6056cd20 Jean*12272 checkpoint48d_pre (2003/02/08)
395300a99d Jean*12273 o in preparation for r*:
12274 new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient.
12275 pass the 2 comp. of the grad. as arguments to momentum S/R.
a435e833b1 Mart*12276 but for the moment, only used if it does not change the results.
395300a99d Jean*12277 o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP
12278
0e6056cd20 Jean*12279 checkpoint48c_post (2003/02/06)
da25c1b1f0 Patr*12280 Modifications in treatment of initial flux forcing controls
12281 to avoid extra storing of flux fields.
12282
0e6056cd20 Jean*12283 checkpoint48c_pre (2003/01/21)
6201ebed0f Alis*12284 o Added tidal_basin_2d experiment (currently 1D!)
a435e833b1 Mart*12285 o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented)
ed1ae133b9 Jean*12286
0e6056cd20 Jean*12287 checkpoint48b_post (2003/01/27)
1bf124dbfd Jean*12288 o r* coordinate added in #ifdef NONLIN_FRSURF block.
12289 (modification to pressure gradient not yet implemented)
12290 o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports
12291 (for U & V) that are used for vertical advection of momentum.
12292
0e6056cd20 Jean*12293 checkpoint48a_post (2003/01/24)
5c72e2cee7 Jean*12294 o In preparation for r*, use temp. array to compute vertical transport
a435e833b1 Mart*12295 in flux-form momentum pkg. => change results of few test-exp.
12296 Update output of: exp4, exp5, front_relax, global_ocean_pressure,
5c72e2cee7 Jean*12297 lab_sea, natl_box & plume_on_slope
12298
0e6056cd20 Jean*12299 checkpoint48 (2003/01/23)
3fa5200144 Jean*12300 o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D')
12301
0e6056cd20 Jean*12302 checkpoint47j_post (2003/01/21)
d15fa5f8eb Jean*12303 o add new exp. (ideal_2D_oce) to test "exotic" parameters and options.
dd4e4e2846 Patr*12304 o moved adexch from forward_step to addummy_in_stepping
12305 o added exch in ctrl_map_...
12306 o aveFreq.=0. at end of cost_final to avoid overwrite in
12307 reverse checkpointing loop
12308 o Yet more changes in gmredi:
12309 * adgmredi_calc_tensor
12310 avoiding all recomputation of gmredi_slope_limit
12311 * adgmredi_x/y/rtransport
12312 added flag for excessive storing to avoid recomp. of
12313 u/v/rtans, dTdx/y/z
12314 -> this is not really necessary and very memory-consuming
12315 * adgmredi_slope_psi:
12316 consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff
12317 * gmredi_slope_limit
12318 re-activated full calculation of taperfct for case 'ac02'
12319 o updating verification/ adjoints of carbon, global_ocean.90x40x15
d537a7f0b2 Patr*12320
0e6056cd20 Jean*12321 checkpoint47i_post (2003/01/13)
a934d97f06 Jean*12322 o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled.
12323 o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi)
12324 default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post)
a435e833b1 Mart*12325 o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf)
a934d97f06 Jean*12326 o gmredi: fix few bugs.
12327
ba5e34915b Alis*12328 checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48)
d537a7f0b2 Patr*12329 This will be a good checkpoint to plug into the ecco-branch.
12330 o few modif.'s to get latest version adjointed
12331 (mainly kick out code in ini_linear_phisurf)
12332 o modif's to run adjoint with exactConserv
12333 o case GM_BOLUS_ADVEC should be cleaned
12334 S/R gmredi_slope_psi should be cleaned
12335 o verification/carbon now has exactConserv=.TRUE.
0501ef9fb3 Patr*12336
0e6056cd20 Jean*12337 checkpoint47g_post (2003/01/10)
6d8d3f40dd Jean*12338 o time-average AIM output: becomes independent from statvars time-average
12339 (can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH)
88844f54ad Patr*12340 o After TAF bug fix:
12341 Tested adjoint of gmredi package.
12342 Tests were done with checkpoint47 rather than with latest
12343 checkpoint47f_post since the latter is broken for the adjoint
12344 verification/carbon/ contains both ADM and TLM gradient checks.
12345 Here they are, before they get changed/lost/stolen.
12346 Mostly modif.'s to fix numerical sensitivities.
12347 Gradient checks OK for
12348 - GM_taper_scheme:
12349 * clipping
12350 * ac02
12351 * linear
12352 * glw91
12353 * dm95
12354 * ldd97
12355 - GMREDI_OPTIONS:
12356 * GM_VISBECK_VARIABLE_K
12357 * GM_NON_UNITY_DIAGONAL
12358 * GM_EXTRA_DIAGONAL
12359 * GM_BOLUS_ADVEC
12360 in conjunction with data.gmredi parameters to be checked in
12361 in a few minutes under verification/carbon/code/
6d8d3f40dd Jean*12362
0e6056cd20 Jean*12363 checkpoint47f_post (2002/12/28)
cee16b76ae Dimi*12364 Merging from release1_p10:
12365 o modifications for using pkg/exf with pkg/seaice
12366 - pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
12367 and SEAICE_EXTERNAL_FLUXES
12368 - pkg/exf CPP options EXF_READ_EVAP and
12369 EXF_NO_BULK_COMPUTATIONS
12370 - usage examples are Experiments 8 and 9 in
12371 verification/lab_sea/README
12372 - verification/lab_sea default experiment now uses
12373 pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
12374
0e6056cd20 Jean*12375 checkpoint47e_post (2002/12/27)
2d0f62a494 Curt*12376 o created a tag prior to creating a branch
12377
0e6056cd20 Jean*12378 checkpoint47d_post (2002/12/16)
a435e833b1 Mart*12379 o fixed bug in the oceanic pressure coordinates code: vertical viscosity
2672305b1d Mart*12380 at the bottom boundary had an erroneous half slip boundary condition
a435e833b1 Mart*12381 o added bottom drag and no slip boundary condition capabilities to
2672305b1d Mart*12382 oceanic pressure coordinates code
12383 o added new verification experiment global_ocean_pressure, this experiment is
12384 also described in the tutorial section of the manual
0e6056cd20 Jean*12385 checkpoint47d_pre (2002/12/16)
2672305b1d Mart*12386
0e6056cd20 Jean*12387 checkpoint47c_post (2002/12/16)
03456d021e Curt*12388 o Added a verification experiment for a global cubed-sphere ocean run
12389 - verification/global_ocean.cubed32x32x30
12390 - uses pkg/therm_seaice and pkg/bulk_forcing
12391
4195ef17c2 Jean*12392 o allow to run AIM physics with SPEEDY input files (from Franco Molteni)
12393 o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1)
12394 when using P-coordinate; only implemented for atmospheric config.
12395 o OCEANICP & realFreshWater: include P-E direct effect on wVel ;
12396 NOTES: requires option NONLIN_FRSURF to be "#define".
12397 o update advect_xz/results/output.txt (left from checkpoint44g_post)
12398
0e6056cd20 Jean*12399 checkpoint47b_post (2002/12/05)
baa476eeba Dimi*12400 Merging from release1_p9:
12401 o pkg/seaice
12402 - removed GOTO's and added taf directives
12403 - double precision constants to reduce the g77 (Linux)
12404 to F77 (SGI) differences reported in release1_p8
12405 o tools/genmake
12406 - added SGI options
12407 o verification/testscript
12408 - updated to that of checkpoint47a_post
12409 o verification/global_ocean.90x40x15/input/eedata
12410 - modified for SGI f77 compatibility
12411 o verification/lab_sea
12412 - added description of sea-ice model
12413 - added missing matlab routines
12414 - added test of thermodynamics parallelization
12415
0e6056cd20 Jean*12416 checkpoint47a_post (2002/11/23)
a435e833b1 Mart*12417 o new pkg: aim_v23
12418 = F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm.
9a923a4cdc Jean*12419 for now, keep the same surface forcing as before.
12420 - Part-Cell implemented into AIM; check that Heat & Water are conserved
12421 - aim.5l_cs: use new aim pkg (run 10yr & get better results than before)
12422 - aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg
12423 o add diagnostic of surface correction term in monitor output
12424
a435e833b1 Mart*12425 o bulk_force and therm_seaice
c9bad82272 Curt*12426 - Two packages: bulk_force (Bulk forcing)
12427 and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2
12428 - Earlier integration from Stephaine Dutkiewicz
12429 and Patrick Heimbach.
12430 - Two ifdef statements for compile time,
12431 ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE
0ae80337bd Jean*12432
0e6056cd20 Jean*12433 checkpoint47 (2002/11/15)
d66d6a3f19 Patr*12434 differentiable version of checkpoint46n_post
12435 o bug fix in quasihydrostaticterms
12436 o * "clean" adjoint code (in terms of extensive recomputations)
a435e833b1 Mart*12437 can now be obtained for all GMREDI options (i.e. for
d66d6a3f19 Patr*12438 - GM_VISBECK_VARIABLE_K
12439 - GM_NON_UNITY_DIAGONAL
12440 - GM_EXTRA_DIAGONAL
12441 - GM_BOLUS_ADVEC )
12442 * However, wrong gradient check problem remains unsolved.
12443 * New CPP options have been introduced for different
12444 tapering schemes
12445 o external_fields_load now part of differentiation list
12446 o pressure needs multiple storing;
12447 would be nice to have store_pressure at beginning or
12448 end of forward_step, e.g. by having phiHyd global (5-dim.)
12449 (NB: pressure is needed for certain cases in find_rho,
12450 which is also invoked through convective_adjustment).
a435e833b1 Mart*12451 o recomputations in find_rho for cases
d66d6a3f19 Patr*12452 'JMD95'/'UNESCO' or 'MDJWF' are OK.
12453 o #define ATMOSPHERIC_LOADING should be differentiable
12454 o ini_forcing shifted to begining of initialise_varia
12455 o Incorporating QNVS line search routines into MITgcm
12456 (this is separate code, and therefore not under pkg)
12457 lsopt/, optim/
12458 o Updated verification/carbon/
12459 - #define GM_VISBECK_VARIABLE_K
a435e833b1 Mart*12460 - GM_taper_scheme = 'ldd97'
d66d6a3f19 Patr*12461
0e6056cd20 Jean*12462 checkpoint46n_post (2002/11/12)
5553098c72 Patr*12463 Merging from release1_p8:
12464 o verification/natl_box:
12465 updating new external_fields_load routine
12466 o New package: pkg/seaice
12467 Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
12468 The sea-ice code is based on Hibler (1979-1980).
12469 Two sea-ice dynamic solvers, ADI and LSR, are included.
a435e833b1 Mart*12470 In addition to computing prognostic sea-ice variables and diagnosing
12471 the forcing/external data fields that drive the ocean model,
5553098c72 Patr*12472 SEAICE_MODEL also sets theta to the freezing point under sea-ice.
a435e833b1 Mart*12473 The implied surface heat flux is then stored in variable
12474 surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
12475 kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
12476 non-local transport term. Because this call precedes model
12477 thermodynamics, temperature under sea-ice may not be "exactly" at
5553098c72 Patr*12478 the freezing point by the time theta is dumped or time-averaged.
12479 N.B.: fairly large differences in accuracy occur across
12480 different platforms/compilers; comparison between
a435e833b1 Mart*12481 g77 (Linux) and F77 (SGI Origin 2000/MIPSpro)
5553098c72 Patr*12482 generated output gives:
12483 T S U V
12484 C D M c m s m s m s m s
12485 n p a R g m m e . m m e . m m e . m m e .
12486 f n k u 2 i a a d i a a d i a a d i a a d
12487 g d e n d n x n . n x n . n x n . n x n .
12488
12489 Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea
a435e833b1 Mart*12490 o GAD:
5553098c72 Patr*12491 - generated new common blocks to account for call of
12492 same gad routines with differing traceridentities
12493 (needed to modify tracerIdentity indices in GAD.h)
12494 - generated separate common blocks for case useCubedSphereExchange
12495 (Department of Futurology)
12496 - parameter lists to gmredi_?transport: added tracerIdentity
12497 - added new key indices to tamc.h
12498 o external_fields_load:
12499 - added this routine to TAF list
12500 - needed to make some common blocks global and additional storing
12501 along the same lines as exf package (checkpoint_lev?_directives.h)
12502 o exf:
12503 updated external forcing package
12504 - bug fixes carried over from ecco-branch
12505 (missing OBCS_OPTIONS.h in two routines)
12506 - enable easy to use "no forcing".
12507 - added exf I/O for atmospheric loading
12508 - added exf I/O for runoff data
12509 - transfered scaling between exf <-> MITgcm to exf namelist
12510 o Adding new verification experiment global_with_exf.
12511 This verification experiment is almost identical to the
12512 global_ocean.90x40x15 experiment, except that it uses
12513 the exf (and cal) package instead of the
12514 external_fields_load routine (cf README file).
12515
0e6056cd20 Jean*12516 checkpoint46m_post (2002/11/07)
a435e833b1 Mart*12517 o modified testscript to return -- when there are no lines of "%MON" output
775ad00e06 Alis*12518 o added new flag "quasiHydrostatic" for QH mode
12519 and new routine quasihydrostaticterms()
c5990018f4 Alis*12520 o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term)
12521 New routine: mom_u_coriolis_nh()
8d87f02f4b Alis*12522 o fixed sign of non-hydrostatic metric terms in u and v equations.
12523 Depend on correct sign of gravitySign.
574be91465 Alis*12524 o added work.pc* to .cvsignore in aim directories using ifc
faaa70ed68 Alis*12525 o introduced flag for controllin non-hydrostatic metric terms
a22df31c5b Alis*12526 o removed gravitySign from PARM04
4cc3ac93d0 Alis*12527 o switched to g77/ifc from pgf77 in aim experiments
12528
0e6056cd20 Jean*12529 checkpoint46l_post (2002/11/01)
59e59b79d8 Mart*12530 o made convective adjustment work with pressure coordinates:
12531 - changed the direction of k-loop in convective_adjustment.F for the
12532 case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation)
12533 - adjusted the reference pressure k-index in convective_adjustment.F
12534 - adjusted the convection condition in convect.F (in analogy to
12535 calc_ivdc.F)
12536 - convective_adjustment no longer computes anything on the halos
12537 - removed the warnings about negative salinity from find_rho.F and
12538 find_alpha.F; instead the new routine look_for_neg_salinity, called
a435e833b1 Mart*12539 at the beginning of find_rho, find_alpha, and find_beta, does a
12540 check of the entire slice, if CPP-option
59e59b79d8 Mart*12541 CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
0e6056cd20 Jean*12542 checkpoint46l_pre (2002/10/23)
59e59b79d8 Mart*12543
0e6056cd20 Jean*12544 checkpoint46k_post (2002/10/23)
19ec7ca2f5 Mart*12545 o fixed the verification/global_ocean.90x40x15 experiment:
12546 - new bathymetry (the world according to A., JMC, and M.)
12547 - new initial fields and forcing fields (*.bin files)
12548 - new POLY3.COEFFS (for the next release one should switch to a full
12549 equation of state: JMD95P or MDJWF)
12550 - fixed several errors and redundancies in the data file
12551 - experiment uses looped cells
12552 - added matlab directory with diagnostic scripts for plotting of output
12553
1b947e4f16 Jean*12554 o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F:
12555 - read AIM physics parameters from a file (data.aimphys)
12556 - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
12557
0e6056cd20 Jean*12558 checkpoint46j_post (2002/10/07)
3d1716969e Jean*12559 o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH
12560 o move wVel computation at the end of the time step, in S/R integr_continuity
12561 o create specific S/R to exchange T,S before DYNAMICS (for stagger time step)
12562 o update timeave pkg for wVel diagnostic.
0e6056cd20 Jean*12563 checkpoint46j_pre (2002/09/27)
3d1716969e Jean*12564
0e6056cd20 Jean*12565 checkpoint46i_post (2002/09/25)
e16ef9be6a Jean*12566 o Clean up AIM package (and keep the results unchanged):
a435e833b1 Mart*12567 include CPP_OPTION and use IMPLICT NONE in all routines ;
e16ef9be6a Jean*12568 declare all the variables _RL ; use _d 0 for all numerical constants.
12569 use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 !
e305438401 Mart*12570
0e6056cd20 Jean*12571 checkpoint46h_post (2002/09/25)
a435e833b1 Mart*12572 o cleaned up the use of rhoNil and rhoConst.
12573 - rhoNil should only appear in the LINEAR equation of state, everywhere
e305438401 Mart*12574 else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
12575 and the dynamical equations are all divided by rhoConst
a435e833b1 Mart*12576 o introduced new parameter rhoConstFresh, a reference density of fresh
e305438401 Mart*12577 water, to remove the fresh water flux's dependence on rhoNil. The default
12578 value is 999.8 kg/m^3
12579 o cleanup up external_forcing.F and external_forcing_surf.F
12580 - can now be used by both OCEANIC and OCEANICP
0e6056cd20 Jean*12581 checkpoint46h_pre (2002/09/18)
e305438401 Mart*12582
12583 Added code to convert surface volume flux (fresh water) into
12584 a mass flux when using P coordinates in the ocean (OCEANICP).
12585 Note: It assumes you have set rho0=rhoConst=density of fresh water.
12586
0e6056cd20 Jean*12587 checkpoint46g_post (2002/09/18)
60c223928f Mart*12588 o Include a new diagnostic variable phiHydLow for the ocean model
12589 - in z-coordinates, it is the bottom pressure anomaly
12590 - in p-coordinates, it is the sea surface elevation
12591 - in both cases, these variable have global drift, reflecting the mass
12592 drift in z-coordinates and the volume drift in p-coordinates
12593 - included time averaging for phiHydLow, be aware of the drift!
a435e833b1 Mart*12594 o depth-dependent computation of Bo_surf for pressure coordinates
60c223928f Mart*12595 in the ocean (buoyancyRelation='OCEANICP')
a435e833b1 Mart*12596 - requires a new routine (FIND_RHO_SCALAR) to compute density with only
12597 Theta, Salinity, and Pressure in the parameter list. This routine is
60c223928f Mart*12598 presently contained in find_rho.F. This routine does not give the
12599 correct density for 'POLY3', which would be a z-dependent reference
12600 density.
12601 o cleaned up find_rho
12602 - removed obsolete 'eqn' from the parameter list.
12603 o added two new verification experiments: gop and goz
12604 (4x4 degree global ocean, 15 layers in pressure and height coordinates)
0e6056cd20 Jean*12605 checkpoint46g_pre (2002/09/16)
60c223928f Mart*12606
0e6056cd20 Jean*12607 checkpoint46f_post (2002/09/16)
77d659325b Patr*12608 o Enable tangent linear (forward mode) gradient checks:
12609 - extended active file handling to g_... files
12610 - added TANGENT_SIMULATION to theSimulationMode
12611 - extended grdchk package accordingly
12612 o added tangent linear setup in verification/carbon/code_ftl
12613 o added adjoint setup in verification/front_relax/code_ad
12614
0e6056cd20 Jean*12615 checkpoint46e_post (2002/09/05)
31a5949e20 Mart*12616 o Added new equation of state -> MDJWF
12617 - EOS of McDougall et al., 2002, JAOT, submitted
12618 - caveat: the equation of state is only valid for a smaller (more
12619 realistic?) range of values than JMD95P/Z and UNESCO
12620 - added masks to the calculation of pressure in store_pressure
a435e833b1 Mart*12621 - added more check values for density in check_eos (ini_eos.F), some of
31a5949e20 Mart*12622 the old check values are out of the range of the MDJWF-eos, so don't
a435e833b1 Mart*12623 expect perfect matches for those
0e6056cd20 Jean*12624 checkpoint46e_pre (2002/08/19)
31a5949e20 Mart*12625
0e6056cd20 Jean*12626 checkpoint46d_post (2002/08/19)
9b1fb10894 Mart*12627 o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and
a435e833b1 Mart*12628 'OCEANICP', also initialised field pressure correctly in ini_eos in the
12629 case of pressure coordinates. eosType='JMD95Z' in
9b1fb10894 Mart*12630 combination with buoyancyRelation='OCEANICP' now causes an error.
12631 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
12632 in find_alpha/beta.
0e6056cd20 Jean*12633 checkpoint46d_pre (2002/08/15)
9b1fb10894 Mart*12634
12635 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
a435e833b1 Mart*12636 so that JMD95Z and JMD95P give approptiate static stability in find_rho.
9b1fb10894 Mart*12637
0e6056cd20 Jean*12638 checkpoint46c_post (2002/08/15)
9e5f2093d3 Alis*12639 o Changes necessary for ocean in p-coordinates
12640 - Added new buoyancy relation = 'OCEANICP'
12641 - Added new parameters = gravitySign (this used to be contained inside
12642 the factor dRdZ which I added when we first switched to R coordinates).
12643 X GM/Redi is not compatible (yet)
12644 X bottom drag and no-slip need to be debugged.
0e6056cd20 Jean*12645 checkpoint46c_pre (2002/08/07)
9e5f2093d3 Alis*12646
0e6056cd20 Jean*12647 checkpoint46b_post (2002/08/07)
a37a13034c Mart*12648 o Added new equation of state -> JMD95Z and JMD95P
31a5949e20 Mart*12649 - EOS of Jackett and McDougall, 1995, JAOT
a37a13034c Mart*12650 - moved all EOS parameters into EOS.h
12651 - new routines ini_eos.F, store_pressure.F
a435e833b1 Mart*12652 o Added UNESCO EOS, but not recommended because it requires
a37a13034c Mart*12653 in-situ temperature (see JMD95)
12654 o Modified formatting for knudsen2.f in utils/knudsen2 and added
12655 unesco.f to be used with POLY3
0e6056cd20 Jean*12656 checkpoint46b_pre (2002/07/31)
a37a13034c Mart*12657
0e6056cd20 Jean*12658 checkpoint46a_post (2002/07/31)
395b093796 Mart*12659 o Added (atmospheric) pressure loading
12660 - new field in FFIELDS.h, etc...
12661 - new cpp flag ATMOSPHERIC_LOADING
12662 o Changed hFacC to _hFacC in calc_phi_hyd.F
12663 o Added SHORTWAVE_HEATING to some files for consistency
0e6056cd20 Jean*12664 checkpoint46a_pre (2002/07/13)
395b093796 Mart*12665
0e6056cd20 Jean*12666 checkpoint46 (2002/07/13)
0501ef9fb3 Patr*12667 further merges from release1_p5
12668 o new ctrl package
12669 - adopted from ECCO environment to enable optimization
12670 - added Eliassen Palm fluxes to controls
12671 o added Eliassen Palm flux controls to gradient check package
12672 o cost package
12673 - Compatible with new ctrl package
12674 - added Eliassen Palm cost hooks
12675 - modif's of existing cost functions
12676 o Adjoint-related bug fixes in kpp:
12677 - kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix
12678 - kpp_routines: store of Rib avoids partial recomputation bug of TAF.
12679 o autodiff package
12680 - flow directives:
12681 + new for S/R do_the_model_io
12682 + enhanced for S/R checkpoint
12683 + new gmredi.flow
12684 - Introduced CPP option ALLOW_AUTODIFF_MONITOR to
12685 disable adcommon.h/g_common.h by default.
12686 - fixed problem for adjoint of global_max
12687 o modified verification/carbon/
12688 o New setup for adjoint of global_ocean
12689 o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F)
12690 o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F)
12691 o incorporated hooks for sponge layer code (external_forcing.F)
12692
0e6056cd20 Jean*12693 checkpoint45d_post (2002/07/12)
9d1e859170 Jean*12694 o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F)
fe84d1c123 Jean*12695 o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S
12696 (affects plume_on_slope "cg2d" output)
9d1e859170 Jean*12697 o add new parameter deltaTfreesurf for free-surface time stepping
a435e833b1 Mart*12698 o exchange gT,gS when using staggerTimeStep & GM & Oly<4
40a013c787 Jean*12699 o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B
5a6e38b5cb Jean*12700 o change phiMin in exp1 (to agree with documentation)
a435e833b1 Mart*12701 o add new flags:
5a6e38b5cb Jean*12702 - T,S forcing inside/outside Adams-Bashforth
12703 - turn off temp,salt advection and/or forcing
12704 - for each tracer, define internal flag for multiDimAdvection & A-B
12705 o monitor: change definition of KE to check conservation of Energy
fda4da40f3 Jean*12706
0e6056cd20 Jean*12707 checkpoint45c_post (2002/05/30)
cda7963c0f Patr*12708 o Removed f90 comments ("!")
12709 o Modified initialisations to enable exf package for MITgcm
12710 (without invoking ECCO_PACKAGE).
12711 o modifications to gradient check package (Martin Losch)
12712 - enable centered differences
12713 - modified format of standard output
12714
0e6056cd20 Jean*12715 checkpoint45b_post (2002/05/30)
778263fdd2 Patr*12716 o cleaned exchange calls in cg2d
12717 o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step
12718 o included CPP option SINGLE_LAYER_MODE in thermodynamics
12719 to configure barotropic setup (Martin Losch)
12720 o moved some initialisations within bi,bj loop in dynamics
12721 (TAF flow dependency)
12722 o in initialise_varia, moved call packages_init_variables
12723 before convective_adjustment_init
12724 (corresponding adjustment of TAF tape initialisation).
12725 o in calc_diffusivity/calc_viscosity extended domain to full overlap.
12726
0e6056cd20 Jean*12727 checkpoint45a_post (2002/05/01)
23b8953dcb Jean*12728 o compute Rho over the whole domain (extend iMin,jMin indices)
12729 o specific exchange for X-slice domain (case Ny=1)
58071f7ded Jean*12730 o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code
12731 o solve_for_pressure : set cg2d_x to zero where OBCS are applied
12732
f2f05cab96 Patr*12733 checkpoint44h_post = checkpoint45
12734 o Fix to restore differentiability:
12735 place at which packages_init_variables is called in
12736 initialise_varia is crucial for reverse control flow.
12737 o modifications in GMRedi to enable stable adjoint
12738 (corresponding modif's in thermodynamics, dynamics)
12739 o added missing hook for sponge layer code in external_forcing
12740 o modified test cost functions
12741 o storing in gad_advection (plus removal of write(0,*)!
12742 o missing headers TR1.h added in convective_adjustment routines
12743 o errorMessageUnit set non-equal zero in eeboot
12744 (conflict on some platforms, e.g. IBM SP3)
12745 o modified carbon verif.
12746
0e6056cd20 Jean*12747 checkpoint44h_pre (2002/03/14)
e5968d5db8 Jean*12748 o vertical grid option: allow to put the Interface at the middle between
12749 2 cell-centers ; replace delZ in pkg/kpp by drF.
3f61bba06d Jean*12750 o GM Advective form: Tracers are advected using the residual transport (=
12751 Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form.
12752
0e6056cd20 Jean*12753 checkpoint44g_post (2002/03/05)
a435e833b1 Mart*12754 o fix surface correction term in multiDimAdvection (affects plume_on_slope
d459353a4c Jean*12755 results) ; ifdef missing in thermodynamics.F
12756
5c43c390b6 Alis*12757 checkpoint44f_pre,checkpoint44f_post
12758 o added PTRACERS package
12759 This allows an arbitrary number of passive tracers to be integrated
12760 forward simultaneously with the dynamicaly model.
12761 + Implemented so far:
12762 - basic forward algorithm (time-stepping, advection, diffusion, convection)
12763 - I/O and checkpointing
12764 - GM/Redi *but* using the GM/Redi coefficient of Salt
12765 + Not implemented so far:
12766 - KPP
12767 - OBCS
12768 + No specific example supplied (yet) but global_ocean.90x40x15 has the
12769 necessary data.ptracer file. Simply use -enable=ptracers and uncomment
12770 line in data.pkg.
12771 + This package is disabled by default since it increases storage.
12772
12773
658a1753bb Alis*12774 o testscript: added -cleanup option
f4ba6d3695 Jean*12775 o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter
12776 b) enable to filter 2D fields.
d427b861ca Jean*12777
3e6bf4af46 Alis*12778 checkpoint44e_pre,post
12779 o re-wrote convective adjustment to use pre-calculated weights
12780 Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F
12781 Adds: model/src/convective_weights.F, convectively_mixtracer.F
12782 Original calls to convect() still in place.
12783
2014c6d62b Patr*12784 chkpt44d_pre,post
12785 o added missing EXCLUDE_MONITOR flags
12786 o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi
12787 (incompatible typ in MIN/MAX expressions caused problems
12788 on IBM SP3)
12789 o in genmake added variable MAKEDEPEND
12790 plus resetting for case SunOS
12791 o added timer_stats.c routine for IBM SP3
12792 o removed variables in dynamics
12793 !!! I forgot to create tag chkpt44d_pre !!!
12794 !!! But chkpt44d_pre = chkpt44c_post !!!
12795
f4ba6d3695 Jean*12796 o real fresh water flux implemented with non-linear free-surface.
12797
d645283517 Jean*12798 chkpt44c_pre,post
a435e833b1 Mart*12799 o few fix (mask in shap_s2, EmPmR in external_field_load,
12800 USE_NATURAL_BCS in solve_for_P);
d645283517 Jean*12801 o add arguments myIter & myTime to S/R obcs_calc & solve_for_P
12802
de416ebcde Patr*12803 checkpoint44b_pre/_post
12804 o merge of relevant stuff from the ecco-branch:
12805 - genmake: removed $S64 overwrite for case SunOS
12806 - pkg/exf: update and corrections for field swapping and obcs
12807 - pkg/ecco: parameter lists for the_model_main, the_main_loop
12808 harmonized between ECCO and MITgcm
12809 - pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
12810 updated checkpointing_lev... lists for obcs
12811 - model/src: minor changes in forward_step, plot_field
12812 added directive for divided adjoint in the_main_loop
12813 - pkg/mdsio: added mdsio_gl_slice
12814
fda4da40f3 Jean*12815 o check parameters & config (chkpt44a_pre,post)
5fc9e00fa1 Jean*12816 o OBC and NonLin_FrSurf.
12817
0e6056cd20 Jean*12818 checkpoint44 (2002/01/18)
beeff87535 Jean*12819 o fix bug in mom_vi_del2uv
5fc9e00fa1 Jean*12820 o select when filters are applied ; add options to zonal_filter (data.zonfilt)
12821 o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
12822 o update AIM experiments (NCEP input files)
12823 o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
b07345cdda Patr*12824 o added some stuff for AD
84a1eca0f1 Patr*12825
0e6056cd20 Jean*12826 checkpoint43 (2001/09/28)
7205c731d1 Alis*12827 o added two new advection tests
12828 o added global 4x4 degree ocean test
12829 o added test of H&S94 with free surface on cube
12830 o some final mods for gradient check, adjoint,...
12831
0e6056cd20 Jean*12832 checkpoint42 (2001/09/27)
9620337c26 Patr*12833 Fixed AD-related problems:
12834 o Store directives up-to-date with re-arranged Adams-Bashforth
12835 (mainly thermodynamics.F)
12836 o New store directives for multi-dim. advection schemes
12837 * new CPP flag ALLOW_MULTI_DIM_ADVECTION
12838 * new common block and key passkey
12839 (mainly gad_advection.F)
12840 o Modified store directives for split of dynamics/thermodynamics
12841 for the case ALLOW_KPP
12842 o Cleaned argument list for timestep_tracer.F
12843
0e6056cd20 Jean*12844 checkpoint41 (2001/09/27)
aafb52f44c Alis*12845 o re-formatted/added comments in prologues of key subroutines
12846 to work with protex
12847
0e6056cd20 Jean*12848 checkpoint40 (2001/09/27)
07eb89f7e7 Alis*12849 o moved calc_gs, calc_gt and calc_tr1 back to model/src
12850 o added FLT (floats) package from Arne along with demo. experiment
12851 o re-arranged Adams-Bashforth scheme for tracers to allow easier
12852 implementation of forward-in-time forcing terms
12853 o more mods for non-linear free-surface including new variable
12854 o modified multi-dim method to work on cube
12855 o bug fix in KPP (from DM)
12856
0e6056cd20 Jean*12857 checkpoint40pre9 (2001/09/27)
76bfa80e3f Alis*12858 o added DST advection schemes
12859 o fix MPI bug on SGI's
12860 o modifications for non-linear free-surface
12861 o fixed conditionals for fixed flow/passive tracer only mode
12862 o added tension/strain form of stress tensor
12863 o changes to commenting of arguments for TAF/TAMC
12864 o added/updated many matlab scripts
07eb89f7e7 Alis*12865 o added multi-dimensional advection method for tracers
a435e833b1 Mart*12866
0e6056cd20 Jean*12867 checkpoint40pre8 (2001/09/05)
c710cbecfb Patr*12868 o new package rw/
12869 Added method for dumping intermediate local arrays:
12870 mdsio_writetile - same as mdsio_writefield except works from inside
12871 bi,bj loop
12872 mdsio_writelocal - same as mdsio_writetile except works for local
12873 arrays
12874 write_local_r? - higher-level wrapper for mdsio_writelocal
12875 Controlled by diagFreq. Defaults to zero (ie. no dumps)
12876 Example given at end of mom_vecinv.F that dumps some local arrays.
12877 o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to
12878 control flux-form versus vector invariant code.
12879 Switch is runtime flag vectorInvariantMomentum (defaults to false)
12880 or genmake -DISABLE ...
12881 o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F
12882 (additional storing is now needed for case vecinv;
12883 currently nothing implemented to switch this storing off
12884 in case fluxform is used since no CPP flag available).
12885
0e6056cd20 Jean*12886 checkpoint40pre7 (2001/08/14)
11252a3870 Patr*12887 o bug fix in dynamics.F
12888 calc_viscosity called before k=1,Nr loop.
12889 o added some #ifdef's ALLOW_PASSIVE_TRACER
12890 o cleaned initialisations in ctrl_map_ini
12891 related to TAF
12892
0e6056cd20 Jean*12893 checkpoint40pre6 (2001/08/13)
b2d3fccd49 Patr*12894 o split dynamics into thermodynamics & dynamics
12895 o corresponding split of calc_diffusivity into
12896 calc_diffusivity, calc_viscosity
12897 (kpp_calc_diff, kpp_calc_visc).
12898 o Added diffkr, kapgm to control variables
12899 o bug fix in gmredi_slope_limit for ldd97
12900
0e6056cd20 Jean*12901 checkpoint40pre5 (2001/07/31)
2277c012d1 Alis*12902 o proper initialization of Adams-Bashforth time stepping
12903 + uses forward step for very first step of model (iter=0)
12904 o re-generated *all* output since almost all output is modified by this
12905 change (sorry but we've been putting this one off for about 2 years)
12906 + natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were
12907 *not* regenerated since they are already out of date and I don't
12908 want to create the impression that they are suddenly working.
12909 o removed KAP stuff for DEC's
12910 o modified/added many .cvsignore files in */code and */input
12911 o added new expt "solid-body.cs-32x32x1"
12912 + this uses an alternative form of ini_curvilinear_grid.F which
12913 is not necessarily any better than the current one...
12914
0e6056cd20 Jean*12915 checkpoint40pre4 (2001/07/30)
84a1eca0f1 Patr*12916 o added re-initialisations of utrans,vtrans,rtrans in
12917 calc_common_factors which are crucial for TAF.
12918 o extended iMin,jMin range for calc_common_factors,
12919 calc_diffusivity
12920 o added option ALLOW_PASSIVE_TRACER
12921 o a few minor updates and fixes
12922
0e6056cd20 Jean*12923 checkpoint40pre3 (2001/07/13)
8970237877 Patr*12924 o created calc_gtr1.F for gad package
12925 o split the_main_loop and re-introduced forward_step
12926 o some recomputations of nIter0 for TAMC
12927
0e6056cd20 Jean*12928 checkpoint40pre2 (2001/07/13)
12b269a63b Patr*12929 o Updated to latest branch of AJA, JMC
12930 o Added gradient check package
12931 o Added routines for passive tracer handling
12932 o Added carbon sequestration sensitivity experiment
12933
0e6056cd20 Jean*12934 checkpoint39 (2001/05/14)
0a8108926c Patr*12935 o Modifications and fixes to support TAMC
12936 (mainly missing or wrong directives)
12937 o Corrected common blocks when fooling TAMC to produce adjoint I/O
12938 in addummy_in_stepping
12939 o Updated verification/vero/ (bug fixes in code/, correct pickups in input/)
12940 o Enabled "sliced" (xz-,yz-) exchanges, needed for obcs.
12941 o Included following packages:
12942 cal: calendar
12943 exf: external forcing
12944 ecco: essential routines to control use of cal, exf
12945 (NB: this is not the full ECCO environment)
160e0619c9 Patr*12946 o disabled some packages by default in genmake
0a8108926c Patr*12947
0e6056cd20 Jean*12948 checkpoint38 (2001/04/10)
2cfc9d59a2 Patr*12949 o see notes_c37_adj.txt
12950 o corrected wrong layer index in external_forcing_t
12951 o replaced the_main_loop/forward_step by the_main_loop
12952 o removed forceoutput from write_state
12953 (replaced criteria for initial/final state)
12954 o added runtime flag for pre-C35 pickups: usePickupBeforeC35
b7a12fbe29 Chri*12955
0e6056cd20 Jean*12956 checkpoint37 (2001/03/13)
2a60a6d948 Jean*12957 o mdsio.F routine split and packaged in pkg/mdsio
12958 (mdsio.F and mdsio_gl.F still exist in eesupp/src but are not
12959 used unless genmake -disable=mdsio)
12960 o allow a more precise surface-geopotential gradient for the atmosphere
12961 taking into account the change in space of Alpha (=1/rho) at the surface.
12962 o variable "etaN" (replace cg2d_x) is the surface R-anomaly [r unit]
12963 (ocean: sea surface height [m] / atmos: surface pressure anomaly [Pa])
12964 o Change units: Phi_Hydrostatic (=phiHyd), Phi_Surface(=cg2d_x) and
12965 Phi_NonHydrostatic (=cg3d_x), all have now the dimension of a potential
12966 [m2/s2] (pressure/rhoConst in the ocean ; Geo-Potential in the atmosphere).
12967 o Time-Average diagnostics defined as a pseudo package "timeave".
12968 o pickup files : old pickup (before c35) did not work with new code (c35
12969 and after) unless activating 2 commented lines in initialise-varia.
12970 o Non-Hydrostatic pickup file Pb fixed.
a435e833b1 Mart*12971 o bug with Rigid-lid version (since c35) fixed.
2a60a6d948 Jean*12972
0e6056cd20 Jean*12973 checkpoint36 (2001/02/20)
2a60a6d948 Jean*12974 o implement Crank-Nickelson barotropic time-stepping
3d3ffaaedb Jean*12975 o recover Time-Average diagnostics
a435e833b1 Mart*12976 o fix Pb in checkpoint (PR#19)
3d3ffaaedb Jean*12977 o AIM become a standard package ; clean unused CPP_kees
12978
0e6056cd20 Jean*12979 checkpoint35 (2001/02/08)
47b446e27e Jean*12980 o subtantial rewrite of dynamics.f
12981 o allows staggered time-stepping
12982 o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt
12983 o added bottom drag (linear + quadratic)
12984
0e6056cd20 Jean*12985 checkpoint34 (2001/01/30)
ea8b6560ce Patr*12986 o Modified exchange routines for correct reverse simulation.
12987 o Added verification output to comply with bug fix in impldiff.F
12988 as of c33 (exp2, natl_box).
12989 o Corrected store directives in dynamics.F
12990 o Corrected array boundaries in impldiff.F
12991 o Corrected array dimensions in gmredi.
12992 Added temporary scalars to avoid storage by TAMC (gmredi, kpp).
c3ddfd9c4c Patr*12993 o Added routine GLOBAL_SUM_INT to global_sum.F
ea8b6560ce Patr*12994 o Added mdsio_gl.F for ECCO purposes.
12995
0e6056cd20 Jean*12996 checkpoint33 (2000/11/30)
7a9ddade78 Alis*12997 o Fixed bug in lower BC in impldiff.F
12998 o Fixed confusion about units of forcing arrays in FFIELDS.h
12999 namely Fu,Fv,Qnet,Qsw,EmPmR:
13000 - Removed verification/natl_box/code/external_fields_scale.F
13001 (did not differ from that in model/src)
13002 - Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
13003 (see FFIELDS.h for description)
13004 - Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
13005 kpp_calc.F and kpp_transport_t.F
13006 - Removed model/src/external_fields_scale.F and calls to it
13007 - verification/natl_box uses flux data with "atmospheric" sign so
13008 a special version of external_fields_load.F is used to
13009 change the data as it's read in. This way, the arrays
13010 have the right units and signs at all times tha a user could
13011 possibly use them.
13012 o Corrected genmake to delete a temporary file during configuration
13013
0e6056cd20 Jean*13014 checkpoint32 (2000/11/13)
cfb3cd1ea2 Patr*13015 o Scaling of forcing fields moved from external_forcing.F to
13016 external_fields_scale.F, called directly after loading fields.
13017 o Surface relaxation terms added to surface tendency fields in
13018 extra subroutine.
13019 o impldiff.F changed to avoid storing by TAMC of huge intermediate
13020 fields.
13021 o Changes in GMRedi to comply with packaging structure.
13022 o Modifications and bug fixes in KPP package.
13023 o Verification experiment for KPP added (verification/nat_box/)
13024
0e6056cd20 Jean*13025 checkpoint31 (2000/09/11)
dde6192d54 Patr*13026 o Packages interface brought in line with defined standard
13027 -> new routines packages_...F
13028 -> changes in initialise_fixed.F, initialise_varia.F
13029 -> enables initialisation interface for ECCO package
13030 o Rescaling of external forcing fields immediately after read
a435e833b1 Mart*13031 (removed from external_forcing.F)
dde6192d54 Patr*13032 -> new: surface_fields_scale.F
13033 -> affects ini_foorcing.F, external_fields_load.F
13034 o Computation of surface tendencies before tendency updates.
13035 -> new: external_forcing_surf.F
13036 o Change of variable names useGMRedi, useKPP, useECCO
13037 o Further changes in dynamics.F, impldiff.F for TAMC
13038 o Tested for experiments 0, 2, 4.
13039 - not yet tested for GMRedi.
13040 - not yet tested for KPP.
13041
0e6056cd20 Jean*13042 checkpoint30 (2000/07/13)
7eedb26c3d Alis*13043 o Updates for OBCs
13044 o New experiment for test OBCs (internal_wave)
13045 o New output.txt in verification/exp4/results/
13046 o Updates for KPP: calculation of viscosity corrected, new variables
13047 kpp_dumpFreq and kpp_taveFreq
13048 o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.)
13049 and entry for T90 in genmake
13050
0e6056cd20 Jean*13051 checkpoint29 (2000/06/21)
c53ad8dc62 Alis*13052 o packaged KPP and GM/Redi
13053
0e6056cd20 Jean*13054 checkpoint28 (2000/06/09)
56096ca40a Patr*13055 o Corrected initialization of hFacMin for difference vertical coordinates
13056 o Modified calculation of partial cell thickness to more robust algorithm
13057 o config_summary.F: replaced write_1D_... by write_0D_...
13058 read_write.F: added subroutines write_0D_...
13059 o routines calc_common_factors, calc_gs, calc_gt, calc_phi_hyd, find_rho:
13060 included some initialisations required for TAMC.
a435e833b1 Mart*13061 o routine calc_isoslopes: modified sqrt computation to make it
56096ca40a Patr*13062 differentiable for zero argument.
13063 o routines dynamics, impldiff:
13064 included store directives and tape key computations required for TAMC.
13065 o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC
13066
0e6056cd20 Jean*13067 checkpoint27 (2000/04/10)
5b679adde0 Alis*13068 o fixed calc_isoslopes() to so that cancellation of terms in tensor
13069 formulation works properly with variable resolution.
13070 o restructured the calling tree between the_model_main() and dynamics()
13071 o split initialise() into initialise_fixed() and initialise_varia()
13072 o introduced initialization file pSurfInitFile for free surface (cg2d_x)
13073 in new routine ini_psurf()
13074
0e6056cd20 Jean*13075 checkpoint26 (2000/04/05)
ab1673a65c Alis*13076 o moved some #ifdef in optional routines to encompass everything
13077 except the argument declarations. This was using up some memory.
13078 o fixed macros like _ADT to work with both versions of Linux cpp
13079 o cleaned up some unused and uninitialized variables
13080 (helps when debugging with strict compile options)
13081 o split up CPP_EEOPTIONS.h into options and macros
13082 (macros are now in eesupp/inc/CPP_EEMACROS.h)
13083 o patch for 2 processor JAM mode
13084
0e6056cd20 Jean*13085 checkpoint25 (2000/03/15)
c19cdd9408 Alis*13086 o updates for OBCs and NH
13087 o dramatically reduced memory usage
13088 o added "JAM" routines for use on Artic network
13089 o parameterization of convection by implicit vertical diffusion
13090 o added a diagnostic of convective index
13091 o moved call to calc_divg_hat() from dynamics() to solve_for_pressure()
13092 (this is was partly for OBCs and NH but also in anticipation of
13093 an explicit free-surface option)
13094 o initial state input files for U and V
13095
0e6056cd20 Jean*13096 checkpoint24 (1999/08/02)
090b7007c7 Alis*13097 o Removed some spurious "REAL"s
13098 o Updated KPP to latest version from JPL
13099 o Added a COS(latitude) in horizontal viscosity
13100
0e6056cd20 Jean*13101 checkpoint23 (1999/05/26)
8f6e5ef29b Alis*13102 o Added del^4 diffusion for salt and temperature
13103 o Multiple minor fixes (implicit none's, arguments to global_sum, etc.)
13104
0e6056cd20 Jean*13105 checkpoint22 (1999/05/18)
b3d4b567f6 Alis*13106 o Made many small changes: implicit none, format(i5), etc...
13107 o Introduced KPP mixing scheme (compiles and runs but *not* tested)
13108
0e6056cd20 Jean*13109 checkpoint21 (1999/05/18)
dccdad8bbd Alis*13110 o Introduced new I/O package that supports direct-access records (mdsio.F)
13111 o Split-up mid-level I/O routines
13112 o Updated input data for experiments 0,1,2,4 and 5
13113 o Finally removed the genmake.* scripts (everyone seems happy with genmake)
13114
0e6056cd20 Jean*13115 checkpoint20 (1999/03/22)
e92aabed24 Alis*13116 o Tidied up open-boundaries some more
13117 o Added non-hydrostatic code
13118 o Fixed some input data
13119 o Modified MPI start-up to work in "coupled" context.
13120
0e6056cd20 Jean*13121 checkpoint19 (1998/12/15)
337ad8328b Alis*13122 o Tidied up directory structure for verification experiments.
13123 o Added new code for open boundaries.
13124 o Corrected advective terms near boundaries.
13125 o Added CPP flag for "old UV" geometry and corrected spherical geometry.
13126 o Implemented free-slip/no-slip BCs and del^4 dissipation.
e92aabed24 Alis*13127 o Split default parameters out of ini_parms.F into set_defaults.F.
337ad8328b Alis*13128
0e6056cd20 Jean*13129 checkpoint18 (1998/11/30)
a435e833b1 Mart*13130 o Further changes for optional code generation with
632baf6c85 Chri*13131 CPP - ugh!
13132
0e6056cd20 Jean*13133 checkpoint17 (1998/11/03)
6d71ac9cce Chri*13134 o Beginning to incorporating modularity
13135 for supporting atmos. and ocean configs.
13136 o Small changes for TAMC complinace
13137 o New ultra simple test case. Barotropic box
13138 configuration "exp0".
13139
0e6056cd20 Jean*13140 checkpoint16 (1998/10/28)
a435e833b1 Mart*13141 o Minor changes to exchange routines to support
8c88443df3 Chri*13142 accumulation in reverse mode. Adjoint of an
13143 assignment is an addition.
a435e833b1 Mart*13144 o Changes to support compilation by TAMC (LR(1)
8c88443df3 Chri*13145 syntax) and by g77 under Linux ( 72 character
13146 limit ).
13147
0e6056cd20 Jean*13148 checkpoint15 (1998/09/29)
048ce7bdb7 Chri*13149 Rewrote exchange routines to allow
13150 o General tile <-> tile connectivity.
13151 o TAMC reverse mode flag ( is this really needed? )
13152 o Variable width overlap and exchange region widths.
a435e833b1 Mart*13153 o Hooks for sharing data via DMA, Arctic, Memory Channel,
13154 shmput/shmget, VIA, SYSV shmem and every other cool
048ce7bdb7 Chri*13155 communication method.
13156
0e6056cd20 Jean*13157 checkpoint14 (1998/09/09)
e83f632bdc Chri*13158 Consistent isomorphism chages made. These allow dynamical core
13159 to support both pressure and meters as a vertical coordinate.
13160
0e6056cd20 Jean*13161 checkpoint13 (1998/07/17)
b472be50f6 Chri*13162 Release which corrects global_max problem and a couple
13163 of KGM time-averaging diagnostic errors. Also contains
13164 a double-gyre experiment setup as well as the baseline
13165 4 degree global template. The double gyre template is
13166 organised to allow it to be applied automatically to
13167 the baseline configuration.
13168
6b85e5319c Alis*13169 branch-point-rdot
13170 A few tidy-ups have been made bt the real point of this
13171 check-point (excuse the pun) is to allow a branch to be
13172 made for the purposes of adding the rDot alterations.
13173 I don't want to commit the rDot to the main-trunk until
13174 we've actually tested it...
13175
0e6056cd20 Jean*13176 checkpoint12 (1998/07/08)
713eeb0b71 Chri*13177 Tidy up and added generic genmake script (formerly
a435e833b1 Mart*13178 configure script).
713eeb0b71 Chri*13179 Released to testers.
13180
0e6056cd20 Jean*13181 checkpoint11 (1998/07/02)
8e14856263 Alis*13182 Re-arranged initialise() and introduced ini_vertical_grid()
13183 and ini_masks_etc().
13184
0e6056cd20 Jean*13185 checkpoint10 (1998/07/01)
bef276faee Alis*13186 Introduced the configure script.
13187 Separated out the diags package.
13188 Added template for writing time-averages of tile/intermediate quantities.
13189 Updated SIZE.h in exp2 and made the data big-endian.
13190
0e6056cd20 Jean*13191 checkpoint9 (1998/06/22)
455e14887b Alis*13192 MPI fix. Filename changes (meta/data). salbin*y stuff.
13193 General tidy-up.
13194 SST.bin SSS.bin added to verification/exp2
13195
0e6056cd20 Jean*13196 checkpoint8 (1998/06/22)
81be42c716 Alis*13197 Inludes time-dependant forcing and time-averaging.
13198 Works at 4x4 and 2.8125x2.8125 global
13199
13200 checkpoint7-4degree-ref
13201 Branch from checkpoint7. Released for application to
13202 global modeling and general modeling - process studies, regional
a435e833b1 Mart*13203 model etc..
81be42c716 Alis*13204 Configured for verification/exp2 - 4 degree global, two process.
13205
0e6056cd20 Jean*13206 checkpoint7 (1998/06/15)
42bd47f06f Chri*13207 Created by cnh
a435e833b1 Mart*13208 Simple 4 degree global simulation
42bd47f06f Chri*13209 configuration.
a435e833b1 Mart*13210 Includes climatological wind,
42bd47f06f Chri*13211 hydrography, bathymetry etc
13212 Does not include Heat Flux and E-P
13213
0e6056cd20 Jean*13214 checkpoint6 (1998/06/08)
a82990e8c1 Chri*13215 Created by cnh
a435e833b1 Mart*13216 merged checkpoint5 with CD and
13217 spherical polar code.
a82990e8c1 Chri*13218 Still some problems with GM Redi
13219 abd full topography.
13220
0e6056cd20 Jean*13221 checkpoint5 (1998/06/08)
41a4b13446 Chri*13222 Created by AJA
13223 contains updates to GM Redi
13224 and reordered timestepping loop
13225 for Implicit Diffusion.
13226
0e6056cd20 Jean*13227 checkpoint4 (1998/05/30)
b7a12fbe29 Chri*13228 Created by cnh
13229 Contains memory saving macros ( _rdxc etc..) for when
13230 grid variations are limited.
13231 Contains polynomial coeffs for EOS and knudsen program
13232 for generation.
13233
0e6056cd20 Jean*13234 checkpoint3 (1998/05/26)
addde852ed Chri*13235 Created by cnh
13236 Added extra flags for runtime options
13237 Added this file
13238 Added implicit free-surface
13239 Added pre-conditioner
13240 Put compare01 into repository ( compare01/... )
13241 Put data and eedata into repository ( verification/exp1 )
13242
13243 checkpoint2
13244 Created by AJA
13245 Added GM/Redi
13246
13247 checkpoint1
13248 Created by AJA
13249 Restructured kloop in dynamics.F
13250 Added non-linear EOS
13251
b7a12fbe29 Chri*13252 baseline
13253 Original checked in code
