Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to netcdf-sm0: | (view) (download) (annotate) |
| Sticky Tag: |
o changes to permit hi-res, cubed-sphere, configuration
- added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
- added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F
- added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation
of surface winds for the cube
(A verification experiment, based on global_ocean.cs32x15, but with
pkg/seaice turned on and with on-the-fly interpolation from the NCEP
Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice,
complete with example surface forcing files and matlab scripts to look
at the output and compare it with that of global_ocean.cs32x15.)
added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F
o change global_ocean.cs32x15 because of Pb with GM on CS-grid.
added tag checkpoint52d_pre
add call to AIM pendant S/R in external_forcing & external_fields_load.F
o surface flux time-av diagnostic modified for NLFS & RealFreshWater
Reverse mode: 53 -> 52
tagging checkpoint52c_post
updating
updating
checkpoint52b_post
o new version: "thsice" of thermodynamic sea-ice pkg:
- only 1 call from "forward_step"; conserve energy, fresh-water & salt.
- modify fluxes but do not change theta directly;
- light cleaning of bulk_force pkg (still needed with thsice).
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice
+ output_thsice.txt to test thsice & bulk_force pkgs.
o put back grid & coriolis monitor output.
tag checkpoint52b_pre before checking-in new ThermSeaIce (ThSIce) pkg
updating
updating
FREEZE_SURFACE is the new version of FREEZE and limits only surface temperature; keep the old version of FREEZE to reproduce old results.
o modifications to make FREEZE flux visible to pkg/kpp
- moved surfaceTendencyTice from pkg/seaice to main code
- FREEZE moved to FORWARD_STEP
- subroutine FREEZE now limits only surface temperature
this means new output.txt for global_ocean.90x40x15,
global_ocean.cs32x15, and global_with_exf, but note
that results for these three experiments remain
bit-identical to before if allowFreezing=.FALSE.
o added surface flux output variables to TIMEAVE_STATVARS
o time-averaged output for pkg/ptracers
o some bug fixes for #undef REAL4_IS_SLOW
tagging checkpoint52 = ecco_c52_e35
updating
o creating checkpoint51s_post
o created checkpoint51r_post
tagging checkpoint51q_post
o creating new tag
o updated and tested version of the cd_code package o almost all of the cd_code functionality has been moved into the package but some cleanups (read/write checkpoints) remain
o add a "cd_code" package and update all the verification tests so that they use the new package instead of "INCLUDE_CD_CODE"
updating old info
tagging checkpoint51o_post
o undid all of the cp51 checkin pending some ongoing code cleanups and discussion
o modifications to make FREEZE flux visible to pkg/kpp
- moved surfaceTendencyTice from pkg/seaice to main code
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
- subroutine FREEZE now limits only surface temperature
(this means new output.txt for global_ocean.90x40x15,
global_ocean.cs32x15, and global_with_exf)
o added surface flux output variables to TIMEAVE_STATVARS
o added the [#include "AD_CONFIG.h"] statement to all files that need it for adjoint/tl #defines o re-worked the build logic in genmake2 to support AD_CONFIG.h o removed tools/genmake since it no longer works
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F
Output on faulks using -ieee with of=linux_ia32_g77: Y Y Y Y 13 16 16 16 0 16 16 16 16 16 16 16 16 13 13 13 16 pass adjustment.128x64x1 Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 0 0 16 16 0 0 pass adjustment.cs-32x32x1 Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 22 0 16 16 22 0 pass adjust_nlfs.cs-32x32x1 Y Y Y Y -- 13 13 16 16 13 13 13 13 16 16 16 16 16 16 16 16 N/O advect_cs Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O advect_xy Y Y Y Y -- 13 16 13 16 16 16 16 16 16 16 22 16 16 16 16 16 N/O advect_xz Y Y Y Y 14 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass aim.5l_cs Y Y Y Y 14 16 16 16 16 16 16 16 16 16 13 13 16 16 16 13 16 pass aim.5l_Equatorial_Channel Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 13 16 pass aim.5l_LatLon Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 13 13 13 13 22 16 pass exp0 Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 16 16 13 22 16 pass exp1 Y Y Y Y 13 13 16 13 16 16 16 16 16 13 13 16 16 13 13 13 13 pass exp2 Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass exp4 Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass exp5 Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass front_relax Y Y Y Y 13 16 16 13 13 16 16 13 13 16 16 13 16 12 13 13 16 pass global_ocean.90x40x15 Y Y Y Y 10 16 16 13 13 16 13 16 16 13 13 13 13 13 16 13 16 FAIL global_ocean.cs32x15 Y Y Y Y 6 11 12 13 13 12 13 16 13 9 9 9 9 10 9 9 11 FAIL global_ocean_pressure Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 13 13 16 pass global_with_exf Y Y Y Y 16 16 16 16 16 16 16 16 16 13 13 13 13 16 16 9 16 pass hs94.128x64x5 Y Y Y Y 13 16 16 16 16 16 16 16 16 13 16 16 16 13 13 22 16 pass hs94.1x64x5 Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 13 13 16 16 22 13 pass hs94.cs-32x32x5 Y Y Y Y 9 10 16 13 13 16 16 16 22 16 16 12 13 13 13 22 12 FAIL ideal_2D_oce Y Y Y Y 8 16 16 16 16 16 16 16 16 13 13 8 16 16 16 16 16 FAIL internal_wave Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass inverted_barometer Y Y Y Y 12 16 16 13 16 16 16 13 16 16 13 12 13 13 13 12 13 FAIL lab_sea Y Y Y Y 11 16 16 16 16 16 13 16 13 13 13 12 13 12 13 12 13 FAIL natl_box Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass plume_on_slope Y Y Y Y 13 16 16 16 16 13 16 16 16 16 16 16 16 13 16 16 16 pass solid-body.cs-32x32x1
o first version of genmake2 that works with TAF -- note that only the "ad_taf" target has been confirmed to work and the others are in progress
changes to pkg/cal and pkg/exf that allow and speed-up long integrations
o add salt flux to forcing fields (used when salty sea-ice forms or melts) o enable to apply restoring on S & T only in a latitude band. o update output (external_forcing_surf modif. change truncation errors) global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box
checkpoint51k_post
o change default to: useNHMTerms=.FALSE.
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off):
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5
- new output.txt for idealized oceanic exp (NHMTerms are now turned off):
exp1, ideal_2D_oce
- change data file of oceanic exp (leave the results unchanged for now)
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box
o set gravitySign automatically according to the vertical coordinate used
(and change sign: back to "logical" value: +1 when R increases downward)
*** empty log message ***
tagging checkpoint51j_post
o first check-in for the "branch-genmake2" merge
o verification suite as run on shelley (gcc 3.2.2):
Wed Oct 8 23:42:29 EDT 2003
T S U V
G D M c m s m s m s m s
E p a R g m m e . m m e . m m e . m m e .
N n k u 2 i a a d i a a d i a a d i a a d
2 d e n d n x n . n x n . n x n . n x n .
OPTFILE=NONE
Y Y Y Y 13 16 16 16 0 16 16 16 16 16 16 16 16 13 12 0 0 pass adjustment.128x64x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 0 0 16 16 0 0 pass adjustment.cs-32x32x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 22 0 16 16 22 0 pass adjust_nlfs.cs-32x32x1
Y Y Y Y -- 13 13 16 16 13 13 13 13 16 16 16 16 16 16 16 16 N/O advect_cs
Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O advect_xy
Y Y Y Y -- 13 16 13 16 16 16 16 16 16 16 22 16 16 16 16 16 N/O advect_xz
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass aim.5l_cs
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 16 16 16 16 13 16 pass aim.5l_Equatorial_Channel
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 13 16 16 13 13 16 pass aim.5l_LatLon
Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 12 13 13 16 13 16 pass exp0
Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 13 16 16 22 16 pass exp1
Y Y Y Y 13 13 16 13 16 16 16 16 16 13 13 16 16 13 13 13 13 pass exp2
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass exp4
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass exp5
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass front_relax
Y Y Y Y 14 16 16 13 13 16 16 13 13 16 13 13 16 12 13 13 16 pass global_ocean.90x40x15
Y Y Y Y 10 16 16 13 13 16 13 16 16 13 13 13 13 16 16 13 16 FAIL global_ocean.cs32x15
Y Y Y Y 6 11 12 13 13 12 13 16 13 9 9 9 9 10 9 9 11 FAIL global_ocean_pressure
Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 16 13 16 pass global_with_exf
Y Y Y Y 14 16 16 16 16 16 16 16 16 11 13 22 13 16 16 9 16 pass hs94.128x64x5
Y Y Y Y 13 16 16 16 16 16 16 16 16 11 16 16 16 13 16 22 13 pass hs94.1x64x5
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 13 13 16 16 22 13 pass hs94.cs-32x32x5
Y Y Y Y 10 10 16 13 13 16 16 16 22 16 13 13 13 13 13 22 13 FAIL ideal_2D_oce
Y Y Y Y 8 16 16 16 16 16 16 16 16 13 13 8 16 16 16 16 16 FAIL internal_wave
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass inverted_barometer
Y Y Y Y 12 16 16 16 16 16 16 16 16 16 13 12 13 13 13 13 13 FAIL lab_sea
Y Y Y Y 11 16 16 16 16 16 16 16 13 13 13 12 13 16 13 12 13 FAIL natl_box
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass plume_on_slope
Y Y Y Y 13 16 16 16 16 13 16 16 16 16 16 16 16 13 16 16 16 pass solid-body.cs-32x32x1
New tag before merging genmake2 branch
forgot to commit tag-index for c51g_post
tag c51h_pre
updating
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif)
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation of tracer Green's fucntions for ocean inversion project.
o Mods and bug fixes to pkg/cal and pkg/exf needed for computation of tracer Green's fucntions for ocean inversion project.
o Added on-the-fly spatial interpolation capability
"USE_EXF_INTERPOLATION" to pkg/exf.
- This is a temporary Cartesian-grid hack until
the super-duper ESMF coupler becomes available.
- See verification/global_with_exf/README for usage example.
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid
flags and modified pkg/seaice accordingly.
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
non-local transport term.
checkpoint51f_post
o Added on-the-fly spatial interpolation capability
"USE_EXF_INTERPOLATION" to pkg/exf.
This is a temporary Cartesian-grid hack until
the super-duper ESMF coupler becomes available.
Usage example is in verification/global_with_exf.
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F,
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer
non-local transport term.
checkpoint51e_post
o pkg/mom_vecinv:
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec)
- add time-ave diagnostic of vorticity advection.
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV.
o atmospheric geopotential: - include water vapor effect;
- use p^kappa in p* scaling.
AIM: add stratospheric drag ; LAND : read initial state from files.
tagging checkpoint51d_post
fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid)
o introducing integer flag debugLevel o introducing pathname variable mdsioLocalDir for mdsio
tagging checkpoint51b_post
creating checkpoint51a_post
tagging checkpoint51
preparing c51
updating
tagging checkpoint50h_post
o new package "land": provides surface BC for AIM. o pkg/ptracers: apply exchange to all tracers after reading a pickup.
New variable in PARM03: pickupSuff is a string that can be set to indicate the suffix on pickup files. This allows us to avoid renaming the temporary pickup files.
o AIM: use true log-P extrapolation for near surface temp (= as in
F.Molteni paper) ; update aim.5l_cs output.
checkpoint50g_post
o merged with release1_p17 (pkg/seaice and verification/lab_sea)
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and
made the default because of faster convergence than ADI
tagging checkpoint50f_post
tagging checkpoint50f_pre
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ;
+ change Evap over land. (update aim.5l_cs output)
Recorded updates by AJA
o make KPP work with PTRACERS - fix gad_calc_rhs to call new routine kpp_transport_ptr, which is nearly a copy of kpp_transport_s - there is no analogue to SurfaceTendencyS, so I have to use gPtr(of the surface layer) instead o add a new platform SunFire+mpi (SunFire 15000) to genmake o make new tag checkpoint50e_post
o change kpp output from multiple-record state files to single-record state files analogous to write_state.F o reduce the output frequency of cg3d-related stuff to the monitor frequency, analogous to the cg2d-related output. o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, so that o make tag checkpoint50d_post
checkpoint50c_post o fix problem in ini_procs.F when using MPI (was there since checkpoint48f)
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy.
o add time-average diagnostic of U*V and vertical diffusive flux for theta. o bug fixed in convective adjustment diagnostic (multi-tile set-up). o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries.
checkpoint50c_pre Merging from release1_p13: o bug fix for pkg/seaice dynamic solver o Added SEAICE_initialHEFF to pkg/seaice
checkpoint50b_post o store u*,v* in gU,V instead of in guNm1,gvNm1 o in order to put the momForcing out of the Adams-Bashforth: move forcing & CD-scheme calls from mom_fluxform & mom_vecinv to timestep.F o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays o re-generate output for highly sensitive test-exp: global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box
tag checkpoint50b_pre before modifying momentum timestep.
o restore the use of momAdvection & useCoriolis flags (mom_vecinv).
updating.
updating
tagging half a century.
updating.
updating.
tagging checkpoint49
tagging checkpoint48h_post before commiting AD-related changes.
Modified File doc/tag-index
o SEAICE_WRITE_PICKUP needs to be called before WRITE_CHECKPOINT
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F o Added SEAICE_initialHEFF to pkg/seaice
checkpoint48g_post --- EOS: o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF store total Potential in totPhyHyd for diagnostics & EOS. o fix restart and overlap Pb when using Z-coord and EOS funct. of P --- Pressure/geopotential gradient: o use Ro_surf & R_low instead of hFac in cal_phi_hyd: o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind ( changes results of global_ocean_pressure ) o NLFS + z-coord.: add eta*Rho' contribution. o accurate phiHyd when using interface-W at the middle between 2 centers ( changes results of ideal_2D_oce ) o includes r* 2nd term in potential gradient.
Merging from release1_p12: o Modifications for using pkg/exf with pkg/seaice - improved description of the various forcing configurations - added basic radiation bulk formulae to pkg/exf - units/sign fix for evap computation in exf_getffields.F - updated verification/global_with_exf/results/output.txt o Added pkg/sbo for computing IERS Special Bureau for the Oceans (SBO) core products, including oceanic mass, center-of-mass, angular, and bottom pressure (see pkg/sbo/README.sbo). o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F to avoid negative values in shallow regions. - updated verification/natl_box/results/output.txt - updated verification/lab_sea/results/output.txt o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F o Added useSingleCpuIO option (see PARAMS.h). o Updated useSingleCpuIO option in mdsio_writefield.F to work with multi-field files, e.g., for single-file pickup. o pkg/seaice: - bug fix in growth.F: QNET for no shortwave case - added HeffFile for specifying initial sea-ice thickness - changed SEAICE_EXTERNAL_FLUXES wind stress implementation o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, kpp_transport_t.F, forward_step.F, and the_main_loop.F o pkg/seaice: - adjoint-friendly modifications - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
tag checkpoint48e_post
o dynamics: change definition of computational domain & adapt mom_fluxform
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2.
o following exp works with Olx=Oly=2 (and pass through checkbounds option):
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5
global_ocean.90x40x15 global_with_exf global_ocean_pressure
inverted_barometer solid-body.cs-32x32x1
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure)
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post)
checkpoint48d_post
o in preparation for r*:
a) use pre-computed gradient of hydrostatic potential:
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd:
=> affects results of glob_oce_pressure (different truncation error)
update output.txt of ideal_2D_oce & global_ocean_pressure
checkpoint48d_pre o in preparation for r*: new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. pass the 2 comp. of the grad. as arguments to momentum S/R. but for the moment, only used if it does not change the results. o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP
tagging checkpoint48c_post purely adjoint-related (bracketed between 48c_pre/post)
Logging addition of tidal_basin_2d
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented)
checkpoint48b_post
o r* coordinate added in #ifdef NONLIN_FRSURF block. (modification to pressure gradient not yet implemented) o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports (for U & V) that are used for vertical advection of momentum.
checkpoint48a_post
o In preparation for r*, use temp. array to compute vertical transport
in flux-form momentum pkg. => change results of few test-exp.
Update output of: exp4, exp5, front_relax, global_ocean_pressure,
lab_sea, natl_box & plume_on_slope
checkpoint48
tagging checkpoint47j_post
add new exp. (ideal_2D_oce) to test "exotic" parameters and options.
checkpoint47i_post
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled.
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi)
default= 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post)
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf)
Duplicate tag of PH's c48
pkg/gmredi: fix few bugs and restore parameter values (e.g., Small_Number=1.D-12) and scheme (e.g., Large_SlopeSqr=1.D+48) of checkpoint47f_post
creating checkpoint48
creating checkpoint47g_post
time-average AIM output: becomes independent from statvars time-average (can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH)
checkpoint47f_post
Merging from release1_p10:
o modifications for using pkg/exf with pkg/seaice
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
and SEAICE_EXTERNAL_FLUXES
- pkg/exf CPP options EXF_READ_EVAP and
EXF_NO_BULK_COMPUTATIONS
- usage examples are Experiments 8 and 9 in
verification/lab_sea/README
- verification/lab_sea default experiment now uses
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
checkpoint47e_post o created a tag prior to creating a branch
o updated tag-index after creating a new tag: checkpoint47d_post I still have to remove the experiments goz and gop, because they are obsolete
A new tag because a verification experiment was added.
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) when using P-coordinate; only implemented for atmospheric config. o OCEANICP & realFreshWater: include P-E direct effect on wVel ; NOTES: requires option NONLIN_FRSURF to be "#define". o update advect_xz/results/output.txt (left from checkpoint44g_post)
checkpoint47b_post
Merging from release1_p9:
o pkg/seaice
- removed GOTO's and added taf directives
- double precision constants to reduce the g77 (Linux)
to F77 (SGI) differences reported in release1_p8
o tools/genmake
- added SGI options
o verification/testscript
- updated to that of checkpoint47a_post
o verification/global_ocean.90x40x15/input/eedata
- modified for SGI f77 compatibility
o verification/lab_sea
- added description of sea-ice model
- added missing matlab routines
- added test of thermodynamics parallelization
Modified Files:
doc/tag-index pkg/seaice/SEAICE_FFIELDS.h
pkg/seaice/SEAICE_PARAMS.h pkg/seaice/adi.F
pkg/seaice/advect.F pkg/seaice/budget.F pkg/seaice/diffus.F
pkg/seaice/dynsolver.F pkg/seaice/groatb.F pkg/seaice/growth.F
pkg/seaice/lsr.F pkg/seaice/ostres.F
pkg/seaice/seaice_do_diags.F pkg/seaice/seaice_get_forcing.F
pkg/seaice/seaice_init.F pkg/seaice/seaice_model.F
pkg/seaice/seaice_readparms.F tools/genmake
verification/global_ocean.90x40x15/input/eedata
verification/lab_sea/README
verification/lab_sea/matlab/lookat_exp1.m
verification/lab_sea/matlab/lookat_exp2.m
verification/lab_sea/matlab/lookat_exp3.m
verification/lab_sea/matlab/lookat_exp4.m
verification/lab_sea/matlab/lookat_exp5.m
verification/lab_sea/matlab/lookat_exp6.m
verification/lab_sea/results/AREAtave.0000000010.data
verification/lab_sea/results/HEFFtave.0000000010.data
verification/lab_sea/results/UICEtave.0000000010.data
verification/lab_sea/results/VICEtave.0000000010.data
verification/lab_sea/results/output.txt
Added Files:
verification/lab_sea/seaice.ps
verification/lab_sea/matlab/lookat_exp7.m
verification/lab_sea/matlab/mmax.m
verification/lab_sea/matlab/mypcolor.m
verification/lab_sea/matlab/myquiver.m
verification/lab_sea/matlab/readbin.m
verification/lab_sea/matlab/wysiwyg.m
Removed Files:
verification/lab_sea/code/KPP_OPTIONS.h
Adding comment for therm_seaice and bulk_force.
make tag checkpoint47a_post
o new pkg: aim_v23 = F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. for now, keep the same surface forcing as before. - Part-Cell implemented into AIM; check that Heat & Water are conserved - aim.5l_cs: use new aim pkg (run 10yr & get better results than before) - aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg o add diagnostic of surface correction term in monitor output
Given that we soon run out of single-character letters I take the liberty of creating checkpoint47.
Preparing checkpoint46n_post
New tag to delimit quasi-hydrostatic modifications.
Added catch for cases when experiments are checked in with insufficient monitor output for testscript to use. Instead of a 16 d.p. match testscript now returns "--" and N/O instead of "pass".
Added new routine quasihydrostaticterms() and flag "quasihydrostatic" which is false by default and enables QH mode. Exlcusive with nonhydrostatic flag.
Added non-hydrostatic Coriolis term to U equation - needs new PARAMS.h arraya fCoriCos(i,j,bi,bj) - new routine: mom_u_coriolis_nh()
Fixed sign of non-hydrostatic metric terms of form u*w/r and v*w/r. - now depends on sign of gravitySign which in P coordinates should be -1 and otherwise +1.
Added work.pc* to .cvsignore since switch from pgf77 to g77/ifc.
Added new flag "useNHMTerms" which controls appearance of non-hydrostatic metric
terms:
- defaults to TRUE but is set to false when metricTerms is false.
This means no output is currently affected since N-H metric terms have
always been associated with spherical metric terms to date.
- note that N-H metric terms are both incomplete and disctetized incorrectly
and are not fixed as yet.
- turning off useNHMTerms affects these experiments
adjustment.128x64x1, aim.5l_Equatorial_Channel, exp1, exp2, global_ocean.90x40x1,
hs94.128x64x5, hs94.1x64x5, natl_box
which means they all have non-hydrostatic metric terms in them.
Removed second appearance of gravitySign in a namelist.
No longer using PGI compiler (pgf77) since it does work even on our own machines! - use g77 where it works otherwise ifc
made convective adjustment work with pressure coordinates: - changed the direction of k-loop in convective_adjustment.F for the case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) - adjusted the reference pressure k-index in convective_adjustment.F - adjusted the convection condition in convect.F (in analogy to calc_ivdc.F) - convective_adjustment no longer computes anything on the halos - removed the warnings about negative salinity from find_rho.F and find_alpha.F; instead the new routine look_for_neg_salinity, called at the beginning of find_rho, find_alpha, and find_beta, does a check of the entire slice, if CPP-option CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
updating tag-index
fixed the verification/global_ocean.90x40x15 experiment: - new bathymetry (the world according to A., JMC, and M.) - new initial fields and forcing fields (*.bin files) - new POLY3.COEFFS (for the next release one should switch to a full equation of state: JMD95P or MDJWF) - fixed several errors and redundancies in the data file - experiment uses looped cells - added matlab directory with diagnostic scripts for plotting of output
* S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: - read AIM physics parameters from a file (data.aimphys) - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
* split calc_exact_eta in 2 S/R : integr_continuity & update_etaH * move wVel computation at the end of the time step, in S/R integr_continuity * create specific S/R to exchange T,S before DYNAMICS (for stagger time step) * update timeave pkg for wVel diagnostic ; put convertEmP2rUnit in PARAMS.h
Clean up AIM package (and keep the results unchanged). make tag checkpoint46i_post
o cleaned up the use of rhoNil and rhoConst.
- rhoNil should only appear in the LINEAR equation of state, everywhere
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
and the dynamical equations are all divided by rhoConst
o introduced new parameter rhoConstFresh, a reference density of fresh
water, to remove the fresh water flux's dependence on rhoNil. The default
value is 999.8 kg/m^3
o cleanup up external_forcing.F and external_forcing_surf.F
- can now be used by both OCEANIC and OCEANICP
o Include a new diagnostic variable phiHydLow for the ocean model
- in z-coordinates, it is the bottom pressure anomaly
- in p-coordinates, it is the sea surface elevation
- in both cases, these variable have global drift, reflecting the mass
drift in z-coordinates and the volume drift in p-coordinates
- included time averaging for phiHydLow, be aware of the drift!
o depth-dependent computation of Bo_surf for pressure coordinates
in the ocean (buoyancyRelation='OCEANICP')
- requires a new routine (FIND_RHO_SCALAR) to compute density with only
Theta, Salinity, and Pressure in the parameter list. This routine is
presently contained in find_rho.F. This routine does not give the
correct density for 'POLY3', which would be a z-dependent reference
density.
o cleaned up find_rho
- removed obsolete 'eqn' from the parameter list.
o added two new verification experiments: gop and goz
(4x4 degree global ocean, 15 layers in pressure and height coordinates)
tagging checkpoint46f_post
Fixing Martin's tagging errors
o Added new equation of state -> MDJWF
- EOS of McDougall et al., 2002, JAOT, submitted
- caveat: the equation of state is only valid for a smaller (more
realistic?) range of values than JMD95P/Z and UNESCO
- added masks to the calculation of pressure in store_pressure
- added more check values for density in check_eos (ini_eos.F), some of
the old check values are out of the range of the MDJWF-eos, so don't
expect perfect matches for those
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and 'OCEANICP', also initialised field pressure correctly in ini_eos in the case of pressure coordinates. eosType='JMD95Z' in combination with buoyancyRelation='OCEANICP' now causes an error. o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) in find_alpha/beta.
Changes necessary for ocean in p-coordinates
- Added new buoyancy relation = 'OCEANICP'
- Added new parameters = gravitySign (this used to be contained inside
the factor dRdZ which I added when we first switched to R coordinates).
X GM/Redi is not compatible (yet)
X bottom drag and no-slip need to be debugged.
o Added new equation of state -> JMD95Z and JMD95P - EOS of Jackett and McDougall, 1995, JPO - moved all EOS parameters into EOS.h - new routines ini_eos.F, store_pressure.F o Added UNESCO EOS, but not recommended because it requires in-situ temperature (see JMD95) o Modified formatting for knudsen2.f in utils/knudsen2 and added unesco.f to be used with POLY3
Added pressure loading term and experiment based on Wunsch and Stammer (1997) o new field in FFIELDS.h, etc... o new cpp flag ATMOSPHERIC_LOADING o Changed hFacC to _hFacC in calc_phi_hyd.F o Added SHORTWAVE_HEATING to some files for consistency
Preparing checkpoint46
import 2 fixes from release1_p5
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S (affects plume_on_slope "cg2d" output)
rescaling gNm1 (NLFS + A-B) improve the global conservation of tracer
change phiMin in exp1 (to agree with documentation) and add few flags ...
Creating yet another checkpoint: checkpoint45c_post
Creating checkpoint45b_post
checkpoint45a_post o compute Rho over the whole domain (extend iMin,jMin indices) o specific exchange for X-slice domain (case Ny=1)
add small fix (solve_for_pressure, obcs_calc in exp4 & internal_wave)
Creating checkpoint44h_post = checkpoint45
o vertical grid option: allow to put the Interface at the middle between 2 cell-centers ; replace delZ in pkg/kpp by drF.
o GM Advective form: Tracers are advected using the residual transport (= Euler+GM-bolus); set GM_AdvSeparate=T to return to previous form.
create checkpoint44g_post : o fix surface correction term in multiDimAdvection (affects plume_on_slope results) ; ifdef missing in thermodynamics.F
Added PTRACERS package
This allows an arbitrary number of passive tracers to be integrated
forward simultaneously with the dynamicaly model.
+ Implemented so far:
- basic forward algorithm (time-stepping, advection, diffusion, convection)
- I/O and checkpointing
- GM/Redi *but* using the GM/Redi coefficient of Salt
+ Not implemented so far:
- KPP
- OBCS
+ No specific example supplied (yet) but global_ocean.90x40x15 has the
necessary data.ptracer file. Simply use -enable=ptracers and uncomment
line in data.pkg. PTRACER01 then reproduces Salt exactly.
+ This package is disabled by default since it increases storage.
Document testscript -cleanup.
modification in pkg/shap_filt (affects allmost all S/R): a) new shap_filt S/R to use no-slip BC with S2 filter b) enable to filter 2D fields.
Document checkpoint44e_pre,post
Creating chkpt44d_post (I forgot to create chkpt44d_pre, but chkpt44d_pre = chkpt44c_post).
updated: o real fresh water flux implemented with non-linear free-surface.
chkpt44c_pre,post o few fix (mask in shap_s2, EmPmR in external_field_load, USE_NATURAL_BCS in solve_for_P); o add arguments myIter & myTime to S/R obcs_calc & solve_for_P
o merge of relevant stuff from the ecco-branch:
- genmake: removed $S64 overwrite for case SunOS
- pkg/exf: update and corrections for field swapping and obcs
- pkg/ecco: parameter lists for the_model_main, the_main_loop
harmonized between ECCO and MITgcm
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice
updated checkpointing_lev... lists for obcs
- model/src: minor changes in forward_step, plot_field
added directive for divided adjoint in the_main_loop
- pkg/mdsio: added mdsio_gl_slice
updated
updated
Creating checkpoint44
updated
Annotation of c43.
Creating checkpoint42
Annotation for c41
Annotations for c40
Annotation for c40pre9
Checkpoint40pre8 (postponing c40)
Creating checkpoint40 --- no pre, no post, no nothin'
Creating checkpoint40pre7.
New tag checkpoint40pre6.
New tag: checkpoint40pre5
checkpoint40pre4
Doc. for checkpoint40pre3
Doc. for checkpoint40pre2
checkpoint39
checkpoint39
See doc/tag-index and doc/notes_c37_adj.txt Preparation for stand-alone autodifferentiability.
new tag
add a new tag (checkpoint36)
New checkpoint
Checkpoint34 (update).
Checkpoint34.
New tag (checkpoint32)
Notes for checkpoint32 added.
Comments for checkpoint31.
New tag.
New checkpoint (29).
Included documentation of changes from c27 to c28. (P.H.)
New checkpoint.
New checkpoint
Checkpoint 25
New checkpoint
New checkpoint
Entered checkpoint22 into tag-index.
New entry in tag-index for checkpoint21
Creating checkpoint20
Notes for tag checkpoint19.
Updates to tag0index for checkpoint18
Record updates for checkpoint17
Checkpoint16 documentation updates
CHanges to exchange routines for general tile <-> tile connectivity, DMA and shared memory communication hooks, variable width overlaps and TAMC reverse mode flag.
Consistent isomorphism changes
Added tag-index record for checkpoint13
Creating a tag in order to make a branch. See tag-index for info.
*** empty log message ***
New tag checkpoint11
Making tag checkpoint10
o General tidy-up. o MPI fix. Filename changes (meta/data). salbin*y stuff. o SST.bin SSS.bin added to verification/exp2
New tag and tag-index.
Fairly coplete 4 degree global intercomparison setup. Includes changes to make convective adjustment and hydrostatic pressure correct as well as IO for climatological datasets
Added tag-index record for checkpoint6
Added tag description
Added notes for new tag - checkpoint4
Added tag-index file for recording "release" information associated with a tag.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |