Log of /MITgcm/model/src/convective_adjustment.F
Parent Directory
| Revision Log
| Revision Graph
Revision
1.33 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Feb 13 21:56:48 2009 UTC
(15 years, 3 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint61j,
checkpoint61k,
checkpoint61l,
checkpoint61m,
checkpoint61n,
checkpoint61o,
checkpoint61p,
checkpoint61q,
checkpoint61r,
checkpoint61s,
checkpoint61t,
checkpoint61u,
checkpoint61v,
checkpoint61w,
checkpoint61x,
checkpoint61y,
checkpoint61z,
checkpoint62,
checkpoint62a,
checkpoint62b,
checkpoint62c,
checkpoint62d,
checkpoint62e,
checkpoint62f,
checkpoint62g,
checkpoint62h,
checkpoint62i,
checkpoint62j,
checkpoint62k,
checkpoint62l,
checkpoint62m,
checkpoint62n,
checkpoint62o,
checkpoint62p,
checkpoint62q,
checkpoint62r,
checkpoint62s,
checkpoint62t,
checkpoint62u,
checkpoint62v,
checkpoint62w,
checkpoint62x,
checkpoint62y,
checkpoint62z,
checkpoint63,
checkpoint63a,
checkpoint63b,
checkpoint63c,
checkpoint63d,
checkpoint63e,
checkpoint63f,
checkpoint63g,
checkpoint63h,
checkpoint63i,
checkpoint63j,
checkpoint63k,
checkpoint63l,
checkpoint63m,
checkpoint63n,
checkpoint63o,
checkpoint63p,
checkpoint63q,
checkpoint63r,
checkpoint63s,
checkpoint64,
checkpoint64a,
checkpoint64b,
checkpoint64c,
checkpoint64d,
checkpoint64e,
checkpoint64f,
checkpoint64g,
checkpoint64h,
checkpoint64i,
checkpoint64j,
checkpoint64k,
checkpoint64l,
checkpoint64m,
checkpoint64n,
checkpoint64o,
checkpoint64p,
checkpoint64q,
checkpoint64r,
checkpoint64s,
checkpoint64t,
checkpoint64u
Changes since
1.32: +21 -11 lines
Diff to
previous 1.32
Add TAF option "kind" (or adjust "byte") to enable real*4 common blocks
Revision
1.30 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Feb 4 21:12:17 2007 UTC
(17 years, 3 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint58v_post,
checkpoint58w_post,
checkpoint58x_post,
checkpoint58y_post,
checkpoint59,
checkpoint59a,
checkpoint59b,
checkpoint59c,
checkpoint59d,
checkpoint59e,
checkpoint59f,
checkpoint59g,
checkpoint59h,
checkpoint59i,
checkpoint59j,
checkpoint59k,
checkpoint59l,
checkpoint59m,
checkpoint59n,
checkpoint59o,
checkpoint59p,
checkpoint59q,
checkpoint59r,
checkpoint60
Changes since
1.29: +28 -16 lines
Diff to
previous 1.29
iMin,iMax,jMin,jMax are set within convective_adjustment S/R instead of
passed as argument ;
fix uninitialized variable Pb by computing rhoK & rhoKm1 over the full domain.
Revision
1.29 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 15 14:55:15 2005 UTC
(18 years, 8 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpint57u_post,
checkpoint57s_post,
checkpoint57t_post,
checkpoint57v_post,
checkpoint57w_post,
checkpoint57x_post,
checkpoint57y_post,
checkpoint57y_pre,
checkpoint57z_post,
checkpoint58,
checkpoint58a_post,
checkpoint58b_post,
checkpoint58c_post,
checkpoint58d_post,
checkpoint58e_post,
checkpoint58f_post,
checkpoint58g_post,
checkpoint58h_post,
checkpoint58i_post,
checkpoint58j_post,
checkpoint58k_post,
checkpoint58l_post,
checkpoint58m_post,
checkpoint58n_post,
checkpoint58o_post,
checkpoint58p_post,
checkpoint58q_post,
checkpoint58r_post,
checkpoint58s_post,
checkpoint58t_post,
checkpoint58u_post,
mitgcm_mapl_00
Changes since
1.28: +8 -1 lines
Diff to
previous 1.28
add diagnostics for Convective Adjusment.
Revision
1.24 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sat Dec 4 05:59:50 2004 UTC
(19 years, 5 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
checkpoint57,
checkpoint57a_post,
checkpoint57a_pre,
checkpoint57b_post,
checkpoint57c_post,
checkpoint57c_pre,
checkpoint57d_post,
checkpoint57e_post,
checkpoint57f_pre,
eckpoint57e_pre
Changes since
1.23: +3 -3 lines
Diff to
previous 1.23
Added CPP option MINIMAL_TAVE_OUTPUT for minimal time-averaged output:
S, T, U, V, W, ETA, and phiHydLow.
Revision
1.22 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Sep 17 22:57:11 2004 UTC
(19 years, 8 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint55,
checkpoint55a_post,
checkpoint55b_post,
checkpoint55c_post,
checkpoint55d_post,
checkpoint55d_pre,
checkpoint55e_post,
checkpoint55f_post,
checkpoint55g_post
Changes since
1.21: +1 -13 lines
Diff to
previous 1.21
o remove all tr1-related code (ALLOW_PASSIVE_TRACER)
(adjoint stuff still has some tr1 names, but all use ptracer arrays)
Revision
1.21 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Jan 25 00:31:52 2004 UTC
(20 years, 4 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
checkpoint52j_post,
checkpoint52j_pre,
checkpoint52k_post,
checkpoint52l_post,
checkpoint52l_pre,
checkpoint52m_post,
checkpoint52n_post,
checkpoint53,
checkpoint53a_post,
checkpoint53b_post,
checkpoint53b_pre,
checkpoint53c_post,
checkpoint53d_post,
checkpoint53d_pre,
checkpoint53f_post,
checkpoint53g_post,
checkpoint54,
checkpoint54a_post,
checkpoint54a_pre,
checkpoint54b_post,
checkpoint54c_post,
checkpoint54d_post,
checkpoint54e_post,
checkpoint54f_post,
hrcube4,
hrcube5,
hrcube_2,
hrcube_3
Changes since
1.20: +3 -1 lines
Diff to
previous 1.20
o limit timeave output for hi-res integrations
Revision
1.19 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Oct 9 04:19:18 2003 UTC
(20 years, 7 months ago)
by
edhill
Branch:
MAIN
CVS Tags:
branch-netcdf,
checkpoint51i_post,
checkpoint51k_post,
checkpoint51l_post,
checkpoint51l_pre,
checkpoint51m_post,
checkpoint51n_post,
checkpoint51n_pre,
checkpoint51o_post,
checkpoint51o_pre,
checkpoint51p_post,
checkpoint51q_post,
checkpoint51r_post,
checkpoint51s_post,
checkpoint51t_post,
checkpoint51u_post,
checkpoint52,
checkpoint52a_post,
checkpoint52a_pre,
checkpoint52b_post,
checkpoint52b_pre,
checkpoint52c_post,
checkpoint52d_post,
checkpoint52d_pre,
ecco_c52_e35
Branch point for:
branch-nonh,
checkpoint51n_branch,
netcdf-sm0,
tg2-branch
Changes since
1.18: +4 -1 lines
Diff to
previous 1.18
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
Revision
1.18 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu May 1 22:30:33 2003 UTC
(21 years ago)
by
jmc
Branch:
MAIN
CVS Tags:
branchpoint-genmake2,
checkpoint50c_post,
checkpoint50d_post,
checkpoint50d_pre,
checkpoint50e_post,
checkpoint50e_pre,
checkpoint50f_post,
checkpoint50f_pre,
checkpoint50g_post,
checkpoint50h_post,
checkpoint50i_post,
checkpoint51,
checkpoint51a_post,
checkpoint51b_post,
checkpoint51b_pre,
checkpoint51c_post,
checkpoint51d_post,
checkpoint51e_post,
checkpoint51f_post,
checkpoint51f_pre,
checkpoint51g_post,
checkpoint51h_pre,
checkpoint51i_pre,
checkpoint51j_post
Branch point for:
branch-genmake2
Changes since
1.17: +3 -3 lines
Diff to
previous 1.17
fix bug in convective adj. diagnostic (ConvectCount is a local array !)
and add time-average diagnostic of U*V and diff_Kr*theta
Revision
1.17 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Nov 15 03:01:21 2002 UTC
(21 years, 6 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
branch-exfmods-tag,
checkpoint47,
checkpoint47a_post,
checkpoint47b_post,
checkpoint47c_post,
checkpoint47d_post,
checkpoint47d_pre,
checkpoint47e_post,
checkpoint47f_post,
checkpoint47g_post,
checkpoint47h_post,
checkpoint47i_post,
checkpoint47j_post,
checkpoint48,
checkpoint48a_post,
checkpoint48b_post,
checkpoint48c_post,
checkpoint48c_pre,
checkpoint48d_post,
checkpoint48d_pre,
checkpoint48e_post,
checkpoint48f_post,
checkpoint48g_post,
checkpoint48h_post,
checkpoint48i_post,
checkpoint49,
checkpoint50,
checkpoint50a_post,
checkpoint50b_post,
checkpoint50b_pre,
checkpoint50c_pre
Branch point for:
branch-exfmods-curt
Changes since
1.16: +15 -14 lines
Diff to
previous 1.16
differentiable version of checkpoint46n_post
o external_fields_load now part of differentiation list
o pressure needs multiple storing;
would be nice to have store_pressure at beginning or
end of forward_step, e.g. by having phiHyd global (5-dim.)
(NB: pressure is needed for certain cases in find_rho,
which is also invoked through convective_adjustment).
o recomputations in find_rho for cases
'JMD95'/'UNESCO' or 'MDJWF' are OK.
o #define ATMOSPHERIC_LOADING should be differentiable
o ini_forcing shifted to begining of initialise_varia
Revision
1.15 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Nov 1 22:00:33 2002 UTC
(21 years, 6 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint46l_post
Changes since
1.14: +29 -5 lines
Diff to
previous 1.14
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
Revision
1.14 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Sep 18 16:38:01 2002 UTC
(21 years, 8 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint46g_post,
checkpoint46h_post,
checkpoint46h_pre,
checkpoint46i_post,
checkpoint46j_post,
checkpoint46j_pre,
checkpoint46k_post,
checkpoint46l_pre
Changes since
1.13: +3 -3 lines
Diff to
previous 1.13
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)
Revision
1.13 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu May 30 22:48:33 2002 UTC
(21 years, 11 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint45c_post,
checkpoint45d_post,
checkpoint46,
checkpoint46a_post,
checkpoint46a_pre,
checkpoint46b_post,
checkpoint46b_pre,
checkpoint46c_post,
checkpoint46c_pre,
checkpoint46d_post,
checkpoint46d_pre,
checkpoint46e_post,
checkpoint46e_pre,
checkpoint46f_post,
checkpoint46g_pre
Changes since
1.12: +3 -2 lines
Diff to
previous 1.12
removed some f90 comments ("!")
Revision
1.11 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Mon Mar 4 17:26:40 2002 UTC
(22 years, 2 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint44f_post,
checkpoint44g_post,
checkpoint44h_pre
Changes since
1.10: +9 -1 lines
Diff to
previous 1.10
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.
Revision
1.10 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Feb 26 19:50:12 2002 UTC
(22 years, 2 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint44e_post,
checkpoint44f_pre
Changes since
1.9: +33 -5 lines
Diff to
previous 1.9
Re-wrote the convective mixing algorithm to use pre-calculated weights.
Uses two new routines:
- convective_weights() calculates mixing factors A and B, called once
- convectively_mixtracers() mixes a tracer (argument) using A and B
and is called for each tracer
The old call to convect() is simply commented out for the time-being.
Similarly, convect.F still exists. I thought it prudent to leave them
around until the TAF/TAMC related bits are added.
Revision
1.9 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Jan 11 17:31:19 2002 UTC
(22 years, 4 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint43a-release1mods,
checkpoint44,
checkpoint44b_post,
checkpoint44b_pre,
checkpoint44e_pre,
chkpt44a_post,
chkpt44a_pre,
chkpt44c_post,
chkpt44c_pre,
chkpt44d_post,
release1-branch-end,
release1-branch_branchpoint,
release1-branch_tutorials
Branch point for:
release1-branch,
release1_final
Changes since
1.8: +1 -5 lines
Diff to
previous 1.8
Minor cleanup.
Revision
1.7 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Mon May 14 21:46:17 2001 UTC
(23 years ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint39,
checkpoint40,
checkpoint40pre1,
checkpoint40pre2,
checkpoint40pre3,
checkpoint40pre4,
checkpoint40pre5,
checkpoint40pre6,
checkpoint40pre7,
checkpoint40pre8,
checkpoint40pre9
Changes since
1.6: +9 -8 lines
Diff to
previous 1.6
Modifications/fixes to support TAMC differentiability
(mostly missing or wrong directives).
Revision
1.3 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Feb 4 14:38:46 2001 UTC
(23 years, 3 months ago)
by
cnh
Branch:
MAIN
CVS Tags:
checkpoint35
Changes since
1.2: +2 -1 lines
Diff to
previous 1.2
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!
Revision
1.2 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Feb 2 21:04:47 2001 UTC
(23 years, 3 months ago)
by
adcroft
Branch:
MAIN
Changes since
1.1: +100 -0 lines
Diff to
previous 1.1
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
Revision
1.1
Thu Jan 4 21:41:33 2001 UTC
(23 years, 4 months ago)
by
adcroft
Branch:
MAIN
Branch point for:
branch-atmos-merge
FILE REMOVED
file convective_adjustment.F was initially added on branch branch-atmos-merge.
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.