Log of /MITgcm/model/src/calc_diffusivity.F
Parent Directory
| Revision Log
| Revision Graph
Revision
1.36 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Feb 13 02:43:24 2008 UTC
(16 years, 3 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint59o,
checkpoint59p,
checkpoint59q,
checkpoint59r,
checkpoint60,
checkpoint61,
checkpoint61a,
checkpoint61b,
checkpoint61c,
checkpoint61d,
checkpoint61e,
checkpoint61f,
checkpoint61g,
checkpoint61h,
checkpoint61i,
checkpoint61j,
checkpoint61k,
checkpoint61l,
checkpoint61m,
checkpoint61n,
checkpoint61o,
checkpoint61p,
checkpoint61q,
checkpoint61r,
checkpoint61s,
checkpoint61t,
checkpoint61u,
checkpoint61v,
checkpoint61w,
checkpoint61x,
checkpoint61y,
checkpoint61z,
checkpoint62,
checkpoint62a,
checkpoint62b,
checkpoint62c
Changes since
1.35: +6 -2 lines
Diff to
previous 1.35
,
to
selected 1.25
fix for case where pkg/generic_advdiff is disable (e.g., exp. adjustment.cs-32x32x1)
Revision
1.34 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 27 14:42:59 2007 UTC
(16 years, 7 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
checkpoint59h,
checkpoint59i,
checkpoint59j,
checkpoint59k,
checkpoint59l,
checkpoint59m,
checkpoint59n
Changes since
1.33: +15 -14 lines
Diff to
previous 1.33
,
to
selected 1.25
Added comments, which describe the changes made in kpp_calc_diff_s & _t.F on
April 23, 2007. These routines no longer update the vertical
diffusivity array (passed as argument) but are (re-) setting those
arrays. Also changed order GMREDI_CALC_DIFF & KPP_CALC_DIFF_T in
calc_diffusivity.F and ptracers_calc_diff.F since now the order matters.
Revision
1.30 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Apr 11 15:05:58 2007 UTC
(17 years, 1 month ago)
by
jmc
Branch:
MAIN
Changes since
1.29: +2 -17 lines
Diff to
previous 1.29
,
to
selected 1.25
latest changes are so good (specially from testing on faulks with ifort)
that we will keep them confidential for now. Go back to previous version.
Revision
1.29 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Apr 11 00:00:47 2007 UTC
(17 years, 1 month ago)
by
dimitri
Branch:
MAIN
Changes since
1.28: +18 -3 lines
Diff to
previous 1.28
,
to
selected 1.25
o Added capability for latitudinal dependence of Bryan and Lewis, 1979
vertical diffusivity, similar to that in MOM4; vertical diffusivity is
specified using diffKrBL79* diffKrBLEQ* and KbryanLewisLatTransition
Revision
1.28 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Apr 5 22:51:48 2007 UTC
(17 years, 1 month ago)
by
dimitri
Branch:
MAIN
Changes since
1.27: +7 -5 lines
Diff to
previous 1.27
,
to
selected 1.25
Modified capability for 3D specification of background vertical diffusion
coefficient as per JM requests. 3D diffusion is now specified by
(i) #define ALLOW_3D_DIFFKR in CPP_OPTIONS.h and
(ii) specifying file diffKrFile in runtime "data" file that contains
the 3D vertical diffusivity coefficients.
Revision
1.27 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Apr 5 00:02:49 2007 UTC
(17 years, 1 month ago)
by
dimitri
Branch:
MAIN
Changes since
1.26: +3 -3 lines
Diff to
previous 1.26
,
to
selected 1.25
o Added capability for 3D specification of vertical diffusion coefficient.
This is done by specifying files diffKr3dSfile and diffKr3dTfile that
contain the 3D vertical diffusivity coefficients.
Modified files: doc/tag-index model/inc/PARAMS.h
model/src/calc_3d_diffusivity.F, calc_diffusivity.F, ini_mixing.F,
ini_parms.F, and set_defaults.F
Added missing file verification/tutorial_global_oce_latlon/run/.cvsignore
Revision
1.26 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Oct 28 00:30:57 2004 UTC
(19 years, 6 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpint57u_post,
checkpoint55i_post,
checkpoint55j_post,
checkpoint56,
checkpoint56a_post,
checkpoint56b_post,
checkpoint56c_post,
checkpoint57,
checkpoint57a_post,
checkpoint57a_pre,
checkpoint57b_post,
checkpoint57c_post,
checkpoint57c_pre,
checkpoint57d_post,
checkpoint57e_post,
checkpoint57f_post,
checkpoint57f_pre,
checkpoint57g_post,
checkpoint57g_pre,
checkpoint57h_done,
checkpoint57h_post,
checkpoint57h_pre,
checkpoint57i_post,
checkpoint57j_post,
checkpoint57k_post,
checkpoint57l_post,
checkpoint57m_post,
checkpoint57n_post,
checkpoint57o_post,
checkpoint57p_post,
checkpoint57q_post,
checkpoint57r_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,
checkpoint58v_post,
checkpoint58w_post,
checkpoint58x_post,
eckpoint57e_pre,
mitgcm_mapl_00
Changes since
1.25: +17 -17 lines
Diff to
previous 1.25
Change arrays for total vertical diffusivity (2.D explicit, 3.D implicit)
Revision
1.25 -
(
view)
(
download)
(
annotate)
-
[selected]
Fri Oct 22 01:42:34 2004 UTC
(19 years, 6 months ago)
by
jmc
Branch:
MAIN
Changes since
1.24: +61 -30 lines
Diff to
previous 1.24
towards separation of Explicit & Implicit vertical diffusivity
Revision
1.23 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 16 09:35:11 2004 UTC
(19 years, 8 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint54f_post,
checkpoint55,
checkpoint55a_post,
checkpoint55b_post,
checkpoint55c_post,
checkpoint55d_post,
checkpoint55d_pre,
checkpoint55e_post,
checkpoint55f_post,
checkpoint55g_post
Changes since
1.22: +9 -1 lines
Diff to
previous 1.22
,
to
selected 1.25
o prepare addition of new packages GGL90 and OPPS
- new parameters useGGL90 and useOPPS
- include call to the new routines at the (hopefully) right places
Revision
1.21 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 2 09:13:49 2004 UTC
(19 years, 8 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint54e_post
Changes since
1.20: +9 -1 lines
Diff to
previous 1.20
,
to
selected 1.25
o add calls for two new packages
- pp81 (Packanowski and Philander, 1981), Richardson number and
stratification dependent mixing
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme
Revision
1.19 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Jun 9 14:03:35 2004 UTC
(19 years, 11 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint53d_post,
checkpoint53f_post
Changes since
1.18: +7 -1 lines
Diff to
previous 1.18
,
to
selected 1.25
Added vertical diffusivity profile (T/S) due to Bryan and Lewis, 1979.
New parameters:
diffKrBL79surf - surface diffusivity
diffKrBL79deep - deep diffusivity
diffKrBL79Ho - turning depth for arctan function
diffKrBL79scl - depth scale for arctan function
This diffusivity is added to all other diffusivities. The defaults are
set so as to give zero diffusivity.
Revision
1.18 -
(
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,
checkpoint52e_post,
checkpoint52e_pre,
checkpoint52f_post,
checkpoint52f_pre,
checkpoint52h_pre,
checkpoint52i_post,
checkpoint52i_pre,
checkpoint52j_post,
checkpoint52j_pre,
checkpoint52k_post,
checkpoint52l_post,
checkpoint52l_pre,
checkpoint52m_post,
checkpoint52n_post,
checkpoint53,
checkpoint53a_post,
checkpoint53b_post,
checkpoint53b_pre,
checkpoint53c_post,
checkpoint53d_pre,
ecco_c52_e35,
hrcube4,
hrcube5,
hrcube_1,
hrcube_2,
hrcube_3
Branch point for:
branch-nonh,
checkpoint51n_branch,
netcdf-sm0,
tg2-branch
Changes since
1.17: +2 -1 lines
Diff to
previous 1.17
,
to
selected 1.25
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.17 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu May 30 02:27:00 2002 UTC
(21 years, 11 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
branch-exfmods-tag,
branchpoint-genmake2,
checkpoint45b_post,
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_post,
checkpoint46g_pre,
checkpoint46h_post,
checkpoint46h_pre,
checkpoint46i_post,
checkpoint46j_post,
checkpoint46j_pre,
checkpoint46k_post,
checkpoint46l_post,
checkpoint46l_pre,
checkpoint46m_post,
checkpoint46n_post,
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_post,
checkpoint50c_pre,
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-exfmods-curt,
branch-genmake2
Changes since
1.16: +5 -5 lines
Diff to
previous 1.16
,
to
selected 1.25
Extended calculation to full overlap
(needed to avoid partial recomputation in adjoint mode).
CVS ----------------------------------------------------------------------
Revision
1.16 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Sep 26 18:09:13 2001 UTC
(22 years, 7 months ago)
by
cnh
Branch:
MAIN
CVS Tags:
checkpoint41,
checkpoint42,
checkpoint43,
checkpoint43a-release1mods,
checkpoint44,
checkpoint44b_post,
checkpoint44b_pre,
checkpoint44e_post,
checkpoint44e_pre,
checkpoint44f_post,
checkpoint44f_pre,
checkpoint44g_post,
checkpoint44h_post,
checkpoint44h_pre,
checkpoint45,
checkpoint45a_post,
chkpt44a_post,
chkpt44a_pre,
chkpt44c_post,
chkpt44c_pre,
chkpt44d_post,
ecco-branch-mod1,
ecco-branch-mod2,
ecco-branch-mod3,
ecco-branch-mod4,
ecco-branch-mod5,
ecco_c44_e16,
ecco_c44_e17,
ecco_c44_e18,
ecco_c44_e19,
ecco_c44_e20,
ecco_c44_e21,
ecco_c44_e22,
release1-branch-end,
release1-branch_branchpoint,
release1-branch_tutorials,
release1_b1,
release1_beta1,
release1_chkpt44d_post,
release1_final_v1,
release1_p1
Branch point for:
ecco-branch,
release1,
release1-branch,
release1_coupled,
release1_final
Changes since
1.15: +29 -14 lines
Diff to
previous 1.15
,
to
selected 1.25
Bringing comments up to data and formatting for document extraction.
Revision
1.11 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Mon Sep 11 22:59:45 2000 UTC
(23 years, 8 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
branch-atmos-merge-freeze,
branch-atmos-merge-phase1,
branch-atmos-merge-phase2,
branch-atmos-merge-phase3,
branch-atmos-merge-phase4,
branch-atmos-merge-phase5,
branch-atmos-merge-phase6,
branch-atmos-merge-phase7,
branch-atmos-merge-shapiro,
branch-atmos-merge-start,
branch-atmos-merge-zonalfilt,
checkpoint31,
checkpoint32,
checkpoint33,
checkpoint34
Branch point for:
branch-atmos-merge
Changes since
1.10: +3 -3 lines
Diff to
previous 1.10
,
to
selected 1.25
Change variable name useKPP, useGMRedi.
Revision
1.4 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Jun 10 16:05:39 1998 UTC
(25 years, 11 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
branch-point-rdot,
checkpoint10,
checkpoint11,
checkpoint12,
checkpoint13,
checkpoint7,
checkpoint8,
checkpoint9
Branch point for:
branch-rdot,
checkpoint7-4degree-ref
Changes since
1.3: +10 -2 lines
Diff to
previous 1.3
,
to
selected 1.25
Added code to bring "salt" up-to-date with "theta".
One caveat is that implicit diffusion of salt is done with the
diffusivity of theta. We'll sort this out later. In explicit
mode, diffKzS is used.
Revision
1.1 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Mon Jun 1 22:27:14 1998 UTC
(25 years, 11 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint5,
checkpoint6
Diff
to
selected 1.25
Implemented implicit vertical diffusion (tracers only).
Involved introducing a "total" diffusivity array (local 3D)
calculated by calc_diffusivity().
Made some small changes to time-stepping algorithm.
Switched on by setting implicitZdiffusion.
(note: *Not* fully tested with topography. But when switched off
this does produce identical results)
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.