Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
extend length of drC & recip_drC from Nr to Nr+1
add 2 array to project model C-grid velocity on to zonal direction (similar to AngleCosC & -AngleSinC but at U and V point location)
first check-in of sigma (and hybrid-sigma) coordinate code
change comments (recipricol -> reciprocal)
make arrays rLowW,rLowS & rSurfW,rSurfS always available (no longer restricted to ALLOW_NONHYDROSTATIC) in preparation for Sigma-Coord.
comment out maskH declaration
add 2-D "interior" mask (Center, Western & Southern) (i.e., zero beyond OB) (for now, keep "maskH" during the transition, but will be remove later)
remove xC0,yC0 (not initialised, not used)
- separated common blocs for _RS & _RL variables & for Bottom_Control var. - add rLow * rSurf @ W & S location (for Non-Hydrostatic viscA4 on CS-grid)
move kSurfC,W,S from SURFACE.h to GRID.h (next to kLowC) to facilitate conversion of oceanic pkg to p-coordinate
add deep-atmosphere grid factors.
remove storage & computation of recip_hFacU (not used)
Modifications for bottom topography control o replace hFacC by _hFacC at various places o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL o add non-self-adjoint cg2d_nsa o update autodiff support routines o re-initialise hfac after ctrl_depth_ini o works for 5x5 box, doesnt work for global_ocean.90x40x15
add globalArea (Domain Integrated horizontal area [m2])
add cos & sin of grid-direction orientation angle (relative to W-E, S-N dir.)
"rkSign" replaces "-rkFac" (<- removed)
move Coriolis array from PARAMS.h to GRID.h
Re-arranging common block GRID_R (_RL first, then _RS) to please compiler optim.
o some bug fixes for #undef REAL4_IS_SLOW
o remove all '#include "PACACKAGES_CONFIG.h"' from model/inc/* and cleanup
the verification tests that this breaks
o this was confirmed to work for the basic tests ("testreport -ieee") on
shelley
* reverse gravitySign back to "logical" value: +1 when R increases downward * add a parameter to apply surface relaxation only in a latitude band
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
o included PACKAGES_CONFIG.h in all files where the ALLOW_${PKG_NAME}
defines are used
o added comments where IF ( use${PKG_NAME} ) statements will probably
be needed -- or need to be edited
Merging from c51
Removed single quotes from comments.
Merging c44 and e27
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)
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.
Merging changes on MAIN between checkpoint43 and checkpoint43a-release1mods
Command: cvs -q update -jcheckpoint43 -jcheckpoint43a-release1mods -d -P
These changes are most of the changes between c43 and c44 except those
that occured after "12:45 11 Jan 2002". As far as I can tell it is
checkpoint43 with the following mods:
o fix bug in mom_vi_del2uv
o select when filters are applied ; add options to zonal_filter (data.zonfilt) o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
o update AIM experiments (NCEP input files)
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
o added some stuff for AD
o Jamar wet-points
This update does not contain the following mods that are in checkpoint44
o bug fix in pkg/generic_advdiff/
- thread related bug, bi,bj arguments in vertical advection routines
o some changes to pkg/autodiff, pkg/cost, pkg/exf, pkg/ecco,
verification/carbon and model/src/ related to adjoint
o some new Matlab scripts for diagnosing model density
- utils/matlab/dens_poly3.m and ini_poly3.m
The list of exclusions is accurate based on a "cvs diff". The list of
inclusions is based on the record in doc/tag-index which may not be complete.
Updating ecco-branch-mod1 to checkpoint44. Will be tagged ecco-branch-mod2.
add a 2D full-column mask
Added a single character after a \ followed by white space and new-line. Why we insist in drawing pictures in ASCII and not simply incorporating PostScript into our comments, I don't know... ;^)
More comments up to date and formatted for document extraction of "prototypes".
Merge from branch pre38: o essential mods for cubed sphere o debugged atmosphere, dynamcis + physics (aim) o new packages (mom_vecinv, mom_fluxform, ...)
add 2D array to define surface and bottom position ; add 3D center-cell mask
Preculiar: g77 suddenly recommended re-ordering GRID_R for padding! I obeyed my master...
Cosine(latitude) scaling: - moved initializatino to grid routines - updated discretization to use "method III" and optionally an-isotropic - introduced same scaling for diffusion
Made sure each .F and .h file had the CVS keywords Header and Name at its start. Most had header but very few currently have Name, so lots of changes!
Merged changes from branch "branch-atmos-merge" into MAIN (checkpoint34) - substantial modifications to algorithm sequence (dynamics.F) - packaged OBCS, Shapiro filter, Zonal filter, Atmospheric Physics
o Added missing comment defining meaning of global array yG
added xG,yG arrays (coordinates of cells corner) added redip of area* (recip_rA*) use different formulas for caculating spherical grid
Modifications for non-hydrostatic ability + updates for open-boundaries.
These are changes concerning geometry on a sphere and BCs: o The calculation of RA used to be wrong if delX != delY. o The details of the cell geometry is now consistent with the "classic" CM-5 code. o Advection near boundaries is now correct. o Lateral no-slip/free-slip now works. o Vertical no-slip/free-slip now works properly. o del^4 viscosity (with no-slip/free-slip) now works properly.
Changes for new exchange routines which do general tile <-> tile connectivity, variable width overlap regions and provide hooks for shared memory and DMA protocols like Arctic, Memory Channel etc..
Consistent isomorphism changes
*** empty log message ***
Consistent isomorphism changes
Isomorphism consistency changes
Changes for moving from z -> r as a vertical coordinate Required changing r -> recip for reciprocal variable notation.
Merge of GM Redi and spherical polar and inplicit diffusion and CD. Everything for a global run is now included, however, still some discrepancies with GM Redi.
Changes to support "low" memory mode of operation - Small change to allow _RS -> REAL*4 to work - Added some macros for case where grid variations are a a subset of the general case. e.g. dx constnat or flat bottom
$Id to $Header changes
Imported working release
Initial revision
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 |