Warning, /doc/tag-index is written in an unsupported language. File is not indexed.
view on githubraw file Latest commit a3ffb3b6 on 2026-01-27 00:26:33 UTC
addde852ed Chri*0001 Notes on tags used in MITgcmUV
0002 ==============================
5dda98cf07 Jean*0003
a3ffb3b677 Jean*0004 o pkg/gmredi:
0005 - remove OLD_VISBECK_CALC code ; rename S/R GMREDI_CALC_PSI_B ;
0006 - unless restricted to only uniform Kappa (including 2-D & 1-D scaling),
0007 define local 3-d vars for Kappa-Redi and Kappa-GM to simplify Tensor
0008 setting and Psi-Bolus code.
0009
db6c4bb05b Jean*0010 checkpoint69k (2026/01/25)
b15f6f1e9f Jean*0011 o model/src:
0012 - fix scaling from cg2g/cg3d TargetResWunit to CG-Tolerance (exact scaling
0013 if rAc is uniform) by using few more domain global quantities (in GRID.h).
0014 - adjust accordingly cg2g/cg3d TargetResWunit in all forward test exp. to keep
0015 identical results but switch off cg2dTargetResWunit in most AD exp. (except
0016 if using useNSACGSolver=T) to use cg2gTargetResidual (normalize cg2d RHS).
f1b47febb7 Jean*0017 o verification:
b15f6f1e9f Jean*0018 - after moving/merging (PR 944) fwd & adm tests from global_ocean_ebm into new
0019 host-exp global_oce_latlon, move former input dir and ref. output to replace
0020 sym-link in new host-exp and remove remaining files/dir in global_ocean_ebm.
b4e9a6eb7c aver*0021 o pkg/obsfit:
0022 - fix allocation of 2 local vars in obsfit_init_fixed.F
6a83a78373 Jean*0023 o pkg/profiles:
0024 - fix typo ; this allows to compile ALLOW_PROFILES_SAMPLESPLIT_COST code.
2a2b7d0c36 Mart*0025 o pkg/gchem:
0026 - new routine gchem_insolation.F to replace pkg/bling & pkg/dic code,
0027 and now also usable on Curvilinear-Grid.
8dee4b5b73 dngo*0028 o tools/ci:
0029 - add two tapenade AD test experiments to GitHub action CI test.
0030
2578cc1182 Jean*0031 checkpoint69j (2025/12/20)
75cb2ff809 Jean*0032 o optim:
0033 - fix outdated ALLOW_SHIFWFLX_CONTROL option in "optim_read/writedata.F".
ad59256d7d aver*0034 o pkg/obsfit:
0035 - new package "obsfit" for for model-observations comparisons (and cost
0036 contribution);
0037 - add secondary "obsfit" test in TAF-AD exp. global_oce_biogeo_bling.
036aee8265 Mart*0038 o verification:
0039 - move "global_ocean_ebm" experiment forward tests to "global_oce_latlon" and
0040 adjust AD test for merging in global_oce_latlon, as a secondary "ebm" test.
0041 - disable test of global_ocean_ebm (to be removed later).
6b145becaf Jean*0042 o pkg/seaice:
0043 - fix compilation of untested SEAICE_MODIFY_GROWTH_ADJ code.
47ecd1025a Jean*0044 o model/src:
0045 - add a STOP if using selectPenetratingSW > 0 in Atmospheric set-up.
feb7fa5d1e dngo*0046 o pkg/streamice & Tapenade:
0047 - introduce fixed-point treatment of Goldberg et al 2016 (GMD) for streamice
0048 nonlinear solver using Tapenade FP-LOOP pragma ; used in halfpipe_streamice
0049 exp. (with #define ALLOW_STREAMICE_FP_ADJ) ;
0050 - rename: streamice_vel_solve_openad.F --> streamice_vel_solve_fp.F
0051 + CPP option ALLOW_STREAMICE_OAD_FP --> ALLOW_STREAMICE_FP_ADJ
0052 - skip differentiation of streamice_cg_solve.F with Tapenade, calling instead
0053 adstreamice_cg_solve (update "flow_tap" and stubs_tap_adj.F, add
0054 adFixedPoint.c in ADFirstAidKit/ + links in pkg/tapenade);
0055 - for now, disable halfpipe_streamice exp. Tapenade Tang.-Lin test.
61b91e10c1 Ivan*0056 o pkg/grdchk:
0057 - fix grdchk location to allow to span several vertical level k ; test this
0058 in secondary test exp. "global_ocean.90x40x15.kapredi".
e6feef680a Ivan*0059 o pkg/mnc:
0060 - update grid-variable names in pkg/mnc NetCDF files (mostly matching GRID.h)
0061 and provide backwards compatibility in MATLab "load_grid.m" and for Python
0062 MITgcmutils (restore_MNC_keys).
204068be6a R. S*0063 o pkg/seaice:
0064 - new parameter "SEAICE_evpAreaReg" for regularizations of denomU/V in EVP
0065 solver ; tested in exp. seaice_obcs new secondary test "regDenom".
0066
58fb4fd147 Jean*0067 checkpoint69i (2025/11/14)
c9c019d2e0 Jean*0068 o pkg/cost:
0069 - fix multi-proc initialization of Tapenade adjoint cost-function.
b7411f1a84 Jean*0070 o pkg & model:
0071 - remove pkg/timeave ; remove all ALLOW_TIMEAVE code ; remove all timeave
0072 related parameters from common blocks (in header files) and from src code
0073 and disable/retire these params.
0074 - also updates model_ad.flow, TAP_support/flow_tap, OAD_support and most
0075 */code_oad/cb2mFiles from verification.
626c6ac944 Jean*0076 o tools (Tapenade):
0077 - implement "-ncad" genmake2 option for Tapenade Makefile (similar to TAF),
0078 to append each forward src file to corresponding Tapenade-generated AD file,
0079 using new short script "append_fwd_src"; otherwise (default), put all
0080 adjoint (or Tang.Lin.) tapenade fortran files "_b.f" (or "_d.f") into a
0081 single "adj/tlm/_tap_all.f" file, to be compiled to get an object file.
0082 - simply add symbolic-links within pkg/tapenade/ to the few files from
0083 "tools/TAP_support/ADFirstAidKit/" that are needed.
0084 - fix for case-insensitive file systems (e.g., on Mac-OS) and update optfile
0085 "darwin_arm64_gfortran" to use Tapenade on Mac-OS using with "docker".
78dc053d11 Jean*0086 o pkg/diagnostics:
0087 - add diagnostic "VSHEARSQ" for the square of vertical shear.
0088
66720c264e Jean*0089 checkpoint69h (2025/10/23)
4b300c49e1 Jean*0090 o pkg/ctrl:
0091 - account for shift in record number between original xx_gentim2d_file full
f9b5d1eb8f Jean*0092 time-series and "effective" sub-set version ; this was previously missing.
4b300c49e1 Jean*0093 Also enable some debug print from ctrl_get_gen_rec.F (if debugLevel >= 3).
0fa8d50cfc Jean*0094 o pkg/seaice:
0095 - fix compilation of seaice_growth_adx.F (left from PR #750).
c3be04357d Jean*0096 o model, pkgs:
0097 - remove code within "#ifndef EXACT_CONSERV / #endif" bracket and remove
0098 completely CPP option EXACT_CONSERV.
e9828181c3 Yixi*0099 o pkg/bling:
0100 - allows to specify a 2D field of light attenuation coefficient (k0_2d) from
0101 file "bling_k0_2dFile".
0102
bbbca756c9 Jean*0103 checkpoint69g (2025/09/12)
d4a066fa68 Jean*0104 o verification/short_surf_wave:
0105 - fix Non-Hydrostatic pressure initialization issue with implicSurfPress=1/2
0106 by re-starting (nIter0=1) from pickup generated with implicSurfPress=1.
bb357ea692 Jean*0107 o tools/mpack-1.6:
0108 - fix compilation for recent version of gcc, to pass the compiler test in
0109 "configure" and md5 compilation with v15 (comply with C23 standard).
a5926ff804 dngo*0110 o pkg/streamice:
0111 - for OpenAD, adjust streamice_write_pickup.F to only write the forward
0112 components of state arrays to the binary pickups for later use.
5e44d2ea81 Jean*0113 o verification:
0114 - remove all pkg/timeave params from all exp. and no longer compile this
0115 pkg in any exp. ; also skip pkg/mnc compilation in 4 fwd test exp ;
0116 - switch few remaining exp. to #define EXACT_CONSERV so that no exp is
0117 compiled with this option undefined anymore.
13ce79fe94 Ivan*0118 o pkg/profiles:
0119 - fix "profilesDoNcOutput" feature (writing NetCDF model equivalents) so
0120 that it can be use with pkg/grdchk. Switch profilesDoNcOutput" to True in
0121 adjoint test exp. global_oce_biogeo_bling (both in TAF & Tapenade test).
0122 - improve code readability, rename cost_profiles.F to profiles_cost.F
0123 and fix obvious multi-threading issues.
0124
214bfe91bf Jean*0125 checkpoint69f (2025/07/10)
00c7090dc0 Mart*0126 o model/src, pkg/kpp:
0127 - store shortwave penetration fraction in 3D field SWFrac3D and add run-time
0128 params "selectPenetratingSW" to chose between different short-wave heating
0129 options (only =1 currently implemented);
0130 - remove local (buggy) solution in pkg/seaice ;
0131 - add runtime-flag "KPPuseSWfrac3D", set to F by default, because this code
0132 can only approximately replace the original pkg/kpp-code ;
0133 - update TAF directives in pkg/kpp (mostly related to the code changes);
0134 - fix "global_ocean.cs32x15" exp bug in "in_p" and "seaice" tests, update FWD,
0135 ADM & TLM ref. output ; set KPPuseSWfrac3D to True in "1D_ocean_ice_column"
0136 (both FWD & ADM) test exp. with updated ref. output.
b74a470d07 Jean*0137 o pkg/streamice:
0138 - fix "new_partial" initialisation in streamice_adv_front.f (helps Tapenade)
b26a461de7 Mart*0139 o pkg/bling, pkg/dic:
0140 - additional store directives to avoid hidden recomputations.
6a6c83f9ac Hajo*0141 o pkg/longstep:
0142 - add remaining GM-Redi matrix coefficients (extra-diagonal & diagonal terms)
0143 and Bolus transport stream function for time-averaging in longstep pkg and
0144 use saved values in longstep time-stepping.
871ac80009 Jean*0145 o pkg/seaice:
0146 - fix 3 output formats to allow to run with gfortran v.15
0147 - also add "deep_anelastic.vecinv" to multi-threaded tests.
31fb0e0e6d Jean*0148 o pkg/mom_{common,fluxform,vecinv}:
0149 - mom_fluxform, new option, selectCoriScheme=4: use hFac averaged transport in
0150 Coriolis term so that column integral of tendency match Coriolis time
0151 column integral U,V.
0152 - mom_vecinv, new option, selectVortScheme=4: by-pass division by hFacZ and
0153 instead apply recip_hFacW/S on final tendency. Note: this fixes Angular-Mom
0154 (AM) conservation but breaks vorticity tendency matching advection of vort.
0155 - new 3-d Coriolis option, select3dCoriScheme=2,3: Alternative discretization
0156 using averaged transport; =3 (vs 2), an other alternative discretization of
0157 vertical momentum tendency gW.
0158 - deep-model, put gU,gV NH-metric terms inside vertical advection, to exactly
0159 conserves AM (+ simplify & speed up by skipping NH metric-terms gU,gV
0160 calculation). Add CPP option "MOM_USE_OLD_DEEP_VERT_ADV" (in
0161 MOM_COMMON_OPTIONS.h) to recover the explicit NH metric-term calculation.
0162 - mom_fluxform, new spherical Metric-terms option, selectMetricTerms=2,3: More
0163 accurate discretization similar to manual eq. 2.102 & 2.103 but centered at
0164 grid-cell corner; Also option (selectMetricTerms=3) to skip the gU spherical
0165 metric term by advecting uVel*dxC (simpler, faster and exactly conserve AM).
0166 - add diagnostics for Metric-Terms.
0167 - verification exp. "deep_anelastic", new secondary "vecinv" test + also
0168 update primary test ref output.
0169
69c3e78b15 Jean*0170 checkpoint69e (2025/05/01)
86f389907b Jean*0171 o pkg/atm_ocn_coupler:
0172 - update local copy of setdir.c and CPP_EEOPTIONS.h (were left behind);
0173 - improve "run_cpl_test" step 1 (pass options to genmake2) and step 2.
c296d11a59 Jean*0174 o tools/genmake2:
0175 - use specific "ad_config.template{0,1,2}" in different stages of TAF
0176 AD/TL built to avoid race condition issue with "make -jN".
79b5d5775c Jean*0177 o model/src:
0178 - no "addMass" contribution to initial (iter=0) vertical velocity ;
0179 - with selectAddFluid=1, fix missing implDiv2DFlow factor in "addMass"
0180 contribution to solver RHS ;
0181 - add a STOP if implDiv2DFlow < 1 with exactConserv=F, (was not right with
0182 useRealFreshWaterFlux=T or selectAddFluid=1) and remove untested pieces
0183 of code dealing with this case ;
0184 - when using cg2d/cg3dTargetResWunit, add missing implDiv2DFlow factor to
0185 solver tolerance setting (cg2d/cg3dTolerance) ;
0186 - upgrade "global_ocean.cs32x15.viscA4" exp. to test selectAddFluid=1
0187 with implDiv2DFlow=1/2 ; also update "short_surf_wave" exp. output.
8908c6917c Jean*0188 o tools/genmake2:
0189 - with Tapenade, remove list NON_AD_F77_SRC_FILES from Makefile (not used),
0190 remove processing of "dontCompile", "keepOriginal" and "cb2mFiles" lists ;
0191 - otherwise, in Makefile, move NON_AD_F77_SRC_FILES and NON_AD_F90_SRC_FILES
0192 lists after AD_FILES and AD_F90FILES ;
0193 - simplify (remove intermediate targets) and improve the "-ncad" Makefile
0194 to ends cleanly when "staf" command fails.
f460f9a57e Ivan*0195 o utils:
0196 - improve gluemnc description (usage, dependencies, and example).
fbb692b4e1 Jean*0197 o tools:
0198 - replace (obsolete) "egrep" with "grep -E" (or without "-E" if not needed).
7fe51dd492 Jean*0199 o verification:
0200 - After merging (5 fwd tests + 2 AD) few exp. into new host-exp. (PR #830),
0201 move input dir and ref. output from merged exp. to replace sym-link in new
0202 host exp. and remove remaining files/dir (code, build, run) in merged-exp;
0203 - Add or update README.md in new host-exp and update list of exp. in the docs.
c8ce5f710c Jean*0204 o pkg/rbcs:
0205 - fix error/warning cases and messages.
29b81f1d21 Jean*0206 o pkg/autodiff:
0207 - alternative way (printResidualFreq >=0) to get CG2D output from cg2d_mad.F
0208 - remove 2 unused CPP options.
b7b61e618a Mart*0209 o tools, autodiff and others:
0210 - remove TAMC features, untested, unused and probably broken.
0211
b2c8bc6cea Jean*0212 checkpoint69d (2025/03/01)
5b53130725 Ivan*0213 o tools:
0214 - changes to genmake2 to allow TAF to process F90 files with modules, for now
0215 only with "-ncad" option;
0216 - re-order list of src files sent to TAF (needed with current version of TAF);
0217 - add new scrip "f90mkdepend_taf" to add dependencies form TAF generated src
0218 code (Adjoint and Tang.Lin) in a file included into Makefile.
0219 - more logical and consistent ordering in Makefile target, *.F90 first then
0220 *.F77, *.c and *.h
0221 - add 2 new variables TAF_F77_FLAGS and TAF_F90_FLAGS (set from genmake_local
0222 or adjoint-optfile) to go into the TAF command.
701e10a905 Mart*0223 o model/src and forcing:
0224 - for TEOS10, add new S/R to convert model surface Conservative Temperature
0225 to in-situ Temperature (SST) and compute and store model SST in new model
0226 field (in FFIELDS.h) "gcmSST", just a copy of model Pot.Temp with other EOS.
0227 - use model SST to compute surface forcing over open ocean in pkg/exf and
0228 pkg/bulk_force ; for now, leave ice/seaice freezing/melting unchanged.
0229 - switch test exp. global_ocean.cs32x15.in_p to use TEOS10 + update lab_sea
0230 Tapenade ref. output (affected @ machine truncation level).
f955de4ba2 Jean*0231 o tools:
0232 - remove old backward compatibility feature, so that env.var ROOTDIR is no
0233 longer recognized by genamke2 ;
0234 - re-write "suggest_optfile_names" to use parts from "genmake2".
83a53713c2 Oliv*0235 o utils/python:
0236 - make MITgcmutils compatible with numpy 2.0.0 again.
c908a600ca Jean*0237 o testreport:
0238 - improve way of sending results tar file with "scp", now allowing to combine
0239 "ssh" then "scp".
0240
efc7ba3160 Jean*0241 checkpoint69c (2024/12/06)
7bb5a8a109 Jean*0242 o pkg/mom_common,fluxform,vecinv:
0243 - remove ISOTROPIC_COS_SCALING code from pkg/mom_vecinv/mom_vi_hdissip.F (was
0244 not right); add warning (or stop if side-drag) if used with pkg/mom_vecinv.
0245 - move 2 Cos-Scaling CPP options from CPP_OPTIONS.h to MOM_COMMON_OPTIONS.h
0246 to be used in horizontal viscosity formulation; more consistent use of
0247 GAD_OPTIONS.h where these 2 CPP options are used for horizontal diffusion.
0248 - update all verification exp. customized version of CPP_OPTIONS.h,
0249 GAD_OPTIONS.h and MOM_COMMON_OPTIONS.h.
4287557481 Jean*0250 o verification/atm_gray:
0251 - gray atmosphere test exp moved from "verification_other".
80fd556159 Ou W*0252 o model/src:
0253 - add few missing option header files (RBCS, SALT_PLUME, SHELFICE) in few
0254 src files ; also illustrate how to catch these (see SALT_PLUME.h and
0255 shelfice_ad_check_lev{1,2,3,4}_dir.h).
27ce1202c5 Jean*0256 o eesupp + model:
0257 - remove FAST_BYTESWAP code and option
0258 - remove empty file AUTODIFF_MYFIELDS.h
cb406db96c Ou W*0259 o pkg/ctrl:
0260 - add a STOP when ALLOW_CTRL_OBCSN/S/W/E is defined but corresponding
0261 ALLOW_OBCS_NORTH/SOUTH/EAST/WEST is undef ; and fix the code so that, in
0262 that case, it will compile and reach the stop before running 1rst time-step
0e6a4460e5 Ivan*0263 o model,pkg:
0264 - minor spell checking and formatting updates.
9edc0e3a85 aver*0265 o pkg/bling:
0266 - size-dependent phytoplankton growth code cleaned up and related parameters
0267 can now be specified in data.bling;
0268 - clean up OPTIONS in pkg/bling code ( SIZE_NUT_LIM merged with SIZE_DEP_LIM,
0269 MULT_NUT_LIM merged with MIN_NUT_LIM ) and switch USE_QSW to #undef ; this
0270 fixes FWD exp. global_oce_biogeo_bling which a) use default BLING_OPTIONS.h
0271 and b) since no short-wave is provided, light was zero with USE_QSW defined.
d3172737dc aver*0272 o pkg/profiles:
0273 - add option to write model-equivalent profiles in a netcdf file, thus
0274 removing the need for post-processing tiled output files.
9f85ea262e Mart*0275 o pkg/grdchk:
0276 - write either "grd_ratio_ad" or "grd_ratio_ftl" depending on type of run
0277 and remove limitation to "useSingleCpuIO=F" when writing 2D files ;
0278 - write "costfunction0000" only once, from pkg/ecco.
0279
7a6b0d88e9 Jean*0280 checkpoint69b (2024/10/31)
8b7be8db08 Mart*0281 o pkg/autodiff:
0282 - TAF-store directives for saltFlux (needed for #define EXCLUDE_FFIELDS_LOAD)
0283 - little cleaning of ctrl_map_forcing.F (remove duplicated EXCH calls, ...).
71b7a3e5ac Mart*0284 o tools/genmake2:
0285 - remove step that generates *.flowdir
c9bf163375 Ivan*0286 o pkg/profiles:
0287 - fix missing pieces in this pkg for Tang-Lin model and get this tested in
0288 verification exp. global_oce_biogeo_bling.
ee480e7782 amc2*0289 o pkg/seaice:
0290 - if SEAICEaddSnowMass=T, include HSNOW in diagnostics "SIenph ".
58679b5a83 Esta*0291 o utils/python/MITgcmutils/:
0292 - augment (llc, examples, ...) and update python utils
c7a06a2c29 Mart*0293 o tools/build_options:
0294 - update darwin_arm64_gfortran to be able to compile free-format F90 files.
0295 o pkg/seaice:
5bb179ddc2 Mart*0296 - add new lateral drag parameterisation for landfast ice (Liu etal 2022, JGR)
3a00e4dea9 Jean*0297 o verification/*/results:
0298 - update 5 adm + 3 tlm ref. output affected by TAF new version 6.4.5 & 6.5.0
4c91ca28d5 Ou W*0299 o pkg/ecco:
0300 - implement sea-ice freeboard cost "m_freeboard".
f79ba37af1 Mart*0301 o tools/xmakedepend:
0302 - fix xmakedepend to accept suffix longer than 1.c and add dependencies to
0303 Makefile from included headers in F90 src files.
e6e223b277 Jean*0304 o model/src:
0305 - Add new param "cg3dTargetResWunit" to skip the normalization of cg3d RHS
0306 by specifying the CG3D target residual in term of vertical-velocity units ;
0307 - Remove header files SOLVE_FOR_PRESSURE{3D}.h ; clean-up "post_cg3d.F" ;
0308 - switch test exp. global_ocean.cs32x15.viscA4 & short_surf_wave to use new
0309 param "cg3dTargetResWunit".
95cd2dedde Ivan*0310 o tools/f90mkdepend:
0311 - add arguments to f90mkdepend to specify alternative file suffix (e.g.,
0312 for MacOS) + minor improvement in error message.
0313
b537eb461d Jean*0314 checkpoint69a (2024/09/08)
0524b7d1ff Mart*0315 o tools/genmake2:
0316 - list of src files to Differentiate: change from simply "*.list" to commonly
0317 adopted "*_ad_diff.list" (to avoid accidents).
0318 - change Makefile to enable TAF to generate Tangent-Linear code from a mix
0319 of fixed-form (.F) and free-form (.F90) src code.
0320 - test free format *.F90 code in hs94.1x64x5/code_ad/ exp. for AD and TLM.
ae2be6150b Jona*0321 o pkg/dic:
0322 - save 3D pH (for calcite saturation calculation, useCalciteSaturation=T)
0323 for next time-step and store it in pickup files (for restart).
5237154b93 Jean*0324 o eesupp/src:
0325 - new set of Global-Sum vector routines working with shared buffer
0326 (=> no needs for input/output to be in common block) and with
0327 GLOBAL_SUM_ORDER_TILES implemented ; and remove older versions.
ea893758ea Patr*0328 o tools/genmake2:
0329 - change Makefile to enable TAF to generate adjoint from a mix of fixed-form
0330 (.F) and free-form (.F90) src code. Also fix for alternative suffix (e.g.,
0331 used on MacOS) to work without -ncad.
6d7b0906cb Ivan*0332 o tools/adjoint_options:
0333 - allow to pass -f08 flag to TAF by setting TAF_FORTRAN_VERS to "F08".
a340904e5a Ou W*0334 o pkg/mom_vecinv:
0335 - add more 3-D momentum tendency diagnostics (originally from Helen Pillar)
0336 for harmonic/bi-harmonic dissipation and for bottom + top friction
0337 tendency (under new CPP option: ALLOW_MOM_TEND_EXTRA_DIAGS).
0338
6519d60651 Jean*0339 checkpoint68z (2024/07/27)
acacc28f7f Jean*0340 o pkg/diagnostics:
0341 - to allow to use ADJ-diags in DIVA runs, change call sequence regarding
0342 TURNOFF_MODEL_IO and DIAGSTATS_INI_IO and simplify (fewer tests for
0343 "costfinal") the_model_main.F (+ shorten pkg/openad version) ;
0344 - restore the use of "diag_pkgStatus" (switch & check) in AD backward sweep
0345 with new small S/R for DIVA runs ;
0346 - turn on FWD and ADJ-diags in secondary lab_sea AD test "noseaice".
4dea327916 aver*0347 o pkg/bling:
0348 - clean-up "bling_light.F" (fix typo related to PHYTO_SELF_SHADING option,
0349 move k-loop outside) ; add CHL to bling_ad_check_lev{2,3,4}_dir.h and
0350 fix TAF storage directives ;
0351 - change "global_oce_biogeo_bling" AD test exp. (both TAF & Tapenade) to
0352 use PHYTO_SELF_SHADING (with #undef USE_QSW) and update ref. output.
0353 - also clean-up MDSIO_BUFF_WH.h (avoid common block that mixes r4 & r8 vars).
af61e5eb16 Mart*0354 o pkg/obcs:
0355 - Neumann boundary conditions for sea ice variables, activate by setting
0356 new runtime parameter useSeaiceNeumann=.TRUE. in data.obcs ;
0357 - fewer (hidden) recomputations and no recomputation warnings when
0358 both ALLOW_OBCS_BALANCE and ALLOW_OBCS_STEVENS are defined.
0359 o pkg/cost:
0360 - new runtime flag for pkg/cost "cost_mask_file", which can be used
0361 for flexible cost function definition.
0362
976081d885 Jean*0363 checkpoint68y (2024/06/05)
6518e4ecc5 aver*0364 o pkg/bling:
0365 - fix bigR setting when option CARBONCHEM_TOTALPHSCALE is defined.
00f81e6785 Ou W*0366 o pkg/steep_icecavity + shelfice:
0367 - new package to be used together with pkg/shelfice to also account for
0368 melting at the vertical faces of a steep ice-shelf interface ;
0369 - allows to use non-zero (but constant) ice-shelf salinity ;
0370 - new FWD and (TAF) AD secondary test exp. (in isomip) using new pkg.
82e538d851 aver*0371 o pkg/bling:
0372 - fix/improve initialization of biomass for the 3 phytoplankton groups ;
0373 - add 2D diagnostics of optically integrated chlorophyll concentration
0374 within local-time window to be compared with satellite observation ;
0375 - improve TAF store directives (reduce recomputations).
672b822630 Jean*0376 o pkg/obcs (tides):
0377 - more efficient implementation of OB barotropic tidal velocity components,
0378 with both Cos & Sin of phase times Amplitude stored in common block ;
0379 - more flexible specification of OB tidal-components (only read-in components
0380 with non-zero tidal period) ;
0381 - allows to specify tangential component of barotropic tidal velocity at OB ;
0382 - rename all OBC tidal component input parameter (period, amplitude and
0383 phase of each OB barotropic tidal velocity component input files) ;
0384 - upgrade OB tidal example (in seaice_obcs/input.tides) with fewer tidal
0385 components (only 4) but including few tangential components.
0c90ef582a Jean*0386 o verification:
0387 - changing domain decomposition (more tiles) in global_with_exf experiment
0388 (both FWD & AD) and update ref. output ;
0389 - use correct CD-Scheme time-stepping in FWD exp. global_ocean_ebm and update
0390 ref. output ;
672b822630 Jean*0391 - simplify global_ocean.90x40x15/code_ad (undef ALLOW_GENTIM2D_CONTROL,
0c90ef582a Jean*0392 ALLOW_DIFFKR_CONTROL & ALLOW_3D_DIFFKR); remove kpp from global_oce_latlon
0393 (from both TAF & Tapenade code) ;
0394 - after adjusting new host experiment code, merge forward test:
0395 flt_example --> exp4.with_flt
0396 global_with_exf --> global_ocean_ebm.w_exf
0397 global_with_exf.yearly --> global_ocean_ebm.yearly
0398 natl_box --> lab_sea.natl_box
0399 natl_box.longstep --> lab_sea.longstep
0400 and TAF & Tapenade tests:
0401 global_with_exf --> global_oce_latlon.w_exf
0402 For now, keep original set-up in place and add symbolic links into new
0403 host exp. for input dir and ref. output to run these as secondary test.
9e0fdb4065 Garr*0404 o pkg/obcs:
0405 - fix unusual division by zero in all 4 (N,S,E,W) orlanski main S/R.
41c4545f8f Jean*0406 o pkg/diagnostics:
0407 - new header file "DIAGNOSTICS_P2SHARE.h" (for now, just for useDiag4AdjOutp),
0408 and remove DIAGNOSTICS.h in any src code outside pkg/diagnostics;
0409 - new params "diag_dBugLevel" (default = main model "debugLevel");
0410 - add new arg "seqFlag" to DIAGNOSTICS_SWITCH_ONOFF and DIAGNOSTICS_SUMMARY
0411 and prevent "diagnostics_status" to be overwritten when using ADJ-diags.
0412
5f2d22066e Jean*0413 checkpoint68x (2024/04/30)
8fabf86828 Jean*0414 o model/src:
0415 - more precise specific-volume anomaly expression for Ocean in P-coord;
0416 update reference output of all 3 Ocean in P test experiments.
598aebfcee Mart*0417 o pkg/generic_advdiff:
0418 - adjust 2 SOM (Prather advection) store directives to reduce memory overhead
0419 - include OS7MP (advScheme 7) in AD code ; switch AD test experiment
0420 isomip.htd to use this advection scheme for Temp and Salt.
720a211d38 Ou W*0421 o pkg/ecco, ctrl:
0422 - put active_read calls within #ifdef ALLOW_AUTODIFF (missing in few places)
0423 and fall back to non-active read (from pkg/rw) if undef;
0424 - change argument order in few obcs related pkg/ecco S/R.
20e951135e Mart*0425 o pkg/seaice:
0426 - for seaice-dynamics, add missing mapping of (pkg/thsice) snowHeight to HSNOW
0427 - this affects results (unless SEAICEaddSnowMass=F); update seaice parameters
0428 in test global_ocean.cs32x15.icedyn and update reference output.
0429
7456fbd729 Jean*0430 checkpoint68w (2024/03/05)
5cf4364659 Mart*0431 o pkg/ctrl, grdchk & optim:
0432 - clean and improve list of ctrl-var settings (in common blocks) and update
0433 ctrl-pack header files:
0434 a) define new character fields "ncvartype" for ctrl-var shape type and
0435 save ctrl-var (file) name "ncvarfname" ;
0436 b) re-define "ncvarindex" to point directly to genArr index (according to
0437 ncvartype) or 1,2,3,4 for N,S,E,W obcs-ctrl ;
0438 so that map of index (and grdchkvarindex) to file name, array shape and
0439 genArr specification is direct, code is simpler, more robust and efficient.
0440 - allow to specify grdchk ctrl-var by name in "data.grdchk" (more robust) ;
0441 - write ncvartype list to ctrl-pack header files ;
0442 - simplify definition of maxcvars to get much shorter "ncvar"-field lists ;
0443 - remove unnecessary common blocks, rename ctrl_init.F -> ctrl_init_fixed.F,
0444 call TURNOFF_MODEL_IO only once ;
0445 - adjust optimisation utility optim and provide backward compatibility
0446 regarding changes to ctrl-pack files ; also improve build process ;
0447 - update all "data.grdchk" in verification experiments.
a4576c7cde Juli*0448 o pkg/gmredi:
0449 - add GEOMETRIC parameterization (Mak etal, JPO, 2018) for GM coefficient,
0450 under GM_GEOM_VARIABLE_K CPP-option, turned on with "GM_useGEOM=T" and
0451 tested in exp. ideal_2D_oce, secondary test "geom".
35c4fdc74b Emma*0452 o pkg/ecco:
0453 - add option ECCO_VARIABLE_AREAVOLGLOB to use the total time-varying volume
0454 to weight contributions to m_boxmean cost functions
0455
285cda8c7b Jean*0456 checkpoint68v (2024/02/03)
427e24e121 Jean*0457 o model/src:
0458 - change param "metricTerms" to integer param "selectMetricTerms" and change
0459 param "use3dCoriolis" to integer param "select3dCoriScheme" but keep former
0460 parameters in namelist (backward compatible).
0461 - remove un-used param "writeStatePrec" + also in experiment param file "data"
0462 - rotateGrid: fix missing 3-D Coriolis term to gV ; adjust usage restriction.
d4b64b229a Jean*0463 o pkg/ecco:
0464 - remove call to ECCO_CHECK from ecco_cost_init_fixed.F (but keep the other
0465 call from packages_check.F) and move ECCO_SUMMARY call to ecco_check.F
005af54e38 Jean*0466 o pkg/shelfice:
0467 - put the update of kTopC code within "#ifdef ALLOW_SHELFICE_REMESHING/#endif"
0468 and add run-time switch "SHI_update_kTopC" to allow to turn it off.
0469 - Change the initial setting of "kTopC" to remain unaffected by machine
0470 truncation error and if using SHELFICEMassStepping, set it according to
0471 shelficeMassInit.
aef96ed361 Jean*0472 o verification/solid-body.cs-32x32x1:
0473 - update set up (faster flow, smaller planet ..) and fix initial Ps condition.
9af873c532 Hajo*0474 o pkg/ggl90:
0475 - revisit Langmuir Circulation (LC) mixing-length calculation: fix bugs in
0476 some "mxlMaxFlag" implementation and ensure it works with P-coordinate.
0477 Update vermix.gglLC ref. output and add new secondary AD test (with LC on)
0478 in global_oce_latlon experiment.
0479
fca39df4c8 Jean*0480 checkpoint68u (2023/12/10)
143d9ce879 Dami*0481 o pkg/seaice:
0482 - new/improved LSR convergence criteria (CPP: SEAICE_ALLOW_LSR_FLEX, run-time:
0483 SEAICEuseLSRflex) accounting for both Non-Lin and Linear solver residual;
0484 tested in offline_exf_seaice.dyn_lsr; also add 2-D diagnostics for residual.
f0ff6e912a dngo*0485 o pkg/streamice:
0486 - rename STREAMICE_PETSC.h to STREAMICE_PETSC_MOD.h and rename
0487 STREAMICE_ARG_PETSC_mod code module to STREAMICE_PETSC_mod;
0488 - include STREAMICE_PETSC_MOD.h in src files rather than the module directly:
0489 this obviates the need for alphabetical order in names or serial compilation
15ec8028f7 aver*0490 o pkg/bling:
0491 - fix 2 small bugs in carbonate and aragonite saturation states: a) both Ksp
0492 coeff are fct of log of temperature (and not log10); b) add missing unit
0493 conversion factor to carbonate variable in OmegaC & OmegaAr calculation.
1052c30783 Jean*0494 o pkg/grdchk:
0495 - new S/R to get CTRL var/file name from grdchk-index ; use it to simplify
0496 (with new arguments) the 3 routines that handle CTRL var/file perturbations
0497 - rename grdchk_init to grdchk_get_mask ; move GRDCHK_SUMMARY call ;
0498 - report (in summary & in results section) CTRL var/file name used in grdchk.
51e381e9c9 Jean*0499 o pkg/dic:
0500 - fix loading of forcing file for the case DIC_forcingCycle = 0 ;
0501 - fix inconsistent timing params for loading initial surface-silica file ;
0502 - clean-up initialise-varia level S/R, now all called from dic_init_varia.F
0503 and move all forcing field initialisation to dic_ini_forcing.F ;
0504 - read and process pickup_dic meta file with error/warning (depending on
0505 pickupStrictlyMatch = T/F) if missing file or field.
65754df434 Mart*0506 o pkg/ctrl:
0507 - reduce pkg/ctrl/optim.h to just "optimcycle" and rename into OPTIMCYCLE.h ;
0508 - keep optim_readparms.F namelist unchanged and define variables locally.
0509
ec9548c9e7 Jean*0510 checkpoint68t (2023/10/28)
a2c35952f2 Jona*0511 o pkg/dic:
0512 - improve carbonate dissolution options (new params: selectCalciteDissolution)
0513 and fix a minor bug in dissolution rates according to Keir et al (1980);
0514 - change exp. so_box_biogeo secondary tests caSat0/3 to test option 2 & 3.
f5509be190 Mart*0515 o pkg/gmredi:
0516 - fix setting of GM_ExtraDiag that was not (always) turned on with 3D Kappa
0517 read from file, with Bates-K3d or QG-Leith, therefore missing 2 terms in
0518 isopycnal diffusion tensor; update ref. output of MLAdjust.QGLthGM test ;
0519 - add more check and stop for the case #undef GM_NON_UNITY_DIAGONAL ;
0520 - add runtime parameter GM_isoFac_calcK to allow to scale dynamically computed
0521 Kappa contribution in the Redi-tensor (default = 1.).
018c28d301 Jean*0522 o pkg/autodiff:
0523 - adjust call to S/R DIAGNOSTICS_SWITCH_ONOFF in autodiff_inadmode_set_ad.F
0524 so that snap-shot Adjoint diagnostics are filled within the same time-step
0525 as they are written to output file.
4d72283393 Mart*0526 o pkg/ctrl:
edcd27be69 Mart*0527 - rename ctrl_dummy.h to CTRL_DUMMY.h, remove unused variables & common blocks
0528 - retire CPP-flag ALLOW_HFACC/HFACC3D_CONTROL and remove related code.
0529 o pkg/ctrl:
4d72283393 Mart*0530 - rename header file "ctrl.h" to "CTRL.h".
4ec37fd829 Jean*0531 o utils/matlab/cs_grid:
0532 - update some basic matlab-scripts for CS-grid (split_*_cub.m,
0533 rotate_uv2uvEN.m, mk_psiLine_CS.m & use_psiLine.m) to a) also work with
0534 compact-format input; and (b) always assume "long-vector" are stored one
0535 face after the other (compact-format compatible);
0536 - new script to generate broken-lines (for computing meridional transport
0537 stream-function), simpler than the previous version in cs_grid/bk_line/;
0538 - update RGB-dims in 2 latloncap/ scripts to match pkg/exch2 convention.
172933ad7e Mart*0539 o pkg/ctrl:
0540 - simplify file name handling in ctrl_map_ini_gentim2d.F to please TAF (fixes
0541 hs94.1x64x5 TL test) without upsetting Tapenade & OpenAD.
85c224e862 Ou W*0542 o pkg/autodiff + ecco:
0543 - fix a typo in AD-var output file name (addummy_in_stepping.F);
0544 - fix and improve weight output in pkg/ecco/cost_generic.F
96b006450c dngo*0545 o pkg/streamice:
0546 - implementation of parameterized depth-dependent ice-shelf melt rate ;
0547 - new subroutines added to accumulate misfit cost based on time-dependent
0548 surface elevation and velocity observations (+ calls in pkg/cost) ;
0549 - fix generic ctrl (ctrl_map_ini_{genarr,gentim2d}.F) for OpenAD and
0550 add mapping of STREAMICE arrays to generic controls ;
0551 - update exp. halfpipe_streamice OAD & Tap setup (remove customized *.F)
0552 and switch on new CPP option ALLOW_COST_STREAMICE (+adjust params files).
910e5c3e29 Mart*0553 o pkg/autodiff:
0554 - fix a bug in ALLOW_AUTODIFF_WHTAPEIO code with ALLOW_DIVIDED_ADJOINT ;
0555 - refine grad-check + update output for AD test "lab_sea.noseaicedyn".
0556
26e63756eb Jean*0557 checkpoint68s (2023/09/11)
19ced9bf8f Mart*0558 o verification:
5a54dbbd56 Jean*0559 - change default ALLOW_IB_CORR (in pkg/ecco/ECCO_OPTIONS.h) to "#undef" and
0560 test that this code compiles in experiment global_oce_biogeo_bling ;
0561 - clean/update AD related CPP header files across all experiments and reduce
0562 differences with standard version in pkg autodiff, cost, ctrl and ecco.
0563 o verification:
19ced9bf8f Mart*0564 - change global_oce_latlon TAF set-up to multi-tiles (4 tiles, as in code_oad
0565 & code_tap) and add SIZE.h_mpi to enable MPI tests (in all 3 code_* dir).
7448700841 Mart*0566 o model/src & pkgs, TAF storage dir:
0567 - rearrange and add storing of variables to reduce number of (unwarned)
0568 recomp. in fluxform & vecinv pkgs and in model/src (e.g., calc_phi_hyd.F) ;
0569 - add store directives in solve_tri/pentadiagonal.F to avoid recomputation
0570 warnings with SOLVE_DIAGONAL_KINNER defined ;
0571 - add CPP condition inside GAD SOM advection S/R (-> empty ".f" file if
0572 neither GAD_ALLOW_TS_SOM_ADV nor PTRACERS_ALLOW_DYN_STATE is defined ) ;
0573 - clean-up/refine many unnecessary store directives -> less TAF warnings ;
0574 - remove unnecessary checkpointing code from pkg/smooth_diff2/3d.F
b038e3cc4f Mart*0575 o pkg/ggl90:
0576 - move computing the mixingLength to a dedicated routine ggl90_mixinglength.F
0577 - adjust/add TAF store directives to avoid hidden recomputations.
45315406aa Mart*0578 o pkg/seaice:
0579 - new option SEAICE_BGRID_DYNAMICS allows to remove/replace
0580 SEAICE_ALLOW_DYNAMICS by ( SEAICE_CGRID or SEAICE_BGRID_DYNAMICS ) ;
0581 - exclude more code if SEAICE_CGRID is undefined and clean up/rearrange
0582 SEAICE.h to form more consistent groups and common-blocks ;
0583 - update SEAICE_OPTIONS.h in verification experiments.
57622776fd Jean*0584 o pkg/mdsio:
0585 - Add 2 new arguments (kLo & kHi) to pkg/mdsio Slice I/O routines that allow
0586 to select which levels in Slice-array to read-in or to write-out to file.
0587
2a22bb531b Jean*0588 checkpoint68r (2023/08/02)
5bc996898d Mart*0589 o verification:
0590 - adjust amplitude of perturbation (grdchk_eps) to improve Fwd/Adj gradient
0591 check comparison in exp. global_ocean.90x40x15, global_with_exf & lab_sea ;
0592 - change location of grad-check (away from freezing Temp) in exp. OpenAD
0593 and rename experiment "OpenAD" to "global_oce_latlon".
444da61630 Mart*0594 o pkg/ctrl + pkg/grdchk:
0595 - define PARAMETER nobcs = 4 in CTRL_OBCS.h instead of SIZE.h ; update SIZE.h
0596 of all code_ad/oad/tap verification exp.
0597 - in pkg/grdchk, rename grdchk.h to GRDCHK.h and adjust src code to work
0598 without "nobcs" when OBCS_ALLOW_CONTROL is undefined.
44c9a33d03 Jean*0599 o verification:
0600 - Remove duplicated parameter files from input_tap/ dir and adjust prepare_run
0601 accordingly ; remove few untested additional files (in OpenAD/ & lab_sea/).
d73d15cdef antn*0602 o pkg/seaice:
8e32c48b8f Mart*0603 - rename ZMIN/ZMAX into SEAICE_ZMIN/ZMAX to avoid potential conflicts with kpp
0604 variables with the same name ; rename swfracb into SEAICE_SWFrac ;
0605 - fix a bug in computing SEAICE_SWFrac in pressure coordinates ; update exp.
0606 global_ocean.cs32x15.in_p reference output.
0607 o pkg/seaice:
d73d15cdef antn*0608 - SEAICE_USE_GROWTH_ADX: fix a bug related to flooding and fix budget closure
0609 for linear free-surface case.
025a9bb173 antn*0610 o pkg/ecco:
0611 - in cost_gencost_sshv4.F, enable to also process monthly data (previously,
0612 only daily) for SSH cost.
c61a47f63f Mart*0613 o pkg/ctrl:
0614 - remove left-over and unused code within ALLOW_NONDIMENSIONAL_CONTROL_IO
0615 (except in OBCS_CONTROL pack/unpack code); as a consequence, switch back
0616 ALLOW_PACKUNPACK_METHOD2 to #undef in exp. tutorial_global_oce_optim.
0617 o pkgs:
de57a2ec4b Mart*0618 - for local filenames, replace character*(80) by character*(MAX_LEN_FNAM)
0619 declaration, where possible, especially in pkgs: autodiff, ctrl, ecco,
0620 profiles, smooth & grdchk.
0621
acbfbd3bbd Jean*0622 checkpoint68q (2023/06/29)
5b0716a6b3 Mart*0623 o pkg/ggl90:
0624 - non IDEMIX code: fix bug (missing hFac) in matrix coefficient computation ;
0625 - fix RI-Number calculation for IDEMIX ; new flag GGL90_IDEMIX_CVMIX_VERSION
0626 (defined by default) to update IDEMIX to CVMix version ;
0627 - add new diagnostics ;
0628 - update Fwd ref. output of exp. isomip.obcs, global_ocean.90x40x15.idemix
0629 and global_ocean.cs32x15.in_p.
b4daa24319 Shre*0630 o pkg/tapenade + other Tapenade addition:
0631 - add new capability to use Tapenade to generate Adjoint & Tang-Linear model:
0632 new package (pkg/tapenade), new tools (tools/TAP_support), update genmake2
0633 and testreport ; add some docs (in progress);
0634 - modify src code & packages to work with tapenade ; add new code_tap/ &
0635 input_tap/ dirs (+ ref output) in 9 verification experiments to get
0636 tested with tapenade.
0637
8c2ab294fc Jean*0638 checkpoint68p (2023/05/07)
8377b8ee87 Mart*0639 o pkg/seaice:
0640 - fix compile error related to ALLOW_AUTODIFF_TAMC/ALLOW_AUTODIFF mix-up
0641 in seaice_evp.F; also replace many ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF
0642 where code is not specific to TAF/TAMC;
0643 - call S/R seaice_get_dynforcing every timestep to always have valid TAUX/Y;
0644 - move most of routine body of seaice_dynsolver.F inside the
0645 SEAICE_ALLOW_DYNAMICS block.
b0b45f2373 Ou W*0646 o pkg/ecco:
0647 - fix "sterGloH" output after a restart (issue related to Greatbatch
0648 correction) by writing & reading (small) new "pickup_ecco" files.
b938a3c63b antn*0649 o pkg/ctrl:
0650 - fix record number (mostly in ctrl_map_ini_gentim2d.F) in case of restart,
0651 using corresponding xx_gentim2d_startdate1/2 as specified from data.ctrl;
0652 this finalizes (+ fix) changes made in PR #260 and #380;
0653 - also add more debug print (+new CPP option ALLOW_CTRL_DEBUG);
0654 - improve generic-control documentation in Chap.10 (State Estimation).
ab47de63dc Mart*0655 o pkg/mom_common:
0656 - new expression for quadratic drag coefficient, function of cell thickness &
0657 roughness length (logarithmic law of the wall); for now, only for z-Coords.
0658 Turned on with CPP option ALLOW_BOTTOMDRAG_ROUGHNESS (MOM_COMMON_OPTIONS.h)
0659 and run-time setting zRoughBot > 0 in data, PARMS01 namelist.
0660 Tested in exp. tutorial_plume_on_slope, new secondary test "roughBot".
cda1c18f72 Jean*0661 o model/src & pkgs:
0662 Finish to remove code within retired CPP options:
0663 - remove orphan code within (many) removed ALLOW_()_CONTROL (as listed in
0664 PR #689 comments); remove seaice_ctrl_map_ini.F;
0665 - remove code within retired CPP options, remove call to COST_TRANSPORT,
0666 remove ALLOW_ECCO_BARSTORES and the 4 "ecco_ad_check_lev?_dir.h" files;
0667 - remove (check & stop) "using_cost_bp" & "using_cost_scat" from "data.ecco";
0668 - avoid few unused variables; use default CTRL_OPTIONS.h in exp. hs94.1x64x5.
a4e168e012 antn*0669 o pkg/seaice:
0670 - SEAICE_USE_GROWTH_ADX: fix diagnostic SIatmFW and add diagnostic SIeprflx
0671 to close seaice mass and heat budgets.
a17ca5331e Jean*0672 o pkg/dic:
0673 - remove TAF storage dir for variable "OmegaC" (within wrong CPP option).
0674
628b4a6c85 Jean*0675 checkpoint68o (2023/03/13)
d9efc637ba Mart*0676 o model/src:
0677 - salt/temp/ptracer_integrate.F: optimise store directives
0678 - add mising "obcs_seaice_sponge.f" to obcs_ad_diff.list
4890e8ebab antn*0679 o pkg/ecco:
0680 - smoothing in gencost_bpv4: allow to choose between a) call to smooth_basic2D
0681 (using a constant length, with run-time params replacing hard-coded values)
0682 or b) call to smooth_hetero2D (using a 2D field to be read in).
e99fa9b078 Mart*0683 o pkg/obcs:
0684 - update OBCS configuration summary.
806785c928 Jean*0685 o eesupp/inc, model/inc & pkgs:
0686 Clean CPP header files:
0687 - remove ALLOW_GENCOST_CONTRIBUTION from COST_OPTIONS.h (is already set in
0688 ECCO_OPTIONS.h);
0689 - move ALLOW_PACKUNPACK_METHOD2 from AUTODIFF_OPTIONS.h to CTRL_OPTIONS.h;
0690 - set EXCLUDE_WHIO_GLOBUFF_2D in MDSIO_OPTIONS.h (found in some customized
0691 AUTODIFF_OPTIONS.h);
0692 - list CPP options in pkg CPP header file (as undef) when used in any
0693 experiment local set-up;
0694 - fix typo in 2 CPP option names ; rename few (unused) pkg/fizhi CPP options;
0695 - update pkg dependence rule for pkg/bling ; avoid few unused variables.
28038c27d5 Lois*0696 o pkg/kl10:
0697 - get stratification from variable "SigmaR" (passed as argument) instead of
0698 recomputing locally in-situ density (less efficient and inaccurate when
0699 using Non-Linear EOS); update (kl10) ref output for internal_wave exp.
38d78826c7 Ciar*0700 o pkg/ecco:
0701 - add new generic integral cost function "m_boxmean_vol" (e.g. to track
0702 volume of isoycnal layer); add it to lab_sea secondary AD test "noseaice"
0703 and update ref. AD output file.
c26ad343d2 Jean*0704 o tools/build_options:
0705 - fix OpenMP option in ifort optfiles for modern intel compiler.
0706
f6d206d1bd Jean*0707 checkpoint68n (2023/02/08)
2b959ba38e Mart*0708 o pkg/seaice:
0709 - make all seaice-cost code independent of pkg/ecco and remove few
0710 SEAICE_COST.h from pkg/ecco ;
0711 - remove unused code related to ALLOW_SEAICE_COST_SMR_AREA (formerly used
0712 with ECCO_CTRL_DEPRECATED, seaice_cost_driver.F and S/R called from there),
0713 ALLOW_MEAN_SFLUX_COST_CONTRIBUTION + ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION,
0714 and retire associated parameters.
2e3e8c330d Jona*0715 o pkg/dic:
0716 - rename CPP: CAR_DISS -> DIC_CALCITE_SAT and AD_SAFE -> DIC_AD_SAFE and put
0717 all carbonate-saturation code and 3D arrays inside #ifdef DIC_CALCITE_SAT
0718 block and time-ave arrays within #ifdef ALLOW_TIMEAVE ;
0719 - add run-time params: useCalciteSaturation, calcOmegaCalciteFreq, nIterCO3,
0720 selectCalciteBottomRemin, KierRateK, KierRateExp and WsinkPIC ;
0721 - switch order of arguments to "myTime, myIter, myThid" in few remaining
0722 pkg/dic S/R + S/R calls in pkg/gchem ;
0723 - update exp. so_box_biogeo (define CARBONCHEM_TOTALPHSCALE & DIC_CALCITE_SAT)
0724 + add 2 new secondary tests (caSat0 & caSat3) with useCalciteSaturation=T
0725 and using 3-D silicate input file.
edb6656069 Mart*0726 o TAF tape keys:
0727 - rename many local taf keys to use shorter and more consistent names ;
0728 - pkg/thsice: fix bug in key computations.
1d99daeaf6 Oliv*0729 o pkg/diagnostics (+doc):
0730 - fix index-loop range in diagnostics_sum_levels.F and document "fileFlags"
0731 and associated features (vertical interpolation & integral & hFac scaling).
5a6997640b Mart*0732 o pkg/gmredi:
1d99daeaf6 Oliv*0733 - in gmredi_slope_limit.F, fix tape keys by using local tapes.
9293d3c672 Hajo*0734 o pkg/ggl90:
1d99daeaf6 Oliv*0735 - cleaning: remove maskS multiplication in ggl90_calc_visc.F (no equivalent
0736 for KappaRU) and update "output_oadm.ggl90.txt" in OpenAD exp.
ea7679383f Jean*0737 o pkg/ggl90:
9293d3c672 Hajo*0738 - Add code in pkg/ggl90 to parameterize Langmuir Circulation (LC) effects on
0739 vertical mixing (useLANGMUIR=T); follows: Tak et al, Ocean Modelling, 2023;
0740 - Primary effect is to increase mixing length scale due to LC ; the stokes
0741 velocity term is also included in the momentum equation (Coriolis term);
0742 - Tested in new secondary test "gglLC" in exp. "vermix".
0a1233e81a Ou W*0743 o pkg/ecco:
0744 - fix out-of-bound array index issue in cost_gencost_sshv4.F;
0745 - fix a small bug in same S/R (skipping call to smooth_hetero2d(anom_slaobs, )
0746 if gencost_outputlevel(igen_lsc)=0.);
0747 - in same S/R, skip output of "_smooth" file when smoothing is not applied.
c69ccc91fb antn*0748 o pkg/ctrl:
0749 - enable initial sea ice area/heff controls with correct definition of control
0750 indices;
0751 - move condition on useSEAICE inside seaice_init_varia.F (always initialize to
0752 zero) when compiling pkg/autodiff. Similar changes to shelfice_init_varia.F;
0753 - fix out-of-bounds index issue in ctrl_map_ini_genarr.F (igen_shiCDrag=0).
a1d0e455fd Hann*0754 o pkg/dic:
0755 - enable to read in prescribed 3d silicate fields for calcite-saturation
0756 calculation and 3-D pH calculation (#define CAR_DISS).
0757 - add 5 new 3-D diagnostics related to calcite-saturation calculation.
0758 - fix 2-D silica input file from tutorial_global_oce_biogeo and add 3-D silica
0759 input file to so_box_biogeo exp. (currently unused).
0760
af3e3bca65 Jean*0761 checkpoint68m (2022/12/05)
5b172de0d2 Jean*0762 o pkg/gmredi:
0763 - update Redi diffusion and GM (skew-flux or advective form) to also work with
0764 P-coordinates and most current tapering schemes ; change sign of sigmaR (for
0765 now, only within pkg/gmredi) to always be the same as stratification, i.e.,
0766 positive if stratified ; add 2 arguments to GMREDI_SLOPE_LIMIT for 'ldd97'.
0767 - with p-coord, keep sign of slope component unchanged (same as dSigmaX,Y)
0768 and flip sign (-gravitySign) of Redi-tensor extra-diagonal terms ; also keep
0769 stream-function components GM_PsiX & GM_PsiY unchanged and flip sign when
0770 computing bolus-transport (left handed coord).
a1d0e455fd Hann*0771 - add unit conversion factor between p and z coord. at level center, function
0772 of vertical profile of ref. density ; used inside slope-limiter and tapering
0773 function.
5b172de0d2 Jean*0774 - stop if trying to use P-coord with not yet updated gmredi pieces of code.
0775 - add a simple secondary test in front_relax exp. using GM and p-coord.
20dee61641 Mart*0776 o pkg/autodiff:
0777 - cleanup tamc.h: remove unused parameters and nthreads_chkpkt as it is (and
0778 should be) always one; update all verification exp. code_ad versions.
0779 - simplify tape-key dependence on tile indices (remove thread grouping).
f9d7cbfb72 Ou W*0780 o pkg/ctrl:
0781 - add run-time variable ctrlDir to specify a directory different from default
0782 current directory for I/O of controls adjustment and adjoint gradient (xx
0783 and adxx), and other active files; used (as example) in lab_sea experiment.
0784 o pkg/smooth:
0785 - add run-time variable smoothDir to specify a directory different from
0786 default current directory for I/O of smoothing operators.
0787
1575dc0796 Jean*0788 checkpoint68l (2022/10/26)
cc9097e522 Oliv*0789 o pkg/longstep:
0790 - fix initialization of LS_fwFlux ;
0791 - move params report & check to new S/R LONGSTEP_CHECK.
dbb54b7d7a Jean*0792 o model/src:
0793 - fix ocean r-star pressure gradient in case model top is not uniformly at r=0
0794 - update ref output of secondary test "isomip.obcs".
d220271442 Oliv*0795 o tools/genmake2:
0796 - Remove unnecessary awk escape sequence ; this avoids a warning with recent
0797 GNU awk (5.0.1 and newer).
3924ebfa1b Mart*0798 o tools/adjoint_options:
0799 - merge five ad-optfiles into single one with compact list of generic control
0800 variables and obcs-control variables ;
0801 - to use divided adjoint (DIVA), in genmake_local, set new flag USE_DIVA=1
0802 (replacing "adjoint_diva");
0803 - select which Fortran version is sent to TAF by setting TAF_FORTRAN_VERS
0804 to either F77, F90, or F95 (replacing "adjoint_f95") ;
0805 - to replace "adjoint_tamc_compatibility", in genmake_local, set new flag
0806 TAMC_COMPATIBILITY_MODE=1 ;
0807 - remove "-server fastopt.net" to use the default server (fastopt.de)
0808 - use the staf default server (currently "fastopt.de") instead of specific
0809 server "fastopt.net" ;
0810 - remove more commented lines (remove_comments_sed) in src code sent to TAF ;
0811 - remove obsolete "ad_taf_output.f.*" diff-patches in tools/ ;
0812 - remove "ad_optfile.local" files from some verification experiments ; keep
0813 example how to specify local optfile in verification/bottom_ctrl_5x5 ;
8a34959769 dngo*0814 o pkg/streamice:
0815 - changes related to PETc solver interface to be compatible with PETSc
0816 version 3.8 and above and also available without MPI;
0817 - also make sure PETSc is not used at runtime by default.
0818
4cf519afc7 Jean*0819 checkpoint68k (2022/08/17)
cf705a6c8e Mart*0820 o pkg/ctrl, ecco, ... :
0821 Remove untested and obsolete ECCO_CTRL_DEPRECATED code: From now on it is
0822 only possible to specify control parameters through generic controls.
0823 - retire associated pkg/ctrl and pkg/autodiff flags, such as: ctrlUseGen,
0824 xx_hflux_file, xx_hflux_startdate1, ..., ctrlSmoothCorrel2D/3D,
0825 useSmoothCorrel2DinAdMode. Most of these did not have any effect with
0826 undefined ECCO_CTRL_DEPRECATED, but were still allowed in data.ctrl.
0827 Now specifying them is an error and stops the run.
0828 - remove code that assumes ctrlUseGen=F
0829 - remove empty and unused subroutines:
0830 * pkg/ctrl: ctrl_weights.h, ctrl_map_ini_gen.F, ctrl_smooth.F,
0831 ctrl_map_ini.F, ctrl_map_ini_ecco.F, ctrl_map_ini.F, ctrl_map_ini_ecco.F
0832 * pkg/ecco: cost_forcing.F, cost_hyd.F, cost_internal_params.F, cost_ssh.F
0833 ecco_cost_summary.F
0834 * pkg/smooth: smooth_correl2dw.F
0835 * pkg/seaice: seaice_cost_areasst.F
0836 - adjust parameters in verification experiment that still contained retired
0837 parameters
0838 - switch global_ocean.cs32x15.thsice to using generic control variables
0839 Note: some untested code (notably pkg/admtlm, which did not compile before)
0840 will be more difficult to resurrect without the ECCO_CTRL_DEPRECATED code.
f18a893d42 Mart*0841 o pkg/ggl90:
0842 - adjust code to also work under an ice-shelf (with pkg/shelfice); idemix
0843 under ice-shelf not fixed yet.
0844 - turn on ggl90 in isomip experiment secondary test "obcs" and update
0845 reference output file.
94a8024bbe Jean*0846 o pkg/gmredi:
0847 - allow to read-in 3-D background isopycnal (Redi) and thickness (GM)
0848 diffusivity without pkg/ctrl: new 3-D arrays, new CPP options:
0849 GM_READ_K3D_REDI & GM_READ_K3D_GM and new input files: GM_K3dRediFile &
0850 GM_K3dGMFile (replacing retired GM_isopycK3dFile & GM_background_K3dFile).
0851 - update code for ALLOW_KAPGM_CONTROL & ALLOW_KAPREDI_CONTROL to use
0852 these new 3-D arrays (from GMREDI.h) and move setting of 3-D control arrays
0853 from from ini_mixing.F to gmredi_init_varia.F (+ adjust call condition);
0854 Note: need to define new option GM_INPUT_K3D_GM and/or GM_INPUT_K3D_REDI
0855 to use KAPGM_CONTROL and/or KAPREDI_CONTROL.
0856 - remove obsolete code & CPP option ALLOW_KAPGM/KAPREDI_CONTROL_OLD
0857
f03a2f5e21 Jean*0858 checkpoint68j (2022/06/28)
cc60455fbb Mart*0859 o pkg/exf:
0860 - implement drag coefficient of Large and Yeager (2009), Climate Dynamics, 33,
0861 pages 341-364, within #ifdef ALLOW_DRAG_LARGEYEAGER09
fe1862e69b Mart*0862 o autodiff(TAF):
0863 - fix few taf recomputation and conflict warnings in: calc_3d_diffusivity.F
0864 (PCELL_MIX_CODE), pkg/bling & dwnslope_apply.F ; update reference AD output
0865 of exp. that use pkg/dwnslope (lab_sea).
f6de6620bc Mart*0866 o pkg/thsice:
0867 - fix bug in computation of ustar (case velocity=0) in thsice_calc_thickn.F;
0868 - introduce & document THSICE_REGULARIZE_CALC_THICKN flag.
20a156cdce Mart*0869 o pkg/generic_advdiff (TAF):
0870 - in gad_advection.F, replace global tapes "comlev1_bibj_k_gad" &
0871 "comlev1_bibj_k_gad" by local tapes; avoid unnecessary recomputations, but
0872 recompute full routine (only) once in ad-routine;
0873 - this affects results when useApproxAdvectionInAdMode=T, since now all tapes
0874 are computed using approximate Adv-Scheme (inAdMode=T); udate AD ref. output
0875 of exp. global_ocean.cs32x15.seaice.
3bafcf6020 Timo*0876 o pkg/shelfice:
0877 - Remove ALLOW_SHIFWFLX_CONTROL and all xx_shifwflx related code in favor of
0878 already implemented gentim2d;
0879 - move update of shelficeLoadAnomaly inside shelfice_step_icemass.F (within
0880 IF (SHELFICEMassStepping) ...);
0881 - fix storage dir for SHELFICEMassStepping, allowing to realFreshWaterFlux=T
0882 with ALLOW_AUTODIFF defined (remove STOP there). Still not working with
0883 OpenAD (add a STOP in shelfice_check.F).
0884
9bcb497701 Jean*0885 checkpoint68i (2022/04/27)
6b551785d1 Jean*0886 o eesupp/src:
0887 - simplify reading parameter file, using single scratch file (instead of 2).
2e7aec9951 dngo*0888 o verification, OpenAD:
0889 - make all OpenAD experiments use generic control variables, so that from now
0890 on, the ECCO_CTRL_DEPRECATED code is no longer tested in verification
0891 (neither in verification_other, where it never was tested), except for
0892 global_ocean.cs32x15.thsice (this is intentioal).
113b21cd45 Mart*0893 o autodiff(TAF):
0894 - avoid unnecessary local recomputations and associated warnings by storing to
0895 local tapes in: seaice/advect.F, gad_dst3fl_impl_r.F, gmredi_slope_limit.F,
0896 shap_filt_uv_s2.F, solve_pentadiagonal.F
a85293d087 Mart*0897 o pkg/thsice:
0898 - fix store directives + modify code of thsice_calc_thickn.F, thsice_extend.F
0899 and thsice_solve4temp.F to avoid 28 recomputation warnings and recomputing
0900 the state unnecessarily;
0901 - define new tape and retire two old thsice related tapes (commented out for
0902 now) in the_main_loop.F;
0903 - change offline_exf_seaice.thsice experiment to be more sensitive to changes;
0904 - fixing a bug leads to smaller gradient errors and correct TLM cost function
0905 values and requires updating (both ADM and TLM) offline_exf_seaice.thsice
0906 and global_ocean.cs32x15.thsice reference output;
07b7562e86 Ou W*0907 o pkg/ctrl:
0908 - fix issue in S/R CTRL_MAP_GENARR3D by explicitly set xx_gen to zero where
0909 wgenarr3d is zero ; also replacing 10^xx_gen with EXP(log(10)*xx_gen) for
0910 log10ctrl produces small differences at machine truncation level.
3d93c0a01e Ou W*0911 o eesupp & pkg/mdsio:
0912 - new (CPP) Macro to open read-only files with ACTION='read', added to
0913 most pkg/mdsio S/R (+ exf_interp_read.F); disable this in few old compiler
0914 optfiles (g77, pgf77) by adding EXCLUDE_OPEN_ACTION to DEFINES list.
51575f66de Mart*0915 o model:
0916 - new CPP option to exclude (= default) S/R CONVECTIVE_ADJUSTMENT_INI;
0917 to reproduce old results, define new option INCLUDE_CONVECT_INI_CALL in
0918 two verification experiments: exp2 and tutorial_tracer_adjsens.
0919 - add a check for INCLUDE_CONVECT_CALL if cAdjFreq <> 0.
fefbff5637 Mart*0920 o tools/build_options:
0921 - new optfile "darwin_arm64_gfortran" for Mac ARM 64-bit processor.
6514215240 Jean*0922 o pkg/gmredi:
0923 - add deep-factor to pkg/gmredi code to work with "deepAtmosphere=T".
a99d705983 Jean*0924 o verification/cpl_aim+ocn:
0925 - add secondary test set-up using seaice dynamics (pkg/seaice) as part of
0926 ocean component and update script to handle option to run multiple test.
adac922254 dngo*0927 o verification/halfpipe_streamice:
0928 - update OpenAD test by removing ECCO_CPPOPTIONS.h (but, for now, keep local
0929 version: ctrl_map_gentim2d.F & ctrl_map_ini_genarr.F in code_oad).
64811cb024 Jean*0930 o pkg/mypackage:
0931 - improve description (for a coding style example).
7e00d7e8f9 Jean*0932 o model:
0933 - add option to apply a correction for net global fresh-water flux imbalance
0934 proportional to, fixed in time, 2-D weight field that is read-in from file ;
0935 - new integer selector "selectBalanceEmPmR" (=0: off, =1: uniform correction,
0936 =2: correction scaled by weight) that replaces logical switch "balanceEmPmR"
0937 with backward compatibility setting.
0938
479cbc238b Jean*0939 checkpoint68h (2022/03/22)
aa93ca8e85 Ciar*0940 o pkg/ecco:
0cd0083da8 Ou W*0941 - new src files: ecco_init_fixed.F & ecco_diagnostics_init.F ;
0942 - new SSH diagnostics: SSH,SSHNOIBC (with & w-out Inv.Barometer corr.: SSHIBC)
0943 STERICHT (steric height anomaly); and Bottom-Pressure/Mass: OBP & OBPGMAP ;
0944 - add arg myTime & myIter to S/R ECCO_PHYS and adjust calls ; change to use
0945 model "rhoInSitu" (instead of recomputed rho) for Greatbatch correction ;
0946 this affects cost "m_eta".
0947 o pkg/ecco:
aa93ca8e85 Ciar*0948 - add new feature (within gencost) to evaluate cost-function contribution
0949 over specified density range (instead of depth range, see issue #483);
0950 - add few run-time parameters including logical switch: gencost_useDensityMask
0951 - test this new feature in lab_sea/input_ad.noseaice and update ref. output.
ef7fa68a19 Jean*0952 o pkg/ptracer (adjoint):
0953 - remove AUTODIFF_PTRACERS_SPLIT_FILES as it has no effect.
0954 o pkg/generic_advdiff & seaice (adjoint):
1574069d50 Mart*0955 - avoid recomputation in Second-Order Moment (SOM) advection S/R by using
0956 local tapes ; reduce local tapesize in seaice_solve4temp.F ;
479cbc238b Jean*0957 - fix key and size of tapes in multi-dimensional advection routines and adjust
1574069d50 Mart*0958 maxcube value (2 or 3 if using CubedSphereExchange) in few exp. "tamc.h".
30ad0459d6 Jean*0959 o pkg/mdsio:
0960 - retire all S/R from mdsio_rw_slice.F after replacing the last 2 calls to
0961 MDSWRITEFIELD{X,Y}Z in pkg/ctrl/ctrl_set_globfld_{x,y}z.F with calls to
0962 S/R WRITE_REC_{X,Y}Z_RL (from pkg/rw).
0963 - remove src file mdsio_rw_field.F & mdsio_rw_slice.F from NOOPTFILES list
0964 in few linux_amd64_ifort* optfiles.
0965 - move if statement out of "lengthBuff" loop in mdsio_{read,write}_whalos.F
16cc32c739 Mart*0966 o verification AD exp.:
0967 - remove ECCO_CPPOPTIONS.h from global_ocean_ebm/ and halfpipe_streamice/
0968 code_ad/ dir and replace by appropriate AUTODIFF/CTRL/COST_OPTIONS.h ;
0969 - for halfpipe_streamice AD exp., make necessary adjustments in pkg/streamice
30ad0459d6 Jean*0970 and remove ALLOW_GENTIM2D_CONTROL from store directive header files
16cc32c739 Mart*0971 streamice_ad_check_lev?_dir.h ;
0972 - remove customized version of ctrl_map_gentim2d.F & ctrl_map_ini_genarr.F
0973 from halfpipe_streamice/code_ad/ and add corresponding code to pkg/ctrl.
0974
ec9af22855 Jean*0975 checkpoint68g (2022/02/19)
0bad585a21 Navi*0976 o doc:
0977 - fix some math notation in docs.
385da9f3ec Jean*0978 o pkg/obcs:
0979 - avoid division by zero when useOBCStides=.True. and tidalPeriod=0.
8233d0ceb9 Jean*0980 o pkg/gmredi:
0981 - fix basic code to also work with dry grid cells near the top (e.g., under
0982 ice-shelf) and in this case, for now, stop if unsafe features are used ;
0983 - fix tapering 'ac02' and 'stableGmAdjTap' ;
0984 - add a secondary test, "input.top", in verification exp. front_relax to test
0985 GM with dry cells at the top (+ also 'ac02' tapering) ;
0986 - update few adm & tlm & oad ref. output from exp. global_ocean.90x40x15
0987 since adding better masking in gmredi_s{x,y}rtransport.F does affect AD &
0988 TLM gradient (@ machine truncation level).
3c775cbf98 Mart*0989 o pkg/autodiff:
0990 - new CPP-flags allow to turnoff (default) autodiff_store/restore entirely:
0991 * New flags AUTODIFF_USE_STORE_RESTORE, AUTODIFF_USE_STORE_RESTORE_OBCS to
0992 turn on autodiff_store/restore, undefined by default ;
0993 * AUTODIFF_EXCLUDE_ADEXCH_RS to skip calls to some AD-exch (if missing).
0994 - improve comments in AUTODIFF_OPTIONS.h, fix some store directives for new
0995 default, which are:
0996 #define ALLOW_AUTODIFF_WHTAPEIO
0997 c#define AUTODIFF_USE_MDSFINDUNITS
0998 #undef AUTODIFF_USE_STORE_STORE_RESTORE
0999 #undef AUTODIFF_USE_STORE_STORE_RESTORE_OBCS
1000 and update local AUTODIFF_OPTIONS.h files from verification experiments.
1001 - experiment specific setting:
1002 * define AUTODIFF_EXCLUDE_ADEXCH_RS in exp.: hs94.1x64x5, obcs_ctrl & OpenAD
1003 * increase "nWH" value in local MDSIO_BUFF_WH.h for exp.:
1004 global_oce_biogeo_bling, offline_exf_seaice & tutorial_dic_adjoffline
1005 - add a TAF "INCOMPLETE" directive for TICES and wVel to avoid a TAF bug.
1006 - fix a TAF store directive to avoid extra call of "load_fields_driver"
1007 with EXF_SEAICE_FRACTION defined.
f2389c73b0 Jean*1008 o pkg/gmredi:
1009 - rename S/R, CPP option (GM_BATES_K3D), on/off switch (GM_useBatesK3d),
1010 parameters (GM_Bates_*) and 3-D var (GM_BatesK3d) of Bates etal (JPO, 2014)
1011 scheme that computes 3-D field GM/Redi diffusivity (analog to Visbeck etal
1012 variable/option naming example).
1013
65dd265852 Jean*1014 checkpoint68f (2022/01/14)
f2389c73b0 Jean*1015 o pkg/exf:
56d13a40ed Mart*1016 - clean-up relative wind implementation so that uwind and vwind are kept
1017 unchanged (always vanilla atmospheric winds after interpolation) while
1018 relative wind is computed locally; add diagnostics for relative wind.
1019 - adjust pkg/seaice relative-wind code (+ clean-up SEAICE_GREASE code).
0c240d16ef Jean*1020 o pkg/kpp:
1021 - avoid updating input argument "kmtj" in S/R BLDEPTH (in: kpp_routines.F);
1022 this also remove/avoid 3 recomputation warnings for kmtj in adm (TAF) built.
0fbff46b46 dngo*1023 o pkg/streamice:
1024 - fix regularised coulomb basal stress impl to avoid issues with adjoint ;
1025 - cancel metric terms in stress tensor for cartesian grid ;
1026 - allow (time-indep) velocities to be imposed from external file rather than
1027 solved for ;
1028 - allow for specification of log of controls as well as sqrt ;
1029 - allow termination of adjoint fixed point loop based on relative and absolute
1030 error ;
1031 - terminate adjoint fixed point loop when change between most recent iterates
1032 begins to increase (a sign of unstable growth from linear solve errors ?);
1033 update OAD output of exp. halfpipe_streamice (affected by this modif).
c704c5a1ef Mart*1034 o pkg/seaice:
1035 - replace hard-coded parameters for JNKF line search by new runtime parameters
1036 SEAICE_JFNK_lsGamma and SEAICE_JFNK_lsLmax ;
1037 - increment line search counter after reporting and fix an if statement, so
1038 that zeroth step is not counted for more consistent debugging output.
f397060a05 dfer*1039 o tools/build_options:
3ee2cce2f5 Jean*1040 - update pleiades optfile "linux_amd64_ifort+mpi_ice_nas"
f397060a05 dfer*1041 - rename/update optfile for UK HPC Archer2.
9f5240b52a Jean*1042 o pkgs:
1043 - remove/avoid unused variables from AD verification exp. built except from
1044 halfpipe_streamice (pkg/streamice); also clean-up a bit pkg/smooth.
3b6c79e4de Mart*1045 o pkg/autodiff:
1046 - introduce separate tapes for integer arrays: the corresponding routines
1047 just convert between integer and double precision arrays and call the
1048 original adread/adwrite routines.
934d981c17 Jean*1049 o pkg/atm_compon_interf:
1050 - only with Atm-Phys pkg, allow "regional coupling", i.e. coupled only where
1051 there is ocean, keeping Atm-Phys basic mixed-layer elsewhere.
1052
d7c15ab3ba Jean*1053 checkpoint68e (2021/12/10)
ae17457769 Andr*1054 o lsopt & optim:
1055 - update Makefiles and README.
c7de4e3cb2 antn*1056 o pkg/ctrl:
37e373688b Mart*1057 - remove unused flag ALLOW_ECCO_OPTIMIZATION and associated code, always save
1058 "fcloc" to gradient vector file and save fcloc=0 to initial ctrl vector file
1059 (which is never used); also remove it from any code*/CTRL_OPTIONS.h.
1060 o pkg/ctrl:
c7de4e3cb2 antn*1061 - replace few calls to MDS_READ/WRITE_FIELD with corresponding call to
1062 pkg/rw READ/WRITE_REC_3D_RL ; also clean-up: ctrl_map_ini_gen.F
7855a13227 Mart*1063 o tape related code (adjoint):
1064 - clean-up tape code in the init-phase, mainly in the_main_loop.F and in
1065 ctrl_map_ini_gentim2d.F ;
1066 - remove unused (ecco) cost_averages_bar_directives.h ;
1067 - adjust comments in (autodiff) adread_adwrite.F & in main_do_loop.F
c3d0b098ae Lars*1068 o eesupp:
1069 - fix scratch file names when using PDAF.
6e2befed03 Oliv*1070 o pkg/exf:
1071 - fix issue in interannual monthly forcing addition (case ${fld}period=0)
bb459eb78c Jean*1072 o model/src:
1073 - skip reading kapGM and kapRedi from ini_mixing.F when useGMRedi is .FALSE.
deacece587 Oliv*1074 o pkg/exf:
1075 - add option for interannual monthly forcing with pkg/cal by setting
1076 ${fld}_period=-1. (like -12. indicates climatological monthly forcing),
1077 available with or without useExfYearlyFields ; update exp. global_with_exf
1078 SST forcing to test this new option with and without useExfYearlyFields.
d68b36a485 Mart*1079 o model/src:
1080 - define local arrays cg2d_q/v/z without overlaps in all 4 cg2d*.F
1081 and skip initialisation of cg2d_q in cg2d.F
9d0c386f0c dngo*1082 o tools/genmake2:
1083 - new option to call OpenAD compiler in a singularity container (if provided);
1084 add option to testreport too and update OpenAD doc (in section 7.5).
1085
4300da6d2c Jean*1086 checkpoint68d (2021/11/05)
71a2d60687 Jean*1087 o verification/*/results:
1088 - update few adm and tlm refence output to get closer agreement.
75c5b64bda Jean*1089 o verification/global_ocean.90x40x15:
1090 - no longer use old bug (fixed in Oct 2015) in KAPGM_CONTROL & KAPREDI_CONTROL
1091 code and update AD & TL ref. output for kapgm & kapredi tests ;
1092 - other small cleaning: finish removing OLD_THSICE_CALL_SEQUENCE code ; remove
1093 "cost_yftype" from experiments "data.ecco" ; move ALLOW_ECCO_OPTIMIZATION
1094 to the right header file.
016b84c482 Mart*1095 o pkgs pp81, my82, opps & ggl90:
1096 - remove pkg/timeave and pkg/mnc output from these mixing packages (since
1097 this functionality is available with pkg diagnostics); add 1 diagnostics
1098 to pkg/opps (to replave TAVE output).
7ea6a3439c Jean*1099 o tools/build_options:
1100 - add "-DAUTODIFF_USE_MDSFINDUNITS -DPROFILES_USE_MDSFINDUNITS" to DEFINES
1101 in g77 optfile ; this allows to run set-up with AUTODIFF_WHTAPEIO and/or
1102 with pkg/profiles using g77 (with S/R MDSFINDUNITS) while other compilers
1103 continue to use local version with extended range of I/O units number.
ebcc29af97 Jean*1104 o pkg/ecco:
1105 - fix halo initialisation for argument "active_var" in cost_genread.F ;
1106 - change "facNum" expression in cost_gencost_transp.F, to be consistent with
1107 comment in src code, by adding missing factor "nSx"; also avoid division
1108 in PARAMETER statement.
1c2b1fa3bc Mart*1109 o model/inc:
1110 - move potentially time dependent grid variable from GRID_RS to new common
1111 block GRID_VAR_RS (hFacW/S/W, etc.) and split common block CG2D_I_R into
1112 a _RL and a _RS part ; adjust AD common block accordingly.
11c3150c71 Mart*1113 o verification AD experiments:
1114 Update TAF AD exp. so that none relies anymore on ECCO_CTRL_DEPRECATED code:
1115 - remove #define ECCO_CTRL_DEPRECATED from experiments: 1D_ocean_ice_column,
1116 bottom_ctrl_5x5, global_with_exf, lab_sea, OpenAD, tutorial_dic_adjoffline,
1117 tutorial_global_oce_biogeo & tutorial_global_oce_optim ; use instead generic
1118 control and generic cost.
1119 - for now, keep experiment global_ocean.cs32x15 with both ECCO_CTRL_DEPRECATED
1120 code and generic control + generic cost.
1121 - also remove ECCO_CPPOPTIONS.h (use instead set of pkg specific OPTIONS
1122 header files) from these experiments above.
1123 - results unchanged except few digits in cost & ad-monitor for lab_sea &
1124 obcs_ctrl ; and few minor recomp. warnings count changes for
1125 tutorial_global_oce_biogeo (-4) and for tutorial_dic_adjoffline (+2).
1126 Update pkgs as needed:
1127 - pkg/ecco: fix field declarations for ecco_toolbox routines and cost_readgen,
1128 new toolbox routines ecco_offset, ecco_maskmindepth, make argument lists
1129 more consistent between ecco_toolbox routines and remove unused subroutines;
1130 - pkg/cost: fix ALLOW_COST_DEPTH contribution;
1131 - pkg/ctrl: add more "ifdef ECCO_CTRL_DEPRECATED" where necessary;
1132 - pkg/exf: add xx_snowprecip as generic control, adjust CPP-flags.
d97a730ee3 Jean*1133 o pkg/gmredi:
1134 - remove condition (ifdef GM_NON_UNITY_DIAGONAL) around 3-D arrays Kux & Kvy
1135 to simplify how GMREDI is applied (e.g., gmredi_x/ytransport); fill up these
1136 2 arrays with constant value (gmredi_calc_tensor.F & offline_get_diffus.F)
1137 when GM_NON_UNITY_DIAGONAL is undef (to reproduce old results).
1138 - also with GM_NON_UNITY_DIAGONAL undef, fix ALLOW_KAPREDI_CONTROL averaging.
c59dd234b1 Jean*1139 o tangent-linear:
1140 - fix few hand-written tangent-linear src code (in autodiff & ctrl pkgs);
1141 - add new target "ftlobj" to Makefile (similar to "obj" & "adobj" for forward
1142 and AD built) and corresponding switch in testreport ;
1143 - fix non-standard sed command (for Mac) in TLM testreport.
1144
2ffc13e2be Jean*1145 checkpoint68c (2021/10/02)
dc26f158aa Mart*1146 o pkg/seaice:
1147 - update some dynamics solver default so that now:
1148 a) SEAICEuseEVPstar = .TRUE. ; b) SEAICEuseEVPrev = .TRUE. ;
1149 c) LSR_ERROR = 1.e-5 (previously was 1.e-4) ;
1150 - put back old default in exp. lab_sea (primary test);
1151 - modify (simplify?) logic in seaice_readparms.F and seaice_check.F.
cf8a0ac466 Jean*1152 o pkg/grdchk:
1153 - allow to use "recglo" to specify a particular control time record for
1154 gradient check (was previously inactive).
f4a4b4841b Jean*1155 o pkg/exf:
1156 - new parameters to reduce AD-exf monitor output:
1157 1) exf_adjMonFreq (def= adjMonitorFreq), = 0. suppresses all output
1158 2) exf_adjMonSelect: =1 (def): less output ; =3 as before, =0 : no output
1159 - fix some AD-common block name + content to match TAF directives (in
1160 common.flow) and TAF generated code.
1161 - skip monitor of model forcing AD-variables (unless monitorSelect=4).
44d3986245 Jean*1162 o pkg/ecco + other:
1163 - fix few non-standard syntax (+ repeated setting of "gencost_msk_is3d").
7fbec11c25 Jean*1164 o pkg/bling:
1165 - fix call to S/R BLING_BIO_NITROGEN when USE_SIBLING is defined.
13d362b8c1 Ou W*1166 o pkg/ecco:
1167 - put various dimensions related to gencost out of "ecco.h" into specific
1168 (new) header file "ECCO_SIZE.h" and rename "ecco.h" to "ECCO.h" ;
1169 - add gencost param "gencost_kLev_select" to select a vertical level (from 3-D
1170 array) to form 2-D gencost ; currently only used in drifter velocity cost ;
1171 - add a couple of costs based on 1) inverse barometer (IB) corrected model sea
1172 level for altimetry data comparison 2) OBP excluding contribution from
1173 global mean atmospheric pressure for comparisons with GRACE data.
7f5c807389 Jean*1174 o pkg/autodiff:
1175 - fix type (_RS vs_RL) of AD-vars in hand-written AD routine cg2d_mad.F and
1176 in adcommon.h, common block adgrid_rs.
042d2503e1 Jean*1177 o model/src:
1178 - fix missing initialisation of local working arrays that were previously
1179 in common block in CG2D.h (needed when using blank tiles).
6b3f5dbce1 Hann*1180 o pkg/dic:
1181 - fix calculation of carbonate saturation state (with CAR_DISS defined) when
1182 #define CARBONCHEM_SOLVESAPHE ; no current test run with #define CAR_DISS.
aecc8b0f47 Mart*1183 o pkg/autodiff:
1184 - add code for Full-Adjoint of cg2d in renamed (from cg2d_sad.F) routine
1185 cg2d_mad.F (cg2d manual adjoint) ;
1186 - new runtime params cg2dFullAdjoint (data.autodiff), useNSACGSolver (data,
1187 default to "FALSE"), cg2dMinItersNSA (data, defaults to 0) ;
1188 - new sub-verification experiment bottom_ctrl_5x5.facg2d to test new
1189 Full-Adjoint capability ;
1190 - update primary test experiment bottom_ctrl_5x5 to always use a minimum
1191 number of 10 CG2D iterations (changes results but improves accuracy) ;
1192 - modify AD-experiment global_ocean.90x40x15.bottomdrag to use full nonlinear
1193 free surface (nonlinFreeSurf=4) and cg2dFullAdjoint=True.
042d2503e1 Jean*1194 - move CG2D working arrays out of CG2D.h common blocks (not necessary)
1195 to local arrays within each cg2d S/R.
aecc8b0f47 Mart*1196
93664352be Jean*1197 checkpoint68b (2021/08/24)
906a61c194 Ou W*1198 o pkg/ecco:
1199 - add time-series output of global mean steric height change at each time step
1200 (variable: sterGloH, with #define ALLOW_PSBAR_STERIC) ; turned on
1201 with run-time switch "ecco_output_sterGloH=T" ; add option to keep file open
1202 (+ single meta file writing) with "ecco_keepTSeriesOutp_open=T" switch.
31f96e9372 Jean*1203 o pkg/ggl90:
1204 - fix EXCH calls in pkg/ggl90 when IDEMIX is used: no additional EXCH when
1205 using zero horizontal diffusion of IDEMIX_E (IDEMIX_tau_h=0) but with
1206 IDEMIX_tau_h > 0, EXCH both IDEMIX_E and GGL90TKE ; this affects results
1207 of test experiment cs32.in_p and fix restart issue ;
1208 - more consistent/simpler idemix code: use model parameter value for PI,
1209 reduce number of IDEMIX global array, add TKE tendency from IDEMIX as output
1210 of S/R GGL90_IDEMIX ; use double product of IDEMIX_E instead of power of 2
1211 which affects results at machine truncation level ;
1212 - update some IDEMIX default param values (following Pollmann et al., 2017)
1213 but keep old default values in global_ocean.90x40x15.idemix ;
1214 - apply also option calcMeanVertShear to uStarSquare calculation (wind-stress
1215 magnitude) and switch on calcMeanVertShear in test experiment cs32.in_p.
0320e25227 Mart*1216 o model/src + pkgs ggl90, exf & seaice: ocean in P-coordinate
1217 - read geopotential anomaly directly into phi0surf instead of via pLoad (was
1218 a hack), specified with new input filename "geoPotAnomFile" in data&PARM05 ;
1219 - adjust MXLDEPTH diagnostic for pressure coordinates ; make sure sigmaR is
1220 computed the same way in P-coord as it is in Z-coord.
1221 - for penetrating Short-wave and geothermal heating as well as for exf forcing
1222 and seaice, use the correct P-coord vertical index for bottom and surface ;
1223 - add a flag sIceLoadFac (in "data", default=1.) to be able to turn off
1224 seaice surface pressure loading, mainly for Z-coord (since not currently
1225 supported in P-coord) ;
1226 - use diagnostics "phiHydLow" for seaice dynamics with P-coord ocean to get
1227 surface tilt term (instead of using ETAN as in Z-coord); fix restart by
1228 adding phiHydLow (only if useSEAICE and usingPCoords) to main pickup file ;
1229 - in pkg/ggl90, apply simple scaling to get mixing-length in meters (from
1230 pressure) so that no parameter changes are necessary ; significant code
1231 changes regarding surface & bottom index + direction of vertical k loop ;
1232 - add secondary test "in_p" to experiment global_ocean.cs32x15 (similar to
1233 Z-coord secondary test "seaice" but using pkg/ggl90 and without pkg/gmredi).
62748458e3 Jeff*1234 o tutorial_reentrant_channel:
1235 - add python notebook (for analysis), add python script to generate input
1236 files (+ update matlab version) and update this tutorial docs.
9c166ce5bb Jean*1237 o verification/vermix:
1238 - change ggl90 secondary test to use (pkg/ggl90) mxlMaxFlag=3 (instead of 2)
1239 and update reference output.
a78204c019 Mart*1240 o pkg/ctrl:
1241 - move S/R CTRL_MAP_GENARR2D/3D out of file "ctrl_map_ini_genarr.F" into
1242 a new file "ctrl_map_genarr.F" ;
1243 - clean-up local versions of ctrl_map_gentim2d.F and ctrl_map_ini_genarr.F
1244 from code_ad dirs (i.e., minimize diff with standard version from pkg/ctrl).
375581a429 Jean*1245 o model/src:
1246 - improve REMOVE_MEAN_RL/RS subroutines (address issues raised in issue #501)
1247 including results independent of tile to proc mapping, correction extended
1248 to overlap regions, improve accuracy of _RS version when RS is real*4 and
1249 and enable the use 2-D mask maskInC/W/S when applied to 3-D array. Change
1250 argument list (add myIter, flip order + change mask arg from 3-D to 2-D).
def7daa328 Jean*1251 o verification/global_ocean.90x40x15:
1252 - increase "grdchk_eps" from 1e-7 to 10 in AD test kapgm to improve
1253 accuracy of FD gradients ; update reference output.
ac8f9c9b75 Jean*1254 o verification/OpenAD:
1255 - add ggl90 pkg to code_ad/packages.conf to get it tested in one TAF-AD exp.
39fa6219cc Oliv*1256 o doc:
1257 - require sphinxcontrib-bibtex 2.0.0 or higher
1258
073783ff30 Jean*1259 checkpoint68a (2021/07/16)
16b9a002a2 Mart*1260 o pkg/seaice:
bcc88b4b54 Jean*1261 - clean up and simplify TAF store directives in do_oceanic_phys.F
1262 for seaice_model to avoid unnecessary recomputations ;
1263 - in testreport, count and report number of times s/r seaice_model is called.
1264 o pkg/seaice:
16b9a002a2 Mart*1265 - fix (untested) multi-threading and recomputations in seaice_solve4temp.F
4e4ad91a39 Jean*1266 o files that include "tamc.h":
1267 - add missing declaration of local keys for TAF store-dir in pkg/obcs
1268 (ALLOW_OBCS_STEVENS) and pkg/bling (USE_BLING_V1, PHYTO_SELF_SHADING) ;
1269 - add missing AUTODIFF_OPTIONS.h in few places (e.g., in pkg/ebm), needed to
1270 get ALLOW_AUTODIFF_TAMC defined ;
1271 - change few ALLOW_AUTODIFF <-> ALLOW_AUTODIFF_TAMC ;
1272 - remove included "tamc.h" in few files from pkgs seaice, streamice, bling, +
1273 in exf_radiation, longstep_thermodynamics, obcs_sponge & pp81_ri_number S/R.
1274 - define ALLOW_OBCS_STEVENS in AD exp. obcs_ctrl (to check it compiles).
93de14eac5 Jean*1275 o pkg/ecco:
1276 - fix incorrect order of array indices for "objf_gencost" and "num_gencost"
1277 in 2 gencost v4 S/R (bpv4 & sstv4).
4351f9c554 Jean*1278 o eessup/inc & pkg/thsice:
1279 - Remove 2 CPP options for deprecated code and remove corresponding code:
1280 a) USE_OLD_MACROS_R4R8toRSRL (added in May 2009) and
1281 b) OLD_THSICE_CALL_SEQUENCE (added in Jan 2013).
dcd3df3e6a Ou W*1282 o pkg/shelfice:
4351f9c554 Jean*1283 - fix missing local keys declaration in shelfice_thermodynamics.F for TAF
dcd3df3e6a Ou W*1284 storge dir. with SHI_ALLOW_GAMMAFRICT defined ;
1285 - remove included PACKAGES_CONFIG.h in many verification exp. "tamc.h".
11d5e9fc04 Gael*1286 o tools/build_options:
1287 - update gfortran optfile for MacBook Pro "darwin_amd64_gfortran" to work with
1288 gfortran version 10 (or higher), similar to linux version update.
7c50f07931 Mart*1289 o pkg/ctrl & other:
dcd3df3e6a Ou W*1290 - cleanup: move declarations of local variables from header files ctrl.h and
7c50f07931 Mart*1291 AUTODIFF.h to the local variables section in the respective routines ;
dcd3df3e6a Ou W*1292 - move declaration of local keys and variables from header file tamc.h to
1293 subroutines where they are used.
1294 ==> IMPORTANT: This requires updating all customised versions of "tamc.h",
1295 from each and every TAF-AD setup.
7c50f07931 Mart*1296 - remove tamc_keys.h + remove tamc (+tamc_keys) from all "cb2mFiles" lists ;
1297 - disentangle ALLOW_AUTODIFF/ALLOW_AUTODIFF_TAMC/ALLOW_OPENAD a bit more ;
1298 - remove unused variables where this is straightforward ;
1299 - remove a few i/jmin/max variables.
1300
b7589390f2 Jean*1301 checkpoint67z (2021/06/12)
49a029e3de Mart*1302 o veritication:
1303 - make testreport count and report the number calls of S/R load_fields_driver
1304 and do_oceanic_phys in AD-code (similar to TAF error & warning count).
2b4c90c108 Mart*1305 o pkg/kpp:
1306 - add CPP-flags to turn off diffusivity matching at bottom of boundary layer ;
1307 - add CPP-flag to turn on taper shear mixing in the case of very small shear ;
1308 - add FLAG to turn on smooth regularisation of divisions by small numbers:
1309 1/(var+eps) instead of 1/MAX(var,eps) ;
1310 - fix a small masking error ;
1311 - fix some unfortunate loop ordering and spurious recomputations ;
1312 - add new diagnostics KPPshsq, KPPdVsq ;
1313 - update exp. vermix (which has KPP_ESTIMATE_UREF defined) reference output.
aa6b2555c8 Jean*1314 o model/src:
fb2c52cfd4 aver*1315 - in the main code, add option and code for sound speed calculation with
1316 corresponding diagnostics ; turned on in exp. global_oce_biogeo_bling.
1317 o model/src:
aa6b2555c8 Jean*1318 - fix few loop range to allow to run with OLx,y=1 when momStepping=F ;
1319 - add check and stop if momStepping=T and overlap-size is smaller than 2.
1320 o pkg/ggl90:
ce9abcce9d Jean*1321 - add 3 store directives for gg90tke in ggl90_calc.F and break some loops
1322 in two to help TAF without extra storage requirements.
2383f7d4e9 Mart*1323 o pkg/seaice:
1324 - adjust store directives in seaice_growth_adx.F:
1325 *) add store directives to avoid calling seaice_solve4temp in AD-mode
1326 *) adjust/remove/reorganise for good balance between storing and recomputing
1327 *) fix a small bug (full 4D arrays were stored instead of 2D for each bi,bj)
1328 *) local option "SEAICE_GROWTH_ADX_STORE_MORE" (not recommended)
1329 reduces the recomputations but increases the memory requirements.
1330 - update ref. AD output of experiment offline_exf_seaice (the only one using
1331 SEAICE_GROWTH_ADX): no Grad-Check changes but differences in AD-Monitor.
7b8b86ab99 Timo*1332 o pkg/ctrl & pkg/shelfice:
1333 - generalize masking procedure for control parameters, fixes procedure for
1334 ice-shelf controls ;
1335 - add ability to control base 10 logarithm in generic control arrays ;
1336 - add shiTransCoeffT, shiTransCoeffS, and shiCDrag as control variables ;
1337 - add ability to compute shelfice freshwater and heat fluxes through ecco
1338 package.
9c41af81f6 Timo*1339 o store directives (model/src, pkg/exf, ...):
1340 - By adding many store directives for variables after they have been computed
1341 the corresponding s/r load_fields_driver, oceanic_phys, solve_for_pressure
1342 no longer need to be called in the AD-routine forward_step_ad.
1343 A as a consequence the forward part of forward_step is not recomputed,
1344 and there are far fewer store statements in the AD-code.
1345 - Most of the new store directives and many of the old ones are collected in
1346 two new files "check_lev1_dir_forcing.h" and "check_lev1_dir_ocephys.h" to
1347 avoid clutter in forward_step.F
1348 - More store directives in pkg/exf allow it to store the forcing fields
1349 instead of the level0/1 (e.g. aqh instead of aqh0 and aqh1), thereby
1350 reducing the number of stored exf-forcing variables by about two. This is
1351 also necessary to avoid calling load_fields_driver from forward_step_ad.
1352 - Additional small tweaks of store directives in forward_step.F have the
1353 effect that the recomputations are kept to a minimum in all of the AD
1354 verification experiments (and in verification_other/global_oce_[llc/cs32])
1355 and calling potentially expensive forward routines are not called (e.g.
1356 do_stagger_fields_exchange, which involves unnecessary exchanges).
1357 - Remove storage of gchemTendency in all checkpoint levels.
1358 - Results unaffected except if using real*4 storage (isbyte=4, e.g., in
1359 offline_exf_seaice, small changes in AD-monitor).
1360
2389d48735 Jean*1361 checkpoint67y (2021/05/05)
c96d63ff5a Jean*1362 o pkg/shelfice:
1363 - Update kTopC when using SHELFICEMassStepping if ice-shelf retreat completely
1364 from one column or advance to cover new grid-cell ; add 4 levels TAF storage
1365 of kTopC (to prevent major recomputations).
1366 - Also prevent ice-shelf mass to become negative.
70ceddf25f Timo*1367 o pkg/mom_common & gmredi:
1368 - Adjust Smag and Leith code for use in Adjoint:
1369 a) protect against derivative of SQRT(0) in mom_calc_visc.F and
1370 gmredi_calc_qgleith.F ;
1371 b) add GM-Redi QG Leith routines to ad_diff lists.
0a637c269e Ou W*1372 o pkg/gmredi:
1373 - fix/remove 2 TAF recomputations in GMREDI_WITH_STABLE_ADJOINT code.
6463ae49bb Jean*1374 o pkg/generic_advdiff:
1375 - improve "slope" calculation in DST2 Flux-Limiter advection scheme to avoid
1376 potential over-flow arithmetic in division by small slope (issue #459),
1377 similar to what has been done in gad_dst3fl_*.F routines.
e9b2d4871a Timo*1378 o pkg/diagnostics:
1379 - use Integer*8 conversion in diagnostics_out.F to get time-record to write
1380 in meta file (avoid integer overflow with large time & small diag-freq).
342b4ea43e Mart*1381 o pkg/mom_common:
1382 - initialise again hdiv in mom_calc_hdiv.F (in case it got dropped by TAF in
1383 calling S/R).
dd54a44307 Mart*1384 o model/src:
1385 - fix a bug in convective_adjustment.F AD code by adjusting store directives
1386 for theta and salt ; update experiment isomip reference AD output.
1387 - a little bit of cleanup: remove unnecessary store directives and options.
9f55dac2bf Jean*1388 o pkg/shelfice:
1389 - change expression of pLoc in shelfice_thermodynamics.F to be simply the
1390 weight of the ice-shelf (= shelficeMass * gravity) replacing inaccurate
1391 estimate from "R_shelfIce". Add TAF directive storage of prognostic
1392 variable "shelficeMass" in all 4 checkpointing levels. Update all reference
1393 output of experiments that use pkg/shelfice (isomip & shelfice_2d_remesh)
d81415648f Jean*1394 o verification/testreport
1395 - add ad-monitor of 3-D state variables to testreport summary output
638b7d19dd Jean*1396 o pkg/ggl90:
1397 - avoid division by zero in adjoint of S/R GGL90_CALC (sqrt related)
1398
aa29a5fd58 Jean*1399 checkpoint67x (2021/04/12)
c512e371cc drin*1400 o pkg/seaice:
1401 - Addition to the sea ice package of 6 sea ice rheologies with different yield
1402 curves and flow rules ;
1403 - Add 4 new verification tests in offline_exf_seaice using new rheologies ;
1404 - Update documentation with description of new rheologies and how to use them.
ba0b047096 Mart*1405 o model, pkg & doc:
1406 - replace all occurrences of incorrect "psu" and "PSU" by "g/kg" in units and
1407 comments ; update the documentation accordingly.
698b6992ee Jean*1408 o pkg/ctrl:
1409 - move to pkg/ctrl the local copy of ctrl_map_ini_genarr.F from verification/
1410 global_oce_biogeo_bling/code_ad/ with ptracers generic control. Improve for
1411 general number of ptracers control.
1412 - add missing diagnostics fill for diagnostics 'Um_ImplD' & 'Vm_ImplD' in
1413 impldiff.F (otherwise not filled when pkg/autodiff is compiled).
9c8f6b90ac Jean*1414 o pkg/autodiff:
1415 Include TICES of pkg/seaice into StoreSEAICE:
1416 - split AUTODIFF.h into two to be able to use nITD in the new AUTODIFF_STORE.h
1417 - rearrange and cleanup declarations, add CPP flags ALLOW_SEAICE/OBCS/EXF ;
1418 - clean up seaice section of autodiff_store/restore.F to remove unused storage
1419 space ;
1420 - changes AD results of global_ocean.cs32x15.seaice & seaice_dynmix, lab_sea &
1421 lab_sea.noseaicedyn => output_adm updated.
cab62edf37 Ou W*1422 o model/src:
1423 - make sure the 3 recip_hFac{C,W,S} are reset after resetting the 3 hFac
1424 in ini_nlfs_vars.F when using Non-Lin FreeSurf with pkg/autodiff compiled
1425 (#define ALLOW_AUTODIFF): this fix problems in gradient-check if recip_hFac
1426 is used, e.g., in one {PKG}_INIT_VARIA S/R.
a10c595eb6 Timo*1427 o pkg/autodiff & diagnostics:
1428 - Add interface routines to write to binary file and fill diagnostics of
1429 single (or pair) of Adjoint variable.
1430 - Rewrite addummy_in_stepping.F using set of new interface S/R to make it
1431 more compact and easier to add new control variables.
1432 - Add all current adjoint variables in addummy_in_stepping, ptracers_ad_dump,
1433 seaice_ad_dump & exf_adjoint_snapshots_ad to work with diagnostics package.
1434 - turn on Adjoint-variable diagnostics in adjoint verification experiments:
1435 *) global_oce_biogeo_bling (with ptracers AD-var diagnostics) and
1436 *) global_ocean.cs32x15.seaice (with seaice and exf AD-var diagnostics).
84cf551a2a Jean*1437 o model/src + pkg/mom_common:
1438 Fix AB time-stepping of QuasiHydrostatic with staggerTimeStep.
1439 - involves new CPP option "ALLOW_QHYD_STAGGER_TS" for storage of previous
1440 time-step Quasi-Hydro tendency to enable AB extrapolation in time when
1441 using staggerTimeStep.
1442 - field added to pickup file for restart ; allows to restart (but not perfect
1443 restart) if field is missing and pickupStrictlyMatch=F.
1444 - switch to staggerTimeStep=T in experiment "global_ocean.90x40x15.dwnslp"
1445 that uses QuasiHydrostatic to test this code; update corresponding output
1446 (as well as primary test output due to machine truncation).
1447 o verification:
1448 In experiments: global_ocean.cs32x15, isomip, obcs_ctrl and offline_exf_seaice
1449 replace CPP flag ECCO_CTRL_DEPRECATED by the much nicer generic control
1450 variables GENARR/GENTIM2D variant.
1451 Also replace ECCO_CPPOPTIONS.h by CTRL/AUTODIFF/COST/ECCO_OPTIONS.h files.
1452 This required a number of changes to the general code to make the generic
1453 control variables work in a non-ecco context:
6b47d550f4 Mart*1454 - pkg/thsice: add AUTODIFF_OPTIONS.h and COST_OPTIONS.h header files to
84cf551a2a Jean*1455 numerous routines ;
6b47d550f4 Mart*1456 - pkg/seaice: mask tendencies of HEFF/AREA/HSNOW in seaice_growth_adx.F to
84cf551a2a Jean*1457 reproduce cost function values ;
1458 - pkg/shelfice: enable GENARR/GENTIM2D methods ;
6b47d550f4 Mart*1459 - pkg/obcs: move reading control variable out of S/R obcs_prescribe_read into
1460 S/R obcs_calc to be independent of parameter values unrelated to the
84cf551a2a Jean*1461 adjoint ;
6b47d550f4 Mart*1462 - pkg/ctrl: make generic control variable work without pkg/cal (works only for
1463 time independent control variables), but issue a warning, bonus: make
84cf551a2a Jean*1464 ctrlprec a runtime parameter that defaults to 64 ;
6b47d550f4 Mart*1465 - pkg/ctrl: fix flow directives for S/R ctrl_bound_2d/3d and add tangent
84cf551a2a Jean*1466 linear versions of these subroutines ;
6b47d550f4 Mart*1467 - pkg/ecco: reorder CPP flags in ecco_cost_weights.F and remove unused
1468 variable 'wbaro', move calling S/R cost_obcs out of ECCO_CTRL_DEPRECATED
1469 code block in S/R ecco_cost_driver, reorganise CPP flags in
1470 cost_averagesinit.F, include CTRL_OPTIONS.h wherever ECCO_OPTIONS.h is
84cf551a2a Jean*1471 included, because ECCO_CTRL_DEPRECATED is now set in CTRL_OPTIONS.h ;
6b47d550f4 Mart*1472 - model/src/the_main_loop.F: fix tape initialisation, bonus: suppress a
84cf551a2a Jean*1473 benign warning ;
6b47d550f4 Mart*1474 - for each of the verification experiments remove ECCO_CPPOPTIONS.h and
1475 replace by CTRL_OPTIONS.h, CTRL_SIZE.h, sometimes COST/ECCO_OPTIONS.h,
84cf551a2a Jean*1476 EXF_OPTIONS.h, adjust data.ctrl, data.grdchk, data.ecco ;
6b47d550f4 Mart*1477 - for global_ocean.cs32x15 compile both variants by keeping
1478 ECCO_CTRL_DEPRECATED in CTRL_OPTIONS.h and use runtime parameter ctrlUseGen
1479 to switch between methods (in global_ocean.cs32x15.thsice). This involves an
1480 extra (benign) recomputation warning in this verification experiment because
1481 of an if statement with ctrlUseGen in ctrl_init_variables.F
1482
e856cdc61b Jean*1483 checkpoint67w (2021/03/06)
4b1d371a30 Jean*1484 o verification/global_ocean.cs32x15:
1485 - fix Adjoint set-up by turning off CPP option "ALLOW_AUTODIFF_INIT_OLD" (that
1486 was intended to put back an old bug) and update all 4 ADM and all 4 TLM
1487 reference output files.
1e291a3f4c Jean*1488 o pkg/exf:
1489 - replace wrong CPP option EXF_SALTFLX with ALLOW_SALTFLX in exf_monitor.F.
a5ae6d70cb Jean*1490 o model/src:
1491 - Output dxF, dyF, dxV, and dyU fields to mdsio grid output files.
dc280143ed Oliv*1492 o tools/build_options:
1493 - improve intel optfile for engaging (linux_amd64_ifort+impi_engaging).
0d75a51072 Mart*1494 o pkg/autodiff:
1495 - Improve, extend & clean-up switch to a simpler advection-scheme in AD-Mode
1496 with new parameter "useApproxAdvectionInAdMode to replace inAdMode:
1497 * If useApproxAdvectionInAdMode is True and advection scheme is set to 33
1498 use advection scheme 30 in AD-model in seaice_advection, gad_advection
1499 and gad_calc_rsh ; model stops when parameters are set inconsistently.
1500 * Defaults to False, but is reset to True if inAdExact = False to be
1501 backwards compatible.
1502 - Important change in the meaning of variable inAdMode: now it is always true
1503 after calling S/R AUTODIFF_INADMODE_SET_AD and always false after calling
1504 S/R AUTODIFF_INADMODE_UNSET_AD.
1505 The non-intuitive flags inAdTrue and inAdFalse, which could be T or F, have
1506 been removed from the code.
1507 - Remove unnecessary TAF related and inAdMode code from seaice_lsr.F, remove
1508 SOLV_MAX_TMP in LSR S/R and adjust SEAICElinearIterMax default accordingly.
1509 - Change AD exp. global_ocean.cs32x15.seaice to test this new functionality;
1510 gradient checks necessarily are poorer because AD advection is approximated.
1e25bc2551 Jean*1511 o tools/build_options:
1512 - update standard optfile "linux_amd64_gfortran" to enable to be used with
1513 gfortran version 10 (or higher); update comments and clean-up for missing
1514 "nf-config".
2ac762dbee Jean*1515 o model/src & pkg/generic_advdiff:
1516 - Implement simple isotropic 3D Smagorinsky diffusivity:
1517 Smag diffusivity is assumed to be linearly dependent on 3D Smag viscosity
1518 (just scaled by inverse of a constant Prandtl number); setting involves:
1519 a) CPP Option: ALLOW_SMAG_3D_DIFFUSIVITY in CPP_OPTIONS.h (def. #undef)
1520 b) switching on 3D Smagorinsky by setting "useSmag3D = .TRUE." in first
1521 namelist of main parameter file "data" ; and, in the same namelist,
1522 c) setting smag coeff. "smag3D_diffCoeff" for diffusivity (similar to
1523 smag coeff. "smag3D_coeff" for viscosity), which results in constant
1524 Prandtl number = smag3D_coeff/smag3D_diffCoeff.
1525 Note: Since Smag3D_diffK is lagging by 1 time-step, needs to be stored
1526 in pickup files (for restart) when using synchronous time-stepping.
1527 - code is compiled in experiment tutorial_deep_convection and ready to use
1528 except smag3D_diffCoeff setting in input.smag3d/data is commented out.
1529 - also add few missing initialisations in "ini_dynvars.F" (just for
1530 consistency with coding practice but no practical side effect).
fef3c33926 Jean*1531 o pkg/ecco:
1532 - fix type of argument in S/R MDS_READVEC_LOC call inside cost_gencost_moc.F
9b38007ffc Jean*1533 o verification/lab_sea:
1534 - change lab_sea.hb87 from testing EVP to testing aEVP with some sensible
1535 parameters ; update reference output "output.hb87.txt"
df462307fb Timo*1536 o pkg/ecco:
1537 - Addition of meridional streamfunction maximum (MOC) as objective function
1538 within ecco/gencost code ;
1539 - MOC objective function tested in verification_other/global_oce_cs32.sens ;
1540 - allows to compute sensitivity to hflux/sflux with prescribed atmospheric
1541 state (not fluxes) with new flags CALC_HFLUX_SENS and CALC_SFLUX_SENS.
1542
830e1a2c4c Jean*1543 checkpoint67v (2021/02/03)
66fe84e647 Oliv*1544 o tools/build_options:
1545 - add optfile for engaging similar to linux_amd64_ifort+impi but with -xAVX
d5254b4e3d Mart*1546 o pkg/seaice:
1547 - move store directives of uice/vice to after calling S/R SEAICE_DYNSOLVER to
1548 avoid calling this routine in S/R seaice_model_ad which may trigger
1549 potential recomputation problems (e.g., with non-exact AD) ;
1550 - move if statement inside S/R SEAICE_BOTTOMDRAG_COEFFS : this enables to
1551 remove storage of "CbotC" without triggering recomputations ; compile this
1552 code in the AD-experiments of global_ocean.cs32x15 ;
1553 - remove unnecessary store directives related to pkg/seaice ;
1554 - fix/extend diagnostic "SIenph " to work with all parameter configurations.
4240547d2d Mart*1555 o pkg/autodiff: fix/improve viscFacAdj
1556 - fix treatment of viscFacAdj in mom_vecinv.F by removing storage of 2D
1557 viscosities if new flag AUTODIFF_ALLOW_VISCFACADJ is defined ;
1558 - add a runtime parameter "viscFacInFw" in autodiff_inadmode_unset_ad.F to
1559 replace hard-coded one ;
1560 - apply viscFacAdj to both viscAh/4_D and _Z ;
1561 - test compiling this code in tutorial_global_oce_optim.
f92f728545 Jean*1562 o model/src:
1563 - move if statement out of i/j-loops in solve_tridiagnoal/pentadiagonal.F:
1564 *) this reduces TAF recomputation warnings by 4 ;
1565 *) potentially easier to optimise/vectorise for some compilers.
1566 o tools/build_options:
1567 - adjust floating point options in: linux_ia64_ifort_ollie:
32ce3e9e96 Mart*1568 o pkg/ctrl:
f92f728545 Jean*1569 - fix two bugs related to writing and reading control variables and
1570 corresponding gradients:
1571 a) replace too large loop range endrec by diffrec in ctrl_map_ini_gentim2d.F;
1572 b) skip writing meta-files in REVERSE_SIMULATION mode (active_file_control.F)
32ce3e9e96 Mart*1573
82ad7f2b88 Jean*1574 checkpoint67u (2020/12/30)
616d857f4a Mart*1575 o utils/python/MITgcmutils
f92f728545 Jean*1576 - add code to compute horizontal divergence of a vector field, gradient of a
1577 scalar field, and averages to c-points on an llc grid.
4a08d54d3a Mart*1578 o pkg/seaice:
f92f728545 Jean*1579 - fix bug in seaice_lsr, spotted by Martin Vancoppenolle, that lead to solving
1580 stationary momentum equations (du/dt -> 0) for SEAICEnonLinIterMax>2 ;
1581 - fix minor bug in seaice_bottomdrag_coeffs.F: replace OLy with correct OLx ;
1582 - changing ordering of addition (to FORCEX,FORCEY) in seaice_lsr.F results in
1583 output differences at machine truncation level: update referece output of
1584 several experiments that use LSR solver.
8fc117ecb7 Mart*1585 o pkg/autodiff: fix flow directives for self-adjoint cg2d
f92f728545 Jean*1586 - new self-adjoint cg2d routine cg2d_sad.F mimics AD-code, but neglects
1587 (purposefully) the proper sensitivity propagation
1588 - extra storage of cg2d solver coefficients and preconditioner is required
1589 - change 2 AD-verification experments (global_ocean.cs32x15 and
1590 global_ocean.cs32x15.seaice) to test this code a little better:
1591 use full NLFS and nchklev_1 = 2
8fc117ecb7 Mart*1592
8b41e6235c Jean*1593 checkpoint67t (2020/11/30)
a67734cba4 Mart*1594 o pkg/kpp:
1595 - with CPP-option KPP_ESTIMATE_UREF, fix compilation errors + fix mixed layer
1596 depth determination ;
1597 - define KPP_ESTIMATE_UREF in verification/vermix ;
1598 - a little bit of cleanup.
1599 o pkg/seaice:
4dd39c50d9 Mart*1600 - small modifications of seaice_growth_adx.F to avoid recomputation warnings
1601 and to avoid potentially inefficient code ;
1602 - remove duplicate version of seaice_solve4temp ;
1603 - exclude code of seaice_growth.F if ALLOW_SEAICE_GROWTH_ADX defined ;
1604 - switch on SEAICE_USE_GROWTH_ADX AD in experiment offline_exf_seaice and
1605 update "output_adm.txt".
76d0c749c4 Jean*1606 o eesupp/src:
1607 - add missing "stdio.h" in src code setdir.c
5dda98cf07 Jean*1608 o tools/do_tst_2+2 & tst_2+2:
08bbaa9f0f Mart*1609 - bug fix: replace some non-standard sed command with POSIX compatible syntax
5dda98cf07 Jean*1610 - remove second blank at beginning of 2 new lines in file "data".
dae83699f8 Jeff*1611 o doc:
1612 - add new SO channel tutorial
0a8794f5ee Mart*1613 - update pkg/shelfice documentation
7a4abe9124 Jean*1614 o optim:
1615 - fix a small bug by initialising myX/YglobalLo=1 in optim_nummod.F
44af98263c Jean*1616 o tools/do_tst_2+2:
1617 - for sending restart test output, add same hack in "send" option as in
1618 testreport, allowing to use "scp" (instead of an email).
1619 o model/src:
1620 - fix 2 missing TAF initialisation directives in file "the_main_loop.F";
1621 this allows to use TAF recent version 5.0.9 (that does check for missing
1622 initialisation).
6de16ba22c Jean*1623 o pkg/seaice:
1624 - fix diagnostics additions (from PR #348) for case _RS is real*4.
1625
ede86f4989 Jean*1626 checkpoint67s (2020/07/30)
b9dadda204 Mart*1627 o eesupp/src:
1628 - Improve formatting of output for large grids and many processors:
1629 adjust formats to actual length of nPx*nPy or Nx and Ny but
1630 keep minimal lengths to avoid changing the format for smaller domains;
1631 - also increase number of digits for printing tile & proc number in pkg/exch2
1632 log files and report to STDOUT.
a284455135 Matt*1633 o pkg/bling:
1634 - cleaning: remove USE_QSW_Z code ;
1635 - few more CPP options (NEW_FRAC_EXP & SIZE_DEP_LIM defined, SIZE_NUT_LIM
1636 undef) related to phytoplankton size and sinking organic matter ;
1637 - fix tiled TAF storage directives (were not right for multi-tile per proc);
1638 update ADM reference output of experiment global_oce_biogeo_bling (now
1639 gradient check are identical whether run on 1 proc - 4 tiles or 4 procs
1640 1 tile each).
5867b94c2f Mart*1641 o pkg/seaice:
1642 - Replace hard-coded minimum for DWATN by runtime parameter "SEAICEdWatMin":
1643 * allows to have zero drag by setting both SEAICEdWatMin and
1644 SEAICE_waterDrag to zero. Non-zero drag had been implemented because
1645 previous LSR solver could not handle zero entries on the main diagonal.
1646 * this fixes a bug (unexpected behavior) reported at MITgcm-support by
1647 Kaley Shrestha, but also allows to modify the somewhat arbitrary
1648 default minimum value of SEAICEdWatMin = 0.25 ;
1649 * freedrift code still requires non-zero drag coefficients,
1650 S/R SEAICE_CHECK catches this case.
3770720c1f Jean*1651 o verification/*/packages.conf
1652 - Cleaning verification experiment "packages.conf":
1653 1) add a 1 line description at the top
1654 2) use pkg group "adjoint" in some experiments
1655 3) use similar ordering of pkgs in packages.conf:
1656 a) eesupp pkgs (e.g., exch2, coupler-pkgs)
1657 b) dyn-core pkgs (e.g., gfd pkgs, mom pkgs, cd_code, gad, obcs ...)
1658 c) SGS-scheme (+ atm physics) pkgs (filters, gmredi, vert.mixing ...)
1659 d) forcing pkgs (e.g., rbcs, exf, cal, ebm, cheapaml)
1660 e) other component pkgs (e.g., ice, land, ptracers, biogeo, flt)
1661 f) diagnostics pkgs (e.g., sbo, profiles, layers, diagnostics, timeave)
1662 g) I/O pkgs, e.g., mnc (+ mypackage at the end)
1663 -- blank line --
1664 h) adjoint related pkgs (e.g., autodiff, ctrl, cost ...)
1665 4) remove unused pkgs: kpp, sbo, timeave ; this results in reduced number of
1666 TAF recomputation warning for AD exp: bottom_ctrl_5x5 & global_ocean_ebm;
1667 o tools/build_options:
1668 - add a symbolic link for optfile "linux_amd64_ifort" to "linux_amd64_ifort11"
7deacd640c Jeff*1669 o doc:
1670 - fix link and plot in doc/examples/baroclinic_gyre
5fe78992ba Mart*1671 o pkg/seaice:
1672 - Add new mechanical energy diagnostics ;
1673 - Move computation of stress diagnostics to seaice_dynsolver.F ; this change
1674 affects diagnostics SIpress, SItensil, SIpress, SIzeta, SIdelta, SIshear,
1675 because they are now filled after the current time step update, when they
1676 are actually available. Note: previously, for the first time step, these
1677 variables (and diagnostics) were not properly defined (or zero).
1678
2bc8ced27d Jean*1679 checkpoint67r (2020/06/04)
cd9df85f4a Jean*1680 o pkg/ecco:
1681 - fix character length when checking for m_trHeat, m_trSalt & m_horflux_vol.
04904a066e Timo*1682 o pkg/autodiff:
1683 - add active read and write routines for global 1D vectors, to be used for
1684 compressed cost function vectors (note: not used yet, example to come soon).
42032b6c9d Jean*1685 o model/src & pkg/exf:
1686 - Reference atmospheric pressure for seawater EOS was assumed but was not
1687 explicitly set. New constant "eosRefP0" is added to make this more clear ;
1688 - Add main model reference surface pressure (surf_pRef) so that pLoad
1689 is now defined as the atmospheric pressure anomaly relative to surf_pRef ;
1690 - Account for differences in 2 ref pressure in EOS S/R ;
1691 - Fix few EOS references (in comments) ; fix and simplify S/R EOS_CHECK ;
1692 - Keep exf "apressure" field unchanged (still full atmospheric surface
1693 pressure) but now initialised to "surf_pRef" and fill "pLoad" with atmos.
1694 pressure anomaly relative to surf_pRef.
07e785229e dngo*1695 o pkg/streamice:
1696 - add option to specify "regularised coulomb" sliding law to better reflect
1697 dependence on subglacial water pressure close to the grounding line ;
1698 - above requires CPP option (due to new arrays) STREAMICE_COULOMB_SLIDING
1699 and r/t param streamice_allow_reg_coulomb ;
1700 - add diagnostic for streamice melt rate (BDOT_SI )
1701 - add parameter STREAMICEAdotFile to specify surface mass balance ;
1702 - add parameter streamice_maxnliter_Petsc to specify maximum no. of
1703 linear solves using PETSc in a single time step (not incl. in doc
1704 since PETSc is not part of standard build) ;
1705 - update references to PETSC_DEFAULT_DOUBLE_PRECISION to PETSC_DEFAULT_REAL in
1706 streamice_cg_solve_petsc.F; former seems to be deprecated in some versions
1707 of PETSc while latter is backward compatible ;
1708 - for BJACOBI (block jacobi) PETSc preconditioner, use PCICC (incomplete
1709 cholesky) rather than PCILU (incomplete LU) ;
1710 - for BJACOBI add parameter streamice_petsc_pcfactorlevels to control level
1711 of factor fill-in.
1712
18fff58a99 Jean*1713 checkpoint67q (2020/03/19)
e1e000e69f Jean*1714 o pkg/shelfice, remeshing code:
1715 - simplify/clarify merging S/R call sequence: all done/called from main
1716 remeshing S/R SHELFICE_REMESHING :
1717 - remesh_c_mask : now only update geometry & surface fields at grid-cell
1718 center and compute merging remeshing weights for tracers;
1719 - remesh_uv_mask : now only update geometry & surface fields at grid-cell
1720 edges and prepare merging remeshing weights for velocity;
1721 also fix thin-wall setting without reading again thin-wall files ;
1722 - calls directly CALC_SURF_DR and UPDATE_SURF_DR
1723 - move adjustment of state variables into (new) dedicated
1724 S/R SHELFICE_REMESH_STATE and change loop range so that no further EXCH
1725 calls are needed ; also add missing code for ALLOW_ADAMSBASHFORTH_3 ;
1726 - move update of Rmin_surf (formerly in shelfice_remesh_rminsurf.F)
1727 before first call to S/R CALC_SURF_DR (where Rmin_surf is used)
1728 and in-line S/R SHELFICE_REMESH_RMINSURF into shelfice_remesh_uv_mask.F
1729 - add argument "wFld" and "myIter" to S/R SHELFICE_REMESH_CALC_W
1730 - fix so that it compiles and run when _RS is real*4 (#undef REAL4_IS_SLOW).
7d270b85fa Jean*1731 o model/src:
1732 - Fix for special value of R_low with pkg/shelfice:
1733 When bathymetry field value is just rF(k)+hFacMindrF(k)/2, R_low will
1734 deepen (by hFacMindrF(k)/2 ) to satisfy the hFacMin criteria. In this case:
1735 o if R_shelfIce value (from file) was exactly equal to initial bathymetry
1736 depth, original code would create a very thin grid cell of thickness
1737 factor hFacMin. Fix this problem by preventing deepening of R_low when
1738 initial R_low >= R_shelfIce.
1739 o if R_shelfIce value is deeper than original value, the problem does not
1740 show up for hFacC (column remains dry) but because of erroneous resetting
1741 of rSurfW/S (to be the MAX of rSurfW/S, rLowW/S) this could trigger the
1742 same type of artificial deepening at Western and Southern column edges
1743 (for hFacW and hFacS). Remove early resetting of rSurfW/S to fix this
1744 second issue (see issue #324).
1745 - Simplify correction for miss-match between Sum of level thickness at
1746 W & S edges and top minus bottom r-position: only adjust rSurfW/S
1747 (and not rLowW/S) as done previously for the case useMin4hFacEdges=T;
1748 - Non-lin free-surf in r coordinate: for consistency, use rSurfW & rSurfS
1749 (which account for adjustment, if any) instead of MIN of adjacent Ro_surf
1750 when calculating new thickness factor: hFac_surfW & hFac_surfS ;
1751 - Make thin-wall implementation available for sigma-coordinate ;
1752 - Record thin-wall position as kSurfW/S = Nr+2 (instead of = Nr+1 for
1753 a dry column).
1754 o tools/build_options:
1755 rename optfile "linux_amd64_ifort" to "linux_amd64_ifort10-"
9acfcdc58c Jeff*1756 o verification:
1757 - new reentrant channel tutorial experiment, doc will follow soon.
1758
260efc476e Jean*1759 checkpoint67p (2020/02/12)
bdf98ce602 Edwa*1760 o model/src:
af65683301 Jean*1761 - rename array "surfaceForcingTice" to "adjustColdSST_diag" and change the
1762 description to better reflect what it is: a diagnostic for SST adjustment.
1763 - remove most of the TAF storage directive for "adjustColdSST_diag" that were
1764 not necessary once it's properly initialized.
bdf98ce602 Edwa*1765 o pkg/gmredi:
1766 - improve error handling
1767 - additional QGLeith config checks
1768 - standardise variable name capitalizations
af65683301 Jean*1769 o pkg/mom_common, mom_vecinv, mom_fluxform:
bdf98ce602 Edwa*1770 - protect QGLeith code with ifdefs
af65683301 Jean*1771 - additional QGLeith config checks (in model/src/config_check.F)
40933c9dd3 Jean*1772 o verification:
1773 - rename dir "rotating_tank" to "tutorial_rotating_tank".
7a05b40c01 Jeff*1774 o pkg/flt:
1775 - improve pkg/flt doc and CPP brackets
1c8cebb321 Jeff*1776 o doc:
1777 - new front-page to tutorial chapter, also listing all verif experiments ;
1778 - add new section in ch3 about input file format.
1779
45ac9863cf Jean*1780 checkpoint67o (2019/12/23)
9952f046d7 dngo*1781 o pkg/shelfice:
75f34d1991 Jean*1782 - implement implicit ice-shelf drag, in the same way as implicit bottom drag,
1783 using the same run-time switch "selectImplicitDrag".
1784 - change 3-D diagnostics of ice-shelf drag tendency (SHIUDrag & SHIVDrag) to
1785 2-D diagnostics of ice-shelf drag stress (SHI_TauX & SHI_TauY).
1786 - update 4 forward reference output files of experiment "isomip".
1787 - switch on implicit drag in experiment shelfice_2d_remesh (to get it tested).
1788 o pkg/shelfice:
9952f046d7 dngo*1789 - addition of functionality described in Jordan et al (2017), "Ocean-Forced
1790 Ice-Shelf Thinning in a Synchronously Coupled Ice-Ocean Model";
1791 allows "remeshing" of grid-cells in vertical in response to changing free
1792 surface due to ice shelf mass change:
1793 At SHELFICEremeshFrequency interval, checks for cells that are too thick or
1794 too thin and adjusts R_surf & eta accordingly, and updates state variables ;
1795 - new main remeshing S/R SHELFICE_REMESHING calling additional S/R in files
1796 shelfice_remesh_c_mask.F, shelfice_remesh_uvmasks.F,
1797 shelfice_remesh_rminsurf.F and shelfice_remesh_calc_w.F
1798 and called directly from top of FORWARD_STEP ;
1799 - all new code and call protected under #define ALLOW_SHELFICE_REMESHING ;
1800 - add field "R_shelfice" to pkg/shelfice pickup files for restart ;
1801 - verification/shelfice_2d_remesh/*: new verification experiment
1802 to test remeshing functionality.
1803 - additional options to SHELFICEboundaryLayer:
1804 a) SHI_withBL_uStarTopDz, to compute uStar from uVel,vVel avergaged over
1805 top Dz thickness first and then average horizontally ;
1806 b) SHI_withBL_realFWflux, to use real Fresh-Water flux (and adjust
1807 advective surface flux) with SHELFICEboundaryLayer.
f4206cb08a Jean*1808 o pkg/ecco:
1809 - change S/R ECCO_READWEI to read in uncertainty file and compute weight
1810 as 1/sigma if nosumsq is provided as a preprocessing option, or 1/sigma^2
1811 if not. This is the expected behavior based on the "generic cost function"
1812 section of the documentation.
fb6db187ae Jean*1813 o verification:
1814 - new experiment "global_oce_biogeo_bling" move here from verification_other.
b62dee2337 Jean*1815 o pkg/cheapaml:
1816 - rewrite advection-diffusion of BL atmospheric variables to use Flux-Form
1817 formulation. Affects results (unless cartesian grid is used).
1818 - apply special treatment of diffusive flux at Northern & Southern boundaries
1819 only if .NOT.cheapamlYperiodic (previously unconditional, gad_diff_2d_y.F);
1820 - Skip calls to AB-2 when using "useFluxLimit=T" option since advection scheme
1821 used then is DST3FL which does not need AB at all. Affects results if
1822 useFluxLimit=T" is used.
1823 - clean-up (rename/remove all "gad_*.F" files) and simplify by using few more
1824 pkg/generic_advdiff S/R (instead of local copies).
1825 - update output of experiment "cheapAML_box" (and in separated PR, experiment
1826 "offline_cheapaml" in verification_other)
c8767af0b6 Timo*1827 o pkg/ctrl:
1828 - Tangent Linear mode: allows to initialise g_xx fields with user-provided
1829 g_xx file (default unchanged, i.e., initialised to zero).
1830
6bdcb6b877 Jean*1831 checkpoint67n (2019/11/26)
9906b3fb84 Jean*1832 o pkg/ctrl:
1833 - add doc & storage dir for initial velocity control option.
788c57c2b5 owan*1834 o pkg/autodiff:
1835 - sort out checkpoint_lev1_dir header file for when pkg/ecco is used
1836 with #undef NONLIN_FRSURF ; similar update in pkg/cd_code & pkg/ptracers;
1837 this fixes issue #68.
1838 - clean-up and fix pkg/autodiff checkpoint_lev?_dir to be able to compile
1839 with #define EXCLUDE_FFIELDS_LOAD.
540437b870 Jean*1840 o model/src:
1841 - allows to specify time-dependent (periodic) geothermal heat-flux
1842 with "periodicExternalForcing".
6dfad62739 Jean*1843 o pkg/diagnostics:
1844 - add diagnostics for thickness factor hFacC, hFacW & hFacS.
8dfb9d9b4c Jean*1845 o pkg/dic:
1846 - Fix carbonate chemistry coefficient issues (#269). This affects results when
1847 either CARBONCHEM_TOTALPHSCALE or CARBONCHEM_SOLVESAPHE are defined.
1848 Update output of verification experiment "so_box_biogeo".
a435e833b1 Mart*1849 o doc:
1850 - fix description of zero-layer thermoydnamics
94f0474fee Jean*1851 o verification/*/results/output.txt:
1852 - update reference machine from baudelaire.mit.edu (running fc13)
1853 to villon.mit.edu (running Ubuntu 18 LTS) and update few output.txt
1854 - change travis Docker settings accordingly + update documentation.
1855
5523dc659e Jean*1856 checkpoint67m (2019/10/16)
d67096e55c Jeff*1857 o doc/examples:
1858 - Convert remaining old doc tutorials from latex to rst files and add them
1859 to current MITgcm documentation.
18d2df1f7f Jean*1860 o pkg/ptracers:
1861 - new diagnostics Tp_gTr01, ... for ptracer total transport tendencies
1862 (before gchem_forcing_sep); this includes advection and diffusion terms,
1863 but also anything added in gchem_add_tendency.
94151a9b18 Jeff*1864 o doc & verification/tutorial_baroclinic_gyre:
1865 - split doc for tutorial experiments into separate files
1866 - update configuration for baroclinic gyre tutorial
1867 - update documentation for baroclinic gyre tutorial
1868 - formatting and font changes in algorithm chapter
5752d89cac Ed D*1869 o doc:
1870 - add rtfd config file to control build behaviour and options.
1871
b6c7ea7cf3 Jean*1872 checkpoint67l (2019/08/29)
b90cc7fedb Ed D*1873 o QG-Leith viscosity:
1874 - pkg/mom_common: bug fix for QG Leith viscosity
1875 - pkg/gmredi: bug fix for QG Leith coefficient
1876 - update output of experiments MLAdjust.QGLeith & MLAdjust.QGLthGM
abfe198bce Mart*1877 o pkg/obcs:
1878 - new feature to balance surface flux of freshwater or ice shelf mass by
1879 outflow through open boundary conditions:
1880 * requires splitting S/R obcs_calc to move call to S/R obcs_balance and S/R
1881 obcs_add_tides after S/R external_forcing_surf call in do_oceanic_phys.F
1882 * add contribution for EmPmR of the current time step and the
1883 shelficeMassDynTendency (new S/R shelfice_netmassflux_surf).
1884 - add new secondary test exp. "isomip.obcs" to text this new feature.
a004e35329 Ed D*1885 o pkg/mom_common & model/src:
1886 - new S/R MOM_U/V_BOTDRAG_COEF used both for explicit and implicit bottom drag
1887 computation (thus replacing both MOM_U/V_BOTTOMDRAG in explicit case and
1888 MOM_U/V_BOTDRAG_IMPL in implicit case) to return a drag coefficient.
1889 This modification affects results at machine truncation level.
1890 - change diagnostics 'Um_dPHdx' & 'Vm_dPHdy' to 'Um_dPhiX' & 'Vm_dPhiY'
1891 for full pressure gradient tendencies (including surf & NH contribution);
1892 - remove bottom drag tendency diags (UBotDrag & VBotDrag); add bottom stress
1893 diagnostics and implicit viscous tendency diagnostics, both accurate also
1894 if using implicit bottom drag (selectImplicitDrag=2).
d7b89710f7 Oliv*1895 o pkg/exf:
1896 - re-arrange EXF interpolation header files: move setting of "MAX_LAT_INC"
1897 from EXF_PARAM.h to EXF_INTERP_SIZE.h (more logical place). But to avoid
1898 having to include EXF_INTERP_SIZE.h each time EXF_PARAM.h is included,
1899 move EXF interpolation parameters outside EXF_PARAM.h in new header file:
1900 EXF_INTERP_PARAM.h
1901 - add S/R to define input grid setting (stored in EXF_INTERP_PARAM.h) to be
1902 used for EXF interpolated fields as default input grid.
ebbe8cf013 Jean*1903 o compon_interf pkgs:
1904 - fix bi loop range in few initialisation subroutines (2 in each pkg),
1905 fixing issue #270
1906
02b4c39948 Jean*1907 checkpoint67k (2019/07/19)
80f7dda68b Jean*1908 o model/src:
1909 - fix format in printing 1 error message from S/R SET_PARMS
9d49c8b5d1 Matt*1910 o pkg/bling:
fbb6fdf8a5 mmaz*1911 - add missing components of SIBLING
1912 - add Manizza et al 2005 light attenuation. Enable with PHYTO_SELF_SHADING
c9238c91a3 Jean*1913 - Replace hard coding of max mixing depth with runtime parameter MLmix_max
fbb6fdf8a5 mmaz*1914 o pkg/ctrl:
796fd0e220 Jean*1915 - fix reccord number setting in S/R CTRL_GET_GEN_REC ("startrec" substracted
1916 for no reason).
bc74f5a574 Jean*1917 o doc:
1918 - add a sub-section about optim_m1qn3
6c44cdc71d Jean*1919 o pkg/ctrl:
1920 - fix in rescaling option for control vector ("doscaling/noscaling" option,
1921 S/R CTRL_MAP_INI_GENARR & CTRL_MAP_INI_GENTIM2D); proper counting of
1922 non-zero control vector when weight-mask is different from ocean-mask.
1923 Expect differences only when (a) weight-mask is different from ocean mask
1924 and (b) xx_genarr2d_preproc='noscaling' (doscaling=.false.).
899473f061 Jean*1925 o pkg/exf:
1926 - new run-time parameter "diags_opOceWeighted" (default=T) to weight some exf
1927 surface diagnostics (all net and upward fluxes) with open-ocean fraction.
1928 Option is turned off when no sea-ice pkg (seaice or thsice) is used.
1929 - new S/R EXF_WEIGHT_SFX_DIAGS to do some exf diags as open-ocean weighted
1930 according to input argument ice fraction. Called from the right location
1931 in time-stepping to get diagnostics that are consistent with wind-stress
1932 and buoyancy fluxes that ocean receive.
1933
d1306ef812 Jean*1934 checkpoint67j (2019/06/18)
e0f9a7ba0b Matt*1935 o pkg/bling:
1936 - Cleanly seperate NBLING (default), BLING_V1 (enabled with USE_BLING_V1),
1937 and also add Silica option (enabled with USE_SIBLING);
1938 - New algorithm for calculating mixed layer depth (old enabled with
1939 BLING_USE_THRESHOLD_MLD);
1940 - Options for updated carbon chemistry (from J. Lauderdale) enabled with
1941 CARBONCHEM_SOLVESAPHE or CARBONCHEM_TOTALPHSCALE ;
1942 - And other minor spring cleaning changes;
1943 - update calls in pkg/gchem for BLING(V1) or NBLING (with Silica).
352c2064d4 antn*1944 o pkg/salt_plume:
1945 - fix calculation index range in salt_plume_apply.F (#ifdef SALT_PLUME_VOLUME)
3a78078268 Aras*1946 o pkg/ecco:
1947 - fix/simplify local file names in ecco_cost_init_barfiles.F (within
1948 #ifdef ALLOW_GENCOST_CONTRIBUTION ).
7843dde2de jm-c 1949 o pkg/mom_vecinv:
1950 - add 2 Coriolis schemes which satisfy: d/dt U = f V ; d/dt V = -f U
1951 (with U,V = vertically integrated flow).
1952 - add new run-time coriolis-scheme selector "selectCoriScheme" to replace
1953 "useJamartWetPoints" and "useEnergyConservingCoriolis"; but keep these 2
1954 in namelist (backward compatible) to set "selectCoriScheme" accordingly.
77f894c517 Timo*1955 o pkg/ctrl:
1956 - Fix bug in ctrl_map_ini_genarr.F regarding missing initialization of
1957 igen_uvel & igen_vvel (just like all the other variables).
6acab690ae Jona*1958 o pkg/dic:
1959 - Implement SolveSAPHE (Munhoven, 2013), a robust algorithm to calculate
1960 oceanic pH/pCO2 ; compiled when CARBONCHEM_SOLVESAPHE is defined (in
1961 DIC_OPTIONS.h) and used when (in data.dic) selectPHsolver > 0 ;
1962 Add several options for selecting dissociation coefficients, available
1963 when CARBONCHEM_SOLVESAPHE is defined.
1964 - Change experiment "so_box_biogeo" to compile with CARBONCHEM_SOLVESAPHE
1965 defined and add secondary test "saphe" (dir: input.saphe) to this experiment
1966 to test GENERAL pH solver (selectPHsolver=1).
dc54d31829 Ian *1967 o pkg/seaice:
1968 - add alternative version of seaice thermodynamics two routines that provide
1969 accurate adjoint. Switched by defining CPP option: ALLOW_SEAICE_GROWTH_ADX
66046ae6a1 Brun*1970 o pkg/mdsio:
1971 - in meta file, write number of records with longer format (10 digits vs 5
1972 previously) to accommodate large number of floats.
1973
aa900cad7e Jean*1974 checkpoint67i (2019/05/08)
f2a88c9ff8 jm-c 1975 o autofdiff:
1976 - fix to avoid TAF recomputations in ggl90 & salt_plume pkgs
1977 and in model/src PCELL_MIX_CODE.
f59d76b0dd Ed D*1978 o pkg/mom_common & pkg/gmredi:
1979 - add quasi-geostrophic variant of Leith dynamic visocity
1980 - use the quasi-geostrophic Leith dynamic visocity as GM diffusivity
1981 - new verification experiment to test QG-Leith (variant of MLAdjust)
1982 - updated documentation about new option
39cd4ae623 Ed D*1983 o pkg/seaice:
1984 - add Hlimit to seaice namelist in data.seaice
1985 - use verification seaice_itd.thermo to test this feature with default
1986 values (experiment does not change)
1987 - clean up related output in seaice_init_fixed.F a little
aad71d9e67 Mart*1988 o verification/testreport:
1989 - for file run_ADM_DIVA, fix sed search syntax so that it works with BSD-sed
6b48f6d519 Mart*1990 o model/src:
1991 - fix small bug (wrong balanceEmPmR report) in config_summary.F, spotted by
1992 Christopher Wolfe ; add report of balancePrintMean to summary.
1f2be90d9e Ed D*1993 o verification/verification_parser.py
1994 - ensure Travis test suite fails when a build or a run fails.
1995
fba140841d Jean*1996 checkpoint67h (2019/03/21)
db0c10dd53 jm-c 1997 o tools/genmake2:
1998 - fix option "-nocat4ad" for latest version of TAF: now needs to add TAF
1999 option "-fixed" to process *.flowdir files with newer (after 4.1.1) version
2000 of TAF (otherwise assumed now to be in free format).
b98355c8c5 jm-c 2001 o model/src:
dc54d31829 Ian *2002 - remove argument tFld & sFld from S/R CALC_PHI_HYD and from 2 related S/R
bcbb675387 jm-c 2003 o tools/genmake2:
2004 - allow to skip "check_fortran_compiler" part (as, e.g., in opt-file:
2005 tools/build_options/linux_ia64_cray_archer).
1c87316fba Jeff*2006 o verification/tutorial_barotropic_gyre:
2007 - add 1rst tutorial documentation to new manual and update corresponding setup
8b07a23c92 Jean*2008 o pkg/atm_phys:
2009 - add 3-D input file for stratospheric ozone
2010 - add code from Matt Kasoar for SW absorption by stratospheric ozone,
2011 based on following papers:
2012 Lacis and Hansen (JAS, 1974) and Forster and Shine (JGR, 1997).
2013 - turned on using 2 local run-time parameter: ozone_in_SW (downward)
2014 and two_stream_SW (also in upward); default are off.
2015 - clean up S/R "radiation_up": rename "net" to "flux_lw" (better name)
2016 and remove un-used local (dyn-allocated) arrays.
2017 - also avoid division by zero in Rel-Humid diagnostics (atm_phys_driver.F)
bfae2ee370 jm-c 2018 o pkg/seaice:
2019 - fix missing update of sIceLoad in the case usePW79thermodynamics=F.
80d7ca01bb Jona*2020 o pkg/dic:
2021 - Adjust unit conversions for dissociation coefficients aks, aksi, and akf
2022 (#define CARBONCHEM_TOTALPHSCALE).
516b08a580 jm-c 2023 o tools/genmake2:
2024 - improve Fortran Compiler check, section: running MPI executable ; also
2025 refine the "conclusion" printed message.
2026
29a542dcab Jean*2027 checkpoint67g (2019/01/03)
2028 o doc:
2029 - add documentation for pkg/streamice
148dd84005 jm-c 2030 o model/src:
2031 - change ordering of pkg calls in initialisation: streamice / shelfice and
2032 then seaice / salt_plume / thsice;
2033 - fix thin ice-shelf issue with pkg/seaice ; implemented by updating (recently
2034 added) seaice masks (requiring new ordering of calls).
c87895a3f5 jm-c 2035 o pkg/shelfice:
2036 - allow to include thin ice-shelf (i.e., such that hFacC(k=1) > 0 ) when
2037 using pkg/thsice, by preventing seaice to form where there is an ice-shelf.
2038 - prevent short-wave heating below an ice-shelf (previously still happening
2039 below thin ice-shelf); also fix Qnet there (but only for diagnostics).
ec0d7df165 Mart*2040 o pkg/seaice:
2041 - move initialisation of masks and metric coefficients and KGEO from
2042 seaice_init_varia.F to seaice_init_fixed.F
2043 - remove all reference to global masks maskC/maskW/maskS:
2044 * introduce new masks SIMaskU/V
2045 * initialise HEFFM/SIMaskU/V as copies of surface maskC/W/S
2046 * replace maskC/W/S with HEFFM/SIMaskU/SIMaskV; in some places this requires
2047 including SEAICE.h and as a consequence renaming a few local variables to
2048 avoid name overlap
2049 - remove TAF storage directives for "heffm" (no longer needed) and simplify
2050 seaice calls and TAF storage dir in do_oceanic_phys.F
73c0056d2e Oliv*2051 o pkg/monitor:
2052 - fix local array declaration in mon_stats_latbnd_rl.F
49fc9b4095 Oliv*2053 o tools/example_scripts:
2054 - remove all files in tools/example_scripts/
2055 (updated testing scripts are all in MITgcm_contrib/test_scripts)
2056 o verification:
2057 - remove un-tested experiments: cpl_atm2d+ocn, tidal_basin_2d and
2058 tutorial_offline
2059
9636f5994f Jean*2060 checkpoint67f (2018/11/23)
83ddf5a6c6 Mart*2061 o pkg/seaice:
2062 - add advection ppm and pqm advection schemes ;
2063 - test new scheme in verification/offline_exf_seaice.dyn_lsr
2064 o pkg/generic_advection:
2065 - regularize ppm and pqm advection schemes:
2066 - replace unsafe division in the case of numerical underflows by
2067 regularized expression sign(max(abs(uCFL),1.d-20),uCFL) and similar,
2068 in anology to other advection routines, e.g. gad_os7mp_adv_x/y/z.F
2069 - affects verification/advect_xz at truncation level -> updated
2070 o eesupp & model:
2071 - add entry points for 2-way nesting pkgs.
95edbf0004 chri*2072 o pkg/dic:
2073 - fix out-of-bounds error in S/R CAR_FLUX_OMEGA_TOP (#define CAR_DISS)
68432e7ba3 dngo*2074 o pkg/streamice:
2075 - new implementation of grounding line smoothing by smoothing of basal
2076 traction in partly grounded cell, in streamice_upd_ffrac_uncoupled.F
2077 - rename CPP directives: previous smoothing functionality now enabled with
2078 STREAMICE_SMOOTH_FLOATATION2, new functionality enabled via
2079 STREAMICE_SMOOTH_FLOATATION
2080 - affects verification/halfpipe_streamice, FWD, TAF and OpenAD adjoint.
fcc5c8b844 jm-c 2081 o pkg/atm_phys:
2082 - change IR absorption formulation regarding the dependence on Water-Vapor
2083 in the case wv_exponent = -1 ; update results of experiment "atm_gray.ape"
2084 from verification_other repos.
e0fa1cecbf Mart*2085 o pkg/seaice: clean up advection and SEAICE_ITD
2086 - make SEAICEmultiDimAdvection a global variable that is set in
2087 seaice_readparams.F
2088 - do not allow SEAICE_ITD with old 2nd order advection scheme anymore
2089 - re-organize SEAICE_ITD code in seaice_advdiff.F
2090 - make it possible to compile pkg/seaice without pkg/generic_advdiff
52dd931a85 Timo*2091 o pkg/autodiff:
2092 - created addummy_for_etan.F to correctly print adjoint variable for etaN
2093
901d0c4f7d Jean*2094 checkpoint67e (2018/10/16)
2095 o pkg/seaice:
2096 - fix possible division by zero if LSR_mixIniGuess > 0
85b328ee93 dngo*2097 o pkg/streamice:
2098 - fix bugs relating to ice front advance:
901d0c4f7d Jean*2099 streamice_advect_thickness.F -- overlap update of array passed to
85b328ee93 dngo*2100 streamice_adv_front which was leading to spurious ice area values
2101 streamice_init_varia.F -- proper initialisation of area_shelf_streamice
2102 which is used for ice front advance (only affects diagnostics)
1c882252b0 Ed D*2103 o verification/*/data
2104 - set "rhoConst" instead of "rhoNil" (unless using Linear EOS)
2105 - for net surface heat flux, set "surfQnetFile" instead of "surfQfile"
2106 (unless net surface shortwave is also specified).
2107 - fix OpenAD/input_oad.kpp set-up where net surface heat flux was used
2108 as net heat-flux minus short-wave and update the output.
2109
2df144911f Jean*2110 checkpoint67d (2018/09/04)
dcaaa42497 Jeff*2111 o doc:
2df144911f Jean*2112 - update few pieces of documentation including addition (in "getting_started"
dcaaa42497 Jeff*2113 section) of main CPP OPTIONS description and main code full list of
2114 run-time parameters.
a60aeb96a0 Oliv*2115 o pkg/generic_advdiff:
2116 - move masking of (explicit) vertical diffusive flux to S/R that compute each
2117 contribution (pass maskUp as a new argument): This ensures that diagnostics
2118 of explicit vertical diffusive flux are properly masked.
faf4966244 jm-c 2119 o tools/do_tst_2+2
2120 - Fix up to use absolute paths for results directories.
b8665dacca Mart*2121 o pkg/seaice: some new and hopefully more sensible defaults:
2122 - SEAICEscaleSurfStress = .TRUE.
2123 - SEAICEaddSnowMass = .TRUE.
2124 - SEAICEadvScheme = 77
2125 - SEAICE_useMultDimSnow = .TRUE.
2126 - SEAICE_Olx/y = Olx/y - 2
2127 - SEAICEetaZmethod = 3
2128 - SEAICE_drag = 0.001
2129 - CPP-flag SEAICE_ZETA_SMOOTHREG defined by default
2130 - change SEAICE_waterDrag default to 5.5e-3 and add reference density
2131 rhoConst to scale it. Add a warning if SEAICE_waterDrag > 1.
2132 This change also involves a slight re-organization (= simplification)
2133 in seaice_oceandrag_coeffs.F
2134 - all verification experiments are affected, so that all but four
2135 data.seaice are adjusted to restore the old defaults. The four experiments
2136 that use the new defaults are
2137 + global_ocean.cs32x15.seaice
2138 + offline_exf_seaice
2139 + offline_exf_seaice.dyn_jfnk
2140 + offline_exf_seaice.dyn_lsr
2141 - updated documentation
b4d50d3323 Oliv*2142 o pkg/dic:
a60aeb96a0 Oliv*2143 - Promote constants in S/R CARBON_COEFFS_PRESSURE_DEP and
2144 S/R CAR_FLUX_OMEGA_TOP to double precision.
1cf5741c70 Jean*2145 o pkg/seaice:
2146 - fix bug in seaice B-grid code (call to seaice_advdiff, see issue #134);
2147 Note: B-grid code not tested in any verification exp. (only compiled in one)
2148 so no need to update any output.txt
a5ec81ed49 Timo*2149 o pkg/diagnostics:
2150 - Print adjoint variables for theta, salt, uvel, vvel, wvel, and etan
2151 through diagnostics package.
4f8baf0351 Kait*2152 o pkg/shelfice:
2153 - fix ice shelf mask for very-thin ice shelf case, when hFacMin
2154 and hFacMinDr criteria leave no room for ice (hFac(k=1)=1).
2155 Note: thin ice-shelf that results in 0< hFac(k=1) <1 still need
2156 to be fixed when using any seaice pkg.
736e27304c Timo*2157 o pkg/ecco:
2158 - Replace "mskTrVol" and "gencost_errfile" with "gencost_mask" in
2159 "cost_gencost_transp", mirroring "m_horflux_vol".
2160 - Document and warn user (via STDERR) of potential issues with using
2161 "cost_gencost_transp" to compute volume, heat, or salt transport.
2162
00ab3a8557 Jean*2163 checkpoint67c (2018/06/26)
63eaf06b6a Jean*2164 o pkg/generic_advdiff:
2165 - Add per tracer run-time param to switch on/off Smolarkiewicz-Hack:
2166 Run-time switch for Temp & Salt are set from main param file "data"
2167 (default value = FALSE); and for pTracers, they are set from parameter
2168 file "data.ptracers" (default value = TRUE).
2169 - Add a test in verification exp. global_ocean.90x40x15.down_slope for
2170 Smolarkiewicz-Hack (switched on for Salt and pTracer(1)) but results
2171 remains unchanged since, in this exp., Salt & pTr(1) are well above 0.
f149b16d6e Jean*2172 o pkg/mdsio:
2173 - apply same substitution to remaining calls to MDSREADFIELD/MDSWRITEFIELD
2174 in pkg/ctrl and in pkg/seaice.
2175 - disable the use of obsolete MDSREADFIELD and MDSWRITEFIELD S/R (unless
2176 USE_OBSOLETE_MDS_RW_FIELD is defined).
f8e779c983 antn*2177 o pkg/ecco:
2178 - replace calls to (obsolete) MDSREADFIELD and MDSWRITEFIELD with calls to
2179 pkg/rw S/R: READ_REC_3D_RL and WRITE_REC_3D_RL ; this enable to use pkg/ecco
2180 without pkg/autodiff.
a51428376c jm-c 2181 o verification exp:
2182 - update few (10) adm & tlm output after latest TAF update, from version 3.9.0
2183 to version 3.9.6 on May 16-18.
2184
9ba62b8274 Jean*2185 checkpoint67b (2018/05/05)
502f242cbd Mart*2186 o pkg/exf/exf_wind.F:
9ba62b8274 Jean*2187 - fix a bug detected by Stanislav Martyanov: replace wStress by SQRT(wStress)
2188 in computing ustar ; this bug does not appear to affect the verification
2189 experiments but has been around for a while (inherited from the ecco-branch)
210ee8461e jm-c 2190 o pkg/seaice:
2191 - new run-time parameter to skip the update of ocean surface stress ; could be
2192 useful for testing or when seaice-dynamics is off (add a warning otherwise).
2193
411fbe7664 Jean*2194 checkpoint67a (2018/03/10)
2195 o pkg/layers
2196 - add Moist Static Energy coordinate in layers package
455d18a2e4 Jean*2197 o pkg/aim_v23:
2198 - change parameter "aim_abs_pCO2" default value (used if aim_select_pCO2=1,3)
2199 to calibrated value (from David Ferreira).
3ba991b895 chri*2200 o pkg/layers
210ee8461e jm-c 2201 - fixed up units reported in diagnostics for THETA and SALT term induced layer
3ba991b895 chri*2202 thickness changes.
17bd6b9422 jm-c 2203 o pkg/seaice:
2204 - move wind-stress over seaice out of SEAICE.h into local seaice_dynsolver.F
2205 common block ; move initialisation of TAUX & TAUY accordingly and add them
2206 to argument list of S/R SEAICE_OCEAN_STRESS (like SEAICE_GET_DYNFORCING).
2207 This enable to remove CPP option "SEAICE_EXCLUDE_WIND_STRESS" (hack from
2208 June 2016) in pkg/dic/dic_fields_update.F
034fdcf01f Jean*2209 o doc:
2210 - first addition of reST/sphinx documentation (formerly in
2211 https://github.com/altMITgcm/MITgcm/doc/), converted from original MITgcm
2212 LaTeX manual in: https://github.com/MITgcm/manual-archive with edits
2213 (including new sections) from @jrscott and @edoddridge ;
2214 - update section on Ocean State Estimation packages by @gaelforget ;
2215 - updated seaice pkg description by @mjlosch.
2216
78abfc2fd0 Oliv*2217 checkpoint67 (2018/02/05)
2218 o add Sphinx configuration for documentation on https://mitgcm.readthedocs.io
2219 o add Travis configuration for testing pull requests
7c72f3fed9 Oliv*2220 o migrate from CVS to Git (2018/01/31)
2221
e1a9cfe6da Jean*2222 checkpoint66o (2018/01/30)
2223 => Final CVS tag ; disable CVS check-in.
2224
9f8d0cd292 Jean*2225 checkpoint66n (2018/01/18)
4dedbda92a Jean*2226 o pkg/seaice & down_slope:
2227 - remove few files from ${pkg}_ad_diff.list (when calling S/R is not in
2228 any *_ad_diff.list)
2229 o pkg/shelfice:
2230 - account for "shelficeLoadAnomaly" in computation of initial pressure
2231 that is used in EOS (case selectP_inEOS_Zc >= 2).
457ca81085 Jean*2232 o pkg/aim_v23:
2233 - merge namelist "AIM_PAR_CO2" into "AIM_PARAMS" and replace Aim_CO2_Flag=2
2234 option with aim_select_pCO2=2 (using #define ALLOW_AIM_CO2);
2235 - add option to derive LW absorption in CO2 band as function of pCO2,
2236 using either prescribed pCO2 (aim_select_pCO2=1), or computed pCO2
2237 from well-mixed atm-box (aim_select_pCO2=3).
a88d8cd2fb Jean*2238 o pkg/gchem, changes to enable to use several geo-chemistry pkgs together:
2239 - new CPP option GCHEM_ADD2TR_TENDENCY around definition of gchemTendency
2240 array (replacing #ifndef GCHEM_SEPARATE_FORCING) ;
2241 - in GCHEM_FIELDS.h, change dimension of array "gchemTendency"
2242 from PTRACERS_num to GCHEM_tendTr_num ; this later one is set in new header
2243 file: GCHEM_SIZE.h, to be included anytime GCHEM_FIELDS.h is included ;
2244 - new set of S/R, called from GCHEM_TR_REGISTER, to record rank (in pTracer
2245 array) and number of tracers for each geo-chemistry pkg ;
2246 - check that GCHEM tracers all fit in pTracer and gchemTendency arrays ;
2247 - initialise gchemTendency array in gchem_init_vari.F ;
2248 - fix storage directives for gchemTendency ;
2249 - add some entry points for new geo-chemistry pkg SPOIL.
b82264afff Jean*2250 o verification/isomip:
2251 - update secondary test (input.htd): a) drop cd_scheme, useJamartWetPoints=T
2252 and increase viscAh ; b) use ivdc_kappa with implicit Diff & Visc ;
2253 c) switch off SHELFICEboundaryLayer, turn on pCellMix_select (=20) and
2254 use SHELFICEselectDragQuadr=1 ; add new set of pickup files.
0ce06cdb80 Jean*2255 o pkg/shelfice:
2256 - Replace CPP option: SHI_USTAR_WETPOINT with run-time parameter:
2257 SHELFICE_oldCalcUStar (default=F <--> #define SHI_USTAR_WETPOINT)
2258 but keep only original (old) formula in SHELFICEboundaryLayer code.
2259
e699be221d Jean*2260 checkpoint66m (2017/12/12)
40b8e0222d Mart*2261 o add another hook (S/R PDF_FINALIZE) for the Parallel Data Assimilation
2262 Framework PDAF (http://pdaf.awi.de/) in the_main_loop.F
d5d280a154 Jean*2263 o pkg/autodiff:
2264 - fix pkg/exf AD variable output (mainly ADJprecip), left from pkg/exf modif
2265 on Jan 27, 2017. Try also to fix ADJrunoff and TLM output (but less clear).
2266 o pkg/obcs:
2267 - add simpler setting (single value) of OB indices for the case where
2268 indices are uniform over the full section (Bruno Deremble contribution).
5421b78870 Jean*2269 o pkg/rbcs:
2270 - increase size of "relaxMaskFile" to read-in from namelist and save it
2271 (+check) into new (renamed) "relaxMaskTrFile" array.
fe8f61a7d2 Jean*2272 o model/src:
2273 - option (interViscAr_pCell, interDiffKr_pCell) to account for true vertical
2274 distance (including hFac) in vertical viscous flux and diffusive flux ;
2275 - add option to increase vertical mixing (for both momentum and tracers)
2276 near surface and/or bottom where partial cell is too thin ;
2277 - for now, both additions above are within: #ifndef EXCLUDE_PCELL_MIX_CODE ;
2278
1a6d19a1b5 Jean*2279 checkpoint66l (2017/10/24)
408a6af91c Jean*2280 o pkg/kpp, ggl90 & ebm:
2281 - read namelist without IOSTAT=errIO to force to stop if there is an error
2282 in the parameter file namelist.
11fedddd87 Jean*2283 o pkg/cheapaml: major changes to relaxation coefficient setting:
2284 - rename parameters cheapaml_taurelax & cheapaml_taurelaxocean (in days)
2285 to cheap_tauRelax & cheap_tauRelaxOce (now in seconds);
2286 - if using cheapMaskFile, set relaxation coeff to: cheapMask/tauRelax
2287 (instead of 1/cheapMask over ocean and 1/tauRelax over land);
2288 - with cheapMaskFile unset: set relaxation coeff according to land/ocean mask
408a6af91c Jean*2289 (unchanged) but skip increase near domain edges for periodic domain (in X
11fedddd87 Jean*2290 or Y dir) when cheapamlX/Yperiodic=T ; also fix linear increase (over
2291 Cheapaml_mask_width grid points) of coeff towards domain edges (previously
2292 was increasing away from edges). Update output of experiment "cheapAML_box".
2293 o pkg/cheapaml:
2294 - move setting of (fixed in time) relaxation coefficient
2295 from cheapaml_init_varia.F to cheapaml_init_fixed.F
dc84b236da Jean*2296 o pkg/exf:
2297 - add specific forcing field for tides to feed model new geopotential anomaly
2298 forcing, for now within #ifdef EXF_ALLOW_TIDES.
2299 - remove from common block unused params: exf_inscal_sst & exf_inscal_sss.
1faed850cb Jean*2300 o model:
2301 - add new 2-d forcing field for time-dependent geopotential anomaly (e.g.,
2302 tidal forcing), in m^2/s^2 ; add run-time param to allow to turn it off.
2303 o eesupp/src:
7727ad69a9 Dimi*2304 - shift standardMessageUnit in eeboot.F and I/O units in mdsfindunit.F
2305 for coupling to GEOS AGCM: HACK_FOR_GMAO_CPL option in CPP_EEOPTIONS.h
2306
3cac0e158e Jean*2307 checkpoint66k (2017/09/20)
2308 o model/src:
0442cf0340 Gael*2309 - add missing CPP brackets (ALLOW_COST, ALLOW_CTRL in load_fields_driver.F
2310 and the_model_main.F)
2311 o ctrl:
2312 - use zeroRL in place of fc when ALLOW_COST is not compiled (in ctrl_pack.F)
3cac0e158e Jean*2313 - call MDS_READ_FIELD / MDS_WRITE_FIELD instead of deprecated
0442cf0340 Gael*2314 mdsreadfield / mdswritefield (in ctrl_get_gen.F, ctrl_map_ini_gen.F,
2315 ctrl_map_ini_genarr.F, and ctrl_map_ini_gentim2d.F )
dd5f25c34f Jean*2316 o eesupp:
2317 - add CPP option to activate some pieces of code for coupling to GEOS AGCM;
2318 - shift commonly used IO unit (in eeboot.F) for coupling to GEOS AGCM.
59cd39d469 Matt*2319 o pkg/bling:
dd5f25c34f Jean*2320 - bling_production: Fix typo in calcium carbonate uptake. Also rearranging
2321 and cleaning
8880ed1f7d Jean*2322 o model/src:
2323 - move k loop inside correction_step.F (+ update calling S/R)
2324 - collect implicit pressure gradient tendencies in local 2-D array;
2325 affect results (at machine truncation level) when using 3-D solver; update
2326 output of exp.: exp4 (x1), global_ocean.cs32x15 (x2),hs94.cs-32x32x5.impIGW,
2327 rotating_tank, short_surf_wave,tutorial_deep_convection (x2)
2328 & tutorial_plume_on_slope.
2329
32f5cbc73c Jean*2330 checkpoint66j (2017/08/15)
ba2a21739f Jean*2331 o pkg/ptracers:
2332 - fix surface forcing under ice-shelf (useShelfIce=T).
2333 o pkg/atm_phys:
2334 - use hFac weighted average when applying A-grid atm-phys momentum tendency
2335 to C-grid dynamics; this ensures wind-stress match mom tendency.
03aacdc90f Mart*2336 o eesupp/src:
157398927a Mart*2337 - change default for opening scratch files to avoid STATUS='SCRATCH'
4a3a90a659 Jean*2338 - close scratch files with STATUS='DELETE'
03aacdc90f Mart*2339 - changes affect eeset_parms.F and open_copy_data_file.F and many routines
2340 that read namelists (because they close the scratch files)
4a3a90a659 Jean*2341 - you can revert to old default by setting USE_FORTRAN_SCRATCH_FILES
2342 in CPP_EEOPTIONS.h (tested in ideal_2D_oce/code & lab_sea/code_ad)
d39315aba7 Jean*2343 o pkg/atm_phys:
2344 - fix unset arguments in (unused) S/R surface_flux_0d.
5261466e31 Jean*2345 o eesupp/src:
2346 - add argument "procId" to S/R EESET_PARMS to fix scratchFile1 & 2 setting
2347 (case TARGET_BGL or TARGET_CRAYXT) for early call (from eeboot_minimal.F):
2348 called with myProcId in eeboot.F and with mpiMyWId in eeboot_minimal.F
234f0840d6 Mart*2349 o pkg/streamice:
2350 - remove blank between _EXCH_XY_RL and "()", which my Apple Xcode
2351 preprocessor /usr/bin/cpp cannot interpret; 3 instances in total in
2352 streamice_driving_stress_fd.F and streamice_advect_2dtracer.F
7d973b58e2 Jean*2353 o pkg/diagnostics:
2354 - new option to allow to cumulate thickness-factor (hFac) weighted field
2355 (if field permitted); implemented by changing sign of "jdiag" pointer
2356 (> 0: cumlulate field, < 0: cumulate hFac weighted field).
2357 a) restricted to 3-d (Nr levels), level centered diagnostics at U,V or Cell
2358 center position (gcode(2)='U','V','M' & gcode(3,5,9:10)='R',' ','MR')
2359 b) for now, activated by setting fileFlags 3rd character to 'h'.
2360
d0fc06a0a4 Jean*2361 checkpoint66i (2017/07/18)
2362 o pkg/cheapaml:
2363 - add parameter "useRelativeWind", default set to False; this change the
2364 previous setting which was always using relative wind.
036ec33ebd Mart*2365 o add hooks for the Parallel Data Assimilation Framework PDAF
d0fc06a0a4 Jean*2366 (http://pdaf.awi.de/) in eeboot_minimal.F and the_main_loop.F;
2367 to use set CPP-flag USE_PDAF in CPP_EEOPTIONS.h
fc55955988 Jean*2368 o pkg/exf:
2369 - interpolation of vector fields (exf_interp_uv.F): fix bug in calculation
a435e833b1 Mart*2370 of South-Pole mean value.
d0fc06a0a4 Jean*2371 - interpolation near the poles, case where second additional row is at the
04a6d3d2ba Jean*2372 pole (or beyond the pole and moved to the pole): change first addition row
d0fc06a0a4 Jean*2373 value to a linear interpolation between pole and 1rst (S.pole)/last (N.pole)
04a6d3d2ba Jean*2374 row (instead of just a copy of it).
fc55955988 Jean*2375 o pkg/seaice:
f720d02ca0 Mart*2376 - prevent JFNK and KRYLOV solvers from trying to reduce a residual of 0
fc55955988 Jean*2377 - add the option to compute no-slip du/dy, dv/dx (i.e.
2378 the offdiagonal strain rate e12) by a second order approximation
2379 on the boundary; works only with JFNK, KRYLOV, or EVP solvers, because
2380 it is too messy to implement for the implicit LSR matrix.
f720d02ca0 Mart*2381 SEAICE_2ndOrderBC = .FALSE. by default
50ab531fad Mart*2382
6a3f62c6cb Jean*2383 checkpoint66h (2017/06/02)
2384 o pkg/seaice:
2385 - add new routines to compute stress tensor components and stress tensor
e228c48bba Mart*2386 divergence to be reused in s/r seaice_lsr and s/r seaice_calc_lhs
2387 - change names of diagnostics SIsigI/II (commonly used for invariants)
2388 to SIsig1/sig2 (more common for principal components) to avoid confusion
5d66a6a2ec Jean*2389 o pkf/exf:
2390 - add a stop if useRelativeWind with un-updated uwind/vwind (e.g., constant);
2391 similarly, stop if rotateStressOnAgrid with constant wind-stress.
caa3182bae Jean*2392 o pkg/seaice:
2393 - remove (comment out) diagnostics SIuwind,SIvwind,SIfu,SIfv (duplicate of
2394 EXFuwind,EXFvwind,oceTAUX,oceTAUY) and point them to their equivalent.
2395 - add diagnostics of wind-stress over seaice (SItaux,SItauy) and seaice
2396 fraction weighted wind stress over ocean+seaice (SIatmTx,SIatmTy).
2397 o pkg/diagnostics:
2398 - small piece of code to rename (old) diagnostics, when namelist is processed.
e9ff366891 Jean*2399 o model/src:
2400 - new run-time param (useMin4hFacEdges) to select method for setting hFacW,S:
2401 originally, set as minimum of adjacent hFacC factor ; now (new default)
2402 computed from rSurfW,S and rLowW,S by applying same rules as for hFacC.
2403 Only matters when useShelfIce=T with particular ice-shelf cavity geometry.
caa3182bae Jean*2404 o pkg/seaice:
e9ff366891 Jean*2405 - add momemtum advection, off by default, still in test phase
2406 most of the momentum advection code is adapted and reused from mom_vecinv
caa3182bae Jean*2407 o pkg/mom_vecinv:
2408 - pass these runtime flags:
e9ff366891 Jean*2409 selectVortScheme, highOrderVorticity, upwindVorticity, useJamartMomAdv
caa3182bae Jean*2410 as formal parameters to s/r mom_vi_u/v_coriolis, mom_vi_u/v_coriolis_c4,
e9ff366891 Jean*2411 so that these routines can also be used in pkg/seaice.
fc0cb18620 Mart*2412
4207dc8bfb Jean*2413 checkpoint66g (2017/04/24)
d9c26da9d2 Jean*2414 o model/src:
2415 - more robust ordering of column thickness integral (=Sum_k(drF*hFac) )
2416 to get same expression (regarding machine truncation) in different places
2417 in ini_masks_etc.F (e.g., rSurfC,W,S is now exactly zero when it should).
2418 Update forward output of experiments: global_ocean.cs32x15 (all 5 except
2419 viscA4), isomip (x3), tutorial_global_oce_in_p & tutorial_plume_on_slope.
e3622e8a9f Jean*2420 o pkg/shelfice:
2421 - ALLOW_SHIFWFLX_CONTROL: move setting of maskSHI from shelfice_update_masks.F
2422 to shelfice_init_fixed.F
2423 - change S/R SHELFICE_UPDATE_MASKS to SHELFICE_INIT_DEPTHS (still called from
2424 ini_masks_etc.F for now) to update ocean upper boundary position according
2425 to ice-shelf topography (instead of directly updating hFacC).
559a8104ea Jean*2426 o model/src:
2427 - move call to CTRL_INIT & CTRL_ADMTLM from the middle to the bottom of
2428 packages_init_fixed.F to allow other pkgs to set mask and weight fields.
2429
902eadea41 Jean*2430 checkpoint66f (2017/04/06)
4fcf953981 Jean*2431 o model/src:
2432 - add specific run-time param to select level of printed plot-field-maps,
2433 set by default to debugLevel. Remove internal param "printDomain".
2434 o pkg/seaice:
c854efd521 Mart*2435 - add flag to add snow mass to seaiceMassC/U/V, the default is
2436 SEAICEaddSnowMass=.FALSE., not to change previous results
7d18c8ad21 Matt*2437 o pkg/bling
2438 - Bug fix in bling_production regarding unit conversion for diagnostics
2439 being put in the wrong place
bc982d58e8 Jean*2440 o model/src:
2441 - add back recomputation of rSurfW & S to ensure consistent column thickness
2442 (needed for rStar) between Sum_k(hFac*drF) and rSurf-rLow, for now only
2443 when using pkg/shelfice; was initially added on 2012/06/01 (ini_masks_etc.F
2444 revision 1.51) but was removed accidentally on 2014/02/08 (v1.53).
fe1663a66d Jean*2445 o pkg/autodiff:
2446 - clean-up "checkpoint.flow"
2447 o pkg/rw (Contribution from Jody Klymak):
2448 option to set mds file suffix as function of time in simulation:
2449 *) new input parameter "rwSuffixType" (read from PARM03 namelist)
2450 to select file suffix format; by default (=0), use iteration number;
2451 *) add simple routine to return file suffix according to rwSuffixType;
2452 *) in model/src and in most pkgs (except: atm2d, fizhi, regrid & streamice),
2453 use new S/R to get file suffix, except for debug output file (diagFreq)
2454 and pkgs offline & rbcs input files.
2455 o pkg/rw:
2456 - uniform processing of "I10" suffix across writing fld routines; used to
2457 simplify debug writing of cg2/3d_b/x in solve_for_pressure.F & post_cg3d.F
2458 (similar to cg3d.F, cg3d_ex0.F)
a94e0175c9 Jean*2459 o pkg/mom_vecinv:
2460 - highOrderVorticity in selectVortScheme=2 case: fix c4 coeff in splitted
2461 vorticity flux (keep same sum in case vBarXm=vBaXp, uBarYm=uBarYp).
1906a8e7f8 Matt*2462 o pkg/bling:
a94e0175c9 Jean*2463 - Many small changes intended to clean the code.
2464 Unnecessary ADJOINT_SAFEs removed ;
2465 removed BLING_COST.h BLING_CTRL.h bling_cost.F ;
2466 diagnostics added.
1906a8e7f8 Matt*2467
a035b63002 Jean*2468 checkpoint66e (2017/03/14)
78a0667e15 Jean*2469 o pkg/exf:
2470 - interpolation with #undef EXF_INTERP_USE_DYNALLOC: move buffer size
2471 definition outside EXF_PARAM.h in new header file: EXF_INTERP_SIZE.h;
2472 use fixed size buffer (passed to S/R EXF_INTERP & EXF_INTERP_UV) to
728f4c76b4 Jean*2473 avoid any dynamic allocation ;
2474 - S/R EXF_CHECK: add new check & stop when file-name is defined but not
2475 read-in ; add warning when file is read-in but not used within pkg/exf ;
2476 + check for buffer-size (if #undef EXF_INTERP_USE_DYNALLOC).
2477 - update exf_summary.F (print {FLD}RepCycle).
78a0667e15 Jean*2478 o verification/global_with_exf:
2479 - switch on exf interpolation in AD test (just like the forward test)
52e8352d39 Gael*2480 o pkg/mom_vecinv:
2481 - add storage directives to avoid recomputations within mom_vecinv.F
78a0667e15 Jean*2482 which were generating seg. fault with gfortran -devel
52e8352d39 Gael*2483 o pkg/ctrl, pkg/smooth:
78a0667e15 Jean*2484 - initialize array halos which were generating seg. fault with
52e8352d39 Gael*2485 gfortran -devel in adjoint mode
df8491dd93 Jean*2486 o pkg/exf:
ab74fbfba7 Jean*2487 - for each input field, enable to specify a field specific repeat-cycle
2488 ({FLD}RepCycle) which defaults to pkg/exf main "repeatPeriod".
2489 o verification/lab_sea:
2490 - update AD results of primary test and noseaicedyn test after switching
2491 to new version of TAF (5.3.13 vs 5.3.2 before); agreement with gradient
2492 check stays about the same.
2493 o pkg/exf:
df8491dd93 Jean*2494 - fix bug in exf_zenithangle.F for cases select_ZenAlbedo > 0 with useCAL=T.
d1272ed847 Dimi*2495 - exf_check: MAX_LAT_INC need only be "loc_nlat-1", not equal to loc_nlat
1a68cdf63d Jean*2496 o pkg/bling, USE_EXFCO2 code:
2497 - add parameter "apco2RepCycle" (set to pkg/exf "repeatPeriod" by default);
2498 - update calls to EXF S/R (use new version: EXF_INIT_FLD & EXF_SET_FLD).
38dcf987c9 Jean*2499 o pkg/exf:
2500 - rename S/R EXF_INIT to EXF_INIT_VARIA ;
2501 - add arguments: fldName (for debug msg) and fldRepeatCycle (set to
2502 repeatPeriod) to S/R EXF_SET_UV and to S/R EXF_SET_GEN (renamed EXF_SET_FLD)
2503 and update calls in pkg/exf calling S/R (exf_getffields.F & exf_getclim.F) ;
2504 - add argument: fldName (for debug msg) to S/R EXF_INIT_GEN (renamed
2505 EXF_INIT_FLD) and update calls in exf_init_varia.F
2506 - For now, for backward compatibility, keep a simplified version of S/Rs
2507 EXF_SET_GEN & EXF_INIT_GEN in file exf_set_gen.F
2508 - add and pass new arguments: fldName (for debug msg) and fldRepeatCycle
2509 to S/R EXF_GetFFieldRec ; update calls in pkg/obcs/obcs_exf_load.F
2510 o tools/genmake2:
2511 - replace "bc -l" (only used once) by "expr" (already used).
0e208b4985 Jean*2512 o verification/global_ocean.cs32x15:
2513 - turn off pkg/cal (useCAL=F) in secondary FWD exp. "icedyn".
2514 Note: exf setting (data.exf) can be compared to other exf secondary exp
2515 "seaice" (kept with useCAL=T) which has same time dependent forcing.
2516
68b2841201 Jean*2517 checkpoint66d (2017/02/13)
2518 o pkg/exf:
2519 - remove setting of useCAL=T when using pkg/exf (useEXF=T); add warning
2520 early on (in packages_boot.F) to stress this change in pkg setting.
2521 - In (most) verification exp. that use pkg/exf, add useCAL=.TRUE. to data.pkg
e88a30daa9 Jean*2522 o model/src:
39fa77e8d0 Gael*2523 - move call to ecco_phys to end of time step; this may induce minor
2524 cost function changes by shifting time averages by one time step
2525 for some variables; this revision resulted in changed adjoint results
2526 in MITgcm_contrib/verification_other/global_oce_cs32
e88a30daa9 Jean*2527 o pkg/exf:
2528 - Change EXF_READ_EVAP to only activate code within #ifdef ALLOW_ATM_TEMP ;
2529 this prevents to read evap when ALLOW_ATM_TEMP is undef and other fields,
2530 e.g. precip, are not available.
2531 o pkg/flt:
2532 - flt_init_varia.F: use pickupSuff if specified
2533 - add code (within #ifdef DEVEL_FLT_EXCH2) and test case as a first,
2534 intermediate, step towards completing pkg/exch2 support within pkg/flt;
2535 ifdef DEVEL_FLT_EXCH2 then:
2536 - flt_init_fixed.F: comment out stop
2537 - flt_exch2.F: conserve ipart, jpart (grid coordinates)
2538 - exch2_recv_get_vec.F: transform ipart, jpart (grid coordinates)
2539 - flt_mapping.F: attempt to fix longitude diagnostic near date-line
2540 - flt_init_varia.F: hack initialization (for testing purposes w. LLC90)
ea11a19a76 Jean*2541 o tools/genmake2 & pkg/pkg_depend:
2542 - define new type of pkg dependency rule ("=pkg_x"), less strict than
2543 the "+" rule, that add the dependent pkg (pkg_x) unless it's disabled
2544 (-pkg_x in packages.conf).
2545 - change pkg/exf dependency rule from "exf +cal" to "exf =cal";
2546 - add "+cal" to dependency list of pkg/ecco (needed to compile).
2547 - simplify FWD experiment "offline_exf_seaice" by removing pkg/cal.
127047c0ca Dimi*2548 o utils/matlab:
2549 - adding ocean_basin routines for defining basin masks.
6a96fcda5d Jean*2550 o pkg/exf:
450d2d2f88 Jean*2551 - new S/R EXF_GETFFIELD_START replacing EXF_GETFIELD_START, but with more
2552 arguments, allowing to check (and stop) if parameter setting of
2553 {FLD}startdate1 & date2 and of {FLD}StartTime are consistent with
2554 useCAL= T or F. For now, kept a simplified version of EXF_GETFIELD_START
2555 for backward compatibility.
2556 - change accordingly calls in exf_init_fixed.F + default {FLD}StartTime in
2557 exf_readparms.F ; apply same changes to pkg/icefront (for SGRunOff field).
2558 o pkg/bling (USE_EXFCO2 code):
2559 - fix missing setting of apco2StartTime according to apco2startdate1 & date2
2560 by adding a call to S/R EXF_GETFFIELD_START.
2561 o pkg/exf:
40e5c4acf5 Jean*2562 - allows to compile without pkg/cal (but disabled by current dependency
2563 rules, i.e., default "pkg/pkg_depend"). Minimal changes to enable to
2564 run with useCAL=F ; this involves setting directly {FLD}StartTime instead
2565 of {FLD}startdate1 & date2 ; consistency check not yet coded.
2566 o verification/global_ocean.cs32x15:
2567 - fix all data.exf for a shift of 1 day in all field startdate1 so that it now
2568 corresponds to middle of 1rst month; update outputs (2 fwd + 3 adm + 3 tlm).
2569 o pkg/exf:
2570 - allow to use EXF_ZENITHANGLE without pkg/cal + simplify (saving some
2571 calculations); change FWD experiment global_ocean.cs32x15
2572 (#define ALLOW_ZENITHANGLE) to test/check that this code compiles.
2573 o pkg/exf:
2574 - In preparation for addition to NAMELIST, rename internal (_RL) parameter
053dccd244 Jean*2575 {FIELD}startdate to {FIELD}StartTime
2576 Note: new name also fit better the content, i.e, a start time in second.
40e5c4acf5 Jean*2577 o eesupp/src:
2578 - add 1 argument to S/R EEBOOT & EEBOOT_MINIMAL for interface with ESMF
053dccd244 Jean*2579 o pkg/exf:
6a96fcda5d Jean*2580 - add option ALLOW_READ_TURBFLUXES (and corresponding set of parameters)
2581 to allow to read-in Sensible & Latent Heat flux ;
2582 - simplify pkg/exf main options:
2583 1) move small piece of code (case ALLOW_ATM_TEMP undef) out of
2584 exf_bulkformulae.F into exf_wind.F so that exf_bulkformulae.F is
2585 compiled only when both ALLOW_ATM_TEMP & ALLOW_BULKFORMULAE are defined;
2586 2) make call to EXF_RADIATION and to EXF_WIND independent of CPP option
2587 ALLOW_BULKFORMULAE which now only applies to S/R EXF_BULKFORMULAE ;
2588 3) improve options documentation in EXF_OPTIONS.h.
c63b11972e Gael*2589 o pkg/ecco:
6a96fcda5d Jean*2590 - cost_gencost_customize.F,ecco.h,ecco_phys.F,ecco_readparms.F, and
2591 ecco_summary.F: add passive tracer cost functions to gencost;
c63b11972e Gael*2592 m_ptracer and m_boxmean_ptracer
2593 o pkg/ctrl:
6a96fcda5d Jean*2594 - ctrl_map_forcing.F: pass myIter and myTime to ctrl_map_forcing as input
c63b11972e Gael*2595 parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing; add to list
2596 of implemented gentim2d contol parameters: xx_qnet, xx_empmr, xx_qsw,
2597 xx_sst, xx_sss, xx_pload, xx_saltflux, xx_fu, xx_fv, xx_fe, xx_fn
2598 o model/src:
6a96fcda5d Jean*2599 - forward_step.F: pass myIter and myTime to ctrl_map_forcing as input
c63b11972e Gael*2600 parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing
2601 o pkg/exf:
6a96fcda5d Jean*2602 - exf_getffields.F: add to list of implemented gentim2d contol parameters:
c63b11972e Gael*2603 xx_lwflux, xx_swflux, xx_evap, xx_apressure, xx_areamask
2604
6b39d139af Jean*2605 checkpoint66c (2017/01/19)
8611775bfe Jean*2606 o verification:
2607 - add new option "-src" to testreport to only produce source code (*.f),
2608 including taf output src code (if using '-adm'/'-tlm' option).
66f021d63a Gael*2609 o pkg/exf:
2610 - add saltflx :: Net upward salt flux in psu.kg/m^2/s
2611 o pkg/diagnostics:
bd9df6a12d Jean*2612 - add run-time variable diagMdsDir to specify a subdirectory for
66f021d63a Gael*2613 diagnostic output when mds is being used and mdsioLocalDir is not.
c34b076d9e Gael*2614 o pkg/mnc:
9922871071 Gael*2615 - mnc_utils.F: edit stop message
c34b076d9e Gael*2616 o pkg/autodiff:
66f021d63a Gael*2617 - autodiff_ini_model_io.F: PRINT_MESSAGE, clean-up comments, add _*_MASTER,
2618 add HAVE_SYSTEM bracket around system call to mkdir
c34b076d9e Gael*2619 o pkg/profiles:
bd9df6a12d Jean*2620 - profiles_findunit.F, profiles_init_fixed.F, profiles_interp.F,
c34b076d9e Gael*2621 profiles_readparms.F: call ALL_PROC_DIE before 'stop'
66f021d63a Gael*2622 - profiles_ini_io.F: use PRINT_MESSAGE, clean-up comments, add _*_MASTER,
2623 add HAVE_SYSTEM bracket around system call to mkdir
c34b076d9e Gael*2624 o pkg/smooth:
2625 - smooth_filtervar2d.F, smooth_filtervar3d.F: call ALL_PROC_DIE before 'stop'
2626 - smooth_init2d.F, smooth_init3d.F: move print statements to readparms
2627 - smooth_readparms.F: add cleaner print statements from smooth_init?d.F
7b97f426d4 Jean*2628 o pkg/exf:
2629 - check: count errors and stop cleanly at the end (call to ALL_PROC_DIE);
bd9df6a12d Jean*2630 issue error message when climsst_interpMethod.GT.0 and climsst_lon_inc > 500
2631 generalize tests on interpMethod, nlat, and lon_inc to all exf variables.
7b97f426d4 Jean*2632 - summary: skip detailed field report if not used (empty file-name).
93424431c1 Jean*2633 o tools/xmakedepend:
2634 - In case line editor "ed" is missing, switch to "sed" command to clean-up
2635 Makefile from previous dependencies (anything after "# DO NOT DELETE" line).
5d59af6b6c Jean*2636 o pkg/exf:
2637 - change definition of "hflux" input file to always include Short-Wave;
93424431c1 Jean*2638 this is now consistent with hflux computation (if using bulk-formulae)
5d59af6b6c Jean*2639 and hflux diagnostic & documentation (in EXF_FIELDS.h).
2640
cd57923099 Jean*2641 checkpoint66b (2016/12/01)
3706e6143e Jean*2642 o model & momentum pkgs:
2643 - implement fully implicit bottom friction combined with implicit surf.
2644 pressure, for now, only in hydrostic formulation:
2645 + to use: compile with #define ALLOW_SOLVE4_PS_AND_DRAG in CPP_OPTIONS.h
2646 and run with selectImplicitDrag=2 ;
2647 + currently missing diagnostics of bottom drag and vert. viscosity tendency;
2648 - partial implicit time-stepping (bot. friction + vert. visc first, then
2649 surf. press) corresponding to selectImplicitDrag=1 should be applicable
2650 to NH formulation but not available until we solve for surf. pressure
2651 increment (instead of full etaN).
499c3c4540 Jean*2652 - change exp. global_ocean.cs32x15.thsice to test implicit bottom drag
2653 with implicit vertical viscosity.
ff74c947d1 Mart*2654 o pkg/seaice: add linear remapping scheme (Lipscomb 2001) to ITD model
2655 - this is a first version that includes many regularisations that may
2656 not all be necessary, to be sorted out,
2657 - turned on by runtime parameter SEAICEuseLinRemapITD (true by default)
2658 - change one verification experiment in seaice_itd to use and test new code
3706e6143e Jean*2659 - seaice_growth: catch a case where the argument of log can be zero
ff74c947d1 Mart*2660 or smaller (important for code stability)
c68e15e2a9 Jean*2661 o model/src:
2662 - modify SOLVE_DIAGONAL_LOWMEMORY version of solve_tridiagonal.F
2663 & solve_pentadiagonal.F to enable to re-used inverse matrix for solving
2664 similar A.X'=Y' system (with same matrix A) in subsequent calls;
2665 switch based on errCode (In/Out) argument value; in calling routines,
2666 initialise errCode before first call.
2667
4a59b36843 Jean*2668 checkpoint66a (2016/10/18)
2661ed7c00 Matt*2669 o pkg/bling:
4a59b36843 Jean*2670 - BLING package now loads in atmospheric pCO2 file using exf package routines
2671 Enable with #define USE_EXFCO2 in BLING_OPTIONS.h
8372d9421d Jean*2672 o model/src & pkg/ptracers:
2673 - with INCLUDE_IMPLVERTADV_CODE defined, also call MOM_U,V_IMPLICIT_R &
2674 GAD_IMPLICIT_R (instead of IMPLDIFF) when just implicitViscosity and
2675 implicitDiffusion (respectively) are used (even without momImplVertAdv
2676 or temp,salt,PTRACERS_ImplVertAdv).
25215968c0 Jean*2677 o model/src & generic_advdiff:
2678 - add parenthesis in main diagonal calculation of implicit vertical
2679 diffusion matrix (impldiff.F & gad_implicit_r.F).
2680 This affects results at machine truncation level; update output of many
2681 verification experiments (31 fwd ; 10 adm ; 8 tlm ; 3 oad).
caec104026 Jean*2682 o pkg/mom_commom & generic_advdiff:
2683 - add deep atmosphere and anelastic scaling factor in implicit vertical
2684 advection routines (mom_u,v_implicit_r.F & gad*_impl*_r.F).
2685 o model/src:
2686 - remove few unnecessary temp array copies in solve_tridiagonal.F
2687 & solve_pentadiagonal.F
2688
434f2a808d Jean*2689 checkpoint65z (2016/09/28)
2690 o pkg/seaice: fix multithreading for seaice_fgmres.F
4d686fb526 Mart*2691 - remove unecessary variables from common blocks
434f2a808d Jean*2692 - use extra dimension MAX_NO_THREADS for all variables of the Krylov space
2693 basis, that are stored in commom blocks (including integer variable i1)
2694 - clean up code a little by removing commented lines that refer to
4d686fb526 Mart*2695 original code
434f2a808d Jean*2696 - turn on multi-threaded test for experiment offline_exf_seaice.dyn_jfnk.
6c3fcd2d73 Gael*2697 o MITgcm manual:
caec104026 Jean*2698 - add uptodate pkg/ecco documentation to the manual (section 8.1; ecco.tex),
2699 preliminary documentation for generic controls (8.3; ctrl.tex),
2700 a placeholder for smooth (8.4; smooth.tex), and comment out the deprecated
2701 ecco_costfunction.tex
b3b78d9534 Gael*2702 o pkg/ecco:
caec104026 Jean*2703 - update and cleanup list of CCP options
2704 - re-assign gencost_mask to specify masks rather than gencost_errfile; 'c'
2705 is now always passed to cost_generic; gencost_mask is now MAX_LEN_FNAM
2706 - add checks that retired run-time options are not used, and in relation
2707 to gencost_mask and gencost_errfile
2708 - finish deprecating gencost_scalefile, gencost_smooth2Ddiffnbt, and
2709 gencost_nrecperiod
2710 - fix m_eta computation for virtual salt flux case
2711 - add m_horflux_vol case (selected via gencost_barfile) that computes
2712 transports via cost_gencost_boxmean (gencost_flag=-3)
2713 - use gencost_flag more systematically (i.e., avoid using gencost_name)
2714 for code switches (aside from physical variable selection)
290bbecc29 Mart*2715 o pkg/seaice: make seaice_fgmres.F fit for multithreading; this first
2716 attempt appears to be a bit of a hack and my need some repair down the road
423bece461 Jean*2717 o pkg/exf:
2718 - interpolation near South Pole: fix criteria on input field latitude.
772c88b829 Jean*2719 o pkg/icefront & pkg/exf:
2720 - move setting of icefront Sub-Glacial RunOff forcing (currently unused)
2721 from pkg/exf (read from data.exf) to pkg/icefront (read from data.icefront)
6708d8dfd2 Jean*2722 o pkg/exf:
2723 - replace CPP option ALLOW_EXF_OUTPUT_INTERP with run-time parameter
2724 "exf_output_interp" (in namelist: EXF_NML_04); change output file name
2725 (add suffix "_out" instead of a prefix); keep same record number as in
2726 input file but always write record 1 first (to avoid a STOP in I/O S/R).
2727 Change output file content by writing interpolated field before applying
2728 land-sea mask (helpful for debug).
2729 - 2 compon. vector interpolation with rotation: apply scaling factor on
2730 each compon. (Eastward and Northward) just before rotation.
7e2b7aaecb Matt*2731 o pkg/bling:
6708d8dfd2 Jean*2732 - Cleaned package. Removed not needed code and comments.
2733 - adjoint example now works
7e2b7aaecb Matt*2734 (MITgcm_contrib/verification_other/global_oce_biogeo_bling/code_ad)
33d60f0145 Jean*2735 o pkg/ptracers:
2736 - add Bruno Deremble's code to complete the linear surface correction
2737 for tracer conservation;
0aacb0e819 Oliv*2738 - enabled for individual ptracers by PTRACERS_linFSConserve(iTr)=.TRUE.
c16ff5b7c8 Mart*2739
94ff1e4393 Jean*2740 checkpoint65y (2016/07/29)
92de52e82f Jean*2741 o pkg/debug (stats):
2742 - change GLOBAL_SUM to GLOBAL_SUM_TILE (result independent of tile to
2743 proc/thread mapping);
2744 - fix Min & Max for case where 1 thread has only empty tiles;
2745 - use RL variable to count number of wet grid points (with big domain,
2746 can be too large to fit into integer*4).
c21a057aef Jean*2747 o pkg/monitor:
92de52e82f Jean*2748 - use RL variable to count number of wet grid points (but used only for del2)
c21a057aef Jean*2749 - add new routine to compute Advective CFL within tracer time-stepping with
2750 writing delayed until next monitor output.
880a06ccd8 Jean*2751 o pkg/obcs:
2752 - fix bug in OBCS_BALANCE_FLOW (OBCS_balanceFacN misspelled OBCS_balanceFacW)
33d60f0145 Jean*2753 o pkg/cal:
2754 - calandar-dump: treat case myTime < timePhase in the same way as in
2755 eesupp/src/diff_phase_multiple.F (when not using calandar-dump).
20bafebaa1 Jean*2756 o pkg/dic & seaice:
2757 - fix compilation of ocean component for coupled atm+ocn model with
2758 seaice dynamics & dic.
2759
1fc3f67886 Jean*2760 checkpoint65x (2016/06/11)
2761 o add a license text file in main MITgcm tree.
dca45a136c Matt*2762 o added pkg/bling:
c721362620 Jean*2763 - intermediate complexity biogeochemical model
dca45a136c Matt*2764 - see bling_description.txt for details
c721362620 Jean*2765 - verification experiment is global_oce_biogeo_bling (for now, in
2766 Contrib/verification_other/); tested daily on baudelaire with gfortran.
2767 - add entry point in pkg/gchem for new pkg "bling".
dd56bd054f Mart*2768 o pkg/seaice: fix tensile stength computation
2769 - replace global field tensileStrength by tensileStrFac
2770 - tensileStrFac can be computed once in S/R seaice_init_varia
2771 - fortunately that does not affect any verification results
2772
4973639fa7 Jean*2773 checkpoint65w (2016/05/12)
b509abd770 Mart*2774 o pkg/ctrl/ctrl.h: fix a comma in common block list, so that code compiles
2775 with ECCO_CTRL_DEPRECATED defined
9cecfd71bf Jean*2776 o verification/global_ocean.cs32x15:
2777 - change secondary test "viscA4" to also test "selectP_inEOS_Zc=3"
2778 with "selectNHfreeSurf=1".
99dd8840a4 Jean*2779 o model/src (non-hydrostatic free-surface):
2780 - More "natural" expression of NH free-surface term (case selectNHfreeSurf=1):
2781 was: tmpSurf/(1+tmpSurf); changed to: 1/(1+Gamma) with Gamma=1/tmpSurf.
2782 - Calculate surface vertical velocity after 2-D solver adjustment (accounts
2783 for EmPmR if RealFreshWaterFlux); used in RHS (cg3d_b) if exactConserv
2784 and used to compute dPhiNH (in post_cg3d.F) if selectNHfreeSurf=1.
2785 This fixes EmPmR contribution when selectNHfreeSurf=1 & RealFreshWaterFlux.
2786 - Update output (changes at machine truncation level) of verification exp:
2787 exp4 (11 digits for cg2d), global_ocean.cs32x15.viscA4 (11.d),
2788 short_surf_wave (13.d) and tutorial_deep_convection.smag3d (12.d).
ca41d54747 Mart*2789 o pkg/seaice: ITD code
99dd8840a4 Jean*2790 - fix picking up from a single category model by initialising
ca41d54747 Mart*2791 heff/area/hsnowITD = 0. in seaice_itd_pickup.F
2792 - split a long warning message in seaice_check_pickup.F into two lines,
2793 because NEC SX-ACE cannot deal with the long line.
8c8ba31314 Jean*2794 o model/src:
2795 - fix missing dPhiNH in pressure_for_eos.F (case: selectP_inEOS_Zc=3)
4ecb7ca1c7 Mart*2796 o pkg/seaice:
2797 - add missing checks for SEAICE_ALLOW_KRYLOV and SEAICE_ALLOW_BOTTOMDRAG
8c8ba31314 Jean*2798 o pkg/seaice:
02ecb7194f Mart*2799 - add basal stress as parameterisation for grounding ice
2800 following Lemieux et al. (2015)
8c8ba31314 Jean*2801 - turn on by setting new parameter SEAICEbasalDragK2 to a value
2802 larger than 0. Lemieux et al. (2015) recommend 15.
02ecb7194f Mart*2803 - The adjoint complains with extra recomputations so there is also a
2804 new cpp-flag SEAICE_ALLOW_BOTTOMDRAG that is undefined by default in
2805 order to postpone the problem
2806 - compile the new code in lab_sea
026b44969e Jean*2807 o verification/halfpipe_streamice:
2808 - update both TAF and OpenAD adm output (machine truncation differences)
2809
8692139b79 Jean*2810 checkpoint65v (2016/04/08)
77f624c4e1 Jean*2811 o verification/advect_xz:
2812 - increase overlap size from 3 to 4 and add new secondary test for PQM
2813 advection scheme (with mono & wino limiter).
2814 - change main exp. to test PPM (with weno limiter) adv.scheme on Temp.
ef0910b248 Jean*2815 o model/src:
2816 - new parameters "top_Pres" & "seaLev_Z" (replacing Ro_SeaLevel and recently
2817 added phi0Ref) to set vertical axis origin and phiRef origin;
2818 keep Ro_SeaLevel for backward compatibility (with a warning).
2819 According to coordinate and fluid type:
2820 OCN in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(1), @ the top)
2821 ATM in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(Nr+1) @ bottom)
2822 OCN in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(Nr+1)/g, @ the top)
2823 ATM in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(1)/g, @ the bottom)
77f624c4e1 Jean*2824 - remove Ro_SeaLevel from ATM experiment parameter files;
2825 - in tutorial_global_oce_in_p, remove Ro_SeaLevel and set top_Pres to the
2826 complement; update output.txt (changes at machine truncation level).
9af9059269 Mart*2827 o pkg/seaice/seaice_evp.F
2828 - simplify computation of deltaZ and zetaZ to simple averaging following
2829 Bouillon et al. (2013). This removes a lot of code, but also changes
2830 verification experiment lab_sea.hb87 -> updated
2831
1ec3766700 Jean*2832 checkpoint65u (2016/03/14)
2c76214192 Jean*2833 o pkg/generic_advdiff:
2834 - from Darren: add PPM and PQM advection schemes (number 40-42 and 50-52)
2835 with 2 types of limiter (see: Engwirda & Kelley, submit. to JCP);
2836 Note (from Darren): unlimited PPM/PQM scheme (40 & 50) are just for
2837 testing and not for actual use.
fc40089cb1 Jean*2838 o model/src:
2839 - add parameter "phi0Ref" to specify reference [pressure/geo] potential at
2840 origin r = rF(1);
2841 - add options (parameter selectP_inEOS_Zc) to select which pressure to use
2842 in EOS for height coordinate: enable to include NH Pressure or to use
2843 more accurate pressure vertical profile; options not linked to EOS type
2844 (as previously, e.g., JMD95P/JMD95Z) but set default according to EOS type;
2845 - start to implement variable gravity (along vertical): for now, only with
2846 z-coords (not even z*).
2847 - add Ideal Gas equation of state for height coordinate.
2c76214192 Jean*2848 - update OpenAD output (affected at machine truncation level) of exp:
2849 global_ocean.90x40x15, OpenAD (std) and tutorial_global_oce_biogeo.
564694d02e Gael*2850 o pkg/exf:
2851 - add ALLOW_EXF_OUTPUT_INTERP cpp switch to output the result
fc40089cb1 Jean*2852 of exf interpolation (before any rescaling, rotation or interpolation
2853 to velocity point) for each field that gets loaded from file. This option
2854 identically mimics the input file organization (e.g. record numbers in year
2855 by year input files) besides the change in horizontal grid.
564694d02e Gael*2856 - add rotateStressOnAgrid run-time switch so that wind stress fields
fc40089cb1 Jean*2857 can be provided on the A-grid in zonal/meridional direction and
2858 rotated on the fly. This only applies to the case when the exf
2859 interpolation is off and rotateStressOnAgrid is false by default.
dc293ceb82 Jean*2860 o model/src:
2861 - rename internal parameter "useDynP_inEos_Zc" to "storePhiHyd4Phys" (since
2862 it's also used with pkg/atm_phys) and add few more parameters (but still
2863 inactive, src code yet to come)
2864
388e260d1d Jean*2865 checkpoint65t (2016/02/10)
6eeba9ca6b Jean*2866 o pkg/atm_phys:
2867 - from Ruth Geen: add optical depth dependence on CO2 concentration.
74dbf591da Jean*2868 o model/src:
2869 - fix vertical inter/extra-polation of density factor rhoFacF (for anelastic)
2870 for the case setCenterDr=T (delRc set from "data"); add output of rhoFacC&F.
2871 Update output of exp. deep_anelastic (changes at truncation level).
42d6c3122b Jean*2872 o tools:
2873 - add a hack in "remove_comments_sed" (used only with TAF) for recent
2874 version of OpenMPI (shipped with FC.23): comment out the new header
2875 file "mpif-sizeof.h" which causes problems to TAF.
142f5afeb1 Mart*2876 o pkg/seaice:
c9f636aca9 Mart*2877 - change the termination criterion so that maxits (SEAICElinearIterMax)
2878 has an effect
142f5afeb1 Mart*2879 - unify iteration parameters for implicit solvers (JFNK and Picard)
2880 SEAICEnonLinIterMax replaces SEAICEnewtonIterMax/NPSEUDOTIMESTEPS
2881 SEAICElinearIterMax replaces SEAICEkrylovIterMax/SOLV_MAX_ITER
2882 SEAICEpreLinIterMax replaces SOLV_MAX_ITER in preconditioner
2883 SEAICEpreNL_IterMax replaces NPSEUDOTIMESTEPS in preconditioner
2884 SEAICEnonLinTol replaces JFNKgamma_nonlin
2885 - remove S/R SEAICE_FGMRES_DRIVER and put content into S/R SEAICE_JFKN
2886 - add new Picard-Krylov solver, compile with SEAICE_ALLOW_KRYLOV and
2887 use with SEAICEuseKrylov
2888 o pkg/seaice/seaice_lsr.F
42d6c3122b Jean*2889 fix small bug: replace zetaZ by zetaZloc in S/R seaice_lsr_rhsu/v; only
2890 relevant if SEAICEuseStrImpCpl=T, and even then it does not seem to have
2891 an effect.
e42d0c73e8 Mart*2892 o pkg/seaice: add two new parameters
42d6c3122b Jean*2893 - SEAICEuseLSR to simplify the logic in seaice_dynsolver (this
e42d0c73e8 Mart*2894 parameter is not in any namelist)
42d6c3122b Jean*2895 - SEAICEusrPicardAsPrecon to allow s/r seaice_lsr to be used as
2896 a preconditioner for the non-linear Newton iteration of the JFNK
e42d0c73e8 Mart*2897 solver
2d057da76f Mart*2898 o pkg/seaice/seaice_lsr.F: replace 1./SEAICE_deltaTdyn with recip_deltaT,
42d6c3122b Jean*2899 affects some experiments at truncation level:
2900 - global_ocean.cs32x15.icedyn (11 digits),
2901 - global_ocean.cs32x15.seaice (11 digits),
2d057da76f Mart*2902 - seaice_itd (12 digits), seaice_itd.lipscomb07 (12 digits) -> update
2903 - also update global_ocean.cs32x15 adjoint and tangent-linear results
3d01549ccd Jean*2904 o pkg/salt_plume & pkg/thsice:
2905 - for coupled set-up with pkg/thsice in ATM and pkg/salt_plume in OCN,
2906 connect salt_plume flux to ATM-OCN coupling pkgs interface:
2907 a) in ATM: also cumulate salt-plume flux in S/R THSICE_SALT_PLUME (for
2908 export to coupler interface) even without compiling pkg/salt_plume ;
2909 b) in OCN: apply coupler salt-plume flux to pkg/salt_plume field
2910 (saltPlumeFlux) just before exch call, in S/R SALT_PLUME_DO_EXCH.
467753bb05 Jean*2911 o pkg/dic:
2912 - use the updated seaice fraction (from seaice pkgs) for DIC forcing
2913 instead of the previous time-step value ; done in new S/R DIC_FIELDS_UPDATE
2914 called from the top of dic_biotic_forcing.F (instead of in DIC_FIELDS_LOAD);
2915 - move also update with values from ATM-OCN Coupler in the same new S/R
2916 (previously done in ocn_apply_import.F).
2917 o tools/adjoint_options:
2918 - specify explicitly "-f77" or "-f90" in default ad-optfile since TAF (default)
2919 has been changed on Jan 14, 2016.
2920 o pkg/ggl90:
2921 - add alternative discretisation of vertical shear (off by default), to
2922 compute the mean (@ grid-cell center) of vertical shear compon instead of
2923 vertical shear of mean flow (@ grid-cell center).
2924 - add correct parenthesis in ALLOW_GGL90_SMOOTH code to get the same truncated
2925 results on adjacent faces of cubed-sphere grids; this fix the restart.
86104489ad Jean*2926 o pkg/atm_compon_interf:
467753bb05 Jean*2927 - skip time-ave over cpl_atmSendFrq of Sea-Level Pressure (atmSLPr) and just
86104489ad Jean*2928 pass last value, stored directly before export to CPL ;
2929 Note: this affects results of Coupled set-up where OCN uses useImportSLP=T
2930 - remove atmSLPr from pickup files (no longer needed for restart)
2931
96ead4aa58 Jean*2932 checkpoint65s (2016/01/13)
9d1bad620f Jean*2933 o eesupp & genmake2:
2934 - first check for Function ETIME and, if it fails, then check for subroutine
2935 ETIME and consistent output; use the appropriate version in timers.F
0e1fe683c9 Jean*2936 o model/src:
2937 - to check restart test, add option to apply EXCH to U,V earlier, just before
2938 integr_continuity; turned off by default.
2939 o pkg/dic:
2940 - remove CPP option USE_ATMOSCO2 (not needed)
2941 o tools/tst_2+2:
2942 - try to ignore difference between +0 and -0 in binary file, causing test
2943 to fail for no good reason.
2944 o eesupp & genmake2:
2945 - put back modif from Jinxuan Zhu - change etime fct call to S/R call -
2946 but also check (in genmake2) that test runs and returns meaningful results.
a4406a661e Jean*2947 o coupler pkgs:
2948 Finish implementation of optionally-exchanged variable switches (started on
2949 Nov 12) with addition of few more exchanged fields, including 2-way exchange
2950 of pkg/thsice vars to allow to use seaice dynamics (from pkg/seaice) & seaice
2951 advection in OCN component; this requires sequential coupling.
2952 coupler (pkg/atm_ocn_coupler):
2953 - add argument msgUnit and iter number to CPL_SEND/RECV_ATM/OCN_FIELDS
2954 routines (useful for debug).
2955 - only export/import optionally exchanged fields (RunOff, seaice, Salt-Plume
2956 flux, DIC fields) if corresponding switch is ON.
2957 - add option to export RunOff to OCN (to use for DIC river input)
2958 - add 2-way thSIce vars exchange; check for consistent cpl_sequential setting.
2959 components (pkg/atm_ & ocn_compon_interf):
2960 - to save memory space in ATM & OCN comp: add some #ifdef ALLOW_${PKG} around
2961 optionally exchanged fields; add a check & stop in cpl_readparms.F.
2962 ATMCPL.h: ALLOW_LAND for RunOff, ALLOW_THSICE for seaice, ALLOW_AIM for CO2;
2963 OCNCPL.h: ALLOW_SALT_PLUME, ALLOW_DIC for DIC, ALLOW_THSICE for 2-W thsice.
2964 - rename: fracIce -> sIceFrac_cpl (<- match coupler var name)
2965 + in ATM: fracIceTime -> sIceFracTime ; seaIceTime -> sIceMassTime.
2966 - add 2-way thSIce vars exchange ; add Salt-Plume flux ; add RunOff in OCN.
2967 - hold in common block coupler optionally-exchanged variable switch
2968 and set default "useImportXXX" accordingly; + check & stop if inconsistent.
2969 - add diagnostics for all imported fields from coupler (in both OCN & ATM);
2970 this is intended to replace the OCN cplFldtave.* output files (not updated
2971 to contain new additional exchanged fields).
826e3022ab Jean*2972 o pkg/dic:
2973 - fix an other bug (also from 2014/08/30) in dic_atmos.F, in dic_int1=3 code.
2974 o pkg/thsice:
2975 - when coupled to ATM (useCoupler) with thSIce_skipThermo=T, skip reading
2976 and writing of thsice pickup files.
2977 o pkg/atm_compon_interf:
2978 - move all field individual export-call out of cpl_export_import_data.F
2979 into new S/R ATM_EXPORT_FIELDS
df3ba02ef4 Jean*2980 o pkg/atm_compon_interf:
2981 - store state variables (for now, only thSIce fields) just before beeing
2982 exported (in cpl_export_import_data.F, like on ocean side) instead of from
2983 atm_store_my_data.F like all exported fluxes.
2984 - new version of pickup_cpl: write field names into meta file and read meta
2985 file to find field postion in pickup. Also only write/read fields meeded for
2986 restart (same logic as main pickup file ; also using pickupStrictlyMatch)
cc55ade87f Jean*2987 o pkg/dic:
2988 - fix bug (added on 2014/08/30) in dic_atmos.F for the case dic_int1= 2 or 3.
238b281666 Mart*2989 o pkg/seaice: add new parameter SEAICEpressReplFac to choose between
cc55ade87f Jean*2990 pressure replacement method (=1., default) or original Hibler (1979) (=0.)
2991 value can be from domain [0,1] to average between the two methods
8f2cc0ef18 Jean*2992 o pkg/atm_phys:
2993 - allow to provide 2-d map of albedo and mixed-layer depth from files (but
2994 hold fixed in time).
2995
df5ab41a91 Jean*2996 checkpoint65r (2015/12/21)
2997 o pkg/seaice:
2998 fix bug in tridiagonal solvers for SEAICE_OLx/y>0, this affects the JFNK
2999 solver (offline.dyn_jfnk) and global_ocean.cs32x15.seaice -> updated
3000 o pkg/seaice:
3001 - fix a bug in computing areaS in (J-J -> J-1) that affects runs
d5321ae2f9 Mart*3002 when SEAICEscaleSurfStress=.TRUE.,
3003 - apply areaW and areaS in S/R seaice_calc_lhs
0b8d317bbe Jean*3004 o pkg/atm_phys:
3005 - add diagnostics for 3-D, Nr+1 levels diagnostics of radiative fluxes
3006 (shortwave & longwave, net & downward) and diagnostics of temp. tendency
3007 for individual contribution (convection, LSC cond, radiation)
8c8ba31314 Jean*3008 - add Ruth Geen etal, GRL 2016, radiation options (see paper supp.
0b8d317bbe Jean*3009 information); activated with: solar_exponent=0. and wv_exponent=-1.
3010 o pkg/ggl90:
e4d707b911 Mart*3011 - within IDEMIX add upper limit for horizontal group velocity to
3012 avoid instability problems in the explicit horizontal diffusion term for
3013 long time steps or high resolution
0602590031 Jean*3014 o pkg/diagnostics:
3015 - simplify setting of local-array size in diagstats_output.F: uses "numLevels"
3016 (from DIAGNOSTICS_SIZE.h) to allow to write out more than Nr levels.
3017 o testreport:
3018 - remove "-v" (verbose option) in default mpirun command.
c162643754 Mart*3019 o pkg/seaice/seaice_growth:
0602590031 Jean*3020 - catch potential division by zero in ITD code, does not change
c162643754 Mart*3021 verification results
b8a0aa824d Gael*3022 o pkg/ecco:
0602590031 Jean*3023 - retire old codes to the Attic. The calls to retired functions are
3024 left in a commented form in case they ever need to be re-activated.
b8a0aa824d Gael*3025 - ecco_check.F: issue warning if any old CPP option is
3026 defined that corresponds to retired codes -- then stop.
4240d2d6ae Jean*3027 o pkg/atm_compon_interf:
3028 - change seaice fraction (use for OCN dic surf.flux) stored and sent to
3029 coupler: use last time-step value instead of average over cplSendFrq_iter
3030 time-step, similar to what is done for seaIceMass.
3031 This will affect results (pkg/dic) of coupled ATM-OCN+dic set-up.
f439370875 Jean*3032 o eesupp & genmake2:
4240d2d6ae Jean*3033 - from Jinxuan Zhu: change etime fct call to S/R call (fix gfortran ETIME);
3034 <= remove until a fix is found for some ifort version on ia32 machine.
8e20d992b4 Mart*3035 o pkg/seaice/seaice_evp:
3036 - refine residual computation
3037
4d2bb60bd2 Jean*3038 checkpoint65q (2015/11/18)
3039 o pkg/seaice/seaice_evp:
acd0bab53d Mart*3040 - fix residual computations so that they no longer affect the actual
3041 simulation code
391b36ba77 Mart*3042 - fix seaice_readparams to be able to actually set new parameters
3043 SEAICEaEVPcStar and SEAICEaEVPalphaMin, also fix logic a little
fbe544c5ad Jean*3044 o model/src:
3045 - fix wrong truncation (single prec) from "FLOAT" function in expressions
3046 like: deltaT*FLOAT(myIter) when myIter is large:
3047 a) replaced by DFLOAT (if not seen by TAF);
3048 b) remove "FLOAT" and use implicit type conversion (if seen by TAF).
3049 o pkg/aim_v23:
3050 - write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading
3051 when pickupSuff is set ; do write rolling pickups + at the end of the run.
a90d2d6d41 Jean*3052 o pkg/atm_ocn_coupler + ocn_compon_interf:
3053 - in prep for using pkg/seaice Dyn in coupled set-up, implement sequential
3054 coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ;
3055 add corresponding call in DO_OCEANIC_PHYS.
728fbdfa55 Jean*3056 o coupler pkgs:
3057 Start a new way to set-up optionally-exchanged variables (previously, only
3058 there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler
3059 data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ;
3060 send switch to ATM & OCN compon before reading their own "data.cpl" (so that
3061 compononent param default can be set accordingly).
3062 Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch
3063 but rather applies to a group a fields (going both ways like for DIC)
3064 and corresponds to an option of coupling config.
3065 coupler (pkg/atm_ocn_coupler):
3066 - change parameter file from "data" to "data.cpl" (in cpl_read_params.F),
3067 and read namelist directly (without eessup S/R calls) instead of
3068 in the very un-flexible old way, 1 param per line, in fixed order;
3069 - add error-counter to track errors (e.g., missing "data.cpl") and to stop
3070 cleanly in CPL_CHECK_CPLCONFIG
3071 - add new coupling-exchange selectors (some not yet active) including
3072 cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h
3073 and ocnCpl_exchange_DIC=T in OCNIDS.h);
3074 - add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each
3075 component ; called directly from coupler.F, after comp. registrations;
3076 - rename few variable-ID names (in ATMIDS.h & OCNIDS.h):
3077 atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name ->
3078 -> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName
3079 components (pkg/atm_ & ocn_compon_interf):
3080 - add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding
3081 CPP header file in all pkg source files.
3082 - move checking of comp. configs out of cpl_exch_configs.F into new S/R
3083 ATM/OCN_CHECK_CPLCONFIG;
3084 - add error-counter to track errors (e.g., in "data.cpl") and to stop
3085 cleanly in ATM/OCN_CHECK_CPLCONFIG;
3086 - add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors
3087 from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and
3088 before PACKAGES_READPARMS;
3089 verification/cpl_aim+ocn/:
3090 - update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file
3091 "data.cpl" for coupler (in input_cpl).
2f968f5f13 Jean*3092 o eesupp/inc:
3093 - change the MPI-global-sum default (in CPP_EEOPTIONS.h) to:
3094 #define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F)
3095 to always cumulate tile local-sum in the same order (still uses
3096 MPI_Allreduce like standard code).
3097 - in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files
3098 that are now identical to standard version (in eesupp/inc).
4014d9eb9b Dimi*3099 o pkg/shelfice:
3100 - add SHELFICETransCoeffTFile for initializing spatially varying
3101 heat and salt transfer coefficients
1f88340446 Jean*3102 o pkg/atm_compon_interf & ocn_compon_interf:
3103 - combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous
3104 S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA
3105 - move bi,bj loops inside S/R OCN_STORE_MY_DATA
3106 o pkg/atm_ocn_coupler:
3107 - initialise to zero ATMVARS.h & OCNVARS.h arrays.
06e0575ae0 Jean*3108 o pkg/rbcs:
3109 - select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows
3110 to compile with maskLEN=1 when all tracers use the same RBCS-mask.
3111 - add a short report (to STDOUT) about RBCS-mask settings.
3112
87c2bed99f Jean*3113 checkpoint65p (2015/10/23)
53fe7f7443 Mart*3114 o pkg/seaice/seaice_evp.F: fix store directives and key computations, since
87c2bed99f Jean*3115 there is no adjoint test for EVP, we don't know what it does to the adjoint
3116 solution, but at least there are no more recomputation warnings left
5790bd3152 Mart*3117 o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands
87c2bed99f Jean*3118 a chance of giving the same results as a fully converged VP (JFNK) solver
8187002e7a Jean*3119 o tools/adjoint_options/adjoint_diva:
80f3898c9c Jean*3120 - fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA
4323a006ce Dani*3121 o pkg/streamice:
8187002e7a Jean*3122 - spotted bug in streamice_driving_stress using dyG where should have been dxG
fcf4f25c01 Jean*3123 o pkg/exf:
3124 - remove STOP statement that prevented to use wind or (wind-)stress
3125 interpolation for constant-in-time forcing fields (wind/stress period = 0).
3126 o pkg/seaice:
31d3f56edc Mart*3127 - replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires
3128 5 additionals 2D fields and 6 new store directives
3129 - change logic in seaice_readparms.F: EVP code can now be turned on in
fcf4f25c01 Jean*3130 various ways, setting SEAICE_deltaTev is no longer required,
3131 alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev,
31d3f56edc Mart*3132 or SEAICEaEVPcoeff
443b4c77b9 Dimi*3133 o pkg/shelfice/shelfice_thermodynamics.F
3134 - redefining uLoc/vLoc to u/v, instead of 2u/v
0a62312758 Mart*3135 o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz
3136 - this is an intermediate state of a truely converging EVP that has
3137 the potential of outperforming implicit VP methods, I do not recommend
3138 using it yet.
3139 - for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION
3140 and all parameters are hardwired
3141 - for convergence it still requires very smooth regularisations, that means,
3142 if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is
3143 different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also
3144 specific averaging appears to be required, still subject to tuning
3145 - still needs cleaning and I need to turn parameter into runtime parameters
3146 - add code to compute and print residuals of iteration, compile with
3147 defining ALLOW_SEAICE_EVP_RESIDUAL to enable it
912323e508 Mart*3148 o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq)
3149 that entered with r1.54 on Sep04, 2015, -> update results
3150
40fe6f59c8 Jean*3151 checkpoint65o (2015/09/14)
4c3e5a1532 Jean*3152 o pkg/mom_vecinv & mom_common:
3153 - add deep-atmosphere geometry factor in mom_calc_visc.F + in routines
3154 called from there.
3155 - add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this
3156 allows to use Vector-Invariant form in deep atmos and anelastic formulation
7d06cac49c Mart*3157 o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015)
3158 and Koenig-Beatty+Holland (2012)
3159 - two new parameters SEAICE_tensilFac and SEAICE_tensilDepth
3160 - global 2D field tensileStrength, computed in seaice_calc_ice_strength
3161 - requires an extra input argument for S/R seaice_calc_viscosities
3162 - tensileStrength's depth dependence is different from Itkin et al. (2015)
3163 (to be changed and played with, for now exponential)
22864ea3d8 Mart*3164 o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.)
3165 - if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice
3166 by AREA according to Connelly et al. (2004), JPO.
3167 - For EVP and the LSR solver, the implicit part of the drag term is
4c3e5a1532 Jean*3168 the only non-zero term in the denominator when there is no ice (which
22864ea3d8 Mart*3169 prevented running the model with zero ice-ocean drag). If
3170 SEAICEscaleSurfStress = .TRUE., this results in a division by zero
3171 (or zero main diagonals BU/BV) which need to be caught. A practical
3172 consequence is that for open water, the momentum equation reduce
4c3e5a1532 Jean*3173 to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if
22864ea3d8 Mart*3174 they happen to be zero, often leading to a non-zero solution over
3175 open water.
4c3e5a1532 Jean*3176 o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more
eac2f17d92 Mart*3177 efficient EVP method.
4c3e5a1532 Jean*3178 - introduce area-weighted averages for e12 (analogously to
eac2f17d92 Mart*3179 seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits
3180 remain, but also changing the order of terms in the previous average
3181 changed the results as much) -> update experiment
3182 - add SEAICE_DELTA_SMOOTHREG code
4c3e5a1532 Jean*3183 - disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for
eac2f17d92 Mart*3184 TEM-code
3185 - adjust loop bounds so that only required fields are computed
4c3e5a1532 Jean*3186 - add new averaging code for zetaZ/deltaZ (again similar to
eac2f17d92 Mart*3187 seaice_calc_viscosities.F), inactive by default for now (will change
3188 results again), but will replace old code eventually
4b86bb6ef3 Jean*3189 o eesupp/src:
3190 - add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F)
3191 to always cumulate tile local-sum in the same order
3192 (option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h).
3193 Still uses MPI_Allreduce (like standard code) but on array of tiles
3194 and should be faster than GLOBAL_SUM_SEND_RECV code.
3195 - switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV
3196 (defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead.
40fe6f59c8 Jean*3197 - add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.:
4b86bb6ef3 Jean*3198 aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40,
40fe6f59c8 Jean*3199 fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example,
3200 natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre,
3201 tutorial_baroclinic_gyre and tutorial_held_suarez_cs.
4b86bb6ef3 Jean*3202
1e127b2371 Jean*3203 checkpoint65n (2015/07/29)
3204 o pkg/thsice:
3205 - add a warning when used with pkg/aim but without updating SST
3206 (stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ).
d167cbe4e6 Jean*3207 o pkg/offline:
65bcd0f1ad Jean*3208 - change where Offline-Fields are loaded, from load_fields_driver.F to
3209 directly within FORWARD_STEP, just after updating iter number and time;
3210 - move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new
3211 S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS;
3212 These changes allow:
3213 a) to recover exactly on-line results using deltaToffline=deltaTClock,
3214 tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2)
3215 both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous
3216 time-step, both with GM & KPP files and with recomputing these fields;
3217 b) no needs to switch on staggerTimeStep anymore;
3218 c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf.
56d308cb5a Jean*3219 - update output of experiment tutorial_dic_adjoffline (only 3 digits left).
65bcd0f1ad Jean*3220 o pkg/offline:
d167cbe4e6 Jean*3221 - change (rarely used) offset-iteration parameter to an offset time (in s):
3222 can easily recover previous offset-iter effect by setting offset-time
3223 (offlineTimeOffset) to offset-iter x deltaToffline;
3224 - do not turn-off Temp & Salinity surface relaxation when using KPP (used
3225 in KPP as part of surface buoyancy forcing) in offline run.
4a2e3073c9 Jean*3226 - fix ptracers KPP non-local term in the case where KPP is re-computed.
2a36d1b911 Patr*3227 o OpenAD
d167cbe4e6 Jean*3228 - Adding preliminary ggl90 test to OpenAD verification.
3229 Config. with ggl90 currently diverges after 64 time steps
3230 so will need more work to become more stable
3231 - Adding preliminary kpp test to OpenAD verification.
3232 required small tweakes in kpp_routines.F
3233 - Merge and update from Krishna Narayanan's contrib area:
3234 * Add one variable for preliminary OpenAD DIVA
3235 * Add replacement time-stepping for OpenAD DIVA
3236 * genmake2 flag -diva (but only for OpenAD; preliminary)
3237 * required modifs for OAD_support
3238 successful preliminary test for tutorial_global_oce_biogeo/
e81dec19cb Mart*3239 o pkg/seaice:
d167cbe4e6 Jean*3240 - initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr
3241 - add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising
3242 delta with a smooth function in s/r seaice_calc_viscosity
3243 (no effect on EVP)
3244 - rename local suffix "sqr" into "sq" for more consistent variable names
3245 o pkg/seaice:
3246 add new parameter SEAICE_deltaMin that is used ***only***
3247 for regularizing Delta (and nothing else, like the parameter
3248 which is also used for all sorts of things SEAICE_EPS).
3249 Defaults to SEAICE_EPS for backward compatibility only.
c9fe27f0ce Mart*3250 o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with
d167cbe4e6 Jean*3251 the wrong key by inialising it before use -> fixes a recomputation
3252 problem but does not fix the gradient
abafc19a3b Jean*3253 o pkg/layers:
a3d5c99c9c Ryan*3254 - move resetting of flux arrays to outside the iLa loop
3255 (this caused layers_diapycnal to not work with more than one layer coord.)
3256 - fix bug in calculation of layers_recip_delta in layers_init_fixed.F
3257 o pkg/layers:
abafc19a3b Jean*3258 - remove from common block 3D layers fields (used to diagnose transport
3259 in tracer coords) and declare them as local arrays in layers_calc.F
d0a27699e8 Mart*3260 o pkg/seaice:
3261 - Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it
3262 in lab_sea forward experiment (changes results -> updated)
229dc91f74 Mart*3263 - update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v
d167cbe4e6 Jean*3264 o pkg/seaice: modify seaice_lsr.F in order to improve the gradient
3265 computations; for SEAICE_VECTORIZE_LSR
d0a27699e8 Mart*3266 - move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v)
abafc19a3b Jean*3267 sweep to the outside,
d0a27699e8 Mart*3268 - remove store directives and add "CADJ loop sequential" directives
3269 in analogy to model/src/solve_tridiagonal.F
3270 - replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop
3271 boundaries to yield more readable code. This has also the charming side
abafc19a3b Jean*3272 effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without
3273 SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in
d0a27699e8 Mart*3274 seaice_lsr_tridiagu/v now requires either of these flags, vectorization
3275 still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as
3276 an additional option)
abafc19a3b Jean*3277 The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F
3278 but the adjoint gradients (which are affected by this change) still explode.
15da1f08b8 Jean*3279 o coupler (atm & ocn _compon_interf):
3280 - avoid using Exch2 IO mapping if not suitable.
3281
30863fa6ad Jean*3282 checkpoint65m (2015/06/15)
7139ed4ee5 Ryan*3283 o pkg/layers:
18e9f37a89 Jean*3284 - clean-up old parameters setting (from Sep 2012):
3285 + remove old parameters setting from common block (declared locally);
3286 + stop if any old parameter is mixed with new parameters;
3287 + check for valid or consistent parameter setting (e.g., layers_name)
3288 - check that layers_bounds for Pot.Density are in the right range;
3289 this is supposed to catch un-updated setting after recently shifting
3290 potential density field "prho" by -1000 (now in "sigma" scale).
3291 o pkg/layers:
edd113ba3f Ryan*3292 - Added missing call to layers_fill for keeping track of tottend in
3293 pkg/diagnostics/diagnostics_fill_state.F
3294 o pkg/layers:
cdcbace143 Ryan*3295 - added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning
3296 of diapycnal fluxes
3297 o pkg/layers:
f6012f0463 Ryan*3298 - reverted changes to interpolation to previous treatment; there
3299 was never actually a problem
3300 o pkg/layers:
7139ed4ee5 Ryan*3301 - fix interpolation of layers tracers in the presence of partial cells
3302 - add lots of new functionality to compute water mass transformation
3303 (enabled by CPP flag LAYERS_THERMODYNAMICS)
3304 - add new calls from main code (diags_oceanic_surf_flux.F,
3305 thermodynamics.F, impldiff.F) and gad to save the necessary fields
3306 for layers_thermodynamics calculations
152ce31913 Gael*3307 o pkg/ptracers:
18e9f37a89 Jean*3308 - add capability of stepping a passive tracer forward without advection
3309 by setting PTRACERS_advScheme to 0.
9152c0f425 Jean*3310 o pkg/diagnostics:
3311 - add few (threads) _BARRIER around any update of "diag_pkgStatus".
9cf13f2e40 Jean*3312 o pkg/layers:
eee4907c3b Jean*3313 - shift potential density field "prho" by -1000 for density layer averaging so
3314 that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000);
3315 Note that density bin boundaries (layers_bounds in data.layers) have
3316 to be set accordingly (i.e., shifted, in sigma scale).
3317 o pkg/layers:
9cf13f2e40 Jean*3318 - fix snap-shot output of layer thickness @ V.pt and output of pot.density
3319 - fix calculation of layer non-weighted velocity and layer probability
3320 - add diagnostics for pot.density used for layer averaging
3321 o pkg/seaice:
f81cc74571 Mart*3322 - seaice_calc_viscosity.F: change computation of deltaC**2 to ensure
9cf13f2e40 Jean*3323 positiveness, modify a few comments and improve variable names,
3324 - the changed computation of deltaC affects most seaice-related
3325 experiments at the truncation level.
f81cc74571 Mart*3326 seaice_itd.thermo is affected by far the most, with
3327 only 7 digits of agreement remaining; update experiments.
3328
adc564fd15 Jean*3329 checkpoint65l (2015/05/04)
b357f162e4 Dani*3330 o pkg/shelfice:
adc564fd15 Jean*3331 - in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set
3332 factor drKp1 to zero where it is negative (ie. do not use
b357f162e4 Dani*3333 SHELFICEBoundaryLayer if hFacC>1)
3334 - the same for factor drLoc in shelfice_forcing.F
307b498a12 Mart*3335 o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem
adc564fd15 Jean*3336 with modules in ptracers, when using testreport option "-small_f"
36a331ccdf Mart*3337 o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD)
3338 - replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1))
43f4321b67 Mart*3339 o verification/testreport
3340 - add new option -small_f
3341 with this option testreport first makes the target small_f (*.f files)
adc564fd15 Jean*3342 before running make (all). This is useful for explicit inlining when
43f4321b67 Mart*3343 all sources need to be full available.
adc564fd15 Jean*3344 o pkg/exf/exf_interp.F:
3345 remove previous changes related to reverse (decreasing) input grids latitude
43f4321b67 Mart*3346
d4262ce583 Jean*3347 checkpoint65k (2015/04/01)
3348 o pkg/ecco:
3349 fix missing cosphi initialization; use eccoiter in place of optimcycle;
3350 if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL
3351 instead of active read/write
3352 o pkg/ctrl:
3353 if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL
3354 instead of active read/write.
3355 o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F
b905f133e5 Gael*3356 return if .NOT.useAUTODIFF
3357 o pkg/seaice: add CPP brackets (cost function related).
d4262ce583 Jean*3358 o model/src:
3359 add useAUTODIFF run time switch.
3360 o pkg/exf/exf_interp.F:
3361 add code to allow input grids with latitude starting in the north (i.e. when
3362 j=1 corresponds to northern edge of field); modify global_with_exf to test
3363 this feature.
0d0ef3b590 Mart*3364 o verification/testreport:
3365 - replace "grep -A3" with POSIX conformal sed command, because there are
3366 implementations of grep that cannot do contextual searches
3367 - replace "cat -n" by "nl" (two occurrences), because not all implementations
3368 of "cat" have the option "-n"
d4262ce583 Jean*3369 o model/src:
3370 add new file gsw_teos10.F that contains 3 functions, more or less a copy
3371 of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to
3372 convert from conservative to potential temperature. For now they are not
3373 called anywhere.
8686b61ec1 Mart*3374 o pkg/ggl90: make "useIDEMIX" useful
3375 - re-organize code in s/r ggl90_calc a little to move computations that
d4262ce583 Jean*3376 are different for idemix into separate loops (changes verification
8686b61ec1 Mart*3377 experiment idemix at truncation level, 12 digits remain -> updated)
3378 - requires 2 new 2D fields KappaM, verticalShear
3379 - make hFacI and recip_hFacI local 3D variables that are passed to
3380 s/r ggl90_idemix
3381 - fix and improve some comments
3382
fec3c1643a Jean*3383 checkpoint65j (2015/02/25)
71e702ab4f Mart*3384 o pkg/openad
fec3c1643a Jean*3385 - synchronize seawater.F with version in model/src: replace routine
3386 body of sw_temp by calling sw_ptmp and fix/add a few comments.
2808e60b18 Jean*3387 o pkg/mnc:
3388 - change default value of pickup_read/write_mnc params to FALSE
3389 (since few features are missing in reading MNC pickup files).
3390 o model/src:
3391 - change default (background) vertical diffusivity for salt to be the
3392 temperature (background) vertical diffusivity.
3393 - change background vertical diffusivity in vertical mixing pkgs ggl90,
3394 kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity.
3395 This makes ptracers default diffusivity (that uses salt diffKr) more
3396 consistent with vertical mixing schemes.
0948a11536 Jean*3397 o verification/testreport:
3398 - fix typo in "-pcls" option ;
3399 - put temp files in /tmp (instead of in local dir)
3400 - add option "-ncad" to use genmake2 new option "-nocat4ad"
3401 - allow to use "-j" option (for multi-procs make) for AD, OAD and TLM.
418827f27e Jean*3402 o pkg/ggl90 (idemix code):
3403 - apply few fixes ; add some missing "_d 0" ; update output of exp.
3404 global_ocean.90x40x15.idemix
c7c1da2019 Patr*3405 o OpenAD
3406 - enable active file I/O and begin removal of work-around code
3407 for OpenAD for handling control variables (memory vs. active files)
3408 - new CPP options file OPENAD_OPTIONS.h
ed1e2fbc34 Patr*3409 - revert to genarr2d gradient check for hs94.1x64x5
3410 - (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens)
3411 - gentim2d works for halfpipe_streamice but not yet hs94.1x64x5
7da87823d7 Jean*3412 o tools/genmake2:
3413 - add option for an alternative Makefile (from Martin) where multiple
3414 source files are sent to TAF (instead of all in one file).
689aab8014 Mart*3415 o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013)
d4a41e9da2 Mart*3416 - code provided by Carsten Eden as an extension of ggl90
7da87823d7 Jean*3417 - so far the code is turned on within ggl90 by setting a CPP-flag at
d4a41e9da2 Mart*3418 compile time; a runtime flag implementation is not yet complete
3419 - tested in new verification experiment global_ocean.90x40x15.idemix
c9dca15fbe Jean*3420 o verification:
3421 - reduce length of the AD test run by half for experiments
3422 global_ocean.cs32x15 (std + thsice) and isomip
c7c1da2019 Patr*3423 - enable active file I/O for OpenAD, adjust verifications accordingly
3424 - halfpipe_streamice: change gradient check from genarr2d to gentim2d
58a2b24c42 Mart*3425 o verification/testreport:
3426 - fix two non-POSIX sed statements so that there are no error messages
c9dca15fbe Jean*3427 on Mac OS X
58a2b24c42 Mart*3428 - replace hostname -s with hostname | sed 's/\..*$//'
c9e57a3110 Mart*3429 o model/src/seawater.F:
3430 - simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged
3431 (following the matlab code), which would have avoided the bug caught
3432 by Matt (see below) in the first place
a208a455d6 Jean*3433 o pkg/shelfice:
3434 - implement alternative discretisation of quadratic drag (selectBotDragQuadr)
3435 and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag.
3436 - fix sign of friction tendency (no-slip BC) and fix u,v drag for thin
3437 ice-shelf case (i.e., within surface level).
c9e57a3110 Mart*3438 - add config summary in shelfice_check.F
3439 - remove global variable recip_SHELFICElatentHeat and replace by a local
3440 variable recip_latentHeat
3441 - introduce diagnostics for friction velocity uStar (in case of
c9dca15fbe Jean*3442 SHELFICEuseGammaFrict)
c9e57a3110 Mart*3443 - change verification experiment isomip.htd:
3444 + start from pickup (as input_ad at nIter0=8640)
3445 + start from SHELFICEmassFile instead of SHELFICEloadAnomaly file
3446 + test SHELFICEuseGammaFrict = .TRUE.
3447 + test SHELFICEadvDiffHeatFlux = .TRUE.
93bf9c0d32 Jean*3448 o model/src:
3449 - fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to
3450 in-situ Temp) and in routine SW_TEMP (in pkg/openad);
3451 update output of experiments global_with_exf.yearly and isomip (all 6).
ad3ad8f6cb Jean*3452 o pkg/shelfice:
3453 - change setting of kTopC to also be zero where there is no ice-shelf.
93bf9c0d32 Jean*3454 - zero out surface forcing arrays (for now, for T & S + EmPmR) where
e2b17d5756 Jean*3455 ice-shelf is.
3456 - first attempt to get RealFreshWaterFlux effects: for now, only without
3457 SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping.
3d23c2b9e0 Mart*3458 o pkg/seaice: add the option to prescribe a fixed thickness PDF
3459 for thermodynamic calculations
ad3ad8f6cb Jean*3460 - because of divisions of the type 7/7 not exactly equal to 1, this change
3d23c2b9e0 Mart*3461 affects results of some verification experiments by up to 4 digits:
ad3ad8f6cb Jean*3462 global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume,
3d23c2b9e0 Mart*3463 seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides
3464 adjoint: lab_sea, lab_sea.noseaicedyn
3465 -> updated
3466
982dd9a048 Jean*3467 checkpoint65i (2015/01/23)
f01a61ff96 Jean*3468 o model/src:
3469 - change units of frictionHeating field from W to W/m^2
3470 - fix bug in frictional heating from stratospheric drag in
3471 S/R ATM_PHYS_TENDENCY_APPLY_V
982dd9a048 Jean*3472 - with synchronous time-stepping: move resetting to zero of frictionHeating
01d0a60981 Jean*3473 field from load_fields_driver.F to thermodynamics.F ;
3474 - add diagnostics for frictional heating.
172fd5e8fd Jean*3475 o model/src & gmredi K3D:
3476 - add frictionHeating field to pickup-files (for synchronous time-stepping)
3477 - move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h
3478 - rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name
3479 and name in pickup file).
3480 - fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F
a55487f421 Jean*3481 o model/src:
3482 - move (from ini_forcing.F) initialisation of all arrays in header file
3483 FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart
3484 (since Nov 2012) with option selectAddFluid=1.
376915f8ee Jean*3485 o pkg/shelfice:
3486 - change units (+ document) of newly added field "shelfIceMassDynTendency"
3487 - upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays.
12e9160284 Mart*3488 o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers
376915f8ee Jean*3489 o pkg/seaice: two new runtime parameters:
3490 - SEAICE_cStar replaces the hard wired "20" in the strength formulation,
12e9160284 Mart*3491 long overdue
376915f8ee Jean*3492 - SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012)
12e9160284 Mart*3493 parameterization of tensil stress for fast ice (does not do anything yet)
3494 o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method
376915f8ee Jean*3495 for LSR: move checking overlaps out of JFNK-if-block
ff2a7562da Jean*3496 o pkg/atm_phys:
3497 - move copy of grid and dynamical fields out of atm_phys_driver.F into
3498 new S/R ATM_PHYS_DYN2PHYS.
3499 - fix level height for Linear Free-Surf case (to be consistent with
3500 fixed-in-time pressure levels).
5811c5042c Jean*3501 o pkg/mom_common (bottomdrag):
3502 - average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center
3503 to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG;
3504 update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag.
3505 o pkg/shelfice (u/v_drag):
3506 - add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG;
3507 - use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F
3508 (now similar to shelfice_u_drag.F)
3509 - remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG
3510 from mom_vecinv.F (similar to mom_fluxform calls).
3511 o pkg/mom_common (bottomdrag):
3512 - add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG;
3513 - add options for alternative discretisation of velocity norm in quadratic
3514 bottom drag: averaging of grid-cell-center KE to U.point and V.point
3515 (selectBotDragQuadr=0, original code) can produce noisy patterns; this
3516 improves when averaging only the other component (e.g. vVel for U bottom
3517 drag) using wet-point method (selectBotDragQuadr=2) or not (=1).
3518 - add options (bottomVisc_pCell) to account for partial-cell in bottom
3519 friction (no-slip BC) thus getting the true distance from the bottom;
3520 off by default since this also reduces model stability (explicit bottom
3521 friction). Changes produce different machine truncation with linear-drag
3522 + no-slip BC: update output of experiments exp4.stevens (10 digits) and
3523 front_relax (bvp & mxl, 10 & 11 digits).
cda18d4551 Jean*3524 o model/src & mom pkgs:
3525 - add one more level to vertical viscosity local arrays (Nr+1, previously Nr)
3526 since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k
3527 - for now and until vertical mixing scheme are updated to fill up level Nr+1,
3528 just copy level Nr value to level Nr+1.
3529 o doc:
3530 - add notes form Abhisek Chakraborty on how to close Heat & Salt budgets.
c721362620 Jean*3531 o pkg/shelfice:
07201d0927 Dani*3532 - shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F,
3533 SHELFICE.h: move array shelficemass to init_varia, initialise
3534 from array shelficemassinit, which is set in init_fixed and
3535 has option to be set from file; introduce array
3536 shelficeMassDynTend array, set thru file in init_fixed
3537 - NEW FILE: shelfice_step_icemass.F: update shelficemass from either
cda18d4551 Jean*3538 shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in
07201d0927 Dani*3539 pkg/streamice
cda18d4551 Jean*3540 - shelfice_thermodynamics.F: call shelfice_step_icemass if
07201d0927 Dani*3541 SHELFICEMassStepping = .true.
cda18d4551 Jean*3542 - shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f
07201d0927 Dani*3543
eabebaa9d2 Jean*3544 checkpoint65h (2014/12/17)
83c35e2265 Gael*3545 o verification/global_ocean.90x40x15, global_ocean_ebm:
3546 - update to generic controls.
3547 o pkg/ctrl:
3548 - ctrl_map_ini_genarr.F: test for igen>0
3549 - ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D.
eabebaa9d2 Jean*3550 - move gentim2d part of ctrl_map_ini_genarr.F to
83c35e2265 Gael*3551 new separate routine : ctrl_map_ini_gentim2d.F
3552 - ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F:
eabebaa9d2 Jean*3553 add time variable weights and cyclic controls (time mean,
83c35e2265 Gael*3554 seasonal cycle, etc) capabilities to gentim2d
3555 o pkg/ecco:
3556 - move reading of error, conversion to weights from
3557 ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei)
3558 o global_oce_llc90, cs32:
3559 - activte sbo.
3560 - CTRL_SIZE.h : add maxCtrlProc.
3561 - activate the new genctrl capabilities.
a435e833b1 Mart*3562 - update following reorganization of global_oce_input_fields.tar.gz
83c35e2265 Gael*3563 o pkg/ctrl/ctrl_ad_diff.list:
3564 - add missing ctrl_init_rec.f
3565 o tools/OAD_support/keepOriginal:
3566 - add ctrl_init_rec.F
3567 o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F:
3568 - avoid recomputations of xx_gentim2d_dummy.
a3e6888a7e Jean*3569 o momentum diagnostics:
3570 - move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and
3571 mom_vecinv.F to timestep.F (to include Smag-3D contribution).
3572 o pkg/seaice/seaice_lsr.F:
3573 - fix computation of BU/BV, make sure they are non-zero, only necessary
3574 for cubed sphere exchanges and SEAICE_OLx/y>0.
3575 This makes calling s/r fill_cs_corner_rl obsolete (removed).
07df50d3e2 Mart*3576 o verification/global_ocean.cs32x15/input.seaice
3577 - add test for strong implicit coupling and restricted addtive Schwarz
3578 methods for LSR
3579 - update results/output.seaice.txt
e0b9102457 Jean*3580 o verification/tutorial_global_oce_biogeo:
171611a792 Jean*3581 - AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up)
3582 and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK);
3583 update output_adm,_oadm,_tlm.txt
3584 o pkg/dic:
3585 - change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h
3586 - add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn
3587 for tracer 1 & 2 is set (to avoid double counting of dilution effect).
3588 o verification/tutorial_global_oce_biogeo:
e0b9102457 Jean*3589 - AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since
3590 dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ;
3591 update output_adm,_oadm,_tlm.txt
171611a792 Jean*3592 o eesupp/src:
3593 - add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F)
e0b9102457 Jean*3594 and call it in seaice_lsr when using nonzero SEAICE_OLx/y
1a814ccfcd Mart*3595 o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing
3596 LSR (following Hutchings et al. 2004)
3597 - introduce zetaZ as a global variable (requires adjustments in
3598 seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ
e0b9102457 Jean*3599 in seaice_calc_viscosities.F
1a814ccfcd Mart*3600 - new flag SEAICEuseStrImpCpl (default off)
3601 - add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the
3602 momentum equations
3603 - JFNK-solver (preconditioner) adjusted to allow using this method
3604 (where it does not have any positive effect)
d6f9f4aeb9 Mart*3605 o pkg/seaice
3606 - add overlap for restrictive additive Schwartz method also to LSR, but
3607 turn it off by default (because it only seems to work for non-cubed
3608 sphere/llc topologies)
c8020f78c8 Mart*3609 o pkg/autodiff
3610 - add extra exchanges in addummy_in_steppging also for mnc output
3611 o pkg/seaice:
3612 - add extra exchanges before dumping adjoint fields in seaice_ad_dump.F
3613 to avoid stripes in the adjoint output (similar to addummy_in_stepping.F)
e87a86147c Jean*3614 o pkg/obcs:
3615 - add option to specify domain-connected piece Id along OB though files
3616 (for now, only used to diagnose PhiVel; default =1 -> global correction)
3617 - modify obcs_diag_balance.F to process each connected-part separately;
3618 exclude OB where Id = 0 but keep the full divergence there (-> constant
3619 Psi along this portion of OB and all inflow derived from grad(Phi))
3620 - add example of OB-conect files in verification/so_box_biogeo/input.
3621 o pkg/diagnostics:
88137b1de0 Jean*3622 - improve treatment of Open-Boundaries in Velocity-Potential calculation:
3623 a) use non zero matrix element across OB and solve for Phi 1 grid point
3624 outside OB (i.e, where tracer OBCS are applied).
3625 b) global imbalance of inFlow/outFlow across OB: instead of modifying
3626 velocity across OB, spread it uniformly along the OB in the RHS.
3627
790de314fc Jean*3628 checkpoint65g (2014/11/19)
3629 o pkg/diagnostcis:
3630 - add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param
075f468e41 Jean*3631 o pkg/my82,pp81,kl10:
3632 - fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D
3633 field diffKr as background diffusivity to set minimum diffusivity value.
3634 o pkg/seaice:
3635 - add new parameter SEAICEuseEVPrev (for revisited EVP by
d6ef696f9b Mart*3636 Bouillon et al 2013)
3637 - add SEAICE_evpAlpha/Beta to namelist
075f468e41 Jean*3638 - modify seaice_evp code to able to use SEAICEuseEVPrev. These changes
d6ef696f9b Mart*3639 involve trivial re-ordering of divisions/multiplications that should not
3640 have any effects, but ... they do change the results of lab_sea.hb87 so
075f468e41 Jean*3641 that only 2 digits of agreement remain, in line with the general
d6ef696f9b Mart*3642 instability/fragility of the evp-code. For now, I do not care and just
3643 update the verification experiment
ce66b4105d Gael*3644 o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc)
075f468e41 Jean*3645 - remove xx_genarr2d_numsmooth etc
ce66b4105d Gael*3646 - use xx_genarr2d_preproc etc instead
075f468e41 Jean*3647 - carry out smooth_correl2D at initialization stage rather than during
3648 time stepping.
ce66b4105d Gael*3649 - get smoothOpNb from xx_gentim2d_preproc
3650 o global_oce_cs32 :
3651 - add test of generic ecco capabilities.
3652 o pkg/exf/exf_getsurfacefluxes.F :
3653 - add to tmpUE/tmpVN rather than re-initializing them (conventional behavior).
3654 o pkg/ctrl,ecco :
075f468e41 Jean*3655 - omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED
3656 is defined.
efb8db572a Mart*3657 o pkg/seaice: add diagnostics for Delta (deformation parameter)
c604292c00 Jean*3658 o model/src:
075f468e41 Jean*3659 - when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical
c604292c00 Jean*3660 diffusivity (background) is specified but ignored.
3661 o verification:
3662 - in testreport, convert hostname to lower case for default output dir name
bb3b849103 Gael*3663 o model, pkg : add useCTRL, useECCO parameters (on/off run time switch).
7c3a77b9ab Jean*3664 o pkg/dic: add modifications from Hajoon:
3665 - add iron sedimentation flux function of the flux of PO4 out of bottom layer
3666 - light attenuation: add self-shading effect by climatological Chlorophyll
3667 (read from file).
3668 o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also
3669 compiles when SEAICE_ALLOW_DYNAMICS is undefined
3670 o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate
3671 AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than
3672 ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted,
3673 approach where CPP_OPTIONS.h includes an omnipotent
3674 ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h').
3675 o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where
3676 ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong.
7c5e2c853b Gael*3677 o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF
7c3a77b9ab Jean*3678 to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included
3679 (it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...)
7c5e2c853b Gael*3680 o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl :
3681 add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed
3682 - ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h
3683 - AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h
3684 - CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc
7c3a77b9ab Jean*3685 o pkg/ctrl,ecco,exf :
3ae7845edf Gael*3686 - remove variables associated with NON-generic costs,
3687 unless ECCO_CTRL_DEPRECATED is defined.
7c3a77b9ab Jean*3688 - remove NON-generic NON-obcs controls,
3ae7845edf Gael*3689 unless ECCO_CTRL_DEPRECATED is defined.
3690 o pkg/ctrl : added ctrl_local_params.h
3691 o pkg/ecco : added ecco_local_params.h
7c3a77b9ab Jean*3692 o verification : added ECCO_CTRL_DEPRECATED to most as and oad
3693 experiments, which will progressively be removed once the
3694 experiments are revised to use only generic controls/costs.
3ae7845edf Gael*3695
f9e490a40b Jean*3696 checkpoint65f (2014/10/13)
e9cfc0e399 Gael*3697 o pkg/ctrl, ecco, seaice : minor changes in headers
edcd1bebe3 Gael*3698 o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic
7c3a77b9ab Jean*3699 cost function and control capabilities added since checkpoint65c.
675cbb9806 Gael*3700 o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h.
f6a9bac81e Gael*3701 o pkg/ecco: increase modularity and improve logic
f0a41ddc00 Gael*3702 - ecco_toolbox.F (new) : basic operations that are often used,
3703 including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk,
3704 ecco_addcost, ecco_add, ecco_div, ecco_readbar.
f6a9bac81e Gael*3705 - cost_gencal.F (new) : determine filnames and records.
f0a41ddc00 Gael*3706 - cost_genread.F, cost_generic.F : condense code using ecco_toolbox.
f6a9bac81e Gael*3707 - cost_generic.F : use spzeroloc rather than hard-coded -9999,
3708 and exploit the above functions leading to more compact code.
f0a41ddc00 Gael*3709 - cost_genread.F : rm un-necessary arguments, re-arrange args order.
f6a9bac81e Gael*3710 - ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj,
3711 using_ers, using_gfo, using_mdt is now only defined within gencost)
6a200487bb Gael*3712 o pkg/ecco: extend generic cost capabilities
3713 - pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost
f9e490a40b Jean*3714 capabilities via gencost_preproc (+ _c,_i,_r related params),
45a442938f Gael*3715 gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod,
3716 gencost_outputlevel arguments to cost_generic
6a200487bb Gael*3717 - pkg/ecco/cost_genread.F (new) : interface between cost_generic
3718 and active_read, making room for gencost_preproc to take effect.
45a442938f Gael*3719 Added preproc code ('climmon') to replace GENERIC_BAR_MONTH.
6a200487bb Gael*3720 - pkg/ecco/cost_generic.F :
3721 compute and store misfit maks*(model-data) in localdif that is
3722 then used in cost and for output, output misfit if outlev.GT.0
3723 - pkg/ecco/cost_averagesfields.F : depend on gencost_barskip
3724 rather gencost_barfile for deciding whether to write barfile
3725 - pkg/ecco/ecco_cost_driver.F : extract call to cost_profiles from cost_hyd
3726 - pkg/ecco/ecco_cost_init_fixed.F : extract gencost weights from
3727 ecco_cost_weights, re-activate ecco_summary, determine gencost_barskip
3728 - pkg/ecco/ecco_summary.F : report gencost variables
f6a9bac81e Gael*3729 - pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs
6a200487bb Gael*3730 o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA
a883885bf1 Gael*3731 o pkg/ecco: internal re-organization
f9e490a40b Jean*3732 - resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl
a883885bf1 Gael*3733 (rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter,
f9e490a40b Jean*3734 mv relevant variables definition from ecco_cost.h to ecco.h,
a883885bf1 Gael*3735 make sure gencost routines only include ecco.h)
3736 - throughout : add missing CCP switches, rm unused variables,
3737 and rm un-necessary CPP switches
f9e490a40b Jean*3738 - throughout gencost routines : replace modelstartdate with
a883885bf1 Gael*3739 gencost_startdate when needed
3740 - cost_bp_read.F : use arguments, instead of common blocs
f9e490a40b Jean*3741 so that it can be used also by (new) cost_gencost_bpv4.F
a883885bf1 Gael*3742 - ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0
3743 - ecco_phys.F : compute etanFull
3744 - ecco_readparms.F : rename using_topex as using_tpj, add
3745 bpv4-grace to gencost list, initialize added parameters
3746 - ecco_summary.F : include SIZE.h needed for augmented ecco.h
3747
82fee2871e Jean*3748 checkpoint65e (2014/09/28)
8d1168a02a Dimi*3749 o pkg/obcs:
432b2a4585 Dimi*3750 - replaced the just-added CPP options with run-time variables
3751 (see pkg/obcs/OBCS_PARAMS.h for details)
3752 o pkg/obcs:
3753 - add additional CPP options for sponge boundary layers
8d1168a02a Dimi*3754 (see pkg/obcs/OBCS_OPTIONS.h for details)
5de066abfb Jean*3755 o pkg/atm_phys:
3756 - implement simple (obliquity only, assuming circular planet orbit)
3757 seasonal cycle for incoming insolation ; used when run-time parameter
3758 "select_incSW" is set to 1 ; by default (=0), uses old unchanged formula.
ba60baccdb Gael*3759 o pkg/exf, pkg/ecco, pkg/ctrl:
82fee2871e Jean*3760 - add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets
3761 - activate gentim2d for xx_atemp,xx_aqh,xx_swdown,xx_lwdown,xx_precip
3762 - implement gentim2d for xx_tauu, xx_tauv
3763 o pkg/ctrl, pkg/ecco :
3764 - fix and complement the generic controls implementation
f673b530c1 Gael*3765 o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F,
5de066abfb Jean*3766 pkg/shelfice/shelfice_thermodynamics.F,
3767 verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F,
3768 verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F :
3769 - add weight in CTRL_GET_GEN calls
f673b530c1 Gael*3770 o pkg/ctrl :
5de066abfb Jean*3771 - ctrl_get_gen.F : add weight as input parameter, and apply
3772 it directly rather than using smooth_correl2Dw (to be retired).
3773 - ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call
f673b530c1 Gael*3774 o pkg/ctrl :
5de066abfb Jean*3775 - introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F,
3776 ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F)
3777 - re-activate ctrl_summary (call in ctrl_init.F)
d797bbd6d6 Gael*3778 o pkg/ctrl/ctrl_cost_gen.F :
5de066abfb Jean*3779 - fix CCP brackets, remove un-necessary myiter, mytime
ba60baccdb Gael*3780 o pkg/ecco, pkg/ctrl :
5de066abfb Jean*3781 - remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F)
3782 - remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F)
3783 - add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F)
3784 - add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F)
5e10000fa1 Gael*3785
2334e86337 Jean*3786 checkpoint65d (2014/09/15)
139514ed64 Gael*3787 o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F :
2334e86337 Jean*3788 - add xx_genarr2d_bounds,xx_genarr3d_bounds,
3789 xx_genarr2d_numsmooth, xx_genarr3d_numsmooth
139514ed64 Gael*3790 o pkg/ctrl/ctrl_map_ini_genarr.F :
2334e86337 Jean*3791 - remove compilation failure
3792 - replace hard coded example
3793 - use ctrl_map_ini_gen2D, 3D
139514ed64 Gael*3794 o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F :
2334e86337 Jean*3795 - on/off switch based upon xx_genarr2d_weight,3d
15e98114ad Gael*3796 o src/packages_init_variables.F :
3797 - regroup pkg/estimation calls
3798 - remove CTRL_MAP_INI, CTRL_MAP_INI_ECCO
3799 (moved to ctrl_init_variables)
3800 o cost/cost_init_varia.F :
3801 - remove ecco_cost_init_varia
3802 (moved to ecco_init_varia)
3803 o ctrl/ctrl_init_variables.F :
3804 - add CTRL_MAP_INI, CTRL_MAP_INI_ECCO
3805 - add CTRL_MAP_INI_GENARR, SEAICE_CTRL_MAP_INI
3806 o ctrl/ctrl_map_ini.F :
3807 - remove ctrl_map_ini_genarr, seaice_ctrl_map_ini
3808 (moved to ctrl_init_variables)
3809 o ctrl/ctrl_map_ini_ecco.F :
3810 - remove ECCO_PHYS (mv to ecco_init_varia)
3811 - remove seaice_ctrl_map_ini (mv to ctrl_init_variables)
3812 o ecco/ecco_ad_diff.list :
3813 - add ecco_init_varia.f
3814 o ecco/ecco_init_varia.F
3815 - new routine
291ff6be85 Jean*3816 o pkg/streamice:
3817 - move call to STREAMICE_INITIALIZE_PETSC from the_model_main.F
3818 to streamice_init_fixed.F ; fix setting of STREAMICEisOn.
3819 - from model/src, only call pkg/streamice routines if useStreamIce is TRUE.
c4f4094732 Oliv*3820 o pkg/generic_advdiff:
3821 - fix bug causing negatives in GAD_SMOLARKIEWICZ_HACK, introduced 8/8/2014.
291ff6be85 Jean*3822 o pkg/exf:
3823 - exf_getffields.F : add xxg_atemp, xxg_aqh, xxg_swdown, xxg_lwdown,
3824 xxg_precip capability
f3207a5bb2 Gael*3825 - exf_wind.F : no need for ALLOW_WSPEED_CONTROL cpp switch
291ff6be85 Jean*3826 o pkg/ctrl:
f3207a5bb2 Gael*3827 - ctrl_pack.F, ctrl_unpack.F : omit (un)packing of undefined xx_gentim2d
291ff6be85 Jean*3828 o model/src/load_fields_driver.F :
f3207a5bb2 Gael*3829 - move call to CTRL_MAP_GENTIM2D ahead of BULKF_FIELDS_LOAD, EXF_GETFORCING
3830 so xx_gentim2d can be applied to e.g. exf fields in a timely manner.
43187e68ca Jean*3831 o OpenAD verification experiments:
3832 - Include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, and CTRL_OPTIONS.h
3833 in src files (to enable to skip the ECCO_CPPOPTIONS.h);
3834 for now, only in pkgs used in OpenAD verification experiments.
3835 - Change all except one (halfpipe_streamice) OpenAD experiments to use pkg
3836 specific option file (AUTODIFF_OPTIONS.h, COST_OPTIONS.h & CTRL_OPTIONS.h)
3837 instead of using ECCO_CPPOPTIONS.h (with all relevant options in it).
3838 This applies to both TAF (*/code_ad/) and OpenAD (*/code_oad/) tests.
3839 o OpenAD verification tests:
3840 - finish removing ALLOW_AUTODIFF_OPENAD (replaced by ALLOW_OPENAD);
3841 - finish replacing ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for
3842 tape/storage which are specific to TAF/TAMC) in pkgs used in OpenAD exp.
3843 - leave ALLOW_AUTODIFF_TAMC undef in OpenAD verification tests (*/code_oad/)
3844 and remove local copy of "tamc.h" (needed only if ALLOW_AUTODIFF_TAMC).
781c4efe3e Jean*3845 o model/src & generic_advdiff:
3846 - change hard-coded loop-range in S/R APPLY_FORCING_T/S to set T & S
3847 forcing over 0:sNx+1, 0:sNy=1 (instead of just 1:sNx,1:sNy): Model
3848 dynamics requires valid tracer forcing only over tile interior but, for
3849 some diagnostics, may need to extend it over 1 point in tile halo region.
3850 - in gad_calc_rhs.F, update calls to gmredi_x/ytransport to get valid
3851 tendency over i,j_Min,Max range. This allows to simplfy i,j_Min,Max
3852 setting in temp/salt/ptracer_integrate.F
8b57565bf5 Jean*3853 o pkg/dic:
3854 - multiply tracer tendencies by maskInC (if ussing OBCS) before updating
3855 gchem tracers: this allows to skip the 2nd call to OBCS_APPLY_PTRACER
3856 in gchem_forcing_sep.F
3857 o pkg/autodiff & obcs:
3858 - add storage of current OB values for U & V (was already done for T & S).
3859
34ab325b96 Jean*3860 checkpoint65c (2014/08/30)
649425d785 Jean*3861 o pkg/dic:
3862 - take out of dic_atmos.F the initialisation part (corresponding to istate=0)
3863 and move it to new S/R DIC_INI_ATMOS ; also simplify the dependencies for
3864 AD compilers (but still a Pb with multi-threading and Ajoint dependencies).
4084975ddf Jean*3865 o verification:
649425d785 Jean*3866 - new experiment testing OBCS and DIC pkgs, using params & output from
3867 tutorial_global_oce_biogeo but limited to a sub-domain around Drake
3868 passage: take OBCS from the last year of a 2 yrs simulation and initial
4084975ddf Jean*3869 conditions from t=1.yr while keeping the same forcing.
e564aebabb Jean*3870 o model/src:
3871 - when allowFreezing=T, only reset below freezing initial Temp to Tfreezing
3872 (at any k) if checkIniTemp is not set to FALSE (default checkIniTemp=T).
a14051dc1f Jean*3873 o pkg/diagnostics (Stats-Diags):
3874 - re-write S/R DIAGSTATS_CALC (more similar to TARGET_NEC_SX part) to:
3875 a) refine region where stats are computed, excluding where arrhFac=0 ;
3876 b) fix missing interior mask (use with OBCS) in 3-D fields statistics;
3877 c) extend regional stats over the region edges (for U or V pt location).
ec7eae4c86 Jean*3878 o pkg/gchem:
3879 - add a (2nd) call to OBCS_APPLY_PTRACER in gchem_forcing_sep.F (needed since
3880 pkg/dic is currently changing/updating ptracers values beyond the OB).
cd979ff82b Jean*3881 o verification (hs94):
3882 - convert Held & Suarez external_forcing.F (from hs94.cs, with Sigma-coords
3883 bits) to apply_forcing.F and undef USE_OLD_EXTERNAL_FORCING in experiments
3884 hs94.cs-32x32x5 and tutorial_held_suarez_cs ; also use the same version of
3885 apply_forcing.F in 2D hs94 (fwd, ad & oad) but keep LatLon hs94 unchanged.
1097960fb8 Jean*3886 o pkg/ptracers:
3887 - implement Adams-Bashforth on pTracers (instead of on tracer tendency),
3888 switched on by setting PTRACERS_doAB_onGpTr=F (default set to doAB_onGtGs)
3889 - change exp4 secondary test (input.nlfs) to test AB on T & S & pTracer
3890 with AB-2 code (so that it get tested).
3891 o model/src:
3892 - allow to apply Adams-Bashforth on Temp & Salt (instead of on gT,gS)
3893 with AB-2 code (previously only available with AB-3 code).
3894 Also move the code (call to ADAMS_BASHFORTH S/R) form thermodynamics.F
3895 to temp/salt_integrate.F (since the 2nd part of gt/sNm1 update is done
3896 there, by calling CYCLE_AB_TRACER).
3897 o pkg/generic_advdiff:
3898 - change Tracer argument (drop bi,bj indices) in S/R GAD_CALC_RHS,
3899 GAD_C2_ADV_R, GAD_U3_ADV_R, GAD_C4_ADV_R, GAD_DIFF_R, GAD_BIHARM_R
3900 + also in GMREDI_X/Y/RTRANSPORT ; and update corresponding calls in
3901 S/R temp/salt/ptracers_integrate.F
54809f081d Jean*3902 o model/src & pkg/ptracers:
1097960fb8 Jean*3903 - remove common block variables gT,gS (in DYNVARS.h), except when
3904 USE_OLD_EXTERNAL_FORCING is defined; update TAF storage accordingly.
54809f081d Jean*3905 - remove common block variable gPtr.
b613689ef8 Jean*3906 o model/src & pkgs:
3907 - change gTracer (and/or tracer) argument (drop bi,bj indices) in S/R
3908 ADAMS_BASHFORTH(2&3), CYCLE_(AB_)TRACER, FREESURF_RESCALE_G,
3909 IMPLDIFF, SOLVE_TRIDIAGONAL & _PENTADIAGONAL, GAD_SOM_ADVECT,
3910 GAD_ADVECTION, GAD_CALC_RHS, GAD_IMPLICIT_R, TIMEAVE_CUMUL_DIF_1T
3911 + change accordingly all calling S/R.
3912 - use local temperature/salinity/ptracer tendency array (without bi,bj)
3913 in S/R temp/salt/ptracers_integrate.F
da10b40ad9 Mart*3914 o pkg/seaice:
b613689ef8 Jean*3915 - move computation of stress contributions to rhsU/V in s/r seaice_lsr
da10b40ad9 Mart*3916 to separate s/r seaice_lsr_rhsu/v in order to be able to re-use code
3917 - make u/vIceC local variables if SEAICE_CGRID is defined only to be used
b613689ef8 Jean*3918 in seaice_lsr
3919 - seaice_lsr.F: make local 4D arrays UXX, VYY, etc 2D
3920 in s/r seaice_lsr_calc_coeffs
3921 o pkg/mdsio:
3922 - in MDS_READ/WRITE_FIELD, stop if file-name (+prefix) is too long
3923 (e.g., > MAX_LEN_MBUF -90 ) or, in INI_MODEL_IO, if mdsioLocalDir is
3924 too long (e.g., > MAX_LEN_FNAM/2 )
da10b40ad9 Mart*3925
175cc7f2f5 Jean*3926 checkpoint65b (2014/08/12)
3a54eed890 Jean*3927 o pkg/matrix:
3928 - pass, as argument, updated tracer field to S/R MATRIX_STORE_TENDENCY_EXP
3929 o model/src:
3930 - fix initialisation of geothermalFile; compile geothermal-flux code in
3931 natl_box verification experiment.
09c3b72571 Jean*3932 o model/src & pkg/down_slope:
3933 - push the k loop inside S/R TIMESTEP_TRACER (now called outside the k loop).
3934 - in dwnslp_apply.F, update tracer tendency instead of the future tracer
3935 field and call S/R DWNSLP_APPLY before TIMESTEP_TRACER; this affects
3936 results at machine truncation level: update output of experiments
3937 global_ocean.90x40x15.dwnslp (FWD) and lab_sea.noseaicedyn (AD).
3938 o pkg/diagnostics (Stats-Diags):
3939 - do not cumulate the full volume when DIAGNOSTICS_FILL is
3940 called with bibjFlg < 0 (no increment of the counter for 2D/3D diag);
3941 This fix the mean statistics when DIAGNOSTICS_FILL is called multiple
3942 times (but Min,Max and StD are still wrong).
66f9b25d49 Jean*3943 o model/src:
597fa58847 Jean*3944 - add geothermal flux forcing: read in ini_forcing.F as time-constant
3945 field "geothermalFlux" applied in S/R APPLY_FORCING_T (apply_forcing.F)
3946 o model/src:
3947 - move CYCLE_TRACER calls from tracers_correction_step.F to temp/salt/ptracer
3948 _integrate.F so that, when leaving S/R THERMODYANMICS, theta,salt and pTrac
3949 arrays are already updated while adjustments (filters, conv.adjustment) are
3950 still applied later, in S/R TRACERS_CORRECTION_STEP.
3951 o model/src:
66f9b25d49 Jean*3952 - store in common bloc array "rhoInSitu" the virtual potential temperature
3953 anomaly that is used to compute geopotential: this make the atmos code
3954 more similar to ocean code which already uses rhoInSitu in calc_phi_hyd.F
549401e3a9 Mart*3955 o pkg/seaice/seaice_lsr.F
3956 - rename integer variable ilcall to ipass (that's what it is called
3957 in the residual diagnostics
3958 - change time stepping for NPSEUDOTIMESTEP > 2 (does not change the
66f9b25d49 Jean*3959 default) for improved non-linear convergence of the first few steps
2344d2d5a9 Mart*3960 - adjust a few comments and add new ones to explain some of the store
66f9b25d49 Jean*3961 directives
3962 o pkg/generic_advdiff (& ptracers):
3963 - re-work the code to check for valid advection scheme and for minimum
3964 size of overlap (now stored in local common bloc in gad_advscheme.F)
d192729d83 Mart*3965 o pkg/seaice: another attempt to make the adjoint work for sea ice dynamics
3966 - re-initialize more variables in seaice_lsr: u/vIceC, u/vIceNm1
3967 - add an auxilliary variable "bet" and fix store directives and keys in
3968 seaice_lsr_tridiagu/v, this seems to do the trick (i.e. more or
3969 less exact gradients in my tests); but there are still
3970 recomputation warning (although gradients are sort of OK), when
3971 SEAICE_LSR_VECTORIZE is not defined, so this flag and
3972 SEAICE_LSR_VECTORIZE_ZEBRA are recommended for efficiency.
66f9b25d49 Jean*3973 - update verification experiments lab_sea.
d192729d83 Mart*3974 - change some comments in S/R seaice_calc_viscosities
a25b59d486 Jean*3975 o model/src:
3976 - if staggerTimeStep=T, always apply exchange to velocity field in
3977 do_stagger_fields_exchanges.F instead of in do_fields_blocking_exchanges.F
3978 (independent of using multi-dim advection or not); no effect on FWD run
3979 but affects AD results (at machine truncation level): update output of
3980 experiment 1D_ocean_ice_column (ad: 12 digits), hs94.1x64x5 (ad,oad: 13.d)
3981 and isomip (oad: 12.d).
3982 o pkg/generic_advdiff:
3983 - stop if doAB_onGtGs is set to FALSE but ignored
3984 - refine warning related to stability of tracer time-stepping
3985 regarding internal wave dynamics.
3986 - setting of AdamsBashforth_T,S when doAB_onGtGs=F: remove condition
3987 on staggerTimeStep & implicitIntGravWave (will now get a warning
3988 if potentially unstable).
56bf0dc039 Jean*3989 o pkg/kl10:
3990 - add new pkg "kl10" for mixing due to internal wave breaking, from
3991 http://www.sciencedirect.com/science/article/pii/S1463500310000144
3992 (contribution from Jody Klymak), tested in verification experiment
3993 verification/internal_wave/input.kl10/
b4dd8aa52b Jean*3994 o isomip experiment:
3995 - test pkg/shelfice with Non-Lin Free-Surf in one of the FWD set-up
3996 (input.htd) and update the output.
3997 o cd_code experiments:
3998 - use default cd_code options (#undef CD_CODE_NO_AB_MOMENTUM &
3999 #undef CD_CODE_NO_AB_CORIOLIS) in experiments: cfc_example (fwd)
4000 global_ocean.90x40x15 (ad & oad) and OpenAD (ad & oad) and
4001 update the corresponding output.
4002 o pkg/seaice:
2a89c844fd Mart*4003 - reduce the number of include files and store directives in
4004 S/R seaice_lsr_tridiagu/v
4005 - change the order of loops in one case in S/R seaice_lsr_tridiagv
4006 (only for SEAICE_VECTORIZE_LSR_ZEBRA defined), which allows me to
b4dd8aa52b Jean*4007 get rid off one store directive (a TAF bug?)
2a89c844fd Mart*4008 - add one more instance of ifdef SEAICE_VECTORIZE_LSR_ZEBRA in
4009 S/R seaice_lsr_tridiagv to change the loop range for consistency
b4dd8aa52b Jean*4010 - remove ilcall, m from parameter list of S/R seaice_lsr_tridiagu/v
2a89c844fd Mart*4011 - fix a bug that affects the JFNK solver: replace sNx/y by i/jMax in
4012 S/R seaice_lsr_tridiagu/v (requires update of
b4dd8aa52b Jean*4013 offline_exf_seaice/input.dyn_jfnk)
2a89c844fd Mart*4014
391aedad50 Jean*4015 checkpoint65a (2014/07/27)
262a665438 Jean*4016 o model/src:
90ac475d2f Jean*4017 - Non-Lin Free-Surf in p/z coords: allows hFacW,S to be larger than
4018 surrounding hFacC=1 @ edge of a step with different kSurfC on either side
391aedad50 Jean*4019 (topo in p-coords, ice-shelf in z-coords); update output of experiments
4020 tutorial_global_oce_in_p and isomip (both AD and OpenAD output).
90ac475d2f Jean*4021 o model/src:
262a665438 Jean*4022 - collect momentum forcing tendency into local 2-D array (passed as argument
4023 to apply_forcing S/R); this simplifies mom. Forcing diagnostics and CD_CODE
4024 parts in timestep.F (without CD_CODE_NO_AB_MOMENTUM defined = the default);
4025 affects results at machine truncation level (e.g., if using OBCS_SPONGE).
4026 - collect T & S forcing tendency into local 2-D array (passed as argument to
4027 apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency.
4028 affects results at machine truncation level (e.g., ocean: if using
34ab325b96 Jean*4029 SHORTWAVE_HEATING ; atmos: if using FrictionHeating or (atm_Rq<>0) moist
4030 correction due to vertical advection).
262a665438 Jean*4031 - update output of experiments: fizhi-cs-32x32x40 (13 digits),
4032 global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml:
4033 seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13),
4034 obcs_ctrl (ad & fwd grd @ 12 & 7).
a991652077 Jean*4035 o pkg/ptracers & diagnostics:
4036 - use ptracers (short) name (instead of long one) to make ptracers diagnostics
4037 title (to avoid some unexpected truncation); sort out ptracers diags units.
262a665438 Jean*4038 - collect ptracer forcing tendency into local 2-D array (passed as argument
4039 to apply_forcing S/R); add 3-D diagnostics for ptracers forcing tendency.
a991652077 Jean*4040
77d0805fa2 Jean*4041 checkpoint65 (2014/07/18)
09aa940b92 Jean*4042 o pkg/fizhi:
4043 - add parenthesis around fizhi tendencies in fizhi_tendency_apply.F: this
4044 affects results at machine truncation level. Update output of experiments
4045 fizhi-cs-32x32x40 (12 digits for cg2d) & fizhi-cs-aqualev20 (13 digits).
48bef89a30 Mart*4046 o pkg/seaice: more clean up
4047 - rename TAF common block tapes to be more consistent and remove
4048 unnecessary duplicates
09aa940b92 Jean*4049 - add store directives to remove more recomputations, but use smaller
4050 tapes (and adjust keys) when SEAICE_LSR_ADJOINT_ITER is undefined.
4051 The idea behind this flag is to reduce the memory footprint when the
4052 adjoint of the LSR is not required. As of now, defining the flag
15c6e2792a Mart*4053 SEAICE_LSR_ADJOINT_ITER increases 4 common block tapes for 2D field by
09aa940b92 Jean*4054 a factor of SOLV_MAX_FIXED (=500 by default in SEAICE_SIZE.h).
4055 For experiment offline_exf_seaice, this means on a linux box with gfortran
4056 nearly a factor of 10 (but keep in mind there is mostly seaice code in
77d0805fa2 Jean*4057 this experiment):
15c6e2792a Mart*4058 > size mitgcmuv_ad
790de314fc Jean*4059 text data bss dec hex
4060 5100659 1216 220458952 225560827 d71c8fb
48bef89a30 Mart*4061 5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER)
09aa940b92 Jean*4062 but only a moderate increase of 36% for global_ocean.cs32x15:
48bef89a30 Mart*4063 text data bss dec hex
4064 6695027 1648 1014578664 1021275339 3cdf6ccb
4065 6695203 1648 1382505320 1389202171 52cd8afb (SEAICE_LSR_ADJOINT_ITER)
4066 - note: there are still recomputations in global_ocean.cs32x15 and
15c6e2792a Mart*4067 offline_exf_seaice and the gradient agreement changes (gets a
4068 little worse) for global_ocean.cs32x15 (-> update output_adm.seaice.txt)
48bef89a30 Mart*4069 - in general, the AD gradients still are wrong
53bebe4a64 Patr*4070 o OpenAD
4071 - clean up code_oad/ directories somewhat by moving files
4072 dontCompile, dontTransform, keepOriginal to OAD_support/
f398288312 Jean*4073 o model/src:
930ff12251 Jean*4074 - using MOM fluxform and Non-Lin Free-Surf with momDissip_In_AB=F
4075 (not currently tested): add dissipation terms before NLFS rescaling of
4076 tendencies (previously done after).
4077 o pkg/diagnostics:
4078 - write stats-diags in ascii file with more digits (same as in monitor).
4079 o pkg/down_slope:
4080 - drop the bi,bj dimension of argument recip_hFac in S/R DWNSLP_APPLY; with
4081 NLFS (not tested), use new recip_hFac value in order to conserve tracer.
4082 o model/src:
f398288312 Jean*4083 - new file "apply_forcing.F" containing all the code previously in
4084 external_forcing.F, but with new argument list: pass, as new argument,
4085 the current level tendency array to update (instead of a direct update
4086 of the common bloc array). Change the corresponding calls.
4087 - add CPP option USE_OLD_EXTERNAL_FORCING (default is undef) to use
4088 EXTERNAL_FORCING_U,V,T,S subroutines (for backward compatibility).
5e1701d480 Mart*4089 o pkg/seaice/seaice_lsr, a little bit of clean up
4090 - rearrange some code blocks, so that now all calculations for
f398288312 Jean*4091 setting up the right-hand-sides done within one single block
5e1701d480 Mart*4092 (I find that easier to read and understand)
4093 - rearrange freedrift-code to reduce the number of ifdefs
4094 - adjust some indentations and comments
4095
6544591561 Jean*4096 checkpoint64z (2014/07/10)
c1d95c335c Jean*4097 o model/src and several pkgs:
4098 - change argument list of all S/R called from external_forcing.F and
4099 called from ptracers_forcing.F (renamed to ptracers_apply_forcing.F)
4100 to pass, as argument, the current level tendency array to update
4101 (instead of a direct update of the common bloc array).
4102 - change also (in the same way) argument list of PTRACERS_APPLY_FORCING;
4103 - rename taueddy_external_forcing.f to taueddy_tendency_apply.F
a122714692 Mart*4104 o pkg/seaice/seaice_lsr.F
4105 - always initialize local arrays in seaice_lsr_tridiagu/v
4106 - add more local tapes to seaice_lsr_tridiagu/v
c1d95c335c Jean*4107 - move storing u/vice(:,:,bi,bj) out of seaice_lsr_tridiagu/v, but
a122714692 Mart*4108 keep it in bi/bj loop; this seems to be essential
4109 - gradients are still wrong but only by 4-7 orders of magnitude
4110 instead of 15 orders of magnitude, lab_sea improves a little
822f9de729 Mart*4111 o pkg/seaice
4112 - (pkg/autodiff) remove storing/restoring of seaiceMaskU/V that
4113 generates unnecessary code in seaice_lsr_ad
4114 - add more store directives in seaice_lsr to avoid unnecessary code
4115 in seaice_lsr_ad
4116 - exclude some residual computations in seaice_lsr when
4117 ALLOW_AUTODIFF_TAMC is defined in order to avoid unnecessary code
c1d95c335c Jean*4118 in seaice_lsr_ad
822f9de729 Mart*4119 - add more storing, a new tape (model/src/the_main_loop.F) and
4120 another key for SEAICE_LSR_VECTORIZE_ZEBRA (the local keys ilockey
c1d95c335c Jean*4121 and klockey should be checked by a specialist)
822f9de729 Mart*4122 - modify ( define SEAICE_VECTORIZE_LSR and SEAICE_LSR_ADJOINT_ITER )
4123 and update lab_sea after previous changes in pkg/seaice below
c1d95c335c Jean*4124 o pkg/autodiff:
4125 - introduce useSmoothCorrel2DinAdMode, SEAICEapproxLevInAd, and
d572335125 Gael*4126 viscFacInAd : run time parameters allowing for adjoint switches
4127 note : logic for useSmoothCorrel2DinAdMode is in ctrl_readparms.F
c1d95c335c Jean*4128 o pkg/ecco:
4129 - introduce cost_gencost_boxmean.F that computes a box mean
d572335125 Gael*4130 temperature (for use in adjoint sensitivity studies).
4131 o model/src/set_defaults.F : initialize viscFacAdj to 1.
c1d95c335c Jean*4132 o pkg/mom_common/mom_calc_visc.F:
d572335125 Gael*4133 - ifdef ALLOW_AUTODIFF then include viscFacAdj factor.
c1d95c335c Jean*4134 o pkg/seaice/seaice_summary.F:
d572335125 Gael*4135 - statement for SEAICEadjMODE now in autodiff_readparms.F
c1d95c335c Jean*4136 o pkg/seaice:
1fa25402a0 Mart*4137 - remove some store directives and add new ones in an effort to get
4138 finally rid off the recomputation warnings. This is successful
1d0e5c687d Mart*4139 when SEAICE_VECTORIZE_LSR ***and*** SEAICE_LSR_ADJOINT_ITER are
4140 defined (i.e. no extensive recomputation warnings left), but there
4141 are still too many recomputations on the solver iteration level
0e792109e6 Mart*4142 - define SEAICE_VECTORISZE_LSR in offline_exf_seaice/code_ad/SEAICE_OPTIONS.h
e06bd90b00 Mart*4143 - move definition of MPSEUDOTIMESTEPS into TAMC-block in
4144 SEAICE_SIZE.h
4145 - add a store directive in S/R seaice_calc_viscosities
fdfdc49113 Jean*4146 o pkg/seaice (ITD code):
4147 - fix definition of Hlimit for multi-threaded case
4148 - use double precision arithmetic to compute Hlimit: this affects results;
4149 update output of experiment seaice_itd.
7f033dc113 Mart*4150 o replace content of verification/seaice_itd
4151 - instead of a 1D column use the configuration of offline_exf_seaice
4152 to test the ice thickness distribution code with ridging
4153 - this is a first shot at this experiment
4154 - change of some defaults of ridging parameters SEAICEhStar (from
4155 100 to 25) and SEAICEmuRidging (from 5 to 3) in seaice_readparms.F
fdfdc49113 Jean*4156 and lot of new comments.
7f033dc113 Mart*4157
4fddc18258 Jean*4158 checkpoint64y (2014/06/20)
4159 o pkg/seaice/seaice_reg_ridge.F:
4160 - modify the regularization of very small volumes of ice; only check
4161 total volume HEFF, and do not apply correction to individual ice
4162 classes because that leads to funny patterns in the heat and fw-fluxes
c7c86ceb32 Mart*4163 into the ocean. Adjust seaice_itd/results/output.txt
4164 - replace nITD by SEAICE_multDim in loop-ranges
0a1362090f Jean*4165 o pkg/exf:
4166 - add code to process the case field period = -12. with UV interpolation.
4167 - move debug print (formerly active when exf_verbose=T) from EXF_getFFieldRec
4168 into S/R that calls it (i.e., exf_set_gen.F, exf_set_uv.F & obcs_exf_load.F)
f893122504 Jean*4169 o verification/global_with_exf:
4fddc18258 Jean*4170 - switch all fields period to -12. (was previously untested) in input/data.exf
f893122504 Jean*4171 (but keep secondary test ".yearly" unchanged); update the reference output.
4172 o pkg/cal:
4173 - new calendar type "noLeapYear" for 365 days calendar without any leap year.
4174 o pkg/exf:
4175 - new integer parameter "exf_debugLev" (default set to main model debugLevel)
4176 to replace logical switch "exf_verbose"
4fddc18258 Jean*4177 - report in STDOUT when loading a new record (if exf_debugLev >= 3)
3d5a62f3cd Jean*4178 o pkg/sbo:
4179 - update from Katherine Quinn: evaluate mass directly from density and SSH
4180 (budget using Finite Volume method) instead of from bottom pressure.
8471337f5d Jean*4181 - allow testreport to collect few selected SBO output ; tested in exp.
4182 global_ocean.90x40x15 (after updating the results, to include SBO output).
4183 - fix some multi-threading issues (in output part).
39a405bbb4 Jean*4184 o model/src & most packages:
4185 - always call {PKG}_READPARMS even if corresponding use{PKG}=F;
4186 - in {PKG}_READPARMS, in case use{PKG}=F: add a call to new S/R
4187 PACKAGES_UNUSED_MSG to print a weak warning when parameter file
4188 "data.{pkg}" exist ; and leave the S/R (return) just after.
f459cc48d3 Jean*4189 - more standard LAND pkg interface (land_init_fixed.F, land_check.F).
4190 + call LAND_READPARMS from packages_readparms.F
39a405bbb4 Jean*4191 o pkg/seaice:
efc672bc35 Mart*4192 - remove code that resets useThSice in S/R seaice_readparms and
c7c86ceb32 Mart*4193 replace it by a warning in S/R seaice_check
efc672bc35 Mart*4194 - remove parameter MULTDIM, replace with nITD and runtime
4195 parameter SEAICE_multDim (still hard-wired to nITD if
4196 SEAICE_ITD is defined)
4197
32263cf74c Jean*4198 checkpoint64x (2014/05/24)
bb8f3ffecf Patr*4199 o verification/lab_sea:
32263cf74c Jean*4200 - update adjoint and TLM output following changes to pkg/salt_plume
4201 - un-do the update after putting back local recip_Cp in few places.
bb8f3ffecf Patr*4202 o pkg/salt_plume: modifications by An Nguyen:
32263cf74c Jean*4203 - add capability to do brine rejection (salt-plume) as function of
bb8f3ffecf Patr*4204 volume+tracers (instead of only salinity tracer).
32263cf74c Jean*4205 - conserve volume by exchanging volume from each kLev to above to
bb8f3ffecf Patr*4206 accommodate in-coming brine volume
4207 - store surface and klev exchanged fraction + volume in 4 new 3-d arrays
32263cf74c Jean*4208 - switch KPP surf buoyancy due to brine forcing to 3-d
bb8f3ffecf Patr*4209 (3 more 3-d arrays, 2 for SPforcing[T,S], 1 for boplume)
4210 - add salt_plume_volfrac, salt_plume_apply, salt_plume_tendency_apply_t
32263cf74c Jean*4211 - unrelatedly, also add ad-hoc capability to vary salt_plume scheme
bb8f3ffecf Patr*4212 in East/West Arctic.
751362a27d Jean*4213 o pkg/sbo:
32263cf74c Jean*4214 - incorporate modifications from Katherine Quinn to enable the use of sbo
751362a27d Jean*4215 pkg in ECCO-v4 set-up ; remove SBO-TimeAve output ; add monitor-like
4216 output for future testreport verification (unfinished).
60958941f8 Jean*4217 o pkg/atm_phys:
4218 - change diagnostics (AtPh_Trf & AtPh_Qrf) of DARGAN_BETTSMILLER S/R:
4219 skip the reseting of t_ref & q_ref to initial t & q ; this preserve the
4220 output of S/R CAPECALCNEW (Parcel temp & q) for diagnostics.
0ad17fdd8c Mart*4221 o pkg/seaice
60958941f8 Jean*4222 seaice_calc_ice_strength.F: modify expression to avoid divisions
0ad17fdd8c Mart*4223 (affects truncation)
4224 seaice_do_ridging.F: clean up the insectarium
3fba0517c3 Mart*4225 - fix a bug that was compensated by areaScaling (-> remove areaScaling code)
4226 - added SEAICEsnowFracRidge to redistributed snow (2nd bug)
4227 - set closing/openingRate to zero where no extra iteration is need (3rd bug)
60958941f8 Jean*4228 - add some debugging information and error messages (warnings)
b062ea86d0 Jean*4229 o model/src: modifications relatd to atmosphere p*:
4230 - Switch to more accurate p* coordinate slope term (calc_grad_phi_hyd.F)
4231 - With p* or Sigma-P, use constant reference Pot.Temp (thetaConst) instead
4232 of vertical profile tRef in geopotential background and anomaly.
4233 - Acount for true p* correction in theta <-> T conversion in pkg/aim_v23
4234 and pkg/atm_phys.
4235 - Update FWD output of experiments: aim.5l_cs (x2), fizhi-cs-32x32x40,
4236 fizhi-cs-aqualev20, fizhi-gridalt-hs, tutorial_held_suarez_cs, cpl_aim+ocn.
419c1f0b27 Mart*4237 o pkg/seaice: fix a bug in seaice_prepare_ridging.F, forgot a sqrt
1c0e70142a Oliv*4238 o pkg/ptracers: compute ptracer source/sink due to linear free surface.
4239 not used right now, but can be used in BGC packages to fix conservation.
4240 o pkg/dic, pkg/gchem: move tracer_meanarea to gchem, so it can be used by
4241 other packages too.
b062ea86d0 Jean*4242 o pkg/seaice/seaice_calc_ice_strength.F: replace SEAICE_rhoSnow by
4243 SEAICE_rhoIce in the Rothrock (1975)-type strength calculations (bug fix)
728a44199c Jean*4244 o model/src:
4245 - since we have several heat capacity (even in model/src), define "recip_Cp"
4246 as local variable (no longer in common block) to avoid any confusion.
4247 - add thetaConst in PARAMS.h (to be used with pStar or sigma-P coords).
7bb11c2f45 Jean*4248 o pkg/exf:
4249 - from Jeff Scott: add option (#define EXF_CALC_ATMRHO) to calculate local
4250 air density as function of air Temp, Humidity and atm pressure.
4251
80e9662843 Jean*4252 checkpoint64w (2014/05/02)
4faee70d47 Jean*4253 o verification:
4254 - update output_adm.txt files for experiment global_ocean.cs32x15 (seaice &
4255 seaice_dynmix) and lab_sea (primary test & noseaicedyn): moving/changing
4256 code from seaice_growth.F & seaice_advdiff.F to new ridging routines
b062ea86d0 Jean*4257 seaice_reg_ridge.F seaice_do_ridging.F affects AD gradient
419c1f0b27 Mart*4258 (down to 8-7 matching digits for global_ocean and 5-6 for lab_sea).
bcc533dbd4 Jean*4259 o model/src: for atmosphere in p* coords:
4260 - store factor rStarFacC**atm_kappa (= pStarFacK) in common block
4261 - implement more accurate p* coordinate slope term (in calc_grad_phi_hyd.F),
4262 but not yet activated.
cabb1e150c Mart*4263 o pkg/seaice: fix restart problem for ITD with new ice strength parameterisation:
4264 - move computation of opnWtrFrac = 1-AREA to before computing ice strength
bcc533dbd4 Jean*4265 - this changes the results (but not for any verification experiment, because
4266 none tests this), but avoids having an extra field in the restart files
97d542e805 Mart*4267 o pkg/seaice: remove global variable TICE (not needed)
bcc533dbd4 Jean*4268 - replace by TICES or local variable where necessary (cost_seaice_test,
97d542e805 Mart*4269 seaice_diagnostics_state)
4270 - move copying TICE to TICES from seaice_check_pickup to seaice_read_pickup
4271 - use specific read/write routines for reading and writing individual leves
4272 of a multilevel field
b1bf8777db Jean*4273 o pkg/ctrl & model/inc:
4274 - move additional anomaly fields of control vars (related to options:
4275 ALLOW_KAPGM_CONTROL, ALLOW_KAPREDI_CONTROL and ALLOW_BOTTOMDRAG_CONTROL)
4276 from DYNVARS.h into new header file: CTRL_FIELDS.h
cc5e1bc684 Mart*4277 o pkg/seaice: some small modifications to the ridging code
4278 - make fw2ObyRidge a global variable and add the freshwater flux to
4279 seaice_growth
b1bf8777db Jean*4280 - pass actual thickness from seaice_prepare_ridging, so that it is
cc5e1bc684 Mart*4281 computed only in one place and compute it in the same way as in
4282 seaice_growth
4283 - initialise more fields in seaice_do_ridging that where cause floating
4284 point exceptions over land
e990a77247 Mart*4285 o pkg/seaice: preparations for ridging code and first real ridging code
b1bf8777db Jean*4286 - move most of "PART 1" of S/R seaice_growth into a new and separate
e990a77247 Mart*4287 S/R seaice_reg_ridge that will both regularize the state variable after
4288 advection call the actual ridging routine;
b1bf8777db Jean*4289 - requires to make 5 fields global fields: d_HEFFbyNEG,d_HSNWbyNEG,
e990a77247 Mart*4290 d_AREAbyRLX,d_HEFFbyRLX,saltFluxAdjust;
4291 - remove ridging code from seaice_advdiff
b1bf8777db Jean*4292 - clean up remaining part 1 of seaice_growth in an attempt to make it
e990a77247 Mart*4293 more readable (this is probably subjective)
4294 - call seaice_itd_redist once in the initialisation phase to have the initial
4295 conditions in the correct category
4296 - finally: add new ridging routine for ITD code
4297
e36f9ede36 Jean*4298 checkpoint64v (2014/04/11)
9994e4e8cb An T*4299 o pkg/ecco:
4300 - add runtime parameters mdt[start,end]date[1,2]
4301 - rename variable "tpmean" as "mdt" and "topexmeanfile" as "mdtdatfile"
e36f9ede36 Jean*4302 o pkg/seaice:
4303 - make deltaC a global variable, so that it can be used in ridging code
67f02628d2 Mart*4304 - first step towards ridging: introduce new routines that compute
4305 ice strength based on ridging parameters
79793b3c13 Mart*4306 - add diagnostic for HSNOWITD
4307 - add opnWtrFrac as a global variable (required for ridging scheme)
9994e4e8cb An T*4308 o pkg/salt_plume + pkg/seaice/seaice_growth.F
4309 - add SALT_PLUME_IN_LEADS flag to activate pkg/salt_plume only when ice
4310 AREA exceeds a threshold (code contributed by I.Fenty in 2011)
684ea763ea Jean*4311 o verification/hs94.1x64x5:
4312 - leave ALLOW_AUTODIFF_TAMC undefined in code_oad/AUTODIFF_OPTIONS.h
4313 - do not use ECCO_CPPOPTIONS.h anymore for TAF & OpenAD Adjoint tests.
4314 o autodiff:
4315 - Start to include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h,
4316 and CTRL_OPTIONS.h in src files (to enable to skip the ECCO_CPPOPTIONS.h)
4317 For now, only in pkgs used in verification/hs94.1x64x5.
4318 - Replace ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for tape/storage
4319 which are specific to TAF/TAMC).
4320 - Replace ALLOW_AUTODIFF_OPENAD by ALLOW_OPENAD:
4321 since ALLOW_OPENAD is defined in PACKAGES_CONFIG.h (any time pkg/openad
4322 is compiled), this simplifies/reduces which *_OPTIONS.h file to include.
4323 - OpenAD: change Makefile to generate the appropriate AD_CONFIG.h when
4324 building mitgcmuv_ad (make adAll).
d85e4bb9df An T*4325 o pkg/ecco:
4326 - cost_gencost_seaicev4.F:
4327 reformulate proxy cost as function of sst and local param SEAICE_freeze
4328 change cost names from siv4-[sst,vol] to siv4-[deconc,exconc]
4329 - add stop statement if old names siv4-[sst,vol] are used
4330 - add snapshots + cost reports for atmospheric longwave
4331 - remove factor 0.1 in front of wtau[u,v]
4332 - replace never used flag ALLOW_TMI_COST_CONTRIBUTION with
4333 ALLOW_TMI_SST_COST_CONTRIBUTION
684ea763ea Jean*4334 o pkg/atm_phys:
d68eb785a9 Jean*4335 - add some diagnostics for Short-wave and for convection S/R.
684ea763ea Jean*4336 o pkg/seaice/seaice_growth:
ea66a54ac4 Mart*4337 - fix a bug in the lateral melt parameterization for SEAICE_ITD
4338 in seaice_growth; tempFrz needs to be computed inside the i/j-loop
4339 - rearrange loop order for better vector code in the same code block
4340 - rewrite the floeDiameter formula to have fewer divisions
4341 - (miraculously) none of this changes the results of seaice_itd
684ea763ea Jean*4342 o pkg/smooth:
4343 - move param smooth2Ddiffnbt to pkg/ecco
4344 o pkg/salt_plume:
4345 - salt_plume_frac.F:
4346 clean up local param names
4347 reformulate (1-frac) to frac; original 1-frac was based on swfrac code
6d2104f414 Jean*4348 o pkg/rw:
4349 - add RS version of S/R READ_MFLDS_LEV.
4350 o pkg/streamice:
4351 - fix the restart test by writing/reading pickup_streamice files.
4352 o pkg/seaice:
0e4bf54f91 Mart*4353 - refine checks for jfnk-related parameters
4354 - comment out if statement with SEAICEuseIMEX parameter as long as there
4355 is no IMEX code to avoid confusion and surprises
4356
1b217122f8 Jean*4357 checkpoint64u (2014/03/07)
85157af967 Jean*4358 o verification/MLAdjust:
4359 - rename secondary test suffix:
4360 1.leith -> A4FlxF + switch to flux-form & add side-drag
4361 0.leithD -> AhFlxF + switch to flux-form
4362 0.smag -> AhVrDv (use Vorticity-Div. visc form) + add side-drag
4363 0.leith -> AhStTn (use Strain-Tension visc form) + add side-drag
f0b594ffe2 Jean*4364 o pkg/mom_vecinv:
4365 - remove unused arguments from S/R MOM_VI_HDISSIP & MOM_HDISSIP (as it used
4366 to be before mom_calc_visc.F)
4367 - skip the call to MOM_CALC_TENSION & MOM_CALC_STRAIN if not needed.
4368 - add 2nd copy of vort3 & strain that knows about lateral BC (free/no slip):
4369 this is simpler for the adjoint and for diagnostics.
7ab8a42a9d Jean*4370 o model/src + pkg/momentum:
4371 - add input files for 2-D additional Western and Southern cell-edge wall
4372 (e.g., to add "thin-wall" where it is =1).
4373 - fix sideDrag option for thin-walls with Non-Lin Free-Surf
4374 using 2nd hFacZ that is computed from initial (fix domain) hFac
4375 - known limitations of thin wall implementation: not yet coded for sigma
4376 coords; not working with CD-scheme neither.
21cfbf5d41 Jean*4377 o pkg/seaice:
65555308b7 Mart*4378 - rename recently introduced parameters from (wrong name) AB to
4379 BDF (backward difference time discretisation)
4380 - retire runtime parameters SEAICEuseAB2, SEAICE_abEps
21cfbf5d41 Jean*4381 o tools/adjoint_options:
4382 - remove setting of "OPENAD=true" (now set by command line "genmake2 -oad")
65555308b7 Mart*4383
0819a3aef8 Jean*4384 checkpoint64t (2014/02/01)
d85e4bb9df An T*4385 o pkg/ecco
4386 - add compile flag ALLOW_GENCOST_TIMEVARY_WEIGHT in ECCO_OPTIONS.h and
4387 runtime logical flag gencost_timevaryweight to read daily sea-ice sigma
4388 - replace hard-coded record number and period which only work for monthly
4389 with read-in runtime param that works for other periods (month,day,year)
a4e96d71ae Patr*4390 o pkg/thsice
4391 - corrected store directive fixes thsice adjoint gradient checks
c610335cdc Jean*4392 o genmake2 & testreport:
4393 - add genmake2 option "-oad" to generate a Makefile for OpenAD built and
4394 in this case, use tools/adjoint_options/adjoint_oad as default AD optfile.
4395 Update testreport accordingly. No need to set "export OPENAD=true"
4396 in adjoint_options/adjoint_oad anymore (will be removed later).
9a846a36d2 Jean*4397 o pkg/shelfice:
4398 - put T & S shelfice forcing into model surfaceForcing_T,_S (for now,
4399 only if SHELFICEboundaryLayer=F); Change model/src/external_forcing.F
4400 so that surface forcing applies to k=kSurf if using pkg/shelfice.
62997f5aad Patr*4401 o pkg/ctrl, pkg/grdchk, pkg/ecco:
9a846a36d2 Jean*4402 - Changes to make GENARR more modular (i.e. invisible if not used)
cde67b4ce1 Gael*4403 o model/src/temp_integrate.F and salt_integrate.F
9a846a36d2 Jean*4404 - re-include store directives that were removed on Dec 27th.
3dbdd94ad6 Gael*4405 o model/src/external_forcing_surf.F
9a846a36d2 Jean*4406 - add storage directives for EmPmR and PmEpR to avoid recomputation of
4407 seaice_model in the adjoint that is problematic when seaice_model is
4408 turned off in the adjoint. The resolved issue dated back to July when
4409 EXTERNAL_FORCING_SURF call was moved.
4410 Update global_ocean.cs32x15/*/output_adm.seaice_dynmix.txt accordingly.
20bd954105 Mart*4411 o pkg/exf/exf_check.F
9a846a36d2 Jean*4412 - fix a small bug again (originally found by Wentao Liu, now found again)
4413 - streamline error output
20bd954105 Mart*4414 o pkg/streamice and aim_v23:
9a846a36d2 Jean*4415 - replace a few "_EXCH_XY_RL (" with "_EXCH_XY_RL(", so that
4416 Apple's /usr/bin/cpp knows what to do:
4417 Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
4418 Target: x86_64-apple-darwin13.0.0
20bd954105 Mart*4419
f23338cc5b Jean*4420 checkpoint64s (2014/01/05)
ce5f09424a Jean*4421 o tools/adjoint_options:
4422 - switch to fastopt.net TAF server (instead of default fastopt.de) for
4423 AD optfiles adjoint_diva & adjoint_f95 (similar to adjoint_default).
4424 o model/src:
4425 - remove some unnecessary TAF storage directives in forward_step.F and
4426 in dynamics.F (note: not always removed by TAF, e.g., double storage
4427 of kappaRU,kappaRV in former version of dynamics.F).
f2a2ecef28 Jean*4428 o model/src & pkg/ptracers:
ce5f09424a Jean*4429 - call directly GAD_IMPLICIT_R & IMPLDIFF + DWNSLP_APPLY from temp_integrate.F
f2a2ecef28 Jean*4430 salt_integrate.F and ptracers_integrate.F (instead of from thermodynamics.F)
4431 and remove ptracers_dwnslp_apply.F & ptracers_implicit.F
4432 - call MATRIX_STORE_TENDENCY_EXP for each tracer (in ptracers_integrate.F)
4433 - add fZon & fMer as output argument of S/R GAD_CALC_RHS.
4434 - update TAF AD-output of experiments global_ocean.90x40x15 (13 for AD-grad).
e71dbcdc66 Jean*4435 o useSingleCpuInput separates single-CPU input from single-CPU output;
4436 for now only implemented for in exf_interp_read.F
4437 o verification/advect_xy:
4438 - fix missing EXCH call in local version of ini_salt.F and update output.
4439 o momentum diagnostics:
4440 - fix which deltaT is used in Total-Tendency diagnostics.
4441 - fix typo in diagnostics for momentum tendency from AB.
4442 o pkg/seaice/seaice_lsr.F: fix an initialisation bug for the
4443 SEAICE_VECTORIZE_LSR_ZEBRA option that lead to NaNs on a NEC-SX8
05b3bcee70 Mart*4444
49ba07ded8 Jean*4445 checkpoint64r (2013/12/08)
21fae43a0a Jean*4446 o verification/*/results:
4447 - Update reference output of experiments that were passing with just 13 digits
4448 (make it easier to detect future changes in results)
4175fa5a6c Jean*4449 o model/src & pkg/ptracers:
4450 - move calls to GAD_ADVECTION (Multi-Dim advection) from thermodynamics.F to
4451 inside temp_integrate.F and salt_integrate.F and from ptracers_advection.F
4452 to inside ptracers_integrate.F ; remove ptracers_advection.F
13e111d31a Jean*4453 o coupling interface pkgs:
4454 [atm_compon_interf, ocn_compon_interf & atm_ocn_coupler]
4455 - change the config check to test the agreement of Ocean Depth
4456 with ATM land/sea mask (instead of ATM orography);
4457 - send to coupler the number of coupler time-steps to do for this run:
4458 this allows to check for consistency and don't need anymore to be
4459 specified in parameter file "data";
4460 in coupler:
4461 - check consistency of RunOff map versus Ocean Depth and ATM land/sea mask.
4462 - improve report to log-file of config setting (pass log-file unit to few S/R)
4463 o pkg/compon_communic:
4464 - add coupling send/receive for non-tiled integer vector;
4465 - add S/R to check and stop if any proc has an error (similar to
4466 eesupp/src/stop_if_error.F but single thread and across Comm_World).
b7f9d4a417 Jean*4467 o pkg/exch2:
4468 - in exch2*_get_rx[1,2]: use new list "W2_tileIndex" to replace search
4469 through list of all tiles my proc owns.
4470 o model/src:
4471 - AUTODIFF only: in calc_adv_flow.F, recompute rTransKp (instead of copying
4472 from rTrans) to simplify dependencies (no need to store rTrans anymore in
4473 calling S/R); this affects AD results at machine truncation level:
4474 update AD-output (TAF) of experiments: 1D_ocean_ice_column,
4475 bottom_ctrl_5x5 & obcs_ctrl (12 digits for AD grad, same FWD grad).
1088379d6a Jean*4476 o tools/build_options:
4477 - simplify Warnings options (-ieee & -devel cases) in linux_amd64_gfortran
4478 o coupling interface pkgs:
4479 [compon_communic, atm_compon_interf & ocn_compon_interf]
4480 - move declaration of local array "ibuf" out of header file "CPLR_SIG.h"
4481 to each S/R that needs it; remove un-used variables.
4482 - change component tile registration (cpl_register.F in both compon_interf
4483 and mitcomponent_tile_register.F) to pass the full list of tiles
4484 information (including bi,bj) in 1 vector (instead of in a bi,bj matrix).
4485 - with pkg/exch2: adopt the same convention used for I/O to define mapping
4486 towards coupler global array (unless W2_useE2ioLayOut=F):
4487 a) can now use different tiling between atm & ocn comp.
4488 b) no needs to modify the run-Off map when changing tiling (was needed
4489 even if using the same tiling between atm & ocn).
4490 c) will allow to run with blank-tiles in 1 component (e.g., for ocean
4491 full land tiles); not yet tested.
4492 - check for valid mapping from comp. tile to coupler global array
4493 - improve report of tile registration results to log file.
4494 o pkg/exch2:
4495 - in eesupp/src/eeboot.F: move call to W2_EEBOOT before Coupler
4496 tile-registration (CPL_REGISTER);
4497 - activate (un-comment) definition and setting of "W2_tileIndex" list to
4498 store the local bi,bj indices of each tile;
4499 - also print bi,bj in local report to log file;
4500 - fix pkg/debug/debug_cs_corner_uv.F for the case nSy > 1 (left from
4501 Jun 2009 modif of pkg/exch2).
4502 o testing on baudelaire:
4503 - run 2 tests at a time: no significant slow down (since enough cpu) and
4504 get the full set of test done earlier
4505 - switch the ifort test to "-devel" ; run the OpenAD test everyday.
a9265de95a Jean*4506 o model/src/thermodynamics.F and routines called from it:
4507 - pkg/gmredi: gmredi_residual_flow.F (replacing gmredi_calc_uvflow.F &
4508 gmredi_calc_wflow.F) to update eulerian velocity (input) into residual
4509 velocity (outp) by adding bolus velocity.
4510 - model/src: calc_adv_flow.F (replacing calc_common_factors.F) to compute
4511 mass transport from velocity + lateral grid cell area
4512 - rename calc_gt.F to temp_integrate.F (includes call to TIMESTEP_TRACER)
4513 - rename calc_gs.F to salt_integrate.F (includes call to TIMESTEP_TRACER)
4514 in thermodynamics.F
4515 - remove k from thermodynamics.F and move it to temp_integrate.F
4516 salt_integrate.F and ptracers_integrate.F (now done inside the tracer
4517 loop).
4518 - compute locally (in thermodynamics.F) 3-D velocity field that is used to
4519 advect tracers; pass it as argument to GAD_ADVECTION, GAD_SOM_ADVECT,
4520 PTRACERS_ADVECTION, TEMP_INTEGRATE, SALT_INTEGRATE, PTRACERS_INTEGRATE,
4521 GAD_IMPLICIT_R and PTRACERS_IMPLICIT
4522 - update AD-output (TAF & OAD) of experiments: 1D_ocean_ice_column,
4523 global_ocean.90x40x15, tutorial_global_oce_biogeo and
4524 tutorial_tracer_adjsens (+ TLM output).
1088379d6a Jean*4525 o tools/OAD_support and (verification/*/) code_oad:
8f959368b3 Jean*4526 - OAD_support/cb2mGetModules.csh: add PACKAGES_CONFIG.h in header file to
4527 module conversion ; remove unneeded CPP_EEOPTIONS.h.
4528 - code_oad/CPP_OPTIONS.h: remove PACKAGES_CONFIG.h and use a more standard
1088379d6a Jean*4529 version (closer to model/inc/CPP_OPTIONS.h).
8f959368b3 Jean*4530 o model/src:
4531 - remove parameter "useOldFreezing" from PARAMS.h and push it to the
4532 retired list of parameters (routine FREEZE has been replace by surface
4533 freezing (10.yrs ago) and by pkg/frazil (interior freezing).
4534 o pkg/gmredi:
4535 - add option (GM_CALC_TRANSP_FROM_VEL) to compute transport directly from
4536 velocity (same scheme but affects machine truncation) for GM_AdvForm.
4537 - update output of FWD experiments: front_relax.bvp,
4538 global_ocean.90x40x15.dwnslp, global_ocean.cs32x15 and ideal_2D_oce.
4539
ccabb03de3 Jean*4540 checkpoint64q (2013/11/17)
7669301999 Jean*4541 o verification:
4542 - generate new output on baudelaire (gfortran, -ieee) for OpenAD experiments
4543 tutorial_global_oce_biogeo and global_ocean.90x40x15.
4544 - generate new output (growth & melt) for seaice_itd experiment after
4545 updating the input pickup_seaice files (previously wrong).
d498609aae Jean*4546 o pkg/cost:
4547 - define a "final cost function" for each tile, and use GLOBAL_SUM_TILE_RL
4548 (instead of _GLOBAL_SUM_RL) to get the final cost from all procs & threads:
c610335cdc Jean*4549 o this fixes global-sum value if multi-threads (since GLOBAL_SUM_RL
d498609aae Jean*4550 cannot be applied to var in common block).
4551 o allows to get results independent of tile-per-proc setting (if using
4552 slower GLOBAL_SUM_SEND_RECV option).
4553 - update accordingly: seaice_cost_final.F, shelfice_cost_final.F,
4554 thsice_cost_final.F and ecco_cost_final.F (this one affects lab_sea
4555 forward gradients: update output).
4556 - update */code_oad/externalDummies.F by adding dummy GLOBAL_SUM_TILE_RL
4557 S/R and, for most exp., also comment out GLOBAL_SUM_R8.
586c949ecf Jean*4558 o pkg/mom_common:
4559 - move to pkg/mom_common and model/src (previously in tutorial_deep_convection
4560 code) 2nd version of isotropic 3-D Smagorinsky code interface: strain and
4561 viscosity are locally declared in dynmics.F and pass as argument to CALC_GW;
4562 ensure that all field value that are used are set.
4eccb07ab1 Jean*4563 o tutorial_deep_convection (smag3d):
4564 - add missing scaling in mom_calc_smag_3d.F;
4565 - set smag3D_coeff in input.smag3d such that results do not change.
4566 o pkg/dic:
4567 - change dic_cost.F to compute cost on each tile first and then apply
4568 GLOBAL_SUM_TILE_RL: this affects forward gradient of AD experiments
4569 tutorial_dic_adjoffline & tutorial_global_oce_biogeo; update output.
35050126c6 Oliv*4570 - remove kLev argument and use GLOBAL_SUM_TILE_RL in tracer_meanarea.
a5d44ed107 Jean*4571 o eesupp/src & pkg/mdsio:
4572 - remove gather/scatter_vector.F (from eesupp) and mdsio_read/writevector.F
4573 (from pkg/mdsio) since they are no longer used for tape IO.
4574 - move simple C subroutine "setdir.c" from pkg/compon_communic to eesupp/src
4575 (+ keep a copy in pkg/atm_ocn_coupler).
2e81182906 Jean*4576 o verification/isomip:
4577 - split domain in 8 squared tiles (instead of just 2) for FWD, AD & OAD tests.
4578 o tools/build_options:
4579 - optfile linux_amd64_ifort11, fast (no ieee) case:
4580 to get a working restart for all experiments, add "-fp-model source"
4581 to FOPTIM (also remove "-opt-streaming-stores auto" <- this is the default).
4582
a01940b562 Jean*4583 checkpoint64p (2013/10/20)
5bfbd26026 Jean*4584 o pkg/autodiff:
4585 - adread_adwrite.F: when type and length do not match ALLOW_AUTODIFF_WHTAPEIO
4586 criteria, return to simple (default) tape IO format.
645a01b465 Jean*4587 o pkg/mdsio (+ eesupp/src):
4588 - rewrite/simplify tape-IO S/R (new S/R MDS_READ/WRITE_TAPE replace
4589 previous MDSREAD/WRITEVECTOR) with 2 array argument from each type (R4/R8);
4590 - fix globalFile and singleCpuIO options using simpler global mapping.
4591 - new pairs of scatter/gather vector S/R (one for each type, generated from
4592 template) corresponding to simpler global mapping.
4593 - adread_write.F: switch to new S/R (but leave old calls commented) and write
4594 to globalFile when parameter globalFiles is set to True.
4595 - switch on useSingleCpuIO in AD experiments: global_ocean.90x40x15 & isomip.
b798a7d810 Jean*4596 o pkg/autodiff:
5bfbd26026 Jean*4597 - adread_adwrite.F: add a hack for RS arrays (when RS=real*4);
4598 with ALLOW_AUTODIFF_WHTAPEIO defined, since corresponding (real*4) is
b798a7d810 Jean*4599 missing, just add a STOP if array type do not match.
dc136770de Jean*4600 o pkg/exf:
4601 - to allow to use seaice-fraction from pkg/exf in other pkgs than pkg/seaice:
4602 rename CPP option EXF_ALLOW_SEAICE_RELAX to EXF_SEAICE_FRACTION
4603 and rename array obsSIce to exf_iceFraction.
94e0cca872 Jean*4604 o tutorial_deep_convection:
4605 - add 1rst version of isotropic 3-D Smagorinsky code (from Louis-Philippe),
4606 for now all in this exp. code dir.
4607 - add secondary test using Smag-3D viscosity (keep very low backgroud visc for
4608 testing) and flux-limter advection scheme for Temp. (no explicit diffusion).
4609 o eesupp/src:
4610 - added SINGLE_DISK_IO option because reading of parameter files on
4611 very large number of processors did not work with existing set-up
4612
cc89d07104 Jean*4613 checkpoint64o (2013/09/25)
4614 o pkg/atm_phys & atm_compon_interf:
4615 - allows for coupling of gray-atmosphere (atm_phys) with ocean.
6bd6f7be12 Jean*4616 o tools/build_options:
4617 - switch from "-fPIC" to "-mcmodel=medium" in optfiles: linux_amd64_gfortran
4618 & linux_amd64_ifort11 and in linux_amd64_g77 & linux_amd64_open64 also
4619 remove CPP setting (was identical to genmake2 default).
1115280ea7 Mich*4620 o pkg/gmredi & model/src: Some updating and work done on the residual model.
4621 - created new file model/src/calc_eddy_stress.F to calculate the eddy stress.
6bd6f7be12 Jean*4622 - fixed up the calculation of the eddy stress and how it is added to the
1115280ea7 Mich*4623 external forcing via taueddy_external_forcing.F
4624 - at the moment, it is very experimental and only works with the variable eddy
4625 diffusivity calculated in gmredi_k3d.F
6bd6f7be12 Jean*4626 o pkg/seaice/seaice_check.F: add a check to catch the case of specifying
4627 lw/swfluxfile instead of lw/swdownfile in data.exf together with pkg/seaice
4628 o testreport (& tools/do_tst_2+2):
4629 - for MPI test, set default COMMAND to 'mpirun -v -np TR_NPROC ./{executable}'
addfa94074 Jean*4630 o tools/build_options: linux_amd64_gfortran & linux_amd64_ifort11:
4631 - remove CPP='cpp -traditional -P' (this is genmake2 default)
4632 - add switch (for big setups) to use 'medium' memory-model (but leave it
4633 commented out for now). Note: needed with FC 19 to compile big setups.
3dca81485c Jean*4634 o pkg/atm_compon_interf:
4635 - regroup per field origin (model & pkgs) the coupling storage routines
4636 (which accumalate in time each coupling field)
addfa94074 Jean*4637 - move bi,bj loops inside atm_store_my_data.F and store also wind-stress;
3dca81485c Jean*4638 update accordingly + simplify aim_do_physics.F
4639
8f1243bebb Jean*4640 checkpoint64n (2013/08/26)
5f5cc705f4 Dimi*4641 o pkg/bbl:
4642 - update formulation to reduce dispersion of tracer properties in bbl
4643 - replaced horizontal and vertical transport parameters with velocities
4644 - changes results for verification/global_with_exf.yearly
ffbb57e6f3 Dani*4645 o verification/halfpipe_streamice:
4646 - change to matrix construction; update both Fwd & AD output.
c91228a3b5 Jean*4647 o verification/tutorial_tracer_adjsens:
4648 - OpenAD test: switch to vector-invariant momentum since fluxform with
4649 rStar causes problems with OpenAD; update output.
983705b2af Jean*4650 o tools:
c91228a3b5 Jean*4651 - genmake2: define a common prefix for all temp-file names ; move them
4652 to local /tmp disk (but would be easy to move them back);
4653 - xmakedepend: apply the same switch for temp-files.
983705b2af Jean*4654 o pkg/offline:
c91228a3b5 Jean*4655 - changes for use with rStar (NLFS): assume that we continue to provide
983705b2af Jean*4656 UVELMASS/hFacW_ini & VVELMASS/hFacS_ini (hFacWi,S_ini as written in grid
4657 output files) and apply r* scaling at each time-step (function of the time
4658 varying Eta field); use normal pickup files (needed for restart with NLFS).
28e8749e94 Oliv*4659 o adjoint with OpenAD:
4660 - move OpenAD-specific files from verification/OpenAD/code_oad_all to a new
4661 package openad. This package has to be compiled for all runs with OpenAD
4662 instead of specifying code_oad_all as a modification directory.
4663 - link the fortran templates from tools/OAD_support to the build directory
4664 for preprocessing to avoid conflicts between different setups compiled
4665 simultaneously and simplify cleanup.
96b2fd29af Jean*4666 o pkg/exf:
4667 - in exf_getforcing.F: comment out most of the EXCH calls (fields used by
4668 main model or other pkgs are exchanged in EXF_MAPFIELDS).
4669 o model/src:
4670 - do_stagger_fields_exchanges.F: skip EXCH calls when using pkg/offline
4671 (similar to do_fields_blocking_exchanges.F).
4672 o tools/genmake2:
4673 - remove TAF output src code just before calling staf (when not doing a fresh
4674 built, will stop if things go wrong with staf).
4675 - fix target "adobj" (left from TAF version-2 transition)
2cbfd59e75 Jean*4676 o pkg/diagnostics:
4677 - add a parameter to track the status of pkg/diagnostics activation;
4678 this replace/extend the use of logical param "settingDiags" (to check
4679 when adding diag to the list) to also check any DIAGNOSTICS_[]FILL* call.
4680 New S/R to print error message and stop when pkgStatus is not right.
4681 - to try: add a warning when "data.diagnostics" exist but useDiagnostics=F.
4682
45d3f75a8f Jean*4683 checkpoint64m (2013/08/13)
ee9d1fdd8f Jean*4684 o model/inc:
4685 - move FCORI_MACROS.h from PARAMS(_MACROS).h to GRID_MACROS.h (left from
4686 8 yrs ago modif when Coriolis arrays were moved from PARAMS.h to GRID.h)
4687 o pkg/kpp & aim_v23:
4688 - only call DIAGNOSTICS_FILL when useDiagnostics=TRUE.
19c1d5675e Jean*4689 o pkg/seaice:
4690 - restore (last time on 2011/12/24) ability to compile pkg/seaice with
4691 undefined pkg/exf ALLOW_ATM_TEMP or ALLOW_RUNOFF CPP-options.
ee9d1fdd8f Jean*4692 - only call DIAGNOSTICS_FILL when useDiagnostics=TRUE.
4693 o eesupp/src:
4694 - fix check for overlap-size argument (myOLn.GT.MAX_OLY_EXCH)
4695 in exch1_rx[_ad].template (thanks to Francois Lefeuvre report).
51fc369eef Jean*4696 o switch to TAF version-2:
4697 - add flow directives to "freeze" naming convention for ad-routines that
4698 are used in I/O routines of adjoint state and associated common blocks
4699 that are used in adcommon.h (backward compatible with version-1)
4700 - update all ad-optfiles (in tools/adjoint_options + few local to some
4701 verification exp) to switch to latest TAF version (currently 2.5.5);
4702 merge "*_mpi" adoptfiles into the corresponding non-mpi (but commented
4703 out except for diva).
4704 - the major change with TAF version-2 is that both the differentiated
4705 routines and the forward routines (new) are returned as part of the TAF
4706 output source code. Update genmake2 accordingly.
4707 - new output for AD experiment tutorial_global_oce_biogeo (better AD gradient
4708 with version-2 when compared to TLM or FWD gradient); other experiments
4709 output show minor changes (machine truncation level); update the few AD &
4710 TLM output with 12 matching digits only (some prior to version-2 switch).
4711
5ed109e8ff Jean*4712 checkpoint64l (2013/08/05)
f66939121e Jean*4713 o model/src:
4714 - in dynamics.F, skip the call to CALC_VISCOSITY if momViscosity=F
ea7e42c5a8 Jean*4715 - main_do_loop.F: no longer includes additional (AUTODIFF) header files
4716 when using TAF but only if using OpenAD.
c7389f7fae Jean*4717 o pkg/mom_common+fluxform+vecinv:
4718 - always set horiz. viscosity arrays to background value before calling
4719 MOM_CALC_VISC (in MOM_FLUXFORM & MOM_VECINV) and call S/R MOM_CALC_VISC
4720 only when using variable horiz. viscosity (useVariableVisc=T);
4721 - simplify mom_vecinv.F (only 1 block for momViscosity).
d9f9cc1105 Jean*4722 o pkg/mom_common: variable horiz. viscosity in NH code
4723 - move horiz-viscosity 3-D arrays viscAh_W & viscA4_W (used in calc_gw.F)
4724 from model/inc/NH_VARS.h to pkg/mom_common/MOM_VISC.h
4725 - store in common block (in MOM_VISC.h) logical parameters: useHarmonicVisc,
4726 useBiharmonicVisc & useVariableVisc.
4727 - fix old bug (already in 1rst implementation of variable horizontal viscosity
4728 in calc_gw.F, version 1.27, 2006/06/20):
4729 horizontal bi-harmonic viscosity in gW was missing when wiscA4W=0
4730 even if variable bi-harmonic viscosity (e.g., viscA4Grid) was non-zero.
4731 - change background horiz viscosity in vertical momentum (gW) to always be
4732 viscAhW,viscA4W (instead of switching to viscAhD, viscA4D when using
4733 any type of variable viscosity, e.g., viscAh/4Grid)
4734 - change default value of viscAhW,viscA4W to viscAhD,viscA4D (instead of
4735 viscAh,viscA4) which default to viscAh,viscA4 : this avoid missing
4736 horiz. viscosity in W eq when just setting viscAhD/Z,viscA4D/Z (since
4737 default viscAh,viscA4 is zero).
e636cf27b8 Jean*4738 o model/src:
4739 - extend length of drC & recip_drC from Nr to Nr+1.
e8ed922ed3 Jean*4740 o Divided Adjoint (DIVA) with MPI:
4741 - genmake2: do not create local ./mpi_headers dir when no file to copy into.
4742 - remove option ALLOW_DIVIDED_ADJOINT_MPI (replaced by ALLOW_DIVIDED_ADJOINT
4743 and ALLOW_USE_MPI) from model/src code and from ECCO_CPPOPTIONS.h.
4744
8dca956637 Jean*4745 checkpoint64k (2013/07/23)
dee062a69c Jean*4746 o tools/OAD_support:
8dca956637 Jean*4747 - avoid the need for file "oadtempflile" in insertTemplateDir.bash
4748 and remove it from genmake2.
dee062a69c Jean*4749 o tools/build_options:
4750 - remove MPI_HEADER_FILES_INC setting (no longer used) and comment out
4751 MPI_HEADER_FILES list (let genmake2 find the missing headers)
4be02e3b08 Dani*4752 o verification/halfpipe_streamice:
dee062a69c Jean*4753 - change to driving stress formulation; update both Fwd & AD output.
4754 o tools/genmake2 and Divided Adjoint with MPI:
4755 - remove default setting of MPIINCLUDEDIR from $MPIHOME (always been broken);
4756 - only create local ./mpi_headers dir if using MPI and MPIINCLUDEDIR is set;
4757 - add new variable (LOCAL_MPI_HEADERS, replace MPI_HEADER_FILES_INC) in
4758 Makefile, which is set by genmake2, and check which mpi-headers are needed.
4759 Note: need to update adjoint_options/adjoint_diva_mpi accordingly.
4760 - update target "CLEAN" (to also remove ./mpi_headers/ dir).
bcf312c024 Jean*4761 o testreport:
4762 - changes for Divided Adjoint Run: when file "run_ADM_DIVA" is present,
4763 perform additional runs (number of additional runs is "add_DIVA_runs" taken
4764 from file run_ADM_DIVA ; should match "nchklev_3" in file "code_ad/tamc.h").
4765 o verification/lab_sea (AD test):
4766 - change to test Divided Adjoint Run in this set-up (both standard AD test
4767 and 2 secondary AD test: noseaice + noseaicedyn); drop the evp AD test.
0f31045802 Jean*4768 o pkg atm_ & ocn_compon_interf:
4769 - remove cpl_earlyExpImpCall=F option (was mainly a hack added for the old
4770 staggerTimeStep implementation) and disable (retired) corresponding
4771 parameter.
d761a6c43f Jean*4772 o pkg/offline:
4773 - comment out unused field-array: ICEM, ConvectCount, hflx[01], icem[01];
4774 - add S/R OFFLINE_CHECK to print offline parameter summary
4775 and stop if loading a file that is not used;
4776 - enable to calculate GMRedi tensor, KPP mixing and convective index
4777 when the corresponding file(s) is/are not specified (but pkg is used).
2bbc535596 Jean*4778 - comment out resetting of monitorFreq (to endTime) since it still useful
4779 for monitoring CFL numbers and checking offline fields.
e44d40886c Jean*4780 o OpenAD:
4781 - do not define OAD_DEBUG (in tools/adjoint_options/adjoint_oad) to get
4782 smaller standard output) and generate new (smaller) output (on baudelaire
4783 using gfortran with -ieee) for exp. tutorial_tracer_adjsens
5c3afaf8cf Jean*4784 o model/src:
4785 - call EXTERNAL_FORCING_SURF outside bi,bj loops (in do_oceanic_phys.F),
4786 (where external_forcing_adjust was called) and change list of arguments;
4787 - merge external_forcing_adjust.F into external_forcing_surf.F
4788 - put surface relaxation of SST & SSS in new S/R (forcing_surf_relax.F)
4789 which also contains balancing surface relaxation (ALLOW_BALANCE_RELAX,
4790 previously in file "balance_relax.F", now removed); remove corresponding
4791 arrays in FFIELDS.h.
4792 - EXTERNAL_FORCING_SURF is now called when using pkg/offline; implement
4793 a hack for getting back surfaceForcingS (loaded from file) when using
4794 ALLOW_OLD_VIRTUALFLUX (pkg/dic, in DIC_OPTIONS.h) in offline set-up.
4795 - update output of AD test experiment global_ocean.cs32x15.seaice_dynmix
4796 (was getting only 11 digits for AD-grad, due to different truncation
4797 error in AD code).
4798
f15d0780a7 Jean*4799 checkpoint64j (2013/07/04)
b9ef6e0869 Jean*4800 o pkg/offline:
4801 - to enable the use of other features with pkg offline (e.g., obcs),
4802 also call S/R DO_OCEANIC_PHYS in offline run - more modifs to come.
4803 - comment out "allowFreezing" (now active) in 2 offline testing exp.
27ebbc08f6 Dimi*4804 o pkg/exf ALLOW_RUNOFTEMP
4805 - fix sign and make compatible with temp_EvPrRn .NE. UNSET_RL
5c3afaf8cf Jean*4806 - ahdded RUNOFTEMP test to verification/global_ocean.cs32x15/input.seaice
684284fdda Dimi*4807 - changes verification/global_ocean.cs32x15/results/output.seaice.txt
d2e18b684b Jean*4808 o pkg/atm_phys:
4809 - allows to add some damping on uVel,vVel (strength only function of k).
978ac82129 Jean*4810 o verification, ad-tests:
4811 - reduce length of the simulation for AD test: global_ocean.cs32x15.seaice,
4812 global_ocean_ebm and offline_exf_seaice.thsice.
b8dffaf82f Dani*4813 o verification/halfpipe_streamice:
4814 - found a bug in s/r pkg/streamice/streamice_advect_thickness which caused
4815 flux input boundary conditions to be ignored; a fix for this bug changed
978ac82129 Jean*4816 verification results for forward test.
4817 - add adjoint test.
7ee27107e3 Jean*4818 o pkg/ptracers:
4819 - allow to restart without SOM pickup (resetting SOM to zero).
0d1e4b948d Mich*4820 o pkg/gmredi:
4821 - New parameterisation for the calculation of K and (GM_PsiX,GM_PsiY) added.
4822 - It uses mixing length theory and suppression by steering level effects to
4823 calculate a diffusivity used in the Redi tensor (see Bates et al., submitted
4824 to JPO, for more details).
4825 - It also uses the diffusivity to calculate an eddy induced streamfunction
4826 based on a PV closure (rather than a buoyancy closure as in GM).
7ee27107e3 Jean*4827 - New files added to pkg/gmredi:
0d1e4b948d Mich*4828 gmredi_k3d.F calculates the diffusivity for the Redi tensor and the eddy
4829 induced overturning streamfunction (called from gmredi_calc_tensor)
4830 gmredi_calc_eigs.F calculates the eigenvalues and eigenvectors required
4831 for use in gmredi_k3d
4832 gmredi_calc_urms.F calculates the the rms eddy velocity used to calculate
4833 the eddy diffusivity
ffc1393533 Mich*4834
fe0ec941c0 Jean*4835 checkpoint64i (2013/06/18)
e68ed13a81 Jean*4836 o pkg/cheapaml:
4837 - take src files from MITgcm_contrib/verification_other/offline_cheapaml/code
4838 that enable the use of seaice (pkg/thsice thermo & pkg/seaice dynamics)
4839 with pkg/cheapaml.
4840 o utils/python: add subpackage for cubed sphere function, first example is
4841 simple cs.pcol to plot 2D fields on a map
531678d622 Dani*4842 o pkg/streamice:
4843 - This is a new package in MITgcm, which solves dynamic equations for ice
4844 sheets and ice streams
e68ed13a81 Jean*4845 - At the moment it is independent of atmosphere/ocean dynamics, or any
531678d622 Dani*4846 other physical packages in MITgcm, even ShelfIce (although it is anticipat-
4847 ed that this will change)
e68ed13a81 Jean*4848 - There is a new verification exercise that tests it, halfpipe_streamice,
531678d622 Dani*4849 evolves a 40x80 km ice stream/ice shelf (at coarse resolution) in a
4850 rectangular embayment
4851 - halfpipe_streamice is forward-only for now, will have TAF test soon
4852 - for questions, email dgoldber@mit.edu
04cb5dc10d Jean*4853 o pkg/thsice:
4854 - fix filling of snow-precip diagnostic (SIsnwPrc) (left from the removing
4855 of snowPrc from common bloc, on May 2nd, thsice_step_fwd.F revision 1.40);
4856 - remove diagnostics 'SI_FrcFx' ( now identical to 'SI_Fract' with new
4857 call sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect );
4858 - allow precip from pkg/cheapaml to make snow over seaice.
a5f3de150b Jean*4859 o pkg/cfc:
ac5b32ca4b Jean*4860 - move in separated header file (CFC_ATMOS.h) time-serie arrays of Atmos CFC
4861 - remove atmos CFC 2-D arrays from common bloc (now local variables)
4862 - change some hard-coded constant to run time parameter for reading and
4863 and interpolating atmospheric CFC ; keep same default as previously.
4864 - more flexible reading of Atmos CFC (number of records no longer hard-coded)
4865 - put arguments in standard order: myTime, myIter, myThid
4866 - use standard S/R GET_PERIODIC_INTERVAL for time interpolation of
4867 atmospheric CFC ; fix for the case myIter < PTRACERS_iter0.
4868 - fix calculation of surf tendencys for partial-cell and/or Non-Lin Free-Surf
4869 - new routine to print summary of CFC params and check for consistency.
7a8082e765 Mart*4870 o pkg/seaice: add uice/vice to the parameter list of s/r seaice_advdiff,
4871 similar to thsice_advdiff.
4872 Note that for the B-grid case the routine parameters uc/vc are overwritten.
ac5b32ca4b Jean*4873 o pkg/cfc:
a5f3de150b Jean*4874 - change time interpolation for atmospheric CFC-11 (now same as for CFC-12);
4875 update output (CFC-11) of experiment cfc_example and tutorial_cfc_offline.
ac5b32ca4b Jean*4876 - fix interpolation of atmphspheric CFC between Sorthern and Northern
4877 hemisphere value.
5dd9cc40ef Jean*4878 o pkg/seaice:
4879 - allow to use seaice dynamics without pkg/exf (e.g., using pkg/cheapaml)
a8ebf896c4 Mart*4880 o pkg/seaice: add Adams-Bashforth2 time discretization for ice dynamics;
4881 so far only for JFNK-solver, turn on with SEAICEuseAB2 = .TRUE.
4882 - requires an additional time level that is stored in the pickup
4883 - you can start with AB2 from a pickup without this time level with
4884 pickupStrictlyMatch = .false.
4885
2d517edcde Jean*4886 checkpoint64h (2013/05/26)
06294f69b9 Jean*4887 o pkg/cheapaml:
4888 - replace one ()**.5 with SQRT + use temp var "cdu = tau/Du" (coare3_flux);
4889 affect machine truncation (but exp cheapAML_box still pass with 13 digits).
4890 - consistent treatment of uWind,vWind location: assume everywhere in
4891 pkg/cheapaml that they are on C-grid (@ uVel,vVel location)
4892 (Note: was already the case for Tair,Qair advection);
4893 add option (INCONSISTENT_WIND_LOCATION) to recover old results.
4894 - compute diabatic forcing only in the interior (excluding overlap regions)
4895 - fill in array "Qsw" (for short-wave heating);
4896 - add diagnostic for precip ; fill-in diagnostics for cheapAML state vars
4897 before any update (consistent with MITgcm state var diagnostics);
4898 - cheapaml_fields_load.F & cheapaml_init_varia.F : only fill outer edges if
4899 non periodic ; + adjusted for uWind,vWind (C-grid).
4900 o pkg/seaice:
4901 - remove dependence of pkg/seaice versus pkg/exf (file: pkg/pkg_depend) and
4902 add explicitly pkg/exf in experiments that currently use pkg/seaice.
4903 - allows to compile pkg/seaice without pkg/exf.
142cc892c8 Jean*4904 o tools/OAD_support:
4905 - use a local copy (ourRWCPinBd) to ensure index ourRWCP stays within bounds
4906 of array "ourStepOf" in function rvNextAction (revolve.F90).
723a22990a Jean*4907 o pkg/aim_compon_interf renamed to pkg/atm_compon_interf
4908 - change pkg name (to be used with other atmospheric physics pkg)
4909 but by-pass CVS when making the new pkg so that we keep the CVS history.
a280c86ad5 Jean*4910 o pkg/offline:
4911 - call OFFLINE_FIELDS_LOAD from pkg/offline/offline_init_varia.F
4912 (previously called from pkg/dic_surfforcing_init.F)
4913 o model/src:
4914 - re-order sequence of calls within packages_init_variables.F, using
4915 standard order, except for:
4916 DIAGNOSTICS_INIT_VARIA and OFFLINE_INIT_VARIA (called @ the top),
4917 CTRL_MAP_INI and OBCS_INIT_VARIABLES (called @ the bottom)
ac0d2c71f0 Jean*4918 o new pkg: atm_phys
2edfb1b43c Jean*4919 - add entry point and source code (previously in contrib
4920 verification_other/atm_gray/code_gray/) for new pkg "atm_phys"
4921 (atmospheric physics pkg from P. O'Gorman and T. Schneider, JCl, 2008).
ac0d2c71f0 Jean*4922 - re-order sequence of calls within packages_readparms.F,
4923 packages_init_fixed.F and packages_write_pickup.F
4924 (but skip packages_init_variables.F because of TAF issues).
2edfb1b43c Jean*4925 - update contrib/*/atm_gray/ experiment.
b7399a7436 Jean*4926 o pkg/seaice (ITD code):
76166139ef Jean*4927 - simplify and fix the writing of pickup-files for ITD case
4928 o pkg/seaice (ITD code):
b7399a7436 Jean*4929 - introduce floe size dependent lateral melt for ITD case;
4930 - cleaning (avoid division by zero, change to f77 syntax, remove tabs)
4931 - update seaice_itd experiment main output.
ffa44e5be9 Jean*4932 o pkg/thsice:
4933 - remove snowPrc from common block THSICE_FLUX, in THSICE_VARS.h and
4934 declared it locally (without bi,bj) in thsice_main.F & aim_do_physics.F;
4935 changed accordingly pkg/atm2d.
4936
134aa64c5b Jean*4937 checkpoint64g (2013/05/01)
8f8fcb55e3 Dimi*4938 o pkg/exf ALLOW_RUNOFTEMP
4939 - if defined, river and glacier runoff temperature can be read-in from
4940 runoftempfile; runoftempfile needs to have same format as runofffile
a665b019b3 Jean*4941 o pkg/thsice (& pkg/bulk_force):
4942 - In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account
4943 for energy content of Precip + RunOff & Evap (like with pkg/exf).
4944 - change computation domain to always be the interior (without overlap).
4945 - fix bug (wrong overlap) when using EXF and stressReduction > 0.
690aeca19f Oliv*4946 o verification/tutorial_global_oce_biogeo:
4947 - add preliminary OpenAD setup (still has problems)
134aa64c5b Jean*4948 o pkg/seaice:
6c4c641ea1 Mart*4949 - turn some parameters for choosing the convergence criterion of
4950 the inexact Newton method (JFNK) into runtime parameters for convenience
134aa64c5b Jean*4951 - clean up seaice_calc_viscosities.F: remove/retire two options for
6c4c641ea1 Mart*4952 SEAICetaZmethod (1,2), introduce area weighting for method 3; this changes
4953 the results of lab_sea/input because a division has been replaced by
4954 a multiplication with the reciprocal (sumNorm)
4955 - modify offline_exf_seaice/input.dyn_jfnk/data.seaice to improve
134aa64c5b Jean*4956 convergence of solver (changes results, of course), and to test some
6c4c641ea1 Mart*4957 new features
14111182a7 Jean*4958 o model/src:
4959 - remove unused (since Aug 2006) S/R SET_WRITE_GLOBAL_PICKUP and its call.
4960 - remove unused forcing field "dQdT" and associated parameter "dQdTFile".
4961 - move forcing adjustment (balancing surface forcing) in specific S/R
4962 where might also be applied exchanges (if needed) to forcing arrays.
f63796dcfc Jean*4963 o pkg/shelfice:
4964 - allow to specify the Ice-Shelf mass per unit area (instead of
4965 shelficeLoadAnomaly) and do the conversion from one to the other
4966 - move loading from file of shelficeLoadAnomaly from SHELFICE_INIT_VARIA
4967 to SHELFICE_INIT_FIXED: (a) avoid some TAF recompution issues and
4968 (b) will be loaded in time (before calling INI_PRESSURE) in case it is
4969 needed in phi0surf for initial pressure calculation when useDynP_inEos_Zc
4970 - update isomip experiment forward output (get machine truncation error
4971 from conversion shelficeLoadAnomaly -> shelficeMass -> shelficeLoadAnomaly)
01fb631dba Jean*4972 o verification/offline_exf_seaice:
4973 revise data.seaice in input.thermo and input_ad and update results accordingly
b57d4b5259 Gael*4974 HO = 0.2, SEAICE_areaLossFormula = 2,
01fb631dba Jean*4975 SEAICE_growMeltByConv = .TRUE.,
b57d4b5259 Gael*4976 SEAICE_doOpenWaterMelt = .TRUE.,
01fb631dba Jean*4977 Improve consistency with input.thsice and fix the spurious 500m ice corners
4978 o verification/global_ocean.cs32x15:
4979 - set Energy Reference Level to liq. water @ 0 degC: temp_EvPrRn=0.,
4980 in icedyn (thsice+seaice-dyn) test and update output.
4981 o verification/offline_exf_seaice:
4982 - adjust list of tested variables (with testreport) and update
4983 standard test output with better slection of monitored fields.
8fe5c1e95b Jean*4984 o pkg/cd_code:
4985 - swtich off Adams-Bashforth on the 1rst iteration. Update output of
4986 experiment lab_sea.hb87
9f4f698356 Jean*4987 o tools/genmake2:
4988 - change default makedepend from the system default to tools/xmakedepend:
4989 When no makedepend is specified, select tools/xmakedepend it the test pass,
4990 otherwise select the system default (if exist and pass the test) or
4991 try to build cyrus-makedepend ; stop if none of the 3 works.
329d560e65 Jean*4992 o pkg/exf & pkg/thsice:
4993 - In case Energy-Reference-Level (ERL) is used (temp_EvPrRn=0), account
9f4f698356 Jean*4994 for energy content of Precip + RunOff & Evap. Assumes:
329d560e65 Jean*4995 1) Rain has same temp as Air.
4996 2) Snow has no heat capacity (consistent with seaice & thsice pkgs)
4997 3) Run-Off comes at the temp of surface water (with same Cp)
4998 4) Evap over ocean is released to the Atmos @ surf-temp (=SST); should be
4999 put directly into Latent Heat flux & should use water-vapor heat capacity.
5000 5) Evap over snow/seaice (pkg/thsice) assumes constant Lf+Lv (consistent
5001 with snow having no Cp) => water vapor is released to Atmos @ 0^oC (=ERL).
f21dfbc609 Mart*5002 o pkg/seaice: simplify the use of CPP flags in JFNK-related files
5003 (compile when SEAICE_ALLOW_JFNK is defined)
47259ecf74 Jean*5004 o pkg/thsice:
5005 - fix oceanic flux diagnostics & timeave (left from new sequence of calls
5006 implementation): move THSICE_AVE call after the advection (called directly
5007 from thsice_do_advect.F).
0005dc42e3 Patr*5008 o verification/global_ocean.90x40x15 and OpenAD:
5009 New experiment for OpenAD is identical to the one in input_ad except that
5010 multiDimAdvection=.FALSE.,
5011 There is still an issue with this.
b105fb69b1 Jean*5012 o pkg/thsice:
5013 - account for ice velocity (ocean relative velocity) in turbulent heat flux
5014 at the base of the ice; update output of global_ocean.cs32x15 (icedyn)
5015 and offline_exf_seaice (main test).
5016
490ead03b8 Jean*5017 checkpoint64f (2013/03/31)
5018 o verification/OpenAD:
5019 - new (smaller, without OAD_DEBUG) output_oadm.txt generated using gfortran.
5020 o verification/isomip, pkg/shelfice and OpenAD:
789efdf83c Patr*5021 - add OpenAD setup to this exp and make shelfice package work with OpenAD
490ead03b8 Jean*5022 o verification/tutorial_global_oce_biogeo:
5023 - update AD and TLM output after turning off ALLOW_FE (in DIC_OPTIONS.h)
5024 o verification/offline_exf_seaice:
5025 - replace adjoint experiment (now similar to fwd input.thermo/ setup).
ee82888721 Oliv*5026 o verification/tutorial_tracer_adjsens, pkg/ptracers and OpenAD:
5027 - add OpenAD setup to this exp and make ptracers package work with OpenAD
490ead03b8 Jean*5028 o pkg/seaice/seaice_evp.F:
5029 mask the asymmetric contribution of the ice-ocean stress (when
5030 the turningAngle is non-zero) over open water to avoid stripes
5031 in the EVP-solutions after many EVP-substeps. This does not change
5032 the verification experiment (because turningAngle=0 in that experiment),
5033 but will affect other EVP solutions with turningAngle.ne.0
d38c2a4135 Jean*5034 o verification, AD & TLM output:
5035 - new TAF version 2.3.10 (previously 2.3.8) add more parenthesis in multiple
5036 additions and multiplications which affect results at machine truncation
5037 level. Update few AD output (1D_ocean_ice_column, bottom_ctrl_5x5,
5038 lab_sea.noseaicedyn & offline_exf_seaice) and TLM output
5039 (1D_ocean_ice_column & tutorial_tracer_adjsens.som81) which had only 12
5040 digits of matching.
b3668e95f2 Mart*5041 o pkg/seaice:
d38c2a4135 Jean*5042 modify lsr-algorithm so that it vectorizes AND converges by using a
5043 "zebra" method: split vector loop into two with step size 2; this
5044 solves a general convergence problem for the JFNK solver on a vector
5045 computer. It has the potential to even improve convergence for
5046 non-vector machines, but it does change the results so it is turned
5047 off by default. To turn on define CPP-flags SEAICE_VECTORIZE_LSR and
5048 SEAICE_VECTORIZE_LSR_ZEBRA in SEAICE_OPTIONS.h
b3668e95f2 Mart*5049
06b25f9a40 Jean*5050 checkpoint64e (2013/03/05)
59b6bd98c8 Patr*5051 o pkg/ecco and several verification experiments:
06b25f9a40 Jean*5052 Remove special versions of the_model_main.F, the_main_loop.F, forward_step.F
5053 from ecco package, and revert to unified routine in model/src/
5054 Adjust verification experiments accordingly, especially gloal_oce_llc90
5055 Should conclude long-standing work by Gael to reconsile the_main_loop with
5056 ECCO and will enable OpenAD's revolve loop in ECCO setup.
7c6b6a09d0 Jean*5057 o pkg/generic_advdiff:
ccf9e62cda Jean*5058 - implement compressible flow method for multi-dim advection (similar to
5059 gad_som_advect.F); add new option "GAD_MULTIDIM_COMPRESSIBLE" (since
5060 TAF generates many recomputations) to use it; no yet coded with implicit
5061 vertical advection.
5062 - change experiment advect_cs (new output) and advect_xy (same output)
5063 to test compressible flow multi-dim advection.
5064 o pkg/generic_advdiff:
7c6b6a09d0 Jean*5065 - fix SOM advection for unusual cases (linear Free-Surf in r*, other
5066 cases where linear Free-Surf is not @ k=1, e.g., useShelfIce)
5067 o pkg/seaice:
cfab924fcb Mart*5068 - fix bug in the no-slip implementation in seaice_calc_strainrates.F, this
7c6b6a09d0 Jean*5069 bug affects two verification experiments (lab_sea and lab_sea.hb87),
5070 recover old (wrong) results by setting noSlipFac = 2. in
cfab924fcb Mart*5071 seaice_calc_strainrates.F;
8c657eb247 Mart*5072 - add another averaging method for etaZ (etaZmethod=3), a mix of 2 and 0
7c6b6a09d0 Jean*5073 - add runtime parameter SEAICE_JFNKepsilon for that finite difference
8c657eb247 Mart*5074 gradient in the Jacobian times vector operation (s/r seaice_jacvec)
5075 - fix line search in seaice_jfnk.F (s/r seaice_jfnk_update)
c59d410006 Mart*5076 o pkg/seaice: reorganize seaice_lsr.F to be able to reuse more code:
5077 - new subroutines seaice_lsr_tridiagu/v
5078 - introduce loop bounds i/jmin/max to be able to use a restricted
5079 additive Schwarz method, but not used for now.
5080 - rename SEAICE_CALC_LSR_COEFFS into SEAICE_LSR_CALC_COEFFS
5081 - use new subroutines seaice_lsr_tridiagu/v in s/r seaice_preconditioner
9743b80f75 Patr*5082 o OpenAD support
06b25f9a40 Jean*5083 Reorganize S/R call for overall time-stepping loop to facilitate
5084 OpenAD revolve loop replacement
5085 (new S/R main_do_loop.F)
6dd77b4354 Jean*5086 o model/src:
5087 - add 3-D array 3rd dimension to argument list of S/R ADAMS_BASHFORTH2/3;
5088 - pkg/cheapaml: remove local S/R ADAMS2d and use instead standard S/R
5089 ADAMS_BASHFORTH2.
7bfbef8b82 Jean*5090 o pkg/cheapaml:
5091 - add new parameter (default=F, same as before) to disable full domain
5092 (including land) periodicity in X & Y dir.
5093 - new S/R CHEAPAML_COPY_EDGES to copy relaxation field into edges of
5094 prognostics field ; merge the 2 S/R cycle_2d_tracer and timestep_2d_tracer
5095 into single S/R CHEAPAML_TIMESTEP.
5096
544247e9eb Jean*5097 checkpoint64d (2013/02/17)
11fe9ae9a2 Jean*5098 o pkg/monitor (angular momentum):
5099 - do not add Eta contribution to the total AM if using rigid-lid;
5100 - correct for Adams-Bashforth in zonal-wind part (instead of in AM_eta).
5101 - horizontal discretisation: compute Zonal wind contribution separately for
5102 each component (instead of from cell centered averaged) and use the 4
5103 grid-cell corner averaged value of Omega*(R*cos_Phi)^2 in AM_eta part.
5104 - Check that AM is conserved with linear dynamics (momAdvection=F and linear
5105 FreeSurf) if using vectorInvariant momentum.
5106 o model/src (horizontal grid):
5107 - move initialisation of all horizontal grid arrays to null value
5108 from specific horizontal grid S/R to main S/R INI_GRID;
5109 - add 2 new arrays to project model C-grid velocity on to zonal direction
5110 (similar to AngleCosC & -AngleSinC but at U and V point location) and
5111 compute them in S/R CALC_GRID_ANGLES.
48a47574f9 Mart*5112 o pkg/seaice: replace a hard coded parameter by a runtime parameter
11fe9ae9a2 Jean*5113 SEAICE_JFNK_tolIter
a1321f078e Mart*5114 o pkg/seaice: introduce a restricted additive Schwarz (RAS) method in
5115 preconditioner for JFNK (run LSR into the overlaps as far as possible,
5116 i.e OLx/y-2, but overwrite the solution in the overlaps)
5117 - extend loop range in seaice_calc_viscosity
5118 - add new parameters SEAICE_OLx/y (default = OLx/y-2)
5119 - add flexible loop ranges to seaice_preconditioner, seaice_calc_lsr_coeffs
5120 - slightly modify loops in tridiagonal solver lsr-preconditioner
5121 - by default remove the extra exchange in seaice_preconditioner with a
5122 replacement of an undocumented CPP flag by SEAICE_PRECOND_EXTRA_EXCHANGE
5123 - modify offline_exf_seaice so that old results without RAS are reproduced
5124 for output.dyn_jfnk.txt
5125 in seaice_fgmres.F (unrelated to RAS)
5126 - add a cpp-flag option for a re-ordered mapping (potentially more
5127 efficient), but because this changes the results, turn it off by
5128 default
5129 - replace the save statement by local common blocks
4a6b51e826 Jean*5130 o utils/matlab:
5131 - fix tile-offset in rdmnc.m when output was produced using EXCH2.
5132 - update cs_grid/bk_line scripts to use load_grid.m (in utils/matlab)
5133 instead of local script "load_cs.m".
0d86f34c41 Mart*5134 o pkg/seaice:
5135 - fix a serious bug in seaice_fgmres.F, s/r seaice_scalprod, connected
5136 to the scalarProductMetric and the unrolling. By chance this does not
4a6b51e826 Jean*5137 change the verification experiment, because of the particular domain
0d86f34c41 Mart*5138 decomposition
4956a0134a Jean*5139 o pkg/diagnostics:
5140 - change default missing_value from UNSET_RL to -999.
b24144b856 Mart*5141 o pkg/layers: improve vectorization of layers_fluxcalc.F
4a6b51e826 Jean*5142 - step 1: split loops, make TatU/V 2D arrays. This alone reduces the cpu
b24144b856 Mart*5143 time spent in this routine by more than a factor of 3 on an NEC-SX8
5144 - step 2: replace search algorithm by a bisection algorithm found in
4a6b51e826 Jean*5145 Press et al. Numerical Recipes in Fortran. This algorithm can be
b24144b856 Mart*5146 vectorized and finds the correct bin in approx. log2(Nlayers) steps.
5147 For now, use this algorithm only for TARGET_NEC_SX defined.
5148 - moved the search algorithm into a separate subroutine, that is kept
5149 within the same file for automatic inlining.
5150 - modified catching potential errors
4956a0134a Jean*5151 o pkg/ecco:
27b515a5c9 Gael*5152 - add compile switches ALLOW_SHALLOW_ALTIMETRY and ALLOW_HIGHLAT_ALTIMETRY.
4956a0134a Jean*5153 o model/src, pkg/autodiff, pkg/ctrl, pkg/grdchk :
27b515a5c9 Gael*5154 - modifications for ALLOW_GENTIM2D_CONTROL
5155 -- forward_step.F, the_main_loop.F : pass options and arrays for adjoint tapes.
5156 -- load_fields_driver.F : add call to CTRL_MAP_GENTIM2D( myTime, myIter, myThid )
5157 -- add xx_gentim2d0/1 in ctrl_ad_check_lev1_dir.h checkpoint_lev1_directives.h etc
5158 -- use ctrl_swapffields.F (new) instead of exf_SwapFFields.F in ctrl_get_gen.F
f193ea8b76 Jean*5159 o model/src:
5160 - account for moist thermodynamics in (dry) potential temperature equation;
5161 update results of experiments: aim.5l_cs (x2), fizhi-cs (std + aqualev)
5162 and cpl_aim+ocn.
25fdd6d933 Jean*5163 - also switch to standard compiler (gfortran, was using ifort previously)
5164 for fizhi-cs experiments reference output.
f193ea8b76 Jean*5165 o pkg/ctrl:
93e42e1e05 Patr*5166 - 1st step toward generic time-varying control variable (2D) via CPP option
5167 ALLOW_GENTIM2D_CONTROL
5168 - note new namelist ctrl_nml_genarr in data.ctrl
df3d2037ba Jean*5169 o verification/global_ocean.cs32x15:
5170 - switch off OLD_THSICE_CALL_SEQUENCE (both forward and AD code) to use new
5171 thsice calling sequence and update "output.icedyn.txt" output file.
a618488a45 Jean*5172 o pkg/ptracers:
5173 - from Ryan A.: code to allow to restart a tracer at regular time interval
5174 specifying a reset frequency and a reset-phase (for each tracers).
8d7c0d8037 Jean*5175 o pkg/thsice:
b8ed299f9d Jean*5176 - implement new sequence of calls for thsice+seaice:
5177 previously: ice-Dyn,ice-Advect,ice-Thermo(thsice)
5178 new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect
5179 - allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE"
5180 in CPP_OPTIONS.h) to recover old sequence;
5181 - update diagnostics for Intermediate State thsice diagnostics: now filled
5182 just before advection (instead of just after advection in old sequence);
5183 - update output of experiment offline_exf_seaice (standard test);
5184 - in global_ocean.cs32x15 exp., postpone output.icedyn.txt update
5185 by setting #define OLD_THSICE_CALL_SEQUENCE in CPP_OPTIONS.h
5186 o pkg/aim_v23:
5187 - use tiled array for aim_CO2 and surface wind speed for export to coupler;
5188 - use standard pkg/mdsio routines to read & write CO2 pickup file;
5189 - in-line S/R AIM_AIM2DYN_EXCHANGES in aim_do_physics.F;
5190 - Implement new sequence of calls for seaice advection (with thsice and
5191 seaice diffusion): do ice advection after ice-Thermodynamic (previously
5192 was done before); change aim_do_physics.F (split the bi,bj loops block);
5193 - use same CPP option (OLD_THSICE_CALL_SEQUENCE) to recover old sequence;
5194 o pkg/thsice:
8d7c0d8037 Jean*5195 - add a missing EXCH of sIceLoad in thsice_main.F (ocean set-up) for the case
5196 where just seaice diffusion is used without seaice-dynamics.
5197
9f6899b968 Jean*5198 checkpoint64c (2013/01/18)
5199 o pkg/seaice:
5200 - add a parameter JFNKres_tFac that can replace JFNKres_t
9ebe58d4fa Mart*5201 (= JFNKres_tFac*JFNKresidual before JFNK solver)
5202 - add a line search option to the JFNK solver
9f6899b968 Jean*5203 - move update of u/vIce and computation of initial residual into a separate
c937d257c3 Mart*5204 routine (same file); makes the code a little easier to read (?)
5205 - the line search requires computation of the residual and for some reason
9f6899b968 Jean*5206 I cannot do the update of u/vIce at the beginning of the Newton loop
c937d257c3 Mart*5207 without changing the results, so we move computation of the new residual
5208 also to the end of the Newton loop, even without the line search
3b4e62adf7 Jean*5209 o pkg/mdsio:
5210 - write missing value (corresponding to undefined array value) to meta files;
9f6899b968 Jean*5211 skip this if missing value is one (UNSET_RL would be a better value for the
3b4e62adf7 Jean*5212 case of undefined missing value but it's current the default missing-value);
5213 Also update mdsio_read_meta.F (reading timeInterval & missing-value).
93ace0b1be Jean*5214 o pkg/exf & thsice:
9f6899b968 Jean*5215 - for diagnostics purpose, fill-up and update Qsw array (+ fill the
9ebe58d4fa Mart*5216 diagnostics) even when SHORTWAVE_HEATING is #undef;
93ace0b1be Jean*5217 o verification/cfc_example:
9f6899b968 Jean*5218 - turn on pkg/layers with pkg/diagnostics (to test pkg/layers and to
9ebe58d4fa Mart*5219 illustrate how to use it).
7f496449e0 Jean*5220 o verification/offline_exf_seaice:
5221 in input: add SEAICErestoreUnderIce=.TRUE., and reduce size of forcing
5222 files to only one time-record.
5223 in input.thermo: narrow the 2 bands of low initial ice-concentration near
5224 N & S edges; switch on SEAICErestoreUnderIce=T; use pkg/diagnostics for
9f6899b968 Jean*5225 snapshot output; same mcPheePiston value as in thsice with
9ebe58d4fa Mart*5226 surf-current=0.2m/s.
7f496449e0 Jean*5227 in input.thsice: similar set-up as in input.thermo (channel with same seaice
5228 initial conditions).
a504296e19 Jean*5229 o verification/cfc_example:
5230 - update file "data" with more standard choice (default rotationPeriod,
5231 exactConserv=T, reduce ivdc_kappa to 10, remove multiDimAdvection=F,
5232 set deltaTFreeSurf to deltaTtracer) and update the output.
5233 o pkg/layers:
5234 - fix bolus part so that it compiles with #undef GM_BOLUS_ADVEC;
5235 - ensure that "layers_bolus" is switched to False when useGMRedi=False.
5236 o verification/offline_exf_seaice:
5237 - set all {field}period to zero for constant-in-time forcing (not tested
5238 anywhere else).
bde2cd981d Jean*5239 o verification/offline_exf_seaice:
5240 - dyn_lsr : use pkg/seaice S/R (instead of pkg/thsice) to advect sea-ice;
5241 - dyn_jfnk : use pkg/thsice S/R (instead of pkg/seaice) to advect sea-ice.
a4ef5db77d Jean*5242 o model/src:
5243 - implement Finite-Volume method for (hydrostatic) presure gradient
5244 from S.-J. Lin (QJRMS 1997), for atmosphere using sigma-coordinate.
5245 o pkg/seaice: implement EVP* by Lemieux et al. (2012).
5246 - In order to be compatible with the default EVP code, this requires changing
5247 the EVP code around a little; and because any small change immediately
5248 breaks the lab_sea.hb87 verification experiment, the reference output is
5249 updated two times (each time the remaining aggrement was only 2 digits):
5250 - after replacing 1/dt by 1*recip_dt with a precomputed recip_dt
5251 - after replacing 1/(1+0.5*dt/tau) by a/(a+1), with a=2*tau/dt
5252 The adjoint test lab_sea.evp also needed to be updated.
5253 - Turn on EVP* by setting SEAICE_deltaTevp as before, and setting
5254 SEAICEuseEVPstar=.true.; for EVP* SEAICE_deltaTevp does not need to be
5255 a factor of SEAICE_deltaTdyn, and you can set the number of EVP steps
5256 explicitly with SEAICEnEVPstarSteps (thereby overriding the default of
5257 INT(SEAICE_deltaTdyn/SEAICE_deltaTevp)). Controlling EVP* is deliberately
5258 kept obscure, because I need to test it a little more.
9902b68429 Jean*5259 o pkg/cheapaml:
5260 - fix few incorrect type (_RL/_RS) in subroutine calls.
5261 o pkg/seaice:
5262 - new S/R SEAICE_MAP_RS2VEC (similar to SEAICE_MAP2VEC) to map _RS arrays
5263 to _RL vector; this fixes JFNK code when compiling with "-use_r4" option.
8ecbb13ed3 Jean*5264 o model/src:
5265 - add a warning if using select_rStar=2 with nonlinFreeSurf <> 4;
5266 change (in input_ad*/data) select_rStar from 2 to 1 for AD verification
5267 experiments global_ocean.cs32x15 & tutorial_tracer_adjsens (+ update output)
01e3fdb926 Jean*5268 o pkg/cheapaml:
5269 - replace "273.1 _d 0" by celsius2K in pkg/cheapaml/cheapaml.F and
5270 update output of experiment cheapAML_box.
d9f9739596 Jean*5271 - store in CHEAPAML.h coeffs ssq[0:2] for saturation specific humidity,
5272 and set them only in one place (cheapaml_readparms.F).
5273 - replace "273.16 _d 0" by celsius2K & replace "3.14159 _d 0" by constant "PI"
5274 - remove re-setting of main-model parameter "celsius2K" (in cheapaml_readparms)
5275 and re-setting of cheapAML params "lath" & "p0" (in cheapaml_init_varia).
69e136acfe Gael*5276 o model/src/the_main_loop.F:
5277 - fix revision 129 : need both ALLOW_ECCO and ALLOW_ECCO_EVOLUTION.
5278 o pkg/seaice:
5279 - remove legacy branch code.
5280 - retire SEAICE_GROWTH_LEGACY and SEAICE_CAP_HEFF accordingly.
5281 o verification/*/code*/SEAICE_OPTIONS.h:
d9f9739596 Jean*5282 - remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY,
01e3fdb926 Jean*5283 SEAICE_CAP_HEFF).
b4639cc807 Jean*5284 o pkg/cheapaml:
5285 - use standard routine (S/R GET_PERIODIC_INTERVAL) to decide when it is time
5286 to load new forcing fields.
5287 - add missing "_d 0" where it's needed; + some editing (improve indentation).
5288 - remove switch to "-r8" compiler option (no longer needed) in verification
5289 cheapAML_box, keep same output (small trucation error differences).
692e8490be Jean*5290 o verification/offline_exf_seaice:
54b88f0722 Gael*5291 - add thermodynamics only test.
692e8490be Jean*5292 o verification/cheapAML_box:
5293 - split the domain in 8 (2x4) tiles; add MPI and multi-threaded test;
5294 keep same output (same 14 digits for cg2d).
5295 - switch on "-r8" compiler option (some numerical values are missing
5296 the "_d 0") and update output (only 6 digits for cg2d were preserved).
54b88f0722 Gael*5297
026a4385c5 Jean*5298 checkpoint64b (2012/12/24)
51ad14de13 Jean*5299 o pkg/cheapaml:
5300 - remove un-used variables (Qnet,EmPmR) from pickup files.
5301 - store tendency of advected variables into cheapaml pickup file
5302 and fix the AB-2 restart.
0ef659ed72 Gael*5303 o verification/offline_exf_seaice and lab_sea adjoint:
51ad14de13 Jean*5304 - switch to new code (#undef SEAICE_GROWTH_LEGACY).
5305 - switch to 4 time steps in offline, consistent with lab_sea.
026a4385c5 Jean*5306 - match parameters from SEAICE_GROWTH_LEGACY branch in data.seaice.
51ad14de13 Jean*5307 - update results after change of experiment seaice.
026a4385c5 Jean*5308 o pkg/seaice:
5309 - remove option SEAICE_MULTICATEGORY; has been replaced with run-time
5310 parameter SEAICE_multDim. Issue a warning if SEAICE_MULTICATEGORY is
5311 still defined since SEAICE_multDim needs to be set to MULTDIM value (from
5312 SEAICE_SIZE.h) to recover previous #define SEAICE_MULTICATEGORY default.
7755429b93 Jean*5313 o model/src:
5314 - add run-time parameter to select CG2D solver minimum-residual solution
5315 (in case of a poor convergence).
262f1a37c5 Mart*5316 o pkg/seaice/seaice_lsr.F
7755429b93 Jean*5317 - move calculation of matrix coefficients into new
ed8217d1df Mart*5318 S/R SEAICE_CALC_LSR_COEFFS; for now this routine remains in the same
5319 file; the main purpose of this change is to be able to reuse the code
5320 in S/R SEAICE_PRECONDITIONER
262f1a37c5 Mart*5321 - modify the computation of the residual so that the mass of sea-ice
026a4385c5 Jean*5322 is not used twice; this simplifies the calculations, but since
262f1a37c5 Mart*5323 the residual is never used except when LSR_mixIniGuess.ge.4---and this is
5324 not tested in testreport---this does not affect the testreport results.
adb13907c3 Dimi*5325 o verification/seaice_obcs:
5326 - disable SEAICE_GROWTH_LEGACY; reset input files to match those of
5327 verification/lab_sea/input.salt_plume; changes results/output.txt*
c178b9393a Jean*5328 o model/src:
5329 - adapt quasi-hydrostatic formulation to work with p or p* coordinate.
7e9893ac33 Mart*5330 o pkg/seaice:
5331 - improve description of parameters in seaice_fgmres.F and start
5332 cleaning up the code
c178b9393a Jean*5333 - change name of SCALPROD to SEAICE_SCALPROD and modify meaning of
7e9893ac33 Mart*5334 second argument
5335 - add a metric based on grid cell area to SEAICE_SCALPROD; update
5336 results of offline_exf_seaice.dyn_jfnk
5337 - compute initial residual norm in seaice_jfnk based on SEAICE_SCALPROD
e4684a75d6 Jean*5338 o pkg/aim_v23:
5339 - fix an other bug in dissipation heating (grid-cell area was missing).
2dc84f624e Jean*5340 o model/src + pkg/seaice:
5341 - add global (multi-tile) linear solver for pair of tri-diagonal system
5342 along X and Y lines, respectively for U and V component.
5343 Note: 1) MPI and cube-exchange not yet coded.
5344 2) probably not accurate for poorly conditioned / large size problem.
5345 - add option for SEAICE_LSR to use global (multi-tile) tri-diagonal solver;
5346 default: not compiled and not used.
88a8f1f812 Mart*5347 o pkg/seaice:
5348 - first attempt at a multi-threaded fgmres solver for the JFNK solver:
2dc84f624e Jean*5349 introduce bi/bj loops and use global_sum_tile_rl instead of
88a8f1f812 Mart*5350 mpi_allreduce in seaice_fgmres.F
5351 - improve diagnostics output for fgmres solver (seaice_fgmres.F)
5352 - replace a few unnecessary goto statements by if-blocks (seaice_fgmres.F)
5353 - add a verification experiment for JFNK in offline_exf_seaice
d5a9a292e9 Jean*5354 o verification:
6531f48833 Jean*5355 - change (for now, only fwd test) offline_exf_seaice experiment:
026a4385c5 Jean*5356 use a re-entrant channel with idealized coastline (trapezoidal shape)
6531f48833 Jean*5357 at southern boundary to explore seaice dynamics and thermodynamics
5358 with simple forcing. Main set-up has dynamics+thermo and SST relaxation;
5359 secondary test (input.thsice) use thermodynamics only with SST relaxation.
5360 - add seaice-dynamics only secondary test using LSR and pkg/thsice advection.
5361 o pkg/exf:
5362 - disable "sstExtrapol" when Nr=1
5363 o verification:
d5a9a292e9 Jean*5364 - add new experiment "cheapAML_box" (simple 1 layer set-up from Bruno Deremble)
5365 to test pkg/cheapaml.
46af042642 Jean*5366 o pkg/aim_v23 & pkg/shap_filt:
5367 - fix dissipation heating (erroneous gravity multiplication factor).
5368 o pkg/seaice:
7729ab9475 Mart*5369 - remove unused field pressPre from jfnk solver
5370 - rename two subroutines in seaice_preconditioner.F
e5a4e727cd Jean*5371 o eesupp/src:
5372 - S/R MDSFINDUNIT avoids reserved unit numbers (scrUnit1, eeDataUnit ...)
6ac4f1544e Mart*5373 o pkg/seaice/seaice_preconditioner.F: fix preconditioner once again
5374 - remove wrong parts of the rhs and the lhs (were in there
5375 because I did not understand the concept of this preconditioner)
5376 - add an exchange between u- and v-sweep. This increases communication
5377 by a factor of two but improves the convergence of jfnk. Ideally,
5378 one would like the u- and v-sweep to be independent. So far within
5379 undocumented ifdefs
5380 - reorganize the extra computations for printing the residuals
24fc5488c9 Jean*5381 o tools/genmake2:
5382 - comment out the "mpif.h" include in NetCDF test programm (for MPI built)
5383 since it's not necessary (and was preventing to use MNC in some cases).
5384
3b68c5ef24 Jean*5385 checkpoint64a (2012/11/16)
0e1d0943d5 Jean*5386 o pkg/autodiff:
5387 - improve pkg-internal logical parameter switch (inAd/inFwd mode) so that
5388 autodiff_readparms.F no longer depends on calling order (within
5389 packages_readparms.F) and no longer requires to include ${PKG}_PARMS.h):
5390 rename param turnFreeDriftInAdMode to SEAICEuseFREEDRIFTswitchInAd
5391 and change param SEAICEuseDYNAMICSinAdMode to SEAICEuseDYNAMICSswitchInAd.
ed6db82373 Dimi*5392 o pkg/obcs:
5393 - adding tidal velocity forcing capability to obcs
5394 for usage example, see verification/seaice_obcs/input.tides
7972e6de33 Mart*5395 o pkg/seaice:
0e1d0943d5 Jean*5396 - turn the LSR-relaxation parameters WFAU/V into runtime parameters
7972e6de33 Mart*5397 SEAICE_LSRrelaxU/V
356e5485d1 Mart*5398 - introduce runtime parameter SEAICEetaZmethod (=0 by default)
be55e6379a Jean*5399 o pkg/aim_v23:
5400 - implement heating from friction (bottom friction and stratospheric drag).
5401 o pkg/shap_filt:
5402 - fix diagnostic "SHAP_dKE" (was 2 time smaller); implement heating from
5403 dissipation but only for Shap_funct=2, active when addFrictionHeating=T.
0c723af82e Jean*5404 o model/src:
5405 - move AddMass common block from DYNVARS.h to FFIELDS.h; allow to read-in
5406 time-constant addMass field from file (addMassFile);
5407 - support for heating due to friction (and Kinetic Energy dissipation):
5408 add option, run-time switch and 3-D field array + support code ; each pkg
5409 or S/R can add heating contribution (if there is a sink of KE); the sum is
5410 accounted for as a Temperature tendency term (EXTERNAL_FORCING_T).
93029454d2 Mart*5411 o pkg/seaice:
96c8307cd6 Patr*5412 - complete merge of ITD code into seaice_growth.F
5413 from MITgcm_contrib/torge/itd/code/
5414 no verification so far, but Torge Martin tested
5415 "1-D test case and Beaufort set up;
5416 deliver okay results after 1 model year."
5417 - complete merge of SEAICE_SIZE.h into all relevant routines
db6b283965 Mart*5418 - move computation of eta at Z-points into calc_viscosities
5419 + introduce global field etaZ
5420 + add different methods for computing etaZ, for now the old
5421 method (simple averages of eta to Z-points) is hardwired
0c723af82e Jean*5422 + replace etaMeanZ by etaZ in seaice_lsr, seaice_calc_residual,
db6b283965 Mart*5423 seaice_preconditioner
5424 - simplify computations for SEAICE_ZETA_SMOOTHREG
0c723af82e Jean*5425 - seaice_preconditioner:
773a0cee43 Mart*5426 + replace one remaining press by pressLoc (mistake)
5427 + adjust printing of residuals
54dc59c155 Mart*5428 - improve I/O of diagnostics of JFNK in seaice_jfnk.F:
0c723af82e Jean*5429 + add (SEAICE.h) and rename some counters (initiliased in
54dc59c155 Mart*5430 seaice_init_fixed.F)
5431 + add _BEGIN/END_MASTER (myThid) around print statements
5432 + print total number of iterations and failures over SEAICE_monFreq
5433 interval to STDOUT
5434 - move control over output-messages by fgmres to seaice_jfnk to save
5435 some operations
93029454d2 Mart*5436 - move resetting initial guess for fgmres outside of seaice_fgmres_driver
5437 in order to make restarts with sol .ne. zero (fgmres with restarts)
5438 (seaice_jfnk.F, seaice_fgmres.F)
5439 - seaice_calc_l/rhs.F: replace maskW/S by maskInW/S; this fixes
5440 a serious convergence problem when open boundaries are involved
0c723af82e Jean*5441 o pkg/ggl90: fix computation of control volumes for the case of
58e6249dd7 Mart*5442 ALLOW_GGL90_HORIZDIFF (probably not used very often): move control volumes
5443 up half a grid cell from C-centered to W-centered (pointed out by C. Eden)
8e17d76640 Mart*5444 o pkg/seaice: simplify seaice_evp by avoiding use of extra fields u/vIceC
48ffb9e808 Patr*5445 o pkg/autodiff
5446 - Add inAdMode switch for SEAICEuseDYNAMICS:
0c723af82e Jean*5447 SEAICEuseDYNAMICSinAdMode
48ffb9e808 Patr*5448 (extend logic in ADAUTODIFF_INADMODE_SET)
17353ce854 Patr*5449 o pkg/seaice
5450 - Step 1 of merging ice-thickness distribution (ITD) code from
5451 MITgcm_contrib/torge/itd/ (author: Torge Martin)
5452 The code implements concept laid out in Thorndike et al. (1975);
5453 code is enabled via CPP flag SEAICE_ITD
5454 nITD (in SEAICE_SIZE.h) defines number of ice thickness categories;
5455 code is not complete yet!!
48ffb9e808 Patr*5456 - SEAICE_SIZE.h now included in almost all seaice routines
d28bbf0830 Jean*5457 o verification (using seaice):
5458 - switch back seaice-dynamics (+ lower SOLV_MAX_ITERS) in ADM exp.
5459 global_ocean.cs32x15.seaice ; update results.
5460 - compile B-grid dynamics in FW test exp 1D_ocean_ice_column ;
5461 - compile C-grid dynamics with #define SEAICE_ALLOW_JFNK in FW test exp
5462 offline_exf_seaice (previously compiling B-grid).
b3a1d973db Jean*5463 o pkg/exf:
5464 - fix some STOP conditions in exf_check.F (from Aug 28, modifs did not allow
5465 to specify neither just 1 comp of wind or wind-stress, nor no surface momentum
5466 forcing): just replace CPP option ALLOW_ATM_WIND with run-time param useAtmWind.
c6bd7aced7 Jean*5467 o pkg/layers (adjust changes from Sept 19):
dfcf827164 Jean*5468 - do snap-shot output and fill diagnostics from inside iLa loop (layers_calc.F)
5469 this allows to remove "layers_maxNum" dimension from all layers arrays.
5470 o pkg/layers (adjust changes from Sept 19):
c6bd7aced7 Jean*5471 - remove ALLOW_LAYERS_OUTPUT ; fix snap-shot and time-ave output ;
5472 - snap-shot extended to all type of layers (not just the 1rst type);
5473 - remove layers variables when corresponding CPP option is undef.
5474 o pkg/layers:
5475 - rename pkg/layers variable and add new output (layer exist & un-weighted
5476 velocity in layer)
5477 o pkg/seaice:
2c43bfffcf Mart*5478 - simplify (?) ocean-drag coefficent computations by using
5479 the same routine in all three solvers (saves some code lines)
5480 - remove global fields DRAGA and DRAGS from C-grid code and
5481 declare them locally in lsr.F (the only place where they are
5482 still used)
0db5f1068d Jean*5483 - update AD output of lab_sea.evp (very sensitive anyway).
8c62e844bf Mart*5484 o pkg/seaice: add Jacobian-free Newton Krylov solver for ice dynamics
5485 (Lemieux et al. 2010, 2012). Turn on with the usual SEAICE_ALLOW_JFNK
5486 and SEAICEuseJFNK=.true. A few things to note:
5487 - involves a FGMRES, that is parallel but very inefficient,
5488 because of many scalar products (global sums) in the Gram-Schmidt
5489 orthogonalization method. Needs to be replaced. Original code
5490 from J.-F. Lemieux
5491 - preconditioner for FGMRES is a stripped down version of LSOR
c6bd7aced7 Jean*5492 - SOLV_MAX_ITERS is now used for LSOR as a solver and as a
8c62e844bf Mart*5493 preconditioner. For the preconditioner, the default is set to 10.
5494 - Jacobian times vector is computed with finite differences
5495 - marginally related to JFNK-solver: add a smooth regularization for
5496 zeta with tanh that will improve convergence (Lemieux and Tremblay,
5497 2009) for any implicit solver (not implemented for EVP because EVP
5498 does not need this regularization in the first place). Define
5499 SEAICE_ZETA_SMOOTHREG in SEAICE_OPTIONS.h to use.
8e5804ab61 Jean*5500 o eesupp/src:
5501 - check in genmake2 that intrinsic S/R flush is available.
5502 - add S/R to flush IO unit (if intrinsic S/R flush is available)
5503 - flush standard & error msg unit before MPI termination
5504 - if debugMode, flush IO unit after printing msg
5505 o pkg/ctrl:
5506 - ctrl_unpack.F, ALLOW_GENARR3D_CONTROL code: fix missing argument in call
5507 to ctrl_set_unpack_xyz.
5508
f9281bf7f3 Jean*5509 checkpoint64 (2012/10/09)
6ae30b06da Patr*5510 o pkg/shelfice
f9281bf7f3 Jean*5511 - in mom_fluxform.F, mom_vecinv.F:
5512 CALL SHELFICE_V_DRAG(bi,bj,k,vFld,KE,KappaRU,vF,myThid)
5513 Bug fix KappaRU -> KappaRV
5514 does not change verification/isomip but may change other setups
5515 (presumably constant KappaRU=KappaRV)
9574f2afeb Mart*5516 - fix diagnostics SHIU/Vdrag (thanks to Tom Millgate)
5e26aed318 Dimi*5517 o pkg/obcs:
5518 - fixed some indexing bugs in obcs_seaice_sponge.F
5519 - added obcs relaxation subroutines for HSALT and HSNOW
5520 - changes verification/seaice_obcs/results/obcs_seaice_sponge.F
78e0c35225 Mart*5521 o pkg/seaice:
5522 - add "multicategory" parameterization for snow in analogy to ice,
5523 default is off for now.
fd94cbb100 Jean*5524 o pkg/obcs:
c7c4b57180 Dimi*5525 - added obcs_seaice_sponge.F for obcs relaxation of seaice variables;
5526 see verification/seaice_obcs/input.seaiceSponge for example application.
fd94cbb100 Jean*5527 - remove local commom bloc "OBCS_GLOBAL" in obcs_readparms.F and do all the OB
5528 index setting by master-thread. This fix multi-threads Pb in previous modifs.
4d8bc9f16f Gael*5529 o pkg/layers :
fd94cbb100 Jean*5530 - add diagnostics to pkg/layers
5531 - move the meat of pkg/layers from layers_calc.F to layers_fluxcalc.F
5532 (from R.Tulloch). Layers_calc.F now calls layers_fluxcalc.F accordingly.
4d8bc9f16f Gael*5533 o pkg/generic_advdiff/gad_implicit_r.F :
fd94cbb100 Jean*5534 - fix ADVr diagnostics in case of both implicit vertical advection and diffusion.
5535 o pkg/seaice/seaice_growth.F:
4d8bc9f16f Gael*5536 - fix SItflux diagnostics in virtual salt flux + balanceEmpmr case.
9bb13a83a0 Jean*5537 o pkg/obcs:
f9543ec2af Jean*5538 - change default setting of OBCS_UVICE_OLD from defined to undef;
5539 - use new parameter OB_indexNone for null index value (instead of hard-coded 0)
5540 in all pkg/obcs code and in other pkgs; remove k loop in obcs_check_depths.F;
5541 - pass OB_indexNone as (new) argument to S/R CTRL_MASK_SET_[X,Y]Z;
5542 - change OB null index value (OB_indexNone) to -99 ; this fix the problem
5543 with Southern & Western OB at a tile edge (at least in a simple set-up).
5544 o pkg/obcs:
9bb13a83a0 Jean*5545 - change settings of OB index in case OB coincides with tile edge (shared by
5546 2 tiles), so that common OB location is registered by both tiles (instead of
5547 only 1). However, for Southern and Western OB, index value = 0 is not
5548 recognized as valid OB index (=default null value) and needs to be fixed.
5549 - modify accordingly OBCS_BALANCE_FLOW and OBCS_MONITOR (avoid double counting)
f9543ec2af Jean*5550 - new parameter "OB_indexNone" for null index value (for now, still zero)
9bb13a83a0 Jean*5551 to replace hard-coded null index value of zero.
c783d09169 Jean*5552 o pkg/exch2:
5553 - improve W2_USE_E2_SAFEMODE (faster) and W2_E2_DEBUG_ON:
5554 always check buffer-size (but outside the loop); move checking for valid
5555 index from W2_USE_E2_SAFEMODE to W2_E2_DEBUG_ON; in W2_E2_DEBUG_ON,
5556 print each tile and point connection only if |W2_printMsg|>= 2 and 3.
307cef9ba4 Jean*5557 o pkg/ctrl (pack & unpack):
5558 - in ctrl_pack.F & ctrl_unpack.F, use the same local file-name variable
5559 (locally defined) for different variables (+ remove the variable-specific
5560 file name in CTRL_GENARR.h). For now, only implemented for GENARR2/3D_CONTROL
5561 (to be extended to other local file names in ctrl.h).
5562 o pkg/flt:
5563 - add a FLT_Iter0 option (similar to PTRACERS_Iter0).
31ef3766a3 Jean*5564 o pkg/mdsio:
5565 - fix missing STOP in mdsio_readvec_loc.F (case ioUnit=0) when file is missing
4308379183 Jean*5566 o tools/genmake2:
5567 - add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE
5568 (added by Alistair in version 1.51 for building without make depend);
5569 - remove Header files list (H_SRC_FILES) from the dependence of targets
5570 ad_input_code.f & ftl_input_code.f (not clear why it was added in the first
5571 place in version 1.23): this save going through staf when unrelated header
5572 file has been modified.
5573 Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without
5574 "make depend" step, still need to do "make links" before "make adtaf".
e4daa51e76 Jean*5575 o eesupp/src (+ few pkg src files) & genmake2:
5576 - finish to remove ALWAYS_USE_MPI in source code that TAF does not see;
5577 - no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2).
4308379183 Jean*5578 - improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish
e4daa51e76 Jean*5579 upper/lower case ; account for space between "#" and undef/define)
5580 o pkg/flt (with exch2):
5581 - cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F;
4308379183 Jean*5582 - simplify threads synchronisation; fix (many issues) multi-threaded with MPI.
e4daa51e76 Jean*5583
441c88984f Jean*5584 checkpoint63s (2012/09/05)
8de17d15ea Gael*5585 o pkg/ecco:
f1085458a2 Jean*5586 - remove #ifdef ALLOW_SMOOTH_CORREL3D brackets.
5587 - add more relevant #ifdef ALLOW_SMOOTH ones.
5588 - sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D.
8de17d15ea Gael*5589 o pkg/ctrl:
5590 - CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D,
5591 ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D.
f1085458a2 Jean*5592 - ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag,
5593 doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and
5594 ctrlSmoothCorrel3D (new).
8de17d15ea Gael*5595 The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP.
5596 - ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist.
f1085458a2 Jean*5597 - ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress
8de17d15ea Gael*5598 controls when useAtmWind, and vice versa.
5599 - ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers.
5600 - ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with
f1085458a2 Jean*5601 #ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH.
5602 - ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with
5603 #ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH.
5604 - ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F:
5605 replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D.
8de17d15ea Gael*5606 o pkg/smooth:
f1085458a2 Jean*5607 - remove un-necessary includes.
5608 - remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets.
5609 Those CPP options were never defined, and not necessary.
8de17d15ea Gael*5610 o model/src:
5611 - fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi).
5612 - standard treatment of useSMOOTH.
5613 o pkg/autodiff:
f1085458a2 Jean*5614 - add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode,
5615 useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint.
dace8652ae Jean*5616 o pkg/exch2:
5617 - add "if usingMPI" where it was missing (in exch2_rx?_cube*.template)
8de17d15ea Gael*5618 + start to remove ALWAYS_USE_MPI in source code that TAF does not see.
dace8652ae Jean*5619 - make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag
5620 and tiles to process mapping.
5621 - re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h)
5622 moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h;
5623 rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX
5624 from w2_eeboot.F to w2_readparms.F.
5625 o eesupp/src:
5626 - set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of
5627 ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F;
5628 also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F
5629 - in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI
5630 is defined (remove condition on usingMPI) to match cases where MPI_INIT
5631 has been called.
5632 - fix bug I put in previous modif of exch_sm_3d_rx.template (not much used);
5633 - change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings
5634 (so that on 1 proc, get same myPid independently of usingMPI)
5635 - add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and
5636 useCubedSphereExchange with EXCH-1 (safer).
5637 - add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI).
e2a9470322 Jean*5638 o pkg/ggl90:
5639 - fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call)
5640 used in ALLOW_GGL90_SMOOTH code.
5641 o pkg/flt:
5642 - fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping
5643 floats at the Southern end of the domain).
5644 o eesupp/inc:
5645 - add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h);
5646 but not used (and not to be used) anywhere, just for documentation.
c7b36da2b3 Jean*5647 o pkg/autodiff, exf, ptracers & seaice (AD & TL output):
5648 - comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since:
5649 a) can damage previously written records in any other multi-record files.
5650 b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S.
32c6b8e3e2 Jean*5651 o tools/genmake2:
5652 - define variable MAKE within Makefile and use it in place of 'make';
5653 - update AD_CONFIG.h (if needed) before building any of the executable
5654 (forward, adjoint or tangent-lin); this involves a 2nd invocation of make;
5655 and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h;
5656 - always print usual warning comment 'this file is automatically generated'
5657 from script convert_cpp_cmd2defines (+ remove this warning from genmake2).
c7b36da2b3 Jean*5658 o pkg/cheapaml:
5659 - updated to correspond to the code used in accepted paper (Nico Wienders).
32c6b8e3e2 Jean*5660 o pkg/exf:
5661 added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch.
5662 ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F)
5663 and force defines ALLOW_BULKFORMULAE (EXF_OPTIONS.h).
5664 o pkg/exf, autodiff, ctrl, ecco and seaice:
5665 remove ALLOW_ATM_WIND brackets, or replace them with useAtmWind ones.
5666 o pkg/ctrl, ecco:
5667 allow to compile both ALLOW_U/VSTRESS_CONTROL and ALLOW_U/VWIND_CONTROL.
5668 Depending on useAtmWind, one is inactive, and the other is active (see
5669 exf_getffields.F/exf_getsurfacefluxes.F).
4681beea4a Jean*5670 o tools/genmake2:
5671 - improve error msg when failing in 2nd test of check_for_broken_Ff
5672 - fix option '-makefile' short-name (-mf according to genmake2 -help)
5673 - source local config file "genmake_local" just after processing the genmake2
5674 command arguments (previously done before processing arg).
07c8ca60a9 Jean*5675 o pkg/grdchk:
5676 - add a call to TURNOFF_MODEL_IO for Tangent-Linear run (in this case, call
5677 to this routine from cost_final has been dropped in g_cost_final)
5678 - improve printed information (more explicit msg, no longer using "print *,"
5679 fix fcpertminus printed value).
0c39183c54 Jean*5680 o model/src:
5681 - move call to COST_INIT_VARIA out of packages_init_variables.F directly
5682 into initialise_varia.F (just after calling PACKAGES_INIT_VARIABLES):
5683 this prevents getting cost-funct reset in adinitialise_varia recomputations.
2b983d7243 Jean*5684 o pkg/dic:
5685 - move initialisation of "freefe" array from from dic_biotic_forcing.F to
5686 fe_chem.F: this prevents TAF from dropping this initialisation in TLM code.
5687 o pkg/grdchk:
c78fad8e88 Gael*5688 - grdchk_main.F : added CALL GLOBAL_SUM_INT( ierr , myThid )
2b983d7243 Jean*5689 - grdchk_getadxx.F etc. : omit I/O if ierr.EQ.0
5be1b702e4 Gael*5690 o pkg/autodiff/ctrl/grdchk :
2b983d7243 Jean*5691 - attempt to sort out what works and what does not,
5be1b702e4 Gael*5692 with regard to I/O, and to warn/stop accordingly.
2b983d7243 Jean*5693 o pkg/grdchk:
5be1b702e4 Gael*5694 - attempt to fix grdchk in the case of useSingleCpuIO.
5695 - "if ( myProcId .EQ. grdchkwhichproc .AND. ierr .EQ. 0 )"
5696 statements were moved from grdchk_main.F and into
5697 grdchk_getadxx.F grdchk_getxx.F grdchk_setxx.F.
5698 - a global sum is applied to record numbers icvrec/layer
5699 out of grdchk_loc so that they be passed to I/O routines.
2b983d7243 Jean*5700 o pkg/smooth:
5701 - fix recomputation that appeared with nlfs : use smooth_recip_hFacC,
5be1b702e4 Gael*5702 smooth_hFacW, smooth_hFacS (copied at init_fixed) in 3d case.
97ed0955b8 Jean*5703 o verification/testreport:
5704 - add option '-tlm' for Tangent-Linear test (-adm,-oad,-tlm are all exclusive);
5705 - can also use compressed (gzip) reference output file;
5706 - change format (in pkg/grdchk) of TLM output (+ add forward gradient)
5707 to be easier to collect by testreport.
5708 - update existing TLM output (half out-of-date by more than 3 yrs).
090e7aded7 Jean*5709 - report NETCDF & LAPACK settings (from genmake2) in output dir.
5710 - report run-time in each individual summary (previously only for AD test);
5711 for TLM test, add also TAF version.
5712 - add daily TLM test on (old) aces cluster + weekly test on baudelaire.
97ed0955b8 Jean*5713
5ea440c02d Jean*5714 checkpoint63r (2012/08/15)
5715 o tools/genmake2:
5716 - fix Makefile for target ftlall (+ update files to clean after make ftlall)
a7fab58b1c Gael*5717 o pkg/ecco/ecco_cost_final.F :
5ea440c02d Jean*5718 - fix fc print statements (to stdout and costfunction0000) so
a7fab58b1c Gael*5719 that the printed value is always after the global sum.
5720 o pkg/seaice/seaice_dynsolver.F :
5721 - fix ice strength assymptote at SEAICE_area_max<1
5722 (no change for the standard case of SEAICE_area_max=1)
f0c312b070 Jean*5723 o some cleaning:
5ea440c02d Jean*5724 - pkg source files: ensure that all *.F files from each pkg included the
f0c312b070 Jean*5725 corresponding ${PKG}_OPTIONS.h file (except stand-alone src file which
5ea440c02d Jean*5726 only includes CPP_EEOPTIONS.h); fix S/R CTRL_SMOOTH ; update AD experiment
f0c312b070 Jean*5727 code_ad/*.F src files; add new option-file in pkg/admtlm + corresponding
5ea440c02d Jean*5728 includes;
f0c312b070 Jean*5729 - model/src: add PACKAGES_CONFIG.h wherever ALLOW_AUTODIFF[_TAMC] is used.
5ea440c02d Jean*5730 - ALLOW_DIFFKR_CONTROL: add a stop in S/R CTRL_CHECK in case ALLOW_3D_DIFFKR
5731 is undef; also define /DYNVARS_DIFFKR/ common block in DYNVARS.h when
f0c312b070 Jean*5732 ALLOW_DIFFKR_CONTROL is defined, to allow to compile and reach this stop.
5733 - update option-file CPP_OPTIONS.h of all AD experiments:
5ea440c02d Jean*5734 * no longer include PACKAGES_CONFIG.h ;
5735 * includes ECCO_CPPOPTIONS.h if PACKAGES_CONFIG.h has been included ;
5736 * def/undef ALLOW_3D_DIFFKR independently of ALLOW_DIFFKR_CONTROL (before
f0c312b070 Jean*5737 including ECCO_CPPOPTIONS.h).
0185f8e796 Jean*5738 o pkg/cost, pkg/ctrl, pkg/ecco option-file:
5739 - clean-up and split content of old pkg/ecco/ECCO_CPPOPTIONS.h file into
5740 separated pkg option-file (done according to old doc from ECCO_CPPOPTIONS.h,
5741 not necessary accurate).
5742 - add a template for option-file ECCO_CPPOPTIONS.h, mostly empty, in
5743 pkg/autodiff, i.e., the 1rst pkg to compile for adjoint built, with lines to
5744 deliberately break compilation (a remainder that it needs to be customized)
5745 - in pkg/ecco, includes ECCO_OPTIONS.h instead of COST_OPTIONS.h
5746 - rename COST_CPPOPTIONS.h to COST_OPTIONS.h
5747 - rename CTRL_CPPOPTIONS.h to CTRL_OPTIONS.h
5748 o tools/genamke2:
5749 - check for lapack.
53ea01923d Gael*5750 o pkg/cost and pkg/ecco : attempt to sort out some of the limiting intricacies.
0185f8e796 Jean*5751 - pkg/cost.cost_final.F : allow for use of pkg/ecco and pkg/cost cost functions
5752 jointly. The exclusive ifdefs were removed, to add costs terms (when defined)
5753 from both packages.
53ea01923d Gael*5754 - the fc global sum in pkg/ecco/ecco_cost_final.F was removed accordingly.
5755 - for objf_atl we use either the pkg/ecco or the pkg/cost term depending on CPPs.
0185f8e796 Jean*5756 - pkg/ecco and model/src : add CPP brackets around pkg/cost and pkg/ctrl includes
5757 of "CTRL_SIZE.h" "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly.
53ea01923d Gael*5758 o pkg/cost : add comments to explain special and/or untested setups.
6e25847946 Jean*5759 o pkg/exf:
5760 - use EXF_OPTIONS.h to set pkg/exf options except if done in ECCO_CPPOPTIONS.h
5761 (previously, ALLOW_AUTODIFF_TAMC was controling this switch).
5762 o verification/*/code_ad:
5763 mimimal cleaning of AD experiments ECCO_CPPOPTIONS.h option-file:
5764 - reccord when this file is included (define ECCO_CPPOPTIONS_H)
5765 - remove the most obvious obsolete features (e.g., #define ALLOW_COST not
5766 allowed since Oct 2003 in any option-file except in PACKAGES_CONFIG.h)
c67a77c8bb Gael*5767 o pkg/seaice :
6e25847946 Jean*5768 - added possibility to change ice strength/PRESS0 relationship to
5769 HEFF, according to the following run time parameters
5770 SEAICEpresPow0 :: HEFF exponent for ice strength below SEAICEpresH0 (integer, >0)
5771 SEAICEpresPow1 :: HEFF exponent for ice strength above SEAICEpresH0 (integer, >0)
5772 SEAICEpresH0 :: HEFF threshold for ice strength (m)
c67a77c8bb Gael*5773 o pkg/ggl90 :
6e25847946 Jean*5774 - added run time flag mxlSurfFlag to include the code that ensure
c67a77c8bb Gael*5775 mixing between first and second level (previously included as a comment)
135650b823 Gael*5776 o verification/1D_ocean_ice_column/input_ad/data.autodiff :
6e25847946 Jean*5777 - add test of newly added dumpAdByRec=T option where
135650b823 Gael*5778 we write all records to one file per variable.
5779 o verification/global_ocean.cs32x15/code_ad/CPP_OPTIONS.h :
5780 - switch to #define ALLOW_BALANCE_RELAX and ALLOW_BALANCE_FLUXES
5781 to check that this code is ok with taf and compiles in adjoint.
5782 o pkg/autodiff :
5783 - added run time param dumpAdByRec : ad dump format switch.
6e25847946 Jean*5784 If true then write all records to one file per variable.
5785 Else write one file per record (remains the default).
135650b823 Gael*5786 - revise seaice_ad_dump.F and exf_adjoint_snapshots_ad.F accordingly.
e9b3a4dec3 Gael*5787 o pkg/seaice:
5788 - Added SEAICEuseTILT run time switch : if set to
6e25847946 Jean*5789 false then omit the tilt term in seaice dynamics.
e9b3a4dec3 Gael*5790 - Fix free drift calculation.
a8eec7f730 Patr*5791 o pkg/shelfice:
6e25847946 Jean*5792 When initializing SHELFICEDragQuadratic, set default to be
5793 consistent with shiCdrag in case SHELFICEuseGammaFrict is used,
a8eec7f730 Patr*5794 but retain option to set it independently
5795 (inconsistenty spotted by Veronique Dansereau)
fe9611ab7a Jean*5796 o eesupp/inc:
5797 - in EEPARAMS.h, add real-type constant for some frequently used simple number
5798 (0,1,2,1/2), with name explicitly referring to RS/RL type.
5799 o model/src:
5800 - move balancing of relaxation terms to new S/R balance_relax.F.
9eb8003f99 Jean*5801 o pkg/autodiff:
5802 re-write active I/O high-level (control) S/R:
5803 - rename S/R ACTIVE_READ/WRITE_RL to ACTIVE_READ/WRITE_3D_RL
5804 - add 1 more argument (useCurrentDir) to replace the "_LOC" 2nd set of S/R.
5805 - use standard pkg/mdsio I/O routines (MDS_READ/WRITE_SEC_XZ/YZ and
5806 MDS_READ/WRITE_FIELD); change loops to multi-threads.
5807 - update and merge active_file_control_slice.flow into active_file_control.flow
5808 - update the calls in lower level S/R (active_file.F, active_file_g.F and
5809 active_file_ad.F) keeping the argument list and function unchanged.
ee91acaaf9 Jean*5810 - also update lower-level "_LOC" version (call same S/R with "useCurrentDir
5811 =.TRUE.") and remove high-level (control) _loc version (not called anymore).
75bd0a9954 Jean*5812 - new low-level active I/O routines, one for each type (RL/RS), for active var
5813 of various (XY,XZ,YZ) shape and level number (arguments: arrShape, myNr);
5814 fix ctrl_init_wet.F & ecco_cost_weights.F by calling the new S/R with the
5815 right type.
9eb8003f99 Jean*5816 o autodiff and RS=real*4:
5817 - call the right type (_RS instead of _RL) of S/R in few output S/R (pkg/exf
5818 ad-monitor and snapshots); disable arrType='RS' in mdsio_gl*.F ;
5819 - change argument type of 3-D mask argument to _RS to match type in the call
5820 (in seaice_cost*.F, ctrl_*_gen.F and *ctrl_bound.F); to be continued.
4cdea015c1 Jean*5821 o pkg/thsice:
5822 - re-anable balanceEmPmR when useSEAICE=T with useThSIce=T.
5823 - option to correct ocean fresh-water flux for imbalance of Atmos+Land
5824 fresh-water flux: uniform correction or proportional to local precip.
10741bb907 Patr*5825 o pkg/ctrl:
5826 - new header file CTRL_SIZE.h for parameters maxCtrlArr2D, maxCtrlArr3D
5827 - redefine CPP option ALLOW_BOTTOMDRAG_CONTROL to
5828 ALLOW_BOTTOMDRAG_CONTROL_NONGENERIC
5829 - verification/hs94.1x64x5/ tests ALLOW_GENARR{2D,3D}_CONTROL
4cdea015c1 Jean*5830
5ba9855446 Jean*5831 checkpoint63q (2012/07/30)
09b7b7656d Jean*5832 o pkg/autodiff:
5833 note about monitor and snap-shot of ad-variables:
5834 a) need to apply ADEXCH before monitor or output of ad-vars to include
5835 overlap contributions (was done for adjDump but missing for monitor).
5836 b) since ADEXCH implies adding overlap values to interior array, machine
5837 truncation error is expected when adding an ADEXCH call in the middle of
5838 the time-stepping (although mathematically identical).
5839 modifs:
4d079479ad Jean*5840 - fix some incorrect type (RL/RS, UV/scalar) in ADEXCH calls and ad-vars
5841 declaration (adEddyPsiX,adEddyPsiY in adcommon.h).
09b7b7656d Jean*5842 - add new run-time params (dumpAdVarExch & mon_AdVarExch) to select how to
5843 apply ADEXCH before monitor or snap-shot of ad-variables:
5844 =0 : no ADEXCH ; =1 : do ADEXCH ; =2 : apply ADEXCH on a local copy.
5845 - implement new method (copy+adexch) for snap-shot and monitor of main model
4d079479ad Jean*5846 ad-vars (initially not used by default -> output unchanged).
5847 - change default (set to 2) to use new method and update few output_adm.txt
5848 with accurate ad-monitor (global_ocean.90x40x15, tutorial_global_oce_biogeo
5849 and both tutorial_tracer_adjsens tests).
5850 - switch 2 global_ocean.cs32x15 AD-tests to AB-2 (seaice_dynmix & thsice)
5851 and turn off momDissip_In_AB in the 2 other (needed for stable AB-3).
01d011442e Patr*5852 o pkg/ctrl:
5853 enable the use of a variable number (maxCtrlArr2D, maxCtrlArr3D) of
5854 generic control variables via
5855 #define ALLOW_GENARR2D_CONTROL and/or #define ALLOW_GENARR3D_CONTROL
5856 Only required customization should be S/R ctrl_map_ini_genarr.F
5857 (routine in repository contains example)
7f14c670e9 Jean*5858 o pkg/exf:
5859 - fix and refine checking of surface-relaxation setting when using EXF
cda8c5ef00 Jean*5860 o verification (adjoint exp):
5861 - reduce length of simulation by half for experiment global_ocean.cs32x15
5862 (std, seaice & seaice_dynmix) and exp tutorial_dic_adjoffline; update output.
a2b6ec31fa Mart*5863 o pkg/mom_common (mom_u/v_bottomdrag), pkg/shelfice (shelfice_u/v_drag)
cda8c5ef00 Jean*5864 - replace if statements KE.ne.0 with KE.gt.0 to avoid sqrt of negative numbers
a2b6ec31fa Mart*5865 of KE that can occur with aggressive optimization
cda8c5ef00 Jean*5866 + put quadratic bottom drag calculation in separated loops (only done if
5867 using bottomDragQuadratic)
fb5ebe7993 Jean*5868 o model/src: CG2D_NSA
5869 - clean-up: stop if cg2dNormaliseRHS=T and AUTODIFF
5870 and replace GLOBAL_SUM calls with GLOBAL_SUM_TILE.
5871 - in test-exp that uses CG2D_NSA (bottom_ctrl & tutorial_tracer_adjsens),
5872 change cg2d residual target to be expressed in Wunits (=> do not normalise
5873 RHS ; this fix global_max Pb with TAF); update output.
04c0091821 Jean*5874 o verification/tutorial_tracer_adjsens:
fb5ebe7993 Jean*5875 improve parameter consistency (and get rid of warnings):
04c0091821 Jean*5876 - use deltaTFreeSurf=deltaTtracer (better with NonLin FreeSurf);
5877 - switch Temp Adv Scheme from 81 to 80 (no limiter since theta < 0 is physical)
5878 - use staggerTimeStep (for stability) in som81; use default rotation period.
0288336348 Jean*5879 o pkg/exch2:
5880 - with empty facet: fix compact-format (W2_mapIO=1) definition (was previously
5881 reset to 0 = 1 long line in X)
5882 o pkg/mdsio:
5883 - fix reading of dimensions from meta file for large-size domain
02de2b8dd0 Jean*5884 o model/src:
5885 - fix saltIsActiveTr setting for IdealGas eosType (eosType is 6 character long);
5886 - to refine CS-grid check, add logical flag "hasWetCSCorners": true if using
5887 Cubed-Sphere Exch with CS-corners inside the domain;
5888 make new S/R INI_GLOBAL_DOMAIN from code in ini_linear_phisurf.F to calculate
5889 globalArea and to set hasWetCSCorners.
5890 - add warning if usingCurvilinearGrid and momAdvection in flux-form (missing
5891 metric terms); stop if hasWetCSCorners=T and momAdvection in flux-form.
5892 - re-activate the stop if useCDscheme and hasWetCSCorners=T (previously if
5893 useCDscheme and useCubedSphereExchange).
b1b02f4641 Gael*5894 o pkg/seaice/seaice_growth.F :
02de2b8dd0 Jean*5895 - compute the SEAICE_DISABLE_HEATCONSFIX term accordingly
5896 for the (.NOT.useRealFreshWaterFlux).OR.(nonlinFreeSurf.EQ.0)
5897 when the previous code was not correct.
5898 - in all cases diagnoze the boundary condition mismatch to SIaaflux
5899 - in the case of useRealFreshWaterFlux.AND.(nonlinFreeSurf.GT.0) add
5900 that term to QNET (essentially to set the melt/freeze water to 0degC).
5901 when SEAICEheatConsFix is true, so that the ocean+ice budget heat is closed.
82e953e38c Gael*5902 o verification/global_ocean.cs32x15/input.seaice :
02de2b8dd0 Jean*5903 - add SEAICEheatConsFix in data.seaice, ensuring closed ocean+ice heat budget.
5904 - add diagnostics (commented out) for budget test using my matlab codes (gcmfaces).
5905 - update results (output.seaice.txt) accordingly.
82e953e38c Gael*5906 o verification/lab_sea/input/data.seaice :
02de2b8dd0 Jean*5907 - remove SEAICEheatConsFix, which is now be tested
5908 in global_ocean.cs32x15. The presently coded fix
5909 is only consistent with real fresh water + nlfs.
5910 - update results (output.txt) accordingly.
b0139591bd Gael*5911 o pkg/salt_plume: added diagnotic for salt tendency (oceSPtnd).
81055d8424 Jean*5912 o AD_CONFIG.h file:
02de2b8dd0 Jean*5913 - in genmake2: remove "#undef ALLOW_ECCO_OPTIMIZATION" from AD_CONFIG.h;
5914 - remove #include "AD_CONFIG.h" from all included OPTIONS files and
5915 add it explicitly in each fortran src file where it is needed.
5916 motivation: header file AD_CONFIG.h is generated/modified after "make depend"
5917 thus introducing potentially wrong dependency; therefore, better to include
5918 it only where it's really needed, and after any other included OPTIONS file
5919 (less tempting to bring conditional includes according to ALLOW_ADJOINT_RUN
5920 or ALLOW_TANGENTLINEAR_RUN).
81055d8424 Jean*5921
361210b820 Jean*5922 checkpoint63p (2012/07/06)
94af53ae23 Jean*5923 o pkg/autodiff:
5924 - rename S/R INI_AUTODIFF to AUTODIFF_INIT_VARIA ;
5925 - create new header file "AUTODIFF_PARAMS.h" for pkg/autodiff parameters
5926 which are now read from new parameter file "data.autodiff" (inAdExact
5927 previously in "data", use{KPP/GMRedi/SEAICE}inAdMode previously in data.pkg)
5928 - add file "data.autodiff" in all verification/*/input_ad/ directories.
6101a96b98 Jean*5929 - add run-time parameter to turn On/Off SEAICEuseFREEDRIFT in adjoint/forward
5930 mode (used in global_ocean.cs32x15.seaice_dynmix test exp.)
aa94224112 Patr*5931 o verification/tutorial_tracer_adjsens/
5932 - add extra sub-verification which uses "SOM" advection scheme
5933 (2nd Order-Moment Advection Scheme, Prather Limiter) with
94af53ae23 Jean*5934 #define GAD_ALLOW_TS_SOM_ADV in GAD_OPTIONS.h
aa94224112 Patr*5935 and in data:
94af53ae23 Jean*5936 multiDimAdvection=.TRUE.,
5937 tempAdvScheme=81,
5938 saltAdvScheme=81,
d3350d435b Gael*5939 o model/src:
5940 - introduce ALLOW_BALANCE_RELAX which allow the removal
5941 of the global mean of relaxation terms by setting
5942 balanceThetaClimRelax and balanceSaltClimRelax
361210b820 Jean*5943 - disable balanceEmPmR and balanceQnet in the case when useSeaice.
d3350d435b Gael*5944 This case is now treated appropriately in seaice_growth.F
5945 o pkg/seaice:
361210b820 Jean*5946 - do balanceEmPmR and balanceQnet based on the net fluxes
5947 (SItflux) that enter the ocean+ice system rather than QNET
5948 and EMPMR. Works best in real fresh water.
5949 - SIatmFW, SIatmQnet, and SItflux computations had to be moved
5950 out of the diagnotics bloc, and stored in global arrays.
aa94224112 Patr*5951
e03d424aa5 Jean*5952 checkpoint63o (2012/06/29)
7ea3641d7d Jean*5953 o vertical mixing schemes:
5954 - remove unused S/R CALC_BUOYANCY (left from branch-atmos merging)
5955 - replace computation of density (in Function STATE1, opps_calc.F) by a call
5956 to S/R FIND_RHO_SCALAR
5957 - pass sigmaR to S/R PP81_CALC, MY82_CALC (but not yet used) and to GGL90_CALC
5958 and use it for N^2 calculation in ggl90_calc.F (save 2 density computations);
5959 affects output (vermix.ggl90) at truncation level.
de24565c3d Jean*5960 o testreport:
5961 - change adjustment of SIZE.h for mpi+mth testing: preserve enough tiles
5962 (nSx,nSy) for the number of threads (from eedata.mth)
11491399e8 Jean*5963 o model/src:
5964 - remove 2nd set of calls at the top of initialise_varia.F (Adjoint part)
5965 related to Non_Lin Free-Surf or Bottom-Control (but not longer necessary).
f7139038cb Patr*5966 o verification/tutorial_tracer_adjsens/
5967 - compile with ALLOW_CG2D_NSA
5968 - run with nonlinFreeSurf=3
5969 - update reference output_adm.txt
69c15f0fc5 Jean*5970 o tools/genmake2:
5971 - add "-DHAVE_NETCDF" to the DEFINES list when NetCDF is available ;
5972 refine usePROFILES switching off (only when NetCDF is not available).
781a2dcf80 Jean*5973 o verification (atmospheric set-up):
5974 - change eosType='IDEALGAS' to eosType='IDEALG' to match variable declaration
89f2ec68ea Gael*5975 o pkg/profiles : refine profiles and files handling.
5976 o model/src and pkg/ecco : introduce run-time switch usePROFILES.
c8b7080413 Gael*5977 o model/src/the_main_loop.F, forward_step.F and pkg/exf/EXF_OPTIONS.h :
5978 - changes to use model/src/the_main_loop.F rather than the ecco version
5979 in ecco type adjoint runs.
18d45ae82f Jean*5980 o model/src:
781a2dcf80 Jean*5981 - move computation of recip of grid distance & area from INI_MASKS_ETC to INI_GRID
5982 - move setting of h0Fac[C,W,S] from INI_LINEAR_PHISURF to INI_MASKS_ETC
5983 - update_masks_etc.F: rename SMOOTH*_R4,R8 function to the corresponding type (RS,RL)
5984 o model/src:
5985 - fix S/R UPDATE_CG2D for ALLOW_DEPTH_CONTROL case (was empty before);
18d45ae82f Jean*5986 update output of test experiment bottom_ctrl_5x5.
d8428293bd Jean*5987 o pkg/generic_advdiff:
5988 - implement vertical bi-harmonic diffusion (for now, only for T & S and
5989 only explicitly).
1beab3301f Patr*5990 o verification/bottom_ctrl_5x5/
5991 update reference output (results changed quite some time ago,
5992 not sure when; but new reference results look ok in terms of grdchk)
2478d50aeb Patr*5993 o verification/1D_ocean_ice_column/
5994 For verification purposes, the exact adjoint rather than an approx.
5995 should be used (e.g., to comare against F.D. or TLM).
5996 removed autodiff_inadmode*_ad.F routines in code_ad/
5997 Update results/ accordingly.
2889362499 Jean*5998 o pkg/cal:
5999 - change cal_getdate.F so that output date is function of input time only
6000 (less ambiguous, not mixed up with input iteration number).
6001 - fix calendarDumps for non-zero phase-lag (S/R CAL_TIME2DUMP).
3078ffbadd Jean*6002 o pkg/diagnostics:
6003 - implement calendarDumps also for stats-diags
6004 - implement calendarDumps also for snap-shot output (negative freq)
6005 - for now, ignores calendarDumps if non-zero phase-lag.
6006
fb29d0ce0b Jean*6007 checkpoint63n (2012/06/04)
e2c4129169 Jean*6008 o model/src:
6009 - recompute rSurfW & S to ensure consistent column thickness (needed for rStar)
6010 between Sum_k(hFac*drF) and rSurf-rLow, for now only when using pkg/shelfice;
95205589aa Jean*6011 - use h0FacC, W & S to compute hFac_surfC, W & S in calc_surf_dr.F (more
6012 similar to calc_r_star.F); update results of experiment internal_wave and
e2c4129169 Jean*6013 tutorial_global_oce_in_p (affected @ truncation level).
6014 o pkg/shelfice:
6015 - add parameterisation of advective-diffusive flux into the ice shelf
c1ef53a9f3 Mart*6016 according to Holland and Jenkins (1999), eq.22-33, as suggested by Jan De Ryd
6017 - simply eps3/3a computation
83625f7fb2 Jean*6018 o eesupp:
6019 - add new CPP option (DISCONNECTED_TILES) to disconnect tiles (no exchange
6020 between tiles, just fill-in edges assuming locally periodic subdomain) and
6021 add corresponding exchange subroutines (EXCH0);
6022 - new CG-solver version (_EX0) for disconnected-tiles special case.
30e5f8e0a0 Jean*6023 o model/src (CG-solvers):
6024 - modify Single-Reduction version (CG2D_SR) in case cg2dMaxIters is reached
6025 (similar final residual output and max-Iter number as with standard version);
6026 - allows to store and use lowest-residual solution (standard & _SR versions);
6027 - cleaning up (remove old, commented out code, LETS_MAKE_JAM ...).
6028 - by default, also compile CG2D_SR version (define ALLOW_SRCG in CPP_OPTIONS.h)
6029 o eesup/src:
6030 - global_vec_sum.F cleaning: add a BARRIER ; update comments ; remove ndef
6031 ALWAYS_USE_MPI (no longer needed after fixing usingMPI settings - March 2012)
0f5e9791d2 Patr*6032 o pkg/salt_plume added to lab_sea/input_ad.noseaicedyn
6033
b4f2dc2460 Jean*6034 checkpoint63m (2012/04/27)
fa1b72b057 Jean*6035 o pkg/shelfice:
6036 - account for partical cells in surface level below ice-shelf for hydrostatic
6037 pressure calculion (set uniformFreeSurfLev to F); update isomip experiments.
f74931b354 Jean*6038 o ad test experiments:
6039 - update and rename to "ad_optfile.local" local AD-optfile specific to a
6040 particular adjoint verification experiment (in verification/*/code_ad/)
fb5f9f12be Patr*6041 o pkg/seaice & pkg/exf:
f74931b354 Jean*6042 - Part two of ECCO-CLIVAR code merges.
fb5f9f12be Patr*6043 Completes merge of seaice area relax. code.
6044 Requires unified CPP option EXF_ALLOW_SEAICE_RELAX
6045 to be set in EXF_OPTIONS.h since this pkg controls its I/O
6046 (and avoids second CPP option in SEAICE_OPTIONS.h)
f74931b354 Jean*6047 - change default value of costIceStart & costIceEnd to a valid date.
f053446eb2 Dimi*6048 - add snowPrecip to HSNOW in seaice_growth
2db9a89c59 Jean*6049 o pkg/ptracers:
6050 - move ptracers summary and setup check into separated S/R ; add a check for
6051 valid PTRACERS_Iter0 value (error+stop or just warning).
9afd0876bd Jean*6052 o pkg/cal (+ pkg/ecco):
6053 - avoid calling a S/R with 2 times the same arg (FWD: unless both are only used
6054 as input; and for AD, unless both are not differentiable (e.g., k index)).
546970fc27 Jean*6055 o model/src:
6056 - define internal flag "uniformFreeSurfLev" (=T when free-surface level-index
6057 is everywhere k=1) to speed-up some calculations (by pass kSurf reference);
6058 temporary set to usingZCoords value (to be changed to F when using shelfice).
6059 - hydrostatic pressure: implement partial cell near the surface also for
6060 Z-coordinates (for the case where uniformFreeSurfLev=F); replace test on
6061 usingZCoords with test on uniformFreeSurfLev where needed (in NonHyd code).
6062 o pkg/ctrl/ctrl_init.F:
6063 - add a formal parameter to s/r ctrl_init_rec to print
d993cf017d Mart*6064 xx_$(ctrl_valiable)_file for easier debugging
6065 - move call of cal_* routines into the if-block where they are really
546970fc27 Jean*6066 needed so that xx_$(ctrl_variable)_period can be 0 or -12 without having
d993cf017d Mart*6067 to specify a startdate
5b4194ac9e Jean*6068 o pkg/seaice:
6069 - update comments in SEAICE_OPTIONS.h (+ similar update of lab_sea/code and
6070 global_ocean.cs32x15/code versions).
6071 - turn on seaice Multi-category (in data.seaice, SEAICE_multDim=7) for
6072 verification experiment global_ocean.cs32x15.seaice and update results.
0c1f58d8ac Jean*6073 o pkg/exf:
6074 - new S/R EXF_GETFIELD_START to return starting-time of a forcing field
6075 (according to useExfYearlyFields).
e876af632a Jean*6076 o pkg/cal:
6077 - move calendar setting & summary (previously in cal_readparams.F) into new
6078 S/R CAL_INIT_FIXED to be called later in the initialisation process, once
6079 length of the simulation is set (after SET_PARMS call); This is an attempt
6080 to fix Pb when, e.g.: pkg/longstep, modifies the length of the run.
6081 - For safety: keep a record of pkg/cal parameter settings status
6082 to allow to STOP if one pkg/cal S/R is called too early.
0c1f58d8ac Jean*6083 - add a stop in all basic pkg/cal subroutines if called before setting is done.
6084 - modify cal_getdate.F: stop when nothing was returned;
6085 if called with myIter=-1, simply retrun modelBaseDate (1,2 = startDate_1,_2);
6086 this allows to remove "cal.h" from seaice_read_parms.F & init_mnc_vars.F.
e876af632a Jean*6087
c0d26944d6 Jean*6088 checkpoint63l (2012/04/04)
39e65f8d9e Jean*6089 o pkg/bbl:
6090 - fix call to FIND_RHO_2D in bbl_calc_rho.F (case multi-tiles per proc);
6091 update global_with_exf output.yearly.txt file.
ceea6e3706 Jean*6092 o pkg/cal:
6093 - start to clean-up cal_set.F ; fix for the case where baseTime is non-zero.
6094 - remove 2 unsused and very short (1 line only) functions ;
6095 - remove unsused subroutines from AD-Diff list.
e8bf169f85 Jean*6096 o model/src:
6097 - start to implement clean wait to stop in initialization S/R (config_check.F,
c0d26944d6 Jean*6098 packages_check.F, ini_parms.F and pkg/obcs/obcs_check.F + pkg/mypackage)
e8bf169f85 Jean*6099 o folowing PRINT_MESSAGE changes:
6100 - remove reminder multiple print to the same file (STDOUT) when multi-threads.
28ed837189 Dimi*6101 o pkg/bbl:
6102 - modification so it can work with z*
6103 - replace deltaT with dTtracerLev(k) for asynchronous time stepping
6104 - global_with_exf/input.yearly verification; changes output.yearly.txt
c064649ac0 Jean*6105 o eesupp/src:
6106 - PRINT_MESSAGE: use OpenMP critical instruction (similar to PRINT_ERROR);
6107 writing to unit 0 (if unit=errorMessageUnit) extended to the case myThid=1
6108 - CHECK_THREADS: specific code if using OpenMP threading: improve checking of
6109 # of threads across processors (e.g., different env OMP_NUM_THREADS setting)
6110 - improve special preliminary call to EESET_PARMS (if eedata is read 2 times).
6111 - when using MPI, always set usingMPI=T ; set default accordingly and stop
6112 if not consistent.
6113 - ALL_PROC_DIE: add a BARRIER after MPI_FINALIZE call ; skip this when thread
6114 argument is zero (in case called within single-thread section).
45e37a1efd Jean*6115 o pkg/fizhi:
6116 clean-up turbulence cold-start switch: decided in fizhi_init_vars.F, stored
6117 in common bloc (fizhi_coms.h) and then passed as argument up to S/R TURBIO.
12a35945df Jean*6118 o pkg/exch2:
6119 - add argument "updateCorners" to S/R exch2_get_uv_bounds (enable to
6120 activate EXCH_IGNORE_CORNERS in vector EXCH S/R).
6121 - switch 1rst EXCH call to IGNORE_CORNERS (instead of UPDATE_CORNERS)
6122 but keep the 2nd with UPDATE_CORNERS: this prevents overwriting good data
6123 with bad ones coming from a not-yet-updated halo.
6124 This should fix the problem when sNx <> sNy and GCD(sNx,sNy) < 2*Olx.
bb86b07795 Dimi*6125 o pkg/frazil:
12a35945df Jean*6126 move FrzForcT diag from frazil_diagnostics_state.F to frazil_calc_rhs.F
6127 http://mitgcm.org/pipermail/mitgcm-devel/2012-March/005384.html
16e5bb3e87 Mart*6128 o model/src/config_check.F: add a check for OLx>sNx/OLy>sNy
709f986fa5 Patr*6129 o verification/lab_sea
6130 * #undef SEAICE_EXCLUDE_FOR_EXACT_AD_TESTING
6131 * #define ALLOW_SST_CONTROL & ALLOW_SST_CONTROL
6132 * nTimeSteps 3 -> 4
6133 * changed reference output accordingly
6134 o pkg/ctrl:
6135 * fix ctrl_get_gen for xx_sst, xx_sss
0a88b6db42 Jean*6136 o pkg/fizhi:
6137 - fix 2 calls to S/R GRD2MSC (argument igrd) in update_earth_exports.F
6138 update results of exp. fizhi-cs-32x32x40 (fail with only 6 digits for cg2d)
6a018349c4 Jean*6139 - by default, use new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE);
6140 fix few out-of-bounds indices in referencing vars (initialise igrd to 1);
6141 clean-up fizhi_turb.F (remove unused & uninitialised qdiaglsm array).
4afb828a3b Jean*6142 o pkg/gmredi:
6143 - add diagnostic of Redi (main diagnonal) vertical diffusive flux of Temp
e39d8c1644 Jean*6144 o pkg/fizhi:
6145 - fix few initialisation and multi-tile Pb: aqualev & gridalt now pass the
6146 (old)aces open64 tuv test.
fe82383027 Dimi*6147 o pkg/icefront: fix bug and reorder loop in icefront_init_varia.F
55118a358d Jean*6148 o pkg/mom_vecinv:
6149 - fix 1 loop range in mom_vecinv.F to be like all the other loops which
6150 set/update gu,gv/Diss (fix Pb of uninitialised fVerUkp in admom_vecinv
6151 with non-lin free-surf).
6152 o model/src: move k-loop outside of i/j-loops when (re-)computing R_low
6153 in ini/update_masks_etc.F in order to avoid -O3 optimization problems with
a826ffe6b9 Mart*6154 some compilers (gfortran 4.6.0 on MacOS)
71f40693ee Jean*6155 o momentum:
6156 - separate fVer?(:,:,kUp) & fVer?(:,:,kDown) in argument list of MOM_FLUXFORM
6157 & MOM_VECINV subroutines (to help TAF). This fixes Pb of uninitialised
6158 fVer?(kUp) in admom_fluxform with non-lin free-surf or bottom control.
6159
104669e183 Jean*6160 checkpoint63k (2012/03/17)
ecdd0492fa Jean*6161 o model/src:
6162 - selectAddFluid (ALLOW_ADDFLUID): add missing term in horizontal momentum
6163 flux-form (mom_fluxform.F) and vertical momentum (calc_gw.F) equations.
6164 - SOLVE_DIAGONAL: switch default to use adjoinable & vectorized version
6165 (#undef SOLVE_DIAGONAL_LOWMEMORY); update output of exp. front_relax.bvp.
20e7fd8d99 Jean*6166 o model/src: solve_*diagonal.F
6167 - replace division with multiplication by inverse (similar to original version)
de7acf9ff6 Jean*6168 update output of AD exp. global_ocean.90x40x15.
20e7fd8d99 Jean*6169 - fix pkg/gmredi/gmredi_calc_psi_bvp.F & pkg/ggl90/ggl90_calc.F
6170 to enable the use of the vectorized & differentiable solve_tridiagonal.F
de7acf9ff6 Jean*6171 - test exp. global_ocean.90x40x15/input_ad: switch to advection scheme 20 for
6172 vertical advection (to get solve_tridiagonal tested in AD mode).
20e7fd8d99 Jean*6173 o pkg/seaice: ECCO-CLIVAR merge:
6174 1. seaice AREA relaxation
65e93cc4f0 Patr*6175 * CPP option: SEAICE_ALLOW_AREA_RELAXATION
6176 * runtime flag: SEAICE_tauAreaObsRelax
20e7fd8d99 Jean*6177 2. modified global mean cost imbalance code: CPP option
6178 ALLOW_SSH_GLOBMEAN_COST_CONTRIBUTION
b0f7f403cf Patr*6179 o another iteration on solve_*diagonal.F
20e7fd8d99 Jean*6180 Make choices independent of AUTODIFF
6181 Default will be the adjoinable vectorized version.
6182 Alternative choices are:
6183 * non-adjoinable original version with low memory footprint:
6184 #define SOLVE_DIAGONAL_LOWMEMORY
6185 * still adjoinable but does not vectorize (k as inner-most loop):
6186 #define SOLVE_DIAGONAL_KINNER (keeping SOLVE_DIAGONAL_LOWMEMORY undef)
49c840e1d0 Jean*6187 o testreport
6188 - add option to use a home made wrapper around "make"
6189 - remove MITGCM_IEEE env. variable (no longer active)
fa18eab287 Mart*6190 o pkg/shelfice
6191 - improve computation of friction velocity for velocity dependent
6192 exchange coefficients: include velocities into SHELFICEBoundaryLayer
6193 block to average velocities vertically
6194 - add TAF store directives for SHI_ALLOW_GAMMAFRICT
ac52667c1a Patr*6195 o Modify diagonal solvers, now three versions (upon request):
6196 #ifndef SOLVE_DIAGONAL_AUTODIFF
6197 1. default version (dating back a while ago)
6198 #else /* def SOLVE_DIAGONAL_AUTODIFF */
6199 # ifdef SOLVE_DIAGONAL_KINNER
6200 2. adjoinable version with k-innermost loop (G. Forget)
6201 # else
6202 3. adjoinable vectorized version of 2.
6203 # endif
6204 #endif /* SOLVE_DIAGONAL_AUTODIFF */
6205 All flags are currently set within routines, but could/should be moved to CPP-options.
6206 Array bounds for 1. are as before, for 2.,3. cover the entire domain
6207 (could be changed for 1. too).
cc29266a93 Jean*6208 o verification/lab_sea (fwd):
6209 - update the 4 fwd lab_sea test experiment: no longer SEAICE_GROWTH_LEGACY,
6210 use 7 categories (except hb87), new solve4temp params (except salt_plume),
6211 constant salinity (=4) or variable salinity (salt_plume) done through
6212 SItracer.
05513da3da Jean*6213 o pkg/seaice:
6214 - rename parameters: SIsalFrac to SEAICE_saltFrac & SIsal0 to SEAICE_salt0;
6215 - remove old parameters ( SEAICE_freeze, SEAICEturbFluxFormula, SEAICE_gamma_t,
6216 SEAICE_gamma_t_frz, SEAICE_availHeatTaper & SEAICE_availHeatFracFrz)
6217 from SEAICE_PARMS.h ; still need to fix seaice_cost_sst.F (broken when
6218 SEAICE_freeze got retired) but already better than previously with
6219 SEAICE_freeze=123456.7 deg.C;
6220 - move setting of facOpenGrow/Melt from SEAICE_INIT_FIXED to SEAICE_READPARMS
6221 (safer multi-threaded setting); always set SEAICEuseEVP;
6222 - setting of ocean-ice turb. flux coeff: moved from SEAICE_CHECK to
6223 SEAICE_READPARMS & SEAICE_INIT_FIXED (this fixes wrong summary report);
6224 stop if multiple specifications for the same coeff; make sure default
6225 SEAICE_mcPheePiston is compatible with drF(1) & deltaT.
e6a9f2bf3c Jean*6226 o pkg/obcs:
6227 - allow to switch to upwind 1rst order advection scheme for the advective
6228 flux computation at the open-boundary; disabled for adjoint built.
e5a3138db8 Jean*6229 o pkg/ptracers:
6230 - rename PTRACERS_RESTART.h -> PTRACERS_START.h
6231 - rename ptracers_fields_blocking_exchanges.F -> ptracers_fields_blocking_exch.F
6232 - add parameter to decide when to start a tracer; use internal flag to
6233 know which tracer to step-forward; switch this internal flag at the top
6234 of forward_step.F (new S/R PTRACERS_SWITCH_ONOFF); for now, not enabled
6235 for adjoint built.
3e983913d2 Jean*6236 o pkg/seaice:
6237 - add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ;
6238 - move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ;
6239 - keep experiment offline_exf_seaice truly single category (set MULTDIM=1).
ecde946d49 Jean*6240 o pkg/ecco:
6241 - fix writing of output file DiagnosCost_ClimSalt/Theta
6242 and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc).
3e983913d2 Jean*6243 o pkg/seaice:
e8787c77e2 Jean*6244 - add missing initialisation of COR_ICE array in dynsolver.F
6245 - merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is
6246 compiled either way, and is tested in all exps (multidim was only tested
6247 in lab_sea ad before).
6248 - cosmetic change to prepare for future addition of ITD. no change to results.
6249 no defaults change.
4ed98c0a60 Gael*6250 - added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise).
e8787c77e2 Jean*6251 - by lack of adequate verification experiments, I further used custom versions
6252 of global_ocean.cs32x15 to test multicat or not, with pickup or not. All
6253 should be correct.
4ed98c0a60 Gael*6254 - avoid recomputations in ad.
7c31770a0d Jean*6255 o array initialisation in adjoint mode:
6256 1) pkg/mom_common/mom_calc_ke.F:
6257 add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC):
6258 The S/R which calls MOM_CALC_KE initialises KE but in some recomputation
6259 part this initialisation is gone, resulting in Floating Point Exception
6260 (caught by open64 compiler with debug option).
6261 2) model/src/convective_weights.F
6262 set output convectCount over the full array range (instead of doing
6263 an update): this fix a similar issue when called within recomputation (adjoint)
6264 which could by-pass the initialisation (normally done in the caller S/R).
6265 o pkg/seaice:
c5b170d8ca Gael*6266 - final version of turbulent flux params, as agreed at MIT ice meet:
6267 SEAICE_mcPheePiston (default is ~ 0.000875)
6268 SEAICE_mcPheeTaper (default is 0.)
6269 SEAICE_frazilFrac (defualt is 1.)
6270 SEAICE_mcPheeStepFunc (default is false)
610e3cd50d Dimi*6271 - changes results at trunction error level
6272 - ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo
7c31770a0d Jean*6273 o added pkg/frazil:
6274 - see frazil_description.tex for details
a7657da9ef Dimi*6275 - verification experiment is global_with_exf/input.yearly; changes output.yearly.txt
bc661abca1 Mart*6276 o pkg/shelfice/shelfice_thermodynamics.F
7c31770a0d Jean*6277 - fix exponents for velocity dependent exchange coefficients: change
bc661abca1 Mart*6278 from 2/3(=0) to 0.66666666666666667
7c31770a0d Jean*6279 - move computation of velocity dependent exchange coefficients into
bc661abca1 Mart*6280 separate loop, so that it applies to both thermodynamics
6281 - move some divisions by constants out of loops
6282
3d1eabb9e3 Jean*6283 checkpoint63j (2012/02/16)
6284 o pkg/seaice:
6285 - overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc.
6286 - SItracer: added run time params, and allow coupling to ocn salinity.
df0f758af6 Jean*6287 o pkg/seaice: remove (almost) all divisions by constants within loops
6288 in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d
a54a2ad240 Mart*6289 results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only
df0f758af6 Jean*6290 those, caused by 1/QI -> recip_QI) -> update output.seaice.txt,
6291 output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt
6292 o pkg/seaice :
3d1eabb9e3 Jean*6293 - simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula
6294 = 1 or 2, using newly added run time parameter SEAICE_availHeatTaper.
84662a0e96 Gael*6295 - fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148.
df0f758af6 Jean*6296 - add permanent SItflux diag that corresponds to TFLUX but includes
3d1eabb9e3 Jean*6297 ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget.
df0f758af6 Jean*6298 - allow activation/testing of a fix for suspected missing term in
3d1eabb9e3 Jean*6299 ocn-ice heat budget (to be confirmed). To test this, you want to
6300 undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param
6301 SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic.
84662a0e96 Gael*6302 - no change in results, fwd or ad.
3d1eabb9e3 Jean*6303 o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below:
df0f758af6 Jean*6304 - switch to variable freezing point.
dbf649edf9 Gael*6305 Results change : cg2d -> 1 digits; ad -> 3-6-6 digits.
6306 - bug fix : the sublimation term that was missing is now activated.
6307 Results change : cg2d -> 2 digits; ad -> 8-6-6 digits.
df0f758af6 Jean*6308 - bug fix : flooding sign term for SIsal0.NE.0.
dbf649edf9 Gael*6309 Result change : cg2d -> 8 digits; ad -> 11-12-9 digits.
6310 o pkg/seaice:
6311 - unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT
3d1eabb9e3 Jean*6312 is now the default, and the old default constant freezing point is recovered
6313 with SEAICE_tempFrz0 = -1.96,
6314 SEAICE_dTempFrz_dS = 0.,
6315 - retire SEAICE_freeze (= the old way of specifycing the constant freezing point)
dbf649edf9 Gael*6316 - remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there.
df0f758af6 Jean*6317 - bug fix (thanks to M. Losch) : the sublimation term that was missing is now
3d1eabb9e3 Jean*6318 activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM.
df0f758af6 Jean*6319 - bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211)
3d1eabb9e3 Jean*6320 was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail).
df0f758af6 Jean*6321 - bug fix (thanks to O. Jahn) : area loss for melting got messed up in
3d1eabb9e3 Jean*6322 seaice_growth r149 for legacy branch (no results change).
6323 - introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code
6324 from I. Fenty).
6325 - results did not change except for global_ocean.cs32x15, mostly due to the
6326 switch to variable freezing point (see above item for detail).
74dd18420e Jean*6327 o pkg/thsice:
6328 - fix and simplify interface to salt_plume pkg ; diagnose directly amount of
6329 seawater freezing in thsice_calc_thickn (not used).
c2dec35684 Gael*6330 o pkg/seaice: turbulent flux term specification via run time params.
6331 - replace CPP switches with run time switches to facilitate testing
3d1eabb9e3 Jean*6332 - retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX,
6333 GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR
c2dec35684 Gael*6334 - added runtime parameter : SEAICEturbFluxFormula
6335 - move Mcphee constants to SEAICE_PARAMS.h
6336 - seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula;
3d1eabb9e3 Jean*6337 SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply);
6338 remove seaice_summary call (moved to seaice_init_fixed)
74dd18420e Jean*6339 - seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on
6340 SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms)
3d1eabb9e3 Jean*6341 - seaice_summary.F : add missing report of read turbulent flux term set up
6342 and SITRACER.
6343 - seaice_check.F : check range; inform and stop if retired CPPs are used
6344 (incl. SEAICE_AGE).
74dd18420e Jean*6345 - seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without
3d1eabb9e3 Jean*6346 CPP switch, same computation as before for the different options.
c2dec35684 Gael*6347 - change results at the truncation level.
1a36f96c43 Jean*6348 o pkg/seaice:
6349 - remove un-used parameters LAD & MAX_TICE ; add new run-time parameters:
6350 useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and
6351 SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY.
6352 - update verification/*/input*/data.seaice:
6353 to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY
6354 code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ;
6355 and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code,
6356 set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0.
5355c2bbd8 Jean*6357 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY):
6358 - remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same
6359 algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0);
6360 difference in results only due to machine truncation.
6361 - remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using
6362 MaykutPolySatVap; keep MIN_LWDOWN.
6363 - adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation.
6364 - update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87,
6365 + 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits).
f1369fd6d4 Jean*6366 o pkg/salt_plume:
5355c2bbd8 Jean*6367 - isolate saltPlumeFlux array exch into a specific S/R called from
6368 do_oceanic_phys.F
6369 - add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice.
f1369fd6d4 Jean*6370 o verification:
5355c2bbd8 Jean*6371 - move untested set-up to MITgcm_contrib/verification_other.
4a20d767d7 Jean*6372 o pkg/seaice:
ba96883e1a Gael*6373 - retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER.
6374 o pkg/seaice:
4a20d767d7 Jean*6375 - seaice_solve4temp.F (keeping results unchanged):
6376 * add 2 future run-time params to select which saturation vapor pressure
6377 formula is used and how post-iteration fluxes are set.
6378 Temporary set these 2 params according to option SOLVE4TEMP_LEGACY;
6379 * New piece of code (not used) to update surf. atmos. heat flux F_ia using
6380 the linearized expression to stay consistent with tsurf finding.
6381 - seaice_freedrift.F avoid floating exception in sqrt(y) since y=sqrt(x*x)-x
6382 can be < 0.
2953de52a5 Jean*6383 o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY undef):
6384 - remove from F_ia (and from it's derivative dFiDTs1) the contribution of
6385 conductive heat flux F_c , and add it explicitly when updating tsurf as
6386 solution of: Fc = Fia + d/dT(Fia - Fc) *delta.tsurf
6387 so that now F_ia has a consistent meaning through the entire routine.
6388 This causes differences at truncation level: update output of fwd exp.
6389 global_ocean.cs32x15.seaice.
0c26ee70ab Jean*6390 o pkg/seaice:
c714f5b2dc Jean*6391 - lots of editing/cleaning in seaice_solve4temp.F + better documentation
6392 of arrays, sign/direction of fluxes; no effect on results.
6393 - replace hard coded 273.16 (=previous value of celsius2K) by celsius2K
6394 in seaice_budget_ocean.F & seaice_solve4temp.F (SOLVE4TEMP_LEGACY part);
6395 note: this should have been done before changing celsius2K default.
6396 - to keep results unchanged, add back old value of celsius2K in verification
6397 exp. input*/data : lab_sea (AD), offline_exf_seaice (fwd+AD) & seaice_obcs
6398 - replace hard coded seawater freezing temp in seaice_solve4temp.F (part
6399 SOLVE4TEMP_LEGACY) of 271.20 (=previous value of celsius2K + default
6400 value of SEAICE_freeze) by celsius2K+SEAICE_freeze so that seawater
6401 freezing temp is consistent with value in seaice_growth.F ; this causes
6402 differences at machine truncation level: update lab_sea AD output (3/4).
6403 o pkg/seaice:
0c26ee70ab Jean*6404 - mask (in exf_init_fixed.F) atemp,aqh,evap,precip,runoff,lwflx,areamask
6405 and climsst/sss even when using seaice (to prevent calculation that might
6406 use SST on land); does not affect any verification exp.
6407 - apply mask to taux,tauy (in seaice_get_dynforcing.F); update output
6408 of lab_sea.fd & lab_sea.hb87 and global_ocean.cs32x15.seaice_dynmix.
4091800f77 Mart*6409 o pkg/seaice/seaice_growth.F: add mask to avoid non-zero ice thickness
6410 over land (non-legacy code)
0c26ee70ab Jean*6411 o vectorize salt_plume package:
d797683660 Mart*6412 - add extra code to salt_plume_frac and salt_plume_tendency_apply_s
6413 - this code computes plumebk everywhere (also over land), thus requires
6414 code to avoid divisions by zero and catch the case of kLev=Nr.
6415 - efficiency of salt_plume_frac is still sub-optimal
a355e8fb2b Jean*6416 o tools (genmake2):
6417 - fix makefile NAME specification (option: -makefile NAME) by adding
6418 "-f $MAKEFILE" in few places where it was missing including makedepend
6419 command (contribution from Paul).
6420
6b11434b7a Jean*6421 checkpoint63i (2012/01/24)
fcc1645548 Jean*6422 o model/src:
6b11434b7a Jean*6423 - add factorized versions of some EOS code to find_rho.F,
23bdfc896d Mart*6424 define USE_FACTORIZED_EOS to turn it on (default for TARGET_NEC_SX)
6b11434b7a Jean*6425 o model/src:
fcc1645548 Jean*6426 - add celsius2K to namelist PARM01; remove unused recip_rhoNil from PARAMS.h;
6427 - change default celsius2K from 273.16 to 273.15
6428 - to keep results unchanged, add back old value of celsius2K in verification
6b11434b7a Jean*6429 exp. input*/data : aim.5l_cs, 1D_ocean_ice_column, lab_sea (fwd),
6430 global_ocean.cs32x15(seaice) & cpl_aim+ocn(input_atm).
b730078f53 Mart*6431 o model/src: add a little initialisation trick to find_rho.F and find_alpha.F
6432 to make TAF generate vectorizable code
6433 o pkg/seaice/seaice_evp.F: add code (copied from CICE) that avoids underflows.
6434 Turn on by defining SEAICE_EVP_ELIMINATE_UNDERFLOWS. Most compilers
6435 have flags that do this more efficiently.
70ade2cedc Mart*6436 o pkg/diagnostics/diagstats_calc.F
6437 - for TARGET_NEC_SX fix the treatment of the scaling factor tmpFac=scaleFact
bd19520b1a Jean*6438 o pkg/obcs (with exch2):
6439 - derive OB indices in overlap region from OB-InsideMask (in obcs_init_fixed.F)
6440 and remove code (in obcs_readparms.F) which was based on EXCH of indices
6441 (through buffer) and did not account for exch2 (e.g., CS-grid) topology.
5759772599 Jean*6442 o pkg/exf and seaice exp:
6443 - change offline_exf_seaice.seaicetd test exp. to use default DIFF1 value (=0)
6444 so that switching off area & heff advection flags does not affect results.
6445 - change default EXF_LWDOWN_WITH_EMISSIVITY to #define in EXF_OPTIONS.h
19182668ca Jean*6446 - keep exp. seaice_obcs & 1D_ocean_ice_column(ad) unchanged (using #undef
6447 EXF_LWDOWN_WITH_EMISSIVITY) and, using pkg/exf default emissivities, update
6448 results of verification experiments: 1D_ocean_ice_column(fwd),
6449 global_ocean.cs32x15.seaice(fwd+ad) & seaice_dynmix(ad), lab_sea (all 8)
6450 and offline_exf_seaice (all 4).
fac86b0a61 Jean*6451 o pkg/seaice:
6452 - remove array YNEG, RIVER, TMIX (replaced by local var) from common block;
6453 remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef.
6454 - fix bug: areaNm1 & hEffNm1 are needed in seaice_growth (SEAICE_GROWTH_LEGACY)
6455 but were not filled when resp. SEAICEadvArea=F & SEAICEadvHeff=F and
6456 not multi-dim advection;
6457 - fix seaice_growth.F to compile with both SEAICE_GROWTH_LEGACY and
6458 SHORTWAVE_HEATING #undef.
89b3de8a81 Mart*6459 o optim: make Makefile more robust (?)
7e9d85ac6b Patr*6460 o pkg/obcs:
6461 * fix treatment of obcs_read_pickup for TAF
fac86b0a61 Jean*6462 o pkg/shelfice:
7e9d85ac6b Patr*6463 * add missing initialisation of num_shifwflx
6464 * new adjoint verification exp. for isomip
6465 * change Prandtl and Schmidt numbers from generic formulations
fac86b0a61 Jean*6466 (in terms of model diffus. and visc.) to separate runtime
7e9d85ac6b Patr*6467 parameters, with Holland and Jenkins (1999) default values.
85fbbba158 Jean*6468 o pkg/exf (interpolation):
6469 - extended input field (2 rows) near the N & S poles:
6470 * fill in with the symetric value (when even Nb of data in longitude)
6471 * add average value at the poles only for scalar quantities ; for vector
6472 component interpolation, skip the averaging and keep duplicated values,
6473 unless the 2 components have same location (uvInterp=T) in which case
6474 interpolate the 2 components together using S/R EXF_INTERP_UV.
6475 - new S/R EXF_INTERP_UV to interpolate the 2 components of a vector field
6476 together: this allows to account properly for local orientation when
6477 averaging at N & S pole.
6478 - add CPP option EXF_USE_OLD_INTERP_POLE to recover old results regarding
6479 exf-interpolation near N & S poles. Undef by default.
6480 - add debug check/print on 1rst iter if debugLevel >=2.
45bd772f0f Jean*6481 o pkg/exf:
6482 - change masking flags definition (no longer "parameter"), put them in
6483 common block and set them in S/R EXF_INIT_FIXED.
6484 - change recognized masking flag from s,u,v to c,w,s since the mask
6485 to use (maskC,W,S) depends on position on model grid and has little to
6486 do with scalar/vector difference; fix masking if using P-coordinates.
6487 - fix masking of wind-stress (was wrong if interpolated or read on A-grid)
6488 and update results of exp. global_with_exf (x2).
6489 - fix setting of zenith-angle table when SHORTWAVE_HEATING is undef.
dd08a0bdad Mart*6490 o pkg/obcs
6491 - S/R obcs_calc_stevens: fix a small bug (gammat -> gammas where appropriate)
473f3cfaa4 Jean*6492 o pkg/exf (interpolation):
6493 - assume periodicity in X only if input field cover full longitude range.
6494 - improve search for lat. index (supposed to be faster, in ~log2(ny) steps,
6495 and should vectorise).
6496 - fix input lat of the 2 added row (in case we provide N.pole data).
6497
afd13745c6 Jean*6498 checkpoint63h (2011/12/30)
d0a750d46b Jean*6499 o pkg/seaice:
6500 - change declaration of UVM from _RL to _RS in order to get B-grid
6501 uIce,vIce monitor when _RS = real*4
35af42145b Jean*6502 o pkg/offline:
6503 - new S/R OFFLINE_RESET_PARMS for resetting main-model params (switch off flags);
6504 - compute vertical velocity if not read from file (switch on exactConserv
6505 & staggerTimeStep);
6506 - fix output of ptracer monitor iter & time for default PTRACERS_monitorFreq.
02149d96ab Jean*6507 o verification:
6508 - update grid-files (in tutorial_held_suarez_cs/input and fizhi-cs-32x32x40/input)
6509 with grid-angle generated using "utils/matlab/cs_grid/cubeCalcAngle.m":
6510 fix Pb in yG definition @ 2 missing corners (previously yG was averaged);
6511 - update output of exp. global_ocean.cs32x15.viscA4 after changing
6512 grid-file angles (used here for coriolis-3d);
6513 - remove (or gzip) few files not needed to run fizhi-cs experiments.
473f3cfaa4 Jean*6514 o pkg/exf (vector interpolation):
4ee3919357 Jean*6515 - rotate vector component toward local grid-axis orientation using grid-angles
6516 (stored in GRID.h) instead of locally computed rotation angle; keep old code
6517 available with exf option EXF_USE_OLD_VEC_ROTATION (undef by default).
6518 o pkg/seaice:
6519 - allow to compile with exf options ALLOW_ATM_TEMP or ALLOW_DOWNWARD_RADIATION
6520 undefined. Fix and remove the stop when ALLOW_RUNOFF is undefined.
5803321947 Jean*6521 o pkg/PKG_OPTIONS.h files:
6522 - move #include "CPP_OPTIONS.h" just after #include "PACKAGES_CONFIG.h",
6523 outside of the #ifdef ALLOW_THISPKG / #endif block.
6524 - update verification/*/code/PKG_OPTIONS.h files.
dd0bbd259d Mart*6525 o add a verification experiment (offline_exf_seaice/input.seaice) that test
6526 the B-grid LSOR solver
5d7b3caf45 Mart*6527 o pkg/seaice: sort out emissivity and long wave radiation step 2:
5803321947 Jean*6528 - add emissivity for snow and ice as new run-time parameters
6529 (unfortunately) that default to the corresponding exf values; this
5d7b3caf45 Mart*6530 changes results in most verification experiments so that for backward
6531 compatibility these parameter have to be set explicitly to inconsistent
5803321947 Jean*6532 values (ugly);
5d7b3caf45 Mart*6533 - the exf-flag EXF_LWDOWN_WITH_EMISSIVITY then gets rid off the hard-wired
6534 emissivities of 0.97 associated with lwdownloc in S/R seaice_solve4temp
6535 until we agree how to handle this bug properly
a2895221f1 Jean*6536 o pkg/exf (interpolation):
6537 - add a set of run-time param ({inputfield}_interpMethod), one for
6538 each interpolated input field, to select the interpolation method
6539 with a value of zero switching off the interpolation;
6540 - print interpolation parameters to standard output;
6541 - refine exf_check.F accordingly ; stop if USE_NO_INTERP_RUNOFF is defined
6542 (to use instead runoff_interpMethod=0 in data.exf).
f156ca0fb7 Jean*6543 - simplify default setting of interpolation parameters (for all fields,
6544 set position to match model grid cell-center position, leading to trivial
6545 interpolation in case of regular Lat-Lon grid) and fix for the case of
6546 non-uniform delY.
a2895221f1 Jean*6547 o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for
1ca970e947 Mart*6548 within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1.
a2895221f1 Jean*6549 this factor is absolutely required, because the lw exitance (= out-going
6550 long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown,
1ca970e947 Mart*6551 where the reflectivity rho = 1-emissivity for conservation reasons. Once
6552 this is established, we can remove the CPP-Flag (if we want to).
a2895221f1 Jean*6553 o pkg/seaice:
31c8334354 Mart*6554 - qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and
6555 ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined
3fa95d7893 Mart*6556 - sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity
6557 what the name implies (and not emissivity*BoltzmannConstant), this means
a2895221f1 Jean*6558 the old default value of 5.5e-8 now means
6559 5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in
3fa95d7893 Mart*6560 S/R exf_readparms
6561 - FV-discretization of the B-grid LSOR solver, turn on with
1ca970e947 Mart*6562 SEAICE_LSRBNEW. This new solver also involves a slight re-organization
6563 of the calling routine dynsolver, so that B and C-grid code look a
6564 little more alike.
31c8334354 Mart*6565 - fix index bugs in ostres.F (B-grid code)
03e90c79ad Mart*6566 o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better
b7727eb6f8 Mart*6567 o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the
6568 default for SEAICE_emissivity, if useEXF; requires setting a wrong
6569 parameter value in global_ocean.cs32x15/input.seaice/data.seaice for
6570 backward compatiblity
6571 o model/src: use sigmaR in calc_ivdc
6572
b1b3dce3a2 Jean*6573 checkpoint63g (2011/12/16)
abaf70634e Gael*6574 o pkg/seaice/seaice_growth.F:
6575 fix heat conservation of the coupled ocean-seaice system.
6576 when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of
6577 solid vs liquid water treatment is resolved via QNET.
6578 o pkg/seaice/seaice_growth.F:
6579 add missing term for sublimation in saltFlux, which was breaking conservation.
6580 o pkg/seaice/seaice_model.F:
6581 Remove this patholigical case treatment in evolution branch,
6582 where it is un-necessary and breaks conservation.
a2895221f1 Jean*6583 Update global_ocean.cs32x15/results accordingly for
6584 output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt
bf53796fe2 Jean*6585 o model/src:
6586 useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in
6587 external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE.
6588 o pkg/obcs:
6589 modify Stevens boundary conditions so that S/R obcs_calc_stevens computes
6590 tendency for temperature and salinity that is then applied to update
6591 theta and salt in S/R obcs_apply_ts; this requires proper masking of all
6592 horizontal advection and diffusion contributions on the boundary (in
6593 S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and
6594 removing the mask in S/R timestep_tracer. The advantage of this approach is
6595 that the updated tracer values include contributions from the surface
6596 forcing and vertical diffusion.
c0f0db71ad Mart*6597 This modification changes exp4.stevens because of vertical diffusion.
c947c6ddc4 Jean*6598 o model/src:
c79ab16fdf Jean*6599 change non-curvilinear grid setting to also work with exch2 + blank tiles:
6600 - move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst
6601 face dimensions.
6602 - new S/R INI_LOCAL_GRID to define model tile-local grid (using same units
6603 as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID
6604 and INI_SPHERICAL_POLAR_GRID.
6605 change test-experiment global_ocean.90x40x15:
6606 - split the domain in many more tiles (9x4 tiles of 10x10 each);
6607 - switch to exch2 and remove 1 blank-tile (but only for MPI test).
6608 - update results of both test (std & dwnslp).
bf53796fe2 Jean*6609 o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in
c0f0db71ad Mart*6610 tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation
c79ab16fdf Jean*6611 o model/src:
f9a1d5f8b7 Jean*6612 - take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS
6613 and fix initialisation when using sigma-coords.
6614 o model/src:
6615 - improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc.
6616 to their current value at the beginning of forward_step.F": add a new run-time
c947c6ddc4 Jean*6617 switch "doResetHFactors" (default=false) and use it to do (or not) the resetting.
6618 - set doResetHFactors=T in the following test exp:
6619 global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS),
6620 global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS)
6621 and tutorial_global_oce_in_p (nonLinFS in p)
64ea3e84ce Matt*6622 o pkg/ecco
6623 - added IES cost term
be6cb3adad Jean*6624 o verification/advect_xz
6625 - scale down the depth by 1/100 (from 200 km to just 2.km)
6626 - add secondary test using divergent flow, r-star and implicit vertical advection.
1bf7a90a0b Jean*6627 - add note (check_conserve_TS.txt) and matlab script to check global
6628 conservation of T & S with NonLin-FreeSurf and Adams-Bashforth.
be6cb3adad Jean*6629 o pkg/rbcs:
6630 - add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F).
212c574d0b Mart*6631 o pkg/obcs (Stevens BCs):
be6cb3adad Jean*6632 - fix various problems in the phase speed computations of the Stevens
212c574d0b Mart*6633 boundary conditions:
6634 - sign error for western and southern boundaries,
be6cb3adad Jean*6635 - time tendencies were underestimated by factor of dTracerLev and some just
212c574d0b Mart*6636 zero (for multidim advection schemes) -> now estimate time tendencies
6637 from difference between previous (n) time level and the one before (n-1);
be6cb3adad Jean*6638 this requires storing a field per tracer per boundary, also in the pickup
212c574d0b Mart*6639 files.
6640 - replace deltaTmom in cflMer/Zon computation with dTracerLev
6641 - set default phase velocity to cflMer/Zon
6642 - update verification experiment exp4.stevens
2232bea0cd Jean*6643 o pkg/generic_advdiff (implicit_r):
6644 - fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf
6645 (remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F);
6646 - fix implicit vertical diffusion or advection with NonLin FreeSurf
6647 (was using current recip_hFacC instead of future recip_hFacC): set future
6648 recip_hFac in thermodynamics.F and pass & use it in all vertical implicit
6649 solver S/R ;
6650 - fill diagnostics of vertical advective fluxes (computed from tendency)
6651 when using implicit vert. advection;
6652 - update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion:
6653 global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD),
6654 tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD)
6655 and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5.
6656 o pkg/diagnostics:
6657 - add diags for T & S tendency which goes through Adams-Bashforth.
6658
3cb41ba0ef Jean*6659 checkpoint63f (2011/11/30)
764028acbf Mart*6660 o pkg/obcs/obcs_calc_stevens.F:
5bef8326ad Mart*6661 - join some loops to reduce number of if-statements
764028acbf Mart*6662 - fix a bug in code for northern and southern boundaries.
564b34aefd Mart*6663 o pkg/seaice/seaice_init_varia.F
3cb41ba0ef Jean*6664 - undo resetting UVM=0 that has slipped in unnoticed in r1.49 and
564b34aefd Mart*6665 caused zero ice-velocities for the B-grid code
2876330f22 Mart*6666 o pkg/seaice/seaice_init_fixed.F
3cb41ba0ef Jean*6667 - fix a bug in the initialisation of the second metric terms
2876330f22 Mart*6668 k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0.
6669 - this affects all seaice configurations with useCurviLinearGrid = .true.
6670 and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms
6671 = .true. (default)
6672 - the only verification experiment affected is global_ocean.cs32x15:
6673 icedyn, seaice, and seaice_dynmix (AD)
6674 o pkg/thsice/thsice_diagnostics_state.F
6675 - only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does
6676 not contain garbage that can lead to surprises in diagstats_calc.F
431cbbbe2d Jean*6677 o model/src:
6678 - move bi,bj loops inside INTEGR_CONTINUITY ;
6679 - call INTEGR_CONTINUITY directly from forward_step.F
6680 (previously called from momentum_correction_step.F)
6681 - call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F,
6682 forward_step.F and pkg/ecco/the_main_loop.F
fbc9c53f7c Jean*6683 o model/src/do_oceanic_phys.F:
6684 - reset addMass to zero only if useICEFRONT ;
6685 - separated k-loop for rhoInSitu calculation ;
6686 - add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P)
6687 and at constant T,S (= WdRHOdP);
6688 NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport
6689 of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical
6690 transport of locally-referenced potential density);
6691 to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP)
f2d1e2a4fc Mart*6692 o gluemnc:
6693 - replace ncrcat with ncks when adding variables to *.glob.nc
6694 - change the way variables without record dimensions are handled so that
6695 files that have variables with and without record variables can be glued:
6696 add a record dimension with a new unique name to be able to differentiate
6697 between variable with and without a-prior record dimensions. Remove
6698 this record dimension before adding the variable to the *.glob.nc file.
6699 This procedure automatically works also for grid.*.nc files that do not
6700 have any record dimension.
7f71bb5257 Jean*6701 o verification/cpl_aim+ocn:
6702 - generate new reference output on baudelaire (gfortran, mpich2) (previously
6703 from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script.
6704 o pkg/obcs/obcs_calc_stevens.F:
b81f64aee3 Mart*6705 - add code for northern and southern boundaries.
6706 - reorder some loops to save some operations and so that drFBar can be scalar
12d8e73fbb Jean*6707 o model/src:
6708 - re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine
6709 truncation) and add diagnostics for Adams-Bashforth tendency increment.
6710 - update test-exp. AD output:
6711 1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl;
6712 and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20,
6713 front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5),
6714 global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4),
6715 matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre,
6716 tutorial_global_oce_in_p, tutorial_global_oce_latlon and
6717 tutorial_plume_on_slope.
b06a6ce7ab Mart*6718 o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX
6719 that vectorises. This code uses 3 extra 2D fields, F90 array assignments
6720 and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX
6721 does not even come with an F77 compiler anymore, this should not be
6722 a limitation
6723
34f1dd7af6 Jean*6724 checkpoint63e (2011/11/06)
16b186ab26 Patr*6725 o pkg/seaice adjoint of LSR:
6726 - substantially rework STORE dirs.
6727 - add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED
6728 this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields
6729 and only perform SOLV_MAX_FIXED adjoint iters.
37e94e8cfb Patr*6730 If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration
6731 always goes to same record, meaning that the last forward field will be
6732 the one used in the adjoint - an approximation.
16b186ab26 Patr*6733 - now produces non-zero LSR-related gradients, and acceptable gradients for
6734 An's zonal (x-z) test case (to be checked in)
6735 - lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR
6736 (but these are screwed up by the thermodynamics in the first place);
6737 reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution;
6738 output_adm.txt also reflects changes to seaice_lsr
34f1dd7af6 Jean*6739 - global_ocean.cs32x15:
16b186ab26 Patr*6740 * the "default" input_ad.seaice has been re-defined to always exclude dynamics
6741 (output_adm.seaice.txt was updated)
6742 * new input_ad.seaice_dynmix tests a forward LSR / backward free-drift
6743 (output_adm.seaice_dynmix.txt)
ca66b179c0 Jean*6744 o test-exp. exp4+stevens:
6745 - switch off pTracers and nonHydrostatic (restart problems with NH); update output
de0cda9935 Jean*6746 o pkg/seaice (lsr solver):
6747 - put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only);
6748 update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15
6749 - fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD)
6750 - new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution
6751 into initial guess for linearised solver; use weight ~ (1/err)^2,4.
6752 - compute (with new S/R) and print initial (+ free-driff sol. if available)
6753 and final residual of linearised system.
8a3a83c787 Mart*6754 o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity
6755 (requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F)
383735f3ce Mart*6756 o pkg/obcs: Stevens BCs (still only for east and west)
6757 - fix Stevens BCs by using intermediate velocities of previous
6758 time step as "baroclinic" contribution rather velocity of one grid cell
6759 inside the boundaries; more consistent but makes the entire treatment
de0cda9935 Jean*6760 more complicated, requires new pickup files and two new S/Rs:
383735f3ce Mart*6761 obcs_copy_uv_n and obcs_save_uv_n
de0cda9935 Jean*6762 keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY
383735f3ce Mart*6763 (undefined by default)
de0cda9935 Jean*6764 - silently move computation of some grid factors into separate loops to
383735f3ce Mart*6765 save some recomputations
6766 - add a hack for non-linear free surface
6767 - add a verification experiment to exp4 that tests this code
14398673cd Mart*6768 o make gluemnc/xplodemnc work with (moron) non-GNU shell tools
6769
77e57aaf77 Jean*6770 checkpoint63d (2011/10/25)
ffb3679b95 Jean*6771 o pkg/obcs + seaice-dynamics:
6772 - new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before
6773 solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB
6774 values (consistent with an implicit method).
6775 - add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to
6776 return to older implementation (same results as before); note that none of
6777 the "experimental" OBCS_SEAICE options are implemented in the new version.
2d58d55cc0 Jean*6778 - switch test exp. seaice_obcs to use new version (update output).
6b9597f12c Jean*6779 o pkg/seaice:
ffb3679b95 Jean*6780 - add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS)
6781 - add parenthesis in Water-Ice drag calculations (evp & lsr);
6782 - in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1;
6b9597f12c Jean*6783 and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice)
6784 - update output of test exp lab_sea that uses evp or lsr (fwd+ad)
6785 and global_ocean.cs32x15 (icedyn & seaice fwd+ad).
026da5ed8a Davi*6786 o pkg/layers:
6787 - Include potential density as new coordinate (Thanks to David Munday)
6788 o pkg/dic:
6789 - Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add
6790 carbonate computation/output to CALC_PCO2_APPROX
d1527a124d Mart*6791 o pkg/generic_advdiff
77e57aaf77 Jean*6792 - make TAF generate code that vectorizes:
d1527a124d Mart*6793 gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F
77e57aaf77 Jean*6794 o model/src:
6795 - improve vectorization also for adjoint code of
713532b2ce Mart*6796 solve_tridiagonal and solve_pentadiagonal. As this requires up to
6797 5 new 3D-fields, this code is only turned on for the combination of
d1527a124d Mart*6798 ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message
6799 for singular matrix check (only for TARGET_NEC_SX).
713532b2ce Mart*6800 - remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to
ffb3679b95 Jean*6801 ALLOW_AUTODIFF. This flag now needs to be set outside of
713532b2ce Mart*6802 solve_tri/pentadiagonal.F
6857319532 Jean*6803 o pkg/exf:
6804 - fix previous modif in exf_readparms.F (revision 1.66: treatment of
6805 optional namelist EXF_NML_OBCS).
6806 - add many debug-print (to trace down where pkg/cal error msg comes from)
71df2e2fe0 Mart*6807 o pkg/mom_vecinv/mom_vi_hdissip.F
6808 - rearrange loops so that vectorization is improved and in particular
6857319532 Jean*6809 the adjoint routine vectorizes. The code is a little longer now, but I
6810 think easier to read.
71df2e2fe0 Mart*6811 Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested.
69771f84cc Jean*6812 o pkg/seaice:
6813 - allow to specify initial seaice velocity from files (uIceFile,vIceFile)
69238317a2 Jean*6814 o pkg/exch2:
6815 - alternative code (without tile x tile matrix) for cumulated (global) sum;
6816 used as default; keep using matrix version in adjustment.cs-32x32x1.
5f3dfa25b7 Jean*6817 o tools/build_options:
6818 - after merging some MPI and/or multi-threads specific optfiles so that
6819 the modified default optfile support both built (using genmake2 -mpi
6820 for the MPI built, using genmake2 -omp for OpenMP built),
6821 move now obsolete optfiles to tools/build_options/unsupported/
6822 (add copy of email sent to support list in doc/optfiles_changes.txt)
6823
348beac9cc Jean*6824 checkpoint63c (2011/09/28)
b0522d7987 Jean*6825 o pkg/ebm:
348beac9cc Jean*6826 - fix ebm_zonalmean.F for several procs in Ydir (nPy > 1); update output of
b0522d7987 Jean*6827 test exp. global_ocean_ebm (affects machine truncation, 12 digits for cg2d)
f2b8a2f2ef Patr*6828 o pkg/seaice (SItracer pickup)
6829 * Simple code for pickup of SItracer fields (#define ALLOW_SITRACER)
6830 To be done:
6831 - thorough testing of missing fields in S/R seaice_read_pickup
6832 - thorough matching between generic tracers and specific fields used
6833 (e.g. volume-weighted age, area-weighted age, salinity, ...)
2475d1c482 Jean*6834 o pkg/grdchk:
6835 - all procs calculate and print finite-difference gradient (for testreport)
6836 - change description output used by testreport;
6837 - AD testing: also compare and report Finite-difference gradient;
6838 => update all output_adm*.txt
6839 o test exp. global_ocean_ebm:
6840 - switch back useRealFreshWaterFlux (no problem anymore with run-off);
6841 and turn on exactConserve; update (fwd) output.
22a5e4b7f8 Jean*6842 o pkg/seaice (LSR):
6843 - print to STDOUT number of solver iterations at SEAICE_monFreq interval.
6844 - modify solver to deal cleanly with u/v switch at face edges (CS-grid):
6845 * identical results with non-CS topology (but save up to half of EXCH calls)
6846 * no much changes in cs-32 verification tests since no ice at face edges
6847 (differences due to convergence criteria, since nb of iterations changed)
6848 * expect some differences on lat-lon-cap grid.
6849 update FWD results of global_ocean.cs32x15 test exp. (icedyn & seaice)
21773ac32d Jean*6850 o pkg/exch2:
6851 - add new CPP option to disable Cumul-Sum matrix (to save storage when using
6852 many tiles); until alternative coding is added, just add a stop.
7c74433c3f Jean*6853 o pkg/kpp:
6854 - move ptracer/salt correction to KPP diffusivity from calc_3d_diffusivity.F
6855 to S/R KPP_CALC_DIFF_PTR (+ add tracer-index to argument list).
6856 o optfiles:
6857 - merged few MPI specific (*+mpi*) and multi-threads specific (*+mth) optfiles
6858 into corresponding standard one, which now support different build:
6859 (when using "genmake2 -mpi" for MPI built, "genmake2 -omp" for OpenMP built)
6860 - add "darwin_amd64_gfortran" optfile (initially from Constantinos, tested by Gael)
a9fbe2edc0 Jean*6861 o pkg/obcs (seaice):
6862 - add missing EXCH for uIce,vIce after applying OBCS;
6863 - remove S/R EXF_SWAPFFIELDS_X/Y , disable S/R EXF_SET_OBCS_X/Y by adding
6864 argument = number of levels to S/R EXF_SWAPFFIELDS_XZ/YZ and S/R
6865 EXF_SET_OBCS_XZ/YZ ; update obcs_exf_load.F;
6866 - fix EXF_SET_OBCS_XZ/YZ for multi-threaded (assuming loaded arrays are shared)
6867 - verification exp. seaice_obcs: split domain in 2 tiles ; add SIZE.h_mpi
6868 and eedata.mth for MPI and mutlti-threaded testing.
ecd451586c Jean*6869 o pkg/flt:
6870 - make FLT EXCH working with multi-threads (and MPI + multi-threads);
6871 - use buffer for floats IO (trajectories & profiles); size set in FLT_SIZE.h;
6872 - fix pickup and trajectories + profiles output with multi-threads;
6873 - add parameter to select group of fields to write along trajectory and
6874 profile (default unchanged);
6875 - only call PORT_RAND* function when flt_noise <> 0;
6876 - add multi-threaded test for verification exp. flt_example.
6877 o eesupp/src:
6878 - fix S/R ALL_PROC_DIE for MPI+multi-threads.
6879 - USE_OMP_THREADING: check that number of threads (from eedata) matches
6880 actual number (from env.var. setting).
2e701c809e Jean*6881 o pkg/ebm:
6882 - fix multi-threading in ebm_area_t.F ; clean-up EBM.h header file.
6883 - add multi-threaded test for verification exp. global_ocean_ebm
6884
a51afa12b8 Jean*6885 checkpoint63b (2011/08/29)
1554b54595 Jean*6886 o pkg/ebm:
6887 - fix sign of runoff;
6888 - update directly forcing fields (Qnet,EmPmR) to use standard
6889 external_forcing_surf.F (remove ebm_forcing_surf.F);
6890 - avoid loading forcing fields a 2nd time (1rst time from ini_forcing.F);
6891 - set either tauThetaClimRelax (in data) or tauThetaZonRelax (in data.ebm)
6892 and apply relaxation towards corresponding SST field (2-D map or ZonAver).
6893 - update global_ocean_ebm parameters file data and update output (fwd+ad).
753be3d4e2 Jean*6894 o verification/matrix_example:
fcfc72a991 Jean*6895 - split domain in 8 tiles (2x4); add SIZE.h_mpi and eedata.mth for
6896 MPI and mutlti-threaded testing.
6897 o pkg/matrix:
6898 - change name of S/R MATRIX_INIT to S/R MATRIX_INIT_VARIA ;
6899 - fix for multi-tiles (add bi,bj indices to exp/impMatrixCounter);
6900 - fix for multi-threaded (remove DATA statement);
6901 - use standard DIFFERENT_MULTIPLE function;
6902 - add MATRIX_OPTIONS.h
6903 o verification/matrix_example:
753be3d4e2 Jean*6904 To allow to split the domain in several tiles, change the domain size
6905 from 31x31 to 32x32 by adding 1 row (on Southern side) + 1 column (on
6906 Western side) of land points.
6907 o (*_)write_pickup:
6908 - fix few bugs in mypackage_read/write_pickup.F
6909 - in MDS_WR_METAFILES calls, replace "myTime" by a local copy into
6910 array of length 1 (was caught by compiler syntax-check).
6768a51e8b Jean*6911 o pkg/diagnostics (velocity potential solver):
6912 - fix initialisation of main diagonal matrix (for overlap values)
02665fe70b Jean*6913 o tools/build_options:
6914 - towards single optfile for MPI and non-MPI built: merge few +mpi optfile
6915 into previously non MPI one (linux_am64 pgf77,open64,pathf90,ifort11)
6916 - linux_amd64_gfortran: merge +mpi_generic version into standard optfile:
6917 * move IEEE flags to DEVEL section; take IEEE flags from +mpi_generic ;
6918 * FAST case: for now, keep -O3 with ini_masks_etc.F in NOOPTFILES list;
6919 and use "-devel" testreport option for standard testing on baudelaire.
b6649ac208 Jean*6920 o pkg/grdchk:
6921 - Assume that all gradient-check position are within the same tile
6922 corresponding to global indices (iGloTile,jGloTile) and that
6923 positions (i,j indices or nbeg) are local to this tile;
6924 - set tile local-indices and proc. number according to tile global-indices;
6925 - remove grdchkwhichproc from namelist (retired param);
6926 - send adjoint gradient to all procs so that all procs print it to STDOUT;
6927 - switch on MPI test for global_ocean.90x40x15 AD test experiment.
15338fa568 Dimi*6928 o adding package bbl (Bottom Boundary Layer)
6929 description in MITgcm/pkg/bbl/bbl_description.tex
6930 example/test experiment in MITgcm_contrib/bbl
50d533af19 Patr*6931 o adjoint verifications
1c8f7d3c14 Jean*6932 - changed 5 experiments to multi-tiles
50d533af19 Patr*6933 * global_ocean.90x40x15
6934 * obcs_ctrl
6935 * offline_exf_seaice
6936 * tutorial_dic_adjoffline
6937 * tutorial_tracer_adjsens
6938 changed reference output for those that crossed tile boundaries
6939 (changed choices of gradient check positions)
1c8f7d3c14 Jean*6940 - with same tiling, switch on MPI test for the last 4 (add SIZE.h_mpi)
50d533af19 Patr*6941 - temporary bug fix in grdchk_loc.F for obcs
d5826a2b12 Jean*6942 o genmake2 & testreport
6943 - add target "obj" (just for OBJFILES files) to Makefile;
6944 - add option to specify FEXTRAFLAGS on command line.
ea9625adec Jean*6945 o pkg/mypackage:
6946 - remove bi,bj arguments from argument list of S/R MYPACKAGE_CALC_RHS
6947
975e02919b Jean*6948 checkpoint63a (2011/08/02)
ff219d41cf Jean*6949 o pkg/diagnostics (velocity potential):
6950 - fix velocity-potential calculation when using OBCS: balance net inflow
6951 at each level (new S/R OBCS_DIAG_BALANCE).
6952 - fix some of the problems with OBCS in stream-function calculation.
773313b0d2 Mart*6953 o pkg/exf/exf_readparms.F
ff219d41cf Jean*6954 - make treatment of optional namelists (EXF_NML_04, EXF_NML_SGRUNOFF,
773313b0d2 Mart*6955 EXF_NML_OBCS) more consistent, so that you need not have these lists
6956 in data.exf when they are not used.
45b245ccf5 Mart*6957 o optim/optim_readdata.F:
6958 - add some output about obcs variables that might help debugging
daab778156 Mart*6959 - add a check about nvarlength
d602d84af0 Mart*6960 o pkg/ctrl: once again, fix computation of endrec in s/r ctrl_init_rec
4750cf8833 Jean*6961 o pkg/diagnostics (velocity potential):
6962 - fix mask for OBCS (still problems in stream-function with OBCS);
6963 - add specific parameter (default = main code CG2D params) for solver;
6964 - in case of poor convergence, use solution corresponding to lowest residual.
a045c08a46 Mart*6965 o pkg/seaice/seaice_growth.F: small changes that permit vectorizable
6966 adjoint code. In general statements like tmpscal=fld(i,j) are problematic
6967 and should be avoided where possible.
40639c975a Jean*6968 o model/src (rStar):
6969 - include r* effect on reference-state (PhiRef) in totPhiHyd
6970 (so that it's really the potential anomaly at the cell center);
6971 affect solution only if z* with full pressure in EOS.
6972 - test-exp global_ocean.90x40x15: reduce viscA4 (was not stable) and
6973 update output (because of z* in totPhiHyd and viscA4 changes);
6974 - keep the previous diagnostics as "PHIHYDcR" (closer to potential anomaly
6975 @ constant r) until interpolation at constant r is implemented.
6976 o pkg/diagnostics
6977 - fix RCENTER diagnostics in case cell center is not at interface middle
6a4d8594a7 Mart*6978 o add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use
6979 this eos with eosType = 'TEOS10', in data (PARM01). This eos implies
6980 that THETA and SALT are "conservative temperature" and "absolute
6981 salinity"
6982 o pkg/ctrl
6983 - fix computation of endrec in s/r ctrl_init_rec
6984 - ctrl_pack/unpack_*: remove unused variables and some obsolete code
aa222beea6 Mart*6985 o pkg/seaice/seaice_growth.F
6986 - fix recomputation with FENTY_AREA_EXPANSION_CONTRACTION code,
6987 remove then obsolete STORE directives
6988 - fix STORE directives for tice and tices, so that only the
6989 appropriate part of the fields are stored (and not the entire
40639c975a Jean*6990 field); update global_ocean.cs32x15.seaice AD output.
aa222beea6 Mart*6991 - cosmetic changes: adjust CPP flags and indentation for better
6992 legibilty
6993 o pkg/autodiff: add mnc-output of adBottomDragFld (code contributed by
6994 Chris Wilson)
5c5b0c67fc Jean*6995 o pkg/gmredi:
6996 Add Sub-Meso Eddies parameterisation from Baylor (for now, disabled with TAF),
6997 and test it in verification exp. "front_relax.bvp" (update output.bvp.txt)
6998
975e02919b Jean*6999 checkpoint63 (2011/07/11)
0efa36856a Jean*7000 o pkg/exch2:
7001 - rename+move: nTiles in W2_EXCH2_PARAMS.h --> exch2_nTiles in W2_EXCH2_TOPOLOGY.h
7002 - exch2 version of Cumul-Sum routine: S/R W2_SET_MAP_CUMSUM set up the
7003 (2*nTiles)x(nTiles) Cumul-Sum matrix and Master Proc collects all tiles X,Y
7004 increments, calculates Cumul-Sum @ tile origin and sends results to each tile.
9ec7daa021 Jean*7005 o pkg/diagnostics:
7006 - deal with pairs of post-processed diags which are computed together; in
7007 particular, re-order list of diags within 1 file to save 2nd computation.
7008 - add S/R to compute velocity stream-function (called after velocity-potential
7009 calculation) from divergence free transport -> new diagnostics "PsiVEL".
32f824cd14 Jean*7010 - add parameter to select grid-point location where PsiVEL == 0.
9ec7daa021 Jean*7011 o eesupp/src:
7012 new S/R to calculate cumulated sum on tiled array, corner grid-cell location
7013 (specific S/R needed with exch2 topology - for now, just print an error msg)
f3cfd88687 Patr*7014 o pkg/shelfice
7015 - Implement friction velocity-dependent transfer coefficients following
7016 Holland and Jenkins, JPO, 1999
7017 Original code by M. Losch with small modifs.
7018 Enable with CPP option SHI_ALLOW_GAMMAFRICT
7019 and runtime flag SHELFICEuseGammaFrict
a8b943f1d9 Jean*7020 o verification lab_sea & global_ocean.cs32x15:
7021 - use tools/xmakedepend (instead of cyrus_makedepend, in genmake_local):
7022 does not miss some dependencies (but is slower) and also works with many files
7023 (default makedepend limitation for AD built).
7024 - use cyrus_makedepend in adjustment.128x64x1 (so that it still tested).
c5e360349a Jean*7025 o pkg/diagnostics:
7026 - add run-time parameter "useMissingValue" (def=False) to fill land-point
7027 (i.e., where mask=0) with MissingValue ; used only in MNC output file.
7028 This replaces CPP-option DIAGNOSTICS_MISSING_VALUE.
7029 - Extend the use of "missing_value" setting from data.diagnostics for the case
7030 of counter-diagnostics (where fraction-weight is zero). This applies both to
7031 MNC and MDS output files.
f3bb97e385 Gael*7032 o pkg/seaice/seaice_growth.F:
b7df5ca569 Ian *7033 - add 'a priori' cap of latent heat flux based on actual mass considerations
7034 when SEAICE_ADD_SUBLIMATION_TO_FWBUDGET is used in conjunction with the
7035 non-legacy seaice_solve4temp.
7036 - add diagnostic of the residual sublimation freshwater flux (the freshwater
9ec7daa021 Jean*7037 flux taken from the ocean if the total actual latent heat fluxes exceed
b7df5ca569 Ian *7038 the maximum)
f3bb97e385 Gael*7039 - remove the CPP switch around the *_FWbySublim unit change and move diagnostic
7040 fill for SIatmQnt, SIfwSubl, SIatmFW to the end of seaice_growth.F.
7041 - add diagnostic of the actual sublimation freshwater flux (that is 0. ifndef
7042 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET) and of the latent heat flux (evap+sublim).
7043 - bug fix : frWtrAtm needs a_FWbySublim ifdef SEAICE_ADD_SUBLIMATION_TO_FWBUDGET.
7044 - bug fix : missing part to Martin's r_FWbySublim pathological case fix.
12f262973b Ian *7045 o verification 1D_ocean_ice_column:
7046 made model domain truly 1x1x23 instead of 5x5x23 with only center cell (3,3,:) wet
7047 update results
43043edca4 Jean*7048 o pkg/diagnostics:
7049 - Implement setting of "Post-Processed" diagnostics (corresponding to gdiag(5)='P')
7050 which are not filled-up but computed from other diags ; In this case, the mate
7051 diag points to the primary (filled-up) diag to used for post processing.
7052 - Update Velocity-potential computation using post-processed diag framework.
234bdec1fe Jean*7053 ==> Change the ordering of fields and time-periods in MDS output file
9b34d3ce48 Jean*7054 when using periodic averaging: now writes one time record with the full set
7055 of fields for this time period, then the next time reccord (it used to be
7056 one field with the full set of time records then the next field).
234bdec1fe Jean*7057 Note: this is now similar to NetCDF (MNC) output file. <==
43043edca4 Jean*7058
19985267f5 Jean*7059 checkpoint62z (2011/06/21)
fb247706a7 Patr*7060 o adjoint monitor:
7061 - Add adjoint monitor output for packages exf, seaice
a18fc746e5 Patr*7062 and update relevant testreport output
6de796d755 Gael*7063 o pkg/seaice:
7064 - re-order diags inits so that they appear in order in available_diagnostics.log
7065 - added diags: hsnow thermo. rates of change, area preceeding ridiging process,
7066 area/heff/hsnow preceeding thermodynamic growth/melt.
7067 - modified diag: SIdA; output actual effect, as the description states.
7068 - modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW.
7069 - retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh.
3897a97e38 Jean*7070 (SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO;
6de796d755 Gael*7071 and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO)
7072 - modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates.
3897a97e38 Jean*7073 - added diagnostics for seaice generic tracers (SItr*).
6de796d755 Gael*7074 - added SItrUnit and SItrNameLong run time param (for SItr* diags).
7075 - in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'.
d7d0e261c7 Patr*7076 I. Fenty: 18-Jun-2011:
7077 Minor changes to seaice package:
7078 1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and
7079 added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor)
3897a97e38 Jean*7080 - Differentiated "regularization variables" from "floor variables"
d7d0e261c7 Patr*7081 * areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor
7082 * hiceMin became SEAICE_hice_reg (old hiceMin)
7083 (with _reg meaning regularization variable)
7084 - SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion
7085 so as to ensure energy conservation when going between phases
3897a97e38 Jean*7086 - A22 was not used anywhere
d7d0e261c7 Patr*7087 2) Changed regularization procedure for heffActual and hsnowActual to ensure
7088 well-boundedness and smooth adjoint in seaice_growth.F
7089 3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells
7090 because the old regularization always set heffActual >= 0.05 cm
7091 4) Changed the model so that the default behavior is to put a small (10^-5) "floor"
3897a97e38 Jean*7092 on AREA when HEFF > 0.
7093 - went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to
7094 requiring that DISABLE_AREA_FLOOR *not* be defined
d7d0e261c7 Patr*7095 Affected verifications:
7096 - 1D_ocean_ice_column (output.txt output_adm.txt)
7097 - global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt)
4c5a4fb4d7 Jean*7098 o pkg/diagnostics:
7099 - move MNC code from diagnostics_out.F into new diagnostics_mnc_out.F (2 S/R).
7100 - rename S/R GETDIAG to DIAGNOSTICS_GET_DIAG and change type of 1rst argument
7101 (was _RL, now integer) with option = 0 to retrieve all levels.
2d3c84b138 Jean*7102 - add pieces of code to compute velocity potential at each level (new diagnostics
7103 PhiVEL, works only when UVELMASS & VVELMASS are also turned on);
7104 for now, using same params as CG2D (target-resisual, max Nb of iter ...).
3897a97e38 Jean*7105 - fix few issues with counter diagnostics in diagnostics_setdiag.F &
7106 diagstats_setdiag.F (if diagnostic counter is itself a counter diag)
7107 and in diagnostics_fract_fill.F (do not need a valid pointer for the
7108 diagnostics counter-mate); check that definition of counter-diagnostic
7109 includes a valid counter-mate (in diagnostics_set_levels.F).
d2ffb46800 Jean*7110 o model/src (rStar):
7111 - add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F);
7112 affect solution only if z* with full pressure in EOS;
7113 update output of test-exp global_ocean.90x40x15.
7114 o pkg/seaice:
3b6fc6245d Gael*7115 - introduce siEps=1e-5 parameter
7116 - use areaMax in AREA update (part 4), consistent with ridging step (part 2.5).
7117 - re-organize SEAICE_ADD_SUBLIMATION_TO_FWBUDGET code.
d2ffb46800 Jean*7118 - introduce ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer.
3b6fc6245d Gael*7119 For now it covers, and was tested for, ice salinity and age (attached to HEFF),
7120 as well as ice cover age and ridging index (attached to AREA).
d2ffb46800 Jean*7121 For now the run time parameters (in data.seaice/SEAICE_PARM03) are
7122 SItrName (e.g. 'age') and SItrMate ('HEFF', which is the default, or 'AREA').
3b6fc6245d Gael*7123 Up to SItrMaxNum=3 tracers can be used simultaneously.
7124 o pkg/salt_plume:
d2ffb46800 Jean*7125 -introduce SPsalFRAC run time parameter that sets the fraction of the
7126 salt by-product of ice growth (SPsalFRAC*(1-SIsalFRAC)*salt typically)
7127 that gets vertically redistributed (fluxed down) by pkg/salt_plume.
43306f4baa Jean*7128 o model debug options:
7129 - Switch reading of debugMode from S/R INI_PARMS (parameter file "data", stored
7130 in PARAMS.h) to S/R EESET_PARMS (parameter file "eedata", stored in EEPARAMS.h).
7131 - Refine debug-msg printing selection (3 new levels):
7132 debugMode : controls printing of debug messages (sequence of S/R calls).
7133 debugLevel : controls printing of algorithm-relevant auxiliary/debug messages
7134 debLevZero = 0 ; /* level of disabled aux. msg printing */
7135 debLevA = 1 ; /* level of minimum aux. msg printing */
7136 debLevB = 2 ; /* level of low aux. print (report read-file opening)*/
7137 debLevC = 3 ; /* level of moderate debug prt (most pkgs debug msg) */
7138 debLevD = 4 ; /* level of enhanced debug prt (add DEBUG_STATS prt) */
7139 debLevE = 5 ; /* level of extensive debug printing */
7140 New debugLevel default: with default debugMode value (=F),
7141 = 2 (debLevB) or = 1 (debLevA) in case ALLOW_AUTODIFF is defined.;
7142 and if debugMode=T, default debugLevel = 4 (debLevD).
7143 Relation with previous settings:
7144 debLevB (=2) corresponds to former debLevA (=1)
7145 debLevD (=4) corresponds to former debLevB (=2)
7146 Note:
7147 a) if debugLevel=0, skip WRITE_GRID call when nIter0 > 0 (same as before);
7148 b) default debugLevel=1 is convenient in AD runs (avoid many file opening msgs);
7149 to recover previous default, set debugLevel=2 (e.g. AD-test hs94.1x64x5)
7150 - Add new parameter (printResidualFreq, read from PARM02 namelist) to print
7151 detailed CG solvers convergence; off (=0) by default, except if debugLevel=5.
8a9e9a473a Jean*7152 o pkg/obcs:
7153 - change OBCSfixTopo default from True to False (should not change the results);
7154 keep OBCSfixTopo=T in verification-exp. seaice_obcs.
cc3bbdb6bb Jean*7155 o pkg/thsice:
7156 - fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in
7157 2nd layer seaice sublimation (unlikely to happen)
7158 - use Interior mask for OBCS in thsice_advection.F (similar to what is
7159 done in gad_advection & seaice_advection).
bd46b07a96 Patr*7160 o adjoint:
7161 bug fix spotted by Gael Forget:
7162 seaice_advection and thsice_advection still had
7163 legacy CPP options to avoid CS corner updates for adjoint
0c22b81a88 Jean*7164 o pkg/seaice:
7165 => Change some of the defaults (2011/05/29):
7166 - change SEAICEuseFluxForm default (from False to True)
7167 - change DIFF1 default (from 0.004 m/s to 0. m/s)
7168 And print warnings if DIFF1 is not set in data.seaice and centered
7169 avection scheme is used without any diffusion.
7170 also:
7171 - fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F;
7172 - set SEAICEdiffKh[] default in the same way as SEAICEadvSch[]
7173 - stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any
7174 other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with
7175 #undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE.
7176 update results of test exp.:
7177 lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20)
7178 output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200)
7179 output_adm.noseaicedyn (SEAICEuseFluxForm=T)
7180 offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T)
7181 seaice_obcs: output (SEAICEuseFluxForm=T)
7182 and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004)
7183 for standard fwd & AD lab_sea tests (to keep the same output).
fc3b49c003 Gael*7184 o pkg/seaice/seaice_growth.F:
0c22b81a88 Jean*7185 - use Ian Fenty's capping formulas for actual ice
fc3b49c003 Gael*7186 thickness thoughout EVOLUTION branch.
7187 - put treatment pathological case #2) in CPP brackets
7188 (ALLOW_AVOID_INFINITESIMAL_AREA, undef by default).
0c22b81a88 Jean*7189 - update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly.
fc3b49c003 Gael*7190 o pkg/seaice:
7191 - seaice_diffusion.F : remove the min(DX,DY) factor permanently;
0c22b81a88 Jean*7192 pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter;
7193 also pass fac as a param, which can be 1. (to update the tendency
fc3b49c003 Gael*7194 field) or the time step (to update the field itself).
0c22b81a88 Jean*7195 - seaice_advdiff.F: for multidim, call seaice_diffusion with
fc3b49c003 Gael*7196 e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call
7197 seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step.
0c22b81a88 Jean*7198 - SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F :
fc3b49c003 Gael*7199 hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc.
a6e3308c72 Jean*7200 o pkg/seaice:
7201 diffusion with centered advection scheme (diffus.F & advect.F):
7202 - simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside)
7203 to just compute the laplacian of input-field.
7204 - unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call.
7205 - fix flux-form version in diffus.F to conserve tracer.
7206 update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects
7207 machine truncation) and lab_sea.salt_plume (conservative flux-form modif)
7208
f23903c179 Jean*7209 checkpoint62y (2011/05/26)
b9ea5855ae Gael*7210 o pkg/seaice:
f23903c179 Jean*7211 - seaice_growth.F : in EVOLUTION branch, always include
b9ea5855ae Gael*7212 a_QSWbyATM_cover in qnet (as it should be).
7213 - verification/global_ocean.cs32x15 : update results accordingly
f23903c179 Jean*7214 (output.seaice.txt output_adm.seaice.txt).
665e1cc782 Jean*7215 o pkg/seaice + obcs:
7216 - use maskInW & maskInS in multi-dim advection and biharmonic diffusion:
7217 equivalent of assuming no tracer gradient outside the OB region.
7218 update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion)
7219 - remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed
7220 after changes above);
7221 - obcs+seaice cleaning: apply seaice-tracer OB values to tracer field
7222 only at OB location (instead of over a band of OLx width).
7223 o pkg/seaice:
7224 - fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F
7225 (dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid)
ae7ba49648 Jean*7226 o pkg/obcs:
ae802b970e Jean*7227 - split header file "OBCS.h" into 4 separated files:
7228 OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h
7229 Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h
435c8dd190 Jean*7230 (contain no conditional statement which depends on OBCS options).
7231 - move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h)
7232 to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h).
ae802b970e Jean*7233 o ctrl, cost, grdchk & autodiff pkgs:
7234 - make options file more standard (like other {PKG}_OPTIONS.h file but
7235 with AD_CONFIG.h); clean-up some of the included header files.
7236 o pkg/obcs:
ae7ba49648 Jean*7237 - do not mask tracer when applying OB (tracer == 0 could generate problems)
7238 - apply tracer OB values to tracer field only at OB location (instead of
7239 over a band of OLx width)
7240 - clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R)
7241 - remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove
7242 obcs_apply_tloc.F & obcs_apply_sloc.F
7243 o obcs in model/src:
7244 - call OBCS_APPLY_W only if NonHydrostatic.
7245 - call OBCS_APPLY_ETA only if NonLinFreeSurf.
7246 - reset dEtaHdt and wVel to zero outside OB interior region ;
7247 - leave tracer unchanged outside OB interior region: This has no effect
7248 on the solution but just to prevent unrealistic tracer value outside OB.
7249 - zero out velocity outside OB interior region: This has no effect on
7250 the solution but just to prevent unrealistic velocity outside OB.
1228ad56fc Jean*7251 o obcs and non-lin free-surf:
7252 move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F
7253 and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F
7254 + add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR:
7255 this fixes missing EXCH + get consistent eta OB value (+ fix restart).
7256 update results of test-exp. exp4(nlfs).
b642a711f1 Jean*7257 o exp4 (nlfs) test-exp:
7258 use OBC for Eta at Western & Eastern OB (to test prescribing Eta
7259 with NonLin-FreeSurf); update output.nlfs.txt
691f44a031 Jean*7260 o obcs and 2d/3d solver norm:
b642a711f1 Jean*7261 use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB
7262 and outside OB interior region (will allow to place OB further inside the
7263 domain). Depending on the domain, can affects cg2d-Norm (previous
ae7ba49648 Jean*7264 cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl,
691f44a031 Jean*7265 and cg3d-Norm (previous Norm was computed before canceling OB terms),
7266 e.g. in tutorial_plume_on_slope.
7267 - update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope.
6202f959ce Jean*7268 o pkg rbcs:
7269 - split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h
7270 - add capability to apply relaxation to horizontal velocity uVel & vVel.
5f47d9d3a7 Mart*7271 o pkg/grdchk: add gradient check for control variable xx_shifwflx
7272 o pkg/shelfice/shelfice_init_fixed.F
7273 fix CPP-flag combinations
2706e7ceae Patr*7274 o pkg/seaice: Merge iceage code of Pierre Rampal
7275 * update/change/correct ice age calculations
b642a711f1 Jean*7276 * add age updates for pathological cases
2706e7ceae Patr*7277 Probably needs more testing...
5f47d9d3a7 Mart*7278
fb01456aea Jean*7279 checkpoint62x (2011/05/13)
7280 o pkg/mom_vecinv:
6202f959ce Jean*7281 high-order vorticity scheme: use interior masks (maskInW & S)
fb01456aea Jean*7282 to zero-out (outside OB) gradient of vorticity.
94a41b18e5 Jean*7283 o verification exp.:
7284 turn on "useEnergyConservingCoriolis" (better discretisation) in exp.
7285 hs94.128x64x5 and seaice_obcs ; update results.
abb2d742f7 Oliv*7286 o pkg/obcs:
7287 fix bug in OBeta for YZ sections in obcs_exf_load.F
94a41b18e5 Jean*7288 o pkg/ctrl, pkg/shelfice, and optim:
7289 - add new control variable xx_shifwflx (fresh water flux underneath ice
7290 shelves). This is almost as tedious as obcs-ctrl, because the
c39d626e4c Mart*7291 variables needs its own mask.
94a41b18e5 Jean*7292 - add a cost function term that penalizes the deviation of xx_shifwflx
c39d626e4c Mart*7293 from the first guess (zero) in analogy to other control variables
40171df3a2 Patr*7294 o pkg/shelfice:
7295 - start basic adjoint
94a41b18e5 Jean*7296 o pkg/ctrl:
a14e708176 Mart*7297 - remove extra 2D field "for good measure" when initializing in
7298 ctrl_set_globfld_[xy/xz/yz].F
00525899b2 Mart*7299 - replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec
7300 - improve error messages in ctrl_set_unpack_*
cb8d4055f8 Jean*7301 o OBC implementation in momentum:
7302 use interior masks (maskInC,W & S) in momentum S/R:
7303 - multiply divergence, tension and some del^i.u or del^j.v by maskInC
7304 - multiply del2u,del2v by maskInW/S (biharmonic viscosity)
7305 - multiply horiz. grad of vorticity by maskInW/S (in Leith scheme)
7306 - multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd)
7307 Motivation: fix/clean implementation of OBC with biharmonic-viscosity
7308 (and also with Leith/Smagorinsky harmonic-viscosity).
7309 Update output of experiment dome and exp4 (+nlfs).
19fda1148c Jean*7310 o exp4 test-exp:
ce8a4681c6 Jean*7311 - turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F)
7312 and prescribe time-varying OB (without pkg/exf) for zonal-velocity
7313 at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe
7314 time-varying OB at Western-side for wVel (NonHyd); update output.
19fda1148c Jean*7315 - add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv
ce8a4681c6 Jean*7316 and biharmonic-viscosity ; also use prescribed time varying OB.
19fda1148c Jean*7317 o pkg/obcs:
7318 fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F
cd0d82611c Jean*7319 o model/src:
7320 - fix startTime setting when baseTime<>0 & nIter0=0 are specified ;
7321 - initialise startTime & nIter0 with unlikely values: allows to set one
7322 from the other without ambiguity.
e27288cd7f Jean*7323 o seaice_obcs test-exp.:
7324 add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output.
575d4c6487 Jean*7325 o pkg/obcs:
7326 - remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer:
7327 no longer needed with maskInC,W,S in pkg/generic_advdiff.
81db1d5414 Ian *7328 o pkg/seaice:
575d4c6487 Jean*7329 - retired SEAICE_SALINITY and SEAICE_salinity in favor of
81db1d5414 Ian *7330 SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively.
575d4c6487 Jean*7331 - fixed bug in the initialization of sea ice salinity variable HSALT
81db1d5414 Ian *7332 in seaice_init_varia.F (removed dependence on ICE2WATR)
3fb96de6bc Jean*7333 o fizhi-cs test exp.:
7334 switch reference output convention for these 2 non-standard test-exp,
575d4c6487 Jean*7335 from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5)
3fb96de6bc Jean*7336 to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11)
7337 reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran
38710791cb Jean*7338 o model/inc:
7339 - change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4")
7340 of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS)
c5deacd5a8 Ian *7341 o pkg/seaice:
7342 - fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY
7343 o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15
81db1d5414 Ian *7344 - updated output*.txt files due to bug fixes in salt, saltPlumeFlux,
7345 and initial HSALT
c5deacd5a8 Ian *7346
1c58c84abe Jean*7347 checkpoint62w (2011/04/26)
0585a400b7 Jean*7348 o pkg/mom_fluxform:
7349 - fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf.
7350 - use parameter "sideDragFactor" in no-slip BC side-drag part.
7351 - update output of exp. global_ocean.90x40x15
f79fbf5b9f Jean*7352 o pkg/mom_vecinv:
7353 mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform)
1c58c84abe Jean*7354 o update seaice exp.:
7355 use more consistent parameter values (remove "backward compatability only":
7356 ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh)
7357 related to thermodynamics seaice. Update output (fwd+AD) of exp.:
7358 1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs
f79fbf5b9f Jean*7359 o update test-exp global_ocean.90x40x15:
7360 o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis).
7361 o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.)
7362 o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params)
7363 o turn on zStar & viscA4 in standard set-up (dir input/)
7364 and update output files: output.txt & output.dwnslp.txt
37df334812 Jean*7365 o new AD-test experiment: obcs_ctrl
7366 (From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector.
7367 o pkg/dic:
7368 fix two bugs in handling water vapour pressure in carbonate chemistry
7369 and air-sea fluxes. Found by Val Bennington and Galen McKinley
7370 (add DIC Option = WATERVAP_BUG to recover old results)
7371 update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline
7c642b2a2b Dimi*7372 o adding allowInteriorFreezing option to check for water below freezing point
7373 at depth and bring the negative heat anomaly to the surface level
37df334812 Jean*7374 o pkgs _fields_load:
7375 - extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs)
7376 - use new S/R GET_PERIODIC_INTERVAL in pkgs:
62852f670d Jean*7377 bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and
7378 rbcs to get interpolation weights and time reccord number.
37df334812 Jean*7379 - fix multi-threading in aim_fields_load.F
7380 - apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F
83f3340abe Jean*7381 o external_fields_load:
7382 new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear
7383 interpolation weights) to use in a periodic time-series ; do not divide by
7384 time-step to convert to integer:
7385 - this fixes case where externForcingPeriod is not multiple of time-step
7386 (Thanks to Christopher L. Wolfe)
7387 - this fixes case where externForcingPeriod is an odd multiple of time-step
7388 (was wrong by half of time-step); update results of tutorial_global_oce_in_p.
7389 store index of time-record which is currently loaded:
7390 - works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ;
7391 - needed for the adjoint but not yet used because of extensive recomputations;
7392 (to be fixed soon)
7393
aea6723cc0 Jean*7394 checkpoint62v (2011/04/02)
d0b6c8f47c Ian *7395 o verification/1D_ocean_ice_column added to test Ian Fenty's
7396 pkg/seaice_growth.F modifications for improving sea ice code differentiability
aea6723cc0 Jean*7397 o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope
7398 (new velocity statistics after changing maskInW & maskInS definition)
75620d6d39 Jean*7399 o pkg/generic_advdiff with OBCS:
7400 use maksInW & maskInS in advective flux and in biharmonic diffusion calculation:
7401 equivalent to assumption of no tracer gradient outside the OB region.
7402 This will affect the results if using obcs+biharmonic diffusion.
7403 update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc)
1634337404 Jean*7404 o pkg/obcs:
7405 change definition of maskInW & maskInS: leave OB edges inside (maskIn=1)
7406 (e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still
7407 in Interior region. No impact on solution but affects Velocity monitor stats.
5933dabdc8 Patr*7408 o pkg/ptracers (adjoint)
1634337404 Jean*7409 New option AUTODIFF_PTRACERS_SPLIT_FILES for writing separate
5933dabdc8 Patr*7410 tape file for each tracer
1634337404 Jean*7411 o model/inc/src and pkg/autodiff: add parameters that allow to turn
7412 of parts of the adjoint code at run time. For now, there are only
7413 useKPPinAdMode, useGMrediInAdMode, and useSEAICEinAdMode. These
7414 parameters are set in data.pkg.
7415 This is the lazy coward's version of doing this, but still useful for
7416 debugging. In order to do it right, everything needs to be moved to
d6ce1e6c67 Mart*7417 pkg/autodiff.
1634337404 Jean*7418 o pkg/autodiff: fix global_sum_tile_ad.F by resetting adsumPhi at
d6ce1e6c67 Mart*7419 the end; this fixes the adjoint balancing code for open boundaries.
ae6e7b0b9d Mart*7420 o pkg/ctrl:
7421 - change behavior of xx_${varname}period to be analogous to exf-conventions:
7422 xx_${varname}period = 0., means time-independent control part
1634337404 Jean*7423 xx_${varname}period = -12., means one-year-periodic monthly control part
ae6e7b0b9d Mart*7424 - introduce helper routine ctrl_init_rec (part of ctrl_init.F) to
7425 clean up ctrl_init a little, remove unused variables
e7fdbcdd62 Mart*7426 - ctrl_init: fixed the handling of the start/endrec for obcs-variables
ae6e7b0b9d Mart*7427 - move "call cal_GetMonthsRec" from s/r ctrl_get_gen to s/r ctrl_get_gen_rec
7428
61d23e1802 Mart*7429 checkpoint62u (2011/03/15)
4866a81958 Jean*7430 o model/src:
7431 - for the adjoint, change NonLin-FreeSurf initialisation sequence: fill-in
7432 h0Fac from INITIALISE_FIXED and reset hFac to h0Fac in INITIALISE_VARIA ;
7433 - in initialise_varia.F (except for ALLOW_DEPTH_CONTROL) remove 2nd call to
7434 INI_DEPTHS, INI_MASKS_ETC & INI_LINEAR_PHISURF.
7435 o pkg/ctrl/obcs/ecco:
633dbf7240 Mart*7436 - remove obsolete, unused, and partially broken code:
4866a81958 Jean*7437 ctrl_obcsvol/ctrl_obcsbal/ctrl_volflux and code within
633dbf7240 Mart*7438 ALLOW_CTRL_OBCS_BALANCE
4866a81958 Jean*7439 - put a stop statement into ecco/cost_obcsvol.F, but also add
633dbf7240 Mart*7440 cost_obcsvol to ecco_ad_diff.list
d9c90338d2 Mart*7441 o pkg/ecco: fix counting cost function contributions for obcs (code
7442 by Matt M.) and diffkr for diagnostics
a5506f4305 Patr*7443 o pkg/ecco, pkg/ctrl, pkg/grdchk:
7444 add cost penalty terms for initial uvel, vvel, eta controls
7445 and I/O for prior error files
a2fd64e7bb Jean*7446 o pkg/mdsio:
7447 move mds_check4file.F from eesupp/src to mdsio_check4file.F ; add option
7448 (new argument) to check for tiled file in mdsioLocalDir : this fix the
7449 restart from pickup_som , pickup_dic (& dic_co2atm) with mdsioLocalDir.
fbadcb8ae6 Mart*7450 o pkg/ctrl:
7451 - ctrl_obcsbal.F, ctrl_obcsvol.F: replace last calls of ctrl_getrec by
7452 ctrl_get_gen_rec, put a stop statement into ctrl_getrec. Remove
7453 unused and superfluous variables
7454 - ctrl_get_gen_rec.F: catch the case of xx_genperiod=0.
8bc4946ad4 Mart*7455 o pkg/ecco
7456 - enable adjoint of Stevens OB
a2fd64e7bb Jean*7457 o pkg/ctrl/ecco/grdchk:
ac86e3d04f Mart*7458 - remove global declaration of tmpfldx/yz and tmpfldx/yz2.
8bc4946ad4 Mart*7459 Fortunately, we do not have any tests for the numerous cpp-flagged
ac86e3d04f Mart*7460 option of "obcs as control parameters" so we will never know
7461 if this is an improvement (but at least now things compile).
7462 - remove an obsolete initialization from ecco_cost_init_barfiles.F
a2fd64e7bb Jean*7463 - fix some problems within never used ifdefs to make the code compile
7ee9bd2cad Jean*7464 o pkg/obcs:
7465 - Refine Interior mask definition to work with more complex OB (e.g.
7466 if OB_Ie < OB_Iw); In case default setting is not sufficient, allows to
7467 read in Interior mask from file. Check if Interior mask is consistent
7468 with OB list of indices.
19ebde807c Patr*7469 o pkg/seaice
7470 - beginning code for a seaice tracer package,
7471 but currently only used for seaice age: SEAICE_AGE
7472 SEAICE_num = 4
7473 iTracer = 1: area-weighted ice age
7474 = 2: volume-weighted ice age
7475 = 3, 4: template for one-year vs. multi-year ice
7476 data.seaice has new namelist SEAICE_PARM03 for arrays related to
7477 SEAICE_num
7478
954840cffd Patr*7479 checkpoint62t (2011/03/05)
686e612f13 Jean*7480 o pkg/obcs:
289f5415be Jean*7481 - obcs_apply_uv.F: change to a 2 steps method, first tangential component;
7482 then normal component. This ensures that the normal component is set
7483 correctly even when it conficts with tangential setting from an other OB.
7484 Affects results of test-experiment seaice_obcs: update the output.txt
7485 o pkg/obcs:
686e612f13 Jean*7486 - add code to monitor statistics of dynamical fields at OB.
7487 - take OBCS_BALANCE code out of obcs_calc.F into new S/R OBCS_BALANCE_FLOW :
7488 - fix to OBCS_BALANCE code (right hFac ; deal with simple OB intersection).
7489 - change default: balance the Net inflow through all OB (instead of balancing
7490 each OB separately); keep the old method if setting OBC_balanceFacX < 0.
7491 - switch on useOBCSbalance in dome experiment: only correct Western OB outflow
7492 to match Nortern OB inflow (OBCS_balanceFacN=0).
7f2854329f Dimi*7493 o pkg/seaice:
7494 - redefined actual sea ice age to be ICEAGE/HEFF ifdef SEAICE_AGE_VOL
2afe30fba0 Dimi*7495 o pkg/seaice (seaice_growth v 1.113):
7496 - reverting seaice_growth to v 1.111 in order to have code with exact bit
7497 compatibility with MITgcm_contrib/ifenty/Fenty_seaice_thermo_code_merge
7498 CPP option SEAICE_OCN_MELT_ACT_ON_AREA removed in v 1.112 is reintroduced
7499 runtime flag SEAICEareaFormula is kept but is inactive
fa83c0daea Jean*7500 o model/src:
7501 - add new param to scale curvilinear grid distance and area when using
7502 a different sphere radius from the grid-files.
7503 - test/check multi-threads EXCH applied to local variable (cg2d_x)
878ab8c79d Patr*7504 o adjoint:
7505 - enable adjoint of Stevens OB
7506 - add dummy_in_dynamics to enable extraction of ADJrhoinsitu
7507 (a bit delicate because of potentially modified adj. common block structure;
7508 current switch is ALLOW_AUTODIFF_MONITOR_DIAG, could be changed later)
fa83c0daea Jean*7509
d6110c5749 Jean*7510 checkpoint62s (2011/02/15)
2afe30fba0 Dimi*7511 o pkg/seaice (seaice_growth v 1.112):
83f1d2d932 Gael*7512 - introduce SEAICEareaFormula run time parameter, which selects the recipe for
d6110c5749 Jean*7513 computing the ice cover tendency from effective thickness tendencies. Include
7514 Ian Fenty's formula.
7515 - remove 'undef SEAICE_OCN_MELT_ACT_ON_AREA' which may now be achieved using
7516 SEAICEareaFormula.
83f1d2d932 Gael*7517 - simplify notations for the various d_HEFF/d_AREA terms.
6555d1e696 Jean*7518 o pkg/gmredi:
7519 - add Boundary-Value-Problem bolus transport (Ferrari etal, OM 2010) code
7520 from Christopher Wolfe (UCSD); add partial cell factor in vertical derivative;
7521 add a verification test-run (front_relax.bvp) to test GM_useBVP.
2afe30fba0 Dimi*7522 o pkg/seaice (seaice_growth v 1.111):
dbc3f8d6b1 Gael*7523 - for SEAICE_DO_OPEN_WATER_GROWTH, replace Gael's implementation with Ian's.
d6110c5749 Jean*7524 - the new SEAICE_DO_OPEN_WATER_MELT allows open-water air-sea heat fluxes to
7525 also melt ice.
6555d1e696 Jean*7526 o pkg/seaice:
13127f64f6 Gael*7527 - McPhee formula for Ice-Ocean fluxes (provided by Ian Fenty).
7528 - can be used by #define MCPHEE_OCEAN_ICE_HEAT_FLUX in SEAICE_OPTIONS.h
6d3c37bddc Jean*7529 o pkg/cheapaml:
7530 - from Nico Wienders: New version of this package.
ffaad0659f Jean*7531 o pkg/flt:
7532 - add CPP options to prevent floats to re-enter the opposite side of
7533 a periodic domain (default: keep periodicity)
520f9effa6 Jean*7534 o pkg/gmredi:
7535 - apply exchange to GM_PsiX,GM_PsiY to get valid values near CS-corners
7536 (needed for multi-dim advection).
20e9cc15d6 Jean*7537 - switch on GM Advective form in global_ocean.cs32x15 and update output.txt
520f9effa6 Jean*7538 o model/src:
7539 - fix wrong re-setting of addMass array (ALLOW_ADDFLUID) for atmospheric run.
f40e476a49 Patr*7540 o tutorial_tracer_adjsens
7541 - extend to NLFS and replace maskC by hFacC
7542 (change reference output accordingly)
520f9effa6 Jean*7543
24aac58d71 Jean*7544 checkpoint62r (2011/01/24)
b8c827cb68 Jean*7545 o testreport:
7546 - add option -deloutp (-do) to remove output file after successful run
7547 - add option -mfile (-mf) for MPI machile-file and for each test-exp,
7548 extract exact list of procs from this file ; adjust COMMAND by
7549 replacing TR_MFILE & TR_NPROC with local machile-file & Nb of MPI procs.
ab3c25e729 Mart*7550 o pkg/ecco: replace old ineffective way of penalizing deviations from
7551 first guess (of obcs) with code by Matt Mazloff
b8c827cb68 Jean*7552 o pkg/ctrl: add code that allows the use of ALLOW_OBCS?_CONTROL without
aad046c5da Mart*7553 exf/cal
7554 - ctrl_init: fix initialisation (computation of diffrec) for obcs-ctrl
7555 and handle case of obcs?period == 0
7556 Not affected by these changes: There is still an inconsistency in
b8c827cb68 Jean*7557 the computation of start/endrec for the obcs variables for ALLOW_CAL
aad046c5da Mart*7558 defined (see comment by Menemenlis, 7-Mar-2003)
7559 - make S/R ctrl_get_gen_rec return something meaningful even if
7560 ALLOW_CAL is not defined
b8c827cb68 Jean*7561 - ctrl_getobcs?: simplify code so that it does not need to use
aad046c5da Mart*7562 S/R exf_swapfields
28266d9344 Jean*7563 o testreport:
7564 allow to test MPI with different number of processors for each experiment:
7565 create file "SIZE.h.mpi" in each build dir.
7566 Note: update of "-command" argument not yet implemented.
96bd925d69 Gael*7567 o model/src, pkg/autodiff, pkg/ecco, pkg/seaice:
7568 alleviate the need for additional 3D tapes when using
7569 the non-inear free surface in the adjoint. This is done
b8c827cb68 Jean*7570 by adding an 'update' of hfacc etc. to their current
7571 value at the beginning of forward_step.F.
484f2586c6 Mart*7572 o pkg/seaice
7573 seaice_lsr: move stress-divergence computations out of outer pseudo-
3d83c2ccc1 Jean*7574 timestepping loop
484f2586c6 Mart*7575 o pkg/obcs/obcs_prescribe_read.F: move 'CALL OBCS_EXTERNAL_FIELDS_LOAD'
7576 up, so that the calls of the ctrl_* subroutines are really at the end
7577 of the routine.
3d83c2ccc1 Jean*7578 o pkg/gmredi:
7579 allow to specify a 2-D horizontal map and a 1-D vertical profil
7580 as scaling factor for Isopycnal diffusivity (Redi) and GM diffusivity.
96bd925d69 Gael*7581 o pkg/seaice:
7582 move lsr iterations from seaice_dynsolver to seaice_lsr.
7583 o pkg/seaice:
7584 reduce memory footprint of seaice mutldim advection tapes,
7585 by using a 2D tape independent of the generic_advdiff ones,
7586 and setting GAD_AREA=1 etc. rather than GAD_AREA=101 etc.
484f2586c6 Mart*7587
aaf4b7889a Jean*7588 checkpoint62q (2010/12/29)
56906110dd Jean*7589 o model/src:
7590 - check horizontal grid-spacing for unset or zero/negative values.
7591 - change AD test hs94.1x64x5 to be truly a 2-D set-up.
9827e6a18a Jean*7592 o pkg/flt:
7593 - use (recent) mdsio S/R MDS_READVEC_LOC instead of local FLT_MDSREADVECTOR
7594 - precision of input and output files set according to readBinaryPrec
7595 and writeBinaryPrec (previously always 64.b), pickup remains at 64 bits.
7596 - initial float position from tiled file was not converted to index space
7597 (looks like a bug): fixed to make it similar to initial pos. global file.
7688b175d1 Jean*7598 o global_ocean.cs32x15:
7599 change SIZE.h of AD set-up to get same tiling as with MPI.
7600 Update output_adm, output_adm.thsice (pass@14) & output_adm.seaice (fail@11)
7601 o model/src:
7602 add flag to control printing of domain fields (bathymetry, hFac ...) in
7603 ini_mask_etc (call to plot_fieds_xy*).
7604 o pkg/thsice:
7605 if useEXF, some forcing fields are not valid in overlap: fixed by computing
7606 over the interior only + apply EXCH at the end (like with SEAICE advection).
71e006c2cc Jean*7607 o pkg/mdsio:
7608 - add 2 arguments to S/R MDS_PASS_R4/8toRL/S for overlap size of buffer
7609 to copy to/from, so that it can be used to replace MDS_PASS_WH_R8toRL/RS.
7610 - change barrier call for safe multi-threads access to 3-D shared buffer.
7611 - MDS_READ/WRITEVEC_LOC use buffers from MDSIO_BUFF_3D.h (instead of local ones)
7612 - replace call to MDS_PASS_WH_R4/8toRL with call to MDS_PASS_R4/8toRL and
7613 remove the 4 S/R MDS_PASS_WH_R4/8toRL/S.
1d0c7afaa8 Oliv*7614 o pkg/flt:
7615 - add fourth-order Runge-Kutta integration
7616 - add basic exch2 support (only 1 facet supported so far!)
824747e6ac Jean*7617 o pkg/mdsio+rw:
7618 new S/R to read local (or tile independent) vector (read counterpart of
7619 mds_writevec_loc, and front-end write_glvec_rl/rs).
1196ad766d Gael*7620 o global_ocean.cs32x15: additional input_ad.seaice experiment
7621 that uses pkg/seaice rather than pkg/thsice.
7622 (using multidim advection for seaice)
bba939b996 Jean*7623 o towards more F95 syntax for array specification in namelist:
7624 - change "data.diagnostics" (data.ptracers was changed before checkpoint62p)
7625 of all verification experiments.
7626 e.g.: line: fields(1,3)='ETAN ','ETANSQ ',
7627 was changed to: fields(1:2,3)='ETAN ','ETANSQ ',
7628 - finish adding "-DNML_EXTENDED_F77" to DEFINES list in pgf77 and g77 optfiles
a913ac327f Gael*7629 o global_ocean.cs32x15: additional input.seaice experiment
7630 that uses pkg/seaice rather than pkg/thsice.
bba939b996 Jean*7631
38e5b192c3 Jean*7632 checkpoint62p (2010/12/17)
b8373d841d Gael*7633 o pkg/thsice: rename (ad tape index) iicekey as ticekey, and move it
7634 to THSICE_SIZE.h to avoid conflict with pkg/seaice.
7635 o pkg/seaice: add seaice_diffusion.f seaice_map_thsice.f to adjoint.
7636 allow for use of multim. advection in seaice adjoint.
a71dccbd8b Mart*7637 o pkg/seaice: add diagnostics for snow precipitation and sublimation flux
7638 - first attempt to close budgets by taking into account the freshwater
38e5b192c3 Jean*7639 flux implied by the sublimation of snow and ice. So far only the
a71dccbd8b Mart*7640 volume budget is closed, turn on with soon-to-be-retired-again CPP-Flag
7641 SEAICE_ADD_SUBLIMATION_TO_FWBUDGET
0e4cbd8946 Jean*7642 o eesupp/src:
7643 new S/R with new option (NML_EXTENDED_F77) to change array specification
7644 from F95 standard to commonly accepted extended F77 form.
7645 This would allow to use F95 syntax in namelist (needed with gfortran 4.4.5)
7646 and to revert back to the original syntax (with -DNML_EXTENDED_F77)
7647 for less tolerant f77 compiler (e.g., pgf77, g77).
8da37cabce Jean*7648 o globalFiles:
7649 commented out in parameter file "data" since it's not safe with MPI
7650 (e.g., wrong on aces); keep it if useSingleCpuIO=T (but not doing much
7651 in this case); no longer commented out in restart test (tst_2+2).
7652 o add adTapeDir to specify a special directory where adjoint tapes are
7653 written/read (adread_adwrite.F). adTapeDir is specified in data/PARM05
0e71fc82ff Mart*7654 and cannot be used together with mdsioLocalDir.
372ecbd193 Jean*7655 o nesting pkgs:
7656 - packages_init_variables : put call to OBCS_INIT_VARIABLES in last position
7657 - update Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
7658 - add parameter files + utils dir + output from short run on beagle.
99f78b5547 Gael*7659 o pkg/seaice:
7660 fix seaice_growth.F store directives; update results of exp. lab_sea.ad
372ecbd193 Jean*7661 o pkg/seaice: explicitly store tsurfloc in seaice_solve4temp.F to avoid
b3992b16ea Mart*7662 unnecessary copying in adjoint code, requires new parameter NMAX_ITER
7663
810405d6e0 Jean*7664 checkpoint62o (2010/11/25)
b2aaf537fd Jean*7665 o pkg/exf:
7666 - change CPP option EXF_VERBOSE to run-time logical param exf_verbose.
810405d6e0 Jean*7667 o pkg/seaice:
7668 - seaice_ocean_stress: split a loop for better vectorization of the
7669 adjoint code
bb0aaa13c1 Mart*7670 - seaice_growth.F: fix bug in conservation of freshwater connected to
475a61469a Mart*7671 capping of heff, put contribution into d_HEFFbyNEG
bb0aaa13c1 Mart*7672 - replace irritating parameters SEAICE_latentWater/Ice and SEAICE_sensHeat
7673 by something more sensible (parameters that are what their name implies)
7674 - change some defaults, so that by default exf-parameters are used for
7675 things like rhoAir, cpAir,latent/sensible heat parameters, in order
7676 to reproduce the old results, many data.seaice now contain funny values
7677 for cpAir and latent heat of sublimation
810405d6e0 Jean*7678 o packages_readparms.F: move exf_readparms up in line so that
bb0aaa13c1 Mart*7679 exf-parameters are visible for other packages (e.g. seaice)
a7e5ab30a6 Jean*7680 o debugMode & debugLevel=2:
7681 - differentiate between debugMode & debugLevel=2:
7682 debugMode: controls printing of debug messages (sequence of S/R calls).
7683 debugLevel: controls printing of algorithm intermediate results and stats.
7684 - remove "if debugLevel=2 => debugMode" but keep "debugMode => debugLevel=2";
7685 => allows to print debug-stats without all sequence of call messages.
7686 - switch control of debug print from debugLevel to debugMode in many S/R.
7687 o pkg/obcs (obcs-sponge):
7688 fix bug that was introduced on Oct 25 (in dynamics.F v1.151): put back the
7689 call to OBCS_PRESCRIBE_EXCHANGES (need to exch gU,gV when using obcs-sponge)
db3f21a7ea Jean*7690 o pkg/generic_advdiff:
7691 - record overlap minimum size for each advection scheme;
7692 - refine criteria on overlap minimum size;
7693 - check and stop (in gad_check) if overlap size is too small.
7694 o pkg/obcs:
7695 - with ptracers: remove multiple calls to obcs_apply_ptracer (only done
7696 once, in ptracers_implicit.F)
7697 - with seaice: remove test on empty file name in obcs_apply_seaice (always
7698 apply OB values when tile has OB)
c4900f4204 Jean*7699 o model/src, coriolis setting:
7700 - integer parameter "selectCoriMap" (=0,1,2) replaces 3 logical
7701 useConstantF, useBetaPlaneF, useSphereF ; can now read coriolis from
7702 files (selectCoriMap=3) with any grid.
7703 - add parameter "fPrime" for constant second Coriolis coeff (default=0).
7704 o pkg/seaice/seaice_growth.F:
7705 a few cosmetic changes that reduce the number of lines of code
36f4ad1be7 Mart*7706 o pkg/obcs: add boundary conditions following Stevens (1990)
7707 - the code follows old MOM/NAOSIM code
7708 - so far it is only implemented for the eastern and western boundaries
7709 and NOT for pTracers
3710b30939 Oliv*7710 o pkg/rbcs:
7711 - replace rbcsInIter by rbcsForcingOffset, the time in seconds at the
7712 beginning of the first rbcs forcing period.
7713 - add option rbcsSingleTimeFiles that makes rbcs read forcing data like the
7714 offline package, i.e., one file per time, labeled by iteration number;
7715 deltaTrbcs sets the timestep with which the data was generated;
7716 rbcsIter0 is the forcing iteration corresponding to rbcsForcingOffset.
7717 - rbcsForcingCycle=0 makes forcing non-cyclic.
7718 - make arithmetic safe for negative times and odd forcing periods.
7719
19b92f2fb3 Jean*7720 checkpoint62n (2010/11/09)
501625885e Mart*7721 o pkg/seaice:
2a7b0e3fd3 Jean*7722 fix masking in free-drift S/R ; update results of exp. lab_sea.fd
7723 o pkg/obcs:
7724 New S/R to copy tracer value from the OB location to narrow band region
7725 (width = same as overlap) beyond the OB: preserve OB value (needed for
7726 high-order scheme) which were overwritten by EXCH call if in overlap
7727 region. Applied to theta, salt, ptracer and advected seaice variables.
7728 With seaice: use maskInC in similar way as in gad_advection.F,
7729 in seaice_advection.F and advect.F.
7730 Update output of experiment seaice_obcs and change exp4 to test OBCS with
7731 4th order Adv.Scheme. for pasive salt and ptracer.
7732 o tools/genmake2:
7733 - when looking for an optfile (not specified), only search for Fortran compiler
7734 (remove sym-link test + setting of CPP + makedepend check + C-compiler check)
7735 - in get_fortran_c_namemangling: use "$CC $CFLAG" to compile C test programm
7736 (instead of "$MAKE genmake_test.o" since an existing Makefile can be wrong)
7737 - set default for CPP to "cpp -traditional -P" (was the case without specifying
7738 an optfile, but otherwise default was just "cpp".
7739 - comment out PLATFORM=$p_PLATFORM (no idea where p_PLATFORM comes from)
7740 - when "CC" is not set in the optfile, look for possible C compiler
7741 (instead of just setting CC=cc)
7742 - put back version v.169 modif (from 2008/02/15), was dropped in v.173 changes:
7743 => add a ".F" to ".o" rule for source files with no "#include" (such as
7744 port_rand.F); otherwise, default ignores FOPTIM and just uses FFLAGS.
7745 - move gfortran before g77 in list of possible Fortran compiler (consistent
7746 with reference compiler switch from g77 to gfortran)
7747 o pkg/seaice:
7748 o remove SEAICE_OLD_AND_BAD_DISCRETIZATION-code, add a test to
501625885e Mart*7749 seaice_check that stops the model, when the CPP flag is used.
7750 o seaice_growth.F: make capping of ice volume conserving by returning the
7751 capped ice as freshwater to EmPmR. This does not change the verification
7752 experiments but will change runs where the capping is acutally active
b25aab9f85 Jean*7753 o change reference platform+compiler from faulks+g77 to baudelaire+gfortran
7754 (except the 2 fizhi test exp.); update output of exp.: bottom_ctrl_5x5,
7755 global_ocean.cs32x15 (icedyn, thsice, AD thsice), global_ocean_ebm (AD),
7756 lab_sea (fd, hb87, salt_plume), MLAdjust (3/5) and vermix (dd)
7757 o tools/genmake2:
7758 - merge genmake_warnings & genmake_errors into 1 log file: "genmake.log")
7759 - change DUMPSTATE default to false (can use "-ds" option to switch it to T)
7760 - clean previous genmake log files before anything else.
7761 - change Makefile to remove testreport log files (*.tr_log) and genmake log
7762 files only with "CLEAN" target (instead of "Clean");
8488313509 Jean*7763 o pkg/generic_advdiff:
7764 Change OBCS in multiDim advection (gad_advection.F):
7765 Use maskInC to prevent intermediate update of tracer-field in OB regions,
7766 thus keeping current-time-step OB values; and remove the call to OBCS_APPLY
7767 which were applying future time-step OB values.
7768 This way, all explicit calculations use current-time-step OB values
7769 (simpler and more consistent).
7770 Affects results when set-up uses time-varying OBC and multi-dim advection;
7771 update output of experiment seaice_obcs.
7b24ec4b62 Jean*7772 o pkg/seaice:
7773 move OPTIONS (formerly locally defined) to SEAICE_OPTIONS.h:
7774 this includes SEAICE_GROWTH_LEGACY (+ SEAICE_DO_OPEN_WATER_GROWTH &
7775 SEAICE_OCN_MELT_ACT_ON_AREA ) and SEAICE_SOLVE4TEMP_LEGACY.
7776 Default (pkg/seaice/SEAICE_OPTIONS.h) is to define SEAICE_SOLVE4TEMP_LEGACY
7777 but leave SEAICE_GROWTH_LEGACY undef ; For now, keep verification exp
7778 unchanged (SEAICE_GROWTH_LEGACY defined in */code*/SEAICE_OPTIONS.h)
cc732d4fb4 Davi*7779 o pkg aim (2010/10/26):
7780 - Introduce ALLOW_INSOLATION, moving toward a more general incoming solar radiation
7781 formulation with obliquity, eccentricity, ... as run-time parameters,
7782 - Introduce diagnostics for top-of-the-atmaophere incoming solar radiation and
7783 upward shortwave radition at the surface (all-sky and clear-sky).
f84aaa453a Jean*7784 o pkg/obcs:
11aa53a8c7 Dimi*7785 - writing sections with globalFiles=T does not work: switch to tiled-files
7786 when writing sections for OBCS (change pkg/rw/write_rec.F accordingly).
7787 - fix index bug (OB_Ie -> OB_Iw_) in obcs_apply_uvice.F
7788 - apply OBCS_SEAICE_COMPUTE_UVICE to both uice and vice at all obcs
f84aaa453a Jean*7789
dfe4303922 Jean*7790 checkpoint62m (2010/10/21)
f4c40b0961 Mart*7791 o pkg/seaice: vectorize seaice_solve4temp.F
7792 - move iterations loops outside of i/j-loops
7793 - requires 2D arrays for TB and effConduct
dfe4303922 Jean*7794 - add 2D iceOrNot to replace HICE_ACTUAL.GT.0, as HICE_ACTUAL is
f4c40b0961 Mart*7795 modified in this routine
7796 - a little bit of clean up, adjusting indentation, etc.
dfe4303922 Jean*7797 - replaced a few TEN**a by exp(a*log(10.)) in new code for better
7798 performance and '**TWO' by '**2' (because TWO is a float),
f4c40b0961 Mart*7799 replaced ONE, ZERO
2708f6625c Jean*7800 o eesupp/src:
7801 fix flow dir for exch1_z_RX_cube, exch1_uv_RX_cube & exch1_bg_RX_cube
473a1d0f79 Gael*7802 o pkg/seaice/seaice_growth.F
2708f6625c Jean*7803 Revision 1.89 of seaice_growth.F completes the overall october 2010 revision and
7804 merging process. The merged routine has two branches, and one activates the 'evolution'
473a1d0f79 Gael*7805 branch by setting SEAICE_GROWTH_LEGACY to undef (at the top of the routine for now).
7806 In summary, here is what the '10/10 revision' did consist of
2708f6625c Jean*7807 part 1: seaice_growth.F revisions 1.71 to 1.75
473a1d0f79 Gael*7808 - Preliminary seaice_growth.F clean-up, keeping test results strictly unchanged.
2708f6625c Jean*7809 The emphasis here was on improving readability (e.g. by trying to use meaningful
473a1d0f79 Gael*7810 variable names) and modularity (e.g. by adding arrays to store heff etc. updates).
2708f6625c Jean*7811 part 1.5:
7812 - revising the lab_sea experiment to make it a more useful (i.e. stable
7813 and representative of an actual model run). This was done by generating a
7814 (winter) pickup to start from, switching back the main experiment dynamic
473a1d0f79 Gael*7815 solver from evp to lsr, having one of the experiments use the free drift solution.
2708f6625c Jean*7816 part 2: seaice_growth.F revisions 1.76 to 1.85
473a1d0f79 Gael*7817 - Sorting out hard-coded constants that prevented heat and fresh water conservation.
2708f6625c Jean*7818 - Sorting out the various fields units and sign (set early on and reset at the end)
7819 to avoid numerous scalings/re-scalings. By v1.85 the basic unit for ice, heat and
7820 fresh water stock is 'effective ice meters', and >0 implies more ice/snow.
7821 - Using tendency terms arrays (d_HEFF* etc.) to alleviate remaining code locks,
473a1d0f79 Gael*7822 and simplifying logical expressions to further improve readibility.
7823 part 3: seaice_growth.F revisions 1.86 to 1.89
7824 - Re-organize the blocks of code more logically.
7825 - Merging the '_if.F' pieces that add something new.
2708f6625c Jean*7826 o pkg/thsice:
7827 - vectorize thsice_solve4temp and thsice_get_exf.
65de7ad9cd Mart*7828 Problem: thsice_solve4temp has an unvectorizable statement that
7829 might also be problematic for TAF
2708f6625c Jean*7830 - thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This
7831 does not change the verifcation experiment, but will change all
65de7ad9cd Mart*7832 experiments that have this flag undefined (not tested in verification);
7833 a little reorganization to save a few 2D fields and recomputations
0d66e9256f Patr*7834 - 1st step of revisiting thsice adjoint (major recomp. sorted out)
07a36c38a7 Patr*7835 - 2nd step: fix some store dirs
7836 o seems to work somewhat, i.e. using ifort but not g77
7837 o likely cause are incomplete init. or recomputation
7838 o start verification/global_ocean.cs32x15/input_ad.thsice
cce7f684db Oliv*7839 o pkg/obcs: add support for exch2
7840 - the position of the boundary and prescribed values are specified using
7841 a global domain with exch2 facets stacked
7842 - in x for N,S boundaries (like W2_mapIO=-1)
7843 - in y for E,W boundaries (so E,W boundaries do not overlap)
7844 o pkg/mdsio: add support for writing global sections with exch2
7845 file layout is as for obcs described above:
7846 - for x-z sections, facets are stacked in x (like W2_mapIO=-1)
7847 - for y-z sections, facets are stacked in y
8f33527490 Jean*7848 o pkg/thsice:
033392cf3f Mart*7849 - change a few routines for better vectorization: thsice_albedo.F,
7850 thsice_step_temp.F, and in thsice_calc_thickn.F. Results are
7851 not affected, but in particular the latter routine has changed
7852 dramatically (not necessarily easier to read now).
7853 - re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops
8f33527490 Jean*7854 iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF.
7117852a81 Gael*7855 o verification/lab_sea:
7856 - overhaul of the forward model experiments. The main motivation
2708f6625c Jean*7857 for this revision is that lab_sea has proven quite fragile (when
7117852a81 Gael*7858 changing the sea-ice code, and switching platforms) to a point
7859 when failures were very hard to attribute to specific code problems.
2708f6625c Jean*7860 - the suspected reason for this fragility is noise amplification by evp so,
7117852a81 Gael*7861 to start with, we decided to replace evp with lsr in the main experiment.
7862 - the input.lsr experiment thus became obsolete and was removed.
2708f6625c Jean*7863 - it was replaced with the input.fd experiment that uses an
7117852a81 Gael*7864 analytical "free drift" solution as the ice velocity field.
7865 - Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp)
7866 will hopefully allow us to discriminate problems due to dynamic solvers
7867 from problems due to the thermodynamic code. input.salt_plume (lsr) allows
7868 us to test additional options, along with the salt plume package.
2708f6625c Jean*7869 - Finally a pickup was generated (at the end of a one year run) to
7117852a81 Gael*7870 make the tests more representative of an actual model run. Previously
7871 the tests starting point was a 1m thickness of ice everywhere.
2708f6625c Jean*7872 o pkg/seaice:
7117852a81 Gael*7873 - introducing S\R seaice_freedrift.F that compute the
2708f6625c Jean*7874 analytical solution to an approximate ice momentum
7117852a81 Gael*7875 equation (i.e. the simple stress/coriolis balance).
7876 - define SEAICE_ALLOW_FREEDRIFT to trigger the computation
2708f6625c Jean*7877 of the free drift velocity field, and enable its use.
7878 To actually use the free drift solution as the model ice
7879 velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice.
9aa451bbe6 Mart*7880 o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata"
7881
512c5638c7 Jean*7882 checkpoint62l (2010/10/04)
6915e96d9b Jean*7883 o pkg/seaice:
7884 -fix the USE_ORIGINAL_SBI version (for variable freezing point);
7885 -use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new
7886 version (with USE_ORIGINAL_SBI undef);
ddb00487db Mart*7887 o add hooks for new packages OASIS, the package will follow
7888 (hooks exclude the seaice pkg for now)
63712fce08 Gael*7889 o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO
6915e96d9b Jean*7890 Option to use mdsio_read_whalos.F/mdsio_write_whalos.F,
63712fce08 Gael*7891 rather than mdsio_readvector.F/mdsio_writevector.F, within
7892 adread_adwrite.F to read/write adjoint-related tapes to disk.
6915e96d9b Jean*7893 o eesupp and pkg/mdsio: ALLOW_WHIO
7894 Option to write/read 2D fields to files including tiles halos.
7895 The main purpose is for adjoint related "tape I/O".
b7f33b42e8 Gael*7896 The secondary purpose is for debugging phases.
7897 A word on those rather specifically intended purposes.
7898 The code was meant to be stripped down to the bare minimum.
6915e96d9b Jean*7899 Typically, there is a unique and basic mapping to the global
b7f33b42e8 Gael*7900 buffer (tile by tile, then proc by proc, then level by level), and
7901 byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not
6915e96d9b Jean*7902 meant to generate user friendly outputs of various shapes and forms.
b7f33b42e8 Gael*7903 Rather it is intended, for the knowledgeabale developers,
7904 to be largely independent of the many mdsio options, to allow
6915e96d9b Jean*7905 outputs of tiles+halos in debugging phases and in adjoint runs,
b7f33b42e8 Gael*7906 and to allow some flexibility in tuning (adoint) I/O depending on each
6915e96d9b Jean*7907 file system behavior. With regard to tuning, most of the potential knobs
b7f33b42e8 Gael*7908 (to leave files open, to allocate the I/O indep. of usesinglecpuio,
7909 to specify directories, to specify the typical size of I/O calls, etc.)
7910 are not yet included, and will be added if they prove useful.
2ec921609d Jean*7911 o pkg/seaice:
65c3c27d2c Jean*7912 fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F
7913 o pkg/seaice:
2ec921609d Jean*7914 new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty
7915 code (seaice_budget_ice_if.F) which enable to recover old standard
7916 code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined.
7917 temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F.
7918 o model/src (rStar):
7919 use simple average (not area weighted) of rStarFac at U,V point when using
7920 vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection)
7921 update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20.
813dd65ac9 Jean*7922
e356351660 Jean*7923 checkpoint62k (2010/09/17)
05855df642 Patr*7924 o adjoint
7925 * changed verification/global_ocean.cs32x15 ; adjoint now tests
7926 Adams-Bashforth 3 + NLFS + RSTAR
7927 * some more modifs required for ECCO-GODAE v4
54f6436301 Dimi*7928 o pkg/seaice
7929 add SEAICE_AGE_VOL option to use volume instead of area for
7930 integrating SEAICE_AGE
a89a34c510 Jean*7931 o model/src:
7932 first check-in of sigma & hybrid-sigma coordinate code ; also includes
7933 non-linear free-surface parts ; but pressure-gradient not yet coded.
96a7eb29e8 Jean*7934 o pkg/ptracers:
7935 option for ptracer to convert Salt Relax into additional EmP.
7936 tested in exp. global_ocean.90x40x15.dwnslp (update output)
7937
3eaaf3fa4e Jean*7938 checkpoint62j (2010/08/25)
4d3d3c392f Jean*7939 o pkg/ggl90:
7940 other minor changes: remove 3-D temp array gTKE (+ add argument myIter)
deff84d11b Mart*7941 o pkg/dic: car_flux.F, phos_flux.F
7942 - reduce number of exp-calls in order to improve performance
4d3d3c392f Jean*7943 - clean up a little (replace fields by their macros, etc., fix
deff84d11b Mart*7944 typo in CPP-flag)
fa4ac57b5c Gael*7945 o pkg/ggl90: minor changes
7946 - GGL90diffKrS was removed --> always use GGL90diffKr
7947 - GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV
4d3d3c392f Jean*7948 - hack of mxlMaxFlag=2 --> ensure mixing between first and second level
7949 (commented out for now)
fa4ac57b5c Gael*7950 - change in max/min operations to ensure that smoothing is ok
7951 - smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr)
7952 - always use diffKrNrT as background profile (i.e. never use diffKr field)
3983b1167c Mart*7953 o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj)
c3c9befee2 Mart*7954 o pkg/dic:
1cfcce3655 Mart*7955 - model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better
7956 vectorization
33b1baef56 Mart*7957 - small bug fix in insol for the unlikely case of a cartesian grid
7958 - towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F
7959 + now vectorize, which also removes adjoint recomputations;
7960 + replace integer maksp1 by _RL maskp1
1cfcce3655 Mart*7961 + replace a**x by exp(x*log(a)) in phos_flux.F for speed
c3c9befee2 Mart*7962
ee1e0f95df Jean*7963 checkpoint62i (2010/07/21)
1e3aeb8ba1 Jean*7964 o pkg/flt:
7965 - with OBCS: stop floats which enter the OB region
7966 o model/src:
7967 - use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones)
7968 for implicit vertical advection.
ac416c45e2 Jean*7969 o pkg/seaice:
7970 - account for melting in seaice age evolution.
1e3aeb8ba1 Jean*7971 - remove double counting of seaice ridging effect on seaice age.
ac416c45e2 Jean*7972
283e101b7e Jean*7973 checkpoint62h (2010/06/18)
ad5bd052a0 Jean*7974 o pkg/exch2:
7975 - remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1).
7976 o tools/genmake2
7977 - remove "-pdefault" option: redundant with the use of "packages.conf";
7978 - remove file pkg/pkg_default : set the default as a pkg group
7979 ("default_pkg_list") defined in pkg/pkg_groups;
7980 - fix for case pkg/pkg_depend is missing (was hanging before);
7981 - add option "-pgroups" to specify a different pkg_groups than the default.
82644c0ee5 Jean*7982 o verification/adjustment.cs-32x32x1:
7983 add a "minimal" set-up test (code_min & input_min) which only compiles
7984 eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc.
f30b73b1e2 Jean*7985 o tools/genmake2
7986 - extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg]))
7987 - fix details of checking for mnc & profile pkg when NetCDF is unavailable.
c5f3ee7c60 Mart*7988 o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these
7989 files are nearly the same anyway.
7990 Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04:
7991 - redefinition of tau(i,i) (by a factor of ustar)
7992 - 1./exf(Const/T) -> exf(-Const/T) (big change in the results)
7993 - replace rhonil by rhoConstFresh in computation of evap (bug fix)
7994 - replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results)
6f9d992eff Jean*7995 - replace
c5f3ee7c60 Mart*7996 rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh )
7997 shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j)
7998 by
7999 shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh )
8000 (changes results)
6f9d992eff Jean*8001 -> exf_bulkformulae v1.22,
c5f3ee7c60 Mart*8002 update verification experiments lab_sea, offline_exf_seaice, seaice_obcs
8003 (lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13,
6f9d992eff Jean*8004 output.txt 1.63
c5f3ee7c60 Mart*8005 offline_exf_seaice: output.seaicetd.txt 1.7
8006 seaice_obcs: output.txt 1.10)
8007 Step 2: do the actual merge and remove exf_bulk_largeyeager04.F
8008 -> exf_bulkformulae v1.23,
8009 unfortunately requires updating lab_sea.salt_plume (6 matching digits),
8010 and global_ocean.cs32x15.icedyn (only 11 matching digits)
6f9d992eff Jean*8011 Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice.
48a7bf5f11 Jean*8012 o adjoint of exch-1:
8013 - pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list)
8014 (note: was already like this when using EXCH-2) and remove flow dir
8015 and hand-written AD version of high-level EXCH S/R (pkg/autodiff);
8016 - provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow);
8017 - update pkg/exch2 diff list.
8018
1431f62bbf Jean*8019 checkpoint62g (2010/05/19)
0bb3693507 Jean*8020 o eesupp/src (exch-1):
8021 - split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F)
8022 and remove argument "simulationMode"; same thing for all exch_*rx_cube.F
8023 (renamed to exch1_*rx_cube.F).
8024 - change accordingly exch_*_rx.template and AD version in pkg/autodiff
8025 to call new exch1 S/R ; update Makefile and .cvsignore.
8026 - replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove
8027 exch2_xy_rx later)
8028 Note: after updating your code, need to run "make clean" in eesupp/src
71519bb137 Jean*8029 o test experiment bottom_ctrl_5x5:
0bb3693507 Jean*8030 new output_adm.txt with fewer grdchk & less monitor output.
71519bb137 Jean*8031 o model/src:
8032 remove the call to ini_cori in initialise_varia.F (just keep the usual one
0bb3693507 Jean*8033 in initialise_fixed.F). More consistent with coriolis & horizontal grid
71519bb137 Jean*8034 beeing treated in the same way (ini_grid is not called a 2nd time).
0bb3693507 Jean*8035 o pkg/exf:
1c4c64c172 Mart*8036 - rewrite exf_bulk_largeyeager04.F for better vectorization, changes
ba8369cbfe Mart*8037 global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated
1c4c64c172 Mart*8038 - fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now)
a435e833b1 Mart*8039 - cosmetic changes to exf_bulkformulae.F to make it look more like
8040 exf_bulk_largeyeager04.F
f286872c74 Jean*8041 o eesupp/src (exch-1):
8042 - Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1).
8043 - Separate buffer filling and MPI sending: allow EXCH-1 to work for local
8044 array (non-shared) when using MPI+MTH. Also reduces number of BARRIER
8045 (even without using MPI).
8046 - Message mode: move RecvAck setting (indicator of buffer being ready)
8047 from send_put to recv_get S/R (was useless before, but not sure if
8048 it's much more useful now);
71519bb137 Jean*8049 - Switch the order of sync: MPI-proc 1rst and then threads;
f286872c74 Jean*8050 - take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead.
71519bb137 Jean*8051 - fix AD code for communication mode ='get' (but not used).
b74efa0efe Jean*8052 o model/src:
8053 initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does
8054 not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp).
b42ffdc64e Mart*8055 o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API
46e98d66db Mart*8056 o pkg/ctrl: require a specific set of control variables and exf-flags for
8057 adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied)
c3aa58ac7a Gael*8058 o model/src:
4caeefbbc4 Jean*8059 a) 1rst version of a new driver S/R to turn-off output freq and flags after the
8060 1rst forward sweep, to avoid over-writing output files during recomputations
8061 recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?)
8062 b) 2nd version:
8063 - add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO);
8064 - switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast,
8065 writePickupAtEnd) + seaice & ptracers output;
8066 - do not switch off MNC flags (otherwise, won't get admonitor netcdf file)
958aba4d71 Jean*8067 o model/src:
c3aa58ac7a Gael*8068 - new S/R rotate_uv2en_rl (..._rs) that rotates vector fields.
7b55f0c147 Jean*8069 o pkg/exch2:
958aba4d71 Jean*8070 - remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ;
7b55f0c147 Jean*8071 - add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch).
6f7f051ae5 Jean*8072 o pkg/autodiff & exch2:
8073 process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF
8074 (for now, only if ALLOW_EXCH2 is defined).
72ca7aff83 Jean*8075 o pkg/autodiff:
958aba4d71 Jean*8076 - include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F
72ca7aff83 Jean*8077 (not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly.
8078 + clean-up comments (_RS is not always real*4)
8079 - fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R)
8080 - add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2:
8081 was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs.
e4c55a32ae Jean*8082 o testreport (AD-tests):
8083 no longer link files from dir "../input" (1rst link files from
8084 "../input_ad.[xx]" if secondary test "xx" and then from "../input_ad")
8085
39ab2f324f Jean*8086 checkpoint62f (2010/04/29)
dd69ba5157 Mart*8087 o model/src/the_main_loop.F:
8088 adjust store directives for seaice evp and multicategory according to
8089 pkg/ecco/the_main_loop.F
ec74c4ec27 Patr*8090 o adjoint:
e4c55a32ae Jean*8091 global_sum_ad was incomplete (noted many times by many people ;)
ec74c4ec27 Patr*8092 nice description by Jean U. as follows:
e4c55a32ae Jean*8093 * allreduce(var) in global_sum.F can be interpreted as
8094 reduce(sum) followed by broadcast of sum.
8095 * The adjoint of that is
8096 sum(adjoint) followed by broadcast(summed adjoint value)
ec74c4ec27 Patr*8097 or in other words, allreduce(sum, adjoint vars)
8098 We were missing the sum(adjoint)!
8099 Benign, except(!) for "global" scalars appearing in tile loops (bi,bj)
8100 (noted by J.M. Campin, e.g., in cost_ssh_mean, variable offset).
8101 The fix should produce 16-digit accuracy between
8102 single-CPU multi-tile (e.g. nSx=2, nPx=1) and
8103 multi-CPU single-tile (e.g. nSx=1, nPx-2)
8104 We'll probably change this yet again shortly
3b017f85c7 Jean*8105 o eesupp/src:
8106 - fix global_sum_r4 (wrong from previous modif in Jun 2009; ever used ?)
94ec5b807d Dimi*8107 o pkg/icefront
8108 - ALLOW_SUBGLACIAL_RUNOFF option adds capability for time-evolving
8109 specification of addmass array based on a 2D field, which is added
8110 at bottommost wet level at each horizontal location.
c99b00e28d Jean*8111 o model/src:
8112 horizontal grid initialisation (other than curvilinear): add code for Exch2 IO
8113 layout; (not always compatible with delX,delY setting; commented out for now).
062357823a Jean*8114 o pkg/exch2:
8115 change tile to processor setting (case nSy*nPy > 1): allows default model mapping
8116 (myX and myYGlobalLow) to be used for simple (1 facet, no blank tile) config.
8117
e98d34196c Jean*8118 checkpoint62e (2010/04/15)
a175514333 Jean*8119 o pkg/obcs:
8120 - fix wrong index in OBCS_SPONGE_V for Eastern-OB (reported by David Hebert).
6526bf38ab Jean*8121 o pkg/dic:
8122 -fix bug in fe_chem.F for multi-tile (nSx*nSy > 1) set-up;
8123 (note: not presently tested in any forward verification exp.)
8124 update tutorial_global_oce_biogeo AD output file.
8125 o pkg/exf:
a294fb3ca0 Gael*8126 - account for the variation of albedo as a function of zenith angle
6526bf38ab Jean*8127 by defining ALLOW_ZENITHANGLE in EXF_OPTIONS.h
e8d83fb93d Jean*8128 o build_options:
8129 - rename "linux_ia64_ifort+mpi_ice_nas" to "linux_amd64_ifort+mpi_ice_nas"
8130 o pkg/dic:
8131 change DIC atmos-CO2 box (method 3, dic_int1=3) initialisation & restart:
8132 - use binary pickup file for restart;
8133 - initialise atmos-CO2 box from dic_pCO2 parameter;
8134 - fix multi-threaded.
186276afbe Jean*8135 o pkg/rbcs:
8136 - clean-up RBCS code: add RBCS_OPTIONS.h file ; fix multi-threaded ;
8137 change (+ fix IO calls) type of array RBC_mask from _RL to _RS.
8138 - add RBCS to exp4 passive tracer 01 (rbcs was previously untested)
8139 and update output.txt
faaf90f2c5 Jean*8140 o pkg/kpp:
8141 - add diagnostics for KPP non-local flux of Temp, Salinity and pTracers;
8142 - change diagnostic of KPP non-local term: output average of KPPghat*KPPdiffKzS
e8d83fb93d Jean*8143 (= ratio of KPP non-local (salt) flux relative to surface-flux) when
faaf90f2c5 Jean*8144 using pkg/timeave & pkg/diagnostics (diag 'KPPghatK' replaces 'KPPghat ');
8145 - change pkg/offline to read-in average KPPghat*KPPdiffKzS from file
8146 KPP_ghatKFile (instead of the average of KPPghat from file KPP_ghatFile).
1a6563ae72 Davi*8147 o pkg/offline:
4daea5a88d Jean*8148 fix bug in S/R OFFLINE_FIELDS_LOAD regarding surfaceForcing conversion factor
8149 (bug was added in version 1.10 on 2007-08-23).
8150 o pkg/offline:
1a6563ae72 Davi*8151 - no need to specify periodicExternalForcing, etc ... to use offline pack
8152 - offline input files no longer just single prec --> parameter offlineLoadPrec
3d5d3248cf Patr*8153 o verification/lab_sea:
4daea5a88d Jean*8154 change AD test to multi-tile setup and update all 4 AD output.
3d5d3248cf Patr*8155 NOTE: while cost function values remain very similar,
8156 gradients are very different, although gradient checks are self-consistent
8157 Should try to get to the bottom of this (cost function summation order?)
0978c8a77f Jean*8158 o pkg/dic:
8159 in carbon_chem.F, replace log10 (AUTODIFF) with explicit form to avoid
8160 a weakness of TAF that drops part of double precision in log10 derivative.
d7e064ff4e Jean*8161 <= changes removed since problem has been fixed in current TAF version 1.9.71
0978c8a77f Jean*8162 update AD output of exp. tutorial_dic_adjoffline & tutorial_global_oce_biogeo.
5fd4ec8263 Jean*8163 o pkg/ecco:
8164 add missing "_d 0" in cost_readers.F, cost_readtopex.F & cost_readtopexmean.F
8165 update all 4 lab_sea AD output.
8166
9f4cf29369 Jean*8167 checkpoint62d (2010/03/22)
8168 o build_options:
8169 remove '-r8' (and '-i4') from linux_*pgf and linux_*ifort optfiles.
b9024a78e5 Jean*8170 o remove unbalanced quote (single or double) in commented line of source code
8171 (may cause some warning with some preprocessor/makedepend versions).
8172 o pkg/seaice:
87ed893815 Jean*8173 fix seaice_model.F for adjoint (gael) and update AD results of experiments
8174 lab_sea (std + evp + noseaicedyn) and offline_exf_seaice.
3b0f45b28f Jean*8175 o testreport:
8176 add option '-runonly' (short: '-ro') to just do the run part (without make).
2956a926ec Jean*8177 o eesupp: remove JAM communication code (obsolete).
8194302c25 Jean*8178 o add option to genmake2 & testreport to switch "_RS" type to "real*4"
a435e833b1 Mart*8179 (if allowed in CPP_EEOPTIONS.h); update default CPP_EEOPTIONS.h and return
8194302c25 Jean*8180 to default CPP_EEOPTIONS.h for exp. inverted_barometer & solid-body.cs-32x32x1
8181 (update also the output).
8182
f916330b2a Jean*8183 checkpoint62c (2010/03/02)
c805d90c6c Jean*8184 o tools/build_options :
8185 move (some) old optfiles from build_options/ to build_options/unsupported/
74230ba5cf Gael*8186 o model/src and pkg/exf
8187 surface relaxation -- separating data and data.exf options
8188 The point is to ensure that we specify the surface relaxation
a435e833b1 Mart*8189 either in data or in data.exf (but not half and half) and to
8190 avoid an accidental relaxation to 0 (which happened if a time
74230ba5cf Gael*8191 scale was specified but the file name was left empty)
4b97e458f0 Gael*8192 o model/src model/inc and pkg/mom_common
8193 ALLOW_3D_VISCAH/ALLOW_3D_VISCA4 => 3D specification of Viscosity
8194 => addition to the viscosity field as computed by others schemes
a435e833b1 Mart*8195 o tools/build_options:
076c0d73b3 Jean*8196 - rename "_generic_mpi" -> "+mpi_generic" (like other "+mpi" optfile)
8197 but keep the former optfile for few weeks for smooth transition
01d7251472 Gael*8198 o pkg/ecco
8199 - allow user defined cost function contributions
cc732d4fb4 Davi*8200 CPP: ALLOW_USERCOST_CONTRIBUTION
8201 USAGE: compute contributions in cost_usercost_all.F
01d7251472 Gael*8202 - note: this is identical to what ALLOW_GENCOST_CONTRIBUTION once was.
8203 the two options are complementary.
5939a6479f Gael*8204 o pkg/smooth
8205 - migration from contrib to the main repository
076c0d73b3 Jean*8206
e7a2735eaf Jean*8207 checkpoint62b (2010/01/26)
075e0d2187 Jean*8208 o pkg/monitor:
a435e833b1 Mart*8209 - change back mon_printstats_rl.F & mon_stats_rl.F and add a stop
075e0d2187 Jean*8210 (in case someone forgot to update customized pieces of code)
8211 o nonHydrostatic:
af06fd5b92 Jean*8212 - add Non-hydrostatic free-surface form (selectNHfreeSurf=1)(not fully tested);
8213 - add a simple 2-D experiment (short_surf_wave) to test it.
8214 o pkg/icefront:
8215 adding the shell of, and the hooks to, a new package that
5da8ce63fa Dimi*8216 will model melting and freezing of vertical glacier ice fronts
af06fd5b92 Jean*8217 o momentum:
451e002b6f Jean*8218 add diagnostics of momentum tendency from Hydrostatic pressure gradient
8219 (without surf.pressure term: would need a 2nd filling since implicit term).
af06fd5b92 Jean*8220 o add 3 "_d 0"s so that fizhi compiles with xlf on iblade, and replace
8221 two " &end" by " &" (in fizhi-cs-*) because S/R NML_SET_TERMINATOR
8222 cannot deal with the former
884840d195 Jean*8223 o cleaning:
451e002b6f Jean*8224 - remove all (except OpenAD) old TLM output from results_ad dirs.
884840d195 Jean*8225 - remove unused S/R (MDSWRITEMETA, DIAGNOSTICS_ADD2LIST, old DFILE IO S/R)
8226 - comment out maskH definition (replaced by maskInC)
8227 o pkg/monitor:
8228 - change mon_printstats_rl.F & mon_stats_rl.F (were similar to mon_writestats_rl
075e0d2187 Jean*8229 & mon_calc_stats_rl) to be the RL equivalent of mon_printstats_rs & mon_stats_rs.
884840d195 Jean*8230
0be9783367 Jean*8231 checkpoint62a (2010/01/15)
e95eb1d512 Jean*8232 o model/src:
8233 - bottom pressure diagnostic: correct for r* (when nonlinFreeSurf >= 4)
987f6e1ae3 Jean*8234 o pkg/diagnostics:
8235 - add optional level number diagnostics (i.e., level number to be define
8236 explictly with S/R DIAGNOSTICS_SETKLEV) with parser-code(10)="X".
8237 - strictly check for valid parser-code(10) ;
8238 - check if adding diag to the list from the right place.
09d7c96a8d Oliv*8239 o pkg/longstep:
8240 - change parameters and fix tracer conservation with rstar/nonlinear free surface
f8b182d288 Jean*8241 o diagnostics:
8242 - in all pkgs, replace remaining calls to old S/R DIAGNOSTICS_ADD2LIST with newer
8243 S/R DIAGNOSTICS_ADDTOLIST ; fix seaice VICE diagnostics.
75ecb6f722 Jean*8244 o pkg/diagnostics:
8245 - Add option for writing vertical integral (sum of selected levels) of an output
8246 field instead of writing output field levels. Activate this option on a per
8247 output-file basis, by setting the 2nd character of fileflag to 'I'.
8248 - Add field-specific information relative to level integral in 3rd postion
8249 of parser diagnostics code (gdiag): " "=cumulate levels, "R"=integrate
8250 vertically (x level-thickness x hFac), "r"=same but without hFac.
281db5ef19 Jean*8251 o do_the_model_io:
8252 - pass end-of-model-run flag as argument, from forward_step to diagnostics_write:
8253 in case useSIGREG, will write (averaged) diagnostics (if dumpAtLast) before
8254 writing pickups and stopping.
8255 o pkg/diagnostics (for now, only with mdsio):
8256 - write time information to meta file (and modify accordingly rdmds.m) :
8257 time-averaged diagnostics output: write starting and ending time of the
8258 time-averaging interval ; snap-shot diagnostics output remains unchanged;
e9ac57b72c Jean*8259 o pkg/timeave:
8260 - S/R TIMEAVE_NORMALIZ: change size of cumulated-time array (was previously
8261 always Nr), now assumed to be equal to number of levels of averaged field;
8262 only used for DIC_COST monthly mean arrays: this fixes dic_aver_final.F
8263 o pkg/sbo:
8264 - fix ocean bottom pressure global-average & 2-D time-ave output (was
8265 neither initialised nor filled).
8266 - add starting iteration in suffix of global-average output file
8267 (to avoid over-writing the file after a restart)
8268 - use standard MDSIO pkg S/R instead of SBO_WRITEVECTOR (fix byte-swap Pb).
8269 o time-average:
8270 - use simple cumulative-time array (no k index) in all pkgs: {PKG}_timeAve(bi,bj)
8271 (pkgs: aim_v23, bulk_force, dic, gmredi, kpp, land, ocn_compon_interf,
8272 ggl90, my82, opps, pp81, ptracers, sbo, seaice, shelfice, thsice)
8273 this fix DIC_COST cumulative-time array (previously: bi,bj,k)
8274 - fix 1rst call (nIter0) snap-shot output and accumulation (pkg/shelfice)
8275 - fix missing accumulation for pkg/opps.
8276 - cumulate fields only if doing time-ave output ({PKG}_taveFreq > 0)
8277 (pkgs: ptracers, kpp, ocn_compon_interf, ggl90, my82, pp81);
8278 - fix initialisation of time-ave vars and do only full time-step increment
8279 (i.e.: no first & last "half time-step") (pkgs: ggl90, my82, opps, pp81);
580b2d0e2d Jean*8280 o pkg/layers:
8281 - use standard RW pkg S/R to write the output
8282 and remove local write_fld version (which had a problem).
8283 - use simple cumulative-time array (no level index) to fix time-ave S/R calls.
8284 - fix LAYERS_CALC argument list.
8285 o pkg/timeave:
8286 - store cumulative-time in a simple tiled array (drop the level index)
8287 - add new S/R (TIMEAVE_NORMALIZE) which uses simple cumulative-time array.
b59b551857 Jean*8288 o pkg/ocn,aim_compon_interf
8289 - changes for multi-threaded coupled run. (tested with ifort-11 on danton)
8290
6a7fcc88c2 Jean*8291 checkpoint62 (2009/12/23)
c32120bcda Jean*8292 o switch on useOBCSbalance in tutorial_plume_on_slope exp. and update output.
8293 (was not previously tested in any other exp.)
262f5d9bf0 Jean*8294 o pkg/monitor:
8295 - clean-up _RL/_RS version: add specific S/R for statistics with mask & volume:
6a7fcc88c2 Jean*8296 mon_writestats_rl/s,F mon_calc_stats_rl/s.F ; will keep the old one
262f5d9bf0 Jean*8297 (mon_printstats_rl/s,F mon_stats_rl/s.F) just for bare statistics.
8298 - use hFac & 2-D mask (instead of 3-D mask + hFac in previous mon_stats_rl.F).
8299 - change del2 calculation.
8300 - use interior masks (instead of maskH, <- to be remove).
8301 - shorter monitor suffix for forcing stats ("forcing" instead of "extforcing").
8302 o mask & obcs:
8303 - define 2-D "interior" masks (i.e., zero beyond OB) at 3 locations (C, W & S).
6a7fcc88c2 Jean*8304 - move global area computation from ini_masks_etc.F to ini_linear_phisurf.F
262f5d9bf0 Jean*8305 (called after packages_init_fixed)
3a86c9b47d Oliv*8306 o pkg/obcs:
8307 - move bi,bj loops into obcs_calc, so obcs_prescribe_read is called only once.
8308 Fixes bug in obcs+exf with nSx*nSy.GT.1
8309 - fix multi-tile handling in obcs balance code
c93c5f4bd8 Jean*8310 o nonHydrostatic:
8311 - Implement AB-3 for non-hydrostatic vertical momentum ;
8312 (change ordering of var. stored in pickup file when using NH)
8313 - move NH code from solve_for_pressure.F to 2 new S/R: PRE_CG3D & POST_CG3D.
8314 - add 2-D field to store Hydrostatic Surface Pressure adjusment from cg3d_x
8315 (in prep. for new NH free surface form).
4d27a257dc Jean*8316 o pkg/obcs:
8317 add files & OB-variables for wVel (Non-Hydrostatic) with useOBCSprescribe
6a7fcc88c2 Jean*8318 o model/src:
4d27a257dc Jean*8319 fix 2-D solver initialisation for deep-atmosphere (p-coord) with topography
8320
0e6056cd20 Jean*8321 checkpoint61z (2009/12/01)
4848a3791a Jean*8322 o nonHydrostatic:
8323 Fix missing vertical flux of vert. momentum near surface (k=1). This fixes
8324 a spurious source of energy in simple baroclinic adjusment test case.
8325 Update all non-hydrostatic exp output.
8326 o model/src (3-d solver):
8327 Change again 3-D solver free-surface RHS term when exactConserv=T:
8328 simpler, consistent with exactConserv, and works with implicDiv2Dflow < 1
8329 (which was not the case with previous formulation).
8330 To recover previous version, just reset "oldFreeSurfTerm" to previous value.
8331 Affects results of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW.
8332 o nonHydrostatic:
8333 - compatible with implicDiv2Dflow < 1 ; + implement implicit factor
8334 for Non-Hydrostatic pressure gradient (similar to implicSurfPress).
8335 - change 3-D solver to work with r* (for now, only with linear free-surf.)
8336 - add few debug diagnostics (cg3d_x, residual)
85d256894a Jean*8337 o model/src:
8338 fix missing EmPmR in 3-D solver RHS (was in cg2d_b but missing in cg3d_b).
8339 update output of exp. global_ocean.cs32x15.viscA4
f470880b96 Jean*8340 o update output of exp. global_ocean.cs32x15.icedyn after removing
8341 #define SEAICE_OLD_AND_BAD_DISCRETIZATION from SEAICE_OPTIONS.h
8342 o add entry points for Gianmaria's Nesting pkgs (from Contrib/nesting_sannino)
a435e833b1 Mart*8343 o mnc: add horizontal grid coordinates (XC,YC) and (XG,YG) to netcdf output
2a44bd20e3 Mart*8344 for complex grids, for now only to "state", "adstate", "adexf", "adseaice"
043540edbe Mart*8345 o model: add Christopher Wolfe's implemetation of the single reduction cg2d
f470880b96 Jean*8346 (d'Azevedo, Eijkhout, and Romine, 1999) with CPP-flag ALLOW_SRCG and
a435e833b1 Mart*8347 runtime flag useSRCGSolver. Modify verification experiment global_with_exf
f470880b96 Jean*8348 to test this code
eb4cdc75fa Jean*8349 o pkg/cd_code:
8350 Change defaut D-grid time-stepping to get the same for D-grid momentum as for
8351 C-grid momentum. D-grid velocity used to be stepped forward in time with
8352 Adams-Bashforth only on surface pressure term. Tests show that using AB on
8353 D-grid coriolis term improves stability (as expected from CD-scheme paper).
8354 To reproduce old results, add 2 options (in CD_CODE_OPTIONS.h).
8355 Update results of exp: global_with_exf (x2), ideal_2D_oce, isomip (x2),
8356 lab_sea (3 Fwd +3 AD), natl_box (x2), tutorial_global_oce_biogeo (Fwd+AD),
8357 tutorial_global_oce_latlon, tutorial_global_oce_optim & tutorial_tracer_adjsens.
8358 Keep old results by adding CD_CODE_OPTIONS.h in exp: cfc_example, exp2,
4d27a257dc Jean*8359 global_ocean.90x40x15(+AD), global_ocean_ebm(+AD) and OpenAD.
4a2ef1ee39 Jean*8360 o pkg/obcs:
eb4cdc75fa Jean*8361 - fix bug in initialisation (broken since Oct 1rst modification)
4a2ef1ee39 Jean*8362 for useOBCSprescribe without useEXF.
8363
0e6056cd20 Jean*8364 checkpoint61y (2009/11/15)
10b70e5d9c Mart*8365 o pkg/seaice
8366 - change (once again) the discretization for the evp solver: rather than
8367 squaring the averages of strain rates, average the squares to give
8368 a better approximation to VP behavior (in simple test); this breaks
8369 verification experiments that use EVP (lab_sea and lab_sea.hb87)
8370 --> update outputs
dde99557d4 Jean*8371 o add CPP-flag (in mom_calc_visc.F) and TAF directive (in gmredi_slope_limit)
b2a741ef12 Mart*8372 to improve vectorization of adjoint code on TARGET_NEC_SX
29d62326d0 Davi*8373 o verification/vermix:
a435e833b1 Mart*8374 - change vermix to a more "classical" 1d column with high vertical
8375 resolution, seasonal heat flux forcing and constant wind forcing
10b70e5d9c Mart*8376 --> update outputs
6636ec7a94 Mart*8377 o pkg/seaice
8378 - fix diagnostics of principal stress components for EVP
8379 - add optional diagnostics of non-linear convergence for LSOR solver
8eb548676f Mart*8380 - make maximum zeta a runtime parameter
d7bdbe3409 Jean*8381 o model/src (3-d solver):
8382 Undo modif from Dec 12, 2005 (solve_for_pressure.F cvs version v.49),
8383 which consisted in removing the Surf. Non-Hydrostatic pressure from the
8384 whole column and adding it to Eta (inspired from Casualli, 1999):
8385 Only affects 3-D solver initial guess and only if using ExactConserv,
8386 but tests did show a degradation of solver convergence. For this reason,
8387 decide to disable this piece of code.
8388 to recover previous version, just set zeroPsNH = exactConserv (line 78).
8389 Update output of exp. global_ocean.cs32x15.viscA4 & hs94.cs-32x32x5.impIGW
a435e833b1 Mart*8390 o pkg/ggl90:
8f048929ff Jean*8391 - fix previous modif (unfortunatly has not been documented here).
ef30cce719 Mart*8392 o pkg/seaice/autodiff:
e69eb16cf6 Mart*8393 - add CPP flag to include clipping of zeta in EVP code;
8394 although clipping of zeta is not necessary for EVP and not recommended
8395 it was done by default, now clipping is disabled by default
d68173436e Mart*8396 - modify computation and store zetaC/Z in seaice_evp for TAF
043891c656 Mart*8397 - add CPP-flag SEAICE_ALLOW_CLIPVELS (undefined by default)
6636ec7a94 Mart*8398 - change seaice_calc_viscosities/strainrates for better
043891c656 Mart*8399 vectorization after AD by TAF
9fb8a4afa4 Jean*8400 - rearrange common blocks in SEAICE.h once again for easier dumps of
ef30cce719 Mart*8401 adjoint output, adjust adcommon.h and g_common.h
8402 - change flux form of default advection scheme for better vectorization
8403 of adjoint code
a435e833b1 Mart*8404 - modify lab_sea/input.lsr to test the flux form of default advection
ef30cce719 Mart*8405 scheme
8c04a08a06 Mart*8406 o autodiff: fix seaice fields in g_common.h (left over from 3 to 1 level
8407 transition in checkpoint61r)
8408
0e6056cd20 Jean*8409 checkpoint61x (2009/10/19)
3ccf557bdf Patr*8410 o adjoint: adding two new verification experiments
a435e833b1 Mart*8411 * tutorial_global_biogeo: an online dic sensitivity experiment
3ccf557bdf Patr*8412 (work with G. Forget)
8413 * tutorial_dic_adjoffline: an offline dic sensitivity experiment
8414 (an update of the Dutkiewicz et al., 2006 paper)
8415 Both use the same CO2FLUX cost function, but different controls
8416 Gradient checks look good, but some recomp. could still be traightened out
8417 Should add xx_dic control variable to test at some point
51b66c683d Jean*8418 o model/src:
8419 add run-time parameters to check and/or mask initial Temp & Salt
7744ec9132 Jean*8420 o pkg/ptracers:
8421 apply zonal filter (if used) to all passive tracers
8422
0e6056cd20 Jean*8423 checkpoint61w (2009/10/12)
d5930766d9 Patr*8424 o adjoint:
8425 * update and finish work on adjoint of dic package (G. Forget)
8426 * start adjoint of offline package
8427 * bug fix for cube-sphere TLM code (active_file_g.F)
5ff9d8d8a4 Jean*8428 o tutorial_global_oce_optim:
8429 now tested with 4 tiles (change data.grdchk and update output_adm.txt)
7784d9f62a Jean*8430 and add SIZE.h_mpi for MPI testing
442ec6ef47 Mart*8431 o pkg autodiff
8432 - fix bug in autodiff_restore
a435e833b1 Mart*8433 - make genmake2 remove comments and empty lines from ad_input_code.f in
442ec6ef47 Mart*8434 order to reduce file size (new script file remove_comments_sed)
54e442a4cf Jean*8435 o allows to specify vertical profile of vertical viscosity (viscArNr)
38d9d89a2d Mart*8436 o pkg autodiff
a435e833b1 Mart*8437 autodiff_ini_model_io: comment out writing of grid information to netcdf
8438 files, because at this time the grid fields are a bunch of zeros
8439 (this is analogous to ini_mnc_vars.F)
74b7cbac64 Mart*8440 o pkg seaice/autodiff:
a435e833b1 Mart*8441 left-over from removing the 3-time-level fields:
74b7cbac64 Mart*8442 - small rearrangement of common blocks (SEAICE.h)
a435e833b1 Mart*8443 - fix field declaration in order to get meaningful output in
8444 adseaice.*.nc (adcommon.h)
7532a9f33f Jean*8445 o pkg obcs:
8446 - go through NH code only if nonHydrostatic=T
8447 - fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart)
7784d9f62a Jean*8448 - move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields
53056a14f9 Jean*8449 => Update output of experiment seaice_obcs
8450 - useOBCSbalance: code is wrong with multi-tile / proc: add a stop.
8546425e3d Jean*8451 - fix NH+Orlanski restart (add wvel OBC value in pickup file)
6463eff00c Jean*8452 - fix restart for useOBCSprescribe + useEXF
793e0bf23c Mart*8453 o pkg ctrl
8454 - make obcs as control parameter work also with useSingleCPUio
8455 - replace a few sny and snx by Ny and Nx to be consistent with
8456 ctrl_set_globfld_x/yz.F
cffcf702d2 Mart*8457 o pkg seaice
a435e833b1 Mart*8458 - re-introduce global field frWtrAtm for the case of
cffcf702d2 Mart*8459 ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F)
8460 - catch the case of an empty filename in seaice_cost_init_fixed.F
8461 o pkg ecco:
8462 - small bug fixes in the_main_loop
8463 . fix order of monitor arguments
8464 . change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY
8465 . move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so
8466 that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF
a435e833b1 Mart*8467 - replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the
8468 imbalance diagnostics for wmean_h/sflux = 0
cffcf702d2 Mart*8469 - add actual values to f_obcsn/s/w/e in ecco_cost_final.F
a435e833b1 Mart*8470 - catch the case of empty filenames in ecco_cost_init_fixed.F
cffcf702d2 Mart*8471 and ecco_readparms.F
8472 - fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta)
793e0bf23c Mart*8473 to make this statement meaningfull in ecco_cost_weights.F
339ad6c3b5 Jean*8474 o pkg zonal_filt:
8475 - change ZONAL_FILTER S/R interface (allows to filter 2-D fields)
8476 - when using rStar, filter uVel*hFacW instead of uVel
8477 (tested without topography: fix a Pb of growing instability with NLFS)
9fba1b3510 Davi*8478 o pkg/aim/thsice:
8479 -Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F
8480 (works as SST restoring)
55b32f1302 Davi*8481 o pkg/thsice:
8482 -add specific parameter for salt restoring in slab mixed-layer
8483 (by default equal to the temperature restoring)
8484
0e6056cd20 Jean*8485 checkpoint61v (2009/09/21)
e5d361f9aa Mart*8486 o pkg/kpp:
a435e833b1 Mart*8487 -add double diffusive contributions as a hack, turned off by default
8488 for now, and the code can be excluded with a CPP-flag
e5d361f9aa Mart*8489 EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX
8490 -add a verification experiments to "vermix" to test this code
f81982db08 Davi*8491 o pkg/mom_common:
8492 Move computation of length scales to mom_init_fixed.F (avoid recomputation
8493 at each time-steps*levels).
0dd6d0e826 Ryan*8494 o pkg/layers:
8495 Created a new package for computing volume fluxes in temperature or
8496 [not yet implemented] density layers, e.g. for calculating residual
a435e833b1 Mart*8497 overturning circulations.
8498 o pkg/diagnostics:
f4e6557763 Jean*8499 implement a RS type version for the set of DIAGNOSTICS-FILL subroutines
8500 o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option)
f88b29d124 Jean*8501 o pkg/mdsio (& pkg/rw): rework high level S/R interface:
8502 To avoid mixing type (RS/RL) of input/output array argument,
8503 replace single mixed-type array with a pair from each type (RS/RL).
03e0cc6d31 Jean*8504 o setting pickupSuff force to start from a pickup (even if nIter0=0): this
a435e833b1 Mart*8505 is now implemented for all pkgs (previously only done for the main pickup)
03e0cc6d31 Jean*8506
0e6056cd20 Jean*8507 checkpoint61u (2009/08/25)
7b5bc55348 Mart*8508 o pkg/obcs:
23ff66f209 Mart*8509 - change OB?eta from _RS to _RL and put them into a separate commen block
8510 - add code to read OB?eta from a file via obcs_prescribe_read: the code
8511 compiles and does not destroy any other experiments, the data is read
8512 properly, but the code is not tested in actual applications
a435e833b1 Mart*8513 o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to
8514 create a meaningful unit attribute for the time coordinate variable
b6045d9739 Jean*8515 o pkg/ebm: add plenty of missing "_d 0" ;
a435e833b1 Mart*8516 update results of experiment global_ocean_ebm (fwd + adjoint tests)
b6045d9739 Jean*8517 Notes: several pieces of code only works for (very) specific set up
a435e833b1 Mart*8518 (domain size, lat range, etc ...); should be documented & stop if one
b6045d9739 Jean*8519 of those assumptions is not meet.
6b1574ad60 Jean*8520 o pkg/seaice: add missing "_d 0" in HSNOW initialisation
a435e833b1 Mart*8521 update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests)
6b1574ad60 Jean*8522 and offline_exf_seaice (seaicetd + adjoint).
70d7fbc59b Jean*8523 o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC):
a435e833b1 Mart*8524 update results of experiments: lab_sea (4 fwd tests + 3 adjoint),
70d7fbc59b Jean*8525 seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2).
a435e833b1 Mart*8526 o few changes to pass when compiling with strick checking of arguments
70d7fbc59b Jean*8527 across S/R (allow to find few bugs in S/R calls).
d5724f98ed Mart*8528 o pkg/seaice:
a435e833b1 Mart*8529 - seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new
d5724f98ed Mart*8530 2d-fields, for slightly better performance
70d7fbc59b Jean*8531
0e6056cd20 Jean*8532 checkpoint61t (2009/07/22)
a435e833b1 Mart*8533 o pkg/seaice:
f503466573 Mart*8534 - remove unused variables in seaice_evp
8535 - reduce number of SQRT in seaice_evp and seaice_calc_viscosities
570ee1ae01 Jean*8536 o eeset_parms.F, open_copy_data_file.F & ini_parms.F:
8537 named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT):
5a08ea66a4 Jean*8538 each processor opens a different file (a fix from Matt).
78e9a5d276 Jean*8539 o cg2d:
8540 use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F :
8541 this reduces number of EXCH calls by 2 when using exch2.
a435e833b1 Mart*8542 For now, keep previous size array for gc2d_nsa.F to avoid Pb with store
78e9a5d276 Jean*8543 directives and missing simple EXCH (exch_s3d_rx) adjoint code.
a435e833b1 Mart*8544 o pkg/thsice:
78e9a5d276 Jean*8545 add code for Near Infra-Red albedo (from Jeff)
f3e78cec2b Jean*8546 (turned on with run-time flag: thSIce_calc_albNIR, in data.ice).
78e9a5d276 Jean*8547 o ini_model_io:
8548 move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F
8549 MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F
8550 to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice.
f3e78cec2b Jean*8551
0e6056cd20 Jean*8552 checkpoint61s (2009/06/30)
2afd155f68 Jean*8553 o pkg/exch2 (exch2_rxN_cube*):
8554 remove last BARRIER (no need to synchronise after getting data from shared
8555 buffer (get) as long as any change to buffer (put,recv) is between BARRIER)
78c0da63a8 Jean*8556 o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH
8557 and generate new output (for the 2 tests) using default rotationPeriod.
e33637256c Jean*8558 o pkg/exch2:
8559 - always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F
8560 (was already the case with AUTODIFF_EXCH2 defined)
8561 - add bj in exch2 arrays and S/R.
78c0da63a8 Jean*8562 - can now use pkg/exch2 for regular (non CS) set-up; switch test experiment
8563 MLAdjust to exch2 (identical results except with MPI -> truncation diff);
e8488bfd93 Oliv*8564 o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep
8565 - adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY
8566 GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT
8567 - verification experiment natl_box.longstep
02bc4aeec0 Jean*8568 o build_options: ifort+mpi_aces optfile (following Constantinos advise):
8569 allow different versions of ifort (8 or 9) and different versions
8570 of mpi (mpich or mpich2) to be used with the same optfile.
8571 requires to load a netcdf module and set MPI_INC_DIR (see comments inside
8572 optfile). Change testing scripts (example_scripts/ACESgrid) accordingly.
a435e833b1 Mart*8573 o pkg/seaice:
8574 fix previous modif (3-level field removed) for old-pickup reading
02bc4aeec0 Jean*8575
0e6056cd20 Jean*8576 checkpoint61r (2009/06/25)
a435e833b1 Mart*8577 o pkg/seaice:
88ddcec046 Mart*8578 - clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps:
64469ab2ce Mart*8579 1. introduce fields for time step (N-1)
88ddcec046 Mart*8580 2. do not use levels 2 and 3 anymore (but keep them)
a435e833b1 Mart*8581 3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This
8582 includes changes to pkg/thsice/thsice_get_velocity.F,
88ddcec046 Mart*8583 model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and
8584 pkg/obcs/obcs_apply_uvice.F.
8585 - completely remove code for leap-frog time stepping for second order
8586 advection
2e0a6baf06 Patr*8587 - adjusted adjoint accordingly;
8588 gradient checks have improved by an order of magnitude!
a435e833b1 Mart*8589
0e6056cd20 Jean*8590 checkpoint61q (2009/06/22)
bfa01eb1b6 Mart*8591 o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver
8592 - the boundary conditions along open boundaries are unclear, because the
8593 associated masks are set to zero and are thus treated as closed when
8594 applying the slip-boundary conditions.
8595 - move initialisation of grid variables from seaice_init_varia to _fixed
14ff2fe9e4 Dimi*8596 o adding doc/diags_changes.txt
a435e833b1 Mart*8597 o model/src:
8598 do_the_model_io: rename few pkg S/R which are called from do_the_model_io,
dddd7d8ee5 Jean*8599 to avoid "_diags" naming if no relation to pkg/diagnostics.
a435e833b1 Mart*8600 ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF
dddd7d8ee5 Jean*8601 file and only call PLOT_FIELD_XYZ if debugMode=T.
8602 remove few PLOT_FIELD_XY calls outside initialisation.
8603 remove few unnecessary BARRIER.
1aca59cbdd Dimi*8604 o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling
a435e833b1 Mart*8605 of salt_plume package in Southern Ocean
8606 o pkg/thsice:
8607 - fix hOceMxL in overlap (needed for sea-ice advection);
a870da40f8 Jean*8608 update output of experiment global_ocean.cs32x15.icedyn.
a435e833b1 Mart*8609 o pkg/seaice:
2fe56e7563 Mart*8610 - make the (placeholder-)tracer IceAge a little more meaningful
0ccf00deac Mart*8611 by avoiding ridging of age due to convergent ice flow
14ff2fe9e4 Dimi*8612 - add diagnostics for surface temperature, atmospheric and oceanic
8613 heat flux, and atmospheric and oceanic ice growth
0ccf00deac Mart*8614
0e6056cd20 Jean*8615 checkpoint61p (2009/06/10)
7b728547f6 Jean*8616 o eesupp (global_max & global_sum):
8617 - add one more element to buffer (start at index 0) for GL_MAX/SUM output;
8618 - remove starting & endding barrier (no longer needed)
4877fb20d9 Jean*8619 o pkg/mdsio, writelocal:
8620 works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined
8621 (remove the STOP): uses shared buffer IO to store data from all threads
8622 and then let master-thread write nThreads tiles.
1f0f779d4b Jean*8623 o pkg/mdsio (read/write field):
8624 - tiled IO done in 1 piece (all levels at a time);
4877fb20d9 Jean*8625 - new header file "MDSIO_BUFF_3D.h" with 3-D buffers.
1f0f779d4b Jean*8626 - multi-threaded: allow to read/write local (non-shared) array
8627 (was already working with singleCpuIO ; now works also without);
8628 => no longer needs barrier call after reading a file (added inside
4877fb20d9 Jean*8629 mds_read/write field).
1f0f779d4b Jean*8630 - move barrier calls outside gather/scatter_2d to mds_read/write_field
b54505b067 Mart*8631 o pkg/obcs/exf
a435e833b1 Mart*8632 - exf_getffieldrec.F: add a few ". _d 0" and
8633 add code to catch the case fldperiod = 0.
8634 - obcs_precribe_read.F: change if statements so that they match
b54505b067 Mart*8635 the variable type (_RL)
a435e833b1 Mart*8636 - add a separate exf_iprec_obcs to exf_set_obcs (by default equal to
b54505b067 Mart*8637 exf_iprec) as part of namelist EXF_NML_01
70cbc60ad4 Jean*8638 o pkg/mdsio:
8639 - read/write tiled (local) files: read/write 1-level tile chunk at a time
8640 (instead of segment of length sNx); expected to speed up tiled IO.
8641 o pkg/exch2:
c53c960d6f Jean*8642 - take buffer copy from/to array out of S/R exch2_send/recv into new
8643 S/R exch2_put/get ; Exch of local variable now works with MPI+MTH
8644 (tested by removing commom block statement in SOLVE_FOR_PRESSURE.h).
8645 - ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get)
70cbc60ad4 Jean*8646 - simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds
c53c960d6f Jean*8647 (which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by
8648 including Topology header file (and common blocks).
8649 - implement EXCH_IGNORE_CORNERS in scalar exchange (rx1);
8650 remove 2nd exch call in exch2_s3d_rx (no longer needed).
8651 - document S/R arg. list (+ update some comments)
1ce2a5cdfd Dimi*8652 o pkg/seaice:
8653 - added SEAICE_CLIM_AIR code, which permits modulation of surface air
8654 temperature and humidity over sea ice based on climatological values.
3827b3ff39 Mart*8655 - clean up computation of Hibler+Bryan (1987) stress coupling for the case
a435e833b1 Mart*8656 of LSR (this change is expected to change the results slightly because now
3827b3ff39 Mart*8657 it uses slightly difference moduli from the second last LSR solution, but
a435e833b1 Mart*8658 that is more consistent with the stress computations; this part of the code
3827b3ff39 Mart*8659 is not tested in the verification experiments)
7beac62984 Mart*8660 - fix diagnostics for flux of ice in case of B-grid
a435e833b1 Mart*8661 - turn strain rates eij and press into global fields within global
7beac62984 Mart*8662 common block in SEAICE.h for more straighforward diagnostics
8663 - fix diagnostics for principal stress components, press, zeta, eta
8664 to give something meaning full
607aea417f Jean*8665 o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate
8666 new output (all 4 tests) using default rotationPeriod.
37512d714c Davi*8667 o pkg KPP:
8668 - add flag (LimitHblStable) to avoid limiting BL depth under stable conditions
8669 - fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1
8670 and normal grid from 1 to Nr)
6a8a92ceb1 Davi*8671 o Fix computations of L4rdt in mom_calc_visc.F
4444d50a00 Jean*8672 o eesupp:
8673 new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg):
8674 should be called before a "stop" if we know that all process are going
8675 to stop; if one Proc does call this S/R, will hang in MPI_FINALISE.
8676
0e6056cd20 Jean*8677 checkpoint61o (2009/05/26)
52b3903673 Jean*8678 o pkg/exch2: change check_depths to issue just a warning (instead of error+stop)
8679 o model/src/ini_curvilinear_grid.F:
680765c772 Mart*8680 compute angleSin/CosC when they are not read from a file
52b3903673 Jean*8681 o pkg/seaice:
680765c772 Mart*8682 add pseudo time stepping for LSOR
cfdf8f6dc3 Jean*8683 o pkg/exch2:
8684 temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW
f834b21bef Dimi*8685 o pkg/seaice:
f81e0cd482 Dimi*8686 Adding separate sea ice albedo, drag coefficients, and HO in Southern
8687 Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h
39f815874d Jean*8688 o SingleCpuIO:
8689 fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used.
8690 o pkg/seaice:
affccff0e4 Jean*8691 put exchanged variable in (local) common block for MPI+Multi-Threads
8692 to work (necessary with exch1, and for now with exch2 too).
8d614a5ef7 Jean*8693 o verification: to get more experiments tested with mpi, mth and mpi+mth,
8694 change tiling of:
8695 aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15,
8696 hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope
8697 update output of exp:
8698 exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5),
8699 tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod)
8700 + ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU
8701 (note: output.txt generated on faulks using only 1 tile)
505fa6b5f0 Jean*8702 o eesupp & mdsio (SingleCpuIO):
8703 - remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time
8704 parameter "W2_useE2ioLayOut" (read from file "data.exch2").
8705 Note: was not effective for globalFile & useSingleCpuIO=F; now fixed.
8706 - move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc).
8707 - fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same
8708 gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array).
8dd64871a3 Jean*8709 o pkg/exch2:
8710 - new code to set-up W2-Exch2 topology (replace matlab-topology-generator):
8711 read parameter file "data.exch2" if it exists; otherwise try default regular
8712 cube without blank-tile; new header file "W2_EXCH2_SIZE.h";
8713 - update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible
8714 with new code (not to be used, just as a backup solution).
a435e833b1 Mart*8715 - add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2"
505fa6b5f0 Jean*8716 in utils/exch2/input.
8dd64871a3 Jean*8717
0e6056cd20 Jean*8718 checkpoint61n (2009/05/12)
6805d023a2 Jean*8719 o eesupp & mdsio (SingleCpuIO):
8720 - move mapping to global io-buffer inside gather_2d/scater_2d: this save
8721 memory (1 less 2D global RL array); skip 1 buffer copy; and only send/
8722 receive real*4 array (instead of real*8) to read/write 32.bit files.
8723 (new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S
8724 and remove new mapping S/R)
b983b0a9f3 Jean*8725 o pkg/mdsio: in preparation for topology-generator within pkg/exch2:
8726 - Change declaration of SingleCpuIO buffer, reduced to only 1 dim.:
8727 xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h
8728 when using exch2. Add S/R to map global io-buffer to global model array.
8729 - uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt.
8730
0e6056cd20 Jean*8731 checkpoint61m (2009/04/29)
b983b0a9f3 Jean*8732 o write_utils : change WRITE_1D_R8 to WRITE_1D_RL
8733 and add 3 other S/R for other types (R4,R8,RS).
5ae9fbe2f9 Jean*8734 Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument.
8735 o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros):
8736 - ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ;
8737 - reduce number of macro definitions (keep only those which are used);
8738 can always call directly the corrresponding S/R if needed.
b983b0a9f3 Jean*8739 - everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix
5ae9fbe2f9 Jean*8740 _R4/_R8 to _RS/_RL when applied to _RS/_RL variable.
8741 Fixed wrong type of arg in:
b983b0a9f3 Jean*8742 atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F
5ae9fbe2f9 Jean*8743 ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F
8744 To fix: global_sum of var in common block is wrong (multi-threaded) in:
8745 dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F
8746 To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops)
b983b0a9f3 Jean*8747 o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd
8748 "nlfs" mpi test is going to stop when checking for unconnected tile egdes.
52af3a32f7 Jean*8749 o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error
8750 o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile
8751 edges are closed (zero depth); might happen with "blank tiles";
b983b0a9f3 Jean*8752 for now, disabled if using OBCS.
52af3a32f7 Jean*8753 o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi":
855948c4e0 Jean*8754 link *_mpi files from "MODS" dir) to return to a strait-forward behavior.
52af3a32f7 Jean*8755 o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D)
6e7414edd7 Jean*8756 to reduce length of 1.D array print in STDOUT.
71c716cb9b Jean*8757 o adjustment.cs-32x32x1: changed to oceanic test with 1 continent
8758 + use 48 tiles (16x8): this will allow to test "blank tiles".
8759 o start to test MPI + multi-threaded (change testreport to skip tests
8760 where number of tiles do not match).
8761 o genmake2: add option "-omp" to turn on Open-MP ;
8762 passed to testreport (if using -mth) ; merge few (*+mth) optfiles.
0ab0cf443f Jean*8763 o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them)
8764 and keep the original tile numbering. Note: compatible with old
8765 W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files.
8766
0e6056cd20 Jean*8767 checkpoint61l (2009/04/07)
5a8046a779 Jean*8768 o Overlaps had been forgotten in calculating ijk keys : fixed
8769 o fix cyrus makedepend for gcc 4.4
54b0077775 Jean*8770 o experiment fizhi-cs-aqualev20:
8771 switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE)
71c716cb9b Jean*8772 and generate new output. Note: new output is much closer to the old
8773 one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from
54b0077775 Jean*8774 the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007.
8775 o pkg/fizhi:
8776 - change to avoid indices going deliberately over array-bounds
8777 - remove unnecessary MPI stuff
8778 - perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY"
8779 - new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE:
8780 does not go over array-bounds and therefore returns reliable output.
8781 - in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls:
8782 this S/R has 4 output arguments, which are used inside "get_alarm";
8783 when it is called with the same variable "ndum" in place of several
8784 output arguments, this produces weird side effect inside "get_alarm"
8785 (e.g., datein=dates(n) is overwritten by timein=times(n) since both
8786 datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum"
8787 address) and produces error.
855948c4e0 Jean*8788 o tools/gemake2: (March 27-29 2009)
a435e833b1 Mart*8789 with option "-mpi": link *_mpi files from "MODS" dir (this is what
855948c4e0 Jean*8790 testreport does).
405ae5a3ac Jean*8791 o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output
54b0077775 Jean*8792 o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F:
405ae5a3ac Jean*8793 update lab_sea.lsr & lab_sea.salt_plume results
a435e833b1 Mart*8794 o pkg/seaice:
90652fd079 Mart*8795 Major overhaul of the LSOR solver: change discretization from original
8796 finite differences to finite volume. The old routine is still in the
8797 file seaice_lsr.F and can be turned on with the CPP-flag
8798 SEAICE_OLD_AND_BAD_DISCRETIZATION
8799 Along with this change, the discretization of the strain rates is changed.
8800 The same flag turns on the old discretization in seaice_calc_strainrates.F
a435e833b1 Mart*8801 All verification experiments with seaice are affected (except for
90652fd079 Mart*8802 seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old
8803 results by setting the above flag.
8804 Further changes involve changes in defaults:
8805 - ALLOW_FLOODING is defined and turned on by default
f6450d3114 Patr*8806 - SEAICEadvSnow = .true. is now the default
8807 - SEAICEadvSalt = .true. is now the default
8808 - SEAICEadvAge = .true. is now the default
a435e833b1 Mart*8809 - SEAICE_clipVelocities = .false. is now the default
5d15d4162f Mart*8810 (as per J. Zhang's recommendation)
90652fd079 Mart*8811 - B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE
8812 is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS
8813 - seaice_growth: replace computation of UG by a simple copy from wspeed
8814
0e6056cd20 Jean*8815 checkpoint61k (2009/03/18)
4acbf6fef8 Mart*8816 o pkg/seaice: a few bug fixes mostly concerning the metric terms:
8817 seaice_lsr: fixed a few metric terms,
8818 affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs
8819 add more debugging diagnostics
8820 seaice_evp: removed superfluous many metric terms of FV discretization
8821 of stress divergence
8822 affects lab_sea, lab_sea.hb87
8823 seaice_ocean_stress: removed superfluous many metric terms of FV discretization
a435e833b1 Mart*8824 of stress divergence for non-evp solver
4acbf6fef8 Mart*8825 (this part is not tested anywhere)
8826 seaice_calc_strainrates: fixed a bug in no-slip boundary conditions,
8827 they were effectively only half slip
8828 affects lab_sea.hb87
71a18d0f38 Jean*8829 updated all relevant verification experiments (except lab_sea//output_adm.txt
8830 which was left over, but fails at level 7 & 6)
4acbf6fef8 Mart*8831
0e6056cd20 Jean*8832 checkpoint61j (2009/03/17)
78416b4f31 Mart*8833 o pkg/seaice: turn a few hard wired parameters into run time parameters
a435e833b1 Mart*8834 o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model
3393e77079 Mart*8835 time in seconds as promised by the usints in seaice_monitor and exf_monitor
a32626876a Mart*8836 o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids
8837 that are not cubed-sphere grids
f577077207 Mart*8838 o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR
2db8cfe50f Jean*8839 o pkg/ctrl:
8840 fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low)
0ad8ad6f0c Jean*8841 o non-hydrostatic (calc_gw.F):
8842 fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec
8843 update output of exp. global_ocean.cs32x15.viscA4
8844 o remove backward compatibility for thetaMin,phiMin
ece53aa93e Jean*8845 (replaced by xgOrigin,ygOrigin on Jan 27, 2009)
a435e833b1 Mart*8846 o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the
8847 interpolated wind field not only for curvilineargrid=.true., but also
514437540a Mart*8848 for a rotated grid (rotateGrid=.true.)
58378fc26e Mart*8849 o pkg/exf: add capability to bypass interpolation for runoff
8850 by setting yet another CPP-flag
ece53aa93e Jean*8851 o eesupp/src, B-grid exchange:
8852 add simple (6 tiles, non MPI) CS exch + standard interface S/R.
bb9388b6fb Patr*8853 o autodiff
8854 new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV
8855 allows to switch to single-prec common blocks;
8856 corresponding switch occurs in tamc.h, integer isbyte
8857 TAF store directivs "byte" and "kind" seem equivalent;
8858 Most tamc.h have been updated correspondingly.
8859
0e6056cd20 Jean*8860 checkpoint61i (2009/02/13)
05fc4302e4 Patr*8861 o autodiff:
8862 fix autodiff_sore/_restore indices for obcs
8863 (spotted by I. Hoteit, M. Mazloff)
685514cedc Patr*8864 o pkg/autodiff, pkg/ctrl:
a435e833b1 Mart*8865 Add flag to reduce all tapelev I/O to single-prec.
685514cedc Patr*8866 In data.ctrl set
8867 doSinglePrecTapelev = .TRUE.
ece53aa93e Jean*8868 o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2:
8869 check in hack for SX8 compiler (for dxV, dyU); remove it afterwards.
a435e833b1 Mart*8870 o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for
6870c5ed6c Mart*8871 real fresh water flux (not yet)
a94d876c45 Jean*8872 o pkg/mdsio & rw:
8873 - add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta)
8874 - add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX.
6be08e3e5c Jean*8875 o pkg/flt:
8876 - replace FLT_INIT by 3-steps standard initialization S/R: readparms,
8877 init_fixed & ini_varia.
71a5d709a0 Jean*8878 - clean-up & simplify linear interpolation S/R:
8879 move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid.
8880 - fix some indices (mainly vertical index) ; add IMPLICIT NONE.
a94d876c45 Jean*8881 - more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R.
b57550bbcf Jean*8882 - add vert. coordinate & horiz. indices to output files.
8883 - change vertical position in initial condition, from index to depth [m].
1cae6a1a9f Jean*8884 - store horizontal (decimal) indices i,j in common block (instead of coord. x,y)
8885 (easier to get to a curvilinear grid) ; delX,delY no longer used.
97caae06d7 Davi*8886 o pkg/ggl90: a few modifications:
8887 - fix bottom boundary condition, and interpolation of KappaE
8888 near top and bottom
a435e833b1 Mart*8889 - use same set of viscosity/diffusivity for TKE/momnetum/tracer
97caae06d7 Davi*8890 - add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH)
a435e833b1 Mart*8891 - add a few options for mixing-length upper limit (--> mxlMaxFlag)
d236014eb6 Jean*8892 o rename thetaMin,phiMin -> xgOrigin,ygOrigin
8893 (maintain temporary backward compatibility, until next checkpoint)
8894
0e6056cd20 Jean*8895 checkpoint61h (2009/01/27)
021d69ec69 Jean*8896 o pkg/diagnostics with "periodic averaging diagnostics":
a435e833b1 Mart*8897 fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output.
794d630b5b Jean*8898 o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82
de15b00af7 Mart*8899 o pkg/obcs: fix loop ranges for balancing code
de52daaeea Jean*8900 o pkg/flt:
8901 - improve criteria for finding which tile owns a float.
8902 - fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case.
d7a6322cee Davi*8903 o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg
8904 aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling
8905 with ocean biogeo)
5de0afb7f6 Jean*8906 o pkg/flt:
8907 - do some cleaning and fix the restart ;
8908 - add output.txt in flt_example/results to get this pkg tested.
8909 o genmake2: add an EXTENDED_SRC option and flag.
8910 for now, cannot be turned on on command line (only through genmake_local)
b5cd61a537 Jean*8911 o pkg/mdsio: read/write vector:
8912 - singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS
5de0afb7f6 Jean*8913 - singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR
b5cd61a537 Jean*8914 & MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS.
8915 - affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO)
8916 (drop to 4 digits matching for grad). But this test does not look very
8917 reliable (was already failling on eddy, fc5, at 6.digits). Update output.
8918
0e6056cd20 Jean*8919 checkpoint61g (2008/12/29)
ca04df591d Jean*8920 o pkg/flt:
8921 - move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name)
8922 + make OPTIONS file more standard.
8923 - rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name)
8924 - fix _BYTESWAPIO CPP-Flag
8925 - standard reading of file-parameter "data.flt"
b95b67d7aa Jean*8926 - fix argument list of S/R FLT_RESTART
ca04df591d Jean*8927 still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F
d67bffc17c Mart*8928 o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell
46b3c62480 Mart*8929 o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to
8930 a still unfixed compiler/optimization bug
8931
0e6056cd20 Jean*8932 checkpoint61f (2008/11/21)
a435e833b1 Mart*8933 o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ;
45b6388240 Jean*8934 update results of global_ocean.cs32x15.icedyn test.
aa713d5dbf Jean*8935 o move getcon.F from model/src to pkg/fizhi.
a435e833b1 Mart*8936 o pkg/exf: add parameter for extrapolation of temp up to the surface
df444da92e Jean*8937 and option to prevent negative evap (in bulk_largeyeager04 only).
a78ca545b5 Jean*8938 o Prather Advection scheme: fix tracer conservation for divergent flow
8939 (e.g., when using NonLin Free-Surface).
e18a7f3164 Davi*8940 o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead
db624d91db Jean*8941 o gmredi (Visbeck-variable-K):
8942 - add more parameters to Visbeck-variable-K.
8943 - use a 5 points average for dSigmaR in Visbeck-K calculation
8944 (more "homogenous": same stencil and same weights as in dSigmaH)
8945 - update output of ideal_2D_oce experiment.
a435e833b1 Mart*8946 o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4
8d0c7e204b Mart*8947 (#undef REAL4_IS_SLOW)
a435e833b1 Mart*8948 - pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4
8d0c7e204b Mart*8949 coordinate variable
a435e833b1 Mart*8950 - pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables
8d0c7e204b Mart*8951 (surface forcing fields), removes some of the functionality
a435e833b1 Mart*8952 - model/src/write_grid.F: write _RS variables as RS-netcdf variables
8953 - model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but
8954 probably not all: copy _RS surface flux fields to RL field before
8d0c7e204b Mart*8955 calling DIAGNOSTICS_FILL
a435e833b1 Mart*8956 - model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into
c983541b6d Mart*8957 real*4 (CALL EXCH_*_RS) versions.
04c02cca57 Jean*8958 - tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1
8959 (generate new output).
8d0c7e204b Mart*8960
0e6056cd20 Jean*8961 checkpoint61e (2008/10/23)
c01397a2cf Jean*8962 o gmredi (Visbeck-variable-K):
8963 - fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h
a435e833b1 Mart*8964 - change computation of Visbeck-K where Slope > Smax :
c01397a2cf Jean*8965 now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct)
8966 previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output.
bd21fff799 Jean*8967 o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic
8968 to be the same as with Z-coord. (i.e., m/s & no-units respectively).
8969 o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc)
c3fe1ef4e7 Jean*8970 o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz
c01397a2cf Jean*8971 does not become too large (to avoid precision problems in implicit-diffusion
c3fe1ef4e7 Jean*8972 solver); update ideal_2D_oce output.
9b7442ecc8 Davi*8973 o pkg ggl90:
8974 - in ggl90_cal.F: compute only one set of visc/diff, used to
8975 step forward TKE/T/S/momentum
8976 - default value of GGL90viscMax/GGL90diffMax larger and equal (to
8977 have Prandlt =1)
c01397a2cf Jean*8978 o gmredi (fm07):
284c68fd43 Jean*8979 - add lower limit on Transition layer thickness + lower limit on 1/lambda
883da68718 Jean*8980 - allow to set few more params from data.gmredi
5c4169b4ba Davi*8981 o pkg ggl90:
a435e833b1 Mart*8982 - add missing sqrt(2) factor in computation of mixing length
5c4169b4ba Davi*8983 scale in ggl90_calc.F
8984 (see Eq. (2.35) in Blanke and Delecluse, JPO, 1993)
8985
0e6056cd20 Jean*8986 checkpoint61d (2008/09/25)
900e7deb27 Patr*8987 o adjoint modifs
8988 - adapt to new field rhoInSitu
8989 - allow to revert from StoreDynVars2D, StoreDynVars3D
8990 to individual fields
8991 (switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D)
9021e26bd9 Jean*8992 o store 3-D (in-situ) density in commom block (DYNVARS.h)
8993 - save 1 rho computation.
8994 - no longer modify T & S inland when using down_slope pkg.
a435e833b1 Mart*8995 o gad_som : allow to switch to SOM advection for T & S without corresponding
b3d25f406d Jean*8996 pickup files (using new S/R: MDS_CHECK4FILE).
8997 o keep removing _BEGIN/_END_MASTER between MDSIO S/R call
8998 (for useSingleCpuIO to work in multi-threaded)
30b946f21e Mart*8999 o pkg/shelfice:
9000 - disentangle parameters: retire shelfIceFile in data/PARM05 and substitute
9001 with SHELFICEtopoFile in data.shelfice
9002 - move code for reading ice shelf topography and modifying hFacC into separate
9003 subroutines of the shelfice package
9004 - separate initialisation of "fixed" and "variable" variables
9005 - kTopC is not (yet) replaced by kSurfC, although this is possible
b3d25f406d Jean*9006 o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s
1c7cf036e1 Jean*9007 o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors)
9008 and rename:
9009 ini_phiref.F --> set_ref_state.F (+ set anelastic factors)
9010 ini_reference_state.F --> load_ref_files.F (- set anelastic factors)
9011 o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst)
9012
0e6056cd20 Jean*9013 checkpoint61c (2008/08/30)
a435e833b1 Mart*9014 o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid"
9015 to add mass source/sink of fluid in the interior (3-D generalisation
f035afc50f Jean*9016 of oceanic real-fresh water flux).
9017 o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max)
aa106dc1b1 Jean*9018 o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before)
4d4605f96d Jean*9019 o new pkg: down_slope
9020 density-driven downsloping flow parameterisation (Tellus, 1999, 412-430).
9021 - presently, modify T & S inland (dwnslp_calc_rho.F).
9022 can be avoided if rho was stored in common bloc and used in calc_phi_hyd.
9023 - implementation for ocean in P-coords not tested.
9024 - add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg.
9025 o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC)
50f1c7ab80 Jean*9026 (to facilitate conversion of oceanic pkg to p-coordinate).
a435e833b1 Mart*9027 o change FIND_RHO to FIND_RHO_2D :
f257f8b0f6 Jean*9028 pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK.
9029 o new pkg: cheapaml
9030
0e6056cd20 Jean*9031 checkpoint61b (2008/08/05)
a435e833b1 Mart*9032 o exch2:
37ee8575fd Jean*9033 change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS)
9034 - no longer depend on the order sequence (N,S,E,W).
9035 - 3rd exchange no longer needed (tested with 24 tiles).
9036 - same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff)
9037 - exch_UV_A-grid readily available (but not yet tested).
a435e833b1 Mart*9038 comment out 3rd exch call and remove copy of V to U at SE & NE face-corners
9039 (both are no longer needed) in exch_uv: no effect in forward run; but
37ee8575fd Jean*9040 get truncation error differences with adjoint exch.
a435e833b1 Mart*9041 o exch2:
0e9f2e49ad Jean*9042 - change index-bounds storage (moved from target to local tile,
9043 more intuitive this way) ; rename/remove some variables.
37ee8575fd Jean*9044 - change utils/exch2/matlab-topology-generator & code_mods accordingly.
0e9f2e49ad Jean*9045
0e6056cd20 Jean*9046 checkpoint61a (2008/07/29)
a435e833b1 Mart*9047 o exch2/matlab-topology-generator:
9d45a8c11b Jean*9048 fix bug in index bounds for N-S internal exchange (hard to tell if this
9049 had any effect on the solution).
677d07a6b5 Mart*9050 o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf
9051 is exceeded
a435e833b1 Mart*9052 o testreport: modify syntax of awk, so that it works also with
0d1768695f Mart*9053 awk, and not only with nawk and gawk
9054
0e6056cd20 Jean*9055 checkpoint61 (2008/06/24)
0a92c8c20d Patr*9056 o autodiff
9057 Change default for TAF usage by removing argument '-nonew_arg'
9058 This changes TAF subroutine argument list (ordering of active var.)
9059 Omission of this flag leads to incompatibility w.r.t. TAMC
9060 To restore TAMC-compatibility, need following modifs:
9061 * use adoptfile tools/adjoint_options/adjoint_tamc_compatibility
9062 * use CPP option #define AUTODIFF_TAMC_COMPATIBILITY
9063 Tested TAF version is 1.9.22
9064 N.B.: exch2 hand-written adjoint code currently not TAMC compatible
9065
0e6056cd20 Jean*9066 checkpoint60 (2008/06/19)
f8c2a15654 Patr*9067 --->>> This is the last checkpoint for which generating the adjoint
9068 --->>> is done via the TAMC-compatibility TAF-flag "-nonewarg"
9069 --->>> by default.
9070 --->>> Future checkpoints will ommit this flag by default.
40cd24c888 Jean*9071 o pkg/generic_advdiff, os7mp: simplify and avoid division by zero.
1b63dc87ac Gael*9072 o pkg/grdchk: Add gradient check to etan0 perturbations.
a435e833b1 Mart*9073 o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK).
9074 o pkg/autodiff: more flexibility in zeroadj.
9075 model/src: modifying do_oceanic_phys.F accordingly.
fa59c87170 Gael*9076 o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation.
9077 o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option
a435e833b1 Mart*9078 special setup of gmredi for which the adjoint is stable
fa59c87170 Gael*9079 enough for parameter optimization.
e67ddf28f4 Gael*9080 o bridging the gap between eddy stress and GM.
9081 -> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi)
9082 along with a change in CPP option (now ALLOW_EDDYPSI).
a435e833b1 Mart*9083 -> when using GM w/ GM_AdvForm:
e67ddf28f4 Gael*9084 The total eddy streamfunction (Psi = eddyPsi + K x Slope)
9085 is applied either in the tracer Eq. or in momentum Eq.
9086 depending on data.gmredi (intro. GM_InMomAsStress).
9087 -> ALLOW_EDDYPSI_CONTROL for estimation purpose.
9088 The key modifications are in model/src/taueddy_external_forcing.F
9089 pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F
40cd24c888 Jean*9090
0e6056cd20 Jean*9091 checkpoint59r (2008/05/29)
0d306f558f Jean*9092 o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array
9093 from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F);
9094 fix option to read coriolis(@ cell-corner) from files with CS-grid.
aa539d5971 Mart*9095 o pkg/mnc: add some attributes to standard 1D-coordinate variables
79e37afef0 Mart*9096 o pkg/diagnostics: enforce missing_value attribute for scalar variables at
9097 mass points, when using mnc for output
a435e833b1 Mart*9098 - add runtime parameter (missing_value, missing_value_int) to override
79e37afef0 Mart*9099 default (which is the value of getcon('UNDEF'))
9100 o pkg/mnc: prepare mnc for the actual use of missing values with the
9101 diagnostics package: small fix in mnc_cw_readwrite.template and more
9102 initialisation of never used fields
cebfffcf05 Mart*9103 - replace mnc_common.h and mnc_id_header.h with corresponding upper case
9104 versions
a435e833b1 Mart*9105 o pkg/thsice/thsice_ini_vars.F added default initial values so that
9106 thermodynamics sea ice solver does not blow up when some initial fields
cebfffcf05 Mart*9107 are missing.
87838921ba Jean*9108 o move from external_forcing_surf.F to ini_forcing.F
9109 the p-coord. hack consisting in using pLoad to set phi0surf ;
9110 update output of tutorial_global_oce_in_p (affected @ truncation level).
a435e833b1 Mart*9111 o Freshen up a bit hs94.1x64x5, notably:
9112 remove rotationPeriod and tRef=5*0. (adjoint only), and add
cebfffcf05 Mart*9113 exactConserv=.TRUE.
34e240c0d3 Jean*9114 o pkg/generic_advdiff:
9115 change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only
9116 applies to files where Temperature & Salinity 2nd Order moments are used.
bc2cda07c1 Oliv*9117 o pkg/ptracers: add second-order moment advection schemes (80 and 81);
9118 this uses a dynamically allocated internal state data structure
a435e833b1 Mart*9119 (#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h)
bc2cda07c1 Oliv*9120 and requires a fortran 90 compiler
9121
0e6056cd20 Jean*9122 checkpoint59q (2008/05/06)
934822fb62 Jean*9123 o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3)
9124 (from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977)
bb5c940526 Davi*9125 o Refresh tutorial_global_oce_biogeo, notably:
9126 - change bathymetry (put back seamounts in ACC, use hFacs)
9127 - change EOS (POLY3 --> JMD95Z)
9128 - use Bryan-Lewis vertical diffusivity
9129 - use multidimensional advection
9130 - remove old virtual virtual in dic pkg, now done through ptracer pkg
9131 - change a couple of parameters in dic pkg
b488248973 Gael*9132 o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F
a435e833b1 Mart*9133 o pkg/obcs: change default to OBCSfixTopo = .true.,
37d6577e8a Mart*9134 - set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result
9135 - replace "debugMode" with "debugLevel .GE. debLevB"
a435e833b1 Mart*9136 o implementation of TAF directives for gchem,cfc,dic
c668f876bd Jean*9137 o remove "exp5" (replaced by tutorial_deep_convection).
ba199509e7 Mart*9138 o pkg/obcs: add code to fix topography gradients normal to open boundaries;
9139 this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms;
9140 the code can be turned on by setting OBCSfixTopo = .true. in data.obcs
68dbdb7bfc Mart*9141 --> changes results in exp4, seaice_obcs
c668f876bd Jean*9142 o tutorial_deep_convection :
4c59896cb2 Jean*9143 update the set-up and increase resolution and domain size ; start
9144 from pseudo initial conditions = output at t=120mn in order to see
9145 something happening when running testreport.
e3f6e77e00 Mart*9146 o pkg/seaice: add os7mp as an advection scheme
9147 add check for advection schemes
f414077a87 Mart*9148 add a flag for restoring T and S underneath sea ice
a435e833b1 Mart*9149 o pkg/my82: add netcdf-support and diagnostics
ea0ee0d61a Davi*9150 o thsice pkg:
ba199509e7 Mart*9151 - Now hsMax limits snow height by turning it into ice following
ea0ee0d61a Davi*9152 flooding scheme (and now conserving energy)
9153 - Slight rewriting of the formula in thsice_calc_thick.F
9154 - Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos
a435e833b1 Mart*9155 --> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice
ea0ee0d61a Davi*9156
0e6056cd20 Jean*9157 checkpoint59p (2008/04/10)
2fbf89db82 Jean*9158 o gchem / dic / cfc :
9159 - add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h);
9160 - add new parameter files: "data.dic" & "data.cfc" ;
9161 - various re-arrangement in initialisation & header file ;
9162 - fix tutorial_global_oce_biogeo for multi-threaded test.
9163 o pkg/dic: test for "pickup_dic" file when restarting ;
9164 if no pickup-file, can restart with a re-initialised pH (same as it did
b3b930c218 Jean*9165 before) providing pickupStrictlyMatch is set to False.
eec9c6a066 Jean*9166 o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP
9167 + fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP
9bfbe2231e Jean*9168 o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2
9169 and staggerTimeStep is off (needed for stability of Internal-wave dynamics).
9170 o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax,
9171 & lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers
9172 (note: not clear to me what lambdaTr1ClimRelax is still used for ...)
2f4da9d91b Jean*9173 o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which
9174 scheme to use for vorticty-term ;
a435e833b1 Mart*9175 - compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F
2f4da9d91b Jean*9176 (with default selectVortScheme, return to original discretisation)
9177 - remove weird combination (e.g.: upwindVorticity & highOrderVorticity)
0b784ff841 Mart*9178 o pkg/seaice: add a line to the summary to indicate grid type (B/C)
81ea2c715a Jean*9179 o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the
9180 bottom ; only used with variable horizontal viscosity and non-hydrostatic.
9181 also fix diagnostics VISCAHW & VISCA4W.
9182
0e6056cd20 Jean*9183 checkpoint59o (2008/03/07)
92268978d1 Jean*9184 o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran).
360ad14abb Mart*9185 o change the loop ordering in most gad_*_adv_x.F to improve vectorization:
9186 move a few statemens out the main loop into separate loops
a435e833b1 Mart*9187 o pkg/shelfice:
9188 - sort out freshwater flux; convert freshwater fluxes to mass fluxes
674cb80ca8 Mart*9189 (kg/m^2/s), does not break tests, because in verification/isomip,
9190 rhoConstFresh=rhoConst (by accident)
e3465203db Mart*9191 - rearrange computation of tLoc, sLoc, pLoc to make code more efficient
9192 - move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into
9193 new file model/src/seawater.F, so that they are available for all pkgs.
9194 - convert potential temperature into in-situ temperature. This changes the
9195 isomip tests => update tests
a435e833b1 Mart*9196 o add a flag writePickupAtEnd (default=true) to be able to suppress
97a8c939f6 Mart*9197 writing a pickup at the last timestep
a435e833b1 Mart*9198 o tools/mpack-1.6 :
7739cd8f78 Jean*9199 - disable automake (not working) and autoconf (not needed).
9200 - update to version 1.6.4 which fix MD5 code on some 64 bits platforms
9201 also cleaner with much less compilation warnings.
a435e833b1 Mart*9202 o pkg/profiles:
9e1d042ca2 Gael*9203 rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg
9204 (for "less than 32 characters name" compiler requirement)
212017a383 Dimi*9205 o pkg/obcs and pkg/exf: added capability to specify seaice open boundary
9206 conditions that have a different sampling frequency than S/T/U/V obcs
a435e833b1 Mart*9207 o pkg/diagnostics (stats-diags):
cae4654411 Jean*9208 - fix global Min/Max in case 1 processor get only empty tiles
e89c0084d6 Mart*9209 o genmake2: replace (4 times)
9210 make genmake_tc_1.o >> genmake_warnings 2>&1
9211 with
9212 COMM="$CC $CFLAGS -c genmake_tc_1.c"
9213 echo $COMM >> genmake_warnings
9214 $COMM >> genmake_warnings 2>&1
9215 to make genmake2 always see the value of CC as specified in the optfile.
2c62398d5b Jean*9216 o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid.
9217 - add diagnostics for 1srt & 2nd Order moments and sub-grid variance.
9218 - modify verification advect_cs test to test SOM-advection on CS-grid.
239c38208f Gael*9219 o pkg/ctrl:
a435e833b1 Mart*9220 - Rewrite of ctrl_map_ini_ecco.F,
239c38208f Gael*9221 introducing a generic routine (ctrl_map_ini_gen.F).
9222 - Modification of ctrl_bound/adctrl_bound handling control vector bounds.
2c62398d5b Jean*9223
0e6056cd20 Jean*9224 checkpoint59n (2008/02/09)
a435e833b1 Mart*9225 o pkg/diagnostics: for large number of diagnostics, store diagnostic mate
ae37e502a3 Jean*9226 number in dedicate array "hdiag":
9227 - new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST
9228 with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST.
9229 - many small changes (integer format) for large number of diagnostics
9230 - start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with
9231 a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23.
7514c1bd55 Mart*9232 o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For
9233 usingSphericalGrid, this allows to define the rotated grid coordinates
9234 via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the
9235 geographical coordinates according to the inverse of the rotation defined
a435e833b1 Mart*9236 by the Euler angles, so that Coriolis parameter and online-interpolation by
7514c1bd55 Mart*9237 exf works with the geographical coordinates on XC/YC/XG/YG.
a435e833b1 Mart*9238 Naturally, this feature does not work with all packages, so some
9239 combinations are prohibited in config_summary (flt, flt_zonal, ecco,
9240 profiles), because there the coordinates are assumed to be regular
9241 spherical grid coordinates.
c9e4a2e67d Gael*9242 o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc:
9243 - introduce isopycnal diffusion coefficient control.
a435e833b1 Mart*9244 o tools/adjoint_options:
c9e4a2e67d Gael*9245 - additional control vector components.
8b4eff4f81 Mart*9246 o pkg/mnc: have mnc create marginally meaning full coordinate variables
a435e833b1 Mart*9247 (that is the grid indices) if usingCurvilinearGrid and NOT EXCH2
9248 o pkg/mypackage:
9249 - add example of read/write pickup for state-var ;
1c85ab9892 Jean*9250 - add entry points to the main code for state-vars diags & write-pickup.
659d0ae881 Dimi*9251 o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year
9252 transitions for useExfYearlyFields
a435e833b1 Mart*9253 - add new subroutine that determines the file to read from for
510778fc01 Mart*9254 use*YearlyFields = .TRUE. and .FALSE.
a435e833b1 Mart*9255 - add a verification experiment to global_with_exf that tests
23f0d70669 Mart*9256 useExfYearlyFields with USE_EXF_INTERPOLATION defined
a435e833b1 Mart*9257 o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in
9258 analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new
9259 subroutines (which could be generated from a template, because they are
7c7f4c7f71 Mart*9260 almost identical), for now they are included in obcs_prescribe_read.F for
9261 simplicity
e189b52423 Mart*9262 o pkg/exf:
a435e833b1 Mart*9263 - add a little more diagnostic to exf_interp_read (in analogy to
e189b52423 Mart*9264 mds_read_field, can be turned off with debugLevel < debugLevA=1)
9265 - improve vectorizability of exf_interp for TARGET_NEC_SX, makes code
a435e833b1 Mart*9266 ugly but fast by unrolling short inner loops, inserting a unroll=8
4f5a52ae80 Mart*9267 directive in routine lagran, and splitting a loop and making do while the
9268 outermost loop (the latter requires the intoduction of index arrays)
0f64a7d6fb Dimi*9269 o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice
02aabb8fe5 Dimi*9270 o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver
9271 http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html
3b88786c4e Dimi*9272 o verification/seaice_obcs: updated for restart test and latest options
dadd13178c Mart*9273 o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different
9274 ice rheology (so-called truncated ellipse, that gets rid of tensile stress);
9275 for now this is only available for the C-grid code and also within
9276 #ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code
9277
0e6056cd20 Jean*9278 checkpoint59m (2008/01/14)
b1bf47d3b3 Dimi*9279 o pkg/seaice: use different time constant for melting (SEAICE_gamma_t)
9280 and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature
a435e833b1 Mart*9281 o gad_som : fix flux output (& diagnostics) to have same units as other
9282 advection scheme fluxes (was previously multiplied by deltaT).
41fb919ba6 Dimi*9283 o added verification/seaice_obcs both to test seaice open boundaries
9284 and to provide an example matlab scrpt for generating them
9285 o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume
5968a91b01 An T*9286 o pkg/salt_plume: clean up salt_plume_frac.F to
9287 remove redundancy in PlumeMethod 1 and 4
30c6f5b1cd An T*9288 o pkg/kpp: added saltplume diagnostics
49834856da Dimi*9289 o pkg/obcs and pkg/seaice:
9290 - do not set uice and vice to zero when OB*icefile are unspecified
9291 - OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default
9292 - moved seaice tracer obcs after call to seaice_growth
824966555a Dimi*9293 o pkg/salt_plume: added various options for salt plume depth
9294 criterion and for vertical distribution of the salt
c98c324ec7 Jean*9295
0e6056cd20 Jean*9296 checkpoint59l (2007/12/18)
94059a384d Jean*9297 o pkg/ptracers: new version of ptracers pickup:
9298 read meta file and write only fields which are needed to restart.
9299 ( same logic as main pickup file ; also using pickupStrictlyMatch )
e6b0d1006c Dimi*9300 o pkg/seaice:
f2446b8a43 Mart*9301 - add timescale for melting due to warm mixed layer as a means of
9302 setting SEAICE_availHeatFrac more conveniently
9303 - add a CPP-flag/runtime parameter check for flooding algorithm
e6b0d1006c Dimi*9304 - reformulated availHeat in seaice_growth.F to be independent of AREA
f2446b8a43 Mart*9305 o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent
9306 unit changes
00127a5872 Dimi*9307 o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint
ef5afff8c1 Mart*9308 o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC
9309 SX vector computer.
6eb23881b9 Dimi*9310 o pkg/seaice:
9311 - removed SEAICE_FFIELDS.h and seaice_get_forcing.F
9312 seaice forcing fields can now be read only through pkg/exf
9313 - removed some unused halos
21234f54a9 Jean*9314 o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP
0b49ffce6f Dimi*9315 o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL
9316 or U/VICE from U/VWIND before computing U/VSTRESS
cd7677e357 Dimi*9317
0e6056cd20 Jean*9318 checkpoint59k (2007/11/30)
409b09eb42 Dimi*9319 o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between
9320 dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results.
62e148683f Jean*9321 o fix un-initialised variable problem (in mom_vecinv & shap_filt):
94059a384d Jean*9322 all experiments pass when compile with un-initialised var. checking option.
e4775240e5 Dimi*9323 o added pkg/salt_plume
c28f57ed2e Jean*9324 o script to test restart (for now, in MITgcm_contrib/jmc_script)
a435e833b1 Mart*9325 o pkg/seaice: new read/write pickup version.
c28f57ed2e Jean*9326 read meta file and write only fields which are needed to restart.
9327 ( same logic as main pickup file ; also using pickupStrictlyMatch )
df45546054 Mart*9328 o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates)
b030fd2059 Jean*9329 o lab_sea.hb87: modify the domain & update output.hb87.txt :
9330 lat-long grid & no-slip BC in seaice-dynamics produce different sigma12
9331 at j=1 & j=Ny+1 : this case is not treated correctly in the restart
9332 process. Fixed here by closing the domain at the Northern boundary.
9333 o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD.
9334 o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing
9335 a set of consecutive levels in/from a 3-D array.
a435e833b1 Mart*9336 o pkg/ptracers:
b030fd2059 Jean*9337 use a 2 characters string ioLabel to identify tracer (if more than 99 tracers).
74f73e83d7 Jean*9338 to-do: fix pkg/diagnostics when large number of diagnostics are defined.
9339
0e6056cd20 Jean*9340 checkpoint59j (2007/11/09)
054a6ca04b Jean*9341 o in pkgs: dic, obcs, offline, rbcs:
9342 standard way to compute coeff. for time interpolation between 2 time reccords
9343 which retains full precision (& make results less dependent on compiler).
9344 update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo.
f82f0d1e3a Mart*9345 o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those
9346 packages instead of reading ice cover and wind speed separately
dee09995de Jean*9347 o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h
9348 (keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad
9349 to allow to compile customized code before the update)
a435e833b1 Mart*9350 o cleaning-up:
1330311b36 Jean*9351 - fix CPP instruction syntax in pkg/obcs
9352 - replace (some) call to MDSIO S/R with call to RW interface S/R ; and
9353 add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio)
9354 - fix some threads issue in IO parts.
7f2d5ae7b4 Davi*9355 o pkg/dic:
9356 - add tons of "_d 0" (--> much better testreports !)
9357 and then update outputs of tutorial_global_oce_biogeo
7d697fe457 Jean*9358 o pkg/mom_fluxform:
9359 add a special version of momentum advection intended to conserve momentum
9360 next to a bathymetry step or a coastline edge. (default = off = #undef)
715883b931 Jean*9361 o new read/write pickup version:
9362 - for now, only implemented for main (mdsio) pickup file.
9363 - write out only what is needed to restart; merge pickup_nh , pickup_ph
9364 and main pickup together.
9365 - read meta file; read only what is needed to restart; stop if a field
9366 is missing (if pickupStrictlyMatch=T, = the default) or try to restart
9367 if it make sense (even if the restart is not perfect).
9368 - if no meta file, assume that pickup to read corresponds exactly to
9369 a pickup that would currently be written.
9370 - read pickup written in the old format (until checkpoint59i) if it
9371 recognizes an old meta file (no field-list).
9372 - add a meta file in exp. which starts from a pickup: 2 cases:
9373 a) minimal meta file (with just file precision) + pickupStrictlyMatch=F
9374 e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta
9375 b) a meta file describing the content of the associated pickup file
9376 e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta
9377 o pkg/mdsio & pkg/rw:
9378 - new routine to read a meta file ; new set of routine to read
9379 Multiple-fields file (with meta file).
5459643feb Dimi*9380 o added open boundary conditions capability for seaice
9381 HSNOW, HSALT, UICE, and VICE
fa757486b0 Dimi*9382
0e6056cd20 Jean*9383 checkpoint59i (2007/10/21)
3420897bc6 Patr*9384 o adjoint:
a435e833b1 Mart*9385 * fix multiDimAdvection adjoint
3420897bc6 Patr*9386 (partial recomputation problem by TAF for fVerT(:,:,kDown)
9387 and comlev1 size definition (maxpass vs. max. number of tracers)
9388 * verification/global_ocean.90x45x15 adjoint now tests
9389 NLFS and multiDimAdvection using DST3 (=30)
9390 * verification/lab_sea now tests multiDimAdvection using DST3 (=30)
a435e833b1 Mart*9391 o pkg/kpp: add "_d 0" to real constant (if missing);
846ec3a65a Jean*9392 update output of exp: natl_box (10.digits); vermix (std, 7.digits)
9393 and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits).
97b9193f01 Jean*9394 o prepare for "clever pickup" implementation: add new header file "RESTART.h"
9395 for internal parameters related to restart process (formerly from PARAMS.h)
9396 and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2.
9397 o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed
9398 as argument. (only atm2d & obcs write_pickup have not yet been updated)
fc36747b80 Jean*9399 o pkg/monitor:
9400 - use GLOBAL_SUM_TILE instead of _GLOBAL_SUM
9401 - fix mon_stats_rs (statistics over the full domain, even where field is zero)
9402 - account for deep Atmosphere factor and density factor (anelastic)
b48f786726 Dimi*9403 o added open boundary conditions capability for seaice HEFF and AREA
11b7991b31 Mart*9404 o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989)
9405 thermodynamics
a435e833b1 Mart*9406 - requires a little reorganization, which affects the testreport results
11b7991b31 Mart*9407 of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment,
9408 so that now the conservative form is tested
9409 - add a few comments
fc36747b80 Jean*9410 o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code*
5cc78a2bb0 Mart*9411 o add a little bit of code to gad_os7mp_adv_?.F to help vectorization
37de51ebf5 Mart*9412 o add new diagnostics to seaice: advective, diffusive fluxes (only for
a435e833b1 Mart*9413 multidim-advection, for scheme 2 they are not filled) and transports,
37de51ebf5 Mart*9414 thermodynamic growth rates
5c9e11f575 Jean*9415 o change units of EmPmR (inside the code, + within coupling interface)
9416 from m/s to kg/m2/s (mass flux) but leave input file unchanged.
a435e833b1 Mart*9417 Affects results @ truncation level (cg2d match) and update output of
5c9e11f575 Jean*9418 experiments: lab_sea(6), global_ocean.90x40x15(10),
8106187dda Jean*9419 global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11)
9420 + adjoint results: global_ocean_ebm(11) and lab_sea (12).
5c9e11f575 Jean*9421 Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T).
8106187dda Jean*9422 Next: will retire convertEmP2rUnit (simply using mass2rUnit instead).
9423
0e6056cd20 Jean*9424 checkpoint59h (2007/09/29)
a435e833b1 Mart*9425 o pkg/exf:
97f0a6ab4c Mart*9426 - improve vectorization by moving if-statement out of loops in
9427 exf_mapfields, exf_radiation
9428 - exf_bulkformulae.F: introduce 2D fields and vectorize code
63ceaaa79c Dimi*9429 o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package
a435e833b1 Mart*9430 o testreport:
9431 - allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE
b60e6e79c3 Jean*9432 monitor & update offline_exf_seaice exp. output.
9433 - AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost)
f09197aee0 Mart*9434 o pkg/seaice:
9435 - bug fix in the evp solver: boundary conditions were affected be
9436 masking of zMax/zMin (changes results)
a435e833b1 Mart*9437 - minor bug fix in boundary conditions in seaice_calc_strainrates
f09197aee0 Mart*9438 (changes results for no_slip)
9439 - seaice_lsr.F: make interpolation of eta dependent on boundaries
9440 - replace hardcoded lower limit for zeta (zMin) by runtime parameter
9441 - add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean
9442 stress formulation and no-slip boundary conditions
453b5521e5 Jean*9443 o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP
9444 in gad_calc_rhs.F ; add few safety stops in initialisation phase.
e06023d8a7 Dimi*9445 o pkg/seaice: a first HSALT time stepping equation has been checked in
6aebec07e1 Dimi*9446 o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV
9447 in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem
9448 without requiring DO-IF statements
acdf6745c2 Jean*9449 o pkg/thsice:
9450 use continuous power-law function for partition of energy between lateral
9451 melting/freezing and thinning/thickening ; old code using step function
9452 still available with #undef THSICE_FRACEN_POWERLAW
9453 update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice
9454 o testreport: change AD testing : check against results/output_adm.txt
9455 using same scripts as for forward test.
6aebec07e1 Dimi*9456
0e6056cd20 Jean*9457 checkpoint59g (2007/09/17)
6d61a12d79 Jean*9458 o adjoint testing: in preparation for changing testreport:
9459 - output format: cost and grad written on separated lines
9460 - ad output results in directory "results" (instead of "results_ad")
fdfa8e151f Dimi*9461 o pkg/seaice: adding ice salinity HSALT as a prognostic variable
06687b5615 Dimi*9462 o pkg/seaice: changes for using pkg/seaice with pkg/obcs
a435e833b1 Mart*9463 o pkg/ecco: allow user defined cost function contributions
a3953b5266 Jean*9464 o testreport:
9465 Allow to choose (per experiment) the list of tested output variables
9466 and the main variable (used to issue a pass/FAIL ) ;
9467 - for now, done by adding the specific list in file: [exp]/input/tr_checklist
6d61a12d79 Jean*9468 - default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ;
a3953b5266 Jean*9469 Also modify printing of summary:
9470 a) ">" NN "<" indicates the "main" variable (used for pass/FAIL)
9471 b) echo the list of tested variables in the individual summary.txt of
9472 each experiment.
768f1a0767 Jean*9473 o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of
9474 threads and number of processes (with #define GLOBAL_SUM_SEND_RECV)
9475 (but still depend on the tile decompostion of the domain).
a435e833b1 Mart*9476 o pkg/seaice: change a discretization detail to make the B-grid code
9477 "more symmetric". This change is likely to remove all "ridges/leads" that
9478 where quasi-aligned with the grid in B-grid solutions. It may also be
9890ce5b02 Mart*9479 the solution to the stress coupling issues with the B-grid.
746e4b22c8 Jean*9480 o each tested exp: add a "run" directory with a standard ".cvsignore" file ;
9481 remove .cvsignore from input dir. (since testreport no longer run here).
00f1a01b56 Jean*9482 o pkg/thsice:
746e4b22c8 Jean*9483 - cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h"
00f1a01b56 Jean*9484 - fix reshaping of sea-ice just after advection:
9485 melt all the ice only if ice-volume is too small.
9486 - re-visit lateral/thinning repartition of melting (modifs from May 04, 2007):
9487 prevent lateral melting if sea-ice fraction is too close to iceMaskMin ;
9488 and update experiment global_ocean.cs32x15.icedyn (+start from pickup files).
be8537d9a0 Jean*9489 o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water
9490 tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged.
a435e833b1 Mart*9491 o define mass2rUnit & rUnit2mass as units conversion factor, used for surface
de702e22c7 Jean*9492 forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit
9493 (z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse;
9494 and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error
9495 of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16
9496 -> update output.txt
9497 o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME):
9498 this affects truncation error: -> update output.txt of exp:
9499 global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr,
9500 ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon.
9501
0e6056cd20 Jean*9502 checkpoint59f (2007/08/21)
a435e833b1 Mart*9503 o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode)
9504 o pkg/ctrl: ctrl_bound forces parameter corrections to stay in
5e4d837505 Gael*9505 a bounded range (in forward mode)
59227d8f71 Gael*9506 o pkg/ecco, ctrl, autodiff and mom_common:
9507 internal parameter controls, completements of implementations
7cb9ec3ac0 Jean*9508 o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy.
9e6f983930 Jean*9509 o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ;
9510 (not seem any difference in testing results).
a435e833b1 Mart*9511 o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains
7cb9ec3ac0 Jean*9512 at face corners.
a435e833b1 Mart*9513 o pkg/generic_advdiff:
c3947d579e Jean*9514 - in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR)
9515 loop range indices for computing vertical advection tendency
9516 and do the calculation in the interior only (no overlap) ;
9517 for now, only implemented for SOM advection (to save CPU time).
9518 - add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment)
ffa5f4b126 Patr*9519 o exch2 adjoint
9520 First set of changes:
9521 - add exch2 hand-written adjoint templates
9522 - exch2 hand-written no longer use TAF-flag 'nownew_arg'
9523 This will require cleanup in pkg/autodiff/*.F
9524 (changed routines currently kept separate in verif. code/)
9525 - Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC
9526 that used to hide exch2 or cubed-sphere specific code
9527 (commented via 'cph-exch2')
eb0337bb06 Dimi*9528 o pkg/seaice
9529 - Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE.
a435e833b1 Mart*9530 o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update
142f944c15 Jean*9531 output of global_ocean.cs32x15.thsice .
ffa5f4b126 Patr*9532
0e6056cd20 Jean*9533 checkpoint59e (2007/07/26)
eed8e492b5 Jean*9534 o exch2: new S/R that only use the cube-tracer (center-position) exchange:
9535 for B-grid vector (not yet tested) and C-grid vector (<- only used
9536 when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined).
8c3259a14c Dimi*9537 o starting implementation of Duffy et al. (GRL 1999) salt plume scheme
9538 (#ifdef ALLOW_SALT_PLUME)
713e6ff2ab Dimi*9539 o gather_2d/scatter_2d: removed halo regions
ca76150054 Jean*9540 o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007
9541 scheme and the corresponding test case (under front_relax dir). For now,
9542 only available with Skew-flux form and not yet tested in realistic set-up.
a614482486 Patr*9543 adjoint: store directives updated, but gradient checks deteriorated,
9544 so maybe GM/Redi adjoint is now broken.
7dadb0325c Patr*9545 o seaice adjoint
9546 * add AREA, HEFF, HSNOW as control variable
9547 (should not change lab_sea results)
9548 * CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40
09379e5080 Dimi*9549 o pkg/seaice:
9550 * added computation of saltFlux in seaice_growth;
9551 For time being, sea ice salinity is assumed constant
9552 contribution of snow flooding to freshening of sea ice is neglected.
9553 SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it
9554 defaults to 0.0 in order to maintain backward compatibility.
9555 Typical values for SEAICE_salinity are 4 to 10 g/kg.
9556 * replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F
9557 * added SEAICE_availHeatFrac, which specifies fraction of surface level
9558 heat content used to melt or grow ice
c7cb92a732 Dimi*9559 * commented out cap of HICE: it helps keep ice thinner
9560 * reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option
a6d2313c04 Dimi*9561 * applied OBCS T/S mask to HEFFM sea ice mask
7dadb0325c Patr*9562
0e6056cd20 Jean*9563 checkpoint59d (2007/06/21)
d2b8341951 Jean*9564 o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array
9565 for {PKG} state variables, and called from DO_STATEVARS_DIAGS.
9566 (keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics)
9567 o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0"
9568 and change default value of parameter "GM_Small_Number";
9569 update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15,
a435e833b1 Mart*9570 global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf,
d2b8341951 Jean*9571 tutorial_global_oce_biogeo, tutorial_global_oce_latlon
f79922cd31 Gael*9572 o pkg/ecco: cost function when applying pkg/smooth to controls
9573 o pkg/ctrl: add forcingPrecond run time parameter
6ac96a67e3 Mart*9574 o pkg/seaice:
9575 - replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code
a435e833b1 Mart*9576 - fix bug in metric terms of u-equation in LSR solver (implicit part),
6ac96a67e3 Mart*9577 changes verification/lab_sea
9578 - rearrange implicit part of u-equation in LSR solver to make it easier to
9579 read, understand, and debug. This causes changes at the truncation level.
a435e833b1 Mart*9580 - fix (serious) bug in the boundary conditions (sign error in the implicit
6ac96a67e3 Mart*9581 part) of the LSR solver. Changes all LSR results.
de31ea8481 Dimi*9582 - fixed problem with HSNOW initialization to avoid thick snow when AREA
9583 is initilized with small values - does not change lab_sea results.
9584 - added HsnowFile initialization capability
a435e833b1 Mart*9585 o pkg/smooth: addition to model/src and pkg/ctrl so allow
bf0c19d334 Gael*9586 initialization of pkg/smooth and application to control vector
19ab789a27 Mart*9587 o pkg/seaice: fix another bug in the LSR no-slip boundary conditons
249fe8e752 Gael*9588 o dependencies: pkg/profiles requires pkg/cal
8d3088d3d7 Gael*9589 o pkg/profiles:
9590 - added option ALLOW_PROFILES_GENERICGRID
9591 -> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming
a435e833b1 Mart*9592 that interpolation information (grid points and coefficients) is provided
8d3088d3d7 Gael*9593 within the netcdf input files.
9594 -> sample matlab scripts can be found in MITgcm_contrib/gael
9595 that allow you to prepare netcdf input files.
a435e833b1 Mart*9596 - also modified: cleaner include statements, cleaner error print statements,
8d3088d3d7 Gael*9597 cleaner stops when error, and more tests of the netcdf input files consistency.
a0c93d7fd2 Jean*9598 o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs.
04b45d6d21 Mart*9599 o pkg/seaice:
583c1cf330 Mart*9600 - move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this
9601 requires a new routine: seaice_diagnostics_fill.F
acaec430f5 Mart*9602 - make sure that seaice does not move if not forced (pressure replacement
9603 method, Hibler and Ip, 1995), changes results
04b45d6d21 Mart*9604 - and new damping criterion for EVP solver according to Hunke, JCP, 2001
a435e833b1 Mart*9605 - SEAICE_evpDampC = > 0. turns it on (615. is the recommended value).
04b45d6d21 Mart*9606 It is turned off by default (=-1.), because it changes the results.
b1e9686d05 Mart*9607 - make it possible to read AREA from a file, too.
04b45d6d21 Mart*9608
0e6056cd20 Jean*9609 checkpoint59c (2007/06/04)
93133b7df9 Jean*9610 o add S/R and diagnostics for oceanic mixed-layer depth
9611 o move GMRedi call after all vertical mixing schemes (including KPP)
a435e833b1 Mart*9612 o pkg/thsice:
93133b7df9 Jean*9613 - ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs
9614 (melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice
de3611c1c1 Mart*9615 o pkg/obcs:
9616 - bug fix for balance code
2d85697240 Mart*9617 o pkg/seaice:
6bfbbed422 Mart*9618 - allow values of SEAICE_elasticParm > 1
a435e833b1 Mart*9619 - add new parameter SEAICE_evpTauRelax as an alternative
b559ca9c5c Mart*9620 to SEAICE_elasticParm
6bfbbed422 Mart*9621 - make lsr boundary conditions free slip (by default), changes result
887a79a904 Mart*9622 - add code for no slip boundary conditions for lsr
2d85697240 Mart*9623 - set minimum of zeta to zero (and not 4e8) (changes results)
b559ca9c5c Mart*9624 - add a cap on AREA after advecting AREA if seaice_growth is not called
04010225bf Jean*9625 o change calculation of Visbeck K:
a435e833b1 Mart*9626 - no longer depend on tapering scheme; instead, compute slope (limited
04010225bf Jean*9627 by GM_maxSlope). this is equivalent to what was comuted before with
9628 clipping or linear tappering.
93133b7df9 Jean*9629 - fix vertical averaging (wrong by 1/2 level)
04010225bf Jean*9630 - leave the old version (but will not be maintained) within
9631 #ifdef OLD_VISBECK_CALC / #endif
93133b7df9 Jean*9632 - update output of exp. ideal_2D_oce
ae6dbd4886 Mart*9633 o change error catch in calc_r_star to improve vectorization
fc0ec0c7ea Jean*9634 o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and
9635 add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf).
5728d4a98b Patr*9636 o adjoint:
9637 Re-organized adjoint checkpointing according to Matt Mazloff
9638 (but with modifs/completions/cleanups)
9639 Storing is now bundled into large arrays to optimized I/O
9640 (and second step in cleanup of the_main_loop)
fc0ec0c7ea Jean*9641
0e6056cd20 Jean*9642 checkpoint59b (2007/05/16)
59d7b34837 Jean*9643 o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d):
9644 - export/import (between ocean & coupler) fields needed for ocean DIC.
a435e833b1 Mart*9645 o pkg/seaice:
9646 - get rid of three more exchanges seaice_calc_viscosities (required
17cb3b1135 Mart*9647 different loop boundaries in seaice_lsr and seaice_ocean_stress)
9648 - bug fix in seaice_ocean_stress (update of lab_sea required)
9649 - reduce loop boundaries to necessary minimum also in seaice_evp
a435e833b1 Mart*9650 - go back to the old way of computing deltaC/Z as the adjoint likes that
17cb3b1135 Mart*9651 better
ec0736eb1a Davi*9652 o Refresh of tutorial_global_oce_latlon (includes changing salinity-like
9653 passive tracer to an Age Tracer) + update output.txt
93f8102905 Jean*9654 o pkg/exf:
7bb7cdd467 Jean*9655 - implement A-grid / C-grid selection for wind-stress input files.
9656 - clean-up exf_wind.F (remove us, use wspeed instead ; add wStress)
9657 for now, in exf_bulk_largeyeager04.F only :
9658 - change implementation for case where windspeed + 2. components wind-stress
9659 are read-in. AND use rhoConstFresh to convert evap.
9660 o pkg/seaice:
9661 - use correct EXCH_UV for wind-forcing (on A-grid).
9662 - change SEAICE_OPTIONS.h to limit the number of option combinations (regarding
9663 SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops.
9664 o pkg/exf:
93f8102905 Jean*9665 - default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC)
a435e833b1 Mart*9666 EXF_INTERPOLATION:
93f8102905 Jean*9667 - merge global_with_exf/code version of exf_interp_read.F
a435e833b1 Mart*9668 to the main code ;
9669 - Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when
9670 reading the file ; Important: This options needs to be defined to recover
93f8102905 Jean*9671 previous code.
9672 otherwise, use fixed size array to read in (size=exf_interp_bufferSize).
9673 - no longer loose real*8 precision along the way when using exf_iprec=64.
2f88b60189 Mart*9674 o pkg/seaice: rearrangement of common blocks (really needs more cleaning up)
b3e6145587 Mart*9675 - change discretisation of evp-solver in order to avoid another exchange
9676 (changes lab_sea) and clean up a little
a435e833b1 Mart*9677 - replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS)
b3e6145587 Mart*9678 help the adjoint (this also changes the results slightly)
9679 - add a few "_d 0" where they had been missing in seaice_evp.F
9680 - cleaning up: remove unused seaice_calc_rhs.F
35a74aa2c2 Jean*9681 o pkg/exf: some cleaning-up:
9682 - change various "constants" into runtime parameters
9683 - cleaned-up Large&Yeager04 routine which should eventually
9684 replace exf_bulkformulae.F (changed names of S/R and CPP)
9685 and merged various ALLOW_ATM_WIND options
9686 only used with thsice pkg (in thsice_get_exf.F):
9687 - implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04)
9688 which are used when useStabilityFct_overIce=TRUE (= the default)
9689 - change default values of ice & snow emissivity and scale downward LW
9690 by ice & snow emissivity.
9691 o pkg/thsice:
0a9955b282 Jean*9692 fix few little problems, in thsice_calc_thickn.F:
9693 - growth vertically (and not laterally) if iceFrac == iceMaskMax
93133b7df9 Jean*9694 - melt only laterally if hIce < hThinIce (as the comments say)
0a9955b282 Jean*9695 and in thsice_extend.F:
9696 - allow to form ice even when iceFrac == iceMaskMax (by increasing thickness)
9697 - start to form ice as soon as the minimum ice-volume is reachable.
a435e833b1 Mart*9698 update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice),
0a9955b282 Jean*9699 and cpl_aim+ocn
66b38c4c51 Mart*9700 o pkg/kpp
9701 - move computation of surface related input fields to KPP into a new
9702 subroutine kpp_forcing_surf.F
0a9955b282 Jean*9703 - remove wrong (within bi,bj loops) EXCH calls.
9704 - little cleaning (add argument myThid in last position, cvs header ...)
a435e833b1 Mart*9705 - for now, fix conservation problem by exchanging KPPviscAz (may not
0a9955b282 Jean*9706 be the best fix)
f83c00719e Mart*9707 o pkg/seaice
9708 - check for inconsistent evp parameter/cpp-flag combination
9709 - remove leftover errIO flat for obsolete name list error handling
4b058176c1 Patr*9710 o OpenAD
9711 - changed verification/OpenAD to full baroclinic setup (including GM/Redi)
f83c00719e Mart*9712
0e6056cd20 Jean*9713 checkpoint59a (2007/05/01)
09e3b53265 Mart*9714 o pkg/seaice: some parameter clarifications and a little bit of clean up
f8fa27d193 Jean*9715 o pkg/thsice: rename run-time parameters:
9716 himin -> hIceMin
9717 himin0 -> hThinIce
9718 hihig -> hThickIce
9719 i0 -> i0swFrac
9720 transCoef -> bMeltCoef
9721 frac_energy -> fracMelting
9722 add new parameters: hNewIceMax, fracFreezing, dhSnowLin
9723 with default values (for now) that do not change the results.
9724 remove old version of thsice vars advection in pkg/seaice.
a435e833b1 Mart*9725 o in FFIELDS.h:
18ca872a92 Jean*9726 - replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD
9727 - make pLoad & sIceLoad always available (but still only used if
9728 ATMOSPHERIC_LOADING is #define).
fe66051ebd Dimi*9729 o pkg/kpp: replaced _KPP_RL with _RL
059d9fc14f Dimi*9730 o bug fixes for vertical diffusivity computations when both KPP and
a3b5d49db3 Dimi*9731 3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F
9732 are no longer updating the vertical diffusivity array
9733 (passed as argument) but are (re-) setting those arrays.
2e88c0564a Mart*9734 o pkg/seaice: fix bug in evp solver, while doing that
9735 - change (improve?) discretization of stress computations for both
9736 cgrid-lsr and evp solver
9737 - add a new routine to compute strain rates
ed84a09795 Mart*9738 - the above changes lab_sea results
9739 - add no slip conditions for evp solver (off by default), lsr-version
9740 may follow
9741 - fix exchange for shear at Z-points (does not change lab_sea)
9742 - retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp
9743 (to force the user to pick a time step since there is not "safe" way
9744 of choosing it)
4686684434 Mart*9745 - add principal stress diagnostics
a435e833b1 Mart*9746 - rearrange fields for evp a little to avoid having to call a: too many
9747 exchanges and b: exchanges for stress trensor components which we do
fe367969c0 Mart*9748 not have.
9749 - modify Hibler+Bryan (1987) stress coupling so that it reuses information
9750 of evp, complete rewrite for lsr case (latter is does not yet work
9751 in all cases)
efab83c021 Mart*9752 o pkg/kpp: add code to have mixing in shelf ice caverns
cb6682d07b Mart*9753 - add myThid to all kpp routines (long overdue)
efab83c021 Mart*9754
0e6056cd20 Jean*9755 checkpoint59 (2007/04/19)
a435e833b1 Mart*9756 o pkg/exf:
62cf11cfe0 Patr*9757 - fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND &
9758 ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid
a435e833b1 Mart*9759 - move exf header files from lower_case.h to UPPER_CASE.h ;
62cf11cfe0 Patr*9760 add missing cvs Header & Name
9761 - add adjoint routines and flow dirs for newly used exch_uv_agrid routines
d9a285b784 Patr*9762 - add namelist param. selectStressGridPosition, exf_monFreq
a435e833b1 Mart*9763 - retire many _CLIM routines, and remove data.exf_clim
d9a285b784 Patr*9764 + params moved to data.exf
9765 + climsst, climsss now handled by exf_set_gen, i.e.
9766 climss?period=0 refers to constant field,
9767 climss?period=-12 to monthly forcing
9768 - split up namelists in data.exf
e1d22dfae3 Mart*9769 o pkg/seaice:
9770 - remove seaice_exch and seaice_exch_uv
9771 - remove superfluous exchange of theta
9772 - add myThid to seaice_budget_ocean/ice
039e537654 Mart*9773 - add new interface for atmospheric wind forcing (C-grid only)
9774 + new routine
9775 + two new field (taux, tauy for stress over ice)
9776 + removed one global field (DAIRN) for C-grid case only
62cf11cfe0 Patr*9777 o pkg/thsise
9778 - 2nd set of modifs for thsice adjoint in conjunction with exf
d9a285b784 Patr*9779 o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.)
e1d22dfae3 Mart*9780
0e6056cd20 Jean*9781 checkpoint58y_post (2007/04/15)
0aefc24df1 Dimi*9782 o Added capability for latitudinal dependence of Bryan and Lewis, 1979
e40c34e398 Dimi*9783 vertical diffusivity, similar to that in MOM4; turned on using
9784 #define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using
9785 diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file.
a7c5f770ff Dimi*9786 o Added capability for 3D specification of background vertical diffusion
9787 coefficient. This is done by (i) #define ALLOW_3D_DIFFKR
9788 in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime
9789 "data" file that contains the 3D vertical diffusivity coefficients.
a10167ebd7 Jean*9790 o ice dynamics (pkg/seaice) with thsice thermodynamics:
9791 - add code within pkg thsice to advect & diffuse sea-ice fields
9792 similar to (and will replace) what has been added in seaice_advdiff.F,
9793 but: - conserving Mass, Heat & Salt.
9794 - better when using non-linear advection scheme (not yet fully tested)
9795 - can also be used in atmospheric set-up (for now, only the diffusion).
bf363e629f Dimi*9796
0e6056cd20 Jean*9797 checkpoint58x_post (2007/04/04)
fa535b8213 Jean*9798 o IO option for global-file compact format:
9799 - add options when generating topology (utils/exch2/matlab-topology-generator)
9800 - add I/O capability (pkg/mdsio).
9801 - adapt utils/matlab/rdmds.m to read this format.
9802 for now long-line format not yet supported by pkg/mdsio (& exch2).
4c0efb30d8 Mart*9803 o shelfice: add a few diagnostics
9804
0e6056cd20 Jean*9805 checkpoint58w_post (2007/03/13)
db8fa666e0 Jean*9806 o p-coord. non-hydrostatic using reference profile for w <-> omega conversion:
9807 rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref
9808 (and replace horiVertRatio in NH code).
a435e833b1 Mart*9809 Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !)
db8fa666e0 Jean*9810 and tutorial_plume_on_slope (sensitive to truncation)
2496f367f4 Mart*9811 o seaice: if ALLOW_ATM_WIND is undefined use wind stress
9812 directly to drive seaice model (C-grid only)
9813 o exf: when input wind-stress (#undef ALLOW_ATM_WIND):
a435e833b1 Mart*9814 - reintroduce computation of wind from stress,
9815 - compute tau (in exf_bulkformulae.F) from windstress averaged to
2496f367f4 Mart*9816 mass points to avoid tau = 0
b3d6cfe67b Mart*9817 - fix serious bug: (1/3) in Fortran is not the same as (1./3.)
2496f367f4 Mart*9818 o rdmnc.m: make it work with "global" files created with gluemnc
fedb0baa62 Jean*9819 o rdmnc.m : some improvements in dealing with singleton dimension
9820 (tested on all testreport mnc output files).
9821 o genmake2: disable pkg/profiles if netcdf test fails.
108c7eb2d4 Jean*9822 o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output.
462fd48b6a Mart*9823 o move call to cal_readparms up to make calendar parameters/variable available
9824 to all packages
9825
0e6056cd20 Jean*9826 checkpoint58v_post (2007/02/08)
bafc84b6a4 Jean*9827 o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get
9828 useDynP_inEos_Zc tested.
5d2261ac89 Dimi*9829 o pkg/exf: changes to properly interpolate/mask/scale initial fields
7c705f78f8 Dimi*9830 o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields
9831 and portions thereof. See read_cs.txt for description and examples.
c4b9b1e3e9 Jean*9832 o utils/matlab/cs_grid/bk_line: to compute transport through passages,
9833 add a script (grt_circ_bkl.m) to generate broken-line between 2 points,
9834 following the great-circle arc between those 2 points.
9835 o trap un-initialized variable with pathscale compiler on weddell.mit.edu
9836 (thanks to Constantinos): fix few problems and get (almost) all exp to pass.
95c3249206 Jean*9837 o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in
9838 - enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h)
9839 - used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81)
9840 - still needs work (not working with some options ; efficiency to improve)
9841 and serious testing.
9842 - use this scheme for temperature & salinity in 2 advection test exp.:
9843 advect_xy & advect_xz, respectively.
9844
0e6056cd20 Jean*9845 checkpoint58u_post (2007/01/12)
42a486092f Jean*9846 o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels.
31fd7701e4 Jean*9847 o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA.
9848 o testreport: add option "-skipdir" to skip some test.
a435e833b1 Mart*9849 o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent
31fd7701e4 Jean*9850 momentum calculation.
9851 o gad_advection: fix vertAdvecScheme (if different from advectionScheme)
9852 o some cleaning: usePickupBeforeC35 no longer supported ; remove this option.
9853 remove checkpoint.F and the_correction_step.F (no longer used);
9854 do the k loop inside CYCLE_TRACER (supposed to be more efficient).
a435e833b1 Mart*9855 o add option (linFSConserveTr) to correct for tracer source/sink due to
31fd7701e4 Jean*9856 Linear Free surface
0e1f0a567f Mart*9857 o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine
9858 o pkg/thsice: fix reading mnc-pickups
9859
0e6056cd20 Jean*9860 checkpoint58t_post (2006/12/30)
62990a23c1 Jean*9861 o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F)
9862 o pkg/mdsio:
9863 - clean-up mdsio_readfield.F & mdsio_writefield_new.F and
9864 move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) &
9865 mdsio_write_field.F (S/R MDS_WRITE_FIELD);
9866 - fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD
9867 - collect old S/R in one file: mdsio_rw_field.F (now just a call to
9868 either MDS_READ_FIELD or MDS_WRITE_FIELD )
9869 - new S/R (to replace MDSWRITEMETA), which allows to write more
9870 informations (variable names, time ...) to meta files.
9871 - modify rdmds.m to give back the meta file content.
f0676079d6 Jean*9872 o pkg/diagnostics: change vertical interpolation to be safer, and more
9873 flexible (define p-levels to interpolate to in data.diagnostics);
a435e833b1 Mart*9874 add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right
f0676079d6 Jean*9875 diagnostic pointer.
494a260c71 Mart*9876 o pkg/seaice: more cleaning up of seaice_growth, added many comments
0e1f0a567f Mart*9877 o pkg/exf: put runoff0 and runoff1 into the appropriate common block
72f428a311 Mart*9878 o fix multi-category seaice:
a435e833b1 Mart*9879 - change cpp flag SEAICE_MULTILEVEL to more meaningful name:
72f428a311 Mart*9880 SEAICE_MULTICATEGORY
9881 - fix short wave heat flux
ac10466ef6 Jean*9882 o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics
a435e833b1 Mart*9883 and allow to use EVP solver. Change forward lab_sea: test both EVP
ac10466ef6 Jean*9884 solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint)
13ac555e3c Patr*9885 o Initial check-in of lab_sea adjoint
9886 (very similar to natl_box_adjoint/code_seaice)
9887 * used C-grid and EVP solver
9888 * used KPP, GM/Redi
9889 * uses inAdExact=.TRUE.
9890 * gradient checks fail for both ADM and TLM
9891 due to sensitive snow melt code in seaice_grwoth (look for "JZ")
9892 f.d. gradients actually seem more problematic than ADM, TLM gradients;
9893 issue is related to forward mismatch between g77 an ifort
66cb0aa2f6 Mart*9894 o pkg/seaice: overhaul of thermodynamics
9895 - growth.F and groatb.F are replaced by new routine seaice_growth.F
9896 - budget.F is replaced by two new routines seaice_budget_ocean/ice.F
9897 - move a few global fields out of SEAICE.h into seaice_growth.F and
9898 make them 2D (FICE/QNETO/ ...)
9899 - remove FO (it is the same as QNETO)
9900 - introduce a few local fields to avoid modifying external fields such
9901 as atemp, etc.
9902
0e6056cd20 Jean*9903 checkpoint58s_post (2006/12/11)
58d34f56b6 Dimi*9904 o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F
9905 changed exf_set_gen.F so that
9906 genperiod=0 means input file is one time-constant field and
9907 genperiod=-12 means input file contains 12 monthly means
475943d866 Jean*9908 o CG2D: use pre-computed solver main-diagonal (stored in common block);
9909 this affects truncation error ; generate new output file for exp. which
9910 fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d),
9911 global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d),
9912 ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d),
9913 MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d),
9914 tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d),
9915 vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d)
c5d33297c7 Jean*9916 o start implementation of deep-atmosphere and anelastic formulation
d83c991b0e Jean*9917 o verification: remove 2nd copy of input files and use script "prepare_run"
9918 to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M)
1c10df8cad Mart*9919 o mom_common/vecinv/fluxform: fix a few initialisation isssues
544c96562c Gael*9920 o profiles: fix for multithreaded case
9921
43ae10a9d8 Jean*9922 o diagnostics: rename few diags:
9923 s/'PRESSURE'/'RCENTER '/g
9924 s/'TICE '/'oceFreez'/g
9925 s/'TAUX '/'oceTAUX '/g
9926 s/'TAUY '/'oceTAUY '/g
9927 s/'SWFLUX '/'oceQsw '/g
9928 s/DIFx/DFxE/g
9929 s/DIFy/DFyE/g
9930 and add few ocean-forcing diagnostics:
9931 atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS
ab48336167 Dimi*9932 o modifications to pkg/seaice/growth.F and budget.F, which change results of
9933 lab_sea experiment: HSNOW was sometimes treated as effective and sometimes
9934 as actual snow thickness. It now refers everywhere to effective snow
9935 thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA.
43ae10a9d8 Jean*9936
0e6056cd20 Jean*9937 checkpoint58r_post (2006/11/17)
8307959141 Dimi*9938 o modifications to pkg/seaice/growth.F, which change results of
9939 lab_sea experiment: fixes pertain to melting snow over open water, to
9940 masking EVAP under sea ice, and to using the correct AREA variable for
9941 computations of EVAP, PRECIP, HSNOW, and GHEFF
5f4df5533c Ed H*9942 o add ability to read bathy, salt, and theta using MNC (off by def)
eefc792916 Mart*9943 o add flooding algorithm and advection of HSNOW for pkg/seaice;
9944 both are turned off by default and do no change any results
a435e833b1 Mart*9945 o seaice advection with pkg/thsice: a step toward the use of non-linear
cc4235ab79 Jean*9946 advection scheme, but #ifdef or commented out for now (requires more EXCH).
23209571d0 Jean*9947 o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens
9948 (identical results) and the standard version of EXTERNAL_FIELDS_LOAD
9949 in natl_box (affects results @ truncation level: update output.txt)
9950 o multi-threading and IO:
ba51931058 Jean*9951 - replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R.
9952 - remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls
9953 (needed to work with SingleCpuIO): tested in all verif. exp.
874c68b9c9 Jean*9954 o GAD: use simpler DST3 formulation as default (old version left within #ifdef)
9955 affects the results (but none of the verification test uses this scheme).
9913de8fec Patr*9956 o Adding some pkg/diagnostics capability to pkg/seaice
9957 (will certainly be subject to changes)
983e72444d Patr*9958 o ctrl: adding new control variables:
9959 lwflux, lwdown, evap, snowprecip, apressure, runoff
9913de8fec Patr*9960
0e6056cd20 Jean*9961 checkpoint58q_post (2006/10/20)
f5cbf7b96d Dimi*9962 o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up
9963 1/6-deg Southern Ocean configuration by 8% on IBM Datastar and
9964 high_res_cube configuration by 4% on Columbia.
a615280822 Jean*9965 o clean-up multi-threaded problems (reported by debugger tcheck on ACES);
9966 add (in global_with_exf/code) a version of EXF_INTERP_READ without
9967 dynamical allocation (seems to work in multi-threaded).
9968 o new function "MASTER_CPU_IO" (=T if master thread & master CPU, if using
9969 single CPU io) so that TAF does not have to see EESUPPORT.h
725982e0dd Jean*9970 o pkg/seaice: implement sea-ice loading (when using RealFreshWaterFlux)
9971
0e6056cd20 Jean*9972 checkpoint58p_post (2006/09/08)
fc187b9c6d Mart*9973 o obcs: stop if obcs is used with useCDscheme = .true.
a435e833b1 Mart*9974 o shelfice:
4fd1c14d86 Mart*9975 - fix a sign error so that no slip at shelfice interface works
a435e833b1 Mart*9976 - remove stop for combination non-hydrostatic code and shelfice. That does
4fd1c14d86 Mart*9977 not mean, that the results are correct, but at least they are numerically
9978 stable
bd91f7dab7 Davi*9979 o diagnoctics: modify UVELPHI and VVELPHI to include hfac (i.e. mass-weighted)
9dd22fcf15 Patr*9980 o added adjoint exch routined for all exch*3d* routines
9981 and updated flow directives
bd91f7dab7 Davi*9982
0e6056cd20 Jean*9983 checkpoint58o_post (2006/08/28)
acd22c6e91 Jean*9984 o replace calls to EXCH_Z & EXCH_UV_AGRID: use the new _3D_ version ;
9985 remove old subroutines (_XY_ & _XYZ_); update the adjoint version.
d0ebb46870 Jean*9986 o change controling S/R for writing pickup file (new S/R do_write_pickup)
9987 and clean-up reading/writing of pickup files.
9988 o fix local version of read/write pickup (NH part) in rotating_tank/code
49423ca970 Jean*9989 o simplify EXCH interface:
9990 - change _XYZ_ interface to _3D_ subroutine (with 3rd dim in argument list)
9991 - not often used EXCH S/R (exch_z, exch_uv_agrid): keep only the _3D_ version
134f469a8d Ed H*9992 o added the regrid package
a435e833b1 Mart*9993 o shelfice:
29ffe622cd Mart*9994 - add a simple boundary layer scheme to reduce noise
9995 - fix the indexing in shelfice_u/v_drag so that there will be actually drag
49423ca970 Jean*9996
0e6056cd20 Jean*9997 checkpoint58n_post (2006/08/14)
a435e833b1 Mart*9998 o fix globalArea multi-threaded calculation: need to apply GLOBAL_SUM to
bbc1d9f1e8 Jean*9999 local variable (not in common block).
a435e833b1 Mart*10000 o lot of small changes for multi-threaded. Most tests (using OMP & ifort) pass.
10001 - still problems with pkgs: mnc, exp2, dic, cal, exf (and probably more);
da8bc3fbe0 Jean*10002 - still BEGIN_MASTER/END_MASTER to remove around READ/WRITE_FLD S/R calls
10003 to work with SingleCpuIO.
a435e833b1 Mart*10004 o add "_d 0" to real constant of pkg/cfc subroutines ;
d77b191e54 Jean*10005 update exp. cfc_exemple & tutorial_cfc_offline output files.
15d8704b4b Jean*10006 o multi-threading and IO:
a435e833b1 Mart*10007 - all threads call READ_FLD S/R (needed if using SingleCpuIO):
15d8704b4b Jean*10008 (no BEGIN_MASTER/ END_MASTER around the call, but inside MDSIO S/R.
10009 - barrier before and after reading.
10010 - stop if other than master is calling MDS_WRITELOCAL (if #undef IO_THREAD_SAFE)
10011 - avoid using MDS_WRITELOCAL for LAND pkg output.
10012 - new S/R AIM_WRITE_PHYS (replaces AIM_WRITE_LOCAL) to write AIM physics
10013 common-block variables ; Allows multi-threading with master-thread IO.
a435e833b1 Mart*10014 o change default MAX_NO_THREADS from 32 to 4 ;
10015 and stop cleanly when MAX_NO_THREADS is too small.
e20ba03425 Jean*10016 o add S/R BAR_CHECK to check multi-threaded barrier synchronization
10017
0e6056cd20 Jean*10018 checkpoint58m_post (2006/07/17)
ade0862df3 Jean*10019 o add a Non-Hydroatatic test (with 3-D Coriolis, NHMTerms, biharmonic Visc.
10020 and side-drag) on CS-grid : global_ocean.cs32x15.viscA4
4641b6f2a1 Jean*10021 o make "tutorial_global_oce_latlon" from standard "global_ocean.90x40x15" exp.
a435e833b1 Mart*10022 keep global_ocean.90x40x15 (for AD testing) with former secondary test
4641b6f2a1 Jean*10023 (".qshyd") as the main test (mv output.qshyd.txt to output.txt)
10024 o CVS modules: update MITgcm_verif_basic; remove MITgcm_verif_ocean & _verif_atmos;
10025 add MITgcm_tutorials (= code + all the tutorials)
61b89af843 Gael*10026 o ecco, option to compute cost for total ssh (mean+anom)
fe8bfd2a85 Gael*10027 o consistent with addition of ptracer and ssh in pkg/profiles
021f06a8d1 Gael*10028 o profiles: adding ptracer and ssh
a435e833b1 Mart*10029 o testreport: change multi-test output-file name
a91df43a18 Jean*10030 (from output.txt.{name} to output.{name}.txt)
da8bc3fbe0 Jean*10031 o profiles: now ok for mutli-tiles case
a435e833b1 Mart*10032 o seaice: add 4 parameters for different advection schemes for area,
1633c22cfc Mart*10033 (effective) seaice thickness, enthalphy, and snow height. Their default
10034 is the standard parameter SEAICEadvScheme
a435e833b1 Mart*10035 o calc_gw:
78de812e24 Jean*10036 - add cosFacU in zonal viscous flux (harmonic.visc.).
10037 - put back side-drag (call new S/R MOM_W_SIDEDRAG) and output.txt.
10038 of tutorial_plume_on_slope.
10039 o obcs_calc.F : fix index Pb in OBSeta & OBNeta (Thanks to Gianmaria).
1fa758ce8e Jean*10040 o calc_gw: true flux-form, account for horizontal grid spacing.
a435e833b1 Mart*10041 update rotating_tank results, but not plume_on_slope (affected at
1fa758ce8e Jean*10042 truncation level, 11 digits).
10043
0e6056cd20 Jean*10044 checkpoint58l_post (2006/07/12)
a435e833b1 Mart*10045 o calc_gw:
1fa758ce8e Jean*10046 - take bi,bj loops outside calc_gw to fix Pb with local array KappaRU,V
10047 - remove side-drag for now (need to fix it); update plume_on_slope results.
10048 - fix for partial-cell & non-uniform dz; update plume_on_slope results.
066de0bcd6 Patr*10049 o commit code to make SST/SSS weights spatially variable
10050 (based on either variable in-situ or variable initial T/S weights)
9c7011b92a Patr*10051 o pkg/ecco:
10052 * commit code to relax deviations of xx_theta, xx_salt to 5*sigma,
10053 now based on horizontally varying weights wthetaLev, wsaltLev
10054 * cost_averagesflags now returns year indices in addition to day, month
a435e833b1 Mart*10055 * sflux balance is performed on annual basis
9c7011b92a Patr*10056 (sflxumm, sfluxmm2, bal_sfluxmm)
10057 * for SSH anomaly, separate more cleanly contrib from T/P, ERS, GFO,
10058 including separate counting and multipliers
11d329f17a Patr*10059 o pkg/rbcs
10060 * add all necessary infrastructure for pkg/rbcs levN adjoint checkpointing
926e82ae0e Jean*10061
0e6056cd20 Jean*10062 checkpoint58k_post (2006/07/06)
a75fd4a3a0 Jean*10063 o testreport:
a435e833b1 Mart*10064 - always build in dir. "build" (if not there, mkdir build instead of building
a75fd4a3a0 Jean*10065 & running in input)
10066 - run in dir run (if it exists), in build otherwise.
10067 - call prepare_run (if input/prepare_run exists)
10068 - run multi-threaded test (with new option: "-mth") if file input/eedata.mth exists.
6519624399 Dimi*10069 o pkg/exf modifications to interpolation and rotation routines for more
10070 reasonable treatment of North Pole singularity: for tracers North Pole
10071 value is set to northernmost zonal-mean value, for zonal velocity it is
10072 set to zero, and for meridional velocity it is set to northernmost value.
35141c3376 Mart*10073 o pkg/exf/exf_check_range.F
a435e833b1 Mart*10074 - add tile index to diagnostics and move stop statement to the very
10075 end of the routine.
05aa25be39 Jean*10076 o pkg/diagnostics: (diagnostics_main_init.F)
10077 define title of isomorphic variables according to the current config.
842bb5f1d9 Jean*10078 o pkg/thsice with pkg/seaice dynamics:
6789e1f33d Jean*10079 - fix domain of computation (interior only, required for exf) and do exchanges
10080 - seaice-dynamics forcing: add atmospheric and seaice loading to SSH gradient
ae35500ca3 Jean*10081 o towards a standard way of dealing with multi-threading in MONITOR
10082 and ${PKG}_MONITOR (all except ptracers_monitor) subroutines.
a435e833b1 Mart*10083 o Pass variable viscosities (vertical and horizontal, e.g., KPP or Leith)
10084 to W momentum equation in nonhydrostatic and quasihydrostatic runs.
6f6b52a4f5 Jean*10085 o make exf_monitor & seaice_monitor independant of the main (dynamics) monitor.
e03f83af3c Jean*10086 o pkg/seaice: fix SEAICEuseEVPpickup parameter (put it in a commom block)
10087 o generic_advdiff: DST advection S/R : use local copy of velocity to compute CFL
10088 (problems ? with gradient check in bottom_ctrl_5x5 adjoint test)
a435e833b1 Mart*10089 o tracer advection:
d8d36aa8bb Jean*10090 - clean-up and simplify calc_common_factors.F
a435e833b1 Mart*10091 - make a local copy of velocity and pass it (as u,v,r_Trans) to DST tracer
d8d36aa8bb Jean*10092 advection subroutine (but still not used within DST advection S/R)
2baa3a4f30 Jean*10093 o rename pkg aim_ocn_coupler to atm_ocn_coupler (later on, will be used without aim)
10094
0e6056cd20 Jean*10095 checkpoint58j_post (2006/06/15)
95f2c2ae3f Patr*10096 o new driver S/R: LOAD_FIELDS_DRIVER to load external forcing fields
10097 from file (collects calls previously in FORWARD_STEP)
10098 o move call to SEAICE_MODEL from FORWARD_STEP to DO_OCEANIC_PHYS
a0d26c252a Patr*10099 o adjoint store dir. adjusted accordingly
95f2c2ae3f Patr*10100 o genmake2
10101 replace target "ad_taf" by $(EXE_AD) ; add $(EXE_AD) to the make CLEAN list.
a0d26c252a Patr*10102
0e6056cd20 Jean*10103 checkpoint58i_post (2006/06/14)
a435e833b1 Mart*10104 o pkg/seaice: add parameter that allows to scale/turn off effect of seaice
c9058eda34 Mart*10105 on wind stress (SEAICEstressFactor defaults to 1.)
4a7f47048d Jean*10106 o Total number of Timers is finite (<=40): comment out 2 non-essential one
10107 in the_main_loop.F to avoid Pb (e.g., when running fizhi test)
a435e833b1 Mart*10108 o vector_invariant: fix highOrderVorticity(=4.th.Order) advection
b161d628fb Jean*10109 on CS-grid: no longer loosing mass.
6be7d7dc38 Jean*10110 o exf & curvilinear-grid: no longer modify longitude xC & xG.
5ea0c8294d Mart*10111 o pkg/ggl90: fix sloppy output and fix a bug
d558d05cf5 Dimi*10112 o pkg/seaice: added SEAICEuseEVPpickup parameter
10113 - Set to false in order to start EVP solver with
10114 non-EVP pickup files when using SEAICEuseEVP
b53f333527 Mart*10115 - fix sign error in diffusion in seaice_calc_rhs
5ea0c8294d Mart*10116
0e6056cd20 Jean*10117 checkpoint58h_post (2006/06/07)
4a4ac2b6f4 Patr*10118 * Modifications for bottom topography control
10119 o replace hFacC by _hFacC at various places
10120 o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL
10121 o add non-self-adjoint cg2d_nsa
10122 o update autodiff support routines
10123 o re-initialise hfac after ctrl_depth_ini
10124 o works for 5x5 box, doesnt work for global_ocean.90x40x15
10125 * Adding verification for 5x5 box (4-layer) bottom topography control
10126
0e6056cd20 Jean*10127 checkpoint58g_post (2006/06/07)
6f0ec9a199 Jean*10128 o pkg/diagnostics: implement "periodic averaging diagnostics" (e.g.,
10129 used for mean seasonal cycle, mean diurnal cycle); add an example
10130 in verification/global_ocean.cs32x15/input.thsice/data.diagnostics
a435e833b1 Mart*10131 o pkg/ggl90:
2539abbd59 Mart*10132 - add parameter (minimum surface kinetic energy)
10133 - fix bug (avoiding division by zero)
a5d3c9e070 Mart*10134 o couple pkg/thsice to pkg/seaice:
10135 - modify advection in seaice to accomodate new scalar fields to be advected
10136 - only muliDimAdection scheme work with seaice/thsice
10137 - mapping of thsice-variables to seaice-variables, back and forth
10138 - does not break the verification experiments, but does not give the
10139 desired results either
10140 o pkg/seaice
10141 - make (default) second order advection a bit less confusing?
10142
0e6056cd20 Jean*10143 checkpoint58f_post (2006/06/05)
a435e833b1 Mart*10144 o couple pkg/thsice and pkg/exf (as a preparation for coupling pkg/thsice
10145 to pkg/seaice):
25f8242518 Mart*10146 - new routines thsice_map_exf and thsice_get_exf provide the interface
a435e833b1 Mart*10147 - add an additional formal parameter to thsice_solve4temp
558a6f8862 Patr*10148 o pkg/exf:
10149 - add new fields wspeed, snowprecip (to be able to couple to thsice)
10150 - correct Stefan-Boltzmann constant
10151 - new parameter for longwave surface emittance
a435e833b1 Mart*10152 - separate some stuff from exf_bulkformulae into new routines
558a6f8862 Patr*10153 exf_radiation, exf_wind
a435e833b1 Mart*10154 - add new parameters and constants: longwave emissivity for ocean, ice
25f8242518 Mart*10155 and snow, evaporation parameters over ice
51cdae4cbe Mart*10156 - decouple wind/stress computation from ALLOW_BULKFORMULA: always compute
10157 either wind from stress or stress from wind
766e50be03 Jean*10158 o pkg/thSIce:
10159 - split thsice_step_fwd.F in 2 S/R: thsice_step_temp.F & thsice_step_fwd.F
10160 - put i,j loops inside S/R: THSICE_ALBEDO, THSICE_SOLVE4TEMP, THSICE_EXTEND
10161 and THSICE_CALC_THICKN
10162 - for now, call to THSICE_GET_BULKF remains inside i,j loops.
10163 - add CPP option: ALLOW_DBUG_THSICE and header file THSICE_DEBUG.h
10164 to make debugging easier.
10165 - affects results (@ truncation level) of global_ocean.cs32x15.thsice: update output
a435e833b1 Mart*10166 o pkg/bulk_force:
10167 - clean-up comments and parameters ;
766e50be03 Jean*10168 - add new Bulk-Formulae from Large and Yeager, 2004, NCAR/TN-460+STR ;
086faee439 Jean*10169 o fix bug in aim+thsice albedo: snow & ice thickness arguments were switched;
10170 generate new output for test-experiment: aim.5l_cs.thSI
de56cb35d0 Jean*10171 o results_ad : rename "output.txt_adm" to "output_adm.txt" and change
558a6f8862 Patr*10172 testreport accordingly
de56cb35d0 Jean*10173
0e6056cd20 Jean*10174 checkpoint58e_post (2006/05/17)
23424617f8 Patr*10175 o SEAICE_CGRID adjoint done
f66b450460 Patr*10176 o R_STAR adjoint implemented.
10177 * Seems to just work (based on global_ocean.90x40x15/code_ad_nlfs/ )
10178 * need to sort out init. of h0facc, etc.
5ff8d4a5cf Patr*10179 o Make pkg/profile fully independent of ecco,cost, etc. stuff
10180 to be able to use it in pure forward.
2619b6fb59 Patr*10181
0e6056cd20 Jean*10182 checkpoint58d_post (2006/04/21)
3112405dc7 Jean*10183 o upgrade simple test-experiment to tutorial example:
10184 step.1: duplicate the experiment and (step.2) will remove the old copy.
10185 tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box)
10186 tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere)
10187 tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation)
10188 tutorial_global_oce_biogeo <- copy of dic_example
10189 tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection)
10190 tutorial_plume_on_slope <- copy of plume_on_slope
10191 tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity)
10192 tutorial_global_oce_optim <- empty for now (David ?)
10193 tutorial_global_oce_in_p <- copy of global_ocean_pressure
10194 some tutorials (R1) were already checked-in under tutorial_examples in release1_branch
4c5f492b95 Gael*10195 o correct a sign problem in cost_scat.F
a435e833b1 Mart*10196 o obcs and ptracers: fix boundary conditions for advections schemes
10197 with larger stencil
2057f5cbae Patr*10198 o thsice adjoint: start
a435e833b1 Mart*10199 o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for
9108661f3b Mart*10200 completeness
a435e833b1 Mart*10201 o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING
562e0a15fe Mart*10202 and COSINEMETH_III, add comments in default CPP_OPTIONS.h
a4d028af27 Patr*10203 o ptracers adjoint:
10204 * avoid extensive recomputatations
10205 * fix missing re-init. of gptr (missed by TAF)
a435e833b1 Mart*10206 o obcs: add a flag (OBCSprintDiags, defaults is true) that allows
8ef23b4c75 Mart*10207 me to turn off the excessive output to STDOUT that this package produces
b030b75637 Jean*10208 o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common
10209 and add those terms in Vector-Invariant formulation.
a435e833b1 Mart*10210 o in ctrl pkg, if ALLOW_CAL, use monthly mean controls
d4f53c1fd3 Gael*10211 if the control period (xx_hfluxperiod etc) is 0
10212 o in profiles pkg, clean routines and fix details
a435e833b1 Mart*10213 o in ecco pkg, reading ssh data:
d4f53c1fd3 Gael*10214 fix problem in case the model does not start at iter0=0
587564817e Mart*10215 o fix mnc-pickup/restart for ptracers
b970da0492 Patr*10216 o new package prifiles:
10217 code to compute profile-based cost by Gael Forget
01c71301a9 Patr*10218 (modifs in ecco, ctrl, autodiff)
b970da0492 Patr*10219 o Benign bug fix in initialization (spotted by M. Mazloff) of
10220 ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F
01c71301a9 Patr*10221
0e6056cd20 Jean*10222 checkpoint58c_post (2006/03/23)
5f86d55b22 Patr*10223 o adjoint: finish NLFS adjoint and provide reference output in
10224 verification/global_ocean.90x40x15/results_ad_nlfs
a435e833b1 Mart*10225 o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the
c401c03915 Mart*10226 documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in
a435e833b1 Mart*10227 SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only
c401c03915 Mart*10228 with SEAICE_CGRID defined.
eaf6816ef6 Jean*10229 o move calendarDumps from "data" to "data.cal" and clean-up the code
10230 with a simple call to pkg/cal S/R: CAL_TIME2WRITE
10231 o add useEXF & useCAL flags (for now, set in hard-coded way)
8f72ee0f86 Jean*10232 o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum
10233 (were missing in NH mode, and wrong in quasihydrostatic mode).
10234 waiting for Chris updated version of calc_gw to add those CALLs.
10235 o fix bug in quasihydrostatic S/R ;
10236 add a test for this option: global_ocean.90x40x15.qshyd
808cde9ea6 Jean*10237 o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs.
10238 (called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS)
10239 o add on/off flag useOffLine for package OFFLINE
a435e833b1 Mart*10240 o seaice:
ed94531ee9 Mart*10241 - modify advection so that it works also on the C-grid
a435e833b1 Mart*10242 - extend loop ranges in seaice_lsr and seaice_dynsolver; fixes
ed94531ee9 Mart*10243 problem in multi-tile runs with C-grid
362dbfa680 Mart*10244 - add flags for clipping ice velocities and/or masking solver forcing
8582a6e33f Mart*10245 - fix drag (ocean on ice) formulation and a bug that caused noise in the
10246 C-grid solver
3dce9279c3 Mart*10247 - added a few comments to seaice_diffusion.F
10248 - separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V
10249 are now exclusive)
a435e833b1 Mart*10250 - add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which
3dce9279c3 Mart*10251 required re-ordering the code a little:
10252 + make DAIRN global variable (defined in SEAICE)
10253 + move computation of the viscosities eta and zeta into a new separate
10254 routine (because I need to recompute them in seaice_ocean_stress.F)
0946cb6a20 Mart*10255
0e6056cd20 Jean*10256 checkpoint58b_post (2006/03/13)
a435e833b1 Mart*10257 o AIM+thSIce: fix sign of Short-Wave through the Ice ;
12cf6f073b Jean*10258 update output.txt of exp. aim.5l_cs.thSI
9705a0d5c6 Ed H*10259 o various mnc cleanups and improvements:
10260 + shrink lookup tables by factor of ~4
10261 + better error reporting when running out of lookup space
10262 + able to handle longer path/file names (up to 500 chars)
07c24e37c2 Patr*10263 o adjoint:
10264 - Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations.
10265 - TBD: "hidden" mom_vecinv recomp. in dynamics
3975cf6076 Jean*10266 o change forcing_In_AB to affects both T,S forcing and Momentum forcing
10267 (allow to differentiate between forcing components using new integer flags:
10268 momForcingOutAB=1/0 & tracForcingOutAB=1/0)
10269 and add new flag to put Dissipation tendency out of Adams-Bashforth.
d7e0df64ad Patr*10270 o ecco
10271 - enable trend removal from SSH anomaly obs.
10272 o adjoint
10273 - a fix for PmEpR when #undef EXACT_CONSERV
10274 - fix of "hidden" recomp. in thermodynamics (no TAF warnings)
10275 - try to fix "hidden" recomp. in forward_step for NLFS
10276 (NLFS seems broken sometimes after I checked it in)
a435e833b1 Mart*10277 o seaice:
73792e16df Mart*10278 - add c-grid version of the dynamic solver:
10279 + three new routines that are the c-grid substitute lsr, dynsolver
10280 and ostres
10281 + put a few fields that were local to dynsolver into global common
10282 blocks, so that I can move the computation of stresses etc into
10283 seaice_lsr (saves coding but may break the adjoint).
10284 - replace more hardwired parameters by runtime parameters
10285 - add ice masks that mask the rhs of the implicit solvers where there
10286 is no ice (commented out in seaice_dynsolver, because i am not sure
10287 if this works properly), eventually this should replace the clipping
10288 of ice velocities in seaice_dynsolver to +/-40cm/s.
a435e833b1 Mart*10289 o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly
2f7dcdd863 Ed H*10290 include it only where its needed
a69f02f073 Mart*10291 o move balancing of fluxes before the call of external_forcing_surf
6ed81927e7 Mart*10292 o seaice:
10293 - correct units of turning angles (now they are really in degrees)
10294 - move computation of GWATX/Y out of main routine into dynsolver
10295 - initialize GWATX/Y in seaice_init
6f005fadde Jean*10296 o Apply mask on Fresh-Water flux (needed for SSH forcing).
a435e833b1 Mart*10297 update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual)
03a9a80809 Mart*10298 o seaice: add runtime flags for turning angles (default to zero)
a435e833b1 Mart*10299 o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean
4bf6063982 Patr*10300 and trend from exf forcing and ctrl control adjustments
10301 o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF
10302 (since checkpoint57x_post)
f5e99809b0 Jean*10303 o change the default rotation period to 86164.s = the Earth rotation
6fdf842d4f Jean*10304 o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T)
10305 and based on a reference stratification. Tested within hs94.cs-32x32x5.
009bbbd3aa Mart*10306 o seaice advection: add code for choosing between the default (2nd order
10307 central differences) and multiDim advection schemes provided by
10308 pkg/generic_advdiff
7d6367e3db Mart*10309 o seaice:
a435e833b1 Mart*10310 - removed all references to SEAICE_GRID.h fields from
7d6367e3db Mart*10311 dynsolver, advect, diffus, lsr, without changing the results of lab_sea
10312 (cubed-sphere configuration will change a little)
10313 - grid computations in seaice_init are obsolete now.
10314 - cleaned up code a little so that is easier to read (hopefully).
009bbbd3aa Mart*10315 - added new (better?) discretizations of default advection and diffusion
10316 (turn on with SEAICEuseFluxForm)
10317 - replace 1 in 3d global fields by kSurface in growth.F
a435e833b1 Mart*10318
0e6056cd20 Jean*10319 checkpoint58a_post (2006/02/13)
14e9b6a754 Mart*10320 o seaice:
10321 - bug fix in advect.F
a435e833b1 Mart*10322 o shelfice:
10323 - separate shelfice load anomaly from pload (breaks with time
70b0991389 Mart*10324 dependent forcing), => introduce constant field shelficeLoadAnomaly.
10325 Its default is 0., but it may be computed more cleverly from (unknown)
10326 t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
10327 done offline. A good approximation of the pressure load anomaly is
a435e833b1 Mart*10328 necessary to avoid large initial adjustment processes underneath
70b0991389 Mart*10329 deep-reaching shelfice.
e5cc225f5e Mart*10330 - small fix in ISOMIP shelfice_thermodynamics
a435e833b1 Mart*10331 - add more sophisticated thermodynamics of Hellmer (1989), this is
e5cc225f5e Mart*10332 now the default
10333 - give a few constants more intuitive names
d5413e2490 Mart*10334 o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful
10335 if bulk formulae are used in long integration (especially EmPmR). Turn
10336 on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01
10337 if balancePrintMean, the imbalance that is substracted is printed to
10338 STDOUT.
48ddec2149 Jean*10339 o fix bug (typo) in obcs_apply_eta.F
506298a7d9 Mart*10340 o add a new package shelfice which enables us to model the circulation
10341 underneath shelf-ice with draughts of hundreds of meters.
10342 - works
10343 - to do: + include improved thermodynamics
10344 + check whether kSurfC (from model/inc/SURFACE.h) can be used
10345 instead of new field kTopC
a435e833b1 Mart*10346 + can we use topoFile, Ro_surf and existing code in ini_depth.F
506298a7d9 Mart*10347 instead of new field R_shelfIce and new code in ini_depth.F
10348 and ini_mask_etc.F?
70b0991389 Mart*10349 + adjust vertical mixing schemes?
a435e833b1 Mart*10350 o seaice pkg:
10351 - add a cpp-flag to include a simple formula for a salinity dependent
f2368faea9 Mart*10352 freezing point of sea water at the surface
10353 - change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and
10354 meridional stresses are now different (and hopefully correct)
da87ea6f08 Jean*10355 o AIM pkg: change threshold on large-scale condensation to conserve Heat.
10356 update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics
10357 and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG)
a435e833b1 Mart*10358 o pkg/diagnostics: add options and parameters for regional-statistics
10359 diagnostics ; define regions by reading a region-mask from a file
575f9a835c Jean*10360 (might add other options later)
bae467ec49 Jean*10361 o pkg/bulk_force:
10362 - add option and parameters to use AIM surface-flux formulae.
10363 - Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ;
a435e833b1 Mart*10364 others forcing fields (defined in PARM05, parameter file "data") are loaded
bae467ec49 Jean*10365 from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F).
a435e833b1 Mart*10366 - initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F
bae467ec49 Jean*10367 - use the right EXCH call for uwind,vwind (to work on CS-grid).
10368 - re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h)
10369 and parameters (note: calcWindStress replaces .NOT.readwindstress).
10370 - cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP).
10371
0e6056cd20 Jean*10372 checkpoint58 (2006/01/12)
a435e833b1 Mart*10373 o add "--embed-source" option to genmake2 which, when the supporting
10374 tools can be compiled (as determined by genmake2) will turn on the
10375 embed_files package which then embeds the entire MITgcm source code
d79bbe5ed9 Ed H*10376 (*.[fFhc] + Makefile) used for the build within the executable
10377 - requested by CNH but off by default
10378 - adds a paltry <9MB to the mitgcmuv executable in most cases
10379 - only writes the output when useEMBEDSRC in eedata is true
f4ab189f71 Patr*10380 o clean up 3-dim. relaxation codes:
10381 * Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec
10382 * Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs)
10383 * Thanks to Tom Haine for testing!
10384
0e6056cd20 Jean*10385 checkpoint57z_post (2005/12/31)
b83f88edb2 Jean*10386 o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate):
10387 affects output (@ truncation level) of exp. plume_on_slope ; updated.
b00d0b5f70 Mart*10388 o fix the pickup behavior for obcs in combination with ptracers
10389 o fix a bug in ptracers_external_fields_load
10390 o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...)
10391 affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!)
10392 o transfered surface NH pressure to eta field (if exactConserv).
0330ceca59 Jean*10393 o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign)
10394 and update lab_sea output.txt file.
7276a6414c Patr*10395 o completing 3-dim. relaxation code: additional term
10396 1/tau*( theta(i,j,k) - thetaStar(i,j,k) )
10397 in S/R EXTERNAL_FORCING_T (file external_forcing.F)
10398 * At compile time, in "EXF_OPTIONS.h" set
10399 #define ALLOW_CLIMTEMP_RELAXATION
10400 #define ALLOW_CLIMSALT_RELAXATION
10401 * At runtime in "data", under &PARM03 set (e.g., units in seconds)
10402 tauThetaClimRelax3Dim = 15552000.0,
10403 tauSaltClimRelax3Dim = 15552000.0,
10404 * 3 cases:
10405 1) Use a constant-in-time 3-dim. field
10406 2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec.
10407 3) Real-time relax. to time-evolving prescribed field
a435e833b1 Mart*10408 o Adding Laplacian-type smoothness constraint on
3ed7687b4d Patr*10409 initial and boundary (forcing) controls (ic, bc)
a435e833b1 Mart*10410 * enable at compile-time via
3ed7687b4d Patr*10411 ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION
10412 * enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1
1014465bd0 Patr*10413 * Absolute scale somewhat unclear so far
10414 * no area weighting was included since no other cost term does so far
0330ceca59 Jean*10415
0e6056cd20 Jean*10416 checkpoint57y_post (2005/12/08)
3488aaba5f Patr*10417 First step for a NLFS adjoint
10418 o initially suppress rStar (new flag DISABLE_RSTAR_CODE)
10419 o new init. routines for calc_r_star, calc_surf_dr
10420 o still need to deal with ini_masks_etc
10421 o testreport seemed happy
0e6056cd20 Jean*10422 checkpoint57y_pre (2005/12/08)
7df36fd6a0 Patr*10423
94e76af995 Jean*10424 o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs.
1023fa2ba2 Step*10425 o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc)
81b06b0cda Step*10426 o add new offset feature to offline pkg (plus minor cleanup)
10427 o cfc fixes for final year of integration
10428 o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should
10429 be in GCHEM_OPTIONS).
10430
0e6056cd20 Jean*10431 checkpoint57x_post (2005/12/04)
7392df2720 Jean*10432 o fix testreport Pb in multiple test experiment.
4212cfbd21 Ed H*10433 o cleanup our namelist syntax in verification:
10434 - make it more F95 standards compliant (some work still needed)
10435 - allows the vast majority of our tests to work with gfortran
f3a828f7e4 Jean*10436 o Non-Hydrostatic:
10437 - put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h
10438 - fix exchange calls for CS-grid using the new EXCH_S3D_RL.
f56826ff51 Jean*10439 o Allow to apply AB on T,S rather than on AB(gT,gS):
10440 - implemented within #ifdef ALLOW_ADAMSBASHFORTH_3
10441 - use the same arrays (gtNm,gsNm) to hold tracer field at previous
10442 time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)).
10443 - need a "clever" read_pickup to restart from the other AB formulation
a435e833b1 Mart*10444 o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h
31a33cd878 Jean*10445 o remove some unused variables (reduces number of compiler warnings)
812e613baf Patr*10446 o adjoint
10447 * Disable useVariableViscosity for adjoint for time being
10448 (there are a number of extensive recomputations)
10449 * Initialize certain variables needed for adjoint
31a33cd878 Jean*10450
0e6056cd20 Jean*10451 checkpoint57w_post (2005/11/03)
b0d5c3a79b Jean*10452 o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names
10453 fix the singleCpuIO RS version of MDSWRITEFIELD
10454 and add a WARNING if using globalFiles=T with multi-processors.
1b9b94d610 Jean*10455 o write grid-file(s) in only one format (MDS or MNC): default=MNC (if
10456 using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc
b0d5c3a79b Jean*10457 o tracer advection scheme:
a435e833b1 Mart*10458 add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get
10459 those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile,
dcc36c3b47 Jean*10460 was not very convenient).
a435e833b1 Mart*10461 add implicit version for DST-3 & DST3_Flux_Limit vertical advection;
dcc36c3b47 Jean*10462 (further tests needed for the implicit DST & Flux-Limiter schemes).
1ccb4070a2 Mart*10463 o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef
10464 and sRef for convenience, handy, when you want to initialize
10465 ptracers in a large domain with a constant non-zero value. Also,
10466 untangle ptracers_init.F a little.
10467
0e6056cd20 Jean*10468 checkpoint57v_post (2005/10/13)
5e507d5445 Jean*10469 o change dome exp. to use variable viscosity in side-drag terms.
2f98dc7b12 Ed H*10470 o remove all the files from the cfc_offline test since they are now
10471 incorporated into tutorial_cfc_offline which has been producing
10472 identical results for a few days of testing
7053a0bdbe Jean*10473 o add new parameter: sideDragFactor to enable half-slip-side BC
10474 and change side-drag S/R to use viscosity from mom_calc_visc
a435e833b1 Mart*10475 (can switch back by setting sideDragFactor=0.); affects results at
10476 truncation level; regenerate output for exp.: global_ocean.cs32x10(x3),
7053a0bdbe Jean*10477 global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5).
a435e833b1 Mart*10478 o vorticity & strain are now computed without masking, to account for
cc95ee1c31 Jean*10479 no-slip-side BC in variable viscosity calculation ; mask is applied
10480 anyway later on, before computing advection/coriolis terms.
1ccb4070a2 Mart*10481 o modify exp4 to test new obcs support for reading from external files
58bf89d65c Mart*10482 and for passive tracers
a435e833b1 Mart*10483 o fix behavior of ptracers_monitor when monitor output is written to a
c760cf3af0 Mart*10484 netcdf-file; still not independent of monitor.F (writes in the same
10485 file).
a435e833b1 Mart*10486 o change default value of tRef (put a uniform, meaningful value for ocean
9807caa0b1 Jean*10487 & atmos) and initialize sRef (was missing, as Martin mentioned).
a435e833b1 Mart*10488 o Redefine viscC?Leith*. Change the coefficients of Leith viscosity
e2b2bf4d90 Bayl*10489 to be proportional to enstrophy dissipation length. Thus,
10490 viscC?leith?_new=pi*(viscC?leith?_old)^(1/3)
10491 This is now consistent with Smagorinsky and with the manual.
10492
ca1cda04e8 Mart*10493 checkpoint57u_post
ae51cb4320 Mart*10494 o OBCS and PTRACERS: add open boundary support for passive tracers
a435e833b1 Mart*10495 - either use homogenous (pseudo) v.Neumann conditions or prescribe
ae51cb4320 Mart*10496 OB-values from file; this is not different from the way theta and salinity
10497 are treated
10498 - however, Orlanski-radiation conditions are not supported, and the model
a435e833b1 Mart*10499 will stop if you use pTracers and Orlanski at the same time.
ae51cb4320 Mart*10500 - beefed up the rountine obcs_external_fields_load: now only those open
a435e833b1 Mart*10501 boundary values are overwritten with values from files for which there
ae51cb4320 Mart*10502 are really files, otherwise the OB-fields remain untouched. This makes
a435e833b1 Mart*10503 it possible to use different OBs at different ends of the domain (as
ae51cb4320 Mart*10504 with EXF)
a435e833b1 Mart*10505 o reduce number of exch calls in shap_filt (s2).
10506 o CS-grid: fix divergence contribution to Leith viscosity. Affects (@
20e058fdde Jean*10507 truncation level) 4/5 MLAdjust test results (11&12 digits match).
10508
0e6056cd20 Jean*10509 checkpoint57t_post (2005/10/03)
c126063c4a Jean*10510 o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4
10511 o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get
10512 same truncation, independent of the face number: affects affects several
10513 test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5).
02b02f5c36 Jean*10514 o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times);
c126063c4a Jean*10515 note that biharmonic viscosity + no-slip was not tested in any experiment.
76b60848db Jean*10516 o fix bug in non-linear free-surf side-drag ; generate new output for
10517 global_ocean.cs32x15(+.thsice) & global_ocean_pressure.
b22b541fe9 Ed H*10518 o make mnc honor the writeBinaryPrec flag for most kinds of output
8b81bca38d Ed H*10519 o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum
f28ad821d5 Jean*10520 o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation
10521 error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5).
b39b0f289d Jean*10522 o add brackets in multi-terms sum to get same truncation, independent of
10523 the face number (manage to get exactly same value of gU,gV at the cs-edge)
10524 affects several test. exp. Update global_ocean.cs32x15 (+.thsice).
1e9e8678dd Bayl*10525 o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax
10526 and viscA4Remax, which allow one to limit the minimum viscosity by specifying
10527 a maximum grid-scale Reynolds number. Also, changes all length calculations
10528 in the case of grid anisotropy to geometric mean of dx**2 and dy**2.
a435e833b1 Mart*10529 Suggested values of viscosity parameters found in mom_calc_visc.
1e9e8678dd Bayl*10530 Many new viscosity diagnostics available.
96c813b2a5 Jean*10531
0e6056cd20 Jean*10532 checkpoint57s_post (2005/09/20)
a435e833b1 Mart*10533 o Add clearing-house for viscosity calculations, mom_calc_visc and
10534 correct numerous bugs in LeithD and Smagorinsky discretizations.
10535 mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be
10536 used simultaneously, and to be used in mom_vecinv and mom_fluxform.
188fd32c24 Bayl*10537 Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F)
a435e833b1 Mart*10538 and with Strain-Tension viscous term calculation (mom_hdissip.F).
188fd32c24 Bayl*10539 The Strain-Tension form is now called with useStrainTensonVisc=.true.
10540 ViscAhStrain and viscAhTension are now retired.
96c813b2a5 Jean*10541 o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4".
f7f6e70984 Ed H*10542 o In response to JMC's bug report, genmake2 now ignores any soft-links
10543 that it finds in the *current* directory when searching for files.
10544 Soft-links found in any other source directories will still work as
10545 they did before.
a435e833b1 Mart*10546 o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls
df91541502 Ed H*10547 a C routine to unlimit the stack size
157ea9ae8e Ed H*10548 o mnc-ify pkg/aim snapshot vars
cf701ea57b Ed H*10549 o mnc-ify pkg/land as requested by Daniel
5bc9611487 Ed H*10550 o various changes to mnc including:
10551 - all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format
a435e833b1 Mart*10552 - output can now be grouped so that all files within a group
5bc9611487 Ed H*10553 change the ITER portion of their names in lock-step together
10554 - can now read ("global") PER-FACE (in addition to PER-TILE) files
10555 and works with both EXCH1 and EXCH2 (but needs more testing)
10556 - writing works for all verification test cases w/ g77 on Linux
10557
0e6056cd20 Jean*10558 checkpoint57r_post (2005/09/07)
88d5fee2bf Ed H*10559 o make MNC variable initialization happen earlier
84386989cd Jean*10560 o add diagnostics for (almost) each term of the momentum Eq.
66f83c2ede Jean*10561 o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics.
2be058fac5 Jean*10562 o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups)
a435e833b1 Mart*10563 o remove MINIMAL_TAVE_OUTPUT option ;
2be058fac5 Jean*10564 add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT).
69a417565e Jean*10565 o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src
10566 allows to compile without pkg/mdsio (& test successfully hs94.1x64x5)
5d1838d198 Patr*10567 o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice)
10568 o add time-dependent SST, SSS control
7e2510a0ae Patr*10569 o cost terms in ecco/ modularized (new cost_generic.F)
10570 o cost_averages routines are modularized (new cost_averagesgeneric.F)
10571 o new infrastructure for seaice model vs. obs misfits in seaice/
10572 * driver from the_main_loop.F is seaice_cost_driver.F
10573 * first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA)
10574 * gradient check in Exp. 6a of natl_box_adjoint/
10575 o natl_box_adjoint input_seaice for Lab. Sea now available online via wget
10576 (see README file)
69a417565e Jean*10577
0e6056cd20 Jean*10578 checkpoint57q_post (2005/08/19)
fa355923ad Jean*10579 o fix initialisation Pb in calc_gw (get NANs in exp5 with g77)
1660a6b12d Ed H*10580 o fix annoying months-old bug in mnc/mdsio output for seaice pkg
10581 - bug was reported by Jean-Michel and Ian Fenty
e8d8f0b10f Jean*10582 o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F)
a435e833b1 Mart*10583 update exp. cpl_aim+ocn output.
9caa94febf Patr*10584 o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT
a435e833b1 Mart*10585 Needed for high-res. runs with large global files
9caa94febf Patr*10586 to be able to limit tapelev size
10587 o Changed some tests for adjoint:
10588 * carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT
10589 * natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT
10590 * global_ocean.90x40x15/ back to default 3-level checkpointing
9094bd878c Patr*10591 o Modifications to enable scripted COMMON to MODULE conversion
10592 * verification/OpenAD/code/ has necessary scripts and description;
10593 * converts, compiles and runs successfully;
9caa94febf Patr*10594
0e6056cd20 Jean*10595 checkpoint57p_post (2005/08/01)
62807350a8 Jean*10596 o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F
10597 o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED
10598 (already the case for some pkgs, including recent MNC_init, e.g. thsice)
10599 o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP)
f39b9d8a97 Jean*10600 o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F
10601 (was already the case for dissipation with mom_vecinv,
10602 and also the case for grad.PhiHyd when staggered-timeStep)
10603 This will allow to put dissipation out-off the AB time-stepping.
10604 Unfortunately, affects truncation error. Update output of exp. that "fails"
10605 (cg2d matching number) and leave the others for later: front_relax(10),
10606 global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12),
10607 matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2).
10608
0e6056cd20 Jean*10609 checkpoint57o_post (2005/07/30)
a435e833b1 Mart*10610 o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and
50653b81f1 Ed H*10611 (2) its ready to be documented during the 20050801 DocFest
a435e833b1 Mart*10612 o MNC-ify the gmredi package -- tested and works w/ and w/o mnc
e2d47178e0 Ed H*10613 for ideal_2D_oce and lab_sea on linux_ia32_g77
f48a8b1137 Patr*10614 o set to #undef CTRL_SET_OLD_MAXCVARS_30
10615 in global1x1_tot/code_seaice_adj to access indices 32, 33
10616 (worth another tag)
e2d47178e0 Ed H*10617
0e6056cd20 Jean*10618 checkpoint57n_post (2005/07/29)
fbb2516727 Patr*10619 o adding precip control xx_precip 32
10620 o adding swflux control xx_swflux 33
53a1c5d19a Patr*10621 o Replacing 10 forcing penalty cost routines by 1 generic.
10622 o Implementing partitioning in time-mean and variable adjustment
10623 for atmos. state.
10624 o Time-mean constant error is now read in data.ecco (instead of hard-coded)
08f22f958d Patr*10625 o in natl_box_adjoint:
a435e833b1 Mart*10626 * updated exp 1 to 10
53a1c5d19a Patr*10627 (but does not have time-mean vs. variable split results yet)
455751fbdb Patr*10628 o updated global1x1/*_seaice_adj/
10629 to incorporate latest changes
df05ad6e2a Patr*10630 o enable useSingleCpuIO for mdsio vector routines
10631 (applies in particular to tapelev I/O)
10632 o removed inefficient K-loop in all active_file*control*.F
3d0327d769 Patr*10633
0e6056cd20 Jean*10634 checkpoint57m_post (2005/07/28)
c0c2091c08 Jean*10635 o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into)
10636 and advect_cs (use EXCH-2 and standard cs-32 grid files).
a435e833b1 Mart*10637 o pkg/exch2: filling of face-corner halo regions is optional
d6f0fdc2ab Jean*10638 (ifdef W2_FILL_NULL_REGIONS) and is turned off by default.
10639
0e6056cd20 Jean*10640 checkpoint57l_post (2005/07/14)
a435e833b1 Mart*10641 tag before updating tutorials (pre-release-2)
9ce7209758 Jean*10642 o add cos & sin of grid-direction orientation angle (curvilinear grid only,
10643 for output and interpolation of input fields onto model grid)
10644 o fix radius in mom_v_metric_cylinder.F (wrong by dy/2).
10645 Affects results of exp. rotating_tank ; update output.txt.
27356e724c Jean*10646 o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor
6e29458d64 Jean*10647 and taking the square quantity and/or using a fraction-weight field.
27356e724c Jean*10648 o fix aim_diagnostics_init.F mate numbers.
10649 o add mnc output capability to diagnostics/diagstat and update
106a65ba8a Ed H*10650 our cvsignore files for the ACSII output generated
10651
0e6056cd20 Jean*10652 checkpoint57k_post (2005/07/02)
508b8225ad Patr*10653 o lab_sea now uses diagnostics package and provides a suite of
10654 new EXF diagnostics output.
10655
0e6056cd20 Jean*10656 checkpoint57j_post (2005/06/30)
61b6aef6a7 Patr*10657 o exf
10658 * bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton):
10659 Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982);
10660 terms -2*ATAN(x) + pi/2 were added to both stable and unstable case.
10661 * extended diagnostics output
10662 - now includes all EXF variables
10663 - hs, hl moved to common block
10664 - separate S/R for diagnostics, called after ctrl vector is added
10665 - name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet
10666 - EXFqnet contains true Qnet (i.e. includes qsw)
10667 * updated verif. lab_sea, global_with_exf
10668 * Rearranging hflux (exf_mapfields -> exf_getforcing)
10669 to ensure that diagnostics sees a true EXFqnet
f529aaf45d Jean*10670 o add matlab scripts for CS-grid vectors (in utils/cs_grid)
f4f7b96c0e Jean*10671 o diagnostics pkg: change pointers so that 1 diagnostic can be used
10672 several times with different frequencies.
df4e8f7bcf Ed H*10673 o mnc-ify the thsice package as requested by Daniel Enderton
10674 - the monitor--MNC output needs work
10675 - many attributes need to be added (most are currently blank)
10676 o mnc-ify theaim_v23 package as requested by Daniel Enderton
10677 - many attributes need to be added (most are currently blank)
24babd248d Jean*10678 o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign)
cafbc21546 Jean*10679 o add Sadourny like discretization to the 4th.O vorticity advection scheme
a435e833b1 Mart*10680 o fix bug in rStar code (calc_r_star.F) when used with topo/bathy.
a3075797a1 Jean*10681 update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn,
10682 fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice).
85f899f51b Jean*10683 o fix few little things to avoid floating error with -ftrapuv (ifort v9)
10684 (ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F)
10685
0e6056cd20 Jean*10686 checkpoint57i_post (2005/06/19)
d1a9b8a2b9 Andr*10687 o Diagnostics package was changed: diagnostic allocation is now deactivated
10688 by setting an empty file name in the namelist (used to be by setting 0 frequency)
78a781bbae Jean*10689 o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ;
10690 add 1rst Order upwind vertical Shear.
eb47174845 Ed H*10691 o add a quick fix for A/B checkpointing in OFFLINE mode
4b08b6ee66 Ed H*10692 o add IGNORE_TIME define and -ignore_time option to genmake2 as an
10693 end-run around the C/Fortran linking horror in eesup/src/timers.F
2e9be4c81e Alis*10694 o added pkg/runclock: allows user to terminate run based on wall clock
10695 o added non-hydrostatic scaling parameter: nh_am2
8fef4b1a57 Mart*10696 o pkg/my82: futile attempt to make results compiler-independent by adding
10697 some "_d 0", etc. no effect.
a435e833b1 Mart*10698 o for mnc output, fill the 'T' coordinate var with myTime and create a
987ff12cb6 Ed H*10699 separate 'iter' variable for iteration count
a435e833b1 Mart*10700 o pkg/diagnostics:
37224b77cb Jean*10701 add new capability: output of Global/Regional & per-level statistics ;
10702 tested against monitor output (including land & thSIce) on various exp.
10703 o make seaice-pkg I/O type flags (MNC/MDS) more standard.
b9d81c4350 Jean*10704
0e6056cd20 Jean*10705 checkpoint57h_done (2005/05/19)
a435e833b1 Mart*10706 tag after changing user customized files (DIAGNOSTICS_SIZE.h,
74630d4888 Jean*10707 data.diagnostics, data.gchem, data.ptracers) is done.
10708
a435e833b1 Mart*10709 o pkg/diagnostics: prepare for Global/Regional statistics.
10710 add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h
83f253cab3 Jean*10711 o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
10712 and rename it: DIFFERENT_MULTIPLE
10713
0e6056cd20 Jean*10714 checkpoint57h_post (2005/05/14)
8e5ee067a3 Jean*10715 o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers
0da48370b7 Jean*10716 o pkg/diagnostics: change output frequency, now in seconds (instead
10717 of Nb of iterations). This requires to change data.diagnostics.
0e6056cd20 Jean*10718 checkpoint57h_pre (2005/05/12)
51dd5bf40e Jean*10719
41ce3f2380 Ed H*10720 o in mnc, let the user create the output dir if both mnc_outdir_date
10721 and mnc_outdir_num are false
06fffa8fd5 Ed H*10722 o add fflags() to pkg/diagnostics which allows one to specify, on a
10723 per-file basis, the file precision [default behavior is unchanged]
7e819019d5 Dimi*10724 o added diagnostics to pkg/kpp, including computation of mixed layer
10725 depth based on a temperature/density criterion
10726 o updated verification/natl_box to test the new pkg/kpp diagnostics
7bc0d239f7 Jean*10727 o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T)
300c0d54fc Jean*10728 o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4)
9a87ea5e43 Ed H*10729 o fix mnc flags in pkg/seaice so that they are "owned" by seaice,
10730 not mnc -- this mistake was found by JMC and is now corrected
10731
0e6056cd20 Jean*10732 checkpoint57g_post (2005/04/15)
79e87d2e6d Jean*10733 o add Adams-Bashforth 3rd Order time stepping:
10734 - default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3)
10735 - not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ...
0e6056cd20 Jean*10736 checkpoint57g_pre (2005/04/15)
af908d3f0e Jean*10737
5ab5d7f263 Patr*10738 o make lambda[Theta,Salt]ClimRelax spatially varying
10739 (default remains spatially uniform constant based on tau)
ce442b4534 Patr*10740 o added new control variables
10741 * init. uVel, vVel, etanN
10742 * lambda[Theta,Salt]ClimRelax
10743 o separate masks used for ctrl_pack/unpack 'from write_grid' output
10744 (suggested by G. Forget)
5ab5d7f263 Patr*10745
0e6056cd20 Jean*10746 checkpoint57f_post (2005/04/06)
a80a5e8cfd Jean*10747 o add parameter "baseTime" = model base time = time at iteration zero
a435e833b1 Mart*10748 new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to
a80a5e8cfd Jean*10749 account for baseTime shift
10750 o move Coriolis arrays from PARAMS.h to GRID.h
0e6056cd20 Jean*10751 checkpoint57f_pre (2005/04/06)
ee61c20a30 Jean*10752
de859229b1 Ed H*10753 o mnc-ifying the seaice package
de01be390b Alis*10754 o introduced an alternative length scale calculation for use in the limiting
10755 maximum viscosity (off by default, see mom_vi_hdissip.F for details)
2d80ef5b25 Patr*10756 o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S
a435e833b1 Mart*10757 o added modified Leith scheme with viscosity proportional to grad(Hdiv)
b4b9669a6b Bayl*10758 as well as grad(vort3). Made it compatible with both approximate form
10759 for the cubed sphere and full form of these gradients. Added flag
a435e833b1 Mart*10760 useFullLeith to select between approximate and full form.
02718ea810 Jean*10761 o add "d0" in getcon.F to reduce differences between compilers/platforms
10762 update output.txt of exp. fizhi-gridalt-hs
5103c42ce9 Jean*10763 o change port_rand funtion to allow to set the seed.
409155d7b6 Ed H*10764 o fix obscure MNC bug involving conversion between reals and integers
a435e833b1 Mart*10765 - it caused no problems with certain (eg. gcc, ifc) compilers but the
409155d7b6 Ed H*10766 new version is now more standards-compliant
4645654aba Patr*10767 o adjoint-related modifications
10768 * gad_dst3_adv_?: to be able to use advscheme=30 in adjoint
10769 * gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33
10770 * mom_vi_hdissip: to be able to use Leith scheme in adjoint
409155d7b6 Ed H*10771
0e6056cd20 Jean*10772 checkpoint57e_post (2005/02/28)
a4f6b487ba Patr*10773 o Adding eddy stress controls a la Ferreira et al.
5245708a89 Jean*10774 checkpoint57e_pre (actually was tagged: eckpoint57e_pre)
f30908c65d Patr*10775
eee5dc53df Jean*10776 o fizhi pkg: fix AtoC and CtoA when called with same input & output array
10777 update output.txt of exp. fizhi-gridalt-hs
2cc3b69a26 Ed H*10778 o add more "Z" dimensions and associated coordinate vars to MNC
c098ac3e0d Dimi*10779 o pkg/exf: added twoDigitYear capability for option useExfYearlyFields
fc64655a31 Dimi*10780 o parameter calendarDumps: when set, approximate months (30-31 days) and years
10781 (360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq,
10782 KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar
10783 months and years. Requires pkg/cal.
ee2e7fad64 Ed H*10784 o diagnostics: add pickup functionality
10785 - off by default for backwards compatibility
10786 - current version only uses MDSIO -- MNC will be added
9723cb5244 Jean*10787 o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies.
26c7db4c78 Jean*10788 o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2)
10789
0e6056cd20 Jean*10790 checkpoint57d_post (2005/02/11)
06d5464476 Jean*10791 o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing
a435e833b1 Mart*10792 o modify verification/ideal_2D_oce so that it tests the creation of mnc
91cf1175df Ed H*10793 output from the diagnostics package
24ef99fe7f Jean*10794 o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up
6554790d1c Ed H*10795 o make genmake2 more portable by using ".$FS" instead of ".f" for more
10796 of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys)
e8743b4419 Ed H*10797 o add coordinate variables to the MNC output from the diagnostics package
a629410b0b Jean*10798 o change MNC-flags default value: true when useMNC=TRUE
e808c5b132 Ed H*10799 o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F
a435e833b1 Mart*10800 the ability (off by default) to read the grid information using MNC
7a3f7c0b47 Jean*10801 o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt
0557aa5c83 Jean*10802 o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging
a435e833b1 Mart*10803 o do snap-shot diagnostics at the middle of the time-interval (instead of
fde699a81e Jean*10804 at the end).
40893cb58a Jean*10805 o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add
10806 new test for AIM with thSIce + slab-ocean
dd3fb239f5 Jean*10807 o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h)
440b7157f3 Jean*10808 o move state variable diagnostics to the beginning of the time step ;
10809 (note: still needs some work specially for snap-shot diagnostics)
10810 duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z
10811
0e6056cd20 Jean*10812 checkpoint57c_post (2005/01/27)
c130fcff71 Jean*10813 o Change testing option (-ieee) to get closer agreement between g77 & ifort
10814 o generate new output.txt files on faulks with g77 & the new -ieee option
0e6056cd20 Jean*10815 checkpoint57c_pre (2005/01/27)
7ba28f2af1 Jean*10816
10817 o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF);
5a35007c50 Jean*10818 update output.txt of exp. global_ocean.90x40x15
a435e833b1 Mart*10819 o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer
6643de8305 Jean*10820 results; update global_ocean_pressure & global_ocean.cs32x15 output.txt
5f46ec9135 Jean*10821 o add saltFlux(+File) forcing capability with periodicExternalForcing
97038d3c07 Jean*10822 o allow to use pkg diagnostics for GM-Redi & ThSIce output
10823 o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc.
35ef3a0982 Ed H*10824 o improvements for the MNC output from DIAGNOSTICS:
10825 - correct handling of the unlimitied dimension
10826 - all dims now have associated coordinate variables
10827 - variables located at U, V, and Corner ("Z") points are now written
a435e833b1 Mart*10828 with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that
35ef3a0982 Ed H*10829 *all* data points are output
8d9f2d1888 Dimi*10830 o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice
e1a538cff8 Dimi*10831 o added pkg/seaice/seaice_monitor.F
fcf5946e08 Dimi*10832 o mdsio_readfield.F can now read files visible only to master MPI process.
714116e714 Dimi*10833 o pkg/seaice: some test code for ice-modified ocean stress
4aa81846e7 Dimi*10834 o exf_getffields interpolation defaults to bilinear for all scalar forcing
10835 fields (remains bicubic for wind velocity and stress). This avoids, e.g.,
10836 spurious negative numbers for precipitation and humidity. Will cause
10837 some small numerical differences for integrations using pkg/exf/exf_interp.F.
a3296ad516 Patr*10838 o pkg/ctrl/
10839 * Add ctrlvec diagnostics in pack/unpack for nondimensional I/O
10840 May be enabled via doPackDiag
a435e833b1 Mart*10841 * introduce z-scaling of
10842 + gradient (doZscalePack) and
a3296ad516 Patr*10843 + control (doZscaleUnpack)
10844 o pkg/mdsio/
10845 * enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F
10846 * N.B.: leave tiled I/O for tapelev (i.e. mds...vector)
4aa81846e7 Dimi*10847
0e6056cd20 Jean*10848 checkpoint57b_post (2004/12/20)
0cf6e0ada1 Jean*10849 o simplify options in diagnostics_fill arguments (remove weird combinations)
2f38f768b3 Ed H*10850 o fix MNC coordinate variables so that they now contain per-face index
a435e833b1 Mart*10851 values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in
2f38f768b3 Ed H*10852 general, EXCH2 grids are only aligned to a "local" coordinate system
34bd0f9de0 Jean*10853 o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput)
10854 o Implement instantaneous output within pkg diagnostics:
10855 setting a negative frequency in data.diagnostics produces
10856 "snap-shot" output (as opposed to time-average if freq > 0)
ed27c6ee8e Jean*10857 o move out off EQUIVALENCE all diagnostics that fizhi does not use ;
a435e833b1 Mart*10858 NOTE: change ptracer diagnostics name: use 2 characters to work with
ed27c6ee8e Jean*10859 more than 9 tracers. Add also diagnostics of advect & diffus flux.
a435e833b1 Mart*10860 o more CF compliance: convert all MNC 'iter' variables to 'T' so that it
18eb3f79fd Ed H*10861 becomes the coordinate variable for the 'T' dimension
d77e828db7 Ed H*10862 o add CF-style coordinate variables to MNC
a435e833b1 Mart*10863 - just a first cut: numbers are meaningless on the cubesphere and
d77e828db7 Ed H*10864 missing along the T axis but otherwise it works!
e07cbe4110 Dimi*10865 o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX
047c5644f3 Jean*10866 o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC.
9a922069e0 Jean*10867 o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon)
10868 this is based directly on what the model compute, so that the content of
10869 each diagnostics might be affected by switching options (e.g., implicitDiffusion)
10870 o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F)
a435e833b1 Mart*10871 o clean up build options files for SunOS, in particular
e8f00bfc75 Mart*10872 - remove -traditional from xmakedepend
10873 - change -xarch=v9 to -xarch=native for f77
10874 - restore use of make (not gmake)
10875 - add CC=gcc if using g77
7af35f0733 Ed H*10876 o changes per discussion of AM, JMC, & EH3 today:
a435e833b1 Mart*10877 - move redundant "grid" variables out of "state" -- in preparation of
10878 creating proper CF-style coordinate variables and in recognition
10879 that any/all grid variables can be easily copied (eg. w/NCO) from
7af35f0733 Ed H*10880 the grid files into any of the other NetCDF files
a435e833b1 Mart*10881 - *always* output grid variables with MDSIO (this will eventually be
7af35f0733 Ed H*10882 changed)
10883 - output MNC grid file if useMNC is true
a435e833b1 Mart*10884 o every instance of _END_MASTER() has been found and replaced with
10885 _END_MASTER( myThid ) in order to satisfy certain picky Sun
ea6e02f692 Ed H*10886 preprocessors
ee5c9de779 Jean*10887 o re-arrange diagnostics pkg initialisation:
10888 - allow each package to extend the available diagnostics list
10889 - add some checking and fix small problems (multi-threaded, ...)
10890 - new S/R diagnostics_fill (replace fill_diagnostics):
10891 look through the short list of active diag. (instead of the long list)
10892 create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active
617e9c07f6 Ed H*10893
0e6056cd20 Jean*10894 checkpoint57a_post (2004/12/10)
6ff6896d7d Patr*10895 o this set of changes restores TAMC compatibility
10896 tested for global_ocean.90x40x15 adjoint on trough
10897 (what a pain)
10898
0e6056cd20 Jean*10899 checkpoint57a_pre (2004/12/10)
4161b94ac5 Patr*10900 o some modifs in tools/build_options for sunos
10901 o call ctrl_pack for ctrl at end for optimcycle=0
10902
0e6056cd20 Jean*10903 checkpoint57 (2004/12/09)
7bcb6cc723 Mart*10904 o add horizontal bi-harmonic viscosity for vertical velocity
10905 - new parameter viscA4W (defaults to viscA4)
10906 - affects only non-hydrostatic code
10907 - to be done: no-slip lateral boundary conditions
af994d39e8 Dimi*10908 o switch back to "sflux = sflux - runoff" in exf_getforcing.F
f9712caa2c Jean*10909 o implement Implicit Vertical advection for pTracers
2c4cea51ae Jean*10910 o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k)
e97e7f4284 Jean*10911 (implemented also for implicit vertical diffusion & advection)
5428496056 Mart*10912 o OBCS: extend application of tracer open boundary conditions
10913 to a strip beyond the boundary of width Olx/Oly
14137e831b Patr*10914 o add call monitor to TAF set of required calls (flow directives)
10915 and include in natl_box_adjoint
10916 o untangle a few ifdefs related to cost, ctrl, autodiff
10917 untangel a few ALLOW_ECCO_OPTIMIZATION
e5d44c8b0d Patr*10918 o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr)
10919 (theta2, salt2 in ecco_cost_weights)
5428496056 Mart*10920
0e6056cd20 Jean*10921 checkpoint56c_post (2004/12/03)
93ea71777b Mart*10922 o OBCS as control variables
10923 - update ctrl_ad_diff.list, obcs_ad_diff.list
10924 - remove balance of obcs controls from default
10925 - fix index bug nobcs in ctrl_init
10926 - fix dummy fields filen in ctrl_pack
10927 - add dummy weights for obcs
10928 o lsopt: comment out fort.94 output
a435e833b1 Mart*10929 o optim:
93ea71777b Mart*10930 - remove unnecessary header files
10931 - adjusted namelists
10932 - add xerbla.F to Makefile
a435e833b1 Mart*10933 o exf:
93ea71777b Mart*10934 - multiple modifications of exf_check_range
10935 - unit change in exf_init_runoff from [m/year] to [m/s]
10936 o mdsio:
10937 - i/o-vector change debugLevel from debLevA to debLevB
10938
0e6056cd20 Jean*10939 checkpoint56b_post (2004/12/01)
8a588e179e Mart*10940 o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that
10941 is called from DO_THE_MODEL_IO
10942 - rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE
10943 - introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq)
10944 - clean up PTRACERS_WRITE_TIMEAVE a little
233b414ed8 Mart*10945 o add another verification experiment that tests both the cfc-pkg and
a435e833b1 Mart*10946 the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with
233b414ed8 Mart*10947 reactive tendencies treated inline with regular timestepping
d8c583b49a Mart*10948 o testreport previously did a lousy job of comparing small numbers, so
10949 we (Ed and Martin) changed the way the cut-off of 1.e-12 is
10950 implemented in the little c-progam tmp_cmpnum.c which is embedded in
a435e833b1 Mart*10951 testreport.
d8c583b49a Mart*10952 o ptracers_monitor: bug fix for MPI
10953
0e6056cd20 Jean*10954 checkpoint56a_post (2004/11/28)
bdb2728325 Mart*10955 o GCHEM: finish reorganizating the package
a435e833b1 Mart*10956 - forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency
bdb2728325 Mart*10957 (introduces another 3D-array for each passive tracer, but only if
10958 GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING
10959 gchemTendency is not needed because the timestep is done separately)
10960 - gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY
10961 - GCHEM is now---more or less cleanly---separate from PTRACERS
10962 - to bo done: handling of surfaceForcingPtr that is needed for KPP not
10963 so clear to me how that should be done in a general way.
10964 o CFC: improve formatting of output in CFC_ATMOS
10965 o PTRACERS:
10966 - rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so
10967 that ALL experiments with ptracers enable can be checked. This makes
10968 GCHEM_MONITOR obsolete.
10969 - include a runtime parameter PTRACERS_monitorFreq that defaults to
10970 monitorFreq
a435e833b1 Mart*10971 - set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true
68c34fd102 Ed H*10972 o add PTRACERS (PTR0[1-5]) to testreport output
b3bbb0d458 Patr*10973 o exf_check_range:
10974 * default changed to .TRUE.
10975 * will check values for niter0 if debLevA, every timestep if debLevB
10976 * STOP in exf_check_range if 'out of range'
10977 * range chosen generous to allow for potential extema
10978 TBD: a version with stricter range
10979 permitted range would be runtime parameters
5f42c34bbe Jean*10980 o GMredi:
10981 - fix ldd97 slope limit ; extend valid domain of Psi-Bolus ;
10982 - change S/R GRAD_SIGMA to be valid in the overlap on CS-grid.
10983 - change the default GMREDI_OPTIONS.h: compile everything except Visbeck
a435e833b1 Mart*10984 o GCHEM:
31940778af Mart*10985 - move call to GCHEM_FORCING_SEP, so that it is now called before
10986 the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP
a435e833b1 Mart*10987 - introduced a useGCHEM runtime flag and applied it everywhere.
26bcdcd4f0 Mart*10988 - renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING;
10989 this flag is now only visible within GCHEM-pkg routines.
10990 - moved gchem_forcing_int temporarily into ptracers_forcing, this will
a435e833b1 Mart*10991 be replaced by a 3D array that is computed before thermodynamics; for
26bcdcd4f0 Mart*10992 this, the tracer ID iTracer had to be included into the parameter list
10993 of ptracers_forcing
a435e833b1 Mart*10994 - set up forward_step to call gchem_forcing, that will replace
26bcdcd4f0 Mart*10995 gchem_forcing_int in ptracers_forcing
10996 - cleaning up
3e021cd85f Jean*10997 o small cleaning of exch2: remove files that are also in eesupp/src
30a55c64a0 Mart*10998
0e6056cd20 Jean*10999 checkpoint56 (2004/11/17)
0608749963 Jean*11000 o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0
2f14a1f812 Ed H*11001 o mnc: cleanup "full" files--fixes out-of-memory problem
c715d0b027 Patr*11002 o ECCO-GODAE
11003 * model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup
11004 * fully merged and updated from SIO code
11005 windstress sign change affects
11006 - exf_inscal_[u/v]stress
11007 - sign of xx_tau[u/v] adjustments
11008 - signs in cost_scat
11009 * ctrl_get_gen: avoid update of tau[u/v] for first few days
11010 * natl_box_adjoint updated and compressed
11011 * 2-level checkpoint switch added
11012 (tested in EXP. 1 of natl_box_adjoint)
11013 * new switch doInitXX to avoid init. of xx_... in optimcycle=0
11014 o SVD
11015 * first complete, non-hacked version for SVD calculations
11016 * all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_...
11017 performed via direct access files admtlm_vector.it????
11018 (via ctrl_[un]pack)
11019 * optimcycle is used for ARPACK iteration counter
11020 (note: adxx_... is iterated, rather than xx_...; latter is constant!)
11021 * EV problem ok w.r.t. L2-norm in tangent space; need to check other norms
a435e833b1 Mart*11022 and add linear transforms where necessary
c715d0b027 Patr*11023 * controls are initial/final SST, SSS (can be extended; need to check
11024 ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F
11025 o mdsio: filename info to both stderr, stdout
11026 o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec]
a435e833b1 Mart*11027 from sign change
2f14a1f812 Ed H*11028
0e6056cd20 Jean*11029 checkpoint55j_post (2004/11/10)
4c23dd3d61 Jean*11030 o isolate dissipation tendency (allow to keep it out off AB) in V.I form.
11031 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
617e9c07f6 Ed H*11032 o add consistent build directories and .cvsignore files to verification
070e727a0d Dimi*11033 o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity
a435e833b1 Mart*11034 o make all subroutines 30 or less characters in length for certain older
11035 compilers to work (a thorough search only turns up two routines in
064f472621 Ed H*11036 pkg/ptracers)
a435e833b1 Mart*11037 o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity;
7066de6cf6 Jean*11038 affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice)
11039
0e6056cd20 Jean*11040 checkpoint55i_post (2004/10/28)
92cbe40bc9 Jean*11041 o change arrays for total vertical diffusivity (2.D if explicit,
11042 3.D if implicit) ; each ptracer uses its own background value.
73983c4f5f Ed H*11043 o added mnc/NetCDF output capability to ocn_compon_interf
a435e833b1 Mart*11044 - added bits to verification/cpl_aim+ocn so that it can run on
73983c4f5f Ed H*11045 ITRDA and other clusters without the mpirun "-wd" option
0de9c264f0 Andr*11046 o fixed wayward endif in mom_fluxform.F that messed up cyclindrical
a435e833b1 Mart*11047 configuration
11048 o give MNC the ability to create additional files rather than
11049 exceeding a specified file size limit "MNC_MAX_FILESIZE"
11050 - the default is just less than 2GB which is a practical limit
ab11ba1276 Ed H*11051 on many systems
a435e833b1 Mart*11052 o Compute the non-local term using either KPP vertical diffusivity (=default)
60fa91c126 Jean*11053 or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T)
9f675e95f9 Jean*11054
0e6056cd20 Jean*11055 checkpoint55h_post (2004/10/20)
19afae78f4 Jean*11056 o add verification test "vermix"
ff63a227b0 Ed H*11057 o remove all the *_ioinc flags and replace with the single global
11058 outputTypesInclusive flag
69377f8682 Jean*11059 o allow to set a vertical profile of vertical diffusivity for T & S
19afae78f4 Jean*11060 o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS
11061 o useMNC moved from data.mnc to data.pkg
69377f8682 Jean*11062
0e6056cd20 Jean*11063 checkpoint55g_post (2004/10/14)
6b1c25ae7b Patr*11064 o Renaming carbon AD experiments to comply with testreport conventions
11065 o Updating adjoint of Held-Suarez hs94.1x64x5
11066 o Fixing directives for non-ECCO forward_step, after ECCO directives
11067 have been fixed to avoid recomp. of do_oceanic_phys
11068 Works well for global_ocean.90x40x15,
11069 but recomp. issue remains for carbon
a435e833b1 Mart*11070 o Updating adjoint output for natl_box_adjoint after
6b1c25ae7b Patr*11071 pkg/ecco has been modified (see taga c55d_post)
11072
0e6056cd20 Jean*11073 checkpoint55f_post (2004/10/13)
8a3e9d877a Ed H*11074 o rename to timeave_init_fixed
11075
0e6056cd20 Jean*11076 checkpoint55e_post (2004/10/13)
d6be6cad8f Patr*11077 o some delicate re-shuffle of store directives to avoid one
11078 extra call of do_oceanic_physics
11079 affects ecco_the_main_loop.F, do_oceanic_physics.F
11080 checkpoint_lev1_directives.h
11081 o NB: this may break global_ocean adjoint temporarily,
11082 but it is clear how to fix it. Will do later, need this now.
11083
0e6056cd20 Jean*11084 checkpoint55d_post (2004/10/11)
75d667876f Patr*11085 o ECCO specific cost function terms (up-to-date with 1x1 runs)
11086 o ecco_cost_weights is modified to 1x1 runs
11087 o modifs to allow observations to be read in as
11088 single file or yearly files
11089 o enable to read exf forcing fields as either
11090 single file or yearly files (flag useExfYearlyFields)
0e6056cd20 Jean*11091 checkpoint55d_pre (2004/10/08)
75d667876f Patr*11092
11093 o switch between 2-level and 3-level checkpointing
a435e833b1 Mart*11094 o add ability of MNC to write local and "partial" (eg. 2D slices where
cb356b4c5f Ed H*11095 the full 3D field is never actually stored) arrays to NetCDF files
a435e833b1 Mart*11096 with the correct (that is, the complete multi-dimensional) set of
cb356b4c5f Ed H*11097 array indicies
11098 - used in mom_vecinv() to write the diagFreq output
11099 - tested (demonstrated) in verification/aim.5l_cs
c9c3d7103f Ed H*11100 o further mnc-ification
11101 - add verification/lab_sea to the list with mnc setups
11102 - fix undefined mnc v-names in cd_code
11103 - add kpp to mnc output (both snapshot and timeave)
6deb815953 Mart*11104 o non-hydrostatic code
11105 - added horizontal viscosity parameter viscAhW for w, that replaces viscAh
11106 in calc_gw.F
11107 - defaults to viscAh
11108 - this is useful, when I want to use viscAh=0 (e.g., only biharmonic
a435e833b1 Mart*11109 friction or Leith) in non-hydrostatic mode, as long as there is
6deb815953 Mart*11110 no biharmonic friction and/or Leigth or equivalent for vertical velocity.
449f3c105b Patr*11111 o pkg/cost
11112 extend simple cost functions to treat time mean quantities
11113 (T,U,V) via cost_accumulate_state from cost_tile
4ddf54cc90 Jean*11114 o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to
11115 be 2 times larger than the minimum size the advection scheme requires.
11116 now get a perfect conservation of salt in advect_cs test-exp (updated)
76f580e1f0 Mart*11117 o GGL90 (Gaspar's TKE mixed layer)
a435e833b1 Mart*11118 - add horizontal diffusion of TKE, requires exchanges in
11119 do_fields_blocking_exchanges, horizontal diffusivity is zero by
11120 default. In OPA there is no horizontal diffusion of TKE but the
76f580e1f0 Mart*11121 mixing coefficients are computed from a horizontal average of TKE of
11122 6 points or so. I think that diffusion has a little more physical
11123 justification.
a435e833b1 Mart*11124 - clean up ggl90_calc in the hope of reducing memory usage (this hope
76f580e1f0 Mart*11125 was in vain)
11126 - mask tke-variable in ggl90_init
3c38934f04 Jean*11127 o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass)
11128 o fix biharmonic diffusion on CS-grid.
78800a222d Mart*11129 o more obcs stuff
11130 - added obcs_external_fields_load as an alternative to the EXF-pkg option
a435e833b1 Mart*11131 for reading boundary values. This routine is called from
78800a222d Mart*11132 obcs_prescribe_read
11133 - updated obcs_check
965df15d92 Mart*11134 - changed sponge layer relaxation parameter units for days to seconds
11135 - turned off sponge layer by default
5720994acc Patr*11136 - changed argument list of OBCS_CALC to myTime+deltaTclock
b67ae883c8 Mart*11137 - fixed about 35 bugs in obcs_external_fields_load
78800a222d Mart*11138
0e6056cd20 Jean*11139 checkpoint55c_post (2004/09/23)
38224ac59a Patr*11140 o obcs stuff
11141 - new runtime flags useOBCSprescribe, useOBCSbalance
11142 - re-arranged obcs_calc
11143 - moved exf_getobcs to obcs_prescibe_read
11144 obcs_prescibe_read is called after ORLANSKI stuff
11145 and independent of it (executable can contain all).
11146 - updated obcs_check
64e4c8fd27 Patr*11147 - added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE.
11148 These may be necessary only if tangential velocities are
11149 prescribed at OB, not sure, needs testing.
2509c39694 Ed H*11150 o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments
11151 which simplifies the calls and passes the ifc check-bounds test
11152
0e6056cd20 Jean*11153 checkpoint55b_post (2004/09/22)
6fdcc18f80 Jean*11154 o add a 2D scalar, Z location, exchange_2 routine.
9f675e95f9 Jean*11155 o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows
11156 to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)]
11157 affects advect_cs results (for the wrong reason): update output.txt
a435e833b1 Mart*11158 o use a more standard discretization for biharmonic viscosity ;
df39a169f0 Jean*11159 (original version still available with #define MOM_VI_ORIGINAL_VISCA4 )
a435e833b1 Mart*11160 affects results of dome set-up: update output.txt
df39a169f0 Jean*11161 o fix gad_advection.F (CubedSphere part), back to version 1.23
11162 o fix bug in mom_vi_del2uv.F (CubedSphere part).
58031354dd Mart*11163
0e6056cd20 Jean*11164 checkpoint55a_post (2004/09/20)
a435e833b1 Mart*11165 o merged code to
96bbd4e2a5 Patr*11166 * prescribe/read time-dependent open boundaries
11167 (works in conjunction with exf, cal)
11168 * sponge layer code for open boundaries
11169 * each boundary N/S/E/W now has its own CPP option
11170 (healthy for the adjoint)
11171
0e6056cd20 Jean*11172 checkpoint55 (2004/09/17)
334b55a5b0 Patr*11173 o up-to-date adjoint of previous breaks
11174 - natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix
11175 - global_ocean_ebm: adjoint still needs fix (TLM ok)
11176 - global_ocean.90x40x15: extended GMREDI_OPTIONS.h
11177 - carbon: * remove tr1-related adjoint verification
11178 * add ptracer as control variable
11179 o remove all tr1-related code (ALLOW_PASSIVE_TRACER)
11180 (adjoint stuff still has some tr1 'names', but all use ptracer arrays)
11181
0e6056cd20 Jean*11182 checkpoint54f_post (2004/09/16)
d3c81fef04 Patr*11183 o in verification/carbin/ remove experiment related to
11184 ALLOW_PASSIVE_TRACER (array tr1 etc)
11185 code_ad/ input_ad/ results_ad
11186
b8e554ea44 Mart*11187 o add two new packages
11188 - ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993)
11189 + subject to optimization (memory)
11190 - opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997)
11191 + subject to reordering (many GOTOs in the original code)
11192 + so far opps is called for every (i,j) point, and then operates in
11193 the vertical; one may want to reorder the scheme in order operate in
a435e833b1 Mart*11194 horizontal slabs at the cost of (a lot of) memory, at least ten new 3D
b8e554ea44 Mart*11195 fields)
e05d966902 Ed H*11196 o overhaul of IO so that we now have flags for MDSIO and/or MNC
11197 - all verification tests compile and run with linux_ia32_g77
a435e833b1 Mart*11198 - defaults are compatible with current input files--nothing
e05d966902 Ed H*11199 should change if you were not previously using MNC
11200 - MNC output has been added in numerous places (eg. timeave)
11201 but there are still a few writes not yet do-able with MNC
11202 (this is in progress)
a435e833b1 Mart*11203 - flags now allow for either/or/both use of MDSIO and MNC and
e05d966902 Ed H*11204 documentation will soon follow
11205 - numerous small formatting cleanups for ProTeX
1f6288729b Ed H*11206 o add version info (via BUILD_INFO.h) to MNC and stdout
11207
0e6056cd20 Jean*11208 checkpoint54e_post (2004/09/02)
58031354dd Mart*11209 o add two new packages
a435e833b1 Mart*11210 - pp81 (Packanowski and Philander, 1981), Richardson number and
58031354dd Mart*11211 stratification dependent mixing
11212 - my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme
a435e833b1 Mart*11213 - these scheme operate in a similar manner as KPP (without ghat, of
58031354dd Mart*11214 course), however there is only one diffusivity that is used for both
58378fc26e Mart*11215 temperature and salinity (and passive tracers)
ff0dde6fdb Step*11216 o add offline package
c7bf664228 Ed H*11217 o add "verification/dic_example" which contains a dic-gchem-ptracer setup
11218 provided by Stephanie Dutkiewicz
e8a04cb645 Ed H*11219 o genmake2: add ability to search for C compilers and cleanup test output
11220 - fixes recent SX-6 problems and should help with others (eg. HP-UX)
11221
0e6056cd20 Jean*11222 checkpoint54d_post (2004/07/27)
999e18a3ba Alis*11223 o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed
a435e833b1 Mart*11224 o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong,
1c7ec5d18e Jean*11225 leading to additional shift by 5 days each year of integration
11226 (i.e. leading to considerable offset over the years)
3eb6e74bad Jean*11227 o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep
11228 o start with no AB and no initial filtering (staggerTimeStep):
11229 change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5
11230 o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F
11231 (external loading & cpl import/export stay in forward_step.F)
11232 o update coupling interface to work with new staggerTimeStep
11233 o change MDSIO ptracers_pickup.
f8f693c946 Jean*11234 o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F);
353dc202ae Ed H*11235 o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*")
f8f693c946 Jean*11236 o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell)
353dc202ae Ed H*11237
0e6056cd20 Jean*11238 checkpoint54c_post (2004/07/18)
1a73c8a0cc Jean*11239 o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr
11240 this affects (truncation error) output.txt of test-exp:
11241 global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box
11242 o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array)
b59159bd17 Jean*11243 o change Qnet to always be the net heat flux, (+upward).
11244 affects (truncation error) output of natl_box exp.: updated
43f9f92e51 Jean*11245 o define the max number of passive tracers in PTRACERS_SIZE.h
11246 o start to test mnc routinely in exp0
11247 o add sea-ice loading (sIceLoad) as a new forcing field.
11248
0e6056cd20 Jean*11249 checkpoint54b_post (2004/07/08)
a435e833b1 Mart*11250 o add testreport "-j JOBS" option for parallel builds (tested and pretty
8c9e835c69 Ed H*11251 impressive on Altix and Opteron systems)
bc1bd3388a Ed H*11252 o diagnostics can now write NetCDF files through the mnc package
b71b8cc969 Jean*11253 o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output
a435e833b1 Mart*11254 o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added
f04695194c Jean*11255 o staggerTimeStep & NLFS: rescale T & S surface tendencies.
11256 affects (truncation error) output of lab_sea & natl_box exp.: updated
11257 o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.)
11258
0e6056cd20 Jean*11259 checkpoint54a_post (2004/07/06)
89aa0d86bf Jean*11260 o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order).
11261 o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.)
11262 o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished)
11263 o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D)
11264 + internal_wave (shift in writing cg2d_ini_res)
0e6056cd20 Jean*11265 checkpoint54a_pre (2004/07/05)
33e1cd7241 Jean*11266
0f1d4cfc8d Dimi*11267 o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice
11268 - modified verification/lab_sea and natl_box_adjoint accordingly
11269
0e6056cd20 Jean*11270 checkpoint54 (2004/07/02)
11271 checkpoint53g_post (2004/07/02)
e5b80f023f Jean*11272 o prepare splitting of thermodynamics: store convect.counter in common block
8ac0de89ba Jean*11273 o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error)
11274 output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave
e73e2206ff Dimi*11275 o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection
1cf497b67b Jean*11276 o new parameter "nShapS": allow to treat differently S from T (nShapT)
11277 o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S)
9e38639d14 Patr*11278 o restore adjointability
1cf497b67b Jean*11279
0e6056cd20 Jean*11280 checkpoint53f_post (2004/06/25)
f4437bef13 Jean*11281 o modifications that affect AIM experiment results (update output.txt):
a435e833b1 Mart*11282 - no advection of S at top interface Nr (pkg/generic_advdiff)
f4437bef13 Jean*11283 - air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F)
71989a1d2f Jean*11284 o AIM pkg:
11285 - include stability function into surf.Flux derivative relative to Tsurf
11286 - calculate clear-sky radiation & surface temp. change (for diagnostics)
a435e833b1 Mart*11287
9583d821f1 Andr*11288 checkpoint53e_post
11289 o merged cylindrical coord configuration
11290 o added rotating_tank experiment
db2e27b728 Andr*11291 checkpoint53e_pre
11292
0e6056cd20 Jean*11293 checkpoint53d_post (2004/06/14)
27134ca433 Jean*11294 o faulks upgraded: re-generate output.txt that have changed:
11295 global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box
19ec94aecc Alis*11296 o Added Bryan and Lewis, 1979, vertical diffusivity profile
a435e833b1 Mart*11297 o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing.
5d5fff3a81 Alis*11298 o added Sadourny discretization of Coriolis
11299 - moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h
11300 - re-enabled use of omega3 (useAbsVorticity)
e46ec53fc5 Alis*11301 o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for
52f1ebc9d7 Jean*11302 vector-invariant equations
e46ec53fc5 Alis*11303 - note: does *NOT* yet use same variable visc. for no-slip BC's.
8a9329e700 Mart*11304 o recoded the lateral boundary conditions for non-hydrostatic w, this time
11305 hopefully without new bugs
11306 - still to do: biharmonic friction for non-hydrostatic w
4855f667f0 Alis*11307 o bug fix for mom_*_sidedrag: rA -> rAs,rAw
11308 o regenerated output for global_ocean_ebm (using -ieee)
647a06f20c Alis*11309 o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation
11310 of mom_common/
11311 - simple re-arrangement of instructions within computing loop
0e6056cd20 Jean*11312 checkpoint53d_pre (2004/05/21)
647a06f20c Alis*11313
0e6056cd20 Jean*11314 checkpoint53c_post (2004/05/21)
1ad8306ce0 Jean*11315 o new version of coupler for AIM+thSIce and Ocean models
11316 - new fields (SSS,h_MixLayer ...) are exchanged through the coupler
11317 - land: change Evaporation of snow
11318 - aim with thSIce: fix bug in snow-precip.
fbdf55c31a Mart*11319 o changes to calc_gw.F
11320 - bug fix for w^2 term near the bottom boundary
11321 - (hopefully) improve the lateral slip boundary condtions for use with
11322 partial/looped cells
11323 - because the bug fix changes two verification experiments anyway (exp5
11324 and plume on slope), change the lateral boundary condition from half slip
11325 to the value of no_slip_sides
4e8c9bded2 Patr*11326 o ebm package wasnt quite up to the parallel task. Fixed that.
8c7ad6d151 Patr*11327 o Adjoint of EBM package + verification
11328 * TLM OK
11329 * ADM not sufficient accuracy yet (needs further testing)
fbdf55c31a Mart*11330
0e6056cd20 Jean*11331 checkpoint53b_post (2004/05/14)
f86a3c0e0c Patr*11332 o Commiting new energy balance model to repository
11333 * package is pkg/ebm
11334 * verif. is verification/global_ocean_ebm
11335 * references are in ebm_driver.F
11336 C * X. Wang, P. Stone and J. Marotzke, 1999:
11337 C Global thermohaline circulation. Part I:
11338 C Sensitivity to atmospheric moisture transport.
11339 C J. Climate 12(1), 71-82
11340 C * X. Wang, P. Stone and J. Marotzke, 1999:
11341 C Global thermohaline circulation. Part II:
11342 C Sensitivity with interactive transport.
11343 C J. Climate 12(1), 83-91
11344 C * M. Nakamura, P. Stone and J. Marotzke, 1994:
11345 C Destabilization of the thermohaline circulation
11346 C by atmospheric eddy transports.
11347 C J. Climate 7(12), 1870-1882
11348 o Will need long integration testing.
0e6056cd20 Jean*11349 checkpoint53b_pre (2004/05/14)
89dadec0f0 Patr*11350
9c05b3873e Alis*11351 o created pkg/mom_common in preparation for variable viscosity code
11352 o renamed and split ini_mnc_io
f4a07a4bc7 Jean*11353 o pkg/land: only liquid water can diffuse or run-off
11354 o AIM using land: soil wetness availability account for snow
53c7d996f6 Dimi*11355 o added printMapIncludesZeros to EEPARMS namelist
11356
0e6056cd20 Jean*11357 checkpoint53a_post (2004/05/11)
e7f1536c88 Patr*11358 o restore TAMC compatiility for exf_constants.h
11359 (no usage of _d in .h)
11360 o Additional storing in KPP in an attempt to fix
11361 TAMC problem with adjoint of KPP code.
11362 (no success...)
11363 Identical code works fine with TAF.
0b07ed3507 Dimi*11364 o Fixed verification/natl_box_adjoint experiments.
11365 Initial conditions for Experiments 4 and 5 are now
11366 set to "SEAICE_initialHEFF=0", which is more reasonable,
11367 and hence gives results closer to that of Experiment 2.
11368 Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again.
e7f1536c88 Patr*11369
0e6056cd20 Jean*11370 checkpoint53 (2004/05/06)
8522e3c798 Chri*11371 o stable checkpoint with up to date adjoint
11372 TLM tests only run for 1st grdchk at the moment. Its unclear if
11373 this is a code problem or a problem with resetting code for g_
11374 variables that is being autogenerated wrong.
11375 Otherwise:
a435e833b1 Mart*11376 o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix.
11377 o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ)
8522e3c798 Chri*11378 are both still in chaos following their security messes.
11379
0e6056cd20 Jean*11380 checkpoint52n_post (2004/05/06)
f989ca6313 Ed H*11381 o various build (mostly genmake2) changes including:
11382 - ability to build/run more easily within Cygwin and MacOS X
11383 - more complicated Makefiles with a stronger dependence on Gnu Make
4634ed4578 Dimi*11384 o pkg/seaice modifications
f4fcd985ee Dimi*11385 - added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost
11386 of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer
11387 and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm
a435e833b1 Mart*11388 - changed proxy for geostrophic velocity and updated
28d826540b Dimi*11389 verification/lab_sea/results/* accordingly
4634ed4578 Dimi*11390 - removed ADI dynamic solver from pkg/seaice
11391 - replaced all occurrences of 1/CSTICE or 1/CSUICE
11392 they caused a segmentation fault under certain circumstances
9976df0ac5 Mart*11393 - removed unused field WATR
b055761890 Mart*11394 o bug fix in exf-package:
11395 - u/vwind are defined at tracer/pressure points. The values of u/vwindmask
11396 now reflect that.
386eadb044 Mart*11397 o small fixes in the cal-package:
11398 - set reference date to first of January for the 'model'-calendar
11399 - failing of cal_CheckDate in cal_FullDate now actually results in a
11400 warning
df66ce88b0 Mart*11401 o small modifications in exf-package to increase flexibility:
11402 - change climtempfreeze from a constant to a runtime parameter that
11403 is specified in data.exf_clim (default = -1.9)
11404 - introduce runtime parameter windstressmax (default = 2.0) that is
11405 specified in data.exf
351ee82bec Jean*11406 o fix in pkg/thsice:
11407 - update Evap (Tsf changes) to be consistent with Latent heat flux
11408 - maintain snow precipitation unchanged (even if Tsf >=0).
11409 both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice
11410
0e6056cd20 Jean*11411 checkpoint52m_post (2004/04/18)
329dcc48c4 Mart*11412 o commented out call to cal_GetMonthsRec in swfrac.F and added some comments;
11413 this does not change any of the results, because myIter=0 in swfrac always
11414 lead to jwtype=2 (the default anyway), but the call makes little sense
11415 as a default
222786db83 Jean*11416 o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated
1395c36e8a Jean*11417 o re-work pkg/thsice interface with ocean & bulk_force pkg to allow
11418 atmospheric model (AIM) to use it ; add a "slab ocean" component.
11419 o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice)
11420 o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice
7b6ef96a80 Dimi*11421 o extending useSingleCpuIO option to work with new exch2 I/O format
11422 - old-style, missing-tile I/O is still accessible by defining CPP
11423 option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h
7e019df062 Ed H*11424 o monitor package can write to NetCDF files and/or STDOUT
11425 o fix re-definition bug in MNC_GRID_INIT_ALL()
8a37d3da43 Ed H*11426 o doc/api_reference added
11427 - a framework for building an API Reference Manual using all
11428 the "protex" comments embedded in the code
11429 - see pkg/generic_advdiff, pkg/mnc for examples
b297381f9a Ed H*11430 o MNC:
11431 - make myThid the last argument for all subroutines
11432 - new default for the grid files: NO halos
cba009f524 Ed H*11433 - add useMNC and other run-time flags
11434 - separate per-file-group handling of the unlimited dimension
a435e833b1 Mart*11435 - early initialization of MNC w/ flags read at the eeboot stage
cba009f524 Ed H*11436 and lookup tables set in initialize_fixed
11437 - write all MNC output to a freshly-created directory
47e4defd15 Jean*11438 o thermodynamics sea-ice (thsice) is now tested with testreport.
11439 o test exp. advect_cs: use the standard cs32 grid ; update output.
cd56948b28 Patr*11440 o Added functionality to grdchk:
11441 pick global i,j,k position (or nearest wet) where to perform check.
9fa8dff5bb Jean*11442
0e6056cd20 Jean*11443 checkpoint52l_post (2004/03/11)
63585e25d4 Jean*11444 o new land formulation:
11445 a) use ground enthalpy as prognostic variable to ensure exact
11446 energy conservation.
11447 b) account for water temperature and for latent heat of freezing
11448 in all processes (rain, run-off, ground storage)
11449 c) compute surface and ground temperature implicitly.
11450 o aim_v23 modification for new land model:
11451 a) Treat separately land / ocean / sea-ice surface fluxes
11452 to allow implicit computation of land & sea-ice surface temp.
11453 b) add snow precipitation.
0e6056cd20 Jean*11454 checkpoint52l_pre (2004/03/11)
9fa8dff5bb Jean*11455
af5663a801 Jean*11456 o fix problem (when 1 tile is empty) in min/max monitor.
a435e833b1 Mart*11457 o fix bug in timeAve (u,vZetatave in common block)
76a3a9dce3 Dimi*11458 o no restoring terms under ice for pkg/seaice
36f6faaf99 Dimi*11459 o moved SEAICE_DO_DIAGS to S/R do_the_model_io
11460 o bug fix for pkg/seaice pickups
070ec0f1ad Ed H*11461 o change MNC call locations and add coordinate attributes
3777bd4e33 Jean*11462 o mask vorticity at the corner ; affects global_ocean.cs output
11463 o fix ini_curvilinear_grid ; test CS experiments with mpi
831771ecb4 Jean*11464 o aim.5l_cs: modify sea-ice fraction input file ; update output
73ca73937b Patr*11465 o exf: Adding simple range check routine for exf fields after read
e06eab71ce Jean*11466
0e6056cd20 Jean*11467 checkpoint52k_post (2004/02/23)
c99437d93a Alis*11468 o removed top-level directory "diags"
11469 - we migrated these functions to pkg/timeave a long time ago
11470 o fixed bug introduced in pkg/monitor
171b0dbf72 Patr*11471 o accuracy ctrlprec = 32 insuffient for gradient checks using
11472 averaged fields (I/O via cost_averages)
11473 -> use ctrl.h in active_file*.F to control I/O precision.
11474 o paramter list of CALL ADTHE_MAIN_LOOP
11475 o added initial do_the_model_io to ecco
11476 o set all ...Freq to zero after cost_final
11477 taveFreq, dumpFreq, pChkptFreq
4f02768964 Patr*11478 o MAIN and ECCO differentiability restored
c99437d93a Alis*11479
0e6056cd20 Jean*11480 checkpoint52j_post (2004/02/18)
37b568618c Patr*11481 o fix nchklev in tamc.h for global_ocean...
11482 o Bringing flow and store directives up-to-date
11483 o Really weird thing!
11484 call do_the_model_io from the_main_loop with parameters
a435e833b1 Mart*11485 starttime, niter0, instead of mytime, myiter, screws up the adjoint:
37b568618c Patr*11486 TAF places a faulty re-call of initialise_varia
11487 after cost_final call which should not be there!
0e6056cd20 Jean*11488 checkpoint52j_pre (2004/02/03)
37b568618c Patr*11489
63ae023a6f Andr*11490 o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and
11491 error messages
e06eab71ce Jean*11492 o fix errorMessageUnit problem. remove old version of mdsio from eesup/src
7ecbd3c2aa Andr*11493 o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating
11494 debug output
bd481ce0ad Andr*11495 o modfied mdsio_writefield.F to handle non-global files under exch2
65c905ad22 Jean*11496 o update AIM Cubed-Sphere exp (aim.5l_cs):
11497 use land, p*, and Franco.M forcing fields with fractional land-sea mask.
11498 o update AIM Equatorial Channel exp:
11499 use standard aim_v23 pkg and change the SST fields to be more realistic.
6b7f81d27b Andr*11500 o globalFile now works with exch2
a435e833b1 Mart*11501 o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and
e06eab71ce Jean*11502 mon_vort3.F to make exch2 friendly with >1 tile per cube face
e7f0a9dbe1 Dimi*11503 o limit timeave output for hi-res integrations
404487e0d3 Andr*11504
0e6056cd20 Jean*11505 checkpoint52i_post (2004/01/21)
6989afdf96 Alis*11506 o removed CPP_EEOPTIONS.h from verification/*/code
11507 o updated the tiling for global_ocean_pressure
0e6056cd20 Jean*11508 checkpoint52i_pre (2004/01/20)
6989afdf96 Alis*11509
a435e833b1 Mart*11510 o update aim.5l_LatLon using the standard aim_v23 pkg (instead of
1e2193d0c9 Jean*11511 the old pkg/aim).
11512
0e6056cd20 Jean*11513 checkpoint52h_pre (2004/01/20)
27e400a76e Andr*11514 o shortened offending lines in exch2_send_rx?.template
8c93ce9839 Andr*11515 o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator
65592d1bf7 Ed H*11516 o genmake2: add build & execute test for NetCDF code
52d06eb5f9 Andr*11517 o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed
11518 old grid files, moved CPP_EEMACROS.h to pkg/exch2
f02794c1c2 Dimi*11519 o added useSingleCPUIO flag to monitor.F and mon_out.F
d3ec31b5f6 Dimi*11520 o added temporary hack for sea-ice dynamics on the cube:
11521 metric terms are ignored and it is assumed that
11522 there is no sea-ice on cube faces 1, 2, 4, and 5.
f02794c1c2 Dimi*11523
0e6056cd20 Jean*11524 checkpoint52f_post (2004/01/09)
046fd16d1c Andr*11525 o added exch2 cube routines to pkg/exch2
11526 o modified hs94.cs-32x32x5 to use it
11527 o added new grid files to hs94.cs-32x32x5
0e6056cd20 Jean*11528 checkpoint52f_pre (2004/01/07)
046fd16d1c Andr*11529
0e6056cd20 Jean*11530 checkpoint52e_post (2004/01/07)
67b14118a3 Jean*11531 o first attempt to solve vertical advection (momemtum & T,S) Implicitly
11532 for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom)
1cead955c0 Jean*11533 o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F)
11534 to work with implicit vertical advection and AB ;
11535 o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme.
11536 o update output (gad_calc_rhs.F changes affect truncation error) of exp:
11537 front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box
0e6056cd20 Jean*11538 checkpoint52e_pre (2004/01/02)
caad9f4c67 Jean*11539
11540 o fix bug in impldiff when Nr=1 or Nr=2.
7d401e1f11 Jean*11541 o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt
11542 o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test.
157d0c5b42 Jean*11543 o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2
11544 ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure
7e230c5c02 Dimi*11545 o added exf_offset_atemp for Celsius to Kelvin conversion of atemp
7fd609fd20 Dimi*11546 o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024
11547 o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations
7e230c5c02 Dimi*11548
0e6056cd20 Jean*11549 checkpoint52d_post (2003/12/16)
8b7b5f4e88 Alis*11550 o re-tiled many expts to allow comparison in multi-processor mode
11551 - updated output accordingly
11552 - changed hs94.128x64x5 to use intial T from file rather than use the
11553 random number generator
bcea5a4765 Andr*11554 o add infrastructure in model routines for fizhi and gridalt packages
6b0a2bb136 Jean*11555 o change global_ocean.cs32x15 because of Pb with GM on CS-grid.
8ac0e9b3ce Dimi*11556 o changes to permit hi-res, cubed-sphere, configuration
11557 - added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
11558 - added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F
11559 - added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation
11560 of surface winds for the cube
11561 (A verification experiment, based on global_ocean.cs32x15, but with
11562 pkg/seaice turned on and with on-the-fly interpolation from the NCEP
11563 Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice,
11564 complete with example surface forcing files and matlab scripts to look
11565 at the output and compare it with that of global_ocean.cs32x15.)
4b82b202ac Jean*11566 o packages pickup: $PKG_write_pickup called from packages_write_pickup ;
11567 but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code
11568 to conform to the common rule.
a435e833b1 Mart*11569 o check-in the first version of the coupler + interfaces for multi-components
bf18de4739 Jean*11570 set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI.
11571 - imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD).
a435e833b1 Mart*11572 - atmosphere: use pkg aim_v23 ; no sea-ice for now.
bf18de4739 Jean*11573 - ocean and atmos. share the same horizontal grid (no interpolation).
11574 - exchanges between component and coupler is done in forward_step
a435e833b1 Mart*11575 o new verification experiment, cpl_aim+ocn:
11576 coupled ocean - AIM atmosphere on cs32 grid.
6b0a2bb136 Jean*11577
0e6056cd20 Jean*11578 checkpoint52d_pre (2003/12/06)
a435e833b1 Mart*11579 o surface flux time-av diagnostic modified for NLFS & RealFreshWater
803573887e Jean*11580 o add call to AIM pendant S/R in external_forcing & external_fields_load.F
269d31530a Jean*11581
0e6056cd20 Jean*11582 checkpoint52c_post (2003/11/25)
7c799abcad Patr*11583 o Fixing OPTIONS files for use of exf:
11584 - ALLOW_ECCO not needed
11585 - ECCO_CPPOPTIONS.h should not be included from
11586 EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h
11587 as has been the case in the past
11588 - All cal/exf related options are currently set in
11589 single header file. Should remain so until we
11590 agree on a consistent new policy.
2a563ee529 Patr*11591 o Removed all CPP options for cal package.
11592 cal has no more CPP options.
9682a51356 Patr*11593 o modified STOREs in GAD_ADVECTION
11594 o corrected key comp. for passkey
7c799abcad Patr*11595
0e6056cd20 Jean*11596 checkpoint52b_post (2003/11/23)
dfac86e1ec Jean*11597 o new version: "thsice" of thermodynamic sea-ice pkg:
a435e833b1 Mart*11598 - only 1 call from "forward_step"; conserve energy, fresh-water & salt.
dfac86e1ec Jean*11599 - modify fluxes but do not change theta directly;
11600 - light cleaning of bulk_force pkg (still needed with thsice).
a435e833b1 Mart*11601 - add forcing fields + data files in global_ocean.cs32x15/inp_thsice
dfac86e1ec Jean*11602 + output_thsice.txt to test thsice & bulk_force pkgs.
11603 o put back grid & coriolis monitor output.
0e6056cd20 Jean*11604 checkpoint52b_pre (2003/11/23)
7966caf364 Jean*11605
a435e833b1 Mart*11606 o call "do_the_model_io" at the beginning (=> dump initial state)
7966caf364 Jean*11607 o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P)
6dbdc867be Patr*11608 o sort out interplay between tamc.h and PTRACERS_OPTIONS.h
11609 (need info on NUMBER_OF_PTRACERS)
11610 o missing PTRACERS headers in some routines
11611 o default tamc.h in pkg/autodiff supposed to crash
11612 to ensure proper customization
11613
0e6056cd20 Jean*11614 checkpoint52a_post (2003/11/17)
fa690556aa Jean*11615 o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp
9d36aec500 Dimi*11616 - moved surfaceTendencyTice from pkg/seaice to main code
fa690556aa Jean*11617 - subroutine FREEZE_SURFACE now limits only surface temperature
11618 and is called in FORWARD_STEP (if allowFreezing=.TRUE.)
11619 => new output.txt for global_ocean.cs32x15 & global_with_exf
11620 - keep the old version of FREEZE for backward compatibility;
11621 global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE.
915eb1cffa Patr*11622 - corresponding modifs for TAF directives
9d36aec500 Dimi*11623 o added surface flux output variables to TIMEAVE_STATVARS
11624 o time-averaged output for pkg/ptracers
915eb1cffa Patr*11625 o fix problem with ECCO-related divided adjoint
11626 snapshot file was missing some ad-variables,
11627 but no warning issued by TAF
fa1dae9534 Dimi*11628
0e6056cd20 Jean*11629 checkpoint52a_pre (2003/11/12)
fa1dae9534 Dimi*11630 o some bug fixes for #undef REAL4_IS_SLOW
11631
aca4df70a2 Patr*11632 checkpoint52 = ecco_c52_e35
11633 o after testing adjoints of checkpoint51u_post
11634
0e6056cd20 Jean*11635 checkpoint51u_post (2003/11/06)
909a9f878d Patr*11636 o this is the post-merge tag of the ecco-branch
11637 (needs another clean checkout and re-testing)
11638 o various natl_box_adjoint configs and results
11639 but no input fields
11640 o obcs adjoint not yet merged!
11641 o adding ECCO global 1x1 and 2x2 degree configs
11642 o updated/extended some store directives for seaice
11643 o pkg/ecco now containes ecco-specific part of cost function
11644 o top level routines the_main_loop, forward_step
11645 supersede those in model/src/
11646 previous input data.cost now in data.ecco
11647 (new namelist ecco_cost_nml)
11648 o in ctrl/ cleaned some cross-dependencies and updated CPP options
11649
0e6056cd20 Jean*11650 checkpoint51t_post (2003/11/04)
909a9f878d Patr*11651 o this is the pre-merge tag of the ecco-branch
11652
0e6056cd20 Jean*11653 checkpoint51s_post (2003/11/04)
ef651d0d5f Ed H*11654 o cleanup: removed various obsolete #define-s
909a9f878d Patr*11655 o pkg/grdchk
11656 - renamed 'ph-grd 3' to 'grad-res'
a435e833b1 Mart*11657 - merged from ecco-branch
909a9f878d Patr*11658 (remaining bug fixes for obcs gradient checks)
11659 - additional high-precision output for testreport
11660 (grep for 'precision_grdchk_result')
ef651d0d5f Ed H*11661
0e6056cd20 Jean*11662 checkpoint51r_post (2003/11/03)
16add2227d Ed H*11663 o cleaned up or removed CPP_OPTIONS.h files
11664 o updated results for some of the tests to reflect the new
11665 optfiles (-ieee: -O0 instead of -O3)
11666
0e6056cd20 Jean*11667 checkpoint51q_post (2003/10/30)
cb574bfa04 Patr*11668 o cd_code:
11669 - moved cd_scheme.F -> cd_code_scheme.F
11670 - separate read_checkpoint from cd_code_ini_vars.F
11671 - separated cd_code part from write_checkpoint
11672 - updated AD_SOURCE, generated .flow
11673 - added CD_CODE_VARS.h to the_main_loop
11674 - Moving cd_code specific store dir.s to pkg/cd_code
11675 o ctrl package totally restructured
11676 - pack/unpack now optional and decoupled from
11677 xx_/adxx_ I/O
11678 - ctrl_pack/unpack cleaned
11679 (new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F)
11680 - confined inclusion of AD_CONFIG.h to where necessary.
11681 o genmake2: changed AD dependencies from SRCFILES to AD_FILES
11682
0e6056cd20 Jean*11683 checkpoint51p_post (2003/10/30)
138482fdf6 Ed H*11684 o create initial cd_code package
a5bd9cbb61 Ed H*11685 - WARNING: the initialization of fields within packages
11686 is broken because INI_FIELDS (where READ_CHECKPOINT is
11687 called) is called *before* PACKAGES_INIT_VARIABLES.
11688 This seems to be backwards since
a435e833b1 Mart*11689 1) its important to initially zero the entire field including
a5bd9cbb61 Ed H*11690 the "halo" region
11691 2) zeroing needs to be done *before* reading pickup info
a435e833b1 Mart*11692 and the pickup call might or might not happen in any
a5bd9cbb61 Ed H*11693 particular run
11694 - this needs an overhaul for R2
138482fdf6 Ed H*11695 o cleanup verification/*/code/GMREDI_OPTIONS.h
11696 o cleanup testreport
11697
0e6056cd20 Jean*11698 checkpoint51o_post (2003/10/27)
8a8c81fb3e Patr*11699 o bringing AD-related verif's up to date with genmake2
11700 - carbon/
11701 - global_ocean.90x40x15/
11702 - hs.94.1x64x5/
11703 - (front_relax/ )
11704 o (more) consistent directory structure for AD-related verif.'s
11705 o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK
11706 o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF
11707 o bug fix in find_alpha.F for MDJWF:
11708 - modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for
11709 change rho -> rho-rhoConst
11710 - replace call find_rho to find_rhonum
11711 o initialisation of rFlx extended to full array (required by TAF)
11712 and shifted to thermodynamics
11713 o removed PTRACERS.h in ptracers routine
11714 o added surfacetendencyPtr to S/R parameter list pracers_forcing
11715 o Correcting initialisations for fVerU, fVerV.
11716 o helping TAF to recognize dependency on kUp for
11717 fVerU, fVerV
11718 o Replacing delZ by delR in pkg/ctrl/
0e6056cd20 Jean*11719 checkpoint51o_pre (2003/10/24)
8a8c81fb3e Patr*11720
51701379d8 Ed H*11721 o undid all of cp51 pending some cleanups and discussion
a435e833b1 Mart*11722 o added the [#include "AD_CONFIG.h"] statement to all files that need
406902c2ea Patr*11723 it for adjoint/tl #defines
11724 o re-worked the build logic in genmake2 to support AD_CONFIG.h
11725 o removed tools/genmake since it no longer works
c9cb668a47 Dimi*11726
0e6056cd20 Jean*11727 checkpoint51n_post (2003/10/23)
c9cb668a47 Dimi*11728 o modifications to make FREEZE flux visible to pkg/kpp
11729 - moved surfaceTendencyTice from pkg/seaice to main code
11730 - FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
11731 - subroutine FREEZE now limits only surface temperature
11732 (this means new output.txt for global_ocean.90x40x15,
11733 global_ocean.cs32x15, and global_with_exf)
11734 o added surface flux output variables to TIMEAVE_STATVARS
11735
0e6056cd20 Jean*11736 checkpoint51n_pre (2003/10/23)
d7f6e03355 Dimi*11737 o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F
4a967b9107 Ed H*11738 o added [#include "AD_CONFIG.h"] to all files that use the following
11739 defines:
11740 - ALLOW_ADJOINT_RUN
11741 - ALLOW_TANGENTLINEAR_RUN
11742 - ALLOW_ECCO_OPTIMIZATION
d7f6e03355 Dimi*11743
0e6056cd20 Jean*11744 checkpoint51m_post (2003/10/21)
668b211e58 Ed H*11745 o incorporating changes to get TAMC/TAF working in genmake2
11746 - added new TAMC/TAF targets to the Makefile
11747 - various cleanups related to package handling
fea3c3e36d Ed H*11748 - these changes should have no impact on the forward model
668b211e58 Ed H*11749
0e6056cd20 Jean*11750 checkpoint51l_post (2003/10/20)
c84f6b7c89 Dimi*11751 o changes to pkg/cal and pkg/exf that allow and speed-up long integrations
11752 - faster algorithm for cal_addtime.F
11753 - higher precision arithmetic, where needed
11754 - pkg/exf *startdate variables changed from calendar date to
11755 model integration time
11756
0e6056cd20 Jean*11757 checkpoint51l_pre (2003/10/17)
d33aea2a79 Jean*11758 o add salt flux to forcing fields (used when salty sea-ice forms or melts)
11759 o enable to apply restoring on S & T only in a latitude band.
11760 o update output (external_forcing_surf modif. change truncation errors)
11761 global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box
06c869d156 Patr*11762
0e6056cd20 Jean*11763 checkpoint51k_post (2003/10/16)
f9e188eb72 Jean*11764 o change default to: useNHMTerms=.FALSE.
11765 - new output.txt for atmos. exp (NHMTerms were wrong but now turned off):
11766 adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5
11767 - new output.txt for idealized oceanic exp (NHMTerms are now turned off):
11768 exp1, ideal_2D_oce
11769 - change data file of oceanic exp (leave the results unchanged for now)
11770 exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box
11771 o set gravitySign automatically according to the vertical coordinate used
11772 (and change sign: back to "logical" value: +1 when R increases downward)
a435e833b1 Mart*11773 o added an include barrier to the default CPP_OPTIONS.h and
9eb494b0cb Ed H*11774 removed the #include "PACKAGES_CONFIG.h" from it
f9e188eb72 Jean*11775 o fix a bug in mom_fluxform (from chk51j_post)
9eb494b0cb Ed H*11776
0e6056cd20 Jean*11777 checkpoint51j_post (2003/10/10)
0b85d93038 Patr*11778 o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/
11779 o adjusted some flow directives (dynamics, thermodynamics)
11780 o added cubed-sphere case to test cost function
11781 o heckpoint_lev?_directives.h now include
11782 pkg-specific directives, whenever those are enabled.
11783 o Moving pkg-specific flow directives to corresponding pkg
11784 Moving pkg-specific differentiation list to corresponding pkg
11785 Moving pkg-specific checkpoint-lev storing to corresponding pkg
11786 ---> conventions are
11787 - pkg_ad.flow
11788 - pkg_ad_diff.list
11789 - pkg_ad_check_lev?_dir.h
11790
0e6056cd20 Jean*11791 checkpoint51i_post (2003/10/09)
6d54cf9ca1 Ed H*11792 o merge of the branch-genmake2
11793 - knowingly breaks the older genmake
11794 - automatic generation of all ALLOW_${PKG_NAME} defines
11795 - new testreport supersedes older testscript
11796 o large number of package inclusion and header cleanups
0e6056cd20 Jean*11797 checkpoint51i_pre (2003/10/08)
6d54cf9ca1 Ed H*11798
b95c3843ab Ed H*11799 o new output for adjoin of global ocean vector invariant
11800 o fix for checkpoint of thermodynamic seaice and bulk_force
11801 o Steph gchem various cleanups
11802
46a4243beb Step*11803 checkpoint 51h_pre
b95c3843ab Ed H*11804 o fixed some single quotes
46a4243beb Step*11805 o modify gchem pkg to be more versatile
11806 o modifications to clean up dic pkg
11807 o add pkg/cfc
11808
0e6056cd20 Jean*11809 checkpoint51g_post (2003/10/02)
8c13754326 Patr*11810 o provide links for ARPACK and ADM*TLM
11811 o start removing verification/vero/
11812 o update AD-related stuff
11813 (in particular some IF-statements in model/src/ routines)
11814 o adding to verification/global_ocean.90x40x15/ adjoint of
11815 vector invariant setup
11816
0e6056cd20 Jean*11817 checkpoint51f_post (2003/10/02)
57c1eda489 Jean*11818 o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif)
6eb9516f3f Dimi*11819 o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation
34fdea0d95 Dimi*11820 of tracer Green's fucntions for ocean inversion project.
11821
0e6056cd20 Jean*11822 checkpoint51f_pre (2003/08/07)
981f32514d Dimi*11823 o Added on-the-fly spatial interpolation capability
11824 "USE_EXF_INTERPOLATION" to pkg/exf.
bda7c25f4a Dimi*11825 - This is a temporary Cartesian-grid hack until
981f32514d Dimi*11826 the super-duper ESMF coupler becomes available.
bda7c25f4a Dimi*11827 - See verification/global_with_exf/README for usage example.
11828 - Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
11829 flags and modified pkg/seaice accordingly.
981f32514d Dimi*11830 o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
11831 and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
11832 non-local transport term.
11833
0e6056cd20 Jean*11834 checkpoint51e_post (2003/08/03)
a435e833b1 Mart*11835 o pkg/mom_vecinv:
542c6d36a4 Jean*11836 - changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec)
11837 - add time-ave diagnostic of vorticity advection.
11838 o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV.
a435e833b1 Mart*11839 o atmospheric geopotential: - include water vapor effect;
542c6d36a4 Jean*11840 - use p^kappa in p* scaling.
c886fcc85e Jean*11841 o land pkg: read initial state from files.
11842 o AIM : add stratospheric drag in the upper level
11843
0e6056cd20 Jean*11844 checkpoint51d_post (2003/07/18)
c886fcc85e Jean*11845 o change function ILNBLNK (=> last non-blank char.) to return zero
11846 (instead of the string length) when the string. char is empty
8cd26a84aa Jean*11847 o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid)
06c869d156 Patr*11848 o modif's to restore TAMC compatibility
11849 - avoid "_d" constructs in PARAMETER declarations
11850 - avoid interrupting lines by comment lines
11851 o Use cluster local disks for purely local I/O
11852 vs. globally visible disks needed for ctrl stuff
11853 (merged from ecco-branch)
11854 - new active_file_loc... and mdsio_..._loc routines
11855 - affected packages: autodiff, ctrl, grdchk, mdsio
f171be8f2a Alis*11856
0e6056cd20 Jean*11857 checkpoint51c_post (2003/07/08)
494ad43bae Patr*11858 o introducing integer flag debugLevel
11859 - debLevZero: suppress all output
11860 - debLevA: standard
11861 - debLevB: equivalent to current debugMode=.TRUE.
11862 o introducing pathname variable mdsioLocalDir for mdsio
11863 that can be specified at runtime
11864 (relevant for cluster I/O to local disk)
11865 `
f35a23c575 Patr*11866 >>>checkpoint51b_post
11867 adjoint of ptracers
11868 o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM
11869 o extended state in checkpoint_lev?, etc.
11870 o alternative ctrl/cost with tr1 or ptracer
11871 o new comlev1_bibj_ptracers
11872 o new ptracers.flow
11873 o made ptracers_forcing same as external_forcing_s
11874 o added verification for adjoint with ptracers
11875 - adm. grdchk fail so far
11876 - tlm. grdchk OK
11877 - checked tapelev/comlev recomputations: OK
11878 <<<checkpoint51b_pre
11879
0e6056cd20 Jean*11880 checkpoint51a_post (2003/06/25)
f04468175c Step*11881 o added code for biogeochemistry package
11882 - new pkgs: dic, gchem
11883 - new subroutine in ptracers
11884 o modify code for biogeo packages
11885 - in model/src and pkg/ptracers
11886
0e6056cd20 Jean*11887 checkpoint51 (2003/06/24)
5949b565e2 Patr*11888 o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN
11889 - autodiff, ctrl, exf, grdchk, seaice
11890 kept separate packages
11891 - cost, ecco, obcs
f535eb56d5 Patr*11892 o updating verification/internal_wave, verification/lab_sea
11893 (all verif's pass on faulks.lcs.mit.edu RH7.3, g77)
5949b565e2 Patr*11894
0e6056cd20 Jean*11895 checkpoint50i_post (2003/06/23)
3cd89c6ea4 Patr*11896 o Preparing next differentiable checkpoint and sync
11897 of MAIN vs. ecco-branch
11898 - 1st step: this one is differentiable
a435e833b1 Mart*11899 - 2nd step: next(! not this) checkpoint will have updated packages
3cd89c6ea4 Patr*11900 from ecco-branch)
11901
0e6056cd20 Jean*11902 checkpoint50h_post (2003/06/20)
8f5c8e08bc Jean*11903 o new package "land": provide surface BC for AIM.
11904 o pkg/ptracers: apply exchange to all tracers after reading a pickup.
a435e833b1 Mart*11905 o AIM: use true log-P extrapolation for near surface temp (= as in
568bb87ebb Jean*11906 F.Molteni paper) ; update aim.5l_cs output.
8aafdaabe9 Alis*11907 o New variable in PARM03 for more flexible pickups
61893791a0 Patr*11908 o somewhat cleaned package initialisation sequence for
11909 ctrl/ cost/ ecco/ in packages_... routines
568bb87ebb Jean*11910
0e6056cd20 Jean*11911 checkpoint50g_post (2003/05/23)
09510da3bb Dimi*11912 o merged with release1_p17 (pkg/seaice and verification/lab_sea)
11913 - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
11914 - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
11915 made the default because of faster convergence than ADI
11916
0e6056cd20 Jean*11917 checkpoint50f_post (2003/05/23)
5192502418 Patr*11918 o exf totally restructured
11919 - replaced all exf_set_ routines by one generic exf_set_gen.F
11920 and made sure it's still differentiable
11921 - split exf_getffields.F into new exf_bulkformulae.F
11922 - exf_inscal_/exf_outscal_ suffixes consistent with field names
11923 - updated adjoint/makefile and relevant verif. accordingly
11924
0e6056cd20 Jean*11925 checkpoint50f_pre (2003/05/23)
b8d7339ac7 Jean*11926 o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ;
11927 + change Evap over land. (update aim.5l_cs output)
f171be8f2a Alis*11928 o added missing .cvsignores and made uniform across expts
11929 o changed configuration of tidal_basin_2d expt
11930 o added pkg/debug functions for tracing code in fatal crashes
11931 o tidied pkg/monitor to use MONITOR_OPTIONS.h
11932 o new fn in pkg/monitor to stop model if solution grows too big
11933 o removed lots of single quotes from comments
11934
0e6056cd20 Jean*11935 checkpoint50e_post (2003/05/14)
1a1e1d268a Mart*11936 o make KPP work with PTRACERS
11937 - fix gad_calc_rhs to call new routine kpp_transport_ptr, which is
11938 nearly a copy of kpp_transport_s
a435e833b1 Mart*11939 - there is no analogue to SurfaceTendencyS, so I have to use
1a1e1d268a Mart*11940 gPtr(of the surface layer) instead
11941 o add a new platform SunFire+mpi (SunFire 15000) to genmake
0e6056cd20 Jean*11942 checkpoint50e_pre (2003/05/13)
1a1e1d268a Mart*11943
0e6056cd20 Jean*11944 checkpoint50d_post (2003/05/13)
a435e833b1 Mart*11945 o change kpp output from multiple-record state files to single-record state
3ff61f337e Mart*11946 files analogous to write_state.F
a435e833b1 Mart*11947 o reduce the output frequency of cg3d-related stuff to the monitor frequency,
11948 analogous to the cg2d-related output.
11949 o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512,
1a1e1d268a Mart*11950 so that writing to internal file fn (with length 512) fails.
0e6056cd20 Jean*11951 checkpoint50d_pre (2003/05/12)
dd4e4e2846 Patr*11952
0e6056cd20 Jean*11953 checkpoint50c_post (2003/05/12)
36b01f3eb4 Jean*11954 o fix problem in ini_procs.F when using MPI (was there since checkpoint48f)
a07df11acd Jean*11955 o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy.
956742bd08 Jean*11956 o add time-average diagnostic of U*V and vertical diffusive flux for theta.
11957 o bug fixed in convective adjustment diagnostic (multi-tile set-up).
11958 o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries.
11959
0e6056cd20 Jean*11960 checkpoint50c_pre (2003/04/30)
460cb5f999 Dimi*11961 Merging from release1_p13:
11962 o bug fix for pkg/seaice dynamic solver
11963 o Added SEAICE_initialHEFF to pkg/seaice
11964
0e6056cd20 Jean*11965 checkpoint50b_post (2003/04/17)
b95ba5a50f Jean*11966 o store u*,v* in gU,V instead of in guNm1,gvNm1
11967 o in order to put the momForcing out of the Adams-Bashforth:
11968 move forcing & CD-scheme calls from mom_fluxform & mom_vecinv
11969 to timestep.F
11970 o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays
11971 o re-generate output for highly sensitive test-exp:
11972 global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box
11973
0e6056cd20 Jean*11974 checkpoint50b_pre (2003/04/17)
3228e22c96 Jean*11975 o restore the use of momAdvection & useCoriolis flags (mom_vecinv)
a435e833b1 Mart*11976 o corrected CPP option mismatch in exf_Bulk... functions for case
5ef1561d49 Patr*11977 #define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP
11978
0e6056cd20 Jean*11979 checkpoint50a_post (2003/03/21)
011884106d Patr*11980 o Bug fix for merging between c50 and KPP.
11981 ikey was passed from thermodynamics to kpp_calc via
11982 common block rather than being recomputed in kpp_calc,
11983 in contradiction with new key itdkey.
11984 New key ikppkey created, and tamc.h headers updated.
11985
0e6056cd20 Jean*11986 checkpoint50 (2003/03/08)
19c7b39f75 Patr*11987 - 2nd step of merge with ecco-branch:
11988 merge changes in ecco-branch back into main trunk
11989 - bug fix in find_alpha
11990 - more storing in gmredi_calc_tensor.F, kpp_routines.F
11991 - avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC
11992 - merged some sliced AD support routines
11993
0e6056cd20 Jean*11994 checkpoint49 (2003/03/06)
a2ac993b88 Patr*11995 merged from ecco-branch:
11996 o exf:
a435e833b1 Mart*11997 - Enable initialisation of forcing fields to constant
a2ac993b88 Patr*11998 (runtime) values.
11999 - in exf_getffields.F
12000 Reduce i-/j-loop to interior domain, discarding overlaps.
12001 That also fixes wrong TAF-key computations for key_1, key_2
12002 with bulf formulae.
12003 - exf_init.F modify #ifdef for exf_init_evap
12004 - exf_getffieldrec.F, ctrl_getrec.F
12005 The following INT-usages are not safe:
12006 fldsecs = int(fldsecs/fldperiod)*fldperiod
12007 fldcount = int(fldsecs/fldperiod) + 1
12008 and were modified.
12009 o autodiff: checkpoint_lev...
12010 - updated storing for bulk formulae (some arrays were missing)
12011 - added state for seaice package
12012 - synchronized with main branch
12013 o DIVA:
12014 Modif.s in
19c7b39f75 Patr*12015 - the_main_loop.F
12016 - the_model_main.F
a2ac993b88 Patr*12017 and added cost_final_restore.F cost_final_store.F
12018 o With these changes, it is possible to fully separate
12019 the first forward run to compute the cost function (mdthe_main_loop)
12020 and adjoint runs over individual DIVA intervals (adthe_main_loop)
12021 into separate model executions.
12022 This enables better tuning of DIVA to given queue sizes.
12023 o Loss of cost function value in consecutive DIVA runs is
12024 fixed by storing to 'costfinal' file.
a435e833b1 Mart*12025 o Appropriate call of ctrl_unpack/_pack,grdchk_main at
a2ac993b88 Patr*12026 beginning/end of adjoint integration is accounted for.
12027 The current changes apply to TAF-1.4.26.
12028 TAF has one remaining bug, requiring one manual change
12029 (see MITgcm manual).
12030 o cal: synchronized between MAIN and ecco-branch
12031
0e6056cd20 Jean*12032 checkpoint48i_post (2003/03/05)
eae13cfd04 Patr*12033 o Changes to restore differentiability of code w.r.t. previous tag
12034 (mostly adding new routines to make list and replacing
12035 pressure by totPhiHyd).
12036 o Updated and merged grdchk package
12037 - has both ADM and TLM checks
12038 - works for single- and multi-proc.
12039 - output cleaned
12040 - worked successfully for parallel DIVA
12041 o genmake:
12042 - Adding -platform=SP4
12043 - Modif. for DEC Alpha (many don't have makedepend; use mkdep instead).
12044 o Modif. for DIVA:
12045 ctrl_unpack should not be called in intermediate DIVA interval.
12046 (similar thing would apply for active files such as
12047 tbar, sbar, psbar, which should not be reinitialised;
12048 only relevant for ecco-branch)
12049
0e6056cd20 Jean*12050 checkpoint48h_post (2003/02/28)
c05a259eac Jean*12051 o improve "ini_p_ground" when using finite difference form for calc_phi_hyd
190e1777cb Dimi*12052 o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F
12053 o Added SEAICE_initialHEFF to pkg/seaice
d0702b49e9 Dimi*12054 o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT
190e1777cb Dimi*12055
0e6056cd20 Jean*12056 checkpoint48g_post (2003/02/18)
2959c7b521 Jean*12057 --- EOS:
12058 o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF
12059 store total Potential in totPhyHyd for diagnostics & EOS.
12060 o fix restart and overlap Pb when using Z-coord and EOS funct. of P
12061 --- Pressure/geopotential gradient:
12062 o use Ro_surf & R_low instead of hFac in cal_phi_hyd:
12063 o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind
12064 ( changes results of global_ocean_pressure )
12065 o NLFS + z-coord.: add eta*Rho' contribution.
12066 o accurate phiHyd when using interface-W at the middle between 2 centers
12067 ( changes results of ideal_2D_oce )
12068 o includes r* 2nd term in potential gradient.
12069
0e6056cd20 Jean*12070 checkpoint48f_post (2003/02/18)
6060ec2938 Dimi*12071 Merging from release1_p12:
12072 o Modifications for using pkg/exf with pkg/seaice
12073 - improved description of the various forcing configurations
12074 - added basic radiation bulk formulae to pkg/exf
12075 - units/sign fix for evap computation in exf_getffields.F
12076 - updated verification/global_with_exf/results/output.txt
12077 o Added pkg/sbo for computing IERS Special Bureau for the Oceans
12078 (SBO) core products, including oceanic mass, center-of-mass,
12079 angular, and bottom pressure (see pkg/sbo/README.sbo).
12080 o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F
12081 to avoid negative values in shallow regions.
12082 - updated verification/natl_box/results/output.txt
12083 - updated verification/lab_sea/results/output.txt
12084 o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F
12085 o Added useSingleCpuIO option (see PARAMS.h).
12086 o Updated useSingleCpuIO option in mdsio_writefield.F to
12087 work with multi-field files, e.g., for single-file pickup.
12088 o pkg/seaice:
12089 - bug fix in growth.F: QNET for no shortwave case
12090 - added HeffFile for specifying initial sea-ice thickness
12091 - changed SEAICE_EXTERNAL_FLUXES wind stress implementation
12092 o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf,
12093 kpp_transport_t.F, forward_step.F, and the_main_loop.F
12094 o pkg/seaice:
12095 - adjoint-friendly modifications
12096 - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
12097
0e6056cd20 Jean*12098 checkpoint48e_post (2003/02/12)
6f90d97ce9 Jean*12099 o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post)
5f7a0a65d1 Jean*12100 o dynamics: change definition of computational domain & adapt mom_fluxform
a435e833b1 Mart*12101 accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2.
5f7a0a65d1 Jean*12102 o following exp works with Olx=Oly=2 (and pass through checkbounds option):
12103 adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1
bc5ef4cea8 Jean*12104 exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5
a435e833b1 Mart*12105 global_ocean.90x40x15 global_with_exf global_ocean_pressure
5f7a0a65d1 Jean*12106 inverted_barometer solid-body.cs-32x32x1
12107 (high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure)
6f90d97ce9 Jean*12108
0e6056cd20 Jean*12109 checkpoint48d_post (2003/02/09)
fa86c7bd0e Jean*12110 o in preparation for r*:
12111 a) use pre-computed gradient of hydrostatic potential:
12112 changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce
12113 b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd:
a435e833b1 Mart*12114 => affects results of glob_oce_pressure (different truncation error)
fa86c7bd0e Jean*12115 update output.txt of ideal_2D_oce & global_ocean_pressure
12116
0e6056cd20 Jean*12117 checkpoint48d_pre (2003/02/08)
395300a99d Jean*12118 o in preparation for r*:
12119 new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient.
12120 pass the 2 comp. of the grad. as arguments to momentum S/R.
a435e833b1 Mart*12121 but for the moment, only used if it does not change the results.
395300a99d Jean*12122 o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP
12123
0e6056cd20 Jean*12124 checkpoint48c_post (2003/02/06)
da25c1b1f0 Patr*12125 Modifications in treatment of initial flux forcing controls
12126 to avoid extra storing of flux fields.
12127
0e6056cd20 Jean*12128 checkpoint48c_pre (2003/01/21)
6201ebed0f Alis*12129 o Added tidal_basin_2d experiment (currently 1D!)
a435e833b1 Mart*12130 o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented)
ed1ae133b9 Jean*12131
0e6056cd20 Jean*12132 checkpoint48b_post (2003/01/27)
1bf124dbfd Jean*12133 o r* coordinate added in #ifdef NONLIN_FRSURF block.
12134 (modification to pressure gradient not yet implemented)
12135 o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports
12136 (for U & V) that are used for vertical advection of momentum.
12137
0e6056cd20 Jean*12138 checkpoint48a_post (2003/01/24)
5c72e2cee7 Jean*12139 o In preparation for r*, use temp. array to compute vertical transport
a435e833b1 Mart*12140 in flux-form momentum pkg. => change results of few test-exp.
12141 Update output of: exp4, exp5, front_relax, global_ocean_pressure,
5c72e2cee7 Jean*12142 lab_sea, natl_box & plume_on_slope
12143
0e6056cd20 Jean*12144 checkpoint48 (2003/01/23)
3fa5200144 Jean*12145 o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D')
12146
0e6056cd20 Jean*12147 checkpoint47j_post (2003/01/21)
d15fa5f8eb Jean*12148 o add new exp. (ideal_2D_oce) to test "exotic" parameters and options.
dd4e4e2846 Patr*12149 o moved adexch from forward_step to addummy_in_stepping
12150 o added exch in ctrl_map_...
12151 o aveFreq.=0. at end of cost_final to avoid overwrite in
12152 reverse checkpointing loop
12153 o Yet more changes in gmredi:
12154 * adgmredi_calc_tensor
12155 avoiding all recomputation of gmredi_slope_limit
12156 * adgmredi_x/y/rtransport
12157 added flag for excessive storing to avoid recomp. of
12158 u/v/rtans, dTdx/y/z
12159 -> this is not really necessary and very memory-consuming
12160 * adgmredi_slope_psi:
12161 consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff
12162 * gmredi_slope_limit
12163 re-activated full calculation of taperfct for case 'ac02'
12164 o updating verification/ adjoints of carbon, global_ocean.90x40x15
d537a7f0b2 Patr*12165
0e6056cd20 Jean*12166 checkpoint47i_post (2003/01/13)
a934d97f06 Jean*12167 o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled.
12168 o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi)
12169 default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post)
a435e833b1 Mart*12170 o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf)
a934d97f06 Jean*12171 o gmredi: fix few bugs.
12172
ba5e34915b Alis*12173 checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48)
d537a7f0b2 Patr*12174 This will be a good checkpoint to plug into the ecco-branch.
12175 o few modif.'s to get latest version adjointed
12176 (mainly kick out code in ini_linear_phisurf)
12177 o modif's to run adjoint with exactConserv
12178 o case GM_BOLUS_ADVEC should be cleaned
12179 S/R gmredi_slope_psi should be cleaned
12180 o verification/carbon now has exactConserv=.TRUE.
0501ef9fb3 Patr*12181
0e6056cd20 Jean*12182 checkpoint47g_post (2003/01/10)
6d8d3f40dd Jean*12183 o time-average AIM output: becomes independent from statvars time-average
12184 (can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH)
88844f54ad Patr*12185 o After TAF bug fix:
12186 Tested adjoint of gmredi package.
12187 Tests were done with checkpoint47 rather than with latest
12188 checkpoint47f_post since the latter is broken for the adjoint
12189 verification/carbon/ contains both ADM and TLM gradient checks.
12190 Here they are, before they get changed/lost/stolen.
12191 Mostly modif.'s to fix numerical sensitivities.
12192 Gradient checks OK for
12193 - GM_taper_scheme:
12194 * clipping
12195 * ac02
12196 * linear
12197 * glw91
12198 * dm95
12199 * ldd97
12200 - GMREDI_OPTIONS:
12201 * GM_VISBECK_VARIABLE_K
12202 * GM_NON_UNITY_DIAGONAL
12203 * GM_EXTRA_DIAGONAL
12204 * GM_BOLUS_ADVEC
12205 in conjunction with data.gmredi parameters to be checked in
12206 in a few minutes under verification/carbon/code/
6d8d3f40dd Jean*12207
0e6056cd20 Jean*12208 checkpoint47f_post (2002/12/28)
cee16b76ae Dimi*12209 Merging from release1_p10:
12210 o modifications for using pkg/exf with pkg/seaice
12211 - pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
12212 and SEAICE_EXTERNAL_FLUXES
12213 - pkg/exf CPP options EXF_READ_EVAP and
12214 EXF_NO_BULK_COMPUTATIONS
12215 - usage examples are Experiments 8 and 9 in
12216 verification/lab_sea/README
12217 - verification/lab_sea default experiment now uses
12218 pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
12219
0e6056cd20 Jean*12220 checkpoint47e_post (2002/12/27)
2d0f62a494 Curt*12221 o created a tag prior to creating a branch
12222
0e6056cd20 Jean*12223 checkpoint47d_post (2002/12/16)
a435e833b1 Mart*12224 o fixed bug in the oceanic pressure coordinates code: vertical viscosity
2672305b1d Mart*12225 at the bottom boundary had an erroneous half slip boundary condition
a435e833b1 Mart*12226 o added bottom drag and no slip boundary condition capabilities to
2672305b1d Mart*12227 oceanic pressure coordinates code
12228 o added new verification experiment global_ocean_pressure, this experiment is
12229 also described in the tutorial section of the manual
0e6056cd20 Jean*12230 checkpoint47d_pre (2002/12/16)
2672305b1d Mart*12231
0e6056cd20 Jean*12232 checkpoint47c_post (2002/12/16)
03456d021e Curt*12233 o Added a verification experiment for a global cubed-sphere ocean run
12234 - verification/global_ocean.cubed32x32x30
12235 - uses pkg/therm_seaice and pkg/bulk_forcing
12236
4195ef17c2 Jean*12237 o allow to run AIM physics with SPEEDY input files (from Franco Molteni)
12238 o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1)
12239 when using P-coordinate; only implemented for atmospheric config.
12240 o OCEANICP & realFreshWater: include P-E direct effect on wVel ;
12241 NOTES: requires option NONLIN_FRSURF to be "#define".
12242 o update advect_xz/results/output.txt (left from checkpoint44g_post)
12243
0e6056cd20 Jean*12244 checkpoint47b_post (2002/12/05)
baa476eeba Dimi*12245 Merging from release1_p9:
12246 o pkg/seaice
12247 - removed GOTO's and added taf directives
12248 - double precision constants to reduce the g77 (Linux)
12249 to F77 (SGI) differences reported in release1_p8
12250 o tools/genmake
12251 - added SGI options
12252 o verification/testscript
12253 - updated to that of checkpoint47a_post
12254 o verification/global_ocean.90x40x15/input/eedata
12255 - modified for SGI f77 compatibility
12256 o verification/lab_sea
12257 - added description of sea-ice model
12258 - added missing matlab routines
12259 - added test of thermodynamics parallelization
12260
0e6056cd20 Jean*12261 checkpoint47a_post (2002/11/23)
a435e833b1 Mart*12262 o new pkg: aim_v23
12263 = F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm.
9a923a4cdc Jean*12264 for now, keep the same surface forcing as before.
12265 - Part-Cell implemented into AIM; check that Heat & Water are conserved
12266 - aim.5l_cs: use new aim pkg (run 10yr & get better results than before)
12267 - aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg
12268 o add diagnostic of surface correction term in monitor output
12269
a435e833b1 Mart*12270 o bulk_force and therm_seaice
c9bad82272 Curt*12271 - Two packages: bulk_force (Bulk forcing)
12272 and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2
12273 - Earlier integration from Stephaine Dutkiewicz
12274 and Patrick Heimbach.
12275 - Two ifdef statements for compile time,
12276 ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE
0ae80337bd Jean*12277
0e6056cd20 Jean*12278 checkpoint47 (2002/11/15)
d66d6a3f19 Patr*12279 differentiable version of checkpoint46n_post
12280 o bug fix in quasihydrostaticterms
12281 o * "clean" adjoint code (in terms of extensive recomputations)
a435e833b1 Mart*12282 can now be obtained for all GMREDI options (i.e. for
d66d6a3f19 Patr*12283 - GM_VISBECK_VARIABLE_K
12284 - GM_NON_UNITY_DIAGONAL
12285 - GM_EXTRA_DIAGONAL
12286 - GM_BOLUS_ADVEC )
12287 * However, wrong gradient check problem remains unsolved.
12288 * New CPP options have been introduced for different
12289 tapering schemes
12290 o external_fields_load now part of differentiation list
12291 o pressure needs multiple storing;
12292 would be nice to have store_pressure at beginning or
12293 end of forward_step, e.g. by having phiHyd global (5-dim.)
12294 (NB: pressure is needed for certain cases in find_rho,
12295 which is also invoked through convective_adjustment).
a435e833b1 Mart*12296 o recomputations in find_rho for cases
d66d6a3f19 Patr*12297 'JMD95'/'UNESCO' or 'MDJWF' are OK.
12298 o #define ATMOSPHERIC_LOADING should be differentiable
12299 o ini_forcing shifted to begining of initialise_varia
12300 o Incorporating QNVS line search routines into MITgcm
12301 (this is separate code, and therefore not under pkg)
12302 lsopt/, optim/
12303 o Updated verification/carbon/
12304 - #define GM_VISBECK_VARIABLE_K
a435e833b1 Mart*12305 - GM_taper_scheme = 'ldd97'
d66d6a3f19 Patr*12306
0e6056cd20 Jean*12307 checkpoint46n_post (2002/11/12)
5553098c72 Patr*12308 Merging from release1_p8:
12309 o verification/natl_box:
12310 updating new external_fields_load routine
12311 o New package: pkg/seaice
12312 Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
12313 The sea-ice code is based on Hibler (1979-1980).
12314 Two sea-ice dynamic solvers, ADI and LSR, are included.
a435e833b1 Mart*12315 In addition to computing prognostic sea-ice variables and diagnosing
12316 the forcing/external data fields that drive the ocean model,
5553098c72 Patr*12317 SEAICE_MODEL also sets theta to the freezing point under sea-ice.
a435e833b1 Mart*12318 The implied surface heat flux is then stored in variable
12319 surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
12320 kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
12321 non-local transport term. Because this call precedes model
12322 thermodynamics, temperature under sea-ice may not be "exactly" at
5553098c72 Patr*12323 the freezing point by the time theta is dumped or time-averaged.
12324 N.B.: fairly large differences in accuracy occur across
12325 different platforms/compilers; comparison between
a435e833b1 Mart*12326 g77 (Linux) and F77 (SGI Origin 2000/MIPSpro)
5553098c72 Patr*12327 generated output gives:
12328 T S U V
12329 C D M c m s m s m s m s
12330 n p a R g m m e . m m e . m m e . m m e .
12331 f n k u 2 i a a d i a a d i a a d i a a d
12332 g d e n d n x n . n x n . n x n . n x n .
12333
12334 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*12335 o GAD:
5553098c72 Patr*12336 - generated new common blocks to account for call of
12337 same gad routines with differing traceridentities
12338 (needed to modify tracerIdentity indices in GAD.h)
12339 - generated separate common blocks for case useCubedSphereExchange
12340 (Department of Futurology)
12341 - parameter lists to gmredi_?transport: added tracerIdentity
12342 - added new key indices to tamc.h
12343 o external_fields_load:
12344 - added this routine to TAF list
12345 - needed to make some common blocks global and additional storing
12346 along the same lines as exf package (checkpoint_lev?_directives.h)
12347 o exf:
12348 updated external forcing package
12349 - bug fixes carried over from ecco-branch
12350 (missing OBCS_OPTIONS.h in two routines)
12351 - enable easy to use "no forcing".
12352 - added exf I/O for atmospheric loading
12353 - added exf I/O for runoff data
12354 - transfered scaling between exf <-> MITgcm to exf namelist
12355 o Adding new verification experiment global_with_exf.
12356 This verification experiment is almost identical to the
12357 global_ocean.90x40x15 experiment, except that it uses
12358 the exf (and cal) package instead of the
12359 external_fields_load routine (cf README file).
12360
0e6056cd20 Jean*12361 checkpoint46m_post (2002/11/07)
a435e833b1 Mart*12362 o modified testscript to return -- when there are no lines of "%MON" output
775ad00e06 Alis*12363 o added new flag "quasiHydrostatic" for QH mode
12364 and new routine quasihydrostaticterms()
c5990018f4 Alis*12365 o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term)
12366 New routine: mom_u_coriolis_nh()
8d87f02f4b Alis*12367 o fixed sign of non-hydrostatic metric terms in u and v equations.
12368 Depend on correct sign of gravitySign.
574be91465 Alis*12369 o added work.pc* to .cvsignore in aim directories using ifc
faaa70ed68 Alis*12370 o introduced flag for controllin non-hydrostatic metric terms
a22df31c5b Alis*12371 o removed gravitySign from PARM04
4cc3ac93d0 Alis*12372 o switched to g77/ifc from pgf77 in aim experiments
12373
0e6056cd20 Jean*12374 checkpoint46l_post (2002/11/01)
59e59b79d8 Mart*12375 o made convective adjustment work with pressure coordinates:
12376 - changed the direction of k-loop in convective_adjustment.F for the
12377 case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation)
12378 - adjusted the reference pressure k-index in convective_adjustment.F
12379 - adjusted the convection condition in convect.F (in analogy to
12380 calc_ivdc.F)
12381 - convective_adjustment no longer computes anything on the halos
12382 - removed the warnings about negative salinity from find_rho.F and
12383 find_alpha.F; instead the new routine look_for_neg_salinity, called
a435e833b1 Mart*12384 at the beginning of find_rho, find_alpha, and find_beta, does a
12385 check of the entire slice, if CPP-option
59e59b79d8 Mart*12386 CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
0e6056cd20 Jean*12387 checkpoint46l_pre (2002/10/23)
59e59b79d8 Mart*12388
0e6056cd20 Jean*12389 checkpoint46k_post (2002/10/23)
19ec7ca2f5 Mart*12390 o fixed the verification/global_ocean.90x40x15 experiment:
12391 - new bathymetry (the world according to A., JMC, and M.)
12392 - new initial fields and forcing fields (*.bin files)
12393 - new POLY3.COEFFS (for the next release one should switch to a full
12394 equation of state: JMD95P or MDJWF)
12395 - fixed several errors and redundancies in the data file
12396 - experiment uses looped cells
12397 - added matlab directory with diagnostic scripts for plotting of output
12398
1b947e4f16 Jean*12399 o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F:
12400 - read AIM physics parameters from a file (data.aimphys)
12401 - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
12402
0e6056cd20 Jean*12403 checkpoint46j_post (2002/10/07)
3d1716969e Jean*12404 o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH
12405 o move wVel computation at the end of the time step, in S/R integr_continuity
12406 o create specific S/R to exchange T,S before DYNAMICS (for stagger time step)
12407 o update timeave pkg for wVel diagnostic.
0e6056cd20 Jean*12408 checkpoint46j_pre (2002/09/27)
3d1716969e Jean*12409
0e6056cd20 Jean*12410 checkpoint46i_post (2002/09/25)
e16ef9be6a Jean*12411 o Clean up AIM package (and keep the results unchanged):
a435e833b1 Mart*12412 include CPP_OPTION and use IMPLICT NONE in all routines ;
e16ef9be6a Jean*12413 declare all the variables _RL ; use _d 0 for all numerical constants.
12414 use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 !
e305438401 Mart*12415
0e6056cd20 Jean*12416 checkpoint46h_post (2002/09/25)
a435e833b1 Mart*12417 o cleaned up the use of rhoNil and rhoConst.
12418 - rhoNil should only appear in the LINEAR equation of state, everywhere
e305438401 Mart*12419 else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
12420 and the dynamical equations are all divided by rhoConst
a435e833b1 Mart*12421 o introduced new parameter rhoConstFresh, a reference density of fresh
e305438401 Mart*12422 water, to remove the fresh water flux's dependence on rhoNil. The default
12423 value is 999.8 kg/m^3
12424 o cleanup up external_forcing.F and external_forcing_surf.F
12425 - can now be used by both OCEANIC and OCEANICP
0e6056cd20 Jean*12426 checkpoint46h_pre (2002/09/18)
e305438401 Mart*12427
12428 Added code to convert surface volume flux (fresh water) into
12429 a mass flux when using P coordinates in the ocean (OCEANICP).
12430 Note: It assumes you have set rho0=rhoConst=density of fresh water.
12431
0e6056cd20 Jean*12432 checkpoint46g_post (2002/09/18)
60c223928f Mart*12433 o Include a new diagnostic variable phiHydLow for the ocean model
12434 - in z-coordinates, it is the bottom pressure anomaly
12435 - in p-coordinates, it is the sea surface elevation
12436 - in both cases, these variable have global drift, reflecting the mass
12437 drift in z-coordinates and the volume drift in p-coordinates
12438 - included time averaging for phiHydLow, be aware of the drift!
a435e833b1 Mart*12439 o depth-dependent computation of Bo_surf for pressure coordinates
60c223928f Mart*12440 in the ocean (buoyancyRelation='OCEANICP')
a435e833b1 Mart*12441 - requires a new routine (FIND_RHO_SCALAR) to compute density with only
12442 Theta, Salinity, and Pressure in the parameter list. This routine is
60c223928f Mart*12443 presently contained in find_rho.F. This routine does not give the
12444 correct density for 'POLY3', which would be a z-dependent reference
12445 density.
12446 o cleaned up find_rho
12447 - removed obsolete 'eqn' from the parameter list.
12448 o added two new verification experiments: gop and goz
12449 (4x4 degree global ocean, 15 layers in pressure and height coordinates)
0e6056cd20 Jean*12450 checkpoint46g_pre (2002/09/16)
60c223928f Mart*12451
0e6056cd20 Jean*12452 checkpoint46f_post (2002/09/16)
77d659325b Patr*12453 o Enable tangent linear (forward mode) gradient checks:
12454 - extended active file handling to g_... files
12455 - added TANGENT_SIMULATION to theSimulationMode
12456 - extended grdchk package accordingly
12457 o added tangent linear setup in verification/carbon/code_ftl
12458 o added adjoint setup in verification/front_relax/code_ad
12459
0e6056cd20 Jean*12460 checkpoint46e_post (2002/09/05)
31a5949e20 Mart*12461 o Added new equation of state -> MDJWF
12462 - EOS of McDougall et al., 2002, JAOT, submitted
12463 - caveat: the equation of state is only valid for a smaller (more
12464 realistic?) range of values than JMD95P/Z and UNESCO
12465 - added masks to the calculation of pressure in store_pressure
a435e833b1 Mart*12466 - added more check values for density in check_eos (ini_eos.F), some of
31a5949e20 Mart*12467 the old check values are out of the range of the MDJWF-eos, so don't
a435e833b1 Mart*12468 expect perfect matches for those
0e6056cd20 Jean*12469 checkpoint46e_pre (2002/08/19)
31a5949e20 Mart*12470
0e6056cd20 Jean*12471 checkpoint46d_post (2002/08/19)
9b1fb10894 Mart*12472 o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and
a435e833b1 Mart*12473 'OCEANICP', also initialised field pressure correctly in ini_eos in the
12474 case of pressure coordinates. eosType='JMD95Z' in
9b1fb10894 Mart*12475 combination with buoyancyRelation='OCEANICP' now causes an error.
12476 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
12477 in find_alpha/beta.
0e6056cd20 Jean*12478 checkpoint46d_pre (2002/08/15)
9b1fb10894 Mart*12479
12480 o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj)
a435e833b1 Mart*12481 so that JMD95Z and JMD95P give approptiate static stability in find_rho.
9b1fb10894 Mart*12482
0e6056cd20 Jean*12483 checkpoint46c_post (2002/08/15)
9e5f2093d3 Alis*12484 o Changes necessary for ocean in p-coordinates
12485 - Added new buoyancy relation = 'OCEANICP'
12486 - Added new parameters = gravitySign (this used to be contained inside
12487 the factor dRdZ which I added when we first switched to R coordinates).
12488 X GM/Redi is not compatible (yet)
12489 X bottom drag and no-slip need to be debugged.
0e6056cd20 Jean*12490 checkpoint46c_pre (2002/08/07)
9e5f2093d3 Alis*12491
0e6056cd20 Jean*12492 checkpoint46b_post (2002/08/07)
a37a13034c Mart*12493 o Added new equation of state -> JMD95Z and JMD95P
31a5949e20 Mart*12494 - EOS of Jackett and McDougall, 1995, JAOT
a37a13034c Mart*12495 - moved all EOS parameters into EOS.h
12496 - new routines ini_eos.F, store_pressure.F
a435e833b1 Mart*12497 o Added UNESCO EOS, but not recommended because it requires
a37a13034c Mart*12498 in-situ temperature (see JMD95)
12499 o Modified formatting for knudsen2.f in utils/knudsen2 and added
12500 unesco.f to be used with POLY3
0e6056cd20 Jean*12501 checkpoint46b_pre (2002/07/31)
a37a13034c Mart*12502
0e6056cd20 Jean*12503 checkpoint46a_post (2002/07/31)
395b093796 Mart*12504 o Added (atmospheric) pressure loading
12505 - new field in FFIELDS.h, etc...
12506 - new cpp flag ATMOSPHERIC_LOADING
12507 o Changed hFacC to _hFacC in calc_phi_hyd.F
12508 o Added SHORTWAVE_HEATING to some files for consistency
0e6056cd20 Jean*12509 checkpoint46a_pre (2002/07/13)
395b093796 Mart*12510
0e6056cd20 Jean*12511 checkpoint46 (2002/07/13)
0501ef9fb3 Patr*12512 further merges from release1_p5
12513 o new ctrl package
12514 - adopted from ECCO environment to enable optimization
12515 - added Eliassen Palm fluxes to controls
12516 o added Eliassen Palm flux controls to gradient check package
12517 o cost package
12518 - Compatible with new ctrl package
12519 - added Eliassen Palm cost hooks
12520 - modif's of existing cost functions
12521 o Adjoint-related bug fixes in kpp:
12522 - kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix
12523 - kpp_routines: store of Rib avoids partial recomputation bug of TAF.
12524 o autodiff package
12525 - flow directives:
12526 + new for S/R do_the_model_io
12527 + enhanced for S/R checkpoint
12528 + new gmredi.flow
12529 - Introduced CPP option ALLOW_AUTODIFF_MONITOR to
12530 disable adcommon.h/g_common.h by default.
12531 - fixed problem for adjoint of global_max
12532 o modified verification/carbon/
12533 o New setup for adjoint of global_ocean
12534 o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F)
12535 o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F)
12536 o incorporated hooks for sponge layer code (external_forcing.F)
12537
0e6056cd20 Jean*12538 checkpoint45d_post (2002/07/12)
9d1e859170 Jean*12539 o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F)
fe84d1c123 Jean*12540 o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S
12541 (affects plume_on_slope "cg2d" output)
9d1e859170 Jean*12542 o add new parameter deltaTfreesurf for free-surface time stepping
a435e833b1 Mart*12543 o exchange gT,gS when using staggerTimeStep & GM & Oly<4
40a013c787 Jean*12544 o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B
5a6e38b5cb Jean*12545 o change phiMin in exp1 (to agree with documentation)
a435e833b1 Mart*12546 o add new flags:
5a6e38b5cb Jean*12547 - T,S forcing inside/outside Adams-Bashforth
12548 - turn off temp,salt advection and/or forcing
12549 - for each tracer, define internal flag for multiDimAdvection & A-B
12550 o monitor: change definition of KE to check conservation of Energy
fda4da40f3 Jean*12551
0e6056cd20 Jean*12552 checkpoint45c_post (2002/05/30)
cda7963c0f Patr*12553 o Removed f90 comments ("!")
12554 o Modified initialisations to enable exf package for MITgcm
12555 (without invoking ECCO_PACKAGE).
12556 o modifications to gradient check package (Martin Losch)
12557 - enable centered differences
12558 - modified format of standard output
12559
0e6056cd20 Jean*12560 checkpoint45b_post (2002/05/30)
778263fdd2 Patr*12561 o cleaned exchange calls in cg2d
12562 o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step
12563 o included CPP option SINGLE_LAYER_MODE in thermodynamics
12564 to configure barotropic setup (Martin Losch)
12565 o moved some initialisations within bi,bj loop in dynamics
12566 (TAF flow dependency)
12567 o in initialise_varia, moved call packages_init_variables
12568 before convective_adjustment_init
12569 (corresponding adjustment of TAF tape initialisation).
12570 o in calc_diffusivity/calc_viscosity extended domain to full overlap.
12571
0e6056cd20 Jean*12572 checkpoint45a_post (2002/05/01)
23b8953dcb Jean*12573 o compute Rho over the whole domain (extend iMin,jMin indices)
12574 o specific exchange for X-slice domain (case Ny=1)
58071f7ded Jean*12575 o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code
12576 o solve_for_pressure : set cg2d_x to zero where OBCS are applied
12577
f2f05cab96 Patr*12578 checkpoint44h_post = checkpoint45
12579 o Fix to restore differentiability:
12580 place at which packages_init_variables is called in
12581 initialise_varia is crucial for reverse control flow.
12582 o modifications in GMRedi to enable stable adjoint
12583 (corresponding modif's in thermodynamics, dynamics)
12584 o added missing hook for sponge layer code in external_forcing
12585 o modified test cost functions
12586 o storing in gad_advection (plus removal of write(0,*)!
12587 o missing headers TR1.h added in convective_adjustment routines
12588 o errorMessageUnit set non-equal zero in eeboot
12589 (conflict on some platforms, e.g. IBM SP3)
12590 o modified carbon verif.
12591
0e6056cd20 Jean*12592 checkpoint44h_pre (2002/03/14)
e5968d5db8 Jean*12593 o vertical grid option: allow to put the Interface at the middle between
12594 2 cell-centers ; replace delZ in pkg/kpp by drF.
3f61bba06d Jean*12595 o GM Advective form: Tracers are advected using the residual transport (=
12596 Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form.
12597
0e6056cd20 Jean*12598 checkpoint44g_post (2002/03/05)
a435e833b1 Mart*12599 o fix surface correction term in multiDimAdvection (affects plume_on_slope
d459353a4c Jean*12600 results) ; ifdef missing in thermodynamics.F
12601
5c43c390b6 Alis*12602 checkpoint44f_pre,checkpoint44f_post
12603 o added PTRACERS package
12604 This allows an arbitrary number of passive tracers to be integrated
12605 forward simultaneously with the dynamicaly model.
12606 + Implemented so far:
12607 - basic forward algorithm (time-stepping, advection, diffusion, convection)
12608 - I/O and checkpointing
12609 - GM/Redi *but* using the GM/Redi coefficient of Salt
12610 + Not implemented so far:
12611 - KPP
12612 - OBCS
12613 + No specific example supplied (yet) but global_ocean.90x40x15 has the
12614 necessary data.ptracer file. Simply use -enable=ptracers and uncomment
12615 line in data.pkg.
12616 + This package is disabled by default since it increases storage.
12617
12618
658a1753bb Alis*12619 o testscript: added -cleanup option
f4ba6d3695 Jean*12620 o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter
12621 b) enable to filter 2D fields.
d427b861ca Jean*12622
3e6bf4af46 Alis*12623 checkpoint44e_pre,post
12624 o re-wrote convective adjustment to use pre-calculated weights
12625 Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F
12626 Adds: model/src/convective_weights.F, convectively_mixtracer.F
12627 Original calls to convect() still in place.
12628
2014c6d62b Patr*12629 chkpt44d_pre,post
12630 o added missing EXCLUDE_MONITOR flags
12631 o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi
12632 (incompatible typ in MIN/MAX expressions caused problems
12633 on IBM SP3)
12634 o in genmake added variable MAKEDEPEND
12635 plus resetting for case SunOS
12636 o added timer_stats.c routine for IBM SP3
12637 o removed variables in dynamics
12638 !!! I forgot to create tag chkpt44d_pre !!!
12639 !!! But chkpt44d_pre = chkpt44c_post !!!
12640
f4ba6d3695 Jean*12641 o real fresh water flux implemented with non-linear free-surface.
12642
d645283517 Jean*12643 chkpt44c_pre,post
a435e833b1 Mart*12644 o few fix (mask in shap_s2, EmPmR in external_field_load,
12645 USE_NATURAL_BCS in solve_for_P);
d645283517 Jean*12646 o add arguments myIter & myTime to S/R obcs_calc & solve_for_P
12647
de416ebcde Patr*12648 checkpoint44b_pre/_post
12649 o merge of relevant stuff from the ecco-branch:
12650 - genmake: removed $S64 overwrite for case SunOS
12651 - pkg/exf: update and corrections for field swapping and obcs
12652 - pkg/ecco: parameter lists for the_model_main, the_main_loop
12653 harmonized between ECCO and MITgcm
12654 - pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
12655 updated checkpointing_lev... lists for obcs
12656 - model/src: minor changes in forward_step, plot_field
12657 added directive for divided adjoint in the_main_loop
12658 - pkg/mdsio: added mdsio_gl_slice
12659
fda4da40f3 Jean*12660 o check parameters & config (chkpt44a_pre,post)
5fc9e00fa1 Jean*12661 o OBC and NonLin_FrSurf.
12662
0e6056cd20 Jean*12663 checkpoint44 (2002/01/18)
beeff87535 Jean*12664 o fix bug in mom_vi_del2uv
5fc9e00fa1 Jean*12665 o select when filters are applied ; add options to zonal_filter (data.zonfilt)
12666 o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
12667 o update AIM experiments (NCEP input files)
12668 o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
b07345cdda Patr*12669 o added some stuff for AD
84a1eca0f1 Patr*12670
0e6056cd20 Jean*12671 checkpoint43 (2001/09/28)
7205c731d1 Alis*12672 o added two new advection tests
12673 o added global 4x4 degree ocean test
12674 o added test of H&S94 with free surface on cube
12675 o some final mods for gradient check, adjoint,...
12676
0e6056cd20 Jean*12677 checkpoint42 (2001/09/27)
9620337c26 Patr*12678 Fixed AD-related problems:
12679 o Store directives up-to-date with re-arranged Adams-Bashforth
12680 (mainly thermodynamics.F)
12681 o New store directives for multi-dim. advection schemes
12682 * new CPP flag ALLOW_MULTI_DIM_ADVECTION
12683 * new common block and key passkey
12684 (mainly gad_advection.F)
12685 o Modified store directives for split of dynamics/thermodynamics
12686 for the case ALLOW_KPP
12687 o Cleaned argument list for timestep_tracer.F
12688
0e6056cd20 Jean*12689 checkpoint41 (2001/09/27)
aafb52f44c Alis*12690 o re-formatted/added comments in prologues of key subroutines
12691 to work with protex
12692
0e6056cd20 Jean*12693 checkpoint40 (2001/09/27)
07eb89f7e7 Alis*12694 o moved calc_gs, calc_gt and calc_tr1 back to model/src
12695 o added FLT (floats) package from Arne along with demo. experiment
12696 o re-arranged Adams-Bashforth scheme for tracers to allow easier
12697 implementation of forward-in-time forcing terms
12698 o more mods for non-linear free-surface including new variable
12699 o modified multi-dim method to work on cube
12700 o bug fix in KPP (from DM)
12701
0e6056cd20 Jean*12702 checkpoint40pre9 (2001/09/27)
76bfa80e3f Alis*12703 o added DST advection schemes
12704 o fix MPI bug on SGI's
12705 o modifications for non-linear free-surface
12706 o fixed conditionals for fixed flow/passive tracer only mode
12707 o added tension/strain form of stress tensor
12708 o changes to commenting of arguments for TAF/TAMC
12709 o added/updated many matlab scripts
07eb89f7e7 Alis*12710 o added multi-dimensional advection method for tracers
a435e833b1 Mart*12711
0e6056cd20 Jean*12712 checkpoint40pre8 (2001/09/05)
c710cbecfb Patr*12713 o new package rw/
12714 Added method for dumping intermediate local arrays:
12715 mdsio_writetile - same as mdsio_writefield except works from inside
12716 bi,bj loop
12717 mdsio_writelocal - same as mdsio_writetile except works for local
12718 arrays
12719 write_local_r? - higher-level wrapper for mdsio_writelocal
12720 Controlled by diagFreq. Defaults to zero (ie. no dumps)
12721 Example given at end of mom_vecinv.F that dumps some local arrays.
12722 o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to
12723 control flux-form versus vector invariant code.
12724 Switch is runtime flag vectorInvariantMomentum (defaults to false)
12725 or genmake -DISABLE ...
12726 o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F
12727 (additional storing is now needed for case vecinv;
12728 currently nothing implemented to switch this storing off
12729 in case fluxform is used since no CPP flag available).
12730
0e6056cd20 Jean*12731 checkpoint40pre7 (2001/08/14)
11252a3870 Patr*12732 o bug fix in dynamics.F
12733 calc_viscosity called before k=1,Nr loop.
12734 o added some #ifdef's ALLOW_PASSIVE_TRACER
12735 o cleaned initialisations in ctrl_map_ini
12736 related to TAF
12737
0e6056cd20 Jean*12738 checkpoint40pre6 (2001/08/13)
b2d3fccd49 Patr*12739 o split dynamics into thermodynamics & dynamics
12740 o corresponding split of calc_diffusivity into
12741 calc_diffusivity, calc_viscosity
12742 (kpp_calc_diff, kpp_calc_visc).
12743 o Added diffkr, kapgm to control variables
12744 o bug fix in gmredi_slope_limit for ldd97
12745
0e6056cd20 Jean*12746 checkpoint40pre5 (2001/07/31)
2277c012d1 Alis*12747 o proper initialization of Adams-Bashforth time stepping
12748 + uses forward step for very first step of model (iter=0)
12749 o re-generated *all* output since almost all output is modified by this
12750 change (sorry but we've been putting this one off for about 2 years)
12751 + natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were
12752 *not* regenerated since they are already out of date and I don't
12753 want to create the impression that they are suddenly working.
12754 o removed KAP stuff for DEC's
12755 o modified/added many .cvsignore files in */code and */input
12756 o added new expt "solid-body.cs-32x32x1"
12757 + this uses an alternative form of ini_curvilinear_grid.F which
12758 is not necessarily any better than the current one...
12759
0e6056cd20 Jean*12760 checkpoint40pre4 (2001/07/30)
84a1eca0f1 Patr*12761 o added re-initialisations of utrans,vtrans,rtrans in
12762 calc_common_factors which are crucial for TAF.
12763 o extended iMin,jMin range for calc_common_factors,
12764 calc_diffusivity
12765 o added option ALLOW_PASSIVE_TRACER
12766 o a few minor updates and fixes
12767
0e6056cd20 Jean*12768 checkpoint40pre3 (2001/07/13)
8970237877 Patr*12769 o created calc_gtr1.F for gad package
12770 o split the_main_loop and re-introduced forward_step
12771 o some recomputations of nIter0 for TAMC
12772
0e6056cd20 Jean*12773 checkpoint40pre2 (2001/07/13)
12b269a63b Patr*12774 o Updated to latest branch of AJA, JMC
12775 o Added gradient check package
12776 o Added routines for passive tracer handling
12777 o Added carbon sequestration sensitivity experiment
12778
0e6056cd20 Jean*12779 checkpoint39 (2001/05/14)
0a8108926c Patr*12780 o Modifications and fixes to support TAMC
12781 (mainly missing or wrong directives)
12782 o Corrected common blocks when fooling TAMC to produce adjoint I/O
12783 in addummy_in_stepping
12784 o Updated verification/vero/ (bug fixes in code/, correct pickups in input/)
12785 o Enabled "sliced" (xz-,yz-) exchanges, needed for obcs.
12786 o Included following packages:
12787 cal: calendar
12788 exf: external forcing
12789 ecco: essential routines to control use of cal, exf
12790 (NB: this is not the full ECCO environment)
160e0619c9 Patr*12791 o disabled some packages by default in genmake
0a8108926c Patr*12792
0e6056cd20 Jean*12793 checkpoint38 (2001/04/10)
2cfc9d59a2 Patr*12794 o see notes_c37_adj.txt
12795 o corrected wrong layer index in external_forcing_t
12796 o replaced the_main_loop/forward_step by the_main_loop
12797 o removed forceoutput from write_state
12798 (replaced criteria for initial/final state)
12799 o added runtime flag for pre-C35 pickups: usePickupBeforeC35
b7a12fbe29 Chri*12800
0e6056cd20 Jean*12801 checkpoint37 (2001/03/13)
2a60a6d948 Jean*12802 o mdsio.F routine split and packaged in pkg/mdsio
12803 (mdsio.F and mdsio_gl.F still exist in eesupp/src but are not
12804 used unless genmake -disable=mdsio)
12805 o allow a more precise surface-geopotential gradient for the atmosphere
12806 taking into account the change in space of Alpha (=1/rho) at the surface.
12807 o variable "etaN" (replace cg2d_x) is the surface R-anomaly [r unit]
12808 (ocean: sea surface height [m] / atmos: surface pressure anomaly [Pa])
12809 o Change units: Phi_Hydrostatic (=phiHyd), Phi_Surface(=cg2d_x) and
12810 Phi_NonHydrostatic (=cg3d_x), all have now the dimension of a potential
12811 [m2/s2] (pressure/rhoConst in the ocean ; Geo-Potential in the atmosphere).
12812 o Time-Average diagnostics defined as a pseudo package "timeave".
12813 o pickup files : old pickup (before c35) did not work with new code (c35
12814 and after) unless activating 2 commented lines in initialise-varia.
12815 o Non-Hydrostatic pickup file Pb fixed.
a435e833b1 Mart*12816 o bug with Rigid-lid version (since c35) fixed.
2a60a6d948 Jean*12817
0e6056cd20 Jean*12818 checkpoint36 (2001/02/20)
2a60a6d948 Jean*12819 o implement Crank-Nickelson barotropic time-stepping
3d3ffaaedb Jean*12820 o recover Time-Average diagnostics
a435e833b1 Mart*12821 o fix Pb in checkpoint (PR#19)
3d3ffaaedb Jean*12822 o AIM become a standard package ; clean unused CPP_kees
12823
0e6056cd20 Jean*12824 checkpoint35 (2001/02/08)
47b446e27e Jean*12825 o subtantial rewrite of dynamics.f
12826 o allows staggered time-stepping
12827 o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt
12828 o added bottom drag (linear + quadratic)
12829
0e6056cd20 Jean*12830 checkpoint34 (2001/01/30)
ea8b6560ce Patr*12831 o Modified exchange routines for correct reverse simulation.
12832 o Added verification output to comply with bug fix in impldiff.F
12833 as of c33 (exp2, natl_box).
12834 o Corrected store directives in dynamics.F
12835 o Corrected array boundaries in impldiff.F
12836 o Corrected array dimensions in gmredi.
12837 Added temporary scalars to avoid storage by TAMC (gmredi, kpp).
c3ddfd9c4c Patr*12838 o Added routine GLOBAL_SUM_INT to global_sum.F
ea8b6560ce Patr*12839 o Added mdsio_gl.F for ECCO purposes.
12840
0e6056cd20 Jean*12841 checkpoint33 (2000/11/30)
7a9ddade78 Alis*12842 o Fixed bug in lower BC in impldiff.F
12843 o Fixed confusion about units of forcing arrays in FFIELDS.h
12844 namely Fu,Fv,Qnet,Qsw,EmPmR:
12845 - Removed verification/natl_box/code/external_fields_scale.F
12846 (did not differ from that in model/src)
12847 - Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
12848 (see FFIELDS.h for description)
12849 - Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
12850 kpp_calc.F and kpp_transport_t.F
12851 - Removed model/src/external_fields_scale.F and calls to it
12852 - verification/natl_box uses flux data with "atmospheric" sign so
12853 a special version of external_fields_load.F is used to
12854 change the data as it's read in. This way, the arrays
12855 have the right units and signs at all times tha a user could
12856 possibly use them.
12857 o Corrected genmake to delete a temporary file during configuration
12858
0e6056cd20 Jean*12859 checkpoint32 (2000/11/13)
cfb3cd1ea2 Patr*12860 o Scaling of forcing fields moved from external_forcing.F to
12861 external_fields_scale.F, called directly after loading fields.
12862 o Surface relaxation terms added to surface tendency fields in
12863 extra subroutine.
12864 o impldiff.F changed to avoid storing by TAMC of huge intermediate
12865 fields.
12866 o Changes in GMRedi to comply with packaging structure.
12867 o Modifications and bug fixes in KPP package.
12868 o Verification experiment for KPP added (verification/nat_box/)
12869
0e6056cd20 Jean*12870 checkpoint31 (2000/09/11)
dde6192d54 Patr*12871 o Packages interface brought in line with defined standard
12872 -> new routines packages_...F
12873 -> changes in initialise_fixed.F, initialise_varia.F
12874 -> enables initialisation interface for ECCO package
12875 o Rescaling of external forcing fields immediately after read
a435e833b1 Mart*12876 (removed from external_forcing.F)
dde6192d54 Patr*12877 -> new: surface_fields_scale.F
12878 -> affects ini_foorcing.F, external_fields_load.F
12879 o Computation of surface tendencies before tendency updates.
12880 -> new: external_forcing_surf.F
12881 o Change of variable names useGMRedi, useKPP, useECCO
12882 o Further changes in dynamics.F, impldiff.F for TAMC
12883 o Tested for experiments 0, 2, 4.
12884 - not yet tested for GMRedi.
12885 - not yet tested for KPP.
12886
0e6056cd20 Jean*12887 checkpoint30 (2000/07/13)
7eedb26c3d Alis*12888 o Updates for OBCs
12889 o New experiment for test OBCs (internal_wave)
12890 o New output.txt in verification/exp4/results/
12891 o Updates for KPP: calculation of viscosity corrected, new variables
12892 kpp_dumpFreq and kpp_taveFreq
12893 o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.)
12894 and entry for T90 in genmake
12895
0e6056cd20 Jean*12896 checkpoint29 (2000/06/21)
c53ad8dc62 Alis*12897 o packaged KPP and GM/Redi
12898
0e6056cd20 Jean*12899 checkpoint28 (2000/06/09)
56096ca40a Patr*12900 o Corrected initialization of hFacMin for difference vertical coordinates
12901 o Modified calculation of partial cell thickness to more robust algorithm
12902 o config_summary.F: replaced write_1D_... by write_0D_...
12903 read_write.F: added subroutines write_0D_...
12904 o routines calc_common_factors, calc_gs, calc_gt, calc_phi_hyd, find_rho:
12905 included some initialisations required for TAMC.
a435e833b1 Mart*12906 o routine calc_isoslopes: modified sqrt computation to make it
56096ca40a Patr*12907 differentiable for zero argument.
12908 o routines dynamics, impldiff:
12909 included store directives and tape key computations required for TAMC.
12910 o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC
12911
0e6056cd20 Jean*12912 checkpoint27 (2000/04/10)
5b679adde0 Alis*12913 o fixed calc_isoslopes() to so that cancellation of terms in tensor
12914 formulation works properly with variable resolution.
12915 o restructured the calling tree between the_model_main() and dynamics()
12916 o split initialise() into initialise_fixed() and initialise_varia()
12917 o introduced initialization file pSurfInitFile for free surface (cg2d_x)
12918 in new routine ini_psurf()
12919
0e6056cd20 Jean*12920 checkpoint26 (2000/04/05)
ab1673a65c Alis*12921 o moved some #ifdef in optional routines to encompass everything
12922 except the argument declarations. This was using up some memory.
12923 o fixed macros like _ADT to work with both versions of Linux cpp
12924 o cleaned up some unused and uninitialized variables
12925 (helps when debugging with strict compile options)
12926 o split up CPP_EEOPTIONS.h into options and macros
12927 (macros are now in eesupp/inc/CPP_EEMACROS.h)
12928 o patch for 2 processor JAM mode
12929
0e6056cd20 Jean*12930 checkpoint25 (2000/03/15)
c19cdd9408 Alis*12931 o updates for OBCs and NH
12932 o dramatically reduced memory usage
12933 o added "JAM" routines for use on Artic network
12934 o parameterization of convection by implicit vertical diffusion
12935 o added a diagnostic of convective index
12936 o moved call to calc_divg_hat() from dynamics() to solve_for_pressure()
12937 (this is was partly for OBCs and NH but also in anticipation of
12938 an explicit free-surface option)
12939 o initial state input files for U and V
12940
0e6056cd20 Jean*12941 checkpoint24 (1999/08/02)
090b7007c7 Alis*12942 o Removed some spurious "REAL"s
12943 o Updated KPP to latest version from JPL
12944 o Added a COS(latitude) in horizontal viscosity
12945
0e6056cd20 Jean*12946 checkpoint23 (1999/05/26)
8f6e5ef29b Alis*12947 o Added del^4 diffusion for salt and temperature
12948 o Multiple minor fixes (implicit none's, arguments to global_sum, etc.)
12949
0e6056cd20 Jean*12950 checkpoint22 (1999/05/18)
b3d4b567f6 Alis*12951 o Made many small changes: implicit none, format(i5), etc...
12952 o Introduced KPP mixing scheme (compiles and runs but *not* tested)
12953
0e6056cd20 Jean*12954 checkpoint21 (1999/05/18)
dccdad8bbd Alis*12955 o Introduced new I/O package that supports direct-access records (mdsio.F)
12956 o Split-up mid-level I/O routines
12957 o Updated input data for experiments 0,1,2,4 and 5
12958 o Finally removed the genmake.* scripts (everyone seems happy with genmake)
12959
0e6056cd20 Jean*12960 checkpoint20 (1999/03/22)
e92aabed24 Alis*12961 o Tidied up open-boundaries some more
12962 o Added non-hydrostatic code
12963 o Fixed some input data
12964 o Modified MPI start-up to work in "coupled" context.
12965
0e6056cd20 Jean*12966 checkpoint19 (1998/12/15)
337ad8328b Alis*12967 o Tidied up directory structure for verification experiments.
12968 o Added new code for open boundaries.
12969 o Corrected advective terms near boundaries.
12970 o Added CPP flag for "old UV" geometry and corrected spherical geometry.
12971 o Implemented free-slip/no-slip BCs and del^4 dissipation.
e92aabed24 Alis*12972 o Split default parameters out of ini_parms.F into set_defaults.F.
337ad8328b Alis*12973
0e6056cd20 Jean*12974 checkpoint18 (1998/11/30)
a435e833b1 Mart*12975 o Further changes for optional code generation with
632baf6c85 Chri*12976 CPP - ugh!
12977
0e6056cd20 Jean*12978 checkpoint17 (1998/11/03)
6d71ac9cce Chri*12979 o Beginning to incorporating modularity
12980 for supporting atmos. and ocean configs.
12981 o Small changes for TAMC complinace
12982 o New ultra simple test case. Barotropic box
12983 configuration "exp0".
12984
0e6056cd20 Jean*12985 checkpoint16 (1998/10/28)
a435e833b1 Mart*12986 o Minor changes to exchange routines to support
8c88443df3 Chri*12987 accumulation in reverse mode. Adjoint of an
12988 assignment is an addition.
a435e833b1 Mart*12989 o Changes to support compilation by TAMC (LR(1)
8c88443df3 Chri*12990 syntax) and by g77 under Linux ( 72 character
12991 limit ).
12992
0e6056cd20 Jean*12993 checkpoint15 (1998/09/29)
048ce7bdb7 Chri*12994 Rewrote exchange routines to allow
12995 o General tile <-> tile connectivity.
12996 o TAMC reverse mode flag ( is this really needed? )
12997 o Variable width overlap and exchange region widths.
a435e833b1 Mart*12998 o Hooks for sharing data via DMA, Arctic, Memory Channel,
12999 shmput/shmget, VIA, SYSV shmem and every other cool
048ce7bdb7 Chri*13000 communication method.
13001
0e6056cd20 Jean*13002 checkpoint14 (1998/09/09)
e83f632bdc Chri*13003 Consistent isomorphism chages made. These allow dynamical core
13004 to support both pressure and meters as a vertical coordinate.
13005
0e6056cd20 Jean*13006 checkpoint13 (1998/07/17)
b472be50f6 Chri*13007 Release which corrects global_max problem and a couple
13008 of KGM time-averaging diagnostic errors. Also contains
13009 a double-gyre experiment setup as well as the baseline
13010 4 degree global template. The double gyre template is
13011 organised to allow it to be applied automatically to
13012 the baseline configuration.
13013
6b85e5319c Alis*13014 branch-point-rdot
13015 A few tidy-ups have been made bt the real point of this
13016 check-point (excuse the pun) is to allow a branch to be
13017 made for the purposes of adding the rDot alterations.
13018 I don't want to commit the rDot to the main-trunk until
13019 we've actually tested it...
13020
0e6056cd20 Jean*13021 checkpoint12 (1998/07/08)
713eeb0b71 Chri*13022 Tidy up and added generic genmake script (formerly
a435e833b1 Mart*13023 configure script).
713eeb0b71 Chri*13024 Released to testers.
13025
0e6056cd20 Jean*13026 checkpoint11 (1998/07/02)
8e14856263 Alis*13027 Re-arranged initialise() and introduced ini_vertical_grid()
13028 and ini_masks_etc().
13029
0e6056cd20 Jean*13030 checkpoint10 (1998/07/01)
bef276faee Alis*13031 Introduced the configure script.
13032 Separated out the diags package.
13033 Added template for writing time-averages of tile/intermediate quantities.
13034 Updated SIZE.h in exp2 and made the data big-endian.
13035
0e6056cd20 Jean*13036 checkpoint9 (1998/06/22)
455e14887b Alis*13037 MPI fix. Filename changes (meta/data). salbin*y stuff.
13038 General tidy-up.
13039 SST.bin SSS.bin added to verification/exp2
13040
0e6056cd20 Jean*13041 checkpoint8 (1998/06/22)
81be42c716 Alis*13042 Inludes time-dependant forcing and time-averaging.
13043 Works at 4x4 and 2.8125x2.8125 global
13044
13045 checkpoint7-4degree-ref
13046 Branch from checkpoint7. Released for application to
13047 global modeling and general modeling - process studies, regional
a435e833b1 Mart*13048 model etc..
81be42c716 Alis*13049 Configured for verification/exp2 - 4 degree global, two process.
13050
0e6056cd20 Jean*13051 checkpoint7 (1998/06/15)
42bd47f06f Chri*13052 Created by cnh
a435e833b1 Mart*13053 Simple 4 degree global simulation
42bd47f06f Chri*13054 configuration.
a435e833b1 Mart*13055 Includes climatological wind,
42bd47f06f Chri*13056 hydrography, bathymetry etc
13057 Does not include Heat Flux and E-P
13058
0e6056cd20 Jean*13059 checkpoint6 (1998/06/08)
a82990e8c1 Chri*13060 Created by cnh
a435e833b1 Mart*13061 merged checkpoint5 with CD and
13062 spherical polar code.
a82990e8c1 Chri*13063 Still some problems with GM Redi
13064 abd full topography.
13065
0e6056cd20 Jean*13066 checkpoint5 (1998/06/08)
41a4b13446 Chri*13067 Created by AJA
13068 contains updates to GM Redi
13069 and reordered timestepping loop
13070 for Implicit Diffusion.
13071
0e6056cd20 Jean*13072 checkpoint4 (1998/05/30)
b7a12fbe29 Chri*13073 Created by cnh
13074 Contains memory saving macros ( _rdxc etc..) for when
13075 grid variations are limited.
13076 Contains polynomial coeffs for EOS and knudsen program
13077 for generation.
13078
0e6056cd20 Jean*13079 checkpoint3 (1998/05/26)
addde852ed Chri*13080 Created by cnh
13081 Added extra flags for runtime options
13082 Added this file
13083 Added implicit free-surface
13084 Added pre-conditioner
13085 Put compare01 into repository ( compare01/... )
13086 Put data and eedata into repository ( verification/exp1 )
13087
13088 checkpoint2
13089 Created by AJA
13090 Added GM/Redi
13091
13092 checkpoint1
13093 Created by AJA
13094 Restructured kloop in dynamics.F
13095 Added non-linear EOS
13096
b7a12fbe29 Chri*13097 baseline
13098 Original checked in code