| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o adjoint: adding two new verification experiments |
| 8 |
|
* tutorial_global_biogeo: an online dic sensitivity experiment |
| 9 |
|
(work with G. Forget) |
| 10 |
|
* tutorial_dic_adjoffline: an offline dic sensitivity experiment |
| 11 |
|
(an update of the Dutkiewicz et al., 2006 paper) |
| 12 |
|
Both use the same CO2FLUX cost function, but different controls |
| 13 |
|
Gradient checks look good, but some recomp. could still be traightened out |
| 14 |
|
Should add xx_dic control variable to test at some point |
| 15 |
|
o model/src: |
| 16 |
|
add run-time parameters to check and/or mask initial Temp & Salt |
| 17 |
|
o pkg/ptracers: |
| 18 |
|
apply zonal filter (if used) to all passive tracers |
| 19 |
|
|
| 20 |
|
checkpoint61w |
| 21 |
|
o adjoint: |
| 22 |
|
* update and finish work on adjoint of dic package (G. Forget) |
| 23 |
|
* start adjoint of offline package |
| 24 |
|
* bug fix for cube-sphere TLM code (active_file_g.F) |
| 25 |
|
o tutorial_global_oce_optim: |
| 26 |
|
now tested with 4 tiles (change data.grdchk and update output_adm.txt) |
| 27 |
|
and add SIZE.h_mpi for MPI testing |
| 28 |
|
o pkg autodiff |
| 29 |
|
- fix bug in autodiff_restore |
| 30 |
|
- make genmake2 remove comments and empty lines from ad_input_code.f in |
| 31 |
|
order to reduce file size (new script file remove_comments_sed) |
| 32 |
|
o allows to specify vertical profile of vertical viscosity (viscArNr) |
| 33 |
|
o pkg autodiff |
| 34 |
|
autodiff_ini_model_io: comment out writing of grid information to netcdf |
| 35 |
|
files, because at this time the grid fields are a bunch of zeros |
| 36 |
|
(this is analogous to ini_mnc_vars.F) |
| 37 |
|
o pkg seaice/autodiff: |
| 38 |
|
left-over from removing the 3-time-level fields: |
| 39 |
|
- small rearrangement of common blocks (SEAICE.h) |
| 40 |
|
- fix field declaration in order to get meaningful output in |
| 41 |
|
adseaice.*.nc (adcommon.h) |
| 42 |
|
o pkg obcs: |
| 43 |
|
- go through NH code only if nonHydrostatic=T |
| 44 |
|
- fix restart for Orlanski (Hydrostatic; still to fix NH+Orlanski restart) |
| 45 |
|
- move call to OBCS_CALC before SEAICE_MODEL which needs seaice-obc fields |
| 46 |
|
=> Update output of experiment seaice_obcs |
| 47 |
|
- useOBCSbalance: code is wrong with multi-tile / proc: add a stop. |
| 48 |
|
- fix NH+Orlanski restart (add wvel OBC value in pickup file) |
| 49 |
|
- fix restart for useOBCSprescribe + useEXF |
| 50 |
|
o pkg ctrl |
| 51 |
|
- make obcs as control parameter work also with useSingleCPUio |
| 52 |
|
- replace a few sny and snx by Ny and Nx to be consistent with |
| 53 |
|
ctrl_set_globfld_x/yz.F |
| 54 |
|
o pkg seaice |
| 55 |
|
- re-introduce global field frWtrAtm for the case of |
| 56 |
|
ALLOW_MEAN_SFLUX_COST_CONTRIBUTION defined (SEAICE.h, seaice_growth.F) |
| 57 |
|
- catch the case of an empty filename in seaice_cost_init_fixed.F |
| 58 |
|
o pkg ecco: |
| 59 |
|
- small bug fixes in the_main_loop |
| 60 |
|
. fix order of monitor arguments |
| 61 |
|
. change SEAICE_MULTILEVEL to SEAICE_MULTICATEGORY |
| 62 |
|
. move include DYNVARS.h up outside the ALLOW_AUTODIFF_TAMC block so |
| 63 |
|
that ALLOW_ECCO_FORWARD_RUN works with NONLIN_FRSURF |
| 64 |
|
- replace cos(yc*deg2rad) by _rA in cost_mean_heat/saltflux.F, fix the |
| 65 |
|
imbalance diagnostics for wmean_h/sflux = 0 |
| 66 |
|
- add actual values to f_obcsn/s/w/e in ecco_cost_final.F |
| 67 |
|
- catch the case of empty filenames in ecco_cost_init_fixed.F |
| 68 |
|
and ecco_readparms.F |
| 69 |
|
- fix the logic of wsalt=0.and.wsalt2=0 to wsalt=0.or.wsalt2=0 (and theta) |
| 70 |
|
to make this statement meaningfull in ecco_cost_weights.F |
| 71 |
|
o pkg zonal_filt: |
| 72 |
|
- change ZONAL_FILTER S/R interface (allows to filter 2-D fields) |
| 73 |
|
- when using rStar, filter uVel*hFacW instead of uVel |
| 74 |
|
(tested without topography: fix a Pb of growing instability with NLFS) |
| 75 |
|
o pkg/aim/thsice: |
| 76 |
|
-Add capacity to read a Q-Flux to be applied in slab-mixed layer thsice_slab_ocean.F |
| 77 |
|
(works as SST restoring) |
| 78 |
|
o pkg/thsice: |
| 79 |
|
-add specific parameter for salt restoring in slab mixed-layer |
| 80 |
|
(by default equal to the temperature restoring) |
| 81 |
|
|
| 82 |
|
checkpoint61v |
| 83 |
|
o pkg/kpp: |
| 84 |
|
-add double diffusive contributions as a hack, turned off by default |
| 85 |
|
for now, and the code can be excluded with a CPP-flag |
| 86 |
|
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX |
| 87 |
|
-add a verification experiments to "vermix" to test this code |
| 88 |
|
o pkg/mom_common: |
| 89 |
|
Move computation of length scales to mom_init_fixed.F (avoid recomputation |
| 90 |
|
at each time-steps*levels). |
| 91 |
|
o pkg/layers: |
| 92 |
|
Created a new package for computing volume fluxes in temperature or |
| 93 |
|
[not yet implemented] density layers, e.g. for calculating residual |
| 94 |
|
overturning circulations. |
| 95 |
|
o pkg/diagnostics: |
| 96 |
|
implement a RS type version for the set of DIAGNOSTICS-FILL subroutines |
| 97 |
|
o fix few RS/RL type mismatch (check with ifort 11.1 "-warn all" option) |
| 98 |
|
o pkg/mdsio (& pkg/rw): rework high level S/R interface: |
| 99 |
|
To avoid mixing type (RS/RL) of input/output array argument, |
| 100 |
|
replace single mixed-type array with a pair from each type (RS/RL). |
| 101 |
|
o setting pickupSuff force to start from a pickup (even if nIter0=0): this |
| 102 |
|
is now implemented for all pkgs (previously only done for the main pickup) |
| 103 |
|
|
| 104 |
|
checkpoint61u |
| 105 |
|
o pkg/obcs: |
| 106 |
|
- change OB?eta from _RS to _RL and put them into a separate commen block |
| 107 |
|
- add code to read OB?eta from a file via obcs_prescribe_read: the code |
| 108 |
|
compiles and does not destroy any other experiments, the data is read |
| 109 |
|
properly, but the code is not tested in actual applications |
| 110 |
|
o ini_mnc_vars.F: if available (ALLOW_CAL), use startTime_1 and 2 to |
| 111 |
|
create a meaningful unit attribute for the time coordinate variable |
| 112 |
|
o pkg/ebm: add plenty of missing "_d 0" ; |
| 113 |
|
update results of experiment global_ocean_ebm (fwd + adjoint tests) |
| 114 |
|
Notes: several pieces of code only works for (very) specific set up |
| 115 |
|
(domain size, lat range, etc ...); should be documented & stop if one |
| 116 |
|
of those assumptions is not meet. |
| 117 |
|
o pkg/seaice: add missing "_d 0" in HSNOW initialisation |
| 118 |
|
update results of experiments: lab_sea (3 fwd tests + 2 adjoint tests) |
| 119 |
|
and offline_exf_seaice (seaicetd + adjoint). |
| 120 |
|
o add missing "_d 0" in ShortWave flux penetration (S/R SWFRAC): |
| 121 |
|
update results of experiments: lab_sea (4 fwd tests + 3 adjoint), |
| 122 |
|
seaice_obcs, global_ocean.cs32x15 (icedyn & thsice) and natl_box (x2). |
| 123 |
|
o few changes to pass when compiling with strick checking of arguments |
| 124 |
|
across S/R (allow to find few bugs in S/R calls). |
| 125 |
|
o pkg/seaice: |
| 126 |
|
- seaice_evp: move if-statement out of loop (TEM) at the cost of 11 new |
| 127 |
|
2d-fields, for slightly better performance |
| 128 |
|
|
| 129 |
|
checkpoint61t |
| 130 |
|
o pkg/seaice: |
| 131 |
|
- remove unused variables in seaice_evp |
| 132 |
|
- reduce number of SQRT in seaice_evp and seaice_calc_viscosities |
| 133 |
|
o eeset_parms.F, open_copy_data_file.F & ini_parms.F: |
| 134 |
|
named file replacing SCRATCH files (for TARGET_BGL & TARGET_CRAYXT): |
| 135 |
|
each processor opens a different file (a fix from Matt). |
| 136 |
|
o cg2d: |
| 137 |
|
use simple EXCH (overlap size = 1 and ignore corners), like in cg3d.F : |
| 138 |
|
this reduces number of EXCH calls by 2 when using exch2. |
| 139 |
|
For now, keep previous size array for gc2d_nsa.F to avoid Pb with store |
| 140 |
|
directives and missing simple EXCH (exch_s3d_rx) adjoint code. |
| 141 |
|
o pkg/thsice: |
| 142 |
|
add code for Near Infra-Red albedo (from Jeff) |
| 143 |
|
(turned on with run-time flag: thSIce_calc_albNIR, in data.ice). |
| 144 |
|
o ini_model_io: |
| 145 |
|
move (from packages_readparms.F & initialise_fixed.F) to ini_model_io.F |
| 146 |
|
MNC & MONITOR initialisation calls; move MNC calls from {pkg}_readparms.F |
| 147 |
|
to {pkg}_init_fixed.F for {pkg}= kpp, seaice & shelfice. |
| 148 |
|
|
| 149 |
|
checkpoint61s |
| 150 |
|
o pkg/exch2 (exch2_rxN_cube*): |
| 151 |
|
remove last BARRIER (no need to synchronise after getting data from shared |
| 152 |
|
buffer (get) as long as any change to buffer (put,recv) is between BARRIER) |
| 153 |
|
o change tiling of natl_box (from 2 to 4 tiles) to get it tested with MPI+MTH |
| 154 |
|
and generate new output (for the 2 tests) using default rotationPeriod. |
| 155 |
|
o pkg/exch2: |
| 156 |
|
- always call exch2_*_cube, not exch-1 anymore, if useCubedSphereExchange=F |
| 157 |
|
(was already the case with AUTODIFF_EXCH2 defined) |
| 158 |
|
- add bj in exch2 arrays and S/R. |
| 159 |
|
- can now use pkg/exch2 for regular (non CS) set-up; switch test experiment |
| 160 |
|
MLAdjust to exch2 (identical results except with MPI -> truncation diff); |
| 161 |
|
o add pkg/longstep for ptracer timestep a multiple of U/V/T/S timestep |
| 162 |
|
- adds deltaT argument to the subroutines TIMESTEP_TRACER DWNSLP_APPLY |
| 163 |
|
GAD_ADVECTION GAD_CALC_RHS GAD_IMPLICIT_R GAD_SOM_ADVECT |
| 164 |
|
- verification experiment natl_box.longstep |
| 165 |
|
o build_options: ifort+mpi_aces optfile (following Constantinos advise): |
| 166 |
|
allow different versions of ifort (8 or 9) and different versions |
| 167 |
|
of mpi (mpich or mpich2) to be used with the same optfile. |
| 168 |
|
requires to load a netcdf module and set MPI_INC_DIR (see comments inside |
| 169 |
|
optfile). Change testing scripts (example_scripts/ACESgrid) accordingly. |
| 170 |
|
o pkg/seaice: |
| 171 |
|
fix previous modif (3-level field removed) for old-pickup reading |
| 172 |
|
|
| 173 |
|
checkpoint61r |
| 174 |
|
o pkg/seaice: |
| 175 |
|
- clean up the 3-time levels of UICE,VICE,HEFF,AREA in three steps: |
| 176 |
|
1. introduce fields for time step (N-1) |
| 177 |
|
2. do not use levels 2 and 3 anymore (but keep them) |
| 178 |
|
3. replace 3D versions of UICE,VICE,HEFF,AREA by 2D versions. This |
| 179 |
|
includes changes to pkg/thsice/thsice_get_velocity.F, |
| 180 |
|
model/src/external_forcing_surf.F, pkg/obcs/obcs_apply_seaice.F, and |
| 181 |
|
pkg/obcs/obcs_apply_uvice.F. |
| 182 |
|
- completely remove code for leap-frog time stepping for second order |
| 183 |
|
advection |
| 184 |
|
- adjusted adjoint accordingly; |
| 185 |
|
gradient checks have improved by an order of magnitude! |
| 186 |
|
|
| 187 |
|
checkpoint61q |
| 188 |
|
o pkg/seaice: fix bug in free slip boundary conditons for LSOR solver |
| 189 |
|
- the boundary conditions along open boundaries are unclear, because the |
| 190 |
|
associated masks are set to zero and are thus treated as closed when |
| 191 |
|
applying the slip-boundary conditions. |
| 192 |
|
- move initialisation of grid variables from seaice_init_varia to _fixed |
| 193 |
|
o adding doc/diags_changes.txt |
| 194 |
|
o model/src: |
| 195 |
|
do_the_model_io: rename few pkg S/R which are called from do_the_model_io, |
| 196 |
|
to avoid "_diags" naming if no relation to pkg/diagnostics. |
| 197 |
|
ini_theta,ini_salt: fix (at least compile the code) reading from NetCDF |
| 198 |
|
file and only call PLOT_FIELD_XYZ if debugMode=T. |
| 199 |
|
remove few PLOT_FIELD_XY calls outside initialisation. |
| 200 |
|
remove few unnecessary BARRIER. |
| 201 |
|
o pkg/salt_plume: add SaltPlumeSouthernOcean to allow disabling |
| 202 |
|
of salt_plume package in Southern Ocean |
| 203 |
|
o pkg/thsice: |
| 204 |
|
- fix hOceMxL in overlap (needed for sea-ice advection); |
| 205 |
|
update output of experiment global_ocean.cs32x15.icedyn. |
| 206 |
|
o pkg/seaice: |
| 207 |
|
- make the (placeholder-)tracer IceAge a little more meaningful |
| 208 |
|
by avoiding ridging of age due to convergent ice flow |
| 209 |
|
- add diagnostics for surface temperature, atmospheric and oceanic |
| 210 |
|
heat flux, and atmospheric and oceanic ice growth |
| 211 |
|
|
| 212 |
|
checkpoint61p |
| 213 |
|
o eesupp (global_max & global_sum): |
| 214 |
|
- add one more element to buffer (start at index 0) for GL_MAX/SUM output; |
| 215 |
|
- remove starting & endding barrier (no longer needed) |
| 216 |
|
o pkg/mdsio, writelocal: |
| 217 |
|
works also in multi-threaded when LOCBIN_IO_THREAD_SAFE is undefined |
| 218 |
|
(remove the STOP): uses shared buffer IO to store data from all threads |
| 219 |
|
and then let master-thread write nThreads tiles. |
| 220 |
|
o pkg/mdsio (read/write field): |
| 221 |
|
- tiled IO done in 1 piece (all levels at a time); |
| 222 |
|
- new header file "MDSIO_BUFF_3D.h" with 3-D buffers. |
| 223 |
|
- multi-threaded: allow to read/write local (non-shared) array |
| 224 |
|
(was already working with singleCpuIO ; now works also without); |
| 225 |
|
=> no longer needs barrier call after reading a file (added inside |
| 226 |
|
mds_read/write field). |
| 227 |
|
- move barrier calls outside gather/scatter_2d to mds_read/write_field |
| 228 |
|
o pkg/obcs/exf |
| 229 |
|
- exf_getffieldrec.F: add a few ". _d 0" and |
| 230 |
|
add code to catch the case fldperiod = 0. |
| 231 |
|
- obcs_precribe_read.F: change if statements so that they match |
| 232 |
|
the variable type (_RL) |
| 233 |
|
- add a separate exf_iprec_obcs to exf_set_obcs (by default equal to |
| 234 |
|
exf_iprec) as part of namelist EXF_NML_01 |
| 235 |
|
o pkg/mdsio: |
| 236 |
|
- read/write tiled (local) files: read/write 1-level tile chunk at a time |
| 237 |
|
(instead of segment of length sNx); expected to speed up tiled IO. |
| 238 |
|
o pkg/exch2: |
| 239 |
|
- take buffer copy from/to array out of S/R exch2_send/recv into new |
| 240 |
|
S/R exch2_put/get ; Exch of local variable now works with MPI+MTH |
| 241 |
|
(tested by removing commom block statement in SOLVE_FOR_PRESSURE.h). |
| 242 |
|
- ad version of send/recv no longer needed (but needs exch2_ad_put/ad_get) |
| 243 |
|
- simplify argument list of S/R exch2_get_uv_bounds and exch2_get_scal_bounds |
| 244 |
|
(which replaces exch2_get_recv_bounds & exch2_get_send_bounds) by |
| 245 |
|
including Topology header file (and common blocks). |
| 246 |
|
- implement EXCH_IGNORE_CORNERS in scalar exchange (rx1); |
| 247 |
|
remove 2nd exch call in exch2_s3d_rx (no longer needed). |
| 248 |
|
- document S/R arg. list (+ update some comments) |
| 249 |
|
o pkg/seaice: |
| 250 |
|
- added SEAICE_CLIM_AIR code, which permits modulation of surface air |
| 251 |
|
temperature and humidity over sea ice based on climatological values. |
| 252 |
|
- clean up computation of Hibler+Bryan (1987) stress coupling for the case |
| 253 |
|
of LSR (this change is expected to change the results slightly because now |
| 254 |
|
it uses slightly difference moduli from the second last LSR solution, but |
| 255 |
|
that is more consistent with the stress computations; this part of the code |
| 256 |
|
is not tested in the verification experiments) |
| 257 |
|
- fix diagnostics for flux of ice in case of B-grid |
| 258 |
|
- turn strain rates eij and press into global fields within global |
| 259 |
|
common block in SEAICE.h for more straighforward diagnostics |
| 260 |
|
- fix diagnostics for principal stress components, press, zeta, eta |
| 261 |
|
to give something meaning full |
| 262 |
|
o change tiling of global_ocean.cs32x15 (12 tiles, 32x16) and generate |
| 263 |
|
new output (all 4 tests) using default rotationPeriod. |
| 264 |
|
o pkg KPP: |
| 265 |
|
- add flag (LimitHblStable) to avoid limiting BL depth under stable conditions |
| 266 |
|
- fix vertical indices in RI_IWMIX (match between KPP grid from 0 to Nr+1 |
| 267 |
|
and normal grid from 1 to Nr) |
| 268 |
|
o Fix computations of L4rdt in mom_calc_visc.F |
| 269 |
|
o eesupp: |
| 270 |
|
new S/R ALL_PROC_DIE (like EEDIE, without irrelevant threads err msg): |
| 271 |
|
should be called before a "stop" if we know that all process are going |
| 272 |
|
to stop; if one Proc does call this S/R, will hang in MPI_FINALISE. |
| 273 |
|
|
| 274 |
|
checkpoint61o |
| 275 |
|
o pkg/exch2: change check_depths to issue just a warning (instead of error+stop) |
| 276 |
|
o model/src/ini_curvilinear_grid.F: |
| 277 |
|
compute angleSin/CosC when they are not read from a file |
| 278 |
|
o pkg/seaice: |
| 279 |
|
add pseudo time stepping for LSOR |
| 280 |
|
o pkg/exch2: |
| 281 |
|
temporary fix for exch2_s3d_rx; update results of exp. hs94.cs-32x32x5.impIGW |
| 282 |
|
o pkg/seaice: |
| 283 |
|
Adding separate sea ice albedo, drag coefficients, and HO in Southern |
| 284 |
|
Ocean from those in Arctic Ocean. See *_south in SEAICE_PARAMS.h |
| 285 |
|
o SingleCpuIO: |
| 286 |
|
fix bug put before chkp61n (May 11), when more than 2 MPI cpu are used. |
| 287 |
|
o pkg/seaice: |
| 288 |
|
put exchanged variable in (local) common block for MPI+Multi-Threads |
| 289 |
|
to work (necessary with exch1, and for now with exch2 too). |
| 290 |
|
o verification: to get more experiments tested with mpi, mth and mpi+mth, |
| 291 |
|
change tiling of: |
| 292 |
|
aim.5l_Equatorial_Channel, aim.5l_LatLon, dome, exp4, global_ocean.90x40x15, |
| 293 |
|
hs94.cs-32x32x5, MLAdjust, offline_exf_seaice & tutorial_plume_on_slope |
| 294 |
|
update output of exp: |
| 295 |
|
exp4, global_ocean.90x40x15(+.dwslp), MLAdjust(all 5), |
| 296 |
|
tutorial_plume_on_slope and hs94.cs-32x32x5 (use default rotationPeriod) |
| 297 |
|
+ ideal_2D_ocean: use default rotation period + test Global_Sum_SINGLECPU |
| 298 |
|
(note: output.txt generated on faulks using only 1 tile) |
| 299 |
|
o eesupp & mdsio (SingleCpuIO): |
| 300 |
|
- remove MISSING_TILE_IO (from MDSIO_OPTIONS.h), replaced by run-time |
| 301 |
|
parameter "W2_useE2ioLayOut" (read from file "data.exch2"). |
| 302 |
|
Note: was not effective for globalFile & useSingleCpuIO=F; now fixed. |
| 303 |
|
- move MDSIO_SCPU.h (pkg/mdsio) to EEBUFF_SCPU.h (eesupp/inc). |
| 304 |
|
- fix GLOBAL_SUM_SINGLECPU when using Exch2; re-use same buffers and same |
| 305 |
|
gather/scatter S/R as with SingleCpuIO (=> 1 less 2D global RL array). |
| 306 |
|
o pkg/exch2: |
| 307 |
|
- new code to set-up W2-Exch2 topology (replace matlab-topology-generator): |
| 308 |
|
read parameter file "data.exch2" if it exists; otherwise try default regular |
| 309 |
|
cube without blank-tile; new header file "W2_EXCH2_SIZE.h"; |
| 310 |
|
- update matlab-topology-generator (exch2_setup_cs6_print.m) to be compatible |
| 311 |
|
with new code (not to be used, just as a backup solution). |
| 312 |
|
- add examples (e.g., for lat-lon-cap_120) of parameter file "data.exch2" |
| 313 |
|
in utils/exch2/input. |
| 314 |
|
|
| 315 |
|
checkpoint61n |
| 316 |
|
o eesupp & mdsio (SingleCpuIO): |
| 317 |
|
- move mapping to global io-buffer inside gather_2d/scater_2d: this save |
| 318 |
|
memory (1 less 2D global RL array); skip 1 buffer copy; and only send/ |
| 319 |
|
receive real*4 array (instead of real*8) to read/write 32.bit files. |
| 320 |
|
(new template for gather_2d/scater_2d, new set of S/R MDS_PASS_R4,8toRL,S |
| 321 |
|
and remove new mapping S/R) |
| 322 |
|
o pkg/mdsio: in preparation for topology-generator within pkg/exch2: |
| 323 |
|
- Change declaration of SingleCpuIO buffer, reduced to only 1 dim.: |
| 324 |
|
xyBuffer_size, which is set to W2_ioBufferSize from W2_EXCH2_PARAMS.h |
| 325 |
|
when using exch2. Add S/R to map global io-buffer to global model array. |
| 326 |
|
- uses exch2_global_Nx,y instead of exch2_domain_nxt,nyt. |
| 327 |
|
|
| 328 |
|
checkpoint61m |
| 329 |
|
o write_utils : change WRITE_1D_R8 to WRITE_1D_RL |
| 330 |
|
and add 3 other S/R for other types (R4,R8,RS). |
| 331 |
|
Change calls to WRITE_0D/1D_R[4,8,S,L] to match the type of argument. |
| 332 |
|
o eesupp/inc/CPP_EEMACROS.h (EXCH & GLOBAL_SUM/MAX macros): |
| 333 |
|
- ensure suffix (_R4,_R8,_RS,_RL) correspondance between macro and S/R ; |
| 334 |
|
- reduce number of macro definitions (keep only those which are used); |
| 335 |
|
can always call directly the corrresponding S/R if needed. |
| 336 |
|
- everywhere in the code: change macros (EXCH & GLOBAL_SUM/MAX) suffix |
| 337 |
|
_R4/_R8 to _RS/_RL when applied to _RS/_RL variable. |
| 338 |
|
Fixed wrong type of arg in: |
| 339 |
|
atm2d/put_ocnvars.F cheapaml/cheapaml.F ocn_compon_interf/ocn_apply_import.F |
| 340 |
|
ctrl/ctrl_map_ini_ecco.F seaice/seaice_do_diags.F seaice/seaice_model.F |
| 341 |
|
To fix: global_sum of var in common block is wrong (multi-threaded) in: |
| 342 |
|
dic/dic_atmos.F ebm/ebm_area_t.F ebm/ebm_zonalmean.F sbo/sbo_calc.F |
| 343 |
|
To fix: aim_v23/aim_do_co2.F (BARRIER & GLOBAL_SUM within bi,bj loops) |
| 344 |
|
o adjustment.cs-32x32x1: test "blank tiles" when compiling with mpi; 2nd |
| 345 |
|
"nlfs" mpi test is going to stop when checking for unconnected tile egdes. |
| 346 |
|
o eesupp/src: new S/R to stop everyone when 1 (or more) Proc. find an error |
| 347 |
|
o pkg/exch2: new S/R EXCH2_CHECK_DEPTHS to check that unconnected tile |
| 348 |
|
edges are closed (zero depth); might happen with "blank tiles"; |
| 349 |
|
for now, disabled if using OBCS. |
| 350 |
|
o tools/gemake2: delete modifs from March 27-29 2009 (with option "-mpi": |
| 351 |
|
link *_mpi files from "MODS" dir) to return to a strait-forward behavior. |
| 352 |
|
o move read_write.F to write_utils.F ; new parameter (maxLengthPrt1D) |
| 353 |
|
to reduce length of 1.D array print in STDOUT. |
| 354 |
|
o adjustment.cs-32x32x1: changed to oceanic test with 1 continent |
| 355 |
|
+ use 48 tiles (16x8): this will allow to test "blank tiles". |
| 356 |
|
o start to test MPI + multi-threaded (change testreport to skip tests |
| 357 |
|
where number of tiles do not match). |
| 358 |
|
o genmake2: add option "-omp" to turn on Open-MP ; |
| 359 |
|
passed to testreport (if using -mth) ; merge few (*+mth) optfiles. |
| 360 |
|
o pkg/exch2 (+ utils/exch2): ignore blank tiles (instead of removing them) |
| 361 |
|
and keep the original tile numbering. Note: compatible with old |
| 362 |
|
W2_EXCH2_TOPOLOGY.h & w2_e2setup.F topology files. |
| 363 |
|
|
| 364 |
|
checkpoint61l |
| 365 |
|
o Overlaps had been forgotten in calculating ijk keys : fixed |
| 366 |
|
o fix cyrus makedepend for gcc 4.4 |
| 367 |
|
o experiment fizhi-cs-aqualev20: |
| 368 |
|
switching to new version of S/R GETPWHERE (#define TRY_NEW_GETPWHERE) |
| 369 |
|
and generate new output. Note: new output is much closer to the old |
| 370 |
|
one (v1.8) generated with pgf77 -O2 on Mar 14 2007 than it is from |
| 371 |
|
the previous one (v1.9) generated with pgf77 -O0 on Jun 13 2007. |
| 372 |
|
o pkg/fizhi: |
| 373 |
|
- change to avoid indices going deliberately over array-bounds |
| 374 |
|
- remove unnecessary MPI stuff |
| 375 |
|
- perpetual spring equinox with "#define FIZHI_USE_FIXED_DAY" |
| 376 |
|
- new version of S/R GETPWHERE available with #define TRY_NEW_GETPWHERE: |
| 377 |
|
does not go over array-bounds and therefore returns reliable output. |
| 378 |
|
- in fizhi_driver.F & fizhi_turb.F, fix "get_alarm" calls: |
| 379 |
|
this S/R has 4 output arguments, which are used inside "get_alarm"; |
| 380 |
|
when it is called with the same variable "ndum" in place of several |
| 381 |
|
output arguments, this produces weird side effect inside "get_alarm" |
| 382 |
|
(e.g., datein=dates(n) is overwritten by timein=times(n) since both |
| 383 |
|
datein & timein, resp. 2nd and 3rd arg., are pointed to the same "ndum" |
| 384 |
|
address) and produces error. |
| 385 |
|
o tools/gemake2: (March 27-29 2009) |
| 386 |
|
with option "-mpi": link *_mpi files from "MODS" dir (this is what |
| 387 |
|
testreport does). |
| 388 |
|
o lab_sea experiment: change from 2x1 tiles to 2x2 tiles and regenerate output |
| 389 |
|
o pkg/seaice: fix bug in new version of S/R SEAICE_LSR.F: |
| 390 |
|
update lab_sea.lsr & lab_sea.salt_plume results |
| 391 |
|
o pkg/seaice: |
| 392 |
|
Major overhaul of the LSOR solver: change discretization from original |
| 393 |
|
finite differences to finite volume. The old routine is still in the |
| 394 |
|
file seaice_lsr.F and can be turned on with the CPP-flag |
| 395 |
|
SEAICE_OLD_AND_BAD_DISCRETIZATION |
| 396 |
|
Along with this change, the discretization of the strain rates is changed. |
| 397 |
|
The same flag turns on the old discretization in seaice_calc_strainrates.F |
| 398 |
|
All verification experiments with seaice are affected (except for |
| 399 |
|
seaice_exf_offline); global_ocean.cs32x15/input.icedyn recovers the old |
| 400 |
|
results by setting the above flag. |
| 401 |
|
Further changes involve changes in defaults: |
| 402 |
|
- ALLOW_FLOODING is defined and turned on by default |
| 403 |
|
- SEAICEadvSnow = .true. is now the default |
| 404 |
|
- SEAICEadvSalt = .true. is now the default |
| 405 |
|
- SEAICEadvAge = .true. is now the default |
| 406 |
|
- SEAICE_clipVelocities = .false. is now the default |
| 407 |
|
(as per J. Zhang's recommendation) |
| 408 |
|
- B-grid, and thus not tested: SEAICE_TEST_ICE_STRESS_1/EXPLICIT_SSH_SLOPE |
| 409 |
|
is defined, SEAICE_TEST_ICE_STRESS_1 is renamed into SEAICE_BICE_STRESS |
| 410 |
|
- seaice_growth: replace computation of UG by a simple copy from wspeed |
| 411 |
|
|
| 412 |
|
checkpoint61k |
| 413 |
|
o pkg/seaice: a few bug fixes mostly concerning the metric terms: |
| 414 |
|
seaice_lsr: fixed a few metric terms, |
| 415 |
|
affects lab_sea.lsr, lab_sea.salt_plume, seaice_obcs |
| 416 |
|
add more debugging diagnostics |
| 417 |
|
seaice_evp: removed superfluous many metric terms of FV discretization |
| 418 |
|
of stress divergence |
| 419 |
|
affects lab_sea, lab_sea.hb87 |
| 420 |
|
seaice_ocean_stress: removed superfluous many metric terms of FV discretization |
| 421 |
|
of stress divergence for non-evp solver |
| 422 |
|
(this part is not tested anywhere) |
| 423 |
|
seaice_calc_strainrates: fixed a bug in no-slip boundary conditions, |
| 424 |
|
they were effectively only half slip |
| 425 |
|
affects lab_sea.hb87 |
| 426 |
|
updated all relevant verification experiments (except lab_sea//output_adm.txt |
| 427 |
|
which was left over, but fails at level 7 & 6) |
| 428 |
|
|
| 429 |
|
checkpoint61j |
| 430 |
|
o pkg/seaice: turn a few hard wired parameters into run time parameters |
| 431 |
|
o pkg/seaice/exf/monitor: turn netcdf coordinate variable T into model |
| 432 |
|
time in seconds as promised by the usints in seaice_monitor and exf_monitor |
| 433 |
|
o pkg/mnc: fix the coordinate variables for multi-tile curvi-linear grids |
| 434 |
|
that are not cubed-sphere grids |
| 435 |
|
o pkg/seaice: fix a bug for the rare case of SEAICE_VECTORIZE_LSR |
| 436 |
|
o pkg/ctrl: |
| 437 |
|
fix bug in ctrl_depth_ini.F (EXCH_XYZ was applied to 2-D field xx_r_low) |
| 438 |
|
o non-hydrostatic (calc_gw.F): |
| 439 |
|
fix viscA4 on CS-grid + fix diagnostics: Wm_Diss & Wm_Advec |
| 440 |
|
update output of exp. global_ocean.cs32x15.viscA4 |
| 441 |
|
o remove backward compatibility for thetaMin,phiMin |
| 442 |
|
(replaced by xgOrigin,ygOrigin on Jan 27, 2009) |
| 443 |
|
o pkg/exf: fix a serious bug in exf_set_uv.F: do a rotation of the |
| 444 |
|
interpolated wind field not only for curvilineargrid=.true., but also |
| 445 |
|
for a rotated grid (rotateGrid=.true.) |
| 446 |
|
o pkg/exf: add capability to bypass interpolation for runoff |
| 447 |
|
by setting yet another CPP-flag |
| 448 |
|
o eesupp/src, B-grid exchange: |
| 449 |
|
add simple (6 tiles, non MPI) CS exch + standard interface S/R. |
| 450 |
|
o autodiff |
| 451 |
|
new CPP option ALLOW_TAMC_SINGLEPREC_COMLEV |
| 452 |
|
allows to switch to single-prec common blocks; |
| 453 |
|
corresponding switch occurs in tamc.h, integer isbyte |
| 454 |
|
TAF store directivs "byte" and "kind" seem equivalent; |
| 455 |
|
Most tamc.h have been updated correspondingly. |
| 456 |
|
|
| 457 |
|
checkpoint61i |
| 458 |
|
o autodiff: |
| 459 |
|
fix autodiff_sore/_restore indices for obcs |
| 460 |
|
(spotted by I. Hoteit, M. Mazloff) |
| 461 |
|
o pkg/autodiff, pkg/ctrl: |
| 462 |
|
Add flag to reduce all tapelev I/O to single-prec. |
| 463 |
|
In data.ctrl set |
| 464 |
|
doSinglePrecTapelev = .TRUE. |
| 465 |
|
o model/src/ini_curvilinear_grid.F, new grid-file format without EXCH2: |
| 466 |
|
check in hack for SX8 compiler (for dxV, dyU); remove it afterwards. |
| 467 |
|
o pkg/shelfice: fix bug with SHELFICEconserve flag, prepare for |
| 468 |
|
real fresh water flux (not yet) |
| 469 |
|
o pkg/mdsio & rw: |
| 470 |
|
- add argument & option to S/R MDS_WRITEVEC_LOC (avoid Open/Close & write-meta) |
| 471 |
|
- add simple interface S/R to MDS_WRITEVEC_LOC in pkg/rw: WRITE_GLVEC_RX. |
| 472 |
|
o pkg/flt: |
| 473 |
|
- replace FLT_INIT by 3-steps standard initialization S/R: readparms, |
| 474 |
|
init_fixed & ini_varia. |
| 475 |
|
- clean-up & simplify linear interpolation S/R: |
| 476 |
|
move flt_bilinear.F -> flt_interp_linear.F ; add arg. myThid. |
| 477 |
|
- fix some indices (mainly vertical index) ; add IMPLICIT NONE. |
| 478 |
|
- more efficient I/O, using new options of MDS_WRITEVEC_LOC S/R. |
| 479 |
|
- add vert. coordinate & horiz. indices to output files. |
| 480 |
|
- change vertical position in initial condition, from index to depth [m]. |
| 481 |
|
- store horizontal (decimal) indices i,j in common block (instead of coord. x,y) |
| 482 |
|
(easier to get to a curvilinear grid) ; delX,delY no longer used. |
| 483 |
|
o pkg/ggl90: a few modifications: |
| 484 |
|
- fix bottom boundary condition, and interpolation of KappaE |
| 485 |
|
near top and bottom |
| 486 |
|
- use same set of viscosity/diffusivity for TKE/momnetum/tracer |
| 487 |
|
- add smoothing option as in Blanke and Delecluse (1993) (--> ALLOW_GGL90_SMOOTH) |
| 488 |
|
- add a few options for mixing-length upper limit (--> mxlMaxFlag) |
| 489 |
|
o rename thetaMin,phiMin -> xgOrigin,ygOrigin |
| 490 |
|
(maintain temporary backward compatibility, until next checkpoint) |
| 491 |
|
|
| 492 |
|
checkpoint61h |
| 493 |
|
o pkg/diagnostics with "periodic averaging diagnostics": |
| 494 |
|
fix S/R DIAGNOSTICS_COUNT ; hack diagnostics_out.F to get NetCDF output. |
| 495 |
|
o pkg/my82: add missing "_d 0" ; update output of exp. vermix.my82 |
| 496 |
|
o pkg/obcs: fix loop ranges for balancing code |
| 497 |
|
o pkg/flt: |
| 498 |
|
- improve criteria for finding which tile owns a float. |
| 499 |
|
- fix FLT_EXCH for case without MPI ; apply cyclic BC + fix also the MPI case. |
| 500 |
|
o Add well-mixed CO2 box in aim_v23 (which includes changes in pkg |
| 501 |
|
aim_compon_interf, ocn_compon_interf, gchem, and dic to get coupling |
| 502 |
|
with ocean biogeo) |
| 503 |
|
o pkg/flt: |
| 504 |
|
- do some cleaning and fix the restart ; |
| 505 |
|
- add output.txt in flt_example/results to get this pkg tested. |
| 506 |
|
o genmake2: add an EXTENDED_SRC option and flag. |
| 507 |
|
for now, cannot be turned on on command line (only through genmake_local) |
| 508 |
|
o pkg/mdsio: read/write vector: |
| 509 |
|
- singleCpuIO: fix RL/RS in MDSWRITEVECTOR by calling new S/R MDS_BUFFERtoRL/RS |
| 510 |
|
- singleCpuIO=F: fix arrType & filePrec & _BYTESWAPIO in both MDSREADVECTOR |
| 511 |
|
& MDSWRITEVECTOR by calling new S/R MDS_RD/WR_VEC_RL/RS. |
| 512 |
|
- affects gradient of test-exp "bottom_ctrl_5x5" (not due to _BYTESWAPIO) |
| 513 |
|
(drop to 4 digits matching for grad). But this test does not look very |
| 514 |
|
reliable (was already failling on eddy, fc5, at 6.digits). Update output. |
| 515 |
|
|
| 516 |
|
checkpoint61g |
| 517 |
|
o pkg/flt: |
| 518 |
|
- move FLT_CPPOPTIONS.h to FLT_OPTIONS.h (standard name) |
| 519 |
|
+ make OPTIONS file more standard. |
| 520 |
|
- rename S/R MDSREADVECTOR_FLT to FLT_MDSREADVECTOR (to mach src file name) |
| 521 |
|
- fix _BYTESWAPIO CPP-Flag |
| 522 |
|
- standard reading of file-parameter "data.flt" |
| 523 |
|
- fix argument list of S/R FLT_RESTART |
| 524 |
|
still need to fix _BYTESWAPIO in pkg/mdsio/mdsio_writevector.F |
| 525 |
|
o pkg/obcs: fix a CPP-flag, bug reported by Jeff Blundell |
| 526 |
|
o gather_2d.F/scatter_2d.F: suppress vectorisation on NEC SX in respond to |
| 527 |
|
a still unfixed compiler/optimization bug |
| 528 |
|
|
| 529 |
|
checkpoint61f |
| 530 |
|
o pkg/seaice, LSR solver: fix bug in GLOBAL_MAX calls ; |
| 531 |
|
update results of global_ocean.cs32x15.icedyn test. |
| 532 |
|
o move getcon.F from model/src to pkg/fizhi. |
| 533 |
|
o pkg/exf: add parameter for extrapolation of temp up to the surface |
| 534 |
|
and option to prevent negative evap (in bulk_largeyeager04 only). |
| 535 |
|
o Prather Advection scheme: fix tracer conservation for divergent flow |
| 536 |
|
(e.g., when using NonLin Free-Surface). |
| 537 |
|
o kpp: retire KPPmld diagnostics --> use MXLDEPTH instead |
| 538 |
|
o gmredi (Visbeck-variable-K): |
| 539 |
|
- add more parameters to Visbeck-variable-K. |
| 540 |
|
- use a 5 points average for dSigmaR in Visbeck-K calculation |
| 541 |
|
(more "homogenous": same stencil and same weights as in dSigmaH) |
| 542 |
|
- update output of ideal_2D_oce experiment. |
| 543 |
|
o fix CPP-flag REAL4_IS_SLOW, when _RS expands into real*4 |
| 544 |
|
(#undef REAL4_IS_SLOW) |
| 545 |
|
- pkg/mnc/mnc_cw_cvars.F: write _RS-grid variable as netcdf-real*4 |
| 546 |
|
coordinate variable |
| 547 |
|
- pkg/monitor/monitor.F: call mon_printstats_rs for _RS variables |
| 548 |
|
(surface forcing fields), removes some of the functionality |
| 549 |
|
- model/src/write_grid.F: write _RS variables as RS-netcdf variables |
| 550 |
|
- model/src/diags_oceanic_surf_flux.F: fix a few diagnostics, but |
| 551 |
|
probably not all: copy _RS surface flux fields to RL field before |
| 552 |
|
calling DIAGNOSTICS_FILL |
| 553 |
|
- model/inc/CPP_EEMACROS.h: make the _EXCH_*_RS macros expand into |
| 554 |
|
real*4 (CALL EXCH_*_RS) versions. |
| 555 |
|
- tested in 2 experiments: inverted_barometer & solid-body.cs-32x32x1 |
| 556 |
|
(generate new output). |
| 557 |
|
|
| 558 |
|
checkpoint61e |
| 559 |
|
o gmredi (Visbeck-variable-K): |
| 560 |
|
- fix the "OLD_VISBECK_CALC" option + move the #undef to GMREDI_OPTIONS.h |
| 561 |
|
- change computation of Visbeck-K where Slope > Smax : |
| 562 |
|
now: N*min(Slope,Smax) (similar to OLD_VISBECK_CALC with gkw91 taperFct) |
| 563 |
|
previously was: M*sqrt(min(Slope,Smax)) ; update ideal_2D_oce output. |
| 564 |
|
o bottom-drag in P-coord.: change units of bottomDragLinear & bottomDragQuadratic |
| 565 |
|
to be the same as with Z-coord. (i.e., m/s & no-units respectively). |
| 566 |
|
o calc_viscosity: fix index range (was wrong for CD-Scheme & explicit Visc) |
| 567 |
|
o pkg gmredi, linear & fm07 tapering: put an upper limit on Slope^2 so that Kwz |
| 568 |
|
does not become too large (to avoid precision problems in implicit-diffusion |
| 569 |
|
solver); update ideal_2D_oce output. |
| 570 |
|
o pkg ggl90: |
| 571 |
|
- in ggl90_cal.F: compute only one set of visc/diff, used to |
| 572 |
|
step forward TKE/T/S/momentum |
| 573 |
|
- default value of GGL90viscMax/GGL90diffMax larger and equal (to |
| 574 |
|
have Prandlt =1) |
| 575 |
|
o gmredi (fm07): |
| 576 |
|
- add lower limit on Transition layer thickness + lower limit on 1/lambda |
| 577 |
|
- allow to set few more params from data.gmredi |
| 578 |
|
o pkg ggl90: |
| 579 |
|
- add missing sqrt(2) factor in computation of mixing length |
| 580 |
|
scale in ggl90_calc.F |
| 581 |
|
(see Eq. (2.35) in Blanke and Delecluse, JPO, 1993) |
| 582 |
|
|
| 583 |
|
checkpoint61d |
| 584 |
|
o adjoint modifs |
| 585 |
|
- adapt to new field rhoInSitu |
| 586 |
|
- allow to revert from StoreDynVars2D, StoreDynVars3D |
| 587 |
|
to individual fields |
| 588 |
|
(switches AUTODIFF_USE_OLDSTORE_2D, AUTODIFF_USE_OLDSTORE_3D) |
| 589 |
|
o store 3-D (in-situ) density in commom block (DYNVARS.h) |
| 590 |
|
- save 1 rho computation. |
| 591 |
|
- no longer modify T & S inland when using down_slope pkg. |
| 592 |
|
o gad_som : allow to switch to SOM advection for T & S without corresponding |
| 593 |
|
pickup files (using new S/R: MDS_CHECK4FILE). |
| 594 |
|
o keep removing _BEGIN/_END_MASTER between MDSIO S/R call |
| 595 |
|
(for useSingleCpuIO to work in multi-threaded) |
| 596 |
|
o pkg/shelfice: |
| 597 |
|
- disentangle parameters: retire shelfIceFile in data/PARM05 and substitute |
| 598 |
|
with SHELFICEtopoFile in data.shelfice |
| 599 |
|
- move code for reading ice shelf topography and modifying hFacC into separate |
| 600 |
|
subroutines of the shelfice package |
| 601 |
|
- separate initialisation of "fixed" and "variable" variables |
| 602 |
|
- kTopC is not (yet) replaced by kSurfC, although this is possible |
| 603 |
|
o fix broken diagnostic SIatmFW and changed the units from m/s to kg/m^2/s |
| 604 |
|
o add initialisation of deepFac if using Pcoords (new S/R set_grid_factors) |
| 605 |
|
and rename: |
| 606 |
|
ini_phiref.F --> set_ref_state.F (+ set anelastic factors) |
| 607 |
|
ini_reference_state.F --> load_ref_files.F (- set anelastic factors) |
| 608 |
|
o change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst) |
| 609 |
|
|
| 610 |
|
checkpoint61c |
| 611 |
|
o add option ALLOW_ADDFLUID and run-time selector "selectAddFluid" |
| 612 |
|
to add mass source/sink of fluid in the interior (3-D generalisation |
| 613 |
|
of oceanic real-fresh water flux). |
| 614 |
|
o pkg/monitor: fix recip_dr argument in mon_advcflw2 call (-> advcfl_W_hf_max) |
| 615 |
|
o vermix test experiment: switch from LINEAR EOS to MDJWF (not tested before) |
| 616 |
|
o new pkg: down_slope |
| 617 |
|
density-driven downsloping flow parameterisation (Tellus, 1999, 412-430). |
| 618 |
|
- presently, modify T & S inland (dwnslp_calc_rho.F). |
| 619 |
|
can be avoided if rho was stored in common bloc and used in calc_phi_hyd. |
| 620 |
|
- implementation for ocean in P-coords not tested. |
| 621 |
|
- add secondary test to global_ocean.90x40x15 (input.dwnslp) to check this pkg. |
| 622 |
|
o move kSurfC,kSurfW & kSurfS from SURFACE.h to GRID.h (next to kLowC) |
| 623 |
|
(to facilitate conversion of oceanic pkg to p-coordinate). |
| 624 |
|
o change FIND_RHO to FIND_RHO_2D : |
| 625 |
|
pass arguments tFld & sFld as local (tile) 2D-arrays ; +fix EOS_CHECK. |
| 626 |
|
o new pkg: cheapaml |
| 627 |
|
|
| 628 |
|
checkpoint61b |
| 629 |
|
o exch2: |
| 630 |
|
change index bounds in rx2_cube exchanges (new S/R: EXCH2_GET_UV_BOUNDS) |
| 631 |
|
- no longer depend on the order sequence (N,S,E,W). |
| 632 |
|
- 3rd exchange no longer needed (tested with 24 tiles). |
| 633 |
|
- same modif to hand-written adjoint S/R (global_ocean.cs32x15: zero diff) |
| 634 |
|
- exch_UV_A-grid readily available (but not yet tested). |
| 635 |
|
comment out 3rd exch call and remove copy of V to U at SE & NE face-corners |
| 636 |
|
(both are no longer needed) in exch_uv: no effect in forward run; but |
| 637 |
|
get truncation error differences with adjoint exch. |
| 638 |
|
o exch2: |
| 639 |
|
- change index-bounds storage (moved from target to local tile, |
| 640 |
|
more intuitive this way) ; rename/remove some variables. |
| 641 |
|
- change utils/exch2/matlab-topology-generator & code_mods accordingly. |
| 642 |
|
|
| 643 |
|
checkpoint61a |
| 644 |
|
o exch2/matlab-topology-generator: |
| 645 |
|
fix bug in index bounds for N-S internal exchange (hard to tell if this |
| 646 |
|
had any effect on the solution). |
| 647 |
|
o pkg/mnc: small fix in mnc_handle_err: make sure that length of msgbuf |
| 648 |
|
is exceeded |
| 649 |
|
o testreport: modify syntax of awk, so that it works also with |
| 650 |
|
awk, and not only with nawk and gawk |
| 651 |
|
|
| 652 |
|
checkpoint61 |
| 653 |
|
o autodiff |
| 654 |
|
Change default for TAF usage by removing argument '-nonew_arg' |
| 655 |
|
This changes TAF subroutine argument list (ordering of active var.) |
| 656 |
|
Omission of this flag leads to incompatibility w.r.t. TAMC |
| 657 |
|
To restore TAMC-compatibility, need following modifs: |
| 658 |
|
* use adoptfile tools/adjoint_options/adjoint_tamc_compatibility |
| 659 |
|
* use CPP option #define AUTODIFF_TAMC_COMPATIBILITY |
| 660 |
|
Tested TAF version is 1.9.22 |
| 661 |
|
N.B.: exch2 hand-written adjoint code currently not TAMC compatible |
| 662 |
|
|
| 663 |
|
checkpoint60 |
| 664 |
|
--->>> This is the last checkpoint for which generating the adjoint |
| 665 |
|
--->>> is done via the TAMC-compatibility TAF-flag "-nonewarg" |
| 666 |
|
--->>> by default. |
| 667 |
|
--->>> Future checkpoints will ommit this flag by default. |
| 668 |
|
o pkg/generic_advdiff, os7mp: simplify and avoid division by zero. |
| 669 |
|
o pkg/grdchk: Add gradient check to etan0 perturbations. |
| 670 |
|
o pkg/exf: read ice area from file (#ifdef ALLOW_ICE_AREAMASK). |
| 671 |
|
o pkg/autodiff: more flexibility in zeroadj. |
| 672 |
|
model/src: modifying do_oceanic_phys.F accordingly. |
| 673 |
|
o pkg/ctrl: Bounds for (kapgm,kapredi,eddypsi) parameter estimation. |
| 674 |
|
o model/src and pkg/gmredi: GMREDI_WITH_STABLE_ADJOINT CPP option |
| 675 |
|
special setup of gmredi for which the adjoint is stable |
| 676 |
|
enough for parameter optimization. |
| 677 |
|
o bridging the gap between eddy stress and GM. |
| 678 |
|
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi) |
| 679 |
|
along with a change in CPP option (now ALLOW_EDDYPSI). |
| 680 |
|
-> when using GM w/ GM_AdvForm: |
| 681 |
|
The total eddy streamfunction (Psi = eddyPsi + K x Slope) |
| 682 |
|
is applied either in the tracer Eq. or in momentum Eq. |
| 683 |
|
depending on data.gmredi (intro. GM_InMomAsStress). |
| 684 |
|
-> ALLOW_EDDYPSI_CONTROL for estimation purpose. |
| 685 |
|
The key modifications are in model/src/taueddy_external_forcing.F |
| 686 |
|
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F |
| 687 |
|
|
| 688 |
|
checkpoint59r |
| 689 |
|
o new S/R (pkg/mdsio/mdsio_facef_read.F) reading of sNx+1 x sNy+1 array |
| 690 |
|
from per-face file (take S/R READSYMTILE_RS out of ini_curvilinear_grid.F); |
| 691 |
|
fix option to read coriolis(@ cell-corner) from files with CS-grid. |
| 692 |
|
o pkg/mnc: add some attributes to standard 1D-coordinate variables |
| 693 |
|
o pkg/diagnostics: enforce missing_value attribute for scalar variables at |
| 694 |
|
mass points, when using mnc for output |
| 695 |
|
- add runtime parameter (missing_value, missing_value_int) to override |
| 696 |
|
default (which is the value of getcon('UNDEF')) |
| 697 |
|
o pkg/mnc: prepare mnc for the actual use of missing values with the |
| 698 |
|
diagnostics package: small fix in mnc_cw_readwrite.template and more |
| 699 |
|
initialisation of never used fields |
| 700 |
|
- replace mnc_common.h and mnc_id_header.h with corresponding upper case |
| 701 |
|
versions |
| 702 |
|
o pkg/thsice/thsice_ini_vars.F added default initial values so that |
| 703 |
|
thermodynamics sea ice solver does not blow up when some initial fields |
| 704 |
|
are missing. |
| 705 |
|
o move from external_forcing_surf.F to ini_forcing.F |
| 706 |
|
the p-coord. hack consisting in using pLoad to set phi0surf ; |
| 707 |
|
update output of tutorial_global_oce_in_p (affected @ truncation level). |
| 708 |
|
o Freshen up a bit hs94.1x64x5, notably: |
| 709 |
|
remove rotationPeriod and tRef=5*0. (adjoint only), and add |
| 710 |
|
exactConserv=.TRUE. |
| 711 |
|
o pkg/generic_advdiff: |
| 712 |
|
change option GAD_ALLOW_SOM_ADVECT to GAD_ALLOW_TS_SOM_ADV which only |
| 713 |
|
applies to files where Temperature & Salinity 2nd Order moments are used. |
| 714 |
|
o pkg/ptracers: add second-order moment advection schemes (80 and 81); |
| 715 |
|
this uses a dynamically allocated internal state data structure |
| 716 |
|
(#define PTRACERS_ALLOW_DYN_STATE in PTRACERS_OPTIONS.h) |
| 717 |
|
and requires a fortran 90 compiler |
| 718 |
|
|
| 719 |
|
checkpoint59q |
| 720 |
|
o pkg/mom_vecinv: Add energy & enstrophy conserving scheme (selectVortScheme=3) |
| 721 |
|
(from Sadourny, described by Burridge & Haseler, ECMWF Rep.4, 1977) |
| 722 |
|
o Refresh tutorial_global_oce_biogeo, notably: |
| 723 |
|
- change bathymetry (put back seamounts in ACC, use hFacs) |
| 724 |
|
- change EOS (POLY3 --> JMD95Z) |
| 725 |
|
- use Bryan-Lewis vertical diffusivity |
| 726 |
|
- use multidimensional advection |
| 727 |
|
- remove old virtual virtual in dic pkg, now done through ptracer pkg |
| 728 |
|
- change a couple of parameters in dic pkg |
| 729 |
|
o pkg/ctrl: change formula in adctrl_bound.F and add a parameter to ctrl_map_ini_gen.F |
| 730 |
|
o pkg/obcs: change default to OBCSfixTopo = .true., |
| 731 |
|
- set OBCSfixTopo=.false. in exp4/input/data.obcs to reproduce old result |
| 732 |
|
- replace "debugMode" with "debugLevel .GE. debLevB" |
| 733 |
|
o implementation of TAF directives for gchem,cfc,dic |
| 734 |
|
o remove "exp5" (replaced by tutorial_deep_convection). |
| 735 |
|
o pkg/obcs: add code to fix topography gradients normal to open boundaries; |
| 736 |
|
this requires computing the index fields OB_Jn/Js/Ie/Iw in obcs_readparms; |
| 737 |
|
the code can be turned on by setting OBCSfixTopo = .true. in data.obcs |
| 738 |
|
--> changes results in exp4, seaice_obcs |
| 739 |
|
o tutorial_deep_convection : |
| 740 |
|
update the set-up and increase resolution and domain size ; start |
| 741 |
|
from pseudo initial conditions = output at t=120mn in order to see |
| 742 |
|
something happening when running testreport. |
| 743 |
|
o pkg/seaice: add os7mp as an advection scheme |
| 744 |
|
add check for advection schemes |
| 745 |
|
add a flag for restoring T and S underneath sea ice |
| 746 |
|
o pkg/my82: add netcdf-support and diagnostics |
| 747 |
|
o thsice pkg: |
| 748 |
|
- Now hsMax limits snow height by turning it into ice following |
| 749 |
|
flooding scheme (and now conserving energy) |
| 750 |
|
- Slight rewriting of the formula in thsice_calc_thick.F |
| 751 |
|
- Parameter rhowi eliminated to be replaced by floodFac = (rhosw-rhoi)/rhos |
| 752 |
|
--> changes results of global_ocean.cs32x15.icedyn and global_ocean.cs32x15.thsice |
| 753 |
|
|
| 754 |
|
checkpoint59p |
| 755 |
|
o gchem / dic / cfc : |
| 756 |
|
- add useDIC, useCFC , read from "data.gchem" (& hold in GCHEM.h); |
| 757 |
|
- add new parameter files: "data.dic" & "data.cfc" ; |
| 758 |
|
- various re-arrangement in initialisation & header file ; |
| 759 |
|
- fix tutorial_global_oce_biogeo for multi-threaded test. |
| 760 |
|
o pkg/dic: test for "pickup_dic" file when restarting ; |
| 761 |
|
if no pickup-file, can restart with a re-initialised pH (same as it did |
| 762 |
|
before) providing pickupStrictlyMatch is set to False. |
| 763 |
|
o change argument list of S/R PTRACERS_WRITE_PICKUP & MYPACKAGE_WRITE_PICKUP |
| 764 |
|
+ fix call to S/R GGL90_WRITE_PICKUP & DIC_WRITE_PICKUP |
| 765 |
|
o add a "warning" (to Error msg file) when an Active Tracer is not using AB-2 |
| 766 |
|
and staggerTimeStep is off (needed for stability of Internal-wave dynamics). |
| 767 |
|
o move out of PARAMS.h & data the last pieces of old-ptracer code: tauTr1ClimRelax, |
| 768 |
|
& lambdaTr1ClimRelax ; put those 2 params in PTRACERS_PARAMS.h & data.ptracers |
| 769 |
|
(note: not clear to me what lambdaTr1ClimRelax is still used for ...) |
| 770 |
|
o pkg/mom_vecinv: - new parameter "selectVortScheme" to select which |
| 771 |
|
scheme to use for vorticty-term ; |
| 772 |
|
- compute upwindVorticity=T case within mom_vi_u/v_coriolis_c4.F |
| 773 |
|
(with default selectVortScheme, return to original discretisation) |
| 774 |
|
- remove weird combination (e.g.: upwindVorticity & highOrderVorticity) |
| 775 |
|
o pkg/seaice: add a line to the summary to indicate grid type (B/C) |
| 776 |
|
o in mom_calc_visc, fix average value of viscAh_W & viscA4_W next to the |
| 777 |
|
bottom ; only used with variable horizontal viscosity and non-hydrostatic. |
| 778 |
|
also fix diagnostics VISCAHW & VISCA4W. |
| 779 |
|
|
| 780 |
|
checkpoint59o |
| 781 |
|
o dome/code/obcs_calc.F: avoid division by zero (detected using gfortran). |
| 782 |
|
o change the loop ordering in most gad_*_adv_x.F to improve vectorization: |
| 783 |
|
move a few statemens out the main loop into separate loops |
| 784 |
|
o pkg/shelfice: |
| 785 |
|
- sort out freshwater flux; convert freshwater fluxes to mass fluxes |
| 786 |
|
(kg/m^2/s), does not break tests, because in verification/isomip, |
| 787 |
|
rhoConstFresh=rhoConst (by accident) |
| 788 |
|
- rearrange computation of tLoc, sLoc, pLoc to make code more efficient |
| 789 |
|
- move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into |
| 790 |
|
new file model/src/seawater.F, so that they are available for all pkgs. |
| 791 |
|
- convert potential temperature into in-situ temperature. This changes the |
| 792 |
|
isomip tests => update tests |
| 793 |
|
o add a flag writePickupAtEnd (default=true) to be able to suppress |
| 794 |
|
writing a pickup at the last timestep |
| 795 |
|
o tools/mpack-1.6 : |
| 796 |
|
- disable automake (not working) and autoconf (not needed). |
| 797 |
|
- update to version 1.6.4 which fix MD5 code on some 64 bits platforms |
| 798 |
|
also cleaner with much less compilation warnings. |
| 799 |
|
o pkg/profiles: |
| 800 |
|
rename profiles_interp_mean_genericgrid as profiles_interp_mean_gg |
| 801 |
|
(for "less than 32 characters name" compiler requirement) |
| 802 |
|
o pkg/obcs and pkg/exf: added capability to specify seaice open boundary |
| 803 |
|
conditions that have a different sampling frequency than S/T/U/V obcs |
| 804 |
|
o pkg/diagnostics (stats-diags): |
| 805 |
|
- fix global Min/Max in case 1 processor get only empty tiles |
| 806 |
|
o genmake2: replace (4 times) |
| 807 |
|
make genmake_tc_1.o >> genmake_warnings 2>&1 |
| 808 |
|
with |
| 809 |
|
COMM="$CC $CFLAGS -c genmake_tc_1.c" |
| 810 |
|
echo $COMM >> genmake_warnings |
| 811 |
|
$COMM >> genmake_warnings 2>&1 |
| 812 |
|
to make genmake2 always see the value of CC as specified in the optfile. |
| 813 |
|
o generic_advdiff: - prather advection scheme (SOM) coded for CS-grid. |
| 814 |
|
- add diagnostics for 1srt & 2nd Order moments and sub-grid variance. |
| 815 |
|
- modify verification advect_cs test to test SOM-advection on CS-grid. |
| 816 |
|
o pkg/ctrl: |
| 817 |
|
- Rewrite of ctrl_map_ini_ecco.F, |
| 818 |
|
introducing a generic routine (ctrl_map_ini_gen.F). |
| 819 |
|
- Modification of ctrl_bound/adctrl_bound handling control vector bounds. |
| 820 |
|
|
| 821 |
|
checkpoint59n |
| 822 |
|
o pkg/diagnostics: for large number of diagnostics, store diagnostic mate |
| 823 |
|
number in dedicate array "hdiag": |
| 824 |
|
- new version of S/R DIAGNOSTICS_ADD2LIST : DIAGNOSTICS_ADDTOLIST |
| 825 |
|
with 1 more argument (mate number); modify old version DIAGNOSTICS_ADD2LIST. |
| 826 |
|
- many small changes (integer format) for large number of diagnostics |
| 827 |
|
- start to use DIAGNOSTICS_ADDTOLIST (necessary for diagnostics with |
| 828 |
|
a counter mate) in pkg diagnostics, ptracers, thsice & aim_v23. |
| 829 |
|
o add parameter rotateGrid and Euler angles EulerPhi/Theta/Psi. For |
| 830 |
|
usingSphericalGrid, this allows to define the rotated grid coordinates |
| 831 |
|
via phiMin/thetaMin/dxSpacing/dySpacing, etc., but then re-compute the |
| 832 |
|
geographical coordinates according to the inverse of the rotation defined |
| 833 |
|
by the Euler angles, so that Coriolis parameter and online-interpolation by |
| 834 |
|
exf works with the geographical coordinates on XC/YC/XG/YG. |
| 835 |
|
Naturally, this feature does not work with all packages, so some |
| 836 |
|
combinations are prohibited in config_summary (flt, flt_zonal, ecco, |
| 837 |
|
profiles), because there the coordinates are assumed to be regular |
| 838 |
|
spherical grid coordinates. |
| 839 |
|
o pkg/gmredi,ctrl,ecco,autodiff,grdchk and model/src,inc: |
| 840 |
|
- introduce isopycnal diffusion coefficient control. |
| 841 |
|
o tools/adjoint_options: |
| 842 |
|
- additional control vector components. |
| 843 |
|
o pkg/mnc: have mnc create marginally meaning full coordinate variables |
| 844 |
|
(that is the grid indices) if usingCurvilinearGrid and NOT EXCH2 |
| 845 |
|
o pkg/mypackage: |
| 846 |
|
- add example of read/write pickup for state-var ; |
| 847 |
|
- add entry points to the main code for state-vars diags & write-pickup. |
| 848 |
|
o pkg/exf: rewrite of exf_getffieldrec.F to properly deal with year |
| 849 |
|
transitions for useExfYearlyFields |
| 850 |
|
- add new subroutine that determines the file to read from for |
| 851 |
|
use*YearlyFields = .TRUE. and .FALSE. |
| 852 |
|
- add a verification experiment to global_with_exf that tests |
| 853 |
|
useExfYearlyFields with USE_EXF_INTERPOLATION defined |
| 854 |
|
o pkg/obcs/exf: add useOBCSYearlyFields (=.FALSE.) to obcs with exf in |
| 855 |
|
analogy to useExfYearlyFields; rearrange obcs_prescribe_read: two new |
| 856 |
|
subroutines (which could be generated from a template, because they are |
| 857 |
|
almost identical), for now they are included in obcs_prescribe_read.F for |
| 858 |
|
simplicity |
| 859 |
|
o pkg/exf: |
| 860 |
|
- add a little more diagnostic to exf_interp_read (in analogy to |
| 861 |
|
mds_read_field, can be turned off with debugLevel < debugLevA=1) |
| 862 |
|
- improve vectorizability of exf_interp for TARGET_NEC_SX, makes code |
| 863 |
|
ugly but fast by unrolling short inner loops, inserting a unroll=8 |
| 864 |
|
directive in routine lagran, and splitting a loop and making do while the |
| 865 |
|
outermost loop (the latter requires the intoduction of index arrays) |
| 866 |
|
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice |
| 867 |
|
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver |
| 868 |
|
http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html |
| 869 |
|
o verification/seaice_obcs: updated for restart test and latest options |
| 870 |
|
o pkg/seaice: add a new flag SEAICEuseTEM to use a slightly different |
| 871 |
|
ice rheology (so-called truncated ellipse, that gets rid of tensile stress); |
| 872 |
|
for now this is only available for the C-grid code and also within |
| 873 |
|
#ifdef SEAICE_ALLOW_TEM, because this option may slow down the EVP code |
| 874 |
|
|
| 875 |
|
checkpoint59m |
| 876 |
|
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) |
| 877 |
|
and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature |
| 878 |
|
o gad_som : fix flux output (& diagnostics) to have same units as other |
| 879 |
|
advection scheme fluxes (was previously multiplied by deltaT). |
| 880 |
|
o added verification/seaice_obcs both to test seaice open boundaries |
| 881 |
|
and to provide an example matlab scrpt for generating them |
| 882 |
|
o added verification/lab_sea/input.salt_plume for testing pkg/salt_plume |
| 883 |
|
o pkg/salt_plume: clean up salt_plume_frac.F to |
| 884 |
|
remove redundancy in PlumeMethod 1 and 4 |
| 885 |
|
o pkg/kpp: added saltplume diagnostics |
| 886 |
|
o pkg/obcs and pkg/seaice: |
| 887 |
|
- do not set uice and vice to zero when OB*icefile are unspecified |
| 888 |
|
- OBCS_SEAICE_AVOID_CONVERGENCE is undefined by default |
| 889 |
|
- moved seaice tracer obcs after call to seaice_growth |
| 890 |
|
o pkg/salt_plume: added various options for salt plume depth |
| 891 |
|
criterion and for vertical distribution of the salt |
| 892 |
|
|
| 893 |
|
checkpoint59l |
| 894 |
|
o pkg/ptracers: new version of ptracers pickup: |
| 895 |
|
read meta file and write only fields which are needed to restart. |
| 896 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 897 |
|
o pkg/seaice: |
| 898 |
|
- add timescale for melting due to warm mixed layer as a means of |
| 899 |
|
setting SEAICE_availHeatFrac more conveniently |
| 900 |
|
- add a CPP-flag/runtime parameter check for flooding algorithm |
| 901 |
|
- reformulated availHeat in seaice_growth.F to be independent of AREA |
| 902 |
|
o change units attribute of EmPmR netcdf variables to kg/m^2/s to reflect recent |
| 903 |
|
unit changes |
| 904 |
|
o pkg/obcs: added OBCS_SEAICE_AVOID_CONVERGENCE constraint |
| 905 |
|
o cg2d.F: add 3 compiler directives that speed up this routine by 30% on a NEC |
| 906 |
|
SX vector computer. |
| 907 |
|
o pkg/seaice: |
| 908 |
|
- removed SEAICE_FFIELDS.h and seaice_get_forcing.F |
| 909 |
|
seaice forcing fields can now be read only through pkg/exf |
| 910 |
|
- removed some unused halos |
| 911 |
|
o no longer write pickup from THE_MODEL_MAIN but always from FORWARD_STEP |
| 912 |
|
o pkg/exf: added useRelativeWind EXF_PARAM.h option for subtracting U/VVEL |
| 913 |
|
or U/VICE from U/VWIND before computing U/VSTRESS |
| 914 |
|
|
| 915 |
|
checkpoint59k |
| 916 |
|
o pkg/seaice: ICE2WATR=SEAICE_rhoIce/rhoConst for consistency between |
| 917 |
|
dynamics and thermodynamics. Set ICE2WATR=0.92 to reproduce older results. |
| 918 |
|
o fix un-initialised variable problem (in mom_vecinv & shap_filt): |
| 919 |
|
all experiments pass when compile with un-initialised var. checking option. |
| 920 |
|
o added pkg/salt_plume |
| 921 |
|
o script to test restart (for now, in MITgcm_contrib/jmc_script) |
| 922 |
|
o pkg/seaice: new read/write pickup version. |
| 923 |
|
read meta file and write only fields which are needed to restart. |
| 924 |
|
( same logic as main pickup file ; also using pickupStrictlyMatch ) |
| 925 |
|
o pkg/seaice: fix bug in seaice_ocean_stress (call of seaice_calc_strainrates) |
| 926 |
|
o lab_sea.hb87: modify the domain & update output.hb87.txt : |
| 927 |
|
lat-long grid & no-slip BC in seaice-dynamics produce different sigma12 |
| 928 |
|
at j=1 & j=Ny+1 : this case is not treated correctly in the restart |
| 929 |
|
process. Fixed here by closing the domain at the Northern boundary. |
| 930 |
|
o pkg/rw: cleaning-up: call directly new MDSIO S/R MDS_READ/WRITE_FIELD. |
| 931 |
|
o pkg/mdsio: add new arguments to MDS_READ/WRITE_FIELD for reading/writing |
| 932 |
|
a set of consecutive levels in/from a 3-D array. |
| 933 |
|
o pkg/ptracers: |
| 934 |
|
use a 2 characters string ioLabel to identify tracer (if more than 99 tracers). |
| 935 |
|
to-do: fix pkg/diagnostics when large number of diagnostics are defined. |
| 936 |
|
|
| 937 |
|
checkpoint59j |
| 938 |
|
o in pkgs: dic, obcs, offline, rbcs: |
| 939 |
|
standard way to compute coeff. for time interpolation between 2 time reccords |
| 940 |
|
which retains full precision (& make results less dependent on compiler). |
| 941 |
|
update output of exp: tutorial_cfc_offline & tutorial_global_oce_biogeo. |
| 942 |
|
o pkg/cfc: if compiled with exf and seaice, cfc now can use fields from those |
| 943 |
|
packages instead of reading ice cover and wind speed separately |
| 944 |
|
o split PTRACERS.h in 2 header files: PTRACERS_FIELDS.h & PTRACERS_PARAMS.h |
| 945 |
|
(keep a temporary version of PTRACERS.h in verification/OpenAD/code_ad_openad |
| 946 |
|
to allow to compile customized code before the update) |
| 947 |
|
o cleaning-up: |
| 948 |
|
- fix CPP instruction syntax in pkg/obcs |
| 949 |
|
- replace (some) call to MDSIO S/R with call to RW interface S/R ; and |
| 950 |
|
add #ifdef ALLOW_MDSIO elsewhere (allows to compile without pkg/mdsio) |
| 951 |
|
- fix some threads issue in IO parts. |
| 952 |
|
o pkg/dic: |
| 953 |
|
- add tons of "_d 0" (--> much better testreports !) |
| 954 |
|
and then update outputs of tutorial_global_oce_biogeo |
| 955 |
|
o pkg/mom_fluxform: |
| 956 |
|
add a special version of momentum advection intended to conserve momentum |
| 957 |
|
next to a bathymetry step or a coastline edge. (default = off = #undef) |
| 958 |
|
o new read/write pickup version: |
| 959 |
|
- for now, only implemented for main (mdsio) pickup file. |
| 960 |
|
- write out only what is needed to restart; merge pickup_nh , pickup_ph |
| 961 |
|
and main pickup together. |
| 962 |
|
- read meta file; read only what is needed to restart; stop if a field |
| 963 |
|
is missing (if pickupStrictlyMatch=T, = the default) or try to restart |
| 964 |
|
if it make sense (even if the restart is not perfect). |
| 965 |
|
- if no meta file, assume that pickup to read corresponds exactly to |
| 966 |
|
a pickup that would currently be written. |
| 967 |
|
- read pickup written in the old format (until checkpoint59i) if it |
| 968 |
|
recognizes an old meta file (no field-list). |
| 969 |
|
- add a meta file in exp. which starts from a pickup: 2 cases: |
| 970 |
|
a) minimal meta file (with just file precision) + pickupStrictlyMatch=F |
| 971 |
|
e.g.: global_ocean.90x40x15/input/pickup.0000036000.meta |
| 972 |
|
b) a meta file describing the content of the associated pickup file |
| 973 |
|
e.g.: tutorial_global_oce_biogeo/input/pickup.0004248000.meta |
| 974 |
|
o pkg/mdsio & pkg/rw: |
| 975 |
|
- new routine to read a meta file ; new set of routine to read |
| 976 |
|
Multiple-fields file (with meta file). |
| 977 |
|
o added open boundary conditions capability for seaice |
| 978 |
|
HSNOW, HSALT, UICE, and VICE |
| 979 |
|
|
| 980 |
|
checkpoint59i |
| 981 |
|
o adjoint: |
| 982 |
|
* fix multiDimAdvection adjoint |
| 983 |
|
(partial recomputation problem by TAF for fVerT(:,:,kDown) |
| 984 |
|
and comlev1 size definition (maxpass vs. max. number of tracers) |
| 985 |
|
* verification/global_ocean.90x45x15 adjoint now tests |
| 986 |
|
NLFS and multiDimAdvection using DST3 (=30) |
| 987 |
|
* verification/lab_sea now tests multiDimAdvection using DST3 (=30) |
| 988 |
|
o pkg/kpp: add "_d 0" to real constant (if missing); |
| 989 |
|
update output of exp: natl_box (10.digits); vermix (std, 7.digits) |
| 990 |
|
and lab_sea, 3.FW (only 6,4,6 digits match) & AD (8.digits). |
| 991 |
|
o prepare for "clever pickup" implementation: add new header file "RESTART.h" |
| 992 |
|
for internal parameters related to restart process (formerly from PARAMS.h) |
| 993 |
|
and add startAB parameter to argument list of S/R ADAMS_BASHFORTH2. |
| 994 |
|
o more standard interface to {PKG}_WRITE_PICKUP with pickup suffix passed |
| 995 |
|
as argument. (only atm2d & obcs write_pickup have not yet been updated) |
| 996 |
|
o pkg/monitor: |
| 997 |
|
- use GLOBAL_SUM_TILE instead of _GLOBAL_SUM |
| 998 |
|
- fix mon_stats_rs (statistics over the full domain, even where field is zero) |
| 999 |
|
- account for deep Atmosphere factor and density factor (anelastic) |
| 1000 |
|
o added open boundary conditions capability for seaice HEFF and AREA |
| 1001 |
|
o pkg/shelfice: add option for convservative form of Hellmer&Olbers (1989) |
| 1002 |
|
thermodynamics |
| 1003 |
|
- requires a little reorganization, which affects the testreport results |
| 1004 |
|
of isomip.htd (only 7 digits of cg2d agree) => update/modify experiment, |
| 1005 |
|
so that now the conservative form is tested |
| 1006 |
|
- add a few comments |
| 1007 |
|
o add missing cvs Header: or Name: in eesupp/*, pkg/* & verification/code* |
| 1008 |
|
o add a little bit of code to gad_os7mp_adv_?.F to help vectorization |
| 1009 |
|
o add new diagnostics to seaice: advective, diffusive fluxes (only for |
| 1010 |
|
multidim-advection, for scheme 2 they are not filled) and transports, |
| 1011 |
|
thermodynamic growth rates |
| 1012 |
|
o change units of EmPmR (inside the code, + within coupling interface) |
| 1013 |
|
from m/s to kg/m2/s (mass flux) but leave input file unchanged. |
| 1014 |
|
Affects results @ truncation level (cg2d match) and update output of |
| 1015 |
|
experiments: lab_sea(6), global_ocean.90x40x15(10), |
| 1016 |
|
global_ocean.cs32x15(11x3,10), natl_box(11), tutorial_global_oce_latlon(11) |
| 1017 |
|
+ adjoint results: global_ocean_ebm(11) and lab_sea (12). |
| 1018 |
|
Coupled set-up: allow to restart from previous pickups (cpl_oldPickup=T). |
| 1019 |
|
Next: will retire convertEmP2rUnit (simply using mass2rUnit instead). |
| 1020 |
|
|
| 1021 |
|
checkpoint59h |
| 1022 |
|
o pkg/exf: |
| 1023 |
|
- improve vectorization by moving if-statement out of loops in |
| 1024 |
|
exf_mapfields, exf_radiation |
| 1025 |
|
- exf_bulkformulae.F: introduce 2D fields and vectorize code |
| 1026 |
|
o pkg/kpp: added the salt plume scheme (ALLOW_SALT_PLUME) to KPP package |
| 1027 |
|
o testreport: |
| 1028 |
|
- allow to test for Qnet & SeaIce monitor output; clean-up ALLOW_BULK_OFFLINE |
| 1029 |
|
monitor & update offline_exf_seaice exp. output. |
| 1030 |
|
- AD testing: pass/FAIL according to Grad. output accuracy (instead of Cost) |
| 1031 |
|
o pkg/seaice: |
| 1032 |
|
- bug fix in the evp solver: boundary conditions were affected be |
| 1033 |
|
masking of zMax/zMin (changes results) |
| 1034 |
|
- minor bug fix in boundary conditions in seaice_calc_strainrates |
| 1035 |
|
(changes results for no_slip) |
| 1036 |
|
- seaice_lsr.F: make interpolation of eta dependent on boundaries |
| 1037 |
|
- replace hardcoded lower limit for zeta (zMin) by runtime parameter |
| 1038 |
|
- add a test to lab_sea, that tests the Hibler and Bryan (1987) ocean |
| 1039 |
|
stress formulation and no-slip boundary conditions |
| 1040 |
|
o pkg/ptracers: Temporary fix for PTRACERS_useGMRedi & PTRACERS_useKPP |
| 1041 |
|
in gad_calc_rhs.F ; add few safety stops in initialisation phase. |
| 1042 |
|
o pkg/seaice: a first HSALT time stepping equation has been checked in |
| 1043 |
|
o pkg/seaice: replaced maskW with seaiceMaskU and maskS with seaiceMaskV |
| 1044 |
|
in seaice_lsr.F; this solves the pkg/seaice-pkg/obcs problem |
| 1045 |
|
without requiring DO-IF statements |
| 1046 |
|
o pkg/thsice: |
| 1047 |
|
use continuous power-law function for partition of energy between lateral |
| 1048 |
|
melting/freezing and thinning/thickening ; old code using step function |
| 1049 |
|
still available with #undef THSICE_FRACEN_POWERLAW |
| 1050 |
|
update output of exp: aim.5l_cs.thSI, global_ocean.cs32x15.icedyn & .thsice |
| 1051 |
|
o testreport: change AD testing : check against results/output_adm.txt |
| 1052 |
|
using same scripts as for forward test. |
| 1053 |
|
|
| 1054 |
|
checkpoint59g |
| 1055 |
|
o adjoint testing: in preparation for changing testreport: |
| 1056 |
|
- output format: cost and grad written on separated lines |
| 1057 |
|
- ad output results in directory "results" (instead of "results_ad") |
| 1058 |
|
o pkg/seaice: adding ice salinity HSALT as a prognostic variable |
| 1059 |
|
o pkg/seaice: changes for using pkg/seaice with pkg/obcs |
| 1060 |
|
o pkg/ecco: allow user defined cost function contributions |
| 1061 |
|
o testreport: |
| 1062 |
|
Allow to choose (per experiment) the list of tested output variables |
| 1063 |
|
and the main variable (used to issue a pass/FAIL ) ; |
| 1064 |
|
- for now, done by adding the specific list in file: [exp]/input/tr_checklist |
| 1065 |
|
- default is unchanged: >cg2d< , (T,S,U,V,5 tracers)_[min,max,mean,StD] ; |
| 1066 |
|
Also modify printing of summary: |
| 1067 |
|
a) ">" NN "<" indicates the "main" variable (used for pass/FAIL) |
| 1068 |
|
b) echo the list of tested variables in the individual summary.txt of |
| 1069 |
|
each experiment. |
| 1070 |
|
o new S/R GLOBAL_SUM_TILE to compute global sum independently of number of |
| 1071 |
|
threads and number of processes (with #define GLOBAL_SUM_SEND_RECV) |
| 1072 |
|
(but still depend on the tile decompostion of the domain). |
| 1073 |
|
o pkg/seaice: change a discretization detail to make the B-grid code |
| 1074 |
|
"more symmetric". This change is likely to remove all "ridges/leads" that |
| 1075 |
|
where quasi-aligned with the grid in B-grid solutions. It may also be |
| 1076 |
|
the solution to the stress coupling issues with the B-grid. |
| 1077 |
|
o each tested exp: add a "run" directory with a standard ".cvsignore" file ; |
| 1078 |
|
remove .cvsignore from input dir. (since testreport no longer run here). |
| 1079 |
|
o pkg/thsice: |
| 1080 |
|
- cleaning: move common block out of "THSICE_2DYN.h" (removed) to "THSICE_VARS.h" |
| 1081 |
|
- fix reshaping of sea-ice just after advection: |
| 1082 |
|
melt all the ice only if ice-volume is too small. |
| 1083 |
|
- re-visit lateral/thinning repartition of melting (modifs from May 04, 2007): |
| 1084 |
|
prevent lateral melting if sea-ice fraction is too close to iceMaskMin ; |
| 1085 |
|
and update experiment global_ocean.cs32x15.icedyn (+start from pickup files). |
| 1086 |
|
o external_forcing_surf : extend the use of salt_EvPrRn & temp_EvPrRn (fresh-water |
| 1087 |
|
tracer content) to linFS or no RealFreshWaterFlux ; default remains unchanged. |
| 1088 |
|
o define mass2rUnit & rUnit2mass as units conversion factor, used for surface |
| 1089 |
|
forcing. mass2rUnit: from mass per unit area [kg/m2] to r-coordinate unit |
| 1090 |
|
(z-coord: =1/rhoConst ; p-coord: =gravity) ; rUnit2mass is just the reverse; |
| 1091 |
|
and remove horiVertRatio (& recip_horiVertRatio). Affects truncation error |
| 1092 |
|
of exp. global_oce_in_p: 10 16 16 14 16 13 16 16 16 13 13 13 16 13 13 12 16 |
| 1093 |
|
-> update output.txt |
| 1094 |
|
o pkg/cd_code: add brackets in multiple terms sum (S/R CD_CODE_SCHEME): |
| 1095 |
|
this affects truncation error: -> update output.txt of exp: |
| 1096 |
|
global_ocean.90x40x15 (fw&adm), lab_sea (fw&adm) & lab_sea.lsr, |
| 1097 |
|
ideal_2D_oce, isomip.htd, natl_box, tutorial_global_oce_latlon. |
| 1098 |
|
|
| 1099 |
|
checkpoint59f |
| 1100 |
|
o pkg/autodiff: zero_adj resets an ajoint variable to zero (in adjoint mode) |
| 1101 |
|
o pkg/ctrl: ctrl_bound forces parameter corrections to stay in |
| 1102 |
|
a bounded range (in forward mode) |
| 1103 |
|
o pkg/ecco, ctrl, autodiff and mom_common: |
| 1104 |
|
internal parameter controls, completements of implementations |
| 1105 |
|
o add few EXCH S/R (UV_BGRID, UV_DGRID, SM) for B & D-Grid velocity & 2nd Moment Sxy. |
| 1106 |
|
o use UV_BGRID exch for dxV,dyU: for now, only with pkg/exch2 & forward ; |
| 1107 |
|
(not seem any difference in testing results). |
| 1108 |
|
o pkg/cd_code: use the right EXCH calls (for CS-grid); but problem remains |
| 1109 |
|
at face corners. |
| 1110 |
|
o pkg/generic_advdiff: |
| 1111 |
|
- in GAD.h, define as parameters (iMinAdvR,iMaxAdvR,jMinAdvR,jMaxAdvR) |
| 1112 |
|
loop range indices for computing vertical advection tendency |
| 1113 |
|
and do the calculation in the interior only (no overlap) ; |
| 1114 |
|
for now, only implemented for SOM advection (to save CPU time). |
| 1115 |
|
- add argument "withSigns" to S/R FILL_CS_CORNER_TR_RL (needed for SOM_xy moment) |
| 1116 |
|
o exch2 adjoint |
| 1117 |
|
First set of changes: |
| 1118 |
|
- add exch2 hand-written adjoint templates |
| 1119 |
|
- exch2 hand-written no longer use TAF-flag 'nownew_arg' |
| 1120 |
|
This will require cleanup in pkg/autodiff/*.F |
| 1121 |
|
(changed routines currently kept separate in verif. code/) |
| 1122 |
|
- Comment all relevant #ifndef ALLOW_AUTODIFF_TAMC |
| 1123 |
|
that used to hide exch2 or cubed-sphere specific code |
| 1124 |
|
(commented via 'cph-exch2') |
| 1125 |
|
o pkg/seaice |
| 1126 |
|
- Close southern and western boundaries for UICE/VICE when useOBCS=.TRUE. |
| 1127 |
|
o pkg/bulk_force: fix loading into Qsw of Short-Wave flux; and update |
| 1128 |
|
output of global_ocean.cs32x15.thsice . |
| 1129 |
|
|
| 1130 |
|
checkpoint59e |
| 1131 |
|
o exch2: new S/R that only use the cube-tracer (center-position) exchange: |
| 1132 |
|
for B-grid vector (not yet tested) and C-grid vector (<- only used |
| 1133 |
|
when option W2_USE_R1_ONLY in W2_OPTIONS.h is defined). |
| 1134 |
|
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme |
| 1135 |
|
(#ifdef ALLOW_SALT_PLUME) |
| 1136 |
|
o gather_2d/scatter_2d: removed halo regions |
| 1137 |
|
o gmredi: add option (GM_taper_scheme='fm07') for Ferrari & McWilliams 2007 |
| 1138 |
|
scheme and the corresponding test case (under front_relax dir). For now, |
| 1139 |
|
only available with Skew-flux form and not yet tested in realistic set-up. |
| 1140 |
|
adjoint: store directives updated, but gradient checks deteriorated, |
| 1141 |
|
so maybe GM/Redi adjoint is now broken. |
| 1142 |
|
o seaice adjoint |
| 1143 |
|
* add AREA, HEFF, HSNOW as control variable |
| 1144 |
|
(should not change lab_sea results) |
| 1145 |
|
* CTRL_OPTIONS.h needs new flag: CTRL_SET_OLD_MAXCVARS_40 |
| 1146 |
|
o pkg/seaice: |
| 1147 |
|
* added computation of saltFlux in seaice_growth; |
| 1148 |
|
For time being, sea ice salinity is assumed constant |
| 1149 |
|
contribution of snow flooding to freshening of sea ice is neglected. |
| 1150 |
|
SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it |
| 1151 |
|
defaults to 0.0 in order to maintain backward compatibility. |
| 1152 |
|
Typical values for SEAICE_salinity are 4 to 10 g/kg. |
| 1153 |
|
* replaced dRf(1) with dRf(kSurface)*hFacC(kSurface) in seaice_growth.F |
| 1154 |
|
* added SEAICE_availHeatFrac, which specifies fraction of surface level |
| 1155 |
|
heat content used to melt or grow ice |
| 1156 |
|
* commented out cap of HICE: it helps keep ice thinner |
| 1157 |
|
* reintroduced cap of HEFF via MAX_HEFF and SEAICE_CAP_HEFF option |
| 1158 |
|
* applied OBCS T/S mask to HEFFM sea ice mask |
| 1159 |
|
|
| 1160 |
|
checkpoint59d |
| 1161 |
|
o standard name: {PKG}_DIAGNOSTICS_STATE to fill diagnostics array |
| 1162 |
|
for {PKG} state variables, and called from DO_STATEVARS_DIAGS. |
| 1163 |
|
(keep {PKG}_DIAGNOSTICS_FILL for non-state variables diagnostics) |
| 1164 |
|
o pkg/gmredi (gmredi_readparms.F): add some missing "_d 0" |
| 1165 |
|
and change default value of parameter "GM_Small_Number"; |
| 1166 |
|
update output of exp: lab_sea (x2), cfc_example, global_ocean.90x40x15, |
| 1167 |
|
global_ocean.cs32x15 (x4), global_ocean_ebm, global_with_exf, |
| 1168 |
|
tutorial_global_oce_biogeo, tutorial_global_oce_latlon |
| 1169 |
|
o pkg/ecco: cost function when applying pkg/smooth to controls |
| 1170 |
|
o pkg/ctrl: add forcingPrecond run time parameter |
| 1171 |
|
o pkg/seaice: |
| 1172 |
|
- replace ZMIN=4.e8 with ZMIN=0. in dynsolver.F as in C-grid code |
| 1173 |
|
- fix bug in metric terms of u-equation in LSR solver (implicit part), |
| 1174 |
|
changes verification/lab_sea |
| 1175 |
|
- rearrange implicit part of u-equation in LSR solver to make it easier to |
| 1176 |
|
read, understand, and debug. This causes changes at the truncation level. |
| 1177 |
|
- fix (serious) bug in the boundary conditions (sign error in the implicit |
| 1178 |
|
part) of the LSR solver. Changes all LSR results. |
| 1179 |
|
- fixed problem with HSNOW initialization to avoid thick snow when AREA |
| 1180 |
|
is initilized with small values - does not change lab_sea results. |
| 1181 |
|
- added HsnowFile initialization capability |
| 1182 |
|
o pkg/smooth: addition to model/src and pkg/ctrl so allow |
| 1183 |
|
initialization of pkg/smooth and application to control vector |
| 1184 |
|
o pkg/seaice: fix another bug in the LSR no-slip boundary conditons |
| 1185 |
|
o dependencies: pkg/profiles requires pkg/cal |
| 1186 |
|
o pkg/profiles: |
| 1187 |
|
- added option ALLOW_PROFILES_GENERICGRID |
| 1188 |
|
-> pkg/profiles can thus be used with any grid (e.g. cs32x15) assuming |
| 1189 |
|
that interpolation information (grid points and coefficients) is provided |
| 1190 |
|
within the netcdf input files. |
| 1191 |
|
-> sample matlab scripts can be found in MITgcm_contrib/gael |
| 1192 |
|
that allow you to prepare netcdf input files. |
| 1193 |
|
- also modified: cleaner include statements, cleaner error print statements, |
| 1194 |
|
cleaner stops when error, and more tests of the netcdf input files consistency. |
| 1195 |
|
o additional test (in global_ocean.cs32x15) using seaice+thsice pkgs. |
| 1196 |
|
o pkg/seaice: |
| 1197 |
|
- move seaice-diagnostics from seaice_do_diags to do_statevars_diags; this |
| 1198 |
|
requires a new routine: seaice_diagnostics_fill.F |
| 1199 |
|
- make sure that seaice does not move if not forced (pressure replacement |
| 1200 |
|
method, Hibler and Ip, 1995), changes results |
| 1201 |
|
- and new damping criterion for EVP solver according to Hunke, JCP, 2001 |
| 1202 |
|
- SEAICE_evpDampC = > 0. turns it on (615. is the recommended value). |
| 1203 |
|
It is turned off by default (=-1.), because it changes the results. |
| 1204 |
|
- make it possible to read AREA from a file, too. |
| 1205 |
|
|
| 1206 |
|
checkpoint59c |
| 1207 |
|
o add S/R and diagnostics for oceanic mixed-layer depth |
| 1208 |
|
o move GMRedi call after all vertical mixing schemes (including KPP) |
| 1209 |
|
o pkg/thsice: |
| 1210 |
|
- ensure iceMask > iceMaskMin : this problem appeared after May-04 modifs |
| 1211 |
|
(melt only laterally if thin ice): update output of global_ocean.cs32x15.thsice |
| 1212 |
|
o pkg/obcs: |
| 1213 |
|
- bug fix for balance code |
| 1214 |
|
o pkg/seaice: |
| 1215 |
|
- allow values of SEAICE_elasticParm > 1 |
| 1216 |
|
- add new parameter SEAICE_evpTauRelax as an alternative |
| 1217 |
|
to SEAICE_elasticParm |
| 1218 |
|
- make lsr boundary conditions free slip (by default), changes result |
| 1219 |
|
- add code for no slip boundary conditions for lsr |
| 1220 |
|
- set minimum of zeta to zero (and not 4e8) (changes results) |
| 1221 |
|
- add a cap on AREA after advecting AREA if seaice_growth is not called |
| 1222 |
|
o change calculation of Visbeck K: |
| 1223 |
|
- no longer depend on tapering scheme; instead, compute slope (limited |
| 1224 |
|
by GM_maxSlope). this is equivalent to what was comuted before with |
| 1225 |
|
clipping or linear tappering. |
| 1226 |
|
- fix vertical averaging (wrong by 1/2 level) |
| 1227 |
|
- leave the old version (but will not be maintained) within |
| 1228 |
|
#ifdef OLD_VISBECK_CALC / #endif |
| 1229 |
|
- update output of exp. ideal_2D_oce |
| 1230 |
|
o change error catch in calc_r_star to improve vectorization |
| 1231 |
|
o exf runoff and seaice: remove ALLOW_SEAICE from exf pkg files and |
| 1232 |
|
add #define ALLOW_RUNOFF in SEAICE_OPTIONS.h (when not using exf). |
| 1233 |
|
o adjoint: |
| 1234 |
|
Re-organized adjoint checkpointing according to Matt Mazloff |
| 1235 |
|
(but with modifs/completions/cleanups) |
| 1236 |
|
Storing is now bundled into large arrays to optimized I/O |
| 1237 |
|
(and second step in cleanup of the_main_loop) |
| 1238 |
|
|
| 1239 |
|
checkpoint59b |
| 1240 |
|
o coupler (pkg/atm_ocn_coupler, pkg/ocn_compon_interf, pkg/atm2d): |
| 1241 |
|
- export/import (between ocean & coupler) fields needed for ocean DIC. |
| 1242 |
|
o pkg/seaice: |
| 1243 |
|
- get rid of three more exchanges seaice_calc_viscosities (required |
| 1244 |
|
different loop boundaries in seaice_lsr and seaice_ocean_stress) |
| 1245 |
|
- bug fix in seaice_ocean_stress (update of lab_sea required) |
| 1246 |
|
- reduce loop boundaries to necessary minimum also in seaice_evp |
| 1247 |
|
- go back to the old way of computing deltaC/Z as the adjoint likes that |
| 1248 |
|
better |
| 1249 |
|
o Refresh of tutorial_global_oce_latlon (includes changing salinity-like |
| 1250 |
|
passive tracer to an Age Tracer) + update output.txt |
| 1251 |
|
o pkg/exf: |
| 1252 |
|
- implement A-grid / C-grid selection for wind-stress input files. |
| 1253 |
|
- clean-up exf_wind.F (remove us, use wspeed instead ; add wStress) |
| 1254 |
|
for now, in exf_bulk_largeyeager04.F only : |
| 1255 |
|
- change implementation for case where windspeed + 2. components wind-stress |
| 1256 |
|
are read-in. AND use rhoConstFresh to convert evap. |
| 1257 |
|
o pkg/seaice: |
| 1258 |
|
- use correct EXCH_UV for wind-forcing (on A-grid). |
| 1259 |
|
- change SEAICE_OPTIONS.h to limit the number of option combinations (regarding |
| 1260 |
|
SEAICE_EXTERNAL_FORCING & SEAICE_EXTERNAL_FLUXES); add corresponding stops. |
| 1261 |
|
o pkg/exf: |
| 1262 |
|
- default EXF options are now set in EXF_OPTIONS.h (ifndef ALLOW_AUTODIFF_TAMC) |
| 1263 |
|
EXF_INTERPOLATION: |
| 1264 |
|
- merge global_with_exf/code version of exf_interp_read.F |
| 1265 |
|
to the main code ; |
| 1266 |
|
- Add new option: EXF_INTERP_USE_DYNALLOC to use Dynamical Allocation when |
| 1267 |
|
reading the file ; Important: This options needs to be defined to recover |
| 1268 |
|
previous code. |
| 1269 |
|
otherwise, use fixed size array to read in (size=exf_interp_bufferSize). |
| 1270 |
|
- no longer loose real*8 precision along the way when using exf_iprec=64. |
| 1271 |
|
o pkg/seaice: rearrangement of common blocks (really needs more cleaning up) |
| 1272 |
|
- change discretisation of evp-solver in order to avoid another exchange |
| 1273 |
|
(changes lab_sea) and clean up a little |
| 1274 |
|
- replace SQRT(MAX(deltaC,SEAICE_EPS)) by MAX(SQRT(deltaC),SEAICE_EPS) |
| 1275 |
|
help the adjoint (this also changes the results slightly) |
| 1276 |
|
- add a few "_d 0" where they had been missing in seaice_evp.F |
| 1277 |
|
- cleaning up: remove unused seaice_calc_rhs.F |
| 1278 |
|
o pkg/exf: some cleaning-up: |
| 1279 |
|
- change various "constants" into runtime parameters |
| 1280 |
|
- cleaned-up Large&Yeager04 routine which should eventually |
| 1281 |
|
replace exf_bulkformulae.F (changed names of S/R and CPP) |
| 1282 |
|
and merged various ALLOW_ATM_WIND options |
| 1283 |
|
only used with thsice pkg (in thsice_get_exf.F): |
| 1284 |
|
- implement fixed turbulent transfert Coeff over ice (as in Large&Yeager04) |
| 1285 |
|
which are used when useStabilityFct_overIce=TRUE (= the default) |
| 1286 |
|
- change default values of ice & snow emissivity and scale downward LW |
| 1287 |
|
by ice & snow emissivity. |
| 1288 |
|
o pkg/thsice: |
| 1289 |
|
fix few little problems, in thsice_calc_thickn.F: |
| 1290 |
|
- growth vertically (and not laterally) if iceFrac == iceMaskMax |
| 1291 |
|
- melt only laterally if hIce < hThinIce (as the comments say) |
| 1292 |
|
and in thsice_extend.F: |
| 1293 |
|
- allow to form ice even when iceFrac == iceMaskMax (by increasing thickness) |
| 1294 |
|
- start to form ice as soon as the minimum ice-volume is reachable. |
| 1295 |
|
update output of test-exp: aim.5l_cs(thSI), global_ocean.cs32x15(thsice), |
| 1296 |
|
and cpl_aim+ocn |
| 1297 |
|
o pkg/kpp |
| 1298 |
|
- move computation of surface related input fields to KPP into a new |
| 1299 |
|
subroutine kpp_forcing_surf.F |
| 1300 |
|
- remove wrong (within bi,bj loops) EXCH calls. |
| 1301 |
|
- little cleaning (add argument myThid in last position, cvs header ...) |
| 1302 |
|
- for now, fix conservation problem by exchanging KPPviscAz (may not |
| 1303 |
|
be the best fix) |
| 1304 |
|
o pkg/seaice |
| 1305 |
|
- check for inconsistent evp parameter/cpp-flag combination |
| 1306 |
|
- remove leftover errIO flat for obsolete name list error handling |
| 1307 |
|
o OpenAD |
| 1308 |
|
- changed verification/OpenAD to full baroclinic setup (including GM/Redi) |
| 1309 |
|
|
| 1310 |
|
checkpoint59a |
| 1311 |
|
o pkg/seaice: some parameter clarifications and a little bit of clean up |
| 1312 |
|
o pkg/thsice: rename run-time parameters: |
| 1313 |
|
himin -> hIceMin |
| 1314 |
|
himin0 -> hThinIce |
| 1315 |
|
hihig -> hThickIce |
| 1316 |
|
i0 -> i0swFrac |
| 1317 |
|
transCoef -> bMeltCoef |
| 1318 |
|
frac_energy -> fracMelting |
| 1319 |
|
add new parameters: hNewIceMax, fracFreezing, dhSnowLin |
| 1320 |
|
with default values (for now) that do not change the results. |
| 1321 |
|
remove old version of thsice vars advection in pkg/seaice. |
| 1322 |
|
o in FFIELDS.h: |
| 1323 |
|
- replace #ifndef ALLOW_EXF by #ifndef EXCLUDE_FFIELDS_LOAD |
| 1324 |
|
- make pLoad & sIceLoad always available (but still only used if |
| 1325 |
|
ATMOSPHERIC_LOADING is #define). |
| 1326 |
|
o pkg/kpp: replaced _KPP_RL with _RL |
| 1327 |
|
o bug fixes for vertical diffusivity computations when both KPP and |
| 1328 |
|
3D diffusivity arrays are used; pkg/kpp/kpp_calc_diff_s & _t.F |
| 1329 |
|
are no longer updating the vertical diffusivity array |
| 1330 |
|
(passed as argument) but are (re-) setting those arrays. |
| 1331 |
|
o pkg/seaice: fix bug in evp solver, while doing that |
| 1332 |
|
- change (improve?) discretization of stress computations for both |
| 1333 |
|
cgrid-lsr and evp solver |
| 1334 |
|
- add a new routine to compute strain rates |
| 1335 |
|
- the above changes lab_sea results |
| 1336 |
|
- add no slip conditions for evp solver (off by default), lsr-version |
| 1337 |
|
may follow |
| 1338 |
|
- fix exchange for shear at Z-points (does not change lab_sea) |
| 1339 |
|
- retire SEAICEuseEVP, instead turn on EVP by setting SEAICE_deltaTevp |
| 1340 |
|
(to force the user to pick a time step since there is not "safe" way |
| 1341 |
|
of choosing it) |
| 1342 |
|
- add principal stress diagnostics |
| 1343 |
|
- rearrange fields for evp a little to avoid having to call a: too many |
| 1344 |
|
exchanges and b: exchanges for stress trensor components which we do |
| 1345 |
|
not have. |
| 1346 |
|
- modify Hibler+Bryan (1987) stress coupling so that it reuses information |
| 1347 |
|
of evp, complete rewrite for lsr case (latter is does not yet work |
| 1348 |
|
in all cases) |
| 1349 |
|
o pkg/kpp: add code to have mixing in shelf ice caverns |
| 1350 |
|
- add myThid to all kpp routines (long overdue) |
| 1351 |
|
|
| 1352 |
|
checkpoint59 |
| 1353 |
|
o pkg/exf: |
| 1354 |
|
- fix wind-stress location: defined on A-grid (if ALLOW_ATM_WIND & |
| 1355 |
|
ALLOW_BULKFORMULAE or USE_EXF_INTERPOLATION), otherwise, defined on C-grid |
| 1356 |
|
- move exf header files from lower_case.h to UPPER_CASE.h ; |
| 1357 |
|
add missing cvs Header & Name |
| 1358 |
|
- add adjoint routines and flow dirs for newly used exch_uv_agrid routines |
| 1359 |
|
- add namelist param. selectStressGridPosition, exf_monFreq |
| 1360 |
|
- retire many _CLIM routines, and remove data.exf_clim |
| 1361 |
|
+ params moved to data.exf |
| 1362 |
|
+ climsst, climsss now handled by exf_set_gen, i.e. |
| 1363 |
|
climss?period=0 refers to constant field, |
| 1364 |
|
climss?period=-12 to monthly forcing |
| 1365 |
|
- split up namelists in data.exf |
| 1366 |
|
o pkg/seaice: |
| 1367 |
|
- remove seaice_exch and seaice_exch_uv |
| 1368 |
|
- remove superfluous exchange of theta |
| 1369 |
|
- add myThid to seaice_budget_ocean/ice |
| 1370 |
|
- add new interface for atmospheric wind forcing (C-grid only) |
| 1371 |
|
+ new routine |
| 1372 |
|
+ two new field (taux, tauy for stress over ice) |
| 1373 |
|
+ removed one global field (DAIRN) for C-grid case only |
| 1374 |
|
o pkg/thsise |
| 1375 |
|
- 2nd set of modifs for thsice adjoint in conjunction with exf |
| 1376 |
|
o enable runtime flag useEXF (useCAL is set to .T. if useEXF=.T.) |
| 1377 |
|
|
| 1378 |
|
checkpoint58y_post |
| 1379 |
|
o Added capability for latitudinal dependence of Bryan and Lewis, 1979 |
| 1380 |
|
vertical diffusivity, similar to that in MOM4; turned on using |
| 1381 |
|
#define ALLOW_BL79_LAT_VARY in CPP_OPTIONS.h and specified using |
| 1382 |
|
diffKrBL79*, diffKrBLEQ*, and BL79LatVary in runtime data file. |
| 1383 |
|
o Added capability for 3D specification of background vertical diffusion |
| 1384 |
|
coefficient. This is done by (i) #define ALLOW_3D_DIFFKR |
| 1385 |
|
in CPP_OPTIONS.h and (ii) specifying file diffKrFile in runtime |
| 1386 |
|
"data" file that contains the 3D vertical diffusivity coefficients. |
| 1387 |
|
o ice dynamics (pkg/seaice) with thsice thermodynamics: |
| 1388 |
|
- add code within pkg thsice to advect & diffuse sea-ice fields |
| 1389 |
|
similar to (and will replace) what has been added in seaice_advdiff.F, |
| 1390 |
|
but: - conserving Mass, Heat & Salt. |
| 1391 |
|
- better when using non-linear advection scheme (not yet fully tested) |
| 1392 |
|
- can also be used in atmospheric set-up (for now, only the diffusion). |
| 1393 |
|
|
| 1394 |
|
checkpoint58x_post |
| 1395 |
|
o IO option for global-file compact format: |
| 1396 |
|
- add options when generating topology (utils/exch2/matlab-topology-generator) |
| 1397 |
|
- add I/O capability (pkg/mdsio). |
| 1398 |
|
- adapt utils/matlab/rdmds.m to read this format. |
| 1399 |
|
for now long-line format not yet supported by pkg/mdsio (& exch2). |
| 1400 |
|
o shelfice: add a few diagnostics |
| 1401 |
|
|
| 1402 |
|
checkpoint58w_post |
| 1403 |
|
o p-coord. non-hydrostatic using reference profile for w <-> omega conversion: |
| 1404 |
|
rVel2wUnit & wUnit2rVel are computed from reference profile Tref,Sref |
| 1405 |
|
(and replace horiVertRatio in NH code). |
| 1406 |
|
Update output of exp.: tutorial_global_oce_in_p (useNHMTerms !) |
| 1407 |
|
and tutorial_plume_on_slope (sensitive to truncation) |
| 1408 |
|
o seaice: if ALLOW_ATM_WIND is undefined use wind stress |
| 1409 |
|
directly to drive seaice model (C-grid only) |
| 1410 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND): |
| 1411 |
|
- reintroduce computation of wind from stress, |
| 1412 |
|
- compute tau (in exf_bulkformulae.F) from windstress averaged to |
| 1413 |
|
mass points to avoid tau = 0 |
| 1414 |
|
- fix serious bug: (1/3) in Fortran is not the same as (1./3.) |
| 1415 |
|
o rdmnc.m: make it work with "global" files created with gluemnc |
| 1416 |
|
o rdmnc.m : some improvements in dealing with singleton dimension |
| 1417 |
|
(tested on all testreport mnc output files). |
| 1418 |
|
o genmake2: disable pkg/profiles if netcdf test fails. |
| 1419 |
|
o cpl_aim+ocn exp.: use consistent rhoConstFresh in Atm & Ocn; update output. |
| 1420 |
|
o move call to cal_readparms up to make calendar parameters/variable available |
| 1421 |
|
to all packages |
| 1422 |
|
|
| 1423 |
|
checkpoint58v_post |
| 1424 |
|
o change EOS (from POLY3 to JMD95P) in global_ocean.90x45x15 to get |
| 1425 |
|
useDynP_inEos_Zc tested. |
| 1426 |
|
o pkg/exf: changes to properly interpolate/mask/scale initial fields |
| 1427 |
|
o utils/matlab/cs_grid/read_cs: routines to speed up reading of CS510 fields |
| 1428 |
|
and portions thereof. See read_cs.txt for description and examples. |
| 1429 |
|
o utils/matlab/cs_grid/bk_line: to compute transport through passages, |
| 1430 |
|
add a script (grt_circ_bkl.m) to generate broken-line between 2 points, |
| 1431 |
|
following the great-circle arc between those 2 points. |
| 1432 |
|
o trap un-initialized variable with pathscale compiler on weddell.mit.edu |
| 1433 |
|
(thanks to Constantinos): fix few problems and get (almost) all exp to pass. |
| 1434 |
|
o 2nd-Order Moment Advection Scheme (Prather, 1986): first check-in |
| 1435 |
|
- enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h) |
| 1436 |
|
- used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81) |
| 1437 |
|
- still needs work (not working with some options ; efficiency to improve) |
| 1438 |
|
and serious testing. |
| 1439 |
|
- use this scheme for temperature & salinity in 2 advection test exp.: |
| 1440 |
|
advect_xy & advect_xz, respectively. |
| 1441 |
|
|
| 1442 |
|
checkpoint58u_post |
| 1443 |
|
o new test-exp: fizhi-cs-32x32x40 (40 levels) to replace the 10 levels. |
| 1444 |
|
o move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA. |
| 1445 |
|
o testreport: add option "-skipdir" to skip some test. |
| 1446 |
|
o exf: when input wind-stress (#undef ALLOW_ATM_WIND), by-pass turbulent |
| 1447 |
|
momentum calculation. |
| 1448 |
|
o gad_advection: fix vertAdvecScheme (if different from advectionScheme) |
| 1449 |
|
o some cleaning: usePickupBeforeC35 no longer supported ; remove this option. |
| 1450 |
|
remove checkpoint.F and the_correction_step.F (no longer used); |
| 1451 |
|
do the k loop inside CYCLE_TRACER (supposed to be more efficient). |
| 1452 |
|
o add option (linFSConserveTr) to correct for tracer source/sink due to |
| 1453 |
|
Linear Free surface |
| 1454 |
|
o pkg/seaice: fix a bug in the flooding algorithm: turn off the snow machine |
| 1455 |
|
o pkg/thsice: fix reading mnc-pickups |
| 1456 |
|
|
| 1457 |
|
checkpoint58t_post |
| 1458 |
|
o pkg/diagnostics: fix multi-threaded output (when singleCpuIO=F) |
| 1459 |
|
o pkg/mdsio: |
| 1460 |
|
- clean-up mdsio_readfield.F & mdsio_writefield_new.F and |
| 1461 |
|
move to new files: mdsio_read_field.F (S/R MDS_READ_FIELD) & |
| 1462 |
|
mdsio_write_field.F (S/R MDS_WRITE_FIELD); |
| 1463 |
|
- fix multi-threaded singleCpuIO option in MDS_WRITE_FIELD |
| 1464 |
|
- collect old S/R in one file: mdsio_rw_field.F (now just a call to |
| 1465 |
|
either MDS_READ_FIELD or MDS_WRITE_FIELD ) |
| 1466 |
|
- new S/R (to replace MDSWRITEMETA), which allows to write more |
| 1467 |
|
informations (variable names, time ...) to meta files. |
| 1468 |
|
- modify rdmds.m to give back the meta file content. |
| 1469 |
|
o pkg/diagnostics: change vertical interpolation to be safer, and more |
| 1470 |
|
flexible (define p-levels to interpolate to in data.diagnostics); |
| 1471 |
|
add argument to S/R DIAGNOSTICS_GET_POINTERS to catch the right |
| 1472 |
|
diagnostic pointer. |
| 1473 |
|
o pkg/seaice: more cleaning up of seaice_growth, added many comments |
| 1474 |
|
o pkg/exf: put runoff0 and runoff1 into the appropriate common block |
| 1475 |
|
o fix multi-category seaice: |
| 1476 |
|
- change cpp flag SEAICE_MULTILEVEL to more meaningful name: |
| 1477 |
|
SEAICE_MULTICATEGORY |
| 1478 |
|
- fix short wave heat flux |
| 1479 |
|
o pkg/seaice: change default (SEAICE_OPTIONS.h): use C-grid dynamics |
| 1480 |
|
and allow to use EVP solver. Change forward lab_sea: test both EVP |
| 1481 |
|
solver and LSR solver, and use C-grid dynamics (like lab_sea adjoint) |
| 1482 |
|
o Initial check-in of lab_sea adjoint |
| 1483 |
|
(very similar to natl_box_adjoint/code_seaice) |
| 1484 |
|
* used C-grid and EVP solver |
| 1485 |
|
* used KPP, GM/Redi |
| 1486 |
|
* uses inAdExact=.TRUE. |
| 1487 |
|
* gradient checks fail for both ADM and TLM |
| 1488 |
|
due to sensitive snow melt code in seaice_grwoth (look for "JZ") |
| 1489 |
|
f.d. gradients actually seem more problematic than ADM, TLM gradients; |
| 1490 |
|
issue is related to forward mismatch between g77 an ifort |
| 1491 |
|
o pkg/seaice: overhaul of thermodynamics |
| 1492 |
|
- growth.F and groatb.F are replaced by new routine seaice_growth.F |
| 1493 |
|
- budget.F is replaced by two new routines seaice_budget_ocean/ice.F |
| 1494 |
|
- move a few global fields out of SEAICE.h into seaice_growth.F and |
| 1495 |
|
make them 2D (FICE/QNETO/ ...) |
| 1496 |
|
- remove FO (it is the same as QNETO) |
| 1497 |
|
- introduce a few local fields to avoid modifying external fields such |
| 1498 |
|
as atemp, etc. |
| 1499 |
|
|
| 1500 |
|
checkpoint58s_post |
| 1501 |
|
o pkg/exf: moved exf_init_runoff.F to exf_init.F and exf_set_gen.F |
| 1502 |
|
changed exf_set_gen.F so that |
| 1503 |
|
genperiod=0 means input file is one time-constant field and |
| 1504 |
|
genperiod=-12 means input file contains 12 monthly means |
| 1505 |
|
o CG2D: use pre-computed solver main-diagonal (stored in common block); |
| 1506 |
|
this affects truncation error ; generate new output file for exp. which |
| 1507 |
|
fails: exp4(12d), fizhi-cs-aqualev20(12d), front_relax(10d), |
| 1508 |
|
global_ocean.90x40x15(10d), global_ocean.cs32x15(10d).thsice(11d).viscA4(10d), |
| 1509 |
|
ideal_2D_oce(10d), internal_wave(09d), isomip.htd(11d), matrix_example(07d), |
| 1510 |
|
MLAdjust(4x11d,12d), natl_box(11d), rotating_tank(12d), |
| 1511 |
|
tutorial_global_oce_in_p(10d), tutorial_plume_on_slope(11d), |
| 1512 |
|
vermix(12d).ggl90(12d).my82(11d).opps(12d).pp81(11d) |
| 1513 |
|
o start implementation of deep-atmosphere and anelastic formulation |
| 1514 |
|
o verification: remove 2nd copy of input files and use script "prepare_run" |
| 1515 |
|
to make a symbolic link to the 1rst copy (reduce downloaded size by ~81.M) |
| 1516 |
|
o mom_common/vecinv/fluxform: fix a few initialisation isssues |
| 1517 |
|
o profiles: fix for multithreaded case |
| 1518 |
|
|
| 1519 |
|
o diagnostics: rename few diags: |
| 1520 |
|
s/'PRESSURE'/'RCENTER '/g |
| 1521 |
|
s/'TICE '/'oceFreez'/g |
| 1522 |
|
s/'TAUX '/'oceTAUX '/g |
| 1523 |
|
s/'TAUY '/'oceTAUY '/g |
| 1524 |
|
s/'SWFLUX '/'oceQsw '/g |
| 1525 |
|
s/DIFx/DFxE/g |
| 1526 |
|
s/DIFy/DFyE/g |
| 1527 |
|
and add few ocean-forcing diagnostics: |
| 1528 |
|
atmPload, sIceLoad, oceQnet, oceFWflx, oceSflux, surForcT & surForcS |
| 1529 |
|
o modifications to pkg/seaice/growth.F and budget.F, which change results of |
| 1530 |
|
lab_sea experiment: HSNOW was sometimes treated as effective and sometimes |
| 1531 |
|
as actual snow thickness. It now refers everywhere to effective snow |
| 1532 |
|
thickness, meaning that for non-zero AREA, actual thickness is HEFF/AREA. |
| 1533 |
|
|
| 1534 |
|
checkpoint58r_post |
| 1535 |
|
o modifications to pkg/seaice/growth.F, which change results of |
| 1536 |
|
lab_sea experiment: fixes pertain to melting snow over open water, to |
| 1537 |
|
masking EVAP under sea ice, and to using the correct AREA variable for |
| 1538 |
|
computations of EVAP, PRECIP, HSNOW, and GHEFF |
| 1539 |
|
o add ability to read bathy, salt, and theta using MNC (off by def) |
| 1540 |
|
o add flooding algorithm and advection of HSNOW for pkg/seaice; |
| 1541 |
|
both are turned off by default and do no change any results |
| 1542 |
|
o seaice advection with pkg/thsice: a step toward the use of non-linear |
| 1543 |
|
advection scheme, but #ifdef or commented out for now (requires more EXCH). |
| 1544 |
|
o use standard version of PTRACERS_INI_VARIA in tutorial_tracer_adjsens |
| 1545 |
|
(identical results) and the standard version of EXTERNAL_FIELDS_LOAD |
| 1546 |
|
in natl_box (affects results @ truncation level: update output.txt) |
| 1547 |
|
o multi-threading and IO: |
| 1548 |
|
- replace some call to MDSIO S/R by the corresponding READ/WRITE_FLD S/R. |
| 1549 |
|
- remove most of BEGIN_MASTER/ END_MASTER around READ/WRITE_FLD S/R calls |
| 1550 |
|
(needed to work with SingleCpuIO): tested in all verif. exp. |
| 1551 |
|
o GAD: use simpler DST3 formulation as default (old version left within #ifdef) |
| 1552 |
|
affects the results (but none of the verification test uses this scheme). |
| 1553 |
|
o Adding some pkg/diagnostics capability to pkg/seaice |
| 1554 |
|
(will certainly be subject to changes) |
| 1555 |
|
o ctrl: adding new control variables: |
| 1556 |
|
lwflux, lwdown, evap, snowprecip, apressure, runoff |
| 1557 |
|
|
| 1558 |
|
checkpoint58q_post |
| 1559 |
|
o added CPP_EEOPTIONS.h flag DISABLE_MPI_READY_TO_RECEIVE. Speeds up |
| 1560 |
|
1/6-deg Southern Ocean configuration by 8% on IBM Datastar and |
| 1561 |
|
high_res_cube configuration by 4% on Columbia. |
| 1562 |
o clean-up multi-threaded problems (reported by debugger tcheck on ACES); |
o clean-up multi-threaded problems (reported by debugger tcheck on ACES); |
| 1563 |
add (in global_with_exf/code) a version of EXF_INTERP_READ without |
add (in global_with_exf/code) a version of EXF_INTERP_READ without |
| 1564 |
dynamical allocation (seems to work in multi-threaded). |
dynamical allocation (seems to work in multi-threaded). |
| 2809 |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
| 2810 |
- these scheme operate in a similar manner as KPP (without ghat, of |
- these scheme operate in a similar manner as KPP (without ghat, of |
| 2811 |
course), however there is only one diffusivity that is used for both |
course), however there is only one diffusivity that is used for both |
| 2812 |
temperature and salinity (and passive tracers)ç |
temperature and salinity (and passive tracers) |
| 2813 |
o add offline package |
o add offline package |
| 2814 |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
| 2815 |
provided by Stephanie Dutkiewicz |
provided by Stephanie Dutkiewicz |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch