/[MITgcm]/MITgcm/model/src/ini_eos.F
ViewVC logotype

Log of /MITgcm/model/src/ini_eos.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Links to HEAD: (view) (download) (annotate)
Sticky Tag:
Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Tue Jul 19 12:53:24 2011 UTC (12 years, 9 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.20: +92 -10 lines
Diff to previous 1.20 
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.20 - (view) (download) (annotate) - [select for diffs]
Sat Sep 6 17:42:27 2008 UTC (15 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: 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
Changes since 1.19: +2 -3 lines
Diff to previous 1.19 
change FIND_RHO_SCALAR : return rho (instead of rho - rhoConst)
Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Thu Aug 21 14:25:34 2008 UTC (15 years, 8 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint61c
Changes since 1.18: +7 -2 lines
Diff to previous 1.18 
fix the comments about the check values
Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Thu Aug 21 13:44:53 2008 UTC (15 years, 8 months ago) by mlosch
Branch: MAIN
Changes since 1.17: +16 -5 lines
Diff to previous 1.17 
fix a bit of formatting and add additional output for eos_check
Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Mon Aug 11 01:19:45 2008 UTC (15 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.16: +106 -81 lines
Diff to previous 1.16 
fix EOS_CHECK (broken since Feb 18, 2003)
Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Thu Jan 24 17:22:06 2008 UTC (16 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59n, checkpoint59o, checkpoint59p, checkpoint59q, checkpoint59r, checkpoint60, checkpoint61, checkpoint61a, checkpoint61b
Changes since 1.15: +4 -3 lines
Diff to previous 1.15 
make sure we are using an existing EOS (JMD95a, JMD95b ... are not valid EOS)
Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Tue Oct 17 18:52:34 2006 UTC (17 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: 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, mitgcm_mapl_00
Changes since 1.14: +118 -118 lines
Diff to previous 1.14 
clean-up multi-threaded problems (reported by debugger tcheck on ACES).
Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Mon Nov 7 18:26:02 2005 UTC (18 years, 5 months ago) by cnh
Branch: MAIN
CVS Tags: 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
Changes since 1.13: +4 -1 lines
Diff to previous 1.13 
Added some _BARRIER statements to get correct multi-threaded behavior
for initializations followed by master thread I/O.
Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Fri Nov 4 01:19:24 2005 UTC (18 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.12: +3 -5 lines
Diff to previous 1.12 
remove unused variables (reduces number of compiler warning)
Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Wed Jan 19 01:18:55 2005 UTC (19 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: checkpint57u_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, eckpoint57e_pre
Changes since 1.11: +13 -13 lines
Diff to previous 1.11 
add one "_d 0" that was missing: now g77 & ifc give much closer results
Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Tue Oct 19 02:39:58 2004 UTC (19 years, 6 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
Changes since 1.10: +3 -4 lines
Diff to previous 1.10 
use flags: fluidIsAir/Water, usingP/ZCoords instead of buoyancyRelation
Revision 1.10.2.2 - (view) (download) (annotate) - [select for diffs]
Tue Jun 24 23:05:29 2003 UTC (20 years, 10 months ago) by heimbach
Branch: ecco-branch
CVS Tags: ecco_c51_e34, ecco_c51_e34a, ecco_c51_e34b, ecco_c51_e34c, ecco_c51_e34d, ecco_c51_e34e, ecco_c51_e34f, ecco_c51_e34g
Changes since 1.10.2.1: +0 -0 lines
Diff to previous 1.10.2.1 , to branch point 1.10 , to next main 1.21 
Merging from c51
Revision 1.10.2.1 - (view) (download) (annotate) - [select for diffs]
Fri Mar 7 23:10:21 2003 UTC (21 years, 1 month ago) by heimbach
Branch: ecco-branch
CVS Tags: ecco_c50_e28, ecco_c50_e29, ecco_c50_e30, ecco_c50_e31, ecco_c50_e32, ecco_c50_e33, ecco_c50_e33a
Changes since 1.10: +1 -1 lines
Diff to previous 1.10 
merging c49 and e27
Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Tue Feb 18 15:34:25 2003 UTC (21 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: branch-netcdf, branchpoint-genmake2, 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_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, ecco_c52_e35, hrcube4, hrcube5, hrcube_1, hrcube_2, hrcube_3
Branch point for: branch-genmake2, branch-nonh, checkpoint51n_branch, ecco-branch, netcdf-sm0, tg2-branch
Changes since 1.9: +11 -74 lines
Diff to previous 1.9 
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.9 - (view) (download) (annotate) - [select for diffs]
Mon Feb 3 21:58:09 2003 UTC (21 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint48d_post, checkpoint48d_pre, checkpoint48e_post, checkpoint48f_post
Changes since 1.8: +23 -5 lines
Diff to previous 1.8 
Wrong Restart when using Z-coord with EOS function of P. => add a warning
Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Wed Nov 6 03:45:46 2002 UTC (21 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: branch-exfmods-tag, 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
Branch point for: branch-exfmods-curt
Changes since 1.7: +3 -1 lines
Diff to previous 1.7 
print to standard output enclosed between begin/end MASTER
 (and use "standardMessageUnit" instead of 6)
Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Tue Oct 29 20:16:28 2002 UTC (21 years, 6 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46l_post, checkpoint46l_pre
Changes since 1.6: +78 -57 lines
Diff to previous 1.6 
o fixed a bug in ini_eos: changed e to _d for all MDJWF-coefficients
Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Wed Sep 25 19:36:50 2002 UTC (21 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46h_post, checkpoint46i_post, checkpoint46j_post, checkpoint46j_pre, checkpoint46k_post
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 
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.5 - (view) (download) (annotate) - [select for diffs]
Wed Sep 18 16:38:02 2002 UTC (21 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46g_post, checkpoint46h_pre
Changes since 1.4: +15 -7 lines
Diff to previous 1.4 
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.4 - (view) (download) (annotate) - [select for diffs]
Thu Sep 5 20:49:33 2002 UTC (21 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46e_post, checkpoint46f_post, checkpoint46g_pre
Changes since 1.3: +85 -26 lines
Diff to previous 1.3 
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.3 - (view) (download) (annotate) - [select for diffs]
Tue Aug 20 14:45:18 2002 UTC (21 years, 8 months ago) by mlosch
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2 
o bug-fix in ini_eos.F: check_eos still called find_rhop0 with the wrong
  number of arguments
Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Mon Aug 19 14:21:30 2002 UTC (21 years, 8 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46d_post, checkpoint46e_pre
Changes since 1.1: +47 -12 lines
Diff to previous 1.1 
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and
  'OCEANICP', also initialised field pressure correctly in ini_eos in the
  case of pressure coordinates. eosType='JMD95Z' in
  combination with buoyancyRelation='OCEANICP' now causes an error.
o Changed p = pressure(i,j,k,bi,bj)  to  p = pressure(i,j,kRef,bi,bj)
  in find_alpha/beta.
Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Wed Aug 7 16:55:52 2002 UTC (21 years, 8 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46b_post, checkpoint46c_post, checkpoint46c_pre, checkpoint46d_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.

  Diffs between and
  Type of Diff should be a
Sort log by:
  ViewVC Help
Powered by ViewVC 1.1.22