Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint63a: | (view) (download) (annotate) |
| Sticky Tag: |
OBC in NH momentum: mask (maskInW,S) gradient of wVel in del2w calculation
add commented line to reproduce old results (with bug in vertical flux)
add NH free-surface formulation (selectNHfreeSurf=1) (not fully tested)
Implement AB-3 for non-hydrostatic vertical momentum ; add 2-D field to store Hydrostatic Surface Pressure adjusment (from cg3d).
Fix missing vertical flux of vert. momentum near surface (k=1). This fix a spurious source of energy for simple baroclinic adjusment test case.
- fix filling of diagnostics: Wm_Diss & Wm_Advec - fix viscA4 on CS-grid : use rLow & rSurf @ W & S location (new) + apply FILL_CS_CORNER_TR_RL to wVel before del2w calculation
add diagnostics for vertical momentum tendencies
fix diagnostics VISCAHW & VISCA4W.
prepare for "clever pickup" implementation: add startAB parameter to argument list of S/R ADAMS_BASHFORTH2
- use reference profile for w <-> omega conversion in NH-code - change grid factor arround a W-point to work in p-coord. (keep the previous version within #ifndef CALC_GW_NEW_THICK for now)
start to implement deep-atmosphere and/or anelastic formulation
put back side-drag (by calling new S/R MOM_W_SIDEDRAG)
fix syntax Pb (seen only with ifc)
test "use3dCoriolis" instead of useCoriolis
true flux-form, account for horizontal grid spacing.
- fix for partial-cell & non-uniform vertical resolution - fix del2w (true flux-form) - horizontal grid spacing not yet accounted for (commented out)
need to fix the side-drag implementation; for now, just impose free-slip
- take bi,bj loops outside of calc_gw (since KappaRU,V are local array) - start cleaning-up but leave the bugs (so that results don't change)
Pass the variable viscosities on to calc_gw.
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
isolate forward stepping of wVel in new S/R (previously part of calc_gw)
cycle gW,gwNm1 like other tendencies (gU,gT ...) and write gwNm1 to pickup file
no AB-2 at the 1rst iteration for Gw (like what is done for Gu,Gv,Gt,Gs)
put all NH variables (formely in DYNVARS.h & GW.h) in NH_VARS.h
fix initialisation Pb (del2w) responsible for getting NANs with g77 on faulks
add arguments: myTime & myIter.
Added run-time parameters nh_Am2 which scales the non-hydrostatic terms and changes internal scales (i.e. allows convection at different Rayleigh numbers).
add horizontal bi-harmonic viscosity of vertical viscosity - used only in non-hydrostatic code - add a parameter viscA4W that defaults to viscA4 if unset, otherwise usefull if you want to use the Leith viscosity for horizontal velocity an biharmonic viscosity in the vertical.
o non-hydrostatic code:
- add new parameter viscAhW, replaces viscAh in calc_gw, defaults to
viscAh. Useful when viscAh=0 in non-hydrostatic simulations
o fix syntax for Intel compiler ("no type" error)
o fix bugs and recode lateral boundary conditions for viscous terms
o changes to calc_gw.F - bug fix for w^2 term near the bottom boundary - (hopefully) improve the lateral slip boundary condtions for use with partial/looped cells - because the bug fix changes two verification experiments anyway (exp5 and plume on slope), change the lateral boundary condition from half slip to the value of no_slip_sides o update the verification experiments exp5 and plume_on_slope
include FFIELDS.h not needed ;
clean-up previous modif ( to test free-slip / no-slip B.C )
modified to test free-slip / no-slip B.C. (Matthew's request)
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
Bringing comments up to data and formatting for document extraction.
copy gW -> gwNm1 moved from the end to the beginning of the routine
remove "include CG2D.h"
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
Added "hook" for setting w(n+1) on OBs. Need to modify apply_obcs3() to finish.
Fixed some uninitialized or unused variables. This caused some compilers to either complain or stop. Numerous but harmless.
Various updates for OBCs and Non-hydrostatic routines. o OBCs now fits into time-stepping properly o div.G has been moved to solve_for_pressure()
Modifications for non-hydrostatic ability + updates for open-boundaries.
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 |