| 2 |
|
|
| 3 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 4 |
============================== |
============================== |
| 5 |
|
|
| 6 |
|
|
| 7 |
|
checkpoint53e_pre |
| 8 |
|
|
| 9 |
|
checkpoint53d_post |
| 10 |
|
o faulks upgraded: re-generate output.txt that have changed: |
| 11 |
|
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
| 12 |
|
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
| 13 |
|
o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing. |
| 14 |
|
o added Sadourny discretization of Coriolis |
| 15 |
|
- moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h |
| 16 |
|
- re-enabled use of omega3 (useAbsVorticity) |
| 17 |
|
o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for |
| 18 |
|
vector-invariant equations |
| 19 |
|
- note: does *NOT* yet use same variable visc. for no-slip BC's. |
| 20 |
|
o recoded the lateral boundary conditions for non-hydrostatic w, this time |
| 21 |
|
hopefully without new bugs |
| 22 |
|
- still to do: biharmonic friction for non-hydrostatic w |
| 23 |
|
o bug fix for mom_*_sidedrag: rA -> rAs,rAw |
| 24 |
|
o regenerated output for global_ocean_ebm (using -ieee) |
| 25 |
|
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
| 26 |
|
of mom_common/ |
| 27 |
|
- simple re-arrangement of instructions within computing loop |
| 28 |
|
checkpoint53d_pre |
| 29 |
|
|
| 30 |
|
checkpoint53c_post |
| 31 |
|
o new version of coupler for AIM+thSIce and Ocean models |
| 32 |
|
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
| 33 |
|
- land: change Evaporation of snow |
| 34 |
|
- aim with thSIce: fix bug in snow-precip. |
| 35 |
|
o changes to calc_gw.F |
| 36 |
|
- bug fix for w^2 term near the bottom boundary |
| 37 |
|
- (hopefully) improve the lateral slip boundary condtions for use with |
| 38 |
|
partial/looped cells |
| 39 |
|
- because the bug fix changes two verification experiments anyway (exp5 |
| 40 |
|
and plume on slope), change the lateral boundary condition from half slip |
| 41 |
|
to the value of no_slip_sides |
| 42 |
|
o ebm package wasnt quite up to the parallel task. Fixed that. |
| 43 |
|
o Adjoint of EBM package + verification |
| 44 |
|
* TLM OK |
| 45 |
|
* ADM not sufficient accuracy yet (needs further testing) |
| 46 |
|
|
| 47 |
|
checkpoint53b_post |
| 48 |
|
o Commiting new energy balance model to repository |
| 49 |
|
* package is pkg/ebm |
| 50 |
|
* verif. is verification/global_ocean_ebm |
| 51 |
|
* references are in ebm_driver.F |
| 52 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 53 |
|
C Global thermohaline circulation. Part I: |
| 54 |
|
C Sensitivity to atmospheric moisture transport. |
| 55 |
|
C J. Climate 12(1), 71-82 |
| 56 |
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
| 57 |
|
C Global thermohaline circulation. Part II: |
| 58 |
|
C Sensitivity with interactive transport. |
| 59 |
|
C J. Climate 12(1), 83-91 |
| 60 |
|
C * M. Nakamura, P. Stone and J. Marotzke, 1994: |
| 61 |
|
C Destabilization of the thermohaline circulation |
| 62 |
|
C by atmospheric eddy transports. |
| 63 |
|
C J. Climate 7(12), 1870-1882 |
| 64 |
|
o Will need long integration testing. |
| 65 |
|
checkpoint53b_pre |
| 66 |
|
|
| 67 |
|
o created pkg/mom_common in preparation for variable viscosity code |
| 68 |
|
o renamed and split ini_mnc_io |
| 69 |
|
o pkg/land: only liquid water can diffuse or run-off |
| 70 |
|
o AIM using land: soil wetness availability account for snow |
| 71 |
|
o added printMapIncludesZeros to EEPARMS namelist |
| 72 |
|
|
| 73 |
|
checkpoint53a_post |
| 74 |
|
o restore TAMC compatiility for exf_constants.h |
| 75 |
|
(no usage of _d in .h) |
| 76 |
|
o Additional storing in KPP in an attempt to fix |
| 77 |
|
TAMC problem with adjoint of KPP code. |
| 78 |
|
(no success...) |
| 79 |
|
Identical code works fine with TAF. |
| 80 |
|
o Fixed verification/natl_box_adjoint experiments. |
| 81 |
|
Initial conditions for Experiments 4 and 5 are now |
| 82 |
|
set to "SEAICE_initialHEFF=0", which is more reasonable, |
| 83 |
|
and hence gives results closer to that of Experiment 2. |
| 84 |
|
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
| 85 |
|
|
| 86 |
|
checkpoint53 |
| 87 |
|
o stable checkpoint with up to date adjoint |
| 88 |
|
TLM tests only run for 1st grdchk at the moment. Its unclear if |
| 89 |
|
this is a code problem or a problem with resetting code for g_ |
| 90 |
|
variables that is being autogenerated wrong. |
| 91 |
|
Otherwise: |
| 92 |
|
o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix. |
| 93 |
|
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
| 94 |
|
are both still in chaos following their security messes. |
| 95 |
|
|
| 96 |
|
checkpoint52n_post |
| 97 |
|
o various build (mostly genmake2) changes including: |
| 98 |
|
- ability to build/run more easily within Cygwin and MacOS X |
| 99 |
|
- more complicated Makefiles with a stronger dependence on Gnu Make |
| 100 |
|
o pkg/seaice modifications |
| 101 |
|
- added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost |
| 102 |
|
of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer |
| 103 |
|
and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm |
| 104 |
|
- changed proxy for geostrophic velocity and updated |
| 105 |
|
verification/lab_sea/results/* accordingly |
| 106 |
|
- removed ADI dynamic solver from pkg/seaice |
| 107 |
|
- replaced all occurrences of 1/CSTICE or 1/CSUICE |
| 108 |
|
they caused a segmentation fault under certain circumstances |
| 109 |
|
- removed unused field WATR |
| 110 |
|
o bug fix in exf-package: |
| 111 |
|
- u/vwind are defined at tracer/pressure points. The values of u/vwindmask |
| 112 |
|
now reflect that. |
| 113 |
|
o small fixes in the cal-package: |
| 114 |
|
- set reference date to first of January for the 'model'-calendar |
| 115 |
|
- failing of cal_CheckDate in cal_FullDate now actually results in a |
| 116 |
|
warning |
| 117 |
|
o small modifications in exf-package to increase flexibility: |
| 118 |
|
- change climtempfreeze from a constant to a runtime parameter that |
| 119 |
|
is specified in data.exf_clim (default = -1.9) |
| 120 |
|
- introduce runtime parameter windstressmax (default = 2.0) that is |
| 121 |
|
specified in data.exf |
| 122 |
|
o fix in pkg/thsice: |
| 123 |
|
- update Evap (Tsf changes) to be consistent with Latent heat flux |
| 124 |
|
- maintain snow precipitation unchanged (even if Tsf >=0). |
| 125 |
|
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
| 126 |
|
|
| 127 |
|
checkpoint52m_post |
| 128 |
|
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
| 129 |
|
this does not change any of the results, because myIter=0 in swfrac always |
| 130 |
|
lead to jwtype=2 (the default anyway), but the call makes little sense |
| 131 |
|
as a default |
| 132 |
|
o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated |
| 133 |
|
o re-work pkg/thsice interface with ocean & bulk_force pkg to allow |
| 134 |
|
atmospheric model (AIM) to use it ; add a "slab ocean" component. |
| 135 |
|
o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice) |
| 136 |
|
o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice |
| 137 |
|
o extending useSingleCpuIO option to work with new exch2 I/O format |
| 138 |
|
- old-style, missing-tile I/O is still accessible by defining CPP |
| 139 |
|
option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h |
| 140 |
|
o monitor package can write to NetCDF files and/or STDOUT |
| 141 |
|
o fix re-definition bug in MNC_GRID_INIT_ALL() |
| 142 |
|
o doc/api_reference added |
| 143 |
|
- a framework for building an API Reference Manual using all |
| 144 |
|
the "protex" comments embedded in the code |
| 145 |
|
- see pkg/generic_advdiff, pkg/mnc for examples |
| 146 |
|
o MNC: |
| 147 |
|
- make myThid the last argument for all subroutines |
| 148 |
|
- new default for the grid files: NO halos |
| 149 |
|
- add useMNC and other run-time flags |
| 150 |
|
- separate per-file-group handling of the unlimited dimension |
| 151 |
|
- early initialization of MNC w/ flags read at the eeboot stage |
| 152 |
|
and lookup tables set in initialize_fixed |
| 153 |
|
- write all MNC output to a freshly-created directory |
| 154 |
|
o thermodynamics sea-ice (thsice) is now tested with testreport. |
| 155 |
|
o test exp. advect_cs: use the standard cs32 grid ; update output. |
| 156 |
|
o Added functionality to grdchk: |
| 157 |
|
pick global i,j,k position (or nearest wet) where to perform check. |
| 158 |
|
|
| 159 |
|
checkpoint52l_post |
| 160 |
|
o new land formulation: |
| 161 |
|
a) use ground enthalpy as prognostic variable to ensure exact |
| 162 |
|
energy conservation. |
| 163 |
|
b) account for water temperature and for latent heat of freezing |
| 164 |
|
in all processes (rain, run-off, ground storage) |
| 165 |
|
c) compute surface and ground temperature implicitly. |
| 166 |
|
o aim_v23 modification for new land model: |
| 167 |
|
a) Treat separately land / ocean / sea-ice surface fluxes |
| 168 |
|
to allow implicit computation of land & sea-ice surface temp. |
| 169 |
|
b) add snow precipitation. |
| 170 |
|
checkpoint52l_pre |
| 171 |
|
|
| 172 |
|
o fix problem (when 1 tile is empty) in min/max monitor. |
| 173 |
|
o fix bug in timeAve (u,vZetatave in common block) |
| 174 |
|
o no restoring terms under ice for pkg/seaice |
| 175 |
|
o moved SEAICE_DO_DIAGS to S/R do_the_model_io |
| 176 |
|
o bug fix for pkg/seaice pickups |
| 177 |
|
o change MNC call locations and add coordinate attributes |
| 178 |
|
o mask vorticity at the corner ; affects global_ocean.cs output |
| 179 |
|
o fix ini_curvilinear_grid ; test CS experiments with mpi |
| 180 |
|
o aim.5l_cs: modify sea-ice fraction input file ; update output |
| 181 |
|
o exf: Adding simple range check routine for exf fields after read |
| 182 |
|
|
| 183 |
|
checkpoint52k_post |
| 184 |
|
o removed top-level directory "diags" |
| 185 |
|
- we migrated these functions to pkg/timeave a long time ago |
| 186 |
|
o fixed bug introduced in pkg/monitor |
| 187 |
|
o accuracy ctrlprec = 32 insuffient for gradient checks using |
| 188 |
|
averaged fields (I/O via cost_averages) |
| 189 |
|
-> use ctrl.h in active_file*.F to control I/O precision. |
| 190 |
|
o paramter list of CALL ADTHE_MAIN_LOOP |
| 191 |
|
o added initial do_the_model_io to ecco |
| 192 |
|
o set all ...Freq to zero after cost_final |
| 193 |
|
taveFreq, dumpFreq, pChkptFreq |
| 194 |
|
o MAIN and ECCO differentiability restored |
| 195 |
|
|
| 196 |
|
checkpoint52j_post |
| 197 |
|
o fix nchklev in tamc.h for global_ocean... |
| 198 |
|
o Bringing flow and store directives up-to-date |
| 199 |
|
o Really weird thing! |
| 200 |
|
call do_the_model_io from the_main_loop with parameters |
| 201 |
|
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
| 202 |
|
TAF places a faulty re-call of initialise_varia |
| 203 |
|
after cost_final call which should not be there! |
| 204 |
|
checkpoint52j_pre |
| 205 |
|
|
| 206 |
|
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
| 207 |
|
error messages |
| 208 |
|
o fix errorMessageUnit problem. remove old version of mdsio from eesup/src |
| 209 |
|
o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating |
| 210 |
|
debug output |
| 211 |
|
o modfied mdsio_writefield.F to handle non-global files under exch2 |
| 212 |
|
o update AIM Cubed-Sphere exp (aim.5l_cs): |
| 213 |
|
use land, p*, and Franco.M forcing fields with fractional land-sea mask. |
| 214 |
|
o update AIM Equatorial Channel exp: |
| 215 |
|
use standard aim_v23 pkg and change the SST fields to be more realistic. |
| 216 |
|
o globalFile now works with exch2 |
| 217 |
|
o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and |
| 218 |
|
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
| 219 |
|
o limit timeave output for hi-res integrations |
| 220 |
|
|
| 221 |
|
checkpoint52i_post |
| 222 |
|
o removed CPP_EEOPTIONS.h from verification/*/code |
| 223 |
|
o updated the tiling for global_ocean_pressure |
| 224 |
|
checkpoint52i_pre |
| 225 |
|
|
| 226 |
|
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
| 227 |
|
the old pkg/aim). |
| 228 |
|
|
| 229 |
|
checkpoint52h_pre |
| 230 |
|
o shortened offending lines in exch2_send_rx?.template |
| 231 |
|
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
| 232 |
|
o genmake2: add build & execute test for NetCDF code |
| 233 |
|
o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed |
| 234 |
|
old grid files, moved CPP_EEMACROS.h to pkg/exch2 |
| 235 |
|
o added useSingleCPUIO flag to monitor.F and mon_out.F |
| 236 |
|
o added temporary hack for sea-ice dynamics on the cube: |
| 237 |
|
metric terms are ignored and it is assumed that |
| 238 |
|
there is no sea-ice on cube faces 1, 2, 4, and 5. |
| 239 |
|
|
| 240 |
|
checkpoint52f_post |
| 241 |
|
o added exch2 cube routines to pkg/exch2 |
| 242 |
|
o modified hs94.cs-32x32x5 to use it |
| 243 |
|
o added new grid files to hs94.cs-32x32x5 |
| 244 |
|
checkpoint52f_pre |
| 245 |
|
|
| 246 |
|
checkpoint52e_post |
| 247 |
|
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
| 248 |
|
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
| 249 |
|
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
| 250 |
|
to work with implicit vertical advection and AB ; |
| 251 |
|
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
| 252 |
|
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
| 253 |
|
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
| 254 |
|
checkpoint52e_pre |
| 255 |
|
|
| 256 |
|
o fix bug in impldiff when Nr=1 or Nr=2. |
| 257 |
|
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
| 258 |
|
o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test. |
| 259 |
|
o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2 |
| 260 |
|
ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure |
| 261 |
|
o added exf_offset_atemp for Celsius to Kelvin conversion of atemp |
| 262 |
|
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
| 263 |
|
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
| 264 |
|
|
| 265 |
|
checkpoint52d_post |
| 266 |
|
o re-tiled many expts to allow comparison in multi-processor mode |
| 267 |
|
- updated output accordingly |
| 268 |
|
- changed hs94.128x64x5 to use intial T from file rather than use the |
| 269 |
|
random number generator |
| 270 |
|
o add infrastructure in model routines for fizhi and gridalt packages |
| 271 |
|
o change global_ocean.cs32x15 because of Pb with GM on CS-grid. |
| 272 |
|
o changes to permit hi-res, cubed-sphere, configuration |
| 273 |
|
- added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F |
| 274 |
|
- added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F |
| 275 |
|
- added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation |
| 276 |
|
of surface winds for the cube |
| 277 |
|
(A verification experiment, based on global_ocean.cs32x15, but with |
| 278 |
|
pkg/seaice turned on and with on-the-fly interpolation from the NCEP |
| 279 |
|
Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice, |
| 280 |
|
complete with example surface forcing files and matlab scripts to look |
| 281 |
|
at the output and compare it with that of global_ocean.cs32x15.) |
| 282 |
|
o packages pickup: $PKG_write_pickup called from packages_write_pickup ; |
| 283 |
|
but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code |
| 284 |
|
to conform to the common rule. |
| 285 |
|
o check-in the first version of the coupler + interfaces for multi-components |
| 286 |
|
set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI. |
| 287 |
|
- imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD). |
| 288 |
|
- atmosphere: use pkg aim_v23 ; no sea-ice for now. |
| 289 |
|
- ocean and atmos. share the same horizontal grid (no interpolation). |
| 290 |
|
- exchanges between component and coupler is done in forward_step |
| 291 |
|
o new verification experiment, cpl_aim+ocn: |
| 292 |
|
coupled ocean - AIM atmosphere on cs32 grid. |
| 293 |
|
|
| 294 |
|
checkpoint52d_pre |
| 295 |
|
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
| 296 |
|
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
| 297 |
|
|
| 298 |
|
checkpoint52c_post |
| 299 |
|
o Fixing OPTIONS files for use of exf: |
| 300 |
|
- ALLOW_ECCO not needed |
| 301 |
|
- ECCO_CPPOPTIONS.h should not be included from |
| 302 |
|
EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h |
| 303 |
|
as has been the case in the past |
| 304 |
|
- All cal/exf related options are currently set in |
| 305 |
|
single header file. Should remain so until we |
| 306 |
|
agree on a consistent new policy. |
| 307 |
|
o Removed all CPP options for cal package. |
| 308 |
|
cal has no more CPP options. |
| 309 |
|
o modified STOREs in GAD_ADVECTION |
| 310 |
|
o corrected key comp. for passkey |
| 311 |
|
|
| 312 |
|
checkpoint52b_post |
| 313 |
|
o new version: "thsice" of thermodynamic sea-ice pkg: |
| 314 |
|
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
| 315 |
|
- modify fluxes but do not change theta directly; |
| 316 |
|
- light cleaning of bulk_force pkg (still needed with thsice). |
| 317 |
|
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
| 318 |
|
+ output_thsice.txt to test thsice & bulk_force pkgs. |
| 319 |
|
o put back grid & coriolis monitor output. |
| 320 |
|
checkpoint52b_pre |
| 321 |
|
|
| 322 |
|
o call "do_the_model_io" at the beginning (=> dump initial state) |
| 323 |
|
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
| 324 |
|
o sort out interplay between tamc.h and PTRACERS_OPTIONS.h |
| 325 |
|
(need info on NUMBER_OF_PTRACERS) |
| 326 |
|
o missing PTRACERS headers in some routines |
| 327 |
|
o default tamc.h in pkg/autodiff supposed to crash |
| 328 |
|
to ensure proper customization |
| 329 |
|
|
| 330 |
|
checkpoint52a_post |
| 331 |
|
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
| 332 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 333 |
|
- subroutine FREEZE_SURFACE now limits only surface temperature |
| 334 |
|
and is called in FORWARD_STEP (if allowFreezing=.TRUE.) |
| 335 |
|
=> new output.txt for global_ocean.cs32x15 & global_with_exf |
| 336 |
|
- keep the old version of FREEZE for backward compatibility; |
| 337 |
|
global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE. |
| 338 |
|
- corresponding modifs for TAF directives |
| 339 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 340 |
|
o time-averaged output for pkg/ptracers |
| 341 |
|
o fix problem with ECCO-related divided adjoint |
| 342 |
|
snapshot file was missing some ad-variables, |
| 343 |
|
but no warning issued by TAF |
| 344 |
|
|
| 345 |
|
checkpoint52a_pre |
| 346 |
|
o some bug fixes for #undef REAL4_IS_SLOW |
| 347 |
|
|
| 348 |
|
checkpoint52 = ecco_c52_e35 |
| 349 |
|
o after testing adjoints of checkpoint51u_post |
| 350 |
|
|
| 351 |
|
checkpoint51u_post |
| 352 |
|
o this is the post-merge tag of the ecco-branch |
| 353 |
|
(needs another clean checkout and re-testing) |
| 354 |
|
o various natl_box_adjoint configs and results |
| 355 |
|
but no input fields |
| 356 |
|
o obcs adjoint not yet merged! |
| 357 |
|
o adding ECCO global 1x1 and 2x2 degree configs |
| 358 |
|
o updated/extended some store directives for seaice |
| 359 |
|
o pkg/ecco now containes ecco-specific part of cost function |
| 360 |
|
o top level routines the_main_loop, forward_step |
| 361 |
|
supersede those in model/src/ |
| 362 |
|
previous input data.cost now in data.ecco |
| 363 |
|
(new namelist ecco_cost_nml) |
| 364 |
|
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
| 365 |
|
|
| 366 |
|
checkpoint51t_post |
| 367 |
|
o this is the pre-merge tag of the ecco-branch |
| 368 |
|
|
| 369 |
|
checkpoint51s_post |
| 370 |
|
o cleanup: removed various obsolete #define-s |
| 371 |
|
o pkg/grdchk |
| 372 |
|
- renamed 'ph-grd 3' to 'grad-res' |
| 373 |
|
- merged from ecco-branch |
| 374 |
|
(remaining bug fixes for obcs gradient checks) |
| 375 |
|
- additional high-precision output for testreport |
| 376 |
|
(grep for 'precision_grdchk_result') |
| 377 |
|
|
| 378 |
|
checkpoint51r_post |
| 379 |
|
o cleaned up or removed CPP_OPTIONS.h files |
| 380 |
|
o updated results for some of the tests to reflect the new |
| 381 |
|
optfiles (-ieee: -O0 instead of -O3) |
| 382 |
|
|
| 383 |
|
checkpoint51q_post |
| 384 |
|
o cd_code: |
| 385 |
|
- moved cd_scheme.F -> cd_code_scheme.F |
| 386 |
|
- separate read_checkpoint from cd_code_ini_vars.F |
| 387 |
|
- separated cd_code part from write_checkpoint |
| 388 |
|
- updated AD_SOURCE, generated .flow |
| 389 |
|
- added CD_CODE_VARS.h to the_main_loop |
| 390 |
|
- Moving cd_code specific store dir.s to pkg/cd_code |
| 391 |
|
o ctrl package totally restructured |
| 392 |
|
- pack/unpack now optional and decoupled from |
| 393 |
|
xx_/adxx_ I/O |
| 394 |
|
- ctrl_pack/unpack cleaned |
| 395 |
|
(new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F) |
| 396 |
|
- confined inclusion of AD_CONFIG.h to where necessary. |
| 397 |
|
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
| 398 |
|
|
| 399 |
|
checkpoint51p_post |
| 400 |
|
o create initial cd_code package |
| 401 |
|
- WARNING: the initialization of fields within packages |
| 402 |
|
is broken because INI_FIELDS (where READ_CHECKPOINT is |
| 403 |
|
called) is called *before* PACKAGES_INIT_VARIABLES. |
| 404 |
|
This seems to be backwards since |
| 405 |
|
1) its important to initially zero the entire field including |
| 406 |
|
the "halo" region |
| 407 |
|
2) zeroing needs to be done *before* reading pickup info |
| 408 |
|
and the pickup call might or might not happen in any |
| 409 |
|
particular run |
| 410 |
|
- this needs an overhaul for R2 |
| 411 |
|
o cleanup verification/*/code/GMREDI_OPTIONS.h |
| 412 |
|
o cleanup testreport |
| 413 |
|
|
| 414 |
|
checkpoint51o_post |
| 415 |
|
o bringing AD-related verif's up to date with genmake2 |
| 416 |
|
- carbon/ |
| 417 |
|
- global_ocean.90x40x15/ |
| 418 |
|
- hs.94.1x64x5/ |
| 419 |
|
- (front_relax/ ) |
| 420 |
|
o (more) consistent directory structure for AD-related verif.'s |
| 421 |
|
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK |
| 422 |
|
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF |
| 423 |
|
o bug fix in find_alpha.F for MDJWF: |
| 424 |
|
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for |
| 425 |
|
change rho -> rho-rhoConst |
| 426 |
|
- replace call find_rho to find_rhonum |
| 427 |
|
o initialisation of rFlx extended to full array (required by TAF) |
| 428 |
|
and shifted to thermodynamics |
| 429 |
|
o removed PTRACERS.h in ptracers routine |
| 430 |
|
o added surfacetendencyPtr to S/R parameter list pracers_forcing |
| 431 |
|
o Correcting initialisations for fVerU, fVerV. |
| 432 |
|
o helping TAF to recognize dependency on kUp for |
| 433 |
|
fVerU, fVerV |
| 434 |
|
o Replacing delZ by delR in pkg/ctrl/ |
| 435 |
|
checkpoint51o_pre |
| 436 |
|
|
| 437 |
|
o undid all of cp51 pending some cleanups and discussion |
| 438 |
|
o added the [#include "AD_CONFIG.h"] statement to all files that need |
| 439 |
|
it for adjoint/tl #defines |
| 440 |
|
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
| 441 |
|
o removed tools/genmake since it no longer works |
| 442 |
|
|
| 443 |
|
checkpoint51n_post |
| 444 |
|
o modifications to make FREEZE flux visible to pkg/kpp |
| 445 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
| 446 |
|
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
| 447 |
|
- subroutine FREEZE now limits only surface temperature |
| 448 |
|
(this means new output.txt for global_ocean.90x40x15, |
| 449 |
|
global_ocean.cs32x15, and global_with_exf) |
| 450 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
| 451 |
|
|
| 452 |
|
checkpoint51n_pre |
| 453 |
|
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
| 454 |
|
o added [#include "AD_CONFIG.h"] to all files that use the following |
| 455 |
|
defines: |
| 456 |
|
- ALLOW_ADJOINT_RUN |
| 457 |
|
- ALLOW_TANGENTLINEAR_RUN |
| 458 |
|
- ALLOW_ECCO_OPTIMIZATION |
| 459 |
|
|
| 460 |
|
checkpoint51m_post |
| 461 |
|
o incorporating changes to get TAMC/TAF working in genmake2 |
| 462 |
|
- added new TAMC/TAF targets to the Makefile |
| 463 |
|
- various cleanups related to package handling |
| 464 |
|
- these changes should have no impact on the forward model |
| 465 |
|
|
| 466 |
|
checkpoint51l_post |
| 467 |
|
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
| 468 |
|
- faster algorithm for cal_addtime.F |
| 469 |
|
- higher precision arithmetic, where needed |
| 470 |
|
- pkg/exf *startdate variables changed from calendar date to |
| 471 |
|
model integration time |
| 472 |
|
|
| 473 |
|
checkpoint51l_pre |
| 474 |
|
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
| 475 |
|
o enable to apply restoring on S & T only in a latitude band. |
| 476 |
|
o update output (external_forcing_surf modif. change truncation errors) |
| 477 |
|
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
| 478 |
|
|
| 479 |
|
checkpoint51k_post |
| 480 |
|
o change default to: useNHMTerms=.FALSE. |
| 481 |
|
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
| 482 |
|
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
| 483 |
|
- new output.txt for idealized oceanic exp (NHMTerms are now turned off): |
| 484 |
|
exp1, ideal_2D_oce |
| 485 |
|
- change data file of oceanic exp (leave the results unchanged for now) |
| 486 |
|
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box |
| 487 |
|
o set gravitySign automatically according to the vertical coordinate used |
| 488 |
|
(and change sign: back to "logical" value: +1 when R increases downward) |
| 489 |
|
o added an include barrier to the default CPP_OPTIONS.h and |
| 490 |
|
removed the #include "PACKAGES_CONFIG.h" from it |
| 491 |
|
o fix a bug in mom_fluxform (from chk51j_post) |
| 492 |
|
|
| 493 |
|
checkpoint51j_post |
| 494 |
|
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
| 495 |
|
o adjusted some flow directives (dynamics, thermodynamics) |
| 496 |
|
o added cubed-sphere case to test cost function |
| 497 |
|
o heckpoint_lev?_directives.h now include |
| 498 |
|
pkg-specific directives, whenever those are enabled. |
| 499 |
|
o Moving pkg-specific flow directives to corresponding pkg |
| 500 |
|
Moving pkg-specific differentiation list to corresponding pkg |
| 501 |
|
Moving pkg-specific checkpoint-lev storing to corresponding pkg |
| 502 |
|
---> conventions are |
| 503 |
|
- pkg_ad.flow |
| 504 |
|
- pkg_ad_diff.list |
| 505 |
|
- pkg_ad_check_lev?_dir.h |
| 506 |
|
|
| 507 |
|
checkpoint51i_post |
| 508 |
|
o merge of the branch-genmake2 |
| 509 |
|
- knowingly breaks the older genmake |
| 510 |
|
- automatic generation of all ALLOW_${PKG_NAME} defines |
| 511 |
|
- new testreport supersedes older testscript |
| 512 |
|
o large number of package inclusion and header cleanups |
| 513 |
|
checkpoint51i_pre |
| 514 |
|
|
| 515 |
|
o new output for adjoin of global ocean vector invariant |
| 516 |
|
o fix for checkpoint of thermodynamic seaice and bulk_force |
| 517 |
|
o Steph gchem various cleanups |
| 518 |
|
|
| 519 |
|
checkpoint 51h_pre |
| 520 |
|
o fixed some single quotes |
| 521 |
|
o modify gchem pkg to be more versatile |
| 522 |
|
o modifications to clean up dic pkg |
| 523 |
|
o add pkg/cfc |
| 524 |
|
|
| 525 |
|
checkpoint51g_post |
| 526 |
|
o provide links for ARPACK and ADM*TLM |
| 527 |
|
o start removing verification/vero/ |
| 528 |
|
o update AD-related stuff |
| 529 |
|
(in particular some IF-statements in model/src/ routines) |
| 530 |
|
o adding to verification/global_ocean.90x40x15/ adjoint of |
| 531 |
|
vector invariant setup |
| 532 |
|
|
| 533 |
|
checkpoint51f_post |
| 534 |
|
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
| 535 |
|
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
| 536 |
|
of tracer Green's fucntions for ocean inversion project. |
| 537 |
|
|
| 538 |
|
checkpoint51f_pre |
| 539 |
|
o Added on-the-fly spatial interpolation capability |
| 540 |
|
"USE_EXF_INTERPOLATION" to pkg/exf. |
| 541 |
|
- This is a temporary Cartesian-grid hack until |
| 542 |
|
the super-duper ESMF coupler becomes available. |
| 543 |
|
- See verification/global_with_exf/README for usage example. |
| 544 |
|
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid |
| 545 |
|
flags and modified pkg/seaice accordingly. |
| 546 |
|
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F, |
| 547 |
|
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
| 548 |
|
non-local transport term. |
| 549 |
|
|
| 550 |
|
checkpoint51e_post |
| 551 |
|
o pkg/mom_vecinv: |
| 552 |
|
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
| 553 |
|
- add time-ave diagnostic of vorticity advection. |
| 554 |
|
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV. |
| 555 |
|
o atmospheric geopotential: - include water vapor effect; |
| 556 |
|
- use p^kappa in p* scaling. |
| 557 |
|
o land pkg: read initial state from files. |
| 558 |
|
o AIM : add stratospheric drag in the upper level |
| 559 |
|
|
| 560 |
|
checkpoint51d_post |
| 561 |
|
o change function ILNBLNK (=> last non-blank char.) to return zero |
| 562 |
|
(instead of the string length) when the string. char is empty |
| 563 |
|
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
| 564 |
|
o modif's to restore TAMC compatibility |
| 565 |
|
- avoid "_d" constructs in PARAMETER declarations |
| 566 |
|
- avoid interrupting lines by comment lines |
| 567 |
|
o Use cluster local disks for purely local I/O |
| 568 |
|
vs. globally visible disks needed for ctrl stuff |
| 569 |
|
(merged from ecco-branch) |
| 570 |
|
- new active_file_loc... and mdsio_..._loc routines |
| 571 |
|
- affected packages: autodiff, ctrl, grdchk, mdsio |
| 572 |
|
|
| 573 |
|
checkpoint51c_post |
| 574 |
|
o introducing integer flag debugLevel |
| 575 |
|
- debLevZero: suppress all output |
| 576 |
|
- debLevA: standard |
| 577 |
|
- debLevB: equivalent to current debugMode=.TRUE. |
| 578 |
|
o introducing pathname variable mdsioLocalDir for mdsio |
| 579 |
|
that can be specified at runtime |
| 580 |
|
(relevant for cluster I/O to local disk) |
| 581 |
|
` |
| 582 |
|
>>>checkpoint51b_post |
| 583 |
|
adjoint of ptracers |
| 584 |
|
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM |
| 585 |
|
o extended state in checkpoint_lev?, etc. |
| 586 |
|
o alternative ctrl/cost with tr1 or ptracer |
| 587 |
|
o new comlev1_bibj_ptracers |
| 588 |
|
o new ptracers.flow |
| 589 |
|
o made ptracers_forcing same as external_forcing_s |
| 590 |
|
o added verification for adjoint with ptracers |
| 591 |
|
- adm. grdchk fail so far |
| 592 |
|
- tlm. grdchk OK |
| 593 |
|
- checked tapelev/comlev recomputations: OK |
| 594 |
|
<<<checkpoint51b_pre |
| 595 |
|
|
| 596 |
|
checkpoint51a_post |
| 597 |
|
o added code for biogeochemistry package |
| 598 |
|
- new pkgs: dic, gchem |
| 599 |
|
- new subroutine in ptracers |
| 600 |
|
o modify code for biogeo packages |
| 601 |
|
- in model/src and pkg/ptracers |
| 602 |
|
|
| 603 |
|
checkpoint51 |
| 604 |
|
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
| 605 |
|
- autodiff, ctrl, exf, grdchk, seaice |
| 606 |
|
kept separate packages |
| 607 |
|
- cost, ecco, obcs |
| 608 |
|
o updating verification/internal_wave, verification/lab_sea |
| 609 |
|
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
| 610 |
|
|
| 611 |
|
checkpoint50i_post |
| 612 |
|
o Preparing next differentiable checkpoint and sync |
| 613 |
|
of MAIN vs. ecco-branch |
| 614 |
|
- 1st step: this one is differentiable |
| 615 |
|
- 2nd step: next(! not this) checkpoint will have updated packages |
| 616 |
|
from ecco-branch) |
| 617 |
|
|
| 618 |
|
checkpoint50h_post |
| 619 |
|
o new package "land": provide surface BC for AIM. |
| 620 |
|
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
| 621 |
|
o AIM: use true log-P extrapolation for near surface temp (= as in |
| 622 |
|
F.Molteni paper) ; update aim.5l_cs output. |
| 623 |
|
o New variable in PARM03 for more flexible pickups |
| 624 |
|
o somewhat cleaned package initialisation sequence for |
| 625 |
|
ctrl/ cost/ ecco/ in packages_... routines |
| 626 |
|
|
| 627 |
|
checkpoint50g_post |
| 628 |
|
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
| 629 |
|
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
| 630 |
|
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
| 631 |
|
made the default because of faster convergence than ADI |
| 632 |
|
|
| 633 |
|
checkpoint50f_post |
| 634 |
|
o exf totally restructured |
| 635 |
|
- replaced all exf_set_ routines by one generic exf_set_gen.F |
| 636 |
|
and made sure it's still differentiable |
| 637 |
|
- split exf_getffields.F into new exf_bulkformulae.F |
| 638 |
|
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
| 639 |
|
- updated adjoint/makefile and relevant verif. accordingly |
| 640 |
|
|
| 641 |
|
checkpoint50f_pre |
| 642 |
|
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
| 643 |
|
+ change Evap over land. (update aim.5l_cs output) |
| 644 |
|
o added missing .cvsignores and made uniform across expts |
| 645 |
|
o changed configuration of tidal_basin_2d expt |
| 646 |
|
o added pkg/debug functions for tracing code in fatal crashes |
| 647 |
|
o tidied pkg/monitor to use MONITOR_OPTIONS.h |
| 648 |
|
o new fn in pkg/monitor to stop model if solution grows too big |
| 649 |
|
o removed lots of single quotes from comments |
| 650 |
|
|
| 651 |
|
checkpoint50e_post |
| 652 |
|
o make KPP work with PTRACERS |
| 653 |
|
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
| 654 |
|
nearly a copy of kpp_transport_s |
| 655 |
|
- there is no analogue to SurfaceTendencyS, so I have to use |
| 656 |
|
gPtr(of the surface layer) instead |
| 657 |
|
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
| 658 |
|
checkpoint50e_pre |
| 659 |
|
|
| 660 |
|
checkpoint50d_post |
| 661 |
|
o change kpp output from multiple-record state files to single-record state |
| 662 |
|
files analogous to write_state.F |
| 663 |
|
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
| 664 |
|
analogous to the cg2d-related output. |
| 665 |
|
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
| 666 |
|
so that writing to internal file fn (with length 512) fails. |
| 667 |
|
checkpoint50d_pre |
| 668 |
|
|
| 669 |
|
checkpoint50c_post |
| 670 |
|
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
| 671 |
|
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
| 672 |
|
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
| 673 |
|
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
| 674 |
|
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
| 675 |
|
|
| 676 |
|
checkpoint50c_pre |
| 677 |
|
Merging from release1_p13: |
| 678 |
|
o bug fix for pkg/seaice dynamic solver |
| 679 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 680 |
|
|
| 681 |
|
checkpoint50b_post |
| 682 |
|
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
| 683 |
|
o in order to put the momForcing out of the Adams-Bashforth: |
| 684 |
|
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
| 685 |
|
to timestep.F |
| 686 |
|
o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays |
| 687 |
|
o re-generate output for highly sensitive test-exp: |
| 688 |
|
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
| 689 |
|
|
| 690 |
|
checkpoint50b_pre |
| 691 |
|
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
| 692 |
|
o corrected CPP option mismatch in exf_Bulk... functions for case |
| 693 |
|
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
| 694 |
|
|
| 695 |
|
checkpoint50a_post |
| 696 |
|
o Bug fix for merging between c50 and KPP. |
| 697 |
|
ikey was passed from thermodynamics to kpp_calc via |
| 698 |
|
common block rather than being recomputed in kpp_calc, |
| 699 |
|
in contradiction with new key itdkey. |
| 700 |
|
New key ikppkey created, and tamc.h headers updated. |
| 701 |
|
|
| 702 |
|
checkpoint50 |
| 703 |
|
- 2nd step of merge with ecco-branch: |
| 704 |
|
merge changes in ecco-branch back into main trunk |
| 705 |
|
- bug fix in find_alpha |
| 706 |
|
- more storing in gmredi_calc_tensor.F, kpp_routines.F |
| 707 |
|
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
| 708 |
|
- merged some sliced AD support routines |
| 709 |
|
|
| 710 |
|
checkpoint49 |
| 711 |
|
merged from ecco-branch: |
| 712 |
|
o exf: |
| 713 |
|
- Enable initialisation of forcing fields to constant |
| 714 |
|
(runtime) values. |
| 715 |
|
- in exf_getffields.F |
| 716 |
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
| 717 |
|
That also fixes wrong TAF-key computations for key_1, key_2 |
| 718 |
|
with bulf formulae. |
| 719 |
|
- exf_init.F modify #ifdef for exf_init_evap |
| 720 |
|
- exf_getffieldrec.F, ctrl_getrec.F |
| 721 |
|
The following INT-usages are not safe: |
| 722 |
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
| 723 |
|
fldcount = int(fldsecs/fldperiod) + 1 |
| 724 |
|
and were modified. |
| 725 |
|
o autodiff: checkpoint_lev... |
| 726 |
|
- updated storing for bulk formulae (some arrays were missing) |
| 727 |
|
- added state for seaice package |
| 728 |
|
- synchronized with main branch |
| 729 |
|
o DIVA: |
| 730 |
|
Modif.s in |
| 731 |
|
- the_main_loop.F |
| 732 |
|
- the_model_main.F |
| 733 |
|
and added cost_final_restore.F cost_final_store.F |
| 734 |
|
o With these changes, it is possible to fully separate |
| 735 |
|
the first forward run to compute the cost function (mdthe_main_loop) |
| 736 |
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
| 737 |
|
into separate model executions. |
| 738 |
|
This enables better tuning of DIVA to given queue sizes. |
| 739 |
|
o Loss of cost function value in consecutive DIVA runs is |
| 740 |
|
fixed by storing to 'costfinal' file. |
| 741 |
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
| 742 |
|
beginning/end of adjoint integration is accounted for. |
| 743 |
|
The current changes apply to TAF-1.4.26. |
| 744 |
|
TAF has one remaining bug, requiring one manual change |
| 745 |
|
(see MITgcm manual). |
| 746 |
|
o cal: synchronized between MAIN and ecco-branch |
| 747 |
|
|
| 748 |
|
checkpoint48i_post |
| 749 |
|
o Changes to restore differentiability of code w.r.t. previous tag |
| 750 |
|
(mostly adding new routines to make list and replacing |
| 751 |
|
pressure by totPhiHyd). |
| 752 |
|
o Updated and merged grdchk package |
| 753 |
|
- has both ADM and TLM checks |
| 754 |
|
- works for single- and multi-proc. |
| 755 |
|
- output cleaned |
| 756 |
|
- worked successfully for parallel DIVA |
| 757 |
|
o genmake: |
| 758 |
|
- Adding -platform=SP4 |
| 759 |
|
- Modif. for DEC Alpha (many don't have makedepend; use mkdep instead). |
| 760 |
|
o Modif. for DIVA: |
| 761 |
|
ctrl_unpack should not be called in intermediate DIVA interval. |
| 762 |
|
(similar thing would apply for active files such as |
| 763 |
|
tbar, sbar, psbar, which should not be reinitialised; |
| 764 |
|
only relevant for ecco-branch) |
| 765 |
|
|
| 766 |
|
checkpoint48h_post |
| 767 |
|
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
| 768 |
|
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
| 769 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
| 770 |
|
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
| 771 |
|
|
| 772 |
|
checkpoint48g_post |
| 773 |
|
--- EOS: |
| 774 |
|
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
| 775 |
|
store total Potential in totPhyHyd for diagnostics & EOS. |
| 776 |
|
o fix restart and overlap Pb when using Z-coord and EOS funct. of P |
| 777 |
|
--- Pressure/geopotential gradient: |
| 778 |
|
o use Ro_surf & R_low instead of hFac in cal_phi_hyd: |
| 779 |
|
o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind |
| 780 |
|
( changes results of global_ocean_pressure ) |
| 781 |
|
o NLFS + z-coord.: add eta*Rho' contribution. |
| 782 |
|
o accurate phiHyd when using interface-W at the middle between 2 centers |
| 783 |
|
( changes results of ideal_2D_oce ) |
| 784 |
|
o includes r* 2nd term in potential gradient. |
| 785 |
|
|
| 786 |
|
checkpoint48f_post |
| 787 |
|
Merging from release1_p12: |
| 788 |
|
o Modifications for using pkg/exf with pkg/seaice |
| 789 |
|
- improved description of the various forcing configurations |
| 790 |
|
- added basic radiation bulk formulae to pkg/exf |
| 791 |
|
- units/sign fix for evap computation in exf_getffields.F |
| 792 |
|
- updated verification/global_with_exf/results/output.txt |
| 793 |
|
o Added pkg/sbo for computing IERS Special Bureau for the Oceans |
| 794 |
|
(SBO) core products, including oceanic mass, center-of-mass, |
| 795 |
|
angular, and bottom pressure (see pkg/sbo/README.sbo). |
| 796 |
|
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F |
| 797 |
|
to avoid negative values in shallow regions. |
| 798 |
|
- updated verification/natl_box/results/output.txt |
| 799 |
|
- updated verification/lab_sea/results/output.txt |
| 800 |
|
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F |
| 801 |
|
o Added useSingleCpuIO option (see PARAMS.h). |
| 802 |
|
o Updated useSingleCpuIO option in mdsio_writefield.F to |
| 803 |
|
work with multi-field files, e.g., for single-file pickup. |
| 804 |
|
o pkg/seaice: |
| 805 |
|
- bug fix in growth.F: QNET for no shortwave case |
| 806 |
|
- added HeffFile for specifying initial sea-ice thickness |
| 807 |
|
- changed SEAICE_EXTERNAL_FLUXES wind stress implementation |
| 808 |
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
| 809 |
|
kpp_transport_t.F, forward_step.F, and the_main_loop.F |
| 810 |
|
o pkg/seaice: |
| 811 |
|
- adjoint-friendly modifications |
| 812 |
|
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
| 813 |
|
|
| 814 |
|
checkpoint48e_post |
| 815 |
|
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
| 816 |
|
o dynamics: change definition of computational domain & adapt mom_fluxform |
| 817 |
|
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
| 818 |
|
o following exp works with Olx=Oly=2 (and pass through checkbounds option): |
| 819 |
|
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1 |
| 820 |
|
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5 |
| 821 |
|
global_ocean.90x40x15 global_with_exf global_ocean_pressure |
| 822 |
|
inverted_barometer solid-body.cs-32x32x1 |
| 823 |
|
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
| 824 |
|
|
| 825 |
|
checkpoint48d_post |
| 826 |
|
o in preparation for r*: |
| 827 |
|
a) use pre-computed gradient of hydrostatic potential: |
| 828 |
|
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
| 829 |
|
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd: |
| 830 |
|
=> affects results of glob_oce_pressure (different truncation error) |
| 831 |
|
update output.txt of ideal_2D_oce & global_ocean_pressure |
| 832 |
|
|
| 833 |
|
checkpoint48d_pre |
| 834 |
|
o in preparation for r*: |
| 835 |
|
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
| 836 |
|
pass the 2 comp. of the grad. as arguments to momentum S/R. |
| 837 |
|
but for the moment, only used if it does not change the results. |
| 838 |
|
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
| 839 |
|
|
| 840 |
|
checkpoint48c_post |
| 841 |
|
Modifications in treatment of initial flux forcing controls |
| 842 |
|
to avoid extra storing of flux fields. |
| 843 |
|
|
| 844 |
|
checkpoint48c_pre |
| 845 |
|
o Added tidal_basin_2d experiment (currently 1D!) |
| 846 |
|
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
| 847 |
|
|
| 848 |
|
checkpoint48b_post |
| 849 |
|
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
| 850 |
|
(modification to pressure gradient not yet implemented) |
| 851 |
|
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
| 852 |
|
(for U & V) that are used for vertical advection of momentum. |
| 853 |
|
|
| 854 |
|
checkpoint48a_post |
| 855 |
|
o In preparation for r*, use temp. array to compute vertical transport |
| 856 |
|
in flux-form momentum pkg. => change results of few test-exp. |
| 857 |
|
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
| 858 |
|
lab_sea, natl_box & plume_on_slope |
| 859 |
|
|
| 860 |
|
checkpoint48 |
| 861 |
|
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
| 862 |
|
|
| 863 |
|
checkpoint47j_post |
| 864 |
|
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
| 865 |
|
o moved adexch from forward_step to addummy_in_stepping |
| 866 |
|
o added exch in ctrl_map_... |
| 867 |
|
o aveFreq.=0. at end of cost_final to avoid overwrite in |
| 868 |
|
reverse checkpointing loop |
| 869 |
|
o Yet more changes in gmredi: |
| 870 |
|
* adgmredi_calc_tensor |
| 871 |
|
avoiding all recomputation of gmredi_slope_limit |
| 872 |
|
* adgmredi_x/y/rtransport |
| 873 |
|
added flag for excessive storing to avoid recomp. of |
| 874 |
|
u/v/rtans, dTdx/y/z |
| 875 |
|
-> this is not really necessary and very memory-consuming |
| 876 |
|
* adgmredi_slope_psi: |
| 877 |
|
consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff |
| 878 |
|
* gmredi_slope_limit |
| 879 |
|
re-activated full calculation of taperfct for case 'ac02' |
| 880 |
|
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
| 881 |
|
|
| 882 |
|
checkpoint47i_post |
| 883 |
|
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
| 884 |
|
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
| 885 |
|
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
| 886 |
|
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf) |
| 887 |
|
o gmredi: fix few bugs. |
| 888 |
|
|
| 889 |
|
checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48) |
| 890 |
|
This will be a good checkpoint to plug into the ecco-branch. |
| 891 |
|
o few modif.'s to get latest version adjointed |
| 892 |
|
(mainly kick out code in ini_linear_phisurf) |
| 893 |
|
o modif's to run adjoint with exactConserv |
| 894 |
|
o case GM_BOLUS_ADVEC should be cleaned |
| 895 |
|
S/R gmredi_slope_psi should be cleaned |
| 896 |
|
o verification/carbon now has exactConserv=.TRUE. |
| 897 |
|
|
| 898 |
|
checkpoint47g_post |
| 899 |
|
o time-average AIM output: becomes independent from statvars time-average |
| 900 |
|
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
| 901 |
|
o After TAF bug fix: |
| 902 |
|
Tested adjoint of gmredi package. |
| 903 |
|
Tests were done with checkpoint47 rather than with latest |
| 904 |
|
checkpoint47f_post since the latter is broken for the adjoint |
| 905 |
|
verification/carbon/ contains both ADM and TLM gradient checks. |
| 906 |
|
Here they are, before they get changed/lost/stolen. |
| 907 |
|
Mostly modif.'s to fix numerical sensitivities. |
| 908 |
|
Gradient checks OK for |
| 909 |
|
- GM_taper_scheme: |
| 910 |
|
* clipping |
| 911 |
|
* ac02 |
| 912 |
|
* linear |
| 913 |
|
* glw91 |
| 914 |
|
* dm95 |
| 915 |
|
* ldd97 |
| 916 |
|
- GMREDI_OPTIONS: |
| 917 |
|
* GM_VISBECK_VARIABLE_K |
| 918 |
|
* GM_NON_UNITY_DIAGONAL |
| 919 |
|
* GM_EXTRA_DIAGONAL |
| 920 |
|
* GM_BOLUS_ADVEC |
| 921 |
|
in conjunction with data.gmredi parameters to be checked in |
| 922 |
|
in a few minutes under verification/carbon/code/ |
| 923 |
|
|
| 924 |
|
checkpoint47f_post |
| 925 |
|
Merging from release1_p10: |
| 926 |
|
o modifications for using pkg/exf with pkg/seaice |
| 927 |
|
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
| 928 |
|
and SEAICE_EXTERNAL_FLUXES |
| 929 |
|
- pkg/exf CPP options EXF_READ_EVAP and |
| 930 |
|
EXF_NO_BULK_COMPUTATIONS |
| 931 |
|
- usage examples are Experiments 8 and 9 in |
| 932 |
|
verification/lab_sea/README |
| 933 |
|
- verification/lab_sea default experiment now uses |
| 934 |
|
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
| 935 |
|
|
| 936 |
|
checkpoint47e_post |
| 937 |
|
o created a tag prior to creating a branch |
| 938 |
|
|
| 939 |
|
checkpoint47d_post |
| 940 |
|
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
| 941 |
|
at the bottom boundary had an erroneous half slip boundary condition |
| 942 |
|
o added bottom drag and no slip boundary condition capabilities to |
| 943 |
|
oceanic pressure coordinates code |
| 944 |
|
o added new verification experiment global_ocean_pressure, this experiment is |
| 945 |
|
also described in the tutorial section of the manual |
| 946 |
|
checkpoint47d_pre |
| 947 |
|
|
| 948 |
|
checkpoint47c_post |
| 949 |
|
o Added a verification experiment for a global cubed-sphere ocean run |
| 950 |
|
- verification/global_ocean.cubed32x32x30 |
| 951 |
|
- uses pkg/therm_seaice and pkg/bulk_forcing |
| 952 |
|
|
| 953 |
|
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) |
| 954 |
|
o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) |
| 955 |
|
when using P-coordinate; only implemented for atmospheric config. |
| 956 |
|
o OCEANICP & realFreshWater: include P-E direct effect on wVel ; |
| 957 |
|
NOTES: requires option NONLIN_FRSURF to be "#define". |
| 958 |
|
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
| 959 |
|
|
| 960 |
|
checkpoint47b_post |
| 961 |
|
Merging from release1_p9: |
| 962 |
|
o pkg/seaice |
| 963 |
|
- removed GOTO's and added taf directives |
| 964 |
|
- double precision constants to reduce the g77 (Linux) |
| 965 |
|
to F77 (SGI) differences reported in release1_p8 |
| 966 |
|
o tools/genmake |
| 967 |
|
- added SGI options |
| 968 |
|
o verification/testscript |
| 969 |
|
- updated to that of checkpoint47a_post |
| 970 |
|
o verification/global_ocean.90x40x15/input/eedata |
| 971 |
|
- modified for SGI f77 compatibility |
| 972 |
|
o verification/lab_sea |
| 973 |
|
- added description of sea-ice model |
| 974 |
|
- added missing matlab routines |
| 975 |
|
- added test of thermodynamics parallelization |
| 976 |
|
|
| 977 |
|
checkpoint47a_post |
| 978 |
|
o new pkg: aim_v23 |
| 979 |
|
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
| 980 |
|
for now, keep the same surface forcing as before. |
| 981 |
|
- Part-Cell implemented into AIM; check that Heat & Water are conserved |
| 982 |
|
- aim.5l_cs: use new aim pkg (run 10yr & get better results than before) |
| 983 |
|
- aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg |
| 984 |
|
o add diagnostic of surface correction term in monitor output |
| 985 |
|
|
| 986 |
|
o bulk_force and therm_seaice |
| 987 |
|
- Two packages: bulk_force (Bulk forcing) |
| 988 |
|
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2 |
| 989 |
|
- Earlier integration from Stephaine Dutkiewicz |
| 990 |
|
and Patrick Heimbach. |
| 991 |
|
- Two ifdef statements for compile time, |
| 992 |
|
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
| 993 |
|
|
| 994 |
|
checkpoint47 |
| 995 |
|
differentiable version of checkpoint46n_post |
| 996 |
|
o bug fix in quasihydrostaticterms |
| 997 |
|
o * "clean" adjoint code (in terms of extensive recomputations) |
| 998 |
|
can now be obtained for all GMREDI options (i.e. for |
| 999 |
|
- GM_VISBECK_VARIABLE_K |
| 1000 |
|
- GM_NON_UNITY_DIAGONAL |
| 1001 |
|
- GM_EXTRA_DIAGONAL |
| 1002 |
|
- GM_BOLUS_ADVEC ) |
| 1003 |
|
* However, wrong gradient check problem remains unsolved. |
| 1004 |
|
* New CPP options have been introduced for different |
| 1005 |
|
tapering schemes |
| 1006 |
|
o external_fields_load now part of differentiation list |
| 1007 |
|
o pressure needs multiple storing; |
| 1008 |
|
would be nice to have store_pressure at beginning or |
| 1009 |
|
end of forward_step, e.g. by having phiHyd global (5-dim.) |
| 1010 |
|
(NB: pressure is needed for certain cases in find_rho, |
| 1011 |
|
which is also invoked through convective_adjustment). |
| 1012 |
|
o recomputations in find_rho for cases |
| 1013 |
|
'JMD95'/'UNESCO' or 'MDJWF' are OK. |
| 1014 |
|
o #define ATMOSPHERIC_LOADING should be differentiable |
| 1015 |
|
o ini_forcing shifted to begining of initialise_varia |
| 1016 |
|
o Incorporating QNVS line search routines into MITgcm |
| 1017 |
|
(this is separate code, and therefore not under pkg) |
| 1018 |
|
lsopt/, optim/ |
| 1019 |
|
o Updated verification/carbon/ |
| 1020 |
|
- #define GM_VISBECK_VARIABLE_K |
| 1021 |
|
- GM_taper_scheme = 'ldd97' |
| 1022 |
|
|
| 1023 |
|
checkpoint46n_post |
| 1024 |
|
Merging from release1_p8: |
| 1025 |
|
o verification/natl_box: |
| 1026 |
|
updating new external_fields_load routine |
| 1027 |
|
o New package: pkg/seaice |
| 1028 |
|
Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle). |
| 1029 |
|
The sea-ice code is based on Hibler (1979-1980). |
| 1030 |
|
Two sea-ice dynamic solvers, ADI and LSR, are included. |
| 1031 |
|
In addition to computing prognostic sea-ice variables and diagnosing |
| 1032 |
|
the forcing/external data fields that drive the ocean model, |
| 1033 |
|
SEAICE_MODEL also sets theta to the freezing point under sea-ice. |
| 1034 |
|
The implied surface heat flux is then stored in variable |
| 1035 |
|
surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and |
| 1036 |
|
kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the |
| 1037 |
|
non-local transport term. Because this call precedes model |
| 1038 |
|
thermodynamics, temperature under sea-ice may not be "exactly" at |
| 1039 |
|
the freezing point by the time theta is dumped or time-averaged. |
| 1040 |
|
N.B.: fairly large differences in accuracy occur across |
| 1041 |
|
different platforms/compilers; comparison between |
| 1042 |
|
g77 (Linux) and F77 (SGI Origin 2000/MIPSpro) |
| 1043 |
|
generated output gives: |
| 1044 |
|
T S U V |
| 1045 |
|
C D M c m s m s m s m s |
| 1046 |
|
n p a R g m m e . m m e . m m e . m m e . |
| 1047 |
|
f n k u 2 i a a d i a a d i a a d i a a d |
| 1048 |
|
g d e n d n x n . n x n . n x n . n x n . |
| 1049 |
|
|
| 1050 |
|
Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea |
| 1051 |
|
o GAD: |
| 1052 |
|
- generated new common blocks to account for call of |
| 1053 |
|
same gad routines with differing traceridentities |
| 1054 |
|
(needed to modify tracerIdentity indices in GAD.h) |
| 1055 |
|
- generated separate common blocks for case useCubedSphereExchange |
| 1056 |
|
(Department of Futurology) |
| 1057 |
|
- parameter lists to gmredi_?transport: added tracerIdentity |
| 1058 |
|
- added new key indices to tamc.h |
| 1059 |
|
o external_fields_load: |
| 1060 |
|
- added this routine to TAF list |
| 1061 |
|
- needed to make some common blocks global and additional storing |
| 1062 |
|
along the same lines as exf package (checkpoint_lev?_directives.h) |
| 1063 |
|
o exf: |
| 1064 |
|
updated external forcing package |
| 1065 |
|
- bug fixes carried over from ecco-branch |
| 1066 |
|
(missing OBCS_OPTIONS.h in two routines) |
| 1067 |
|
- enable easy to use "no forcing". |
| 1068 |
|
- added exf I/O for atmospheric loading |
| 1069 |
|
- added exf I/O for runoff data |
| 1070 |
|
- transfered scaling between exf <-> MITgcm to exf namelist |
| 1071 |
|
o Adding new verification experiment global_with_exf. |
| 1072 |
|
This verification experiment is almost identical to the |
| 1073 |
|
global_ocean.90x40x15 experiment, except that it uses |
| 1074 |
|
the exf (and cal) package instead of the |
| 1075 |
|
external_fields_load routine (cf README file). |
| 1076 |
|
|
| 1077 |
|
checkpoint46m_post |
| 1078 |
|
o modified testscript to return -- when there are no lines of "%MON" output |
| 1079 |
|
o added new flag "quasiHydrostatic" for QH mode |
| 1080 |
|
and new routine quasihydrostaticterms() |
| 1081 |
|
o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term) |
| 1082 |
|
New routine: mom_u_coriolis_nh() |
| 1083 |
|
o fixed sign of non-hydrostatic metric terms in u and v equations. |
| 1084 |
|
Depend on correct sign of gravitySign. |
| 1085 |
|
o added work.pc* to .cvsignore in aim directories using ifc |
| 1086 |
|
o introduced flag for controllin non-hydrostatic metric terms |
| 1087 |
|
o removed gravitySign from PARM04 |
| 1088 |
|
o switched to g77/ifc from pgf77 in aim experiments |
| 1089 |
|
|
| 1090 |
|
checkpoint46l_post |
| 1091 |
|
o made convective adjustment work with pressure coordinates: |
| 1092 |
|
- changed the direction of k-loop in convective_adjustment.F for the |
| 1093 |
|
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
| 1094 |
|
- adjusted the reference pressure k-index in convective_adjustment.F |
| 1095 |
|
- adjusted the convection condition in convect.F (in analogy to |
| 1096 |
|
calc_ivdc.F) |
| 1097 |
|
- convective_adjustment no longer computes anything on the halos |
| 1098 |
|
- removed the warnings about negative salinity from find_rho.F and |
| 1099 |
|
find_alpha.F; instead the new routine look_for_neg_salinity, called |
| 1100 |
|
at the beginning of find_rho, find_alpha, and find_beta, does a |
| 1101 |
|
check of the entire slice, if CPP-option |
| 1102 |
|
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
| 1103 |
|
checkpoint46l_pre |
| 1104 |
|
|
| 1105 |
|
checkpoint46k_post |
| 1106 |
|
o fixed the verification/global_ocean.90x40x15 experiment: |
| 1107 |
|
- new bathymetry (the world according to A., JMC, and M.) |
| 1108 |
|
- new initial fields and forcing fields (*.bin files) |
| 1109 |
|
- new POLY3.COEFFS (for the next release one should switch to a full |
| 1110 |
|
equation of state: JMD95P or MDJWF) |
| 1111 |
|
- fixed several errors and redundancies in the data file |
| 1112 |
|
- experiment uses looped cells |
| 1113 |
|
- added matlab directory with diagnostic scripts for plotting of output |
| 1114 |
|
|
| 1115 |
|
o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: |
| 1116 |
|
- read AIM physics parameters from a file (data.aimphys) |
| 1117 |
|
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
| 1118 |
|
|
| 1119 |
|
checkpoint46j_post |
| 1120 |
|
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
| 1121 |
|
o move wVel computation at the end of the time step, in S/R integr_continuity |
| 1122 |
|
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
| 1123 |
|
o update timeave pkg for wVel diagnostic. |
| 1124 |
|
checkpoint46j_pre |
| 1125 |
|
|
| 1126 |
|
checkpoint46i_post |
| 1127 |
|
o Clean up AIM package (and keep the results unchanged): |
| 1128 |
|
include CPP_OPTION and use IMPLICT NONE in all routines ; |
| 1129 |
|
declare all the variables _RL ; use _d 0 for all numerical constants. |
| 1130 |
|
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
| 1131 |
|
|
| 1132 |
|
checkpoint46h_post |
| 1133 |
|
o cleaned up the use of rhoNil and rhoConst. |
| 1134 |
|
- rhoNil should only appear in the LINEAR equation of state, everywhere |
| 1135 |
|
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
| 1136 |
|
and the dynamical equations are all divided by rhoConst |
| 1137 |
|
o introduced new parameter rhoConstFresh, a reference density of fresh |
| 1138 |
|
water, to remove the fresh water flux's dependence on rhoNil. The default |
| 1139 |
|
value is 999.8 kg/m^3 |
| 1140 |
|
o cleanup up external_forcing.F and external_forcing_surf.F |
| 1141 |
|
- can now be used by both OCEANIC and OCEANICP |
| 1142 |
|
checkpoint46h_pre |
| 1143 |
|
|
| 1144 |
|
Added code to convert surface volume flux (fresh water) into |
| 1145 |
|
a mass flux when using P coordinates in the ocean (OCEANICP). |
| 1146 |
|
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
| 1147 |
|
|
| 1148 |
|
checkpoint46g_post |
| 1149 |
|
o Include a new diagnostic variable phiHydLow for the ocean model |
| 1150 |
|
- in z-coordinates, it is the bottom pressure anomaly |
| 1151 |
|
- in p-coordinates, it is the sea surface elevation |
| 1152 |
|
- in both cases, these variable have global drift, reflecting the mass |
| 1153 |
|
drift in z-coordinates and the volume drift in p-coordinates |
| 1154 |
|
- included time averaging for phiHydLow, be aware of the drift! |
| 1155 |
|
o depth-dependent computation of Bo_surf for pressure coordinates |
| 1156 |
|
in the ocean (buoyancyRelation='OCEANICP') |
| 1157 |
|
- requires a new routine (FIND_RHO_SCALAR) to compute density with only |
| 1158 |
|
Theta, Salinity, and Pressure in the parameter list. This routine is |
| 1159 |
|
presently contained in find_rho.F. This routine does not give the |
| 1160 |
|
correct density for 'POLY3', which would be a z-dependent reference |
| 1161 |
|
density. |
| 1162 |
|
o cleaned up find_rho |
| 1163 |
|
- removed obsolete 'eqn' from the parameter list. |
| 1164 |
|
o added two new verification experiments: gop and goz |
| 1165 |
|
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
| 1166 |
|
checkpoint46g_pre |
| 1167 |
|
|
| 1168 |
|
checkpoint46f_post |
| 1169 |
|
o Enable tangent linear (forward mode) gradient checks: |
| 1170 |
|
- extended active file handling to g_... files |
| 1171 |
|
- added TANGENT_SIMULATION to theSimulationMode |
| 1172 |
|
- extended grdchk package accordingly |
| 1173 |
|
o added tangent linear setup in verification/carbon/code_ftl |
| 1174 |
|
o added adjoint setup in verification/front_relax/code_ad |
| 1175 |
|
|
| 1176 |
|
checkpoint46e_post |
| 1177 |
|
o Added new equation of state -> MDJWF |
| 1178 |
|
- EOS of McDougall et al., 2002, JAOT, submitted |
| 1179 |
|
- caveat: the equation of state is only valid for a smaller (more |
| 1180 |
|
realistic?) range of values than JMD95P/Z and UNESCO |
| 1181 |
|
- added masks to the calculation of pressure in store_pressure |
| 1182 |
|
- added more check values for density in check_eos (ini_eos.F), some of |
| 1183 |
|
the old check values are out of the range of the MDJWF-eos, so don't |
| 1184 |
|
expect perfect matches for those |
| 1185 |
|
checkpoint46e_pre |
| 1186 |
|
|
| 1187 |
|
checkpoint46d_post |
| 1188 |
|
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
| 1189 |
|
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
| 1190 |
|
case of pressure coordinates. eosType='JMD95Z' in |
| 1191 |
|
combination with buoyancyRelation='OCEANICP' now causes an error. |
| 1192 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 1193 |
|
in find_alpha/beta. |
| 1194 |
|
checkpoint46d_pre |
| 1195 |
|
|
| 1196 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
| 1197 |
|
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
| 1198 |
|
|
| 1199 |
|
checkpoint46c_post |
| 1200 |
|
o Changes necessary for ocean in p-coordinates |
| 1201 |
|
- Added new buoyancy relation = 'OCEANICP' |
| 1202 |
|
- Added new parameters = gravitySign (this used to be contained inside |
| 1203 |
|
the factor dRdZ which I added when we first switched to R coordinates). |
| 1204 |
|
X GM/Redi is not compatible (yet) |
| 1205 |
|
X bottom drag and no-slip need to be debugged. |
| 1206 |
|
checkpoint46c_pre |
| 1207 |
|
|
| 1208 |
|
checkpoint46b_post |
| 1209 |
|
o Added new equation of state -> JMD95Z and JMD95P |
| 1210 |
|
- EOS of Jackett and McDougall, 1995, JAOT |
| 1211 |
|
- moved all EOS parameters into EOS.h |
| 1212 |
|
- new routines ini_eos.F, store_pressure.F |
| 1213 |
|
o Added UNESCO EOS, but not recommended because it requires |
| 1214 |
|
in-situ temperature (see JMD95) |
| 1215 |
|
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
| 1216 |
|
unesco.f to be used with POLY3 |
| 1217 |
|
checkpoint46b_pre |
| 1218 |
|
|
| 1219 |
|
checkpoint46a_post |
| 1220 |
|
o Added (atmospheric) pressure loading |
| 1221 |
|
- new field in FFIELDS.h, etc... |
| 1222 |
|
- new cpp flag ATMOSPHERIC_LOADING |
| 1223 |
|
o Changed hFacC to _hFacC in calc_phi_hyd.F |
| 1224 |
|
o Added SHORTWAVE_HEATING to some files for consistency |
| 1225 |
|
checkpoint46a_pre |
| 1226 |
|
|
| 1227 |
|
checkpoint46 |
| 1228 |
|
further merges from release1_p5 |
| 1229 |
|
o new ctrl package |
| 1230 |
|
- adopted from ECCO environment to enable optimization |
| 1231 |
|
- added Eliassen Palm fluxes to controls |
| 1232 |
|
o added Eliassen Palm flux controls to gradient check package |
| 1233 |
|
o cost package |
| 1234 |
|
- Compatible with new ctrl package |
| 1235 |
|
- added Eliassen Palm cost hooks |
| 1236 |
|
- modif's of existing cost functions |
| 1237 |
|
o Adjoint-related bug fixes in kpp: |
| 1238 |
|
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix |
| 1239 |
|
- kpp_routines: store of Rib avoids partial recomputation bug of TAF. |
| 1240 |
|
o autodiff package |
| 1241 |
|
- flow directives: |
| 1242 |
|
+ new for S/R do_the_model_io |
| 1243 |
|
+ enhanced for S/R checkpoint |
| 1244 |
|
+ new gmredi.flow |
| 1245 |
|
- Introduced CPP option ALLOW_AUTODIFF_MONITOR to |
| 1246 |
|
disable adcommon.h/g_common.h by default. |
| 1247 |
|
- fixed problem for adjoint of global_max |
| 1248 |
|
o modified verification/carbon/ |
| 1249 |
|
o New setup for adjoint of global_ocean |
| 1250 |
|
o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F) |
| 1251 |
|
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
| 1252 |
|
o incorporated hooks for sponge layer code (external_forcing.F) |
| 1253 |
|
|
| 1254 |
|
checkpoint45d_post |
| 1255 |
|
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
| 1256 |
|
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
| 1257 |
|
(affects plume_on_slope "cg2d" output) |
| 1258 |
|
o add new parameter deltaTfreesurf for free-surface time stepping |
| 1259 |
|
o exchange gT,gS when using staggerTimeStep & GM & Oly<4 |
| 1260 |
|
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
| 1261 |
|
o change phiMin in exp1 (to agree with documentation) |
| 1262 |
|
o add new flags: |
| 1263 |
|
- T,S forcing inside/outside Adams-Bashforth |
| 1264 |
|
- turn off temp,salt advection and/or forcing |
| 1265 |
|
- for each tracer, define internal flag for multiDimAdvection & A-B |
| 1266 |
|
o monitor: change definition of KE to check conservation of Energy |
| 1267 |
|
|
| 1268 |
|
checkpoint45c_post |
| 1269 |
|
o Removed f90 comments ("!") |
| 1270 |
|
o Modified initialisations to enable exf package for MITgcm |
| 1271 |
|
(without invoking ECCO_PACKAGE). |
| 1272 |
|
o modifications to gradient check package (Martin Losch) |
| 1273 |
|
- enable centered differences |
| 1274 |
|
- modified format of standard output |
| 1275 |
|
|
| 1276 |
|
checkpoint45b_post |
| 1277 |
|
o cleaned exchange calls in cg2d |
| 1278 |
|
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
| 1279 |
|
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
| 1280 |
|
to configure barotropic setup (Martin Losch) |
| 1281 |
|
o moved some initialisations within bi,bj loop in dynamics |
| 1282 |
|
(TAF flow dependency) |
| 1283 |
|
o in initialise_varia, moved call packages_init_variables |
| 1284 |
|
before convective_adjustment_init |
| 1285 |
|
(corresponding adjustment of TAF tape initialisation). |
| 1286 |
|
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
| 1287 |
|
|
| 1288 |
|
checkpoint45a_post |
| 1289 |
|
o compute Rho over the whole domain (extend iMin,jMin indices) |
| 1290 |
|
o specific exchange for X-slice domain (case Ny=1) |
| 1291 |
|
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
| 1292 |
|
o solve_for_pressure : set cg2d_x to zero where OBCS are applied |
| 1293 |
|
|
| 1294 |
|
checkpoint44h_post = checkpoint45 |
| 1295 |
|
o Fix to restore differentiability: |
| 1296 |
|
place at which packages_init_variables is called in |
| 1297 |
|
initialise_varia is crucial for reverse control flow. |
| 1298 |
|
o modifications in GMRedi to enable stable adjoint |
| 1299 |
|
(corresponding modif's in thermodynamics, dynamics) |
| 1300 |
|
o added missing hook for sponge layer code in external_forcing |
| 1301 |
|
o modified test cost functions |
| 1302 |
|
o storing in gad_advection (plus removal of write(0,*)! |
| 1303 |
|
o missing headers TR1.h added in convective_adjustment routines |
| 1304 |
|
o errorMessageUnit set non-equal zero in eeboot |
| 1305 |
|
(conflict on some platforms, e.g. IBM SP3) |
| 1306 |
|
o modified carbon verif. |
| 1307 |
|
|
| 1308 |
|
checkpoint44h_pre |
| 1309 |
|
o vertical grid option: allow to put the Interface at the middle between |
| 1310 |
|
2 cell-centers ; replace delZ in pkg/kpp by drF. |
| 1311 |
|
o GM Advective form: Tracers are advected using the residual transport (= |
| 1312 |
|
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
| 1313 |
|
|
| 1314 |
|
checkpoint44g_post |
| 1315 |
|
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
| 1316 |
|
results) ; ifdef missing in thermodynamics.F |
| 1317 |
|
|
| 1318 |
|
checkpoint44f_pre,checkpoint44f_post |
| 1319 |
|
o added PTRACERS package |
| 1320 |
|
This allows an arbitrary number of passive tracers to be integrated |
| 1321 |
|
forward simultaneously with the dynamicaly model. |
| 1322 |
|
+ Implemented so far: |
| 1323 |
|
- basic forward algorithm (time-stepping, advection, diffusion, convection) |
| 1324 |
|
- I/O and checkpointing |
| 1325 |
|
- GM/Redi *but* using the GM/Redi coefficient of Salt |
| 1326 |
|
+ Not implemented so far: |
| 1327 |
|
- KPP |
| 1328 |
|
- OBCS |
| 1329 |
|
+ No specific example supplied (yet) but global_ocean.90x40x15 has the |
| 1330 |
|
necessary data.ptracer file. Simply use -enable=ptracers and uncomment |
| 1331 |
|
line in data.pkg. |
| 1332 |
|
+ This package is disabled by default since it increases storage. |
| 1333 |
|
|
| 1334 |
|
|
| 1335 |
|
o testscript: added -cleanup option |
| 1336 |
|
o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter |
| 1337 |
|
b) enable to filter 2D fields. |
| 1338 |
|
|
| 1339 |
|
checkpoint44e_pre,post |
| 1340 |
|
o re-wrote convective adjustment to use pre-calculated weights |
| 1341 |
|
Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F |
| 1342 |
|
Adds: model/src/convective_weights.F, convectively_mixtracer.F |
| 1343 |
|
Original calls to convect() still in place. |
| 1344 |
|
|
| 1345 |
|
chkpt44d_pre,post |
| 1346 |
|
o added missing EXCLUDE_MONITOR flags |
| 1347 |
|
o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
| 1348 |
|
(incompatible typ in MIN/MAX expressions caused problems |
| 1349 |
|
on IBM SP3) |
| 1350 |
|
o in genmake added variable MAKEDEPEND |
| 1351 |
|
plus resetting for case SunOS |
| 1352 |
|
o added timer_stats.c routine for IBM SP3 |
| 1353 |
|
o removed variables in dynamics |
| 1354 |
|
!!! I forgot to create tag chkpt44d_pre !!! |
| 1355 |
|
!!! But chkpt44d_pre = chkpt44c_post !!! |
| 1356 |
|
|
| 1357 |
|
o real fresh water flux implemented with non-linear free-surface. |
| 1358 |
|
|
| 1359 |
|
chkpt44c_pre,post |
| 1360 |
|
o few fix (mask in shap_s2, EmPmR in external_field_load, |
| 1361 |
|
USE_NATURAL_BCS in solve_for_P); |
| 1362 |
|
o add arguments myIter & myTime to S/R obcs_calc & solve_for_P |
| 1363 |
|
|
| 1364 |
|
checkpoint44b_pre/_post |
| 1365 |
|
o merge of relevant stuff from the ecco-branch: |
| 1366 |
|
- genmake: removed $S64 overwrite for case SunOS |
| 1367 |
|
- pkg/exf: update and corrections for field swapping and obcs |
| 1368 |
|
- pkg/ecco: parameter lists for the_model_main, the_main_loop |
| 1369 |
|
harmonized between ECCO and MITgcm |
| 1370 |
|
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice |
| 1371 |
|
updated checkpointing_lev... lists for obcs |
| 1372 |
|
- model/src: minor changes in forward_step, plot_field |
| 1373 |
|
added directive for divided adjoint in the_main_loop |
| 1374 |
|
- pkg/mdsio: added mdsio_gl_slice |
| 1375 |
|
|
| 1376 |
|
o check parameters & config (chkpt44a_pre,post) |
| 1377 |
|
o OBC and NonLin_FrSurf. |
| 1378 |
|
|
| 1379 |
|
checkpoint44 |
| 1380 |
|
o fix bug in mom_vi_del2uv |
| 1381 |
|
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
| 1382 |
|
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
| 1383 |
|
o update AIM experiments (NCEP input files) |
| 1384 |
|
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
| 1385 |
|
o added some stuff for AD |
| 1386 |
|
|
| 1387 |
|
checkpoint43 |
| 1388 |
|
o added two new advection tests |
| 1389 |
|
o added global 4x4 degree ocean test |
| 1390 |
|
o added test of H&S94 with free surface on cube |
| 1391 |
|
o some final mods for gradient check, adjoint,... |
| 1392 |
|
|
| 1393 |
|
checkpoint42 |
| 1394 |
|
Fixed AD-related problems: |
| 1395 |
|
o Store directives up-to-date with re-arranged Adams-Bashforth |
| 1396 |
|
(mainly thermodynamics.F) |
| 1397 |
|
o New store directives for multi-dim. advection schemes |
| 1398 |
|
* new CPP flag ALLOW_MULTI_DIM_ADVECTION |
| 1399 |
|
* new common block and key passkey |
| 1400 |
|
(mainly gad_advection.F) |
| 1401 |
|
o Modified store directives for split of dynamics/thermodynamics |
| 1402 |
|
for the case ALLOW_KPP |
| 1403 |
|
o Cleaned argument list for timestep_tracer.F |
| 1404 |
|
|
| 1405 |
|
checkpoint41 |
| 1406 |
|
o re-formatted/added comments in prologues of key subroutines |
| 1407 |
|
to work with protex |
| 1408 |
|
|
| 1409 |
|
checkpoint40 |
| 1410 |
|
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
| 1411 |
|
o added FLT (floats) package from Arne along with demo. experiment |
| 1412 |
|
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
| 1413 |
|
implementation of forward-in-time forcing terms |
| 1414 |
|
o more mods for non-linear free-surface including new variable |
| 1415 |
|
o modified multi-dim method to work on cube |
| 1416 |
|
o bug fix in KPP (from DM) |
| 1417 |
|
|
| 1418 |
|
checkpoint40pre9 |
| 1419 |
|
o added DST advection schemes |
| 1420 |
|
o fix MPI bug on SGI's |
| 1421 |
|
o modifications for non-linear free-surface |
| 1422 |
|
o fixed conditionals for fixed flow/passive tracer only mode |
| 1423 |
|
o added tension/strain form of stress tensor |
| 1424 |
|
o changes to commenting of arguments for TAF/TAMC |
| 1425 |
|
o added/updated many matlab scripts |
| 1426 |
|
o added multi-dimensional advection method for tracers |
| 1427 |
|
|
| 1428 |
|
checkpoint40pre8 |
| 1429 |
|
o new package rw/ |
| 1430 |
|
Added method for dumping intermediate local arrays: |
| 1431 |
|
mdsio_writetile - same as mdsio_writefield except works from inside |
| 1432 |
|
bi,bj loop |
| 1433 |
|
mdsio_writelocal - same as mdsio_writetile except works for local |
| 1434 |
|
arrays |
| 1435 |
|
write_local_r? - higher-level wrapper for mdsio_writelocal |
| 1436 |
|
Controlled by diagFreq. Defaults to zero (ie. no dumps) |
| 1437 |
|
Example given at end of mom_vecinv.F that dumps some local arrays. |
| 1438 |
|
o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to |
| 1439 |
|
control flux-form versus vector invariant code. |
| 1440 |
|
Switch is runtime flag vectorInvariantMomentum (defaults to false) |
| 1441 |
|
or genmake -DISABLE ... |
| 1442 |
|
o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F |
| 1443 |
|
(additional storing is now needed for case vecinv; |
| 1444 |
|
currently nothing implemented to switch this storing off |
| 1445 |
|
in case fluxform is used since no CPP flag available). |
| 1446 |
|
|
| 1447 |
|
checkpoint40pre7 |
| 1448 |
|
o bug fix in dynamics.F |
| 1449 |
|
calc_viscosity called before k=1,Nr loop. |
| 1450 |
|
o added some #ifdef's ALLOW_PASSIVE_TRACER |
| 1451 |
|
o cleaned initialisations in ctrl_map_ini |
| 1452 |
|
related to TAF |
| 1453 |
|
|
| 1454 |
|
checkpoint40pre6 |
| 1455 |
|
o split dynamics into thermodynamics & dynamics |
| 1456 |
|
o corresponding split of calc_diffusivity into |
| 1457 |
|
calc_diffusivity, calc_viscosity |
| 1458 |
|
(kpp_calc_diff, kpp_calc_visc). |
| 1459 |
|
o Added diffkr, kapgm to control variables |
| 1460 |
|
o bug fix in gmredi_slope_limit for ldd97 |
| 1461 |
|
|
| 1462 |
|
checkpoint40pre5 |
| 1463 |
|
o proper initialization of Adams-Bashforth time stepping |
| 1464 |
|
+ uses forward step for very first step of model (iter=0) |
| 1465 |
|
o re-generated *all* output since almost all output is modified by this |
| 1466 |
|
change (sorry but we've been putting this one off for about 2 years) |
| 1467 |
|
+ natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were |
| 1468 |
|
*not* regenerated since they are already out of date and I don't |
| 1469 |
|
want to create the impression that they are suddenly working. |
| 1470 |
|
o removed KAP stuff for DEC's |
| 1471 |
|
o modified/added many .cvsignore files in */code and */input |
| 1472 |
|
o added new expt "solid-body.cs-32x32x1" |
| 1473 |
|
+ this uses an alternative form of ini_curvilinear_grid.F which |
| 1474 |
|
is not necessarily any better than the current one... |
| 1475 |
|
|
| 1476 |
|
checkpoint40pre4 |
| 1477 |
|
o added re-initialisations of utrans,vtrans,rtrans in |
| 1478 |
|
calc_common_factors which are crucial for TAF. |
| 1479 |
|
o extended iMin,jMin range for calc_common_factors, |
| 1480 |
|
calc_diffusivity |
| 1481 |
|
o added option ALLOW_PASSIVE_TRACER |
| 1482 |
|
o a few minor updates and fixes |
| 1483 |
|
|
| 1484 |
|
checkpoint40pre3 |
| 1485 |
|
o created calc_gtr1.F for gad package |
| 1486 |
|
o split the_main_loop and re-introduced forward_step |
| 1487 |
|
o some recomputations of nIter0 for TAMC |
| 1488 |
|
|
| 1489 |
checkpoint40pre2 |
checkpoint40pre2 |
| 1490 |
o Updated to latest branch of AJA, JMC |
o Updated to latest branch of AJA, JMC |
| 1491 |
o Added gradient check package |
o Added gradient check package |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch