/[MITgcm]/MITgcm/model/src/find_rho.F

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

Parent Directory | Revision Log | View Revision Graph Revision Graph

Links to HEAD:	(view) (download) (annotate)
Links to checkpoint61s:	(view) (download) (annotate)
Sticky Tag:

Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Mon Aug 11 22:33:23 2008 UTC (15 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61c, checkpoint61d, checkpoint61e, checkpoint61f, checkpoint61g, checkpoint61h, checkpoint61i, checkpoint61j, checkpoint61k, checkpoint61l, checkpoint61m, checkpoint61n, checkpoint61o, checkpoint61p, checkpoint61q, checkpoint61r, checkpoint61s, checkpoint61t, checkpoint61u, checkpoint61v, checkpoint61w, checkpoint61x
Changes since 1.35: +13 -73 lines
Diff to previous 1.35

- remove S/R "FIND_RHO" (replaced by FIND_RHO_2D).

Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Sat Aug 9 01:02:28 2008 UTC (15 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.34: +212 -157 lines
Diff to previous 1.34

new S/R FIND_RHO_2D (replace FIND_RHO):
 change argument tFld & sFld to just 2-D local-tile slice arrays
  (+ same changes in all S/R called by FIND_RHO)
for now, keep old S/R FIND_RHO (which just call new S/R FIND_RHO_2D)

Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Wed Feb 27 19:42:02 2008 UTC (16 years, 2 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint59o, checkpoint59p, checkpoint59q, checkpoint59r, checkpoint60, checkpoint61, checkpoint61a, checkpoint61b
Changes since 1.33: +1 -212 lines
Diff to previous 1.33

move S/R find_rho_scalar, pkg/ecco/sw_ptmp.F, pkg/ecco/sw_adtg.F into
new file model/src/seawater.F, so that they are available for all pkgs.

remove comments about linear EOS and "surface" level.

Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Fri Nov 4 01:19:24 2005 UTC (18 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57x_post, checkpoint57y_post, checkpoint57y_pre, checkpoint57z_post, checkpoint58
Changes since 1.31: +2 -2 lines
Diff to previous 1.31

remove unused variables (reduces number of compiler warning)

Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Tue Oct 11 00:09:02 2005 UTC (18 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57v_post, checkpoint57w_post
Changes since 1.30: +10 -11 lines
Diff to previous 1.30

go back to version 1.27

Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Mon Oct 10 15:56:34 2005 UTC (18 years, 6 months ago) by baylor
Branch: MAIN
Changes since 1.29: +3 -5 lines
Diff to previous 1.29

Oops.  Move references out of i,j loop.

Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Mon Oct 10 15:55:29 2005 UTC (18 years, 6 months ago) by baylor
Branch: MAIN
Changes since 1.28: +9 -13 lines
Diff to previous 1.28

After discussion with JMC, make linear EOS reference even simpler.

Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Mon Oct 10 15:16:56 2005 UTC (18 years, 6 months ago) by baylor
Branch: MAIN
Changes since 1.27: +13 -6 lines
Diff to previous 1.27

Fix linear EOS to always use surface value of Tref and Sref.

little cleaning (unused variables removed)

 o convert all comments with single quotes (such as "can't", "don't", etc.)
     to unabbreviated form (eg. "do not") since these unmatched quotes
     tend to break the Fortran parser used to generate the HTML-ified
     code browser (see: http://mitgcm.org/dev_docs/code_reference/)

Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Wed Sep 10 22:21:22 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: branchpoint-genmake2
Branch point for: branch-genmake2
Changes since 1.24: +16 -1 lines
Diff to previous 1.24

ignore negative salinity in EOS (cause Pb with SQRT).

o compute locally the pressure for use in EOS: UNESCO, JMD95P or MDJWF
o store total Potential in totPhyHyd for diagnostic & EOS funct. of P
o fix restart and overlap Pb when using Z-coord and EOS funct. of P

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.22 - (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, checkpoint46m_post, checkpoint46n_post
Changes since 1.21: +70 -22 lines
Diff to previous 1.21

 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.21 - (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, checkpoint46l_pre
Changes since 1.20: +13 -10 lines
Diff to previous 1.20

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.20 - (view) (download) (annotate) - [select for diffs]
Wed Sep 18 16:38:01 2002 UTC (21 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46g_post, checkpoint46h_pre
Changes since 1.19: +206 -9 lines
Diff to previous 1.19

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.19 - (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.18: +187 -9 lines
Diff to previous 1.18

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.18 - (view) (download) (annotate) - [select for diffs]
Thu Aug 15 18:48:47 2002 UTC (21 years, 8 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint46d_post, checkpoint46d_pre, checkpoint46e_pre
Changes since 1.17: +8 -6 lines
Diff to previous 1.17

Changed p = pressure(i,j,k,bi,bj)  to  p = pressure(i,j,kRef,bi,bj)
so that JMD95Z and JMD95P give approptiate static stability.

Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Thu Aug 15 17:25:31 2002 UTC (21 years, 8 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint46c_post
Changes since 1.16: +5 -7 lines
Diff to previous 1.16

Changes necessary for ocean in p-coordinates
 -  Added new buoyancy relation = 'OCEANICP'
 -  Added new parameters = gravitySign (this used to be contained inside
    the factor dRdZ which I added when we first switched to R coordinates).
 X GM/Redi is not compatible (yet)
 X bottom drag and no-slip need to be debugged.

Revision 1.16 - (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_pre
Changes since 1.15: +242 -3 lines
Diff to previous 1.15

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

Bringing comments up to data and formatting for document extraction.

Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Sun Feb 4 14:38:47 2001 UTC (23 years, 2 months ago) by cnh
Branch: MAIN
CVS Tags: c37_adj, checkpoint35, checkpoint36, checkpoint37, checkpoint38, checkpoint39, checkpoint40, checkpoint40pre1, checkpoint40pre2, checkpoint40pre3, checkpoint40pre4, checkpoint40pre5, checkpoint40pre6, checkpoint40pre7, checkpoint40pre8, checkpoint40pre9, pre38-close, pre38tag1
Branch point for: pre38
Changes since 1.13: +2 -1 lines
Diff to previous 1.13

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.13 - (view) (download) (annotate) - [select for diffs]
Fri Feb 2 21:04:48 2001 UTC (23 years, 3 months ago) by adcroft
Branch: MAIN
Changes since 1.12: +9 -7 lines
Diff to previous 1.12

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.12 - (view) (download) (annotate) - [select for diffs]
Mon Sep 11 23:01:36 2000 UTC (23 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: branch-atmos-merge-phase1, branch-atmos-merge-phase2, branch-atmos-merge-phase3, branch-atmos-merge-start, checkpoint31, checkpoint32, checkpoint33, checkpoint34
Branch point for: branch-atmos-merge
Changes since 1.11: +6 -8 lines
Diff to previous 1.11

Cosmetic.

Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Fri Jun 9 02:45:04 2000 UTC (23 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint28, checkpoint29, checkpoint30
Changes since 1.10: +9 -1 lines
Diff to previous 1.10

Modifications to include TAMC directives, tape key computations
and initialisations to make code TAMC compatible.
Routines the_model_main.F and initialise_fixed.F
are left unchanged for the moment. (P.H.)

Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Fri Aug 6 15:01:27 1999 UTC (24 years, 9 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint25, checkpoint26, checkpoint27
Changes since 1.9: +5 -3 lines
Diff to previous 1.9

Replaced write(0,*) with print_error. Spotted by C.E.

Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Fri Nov 6 22:44:46 1998 UTC (25 years, 5 months ago) by cnh
Branch: MAIN
CVS Tags: checkpoint18, checkpoint19, checkpoint20, checkpoint21, checkpoint22, checkpoint23, checkpoint24
Changes since 1.8: +4 -4 lines
Diff to previous 1.8

Changes to allow for atmospheric integration builds of the code

Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Fri Jun 12 19:33:33 1998 UTC (25 years, 10 months ago) by cnh
Branch: MAIN
CVS Tags: branch-point-rdot, checkpoint10, checkpoint11, checkpoint12, checkpoint13, checkpoint14, checkpoint15, checkpoint16, checkpoint17, checkpoint7, checkpoint8, checkpoint9
Branch point for: branch-rdot, checkpoint7-4degree-ref
Changes since 1.7: +2 -2 lines
Diff to previous 1.7

Chages to make default setup correct for 4 degreee global comparison

Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Tue Jun 9 16:48:02 1998 UTC (25 years, 10 months ago) by cnh
Branch: MAIN
Changes since 1.6: +2 -1 lines
Diff to previous 1.6

Changes to support topography, hydrography and
forcing from files

Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Mon Jun 8 18:45:28 1998 UTC (25 years, 10 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint5, checkpoint6
Changes since 1.5: +3 -3 lines
Diff to previous 1.5

Various corrections:
 o implicitDiffusion was missing from PARAMS.h (obviously forgot to commit)
 o maskUp in calc_common_fact() is now correct
 o find_rho() now has the proper "referencing" for "LINEAR" eos-mode
   [also affected a call from dynamics()]

Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Thu May 28 16:19:50 1998 UTC (25 years, 11 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint4
Changes since 1.4: +24 -12 lines
Diff to previous 1.4

Changes to:
 o read in coefficients for POLY3 EOS.
 o find_rho() polynomial evaluation has been factorized.
 o additional density field needed in calc_iso_slopes() with non-linear EOS.

This EOS must use the appropriate version of KNUDSEN to generate the
coefficients file (POLY3.COEFFS). C7 and C8 were back to front in
all previous versions of the model (compare01).

Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Wed Apr 29 21:30:18 1998 UTC (26 years ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint1, checkpoint2, checkpoint3, kloop1, kloop2, redigm
Changes since 1.3: +66 -12 lines
Diff to previous 1.3

Moved the "K loop" up to the subroutine dynamics().
find_rho() now returns a rho(:,:) for a layer calculated
using 'LINEAR' and 'POLY3' eqns of state and pressure reference
level kRef.

Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Fri Apr 24 02:05:40 1998 UTC (26 years ago) by cnh
Branch: MAIN
Changes since 1.2: +1 -1 lines
Diff to previous 1.2

Further $Id to $Header conversions

Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Wed Apr 22 19:25:35 1998 UTC (26 years ago) by cnh
Branch: MAIN
CVS Tags: baseline
Changes since 1.1: +2 -2 lines
Diff to previous 1.1

Enforced standard upper case INTEGER declaration

Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Wed Apr 22 19:15:30 1998 UTC (26 years ago) by cnh
Branch: MAIN
Branch point for: cnh

Initial revision

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

	ViewVC Help
Powered by ViewVC 1.1.22