Log of /MITgcm/pkg/kpp/kpp_calc.F
Parent Directory
| Revision Log
| Revision Graph
Revision
1.54 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Jan 20 01:32:20 2010 UTC
(14 years, 5 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
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.53: +1 -3 lines
Diff to
previous 1.53
,
to
selected 1.3
remove unused variables
Revision
1.51 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Sep 18 11:40:22 2009 UTC
(14 years, 9 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint61v
Changes since
1.50: +14 -1 lines
Diff to
previous 1.50
,
to
selected 1.3
add double diffusive contributions as a hack, turned off by default
for now, and the code can be excluded with a CPP-flag
EXCLUDE_KPP_DOUBLEDIFF just as EXCLUDE_KPP_SHEAR_MIX
Revision
1.50 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Apr 28 18:15:33 2009 UTC
(15 years, 2 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint61m,
checkpoint61n,
checkpoint61o,
checkpoint61p,
checkpoint61q,
checkpoint61r,
checkpoint61s,
checkpoint61t,
checkpoint61u
Changes since
1.49: +2 -2 lines
Diff to
previous 1.49
,
to
selected 1.3
change macros (EXCH & GLOBAL_SUM/MAX) sufix _R4/_R8 to _RS/_RL
when applied to _RS/_RL variable
Revision
1.47 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Dec 27 21:26:49 2007 UTC
(16 years, 6 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
checkpoint59m,
checkpoint59n,
checkpoint59o,
checkpoint59p,
checkpoint59q,
checkpoint59r,
checkpoint60,
checkpoint61,
checkpoint61a,
checkpoint61b,
checkpoint61c,
checkpoint61d,
checkpoint61e
Changes since
1.46: +4 -3 lines
Diff to
previous 1.46
,
to
selected 1.3
bug fixes for threaded version of salt_plume + kpp
Revision
1.33 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sat Feb 25 16:29:55 2006 UTC
(18 years, 4 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
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,
checkpoint58y_post
Changes since
1.32: +12 -7 lines
Diff to
previous 1.32
,
to
selected 1.3
Improve adjoint solver residual from E+204 to E+34
An improvement of 100+ orders of magn.
Aint it amazing (and still useless).
Revision
1.32 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun May 15 03:04:56 2005 UTC
(19 years, 1 month ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpint57u_post,
checkpoint57h_done,
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
Changes since
1.31: +4 -4 lines
Diff to
previous 1.31
,
to
selected 1.3
remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
and rename it: DIFFERENT_MULTIPLE
Revision
1.30 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Oct 17 23:05:09 2004 UTC
(19 years, 8 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint55h_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_pre,
eckpoint57e_pre
Changes since
1.29: +3 -3 lines
Diff to
previous 1.29
,
to
selected 1.3
allow to set a vertical profile of vertical diffusivity for T & S
Revision
1.29 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Jul 18 15:29:52 2004 UTC
(19 years, 11 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint54d_post,
checkpoint54e_post,
checkpoint54f_post,
checkpoint55,
checkpoint55a_post,
checkpoint55b_post,
checkpoint55c_post,
checkpoint55d_post,
checkpoint55d_pre,
checkpoint55e_post,
checkpoint55f_post,
checkpoint55g_post
Changes since
1.28: +2 -2 lines
Diff to
previous 1.28
,
to
selected 1.3
bug fixed in kpp_calc.F : ustarY = ( SurfaceTendencyV )_j /drF(1)
Revision
1.28 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sun Jul 18 01:20:22 2004 UTC
(19 years, 11 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint54c_post
Changes since
1.27: +32 -30 lines
Diff to
previous 1.27
,
to
selected 1.3
- replace surfaceTendency U,V,S,T,Tice by surfaceForcing U,V,S,T,Tice
- replace pMask by maskC
Revision
1.27 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue May 11 20:57:08 2004 UTC
(20 years, 1 month ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint53a_post,
checkpoint53b_post,
checkpoint53b_pre,
checkpoint53c_post,
checkpoint53d_post,
checkpoint53d_pre,
checkpoint53f_post,
checkpoint53g_post,
checkpoint54,
checkpoint54a_post,
checkpoint54a_pre,
checkpoint54b_post
Changes since
1.26: +4 -4 lines
Diff to
previous 1.26
,
to
selected 1.3
o Additional storing in an attempt to fix
TAMC problem with adjoint of KPP code.
(no success...)
Identical code works fine with TAF.
Revision
1.23 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Nov 13 06:35:14 2003 UTC
(20 years, 7 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
branch-netcdf,
checkpoint52a_post,
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,
hrcube4,
hrcube5,
hrcube_1,
hrcube_2,
hrcube_3
Branch point for:
netcdf-sm0
Changes since
1.22: +4 -22 lines
Diff to
previous 1.22
,
to
selected 1.3
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
Revision
1.19 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Oct 23 07:14:49 2003 UTC
(20 years, 8 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
checkpoint51n_post
Branch point for:
checkpoint51n_branch
Changes since
1.18: +4 -19 lines
Diff to
previous 1.18
,
to
selected 1.3
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
Revision
1.18 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Oct 2 14:38:37 2003 UTC
(20 years, 9 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint51f_post,
checkpoint51g_post,
checkpoint51h_pre,
checkpoint51i_post,
checkpoint51i_pre,
checkpoint51j_post,
checkpoint51k_post,
checkpoint51l_post,
checkpoint51l_pre,
checkpoint51m_post,
checkpoint51n_pre
Branch point for:
tg2-branch
Changes since
1.17: +3 -3 lines
Diff to
previous 1.17
,
to
selected 1.3
Added CPP style comments to #endif ALLOW_
#endif ALLOW_ -> #endif /* ALLOW_ */
Revision
1.17 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Apr 30 07:04:08 2003 UTC
(21 years, 2 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
branchpoint-genmake2,
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_pre
Branch point for:
branch-genmake2
Changes since
1.16: +3 -3 lines
Diff to
previous 1.16
,
to
selected 1.3
checkpoint50c_pre
Merging from release1_p13:
o bug fix for pkg/seaice dynamic solver
o Added SEAICE_initialHEFF to pkg/seaice
Revision
1.14 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sat Dec 28 10:11:11 2002 UTC
(21 years, 6 months ago)
by
dimitri
Branch:
MAIN
CVS Tags:
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
Changes since
1.13: +3 -3 lines
Diff to
previous 1.13
,
to
selected 1.3
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
Revision
1.13 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Nov 12 20:45:41 2002 UTC
(21 years, 7 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
branch-exfmods-tag,
checkpoint46n_post,
checkpoint47,
checkpoint47a_post,
checkpoint47b_post,
checkpoint47c_post,
checkpoint47d_post,
checkpoint47d_pre,
checkpoint47e_post
Branch point for:
branch-exfmods-curt
Changes since
1.12: +21 -2 lines
Diff to
previous 1.12
,
to
selected 1.3
Merging from release1_p8 branch:
Adding package parameters and hooks for new seaice package.
Revision
1.12 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Sep 25 19:36:50 2002 UTC
(21 years, 9 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint46h_post,
checkpoint46i_post,
checkpoint46j_post,
checkpoint46j_pre,
checkpoint46k_post,
checkpoint46l_post,
checkpoint46l_pre,
checkpoint46m_post
Changes since
1.11: +2 -2 lines
Diff to
previous 1.11
,
to
selected 1.3
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
Revision
1.11 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Sat Jul 13 03:12:30 2002 UTC
(21 years, 11 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
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_pre
Changes since
1.10: +38 -10 lines
Diff to
previous 1.10
,
to
selected 1.3
Merging from release1_p5
o Adjoint-related bug fixes in kpp:
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix
- kpp_routines: store of Rib avoids partial recomputation bug of TAF.
Revision
1.10 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Mar 7 14:27:47 2002 UTC
(22 years, 3 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
checkpoint44h_post,
checkpoint44h_pre,
checkpoint45,
checkpoint45a_post,
checkpoint45b_post,
checkpoint45c_post,
checkpoint45d_post
Changes since
1.9: +10 -10 lines
Diff to
previous 1.9
,
to
selected 1.3
o vertical grid : use model standard arrays (drF,drC,rF,rC) instead of delZ.
kpp is now compatible with new options (delR,delRc in file "data").
This does not change the results nor the possibility to specify delZ in
file "data";
Revision
1.9 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 27 18:08:57 2001 UTC
(22 years, 9 months ago)
by
adcroft
Branch:
MAIN
CVS Tags:
checkpoint42,
checkpoint43,
checkpoint43a-release1mods,
checkpoint44,
checkpoint44b_post,
checkpoint44b_pre,
checkpoint44e_post,
checkpoint44e_pre,
checkpoint44f_post,
checkpoint44f_pre,
checkpoint44g_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,
release1-branch-end,
release1-branch_branchpoint,
release1-branch_tutorials,
release1_b1,
release1_beta1,
release1_chkpt44d_post
Branch point for:
ecco-branch,
release1,
release1-branch,
release1_coupled,
release1_final
Changes since
1.8: +3 -3 lines
Diff to
previous 1.8
,
to
selected 1.3
Missing /* and */ around comments after #endif
Revision
1.8 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Mon May 14 21:42:07 2001 UTC
(23 years, 1 month ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint39,
checkpoint40,
checkpoint40pre1,
checkpoint40pre2,
checkpoint40pre3,
checkpoint40pre4,
checkpoint40pre5,
checkpoint40pre6,
checkpoint40pre7,
checkpoint40pre8,
checkpoint40pre9,
checkpoint41
Changes since
1.7: +51 -2 lines
Diff to
previous 1.7
,
to
selected 1.3
Added S/R kpp_calc_dummy.
Revision
1.5 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Nov 29 22:29:23 2000 UTC
(23 years, 7 months ago)
by
adcroft
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,
checkpoint33,
checkpoint34
Branch point for:
branch-atmos-merge
Changes since
1.4: +3 -2 lines
Diff to
previous 1.4
,
to
selected 1.3
Fixed confusion about units of forcing arrays in FFIELDS.h
namely Fu,Fv,Qnet,Qsw,EmPmR:
- Removed verification/natl_box/code/external_fields_scale.F
(did not differ from that in model/src)
- Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
(see FFIELDS.h for description)
- Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
kpp_calc.F and kpp_transport_t.F
- Removed model/src/external_fields_scale.F and calls to it
- verification/natl_box uses flux data with "atmospheric" sign so
a special version of external_fields_load.F is used to
change the data as it's read in. This way, the arrays
have the right units and signs at all times tha a user could
possibly use them.
Revision
1.3 -
(
view)
(
download)
(
annotate)
-
[selected]
Wed Sep 13 17:07:11 2000 UTC
(23 years, 9 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
checkpoint31
Changes since
1.2: +0 -0 lines
Diff to
previous 1.2
KPP package without flag kppPackageIsOn.
Revision
1.2 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Sep 12 18:14:32 2000 UTC
(23 years, 9 months ago)
by
heimbach
Branch:
MAIN
Changes since
1.1: +54 -42 lines
Diff to
previous 1.1
,
to
selected 1.3
Updated version by D. Menemenlis.
Takes new unit and sign conventions for forcing fields into account.
Includes changes of Ralf in ecco_c30_05.09.
Yet to be fully tested.
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.