Log of /MITgcm/model/inc/EOS.h
Parent Directory
| Revision Log
| Revision Graph
Revision
1.5 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Jul 19 12:53:23 2011 UTC
(12 years, 10 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
HEAD,
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,
checkpoint64v,
checkpoint64w,
checkpoint64x,
checkpoint64y,
checkpoint64z,
checkpoint65,
checkpoint65a,
checkpoint65b,
checkpoint65c,
checkpoint65d,
checkpoint65e,
checkpoint65f,
checkpoint65g,
checkpoint65h,
checkpoint65i,
checkpoint65j,
checkpoint65k,
checkpoint65l,
checkpoint65m,
checkpoint65n,
checkpoint65o,
checkpoint65p,
checkpoint65q,
checkpoint65r,
checkpoint65s,
checkpoint65t,
checkpoint65u,
checkpoint65v,
checkpoint65w,
checkpoint65x,
checkpoint65y,
checkpoint65z,
checkpoint66a,
checkpoint66b,
checkpoint66c,
checkpoint66d,
checkpoint66e,
checkpoint66f,
checkpoint66g,
checkpoint66h,
checkpoint66i,
checkpoint66j,
checkpoint66k,
checkpoint66l,
checkpoint66m,
checkpoint66n,
checkpoint66o
Changes since
1.4: +10 -2 lines
Diff to
previous 1.4
add code for TEOS-10 (www.teos-10.org, McDougall et al. 2011). Use
this eos with eosType = 'TEOS10', in data (PARM01). This eos implies
that THETA and SALT are "conservative temperature" and "absolute
salinity"
Revision
1.4 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Fri Jul 18 20:06:45 2003 UTC
(20 years, 10 months ago)
by
heimbach
Branch:
MAIN
CVS Tags:
branch-netcdf,
branchpoint-genmake2,
checkpint57u_post,
checkpoint51d_post,
checkpoint51e_post,
checkpoint51f_post,
checkpoint51f_pre,
checkpoint51g_post,
checkpoint51h_pre,
checkpoint51i_post,
checkpoint51i_pre,
checkpoint51j_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_post,
checkpoint53d_pre,
checkpoint53f_post,
checkpoint53g_post,
checkpoint54,
checkpoint54a_post,
checkpoint54a_pre,
checkpoint54b_post,
checkpoint54c_post,
checkpoint54d_post,
checkpoint54e_post,
checkpoint54f_post,
checkpoint55,
checkpoint55a_post,
checkpoint55b_post,
checkpoint55c_post,
checkpoint55d_post,
checkpoint55d_pre,
checkpoint55e_post,
checkpoint55f_post,
checkpoint55g_post,
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_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,
checkpoint58y_post,
checkpoint59,
checkpoint59a,
checkpoint59b,
checkpoint59c,
checkpoint59d,
checkpoint59e,
checkpoint59f,
checkpoint59g,
checkpoint59h,
checkpoint59i,
checkpoint59j,
checkpoint59k,
checkpoint59l,
checkpoint59m,
checkpoint59n,
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,
checkpoint62d,
checkpoint62e,
checkpoint62f,
checkpoint62g,
checkpoint62h,
checkpoint62i,
checkpoint62j,
checkpoint62k,
checkpoint62l,
checkpoint62m,
checkpoint62n,
checkpoint62o,
checkpoint62p,
checkpoint62q,
checkpoint62r,
checkpoint62s,
checkpoint62t,
checkpoint62u,
checkpoint62v,
checkpoint62w,
checkpoint62x,
checkpoint62y,
checkpoint62z,
checkpoint63,
ecco_c52_e35,
eckpoint57e_pre,
hrcube4,
hrcube5,
hrcube_1,
hrcube_2,
hrcube_3,
mitgcm_mapl_00
Branch point for:
branch-genmake2,
branch-nonh,
checkpoint51n_branch,
netcdf-sm0,
tg2-branch
Changes since
1.3: +3 -3 lines
Diff to
previous 1.3
Retain TAMC compatibility:
- avoid "_d" constructs in PARAMETER declarations
- avoid interrupting lines by comment lines
Revision
1.3 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Tue Feb 18 15:12:17 2003 UTC
(21 years, 3 months ago)
by
jmc
Branch:
MAIN
CVS Tags:
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
Branch point for:
ecco-branch
Changes since
1.2: +3 -3 lines
Diff to
previous 1.2
o compute locally the pressure for use in EOS : UNESCO, JMD95P or MDJWF
o store total Potential in totPhyHyd for diagnostic (DYNVARS.h)
o fix restart and overlap Pb when using Z-coord and EOS funct. of P
Revision
1.2 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Thu Sep 5 20:49:33 2002 UTC
(21 years, 9 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
branch-exfmods-tag,
checkpoint46e_post,
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
Branch point for:
branch-exfmods-curt
Changes since
1.1: +12 -4 lines
Diff to
previous 1.1
o Added new equation of state -> MDJWF
- EOS of McDougall et al., 2002, JAOT, submitted
- caveat: the equation of state is only valid for a smaller (more
realistic?) range of values than JMD95P/Z and UNESCO
- added masks to the calculation of pressure in store_pressure
- added more check values for density in check_eos (ini_eos.F), some of
the old check values are out of the range of the MDJWF-eos, so don't
expect perfect matches for those
Revision
1.1 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Wed Aug 7 16:55:52 2002 UTC
(21 years, 10 months ago)
by
mlosch
Branch:
MAIN
CVS Tags:
checkpoint46b_post,
checkpoint46c_post,
checkpoint46c_pre,
checkpoint46d_post,
checkpoint46d_pre,
checkpoint46e_pre
o Added new equation of state -> JMD95Z and JMD95P
- EOS of Jackett and McDougall, 1995, JPO
- moved all EOS parameters into EOS.h
- new routines ini_eos.F, store_pressure.F
o Added UNESCO EOS, but not recommended because it requires
in-situ temperature (see JMD95)
o Modified formatting for knudsen2.f in utils/knudsen2 and added
unesco.f to be used with POLY3
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.