Index: /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/3_context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/AGRIF_DEMO/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/GYRE_BFM/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/GYRE_BFM/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/GYRE_PISCES/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/ORCA2_ICE_PISCES/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/ORCA2_OFF_PISCES/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/ORCA2_SAS_ICE/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml
===================================================================
--- /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (revision 13475)
+++ /NEMO/trunk/cfgs/SHARED/field_def_nemo-oce.xml (revision 13476)
@@ -507,5 +507,5 @@
@uocetr_vsum
- uocetr_vsum_cumul * $rau0
+ uocetr_vsum_cumul * $rho0
@@ -711,5 +711,5 @@
this * e2u
- this * maskMFO_u * $rau0
+ this * maskMFO_u * $rho0
@voce_e3v
@@ -717,5 +717,5 @@
this * e1v
- this * maskMFO_v * $rau0
+ this * maskMFO_v * $rho0
u_masstr_strait + v_masstr_strait
Index: /NEMO/trunk/cfgs/SHARED/namelist_ref
===================================================================
--- /NEMO/trunk/cfgs/SHARED/namelist_ref (revision 13475)
+++ /NEMO/trunk/cfgs/SHARED/namelist_ref (revision 13476)
@@ -836,5 +836,5 @@
!
! ! S-EOS coefficients (ln_seos=T):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 1.6550e-1 ! thermal expension coefficient
rn_b0 = 7.6554e-1 ! saline expension coefficient
Index: /NEMO/trunk/cfgs/SPITZ12/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/SPITZ12/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/SPITZ12/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/cfgs/WED025/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/cfgs/WED025/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/cfgs/WED025/EXPREF/context_nemo.xml (revision 13476)
@@ -9,5 +9,5 @@
1800
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/doc/latex/NEMO/subfiles/chap_TRA.tex
===================================================================
--- /NEMO/trunk/doc/latex/NEMO/subfiles/chap_TRA.tex (revision 13475)
+++ /NEMO/trunk/doc/latex/NEMO/subfiles/chap_TRA.tex (revision 13476)
@@ -1229,5 +1229,5 @@
In the computer code, a density anomaly, $d_a = \rho / \rho_o - 1$, is computed,
with $\rho_o$ a reference density.
-Called \textit{rau0} in the code,
+Called \textit{rho0} in the code,
$\rho_o$ is set in \mdl{phycst} to a value of \texttt{1,026} $Kg/m^3$.
This is a sensible choice for the reference density used in a Boussinesq ocean climate model,
Index: /NEMO/trunk/doc/namelists/nameos
===================================================================
--- /NEMO/trunk/doc/namelists/nameos (revision 13475)
+++ /NEMO/trunk/doc/namelists/nameos (revision 13476)
@@ -7,5 +7,5 @@
!
! ! S-EOS coefficients (ln_seos=T):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 1.6550e-1 ! thermal expension coefficient
rn_b0 = 7.6554e-1 ! saline expension coefficient
Index: /NEMO/trunk/tests/CANAL/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/CANAL/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/CANAL/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg
===================================================================
--- /NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg (revision 13475)
+++ /NEMO/trunk/tests/CANAL/EXPREF/namelist_cfg (revision 13476)
@@ -147,5 +147,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.28 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/CPL_OASIS/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/CPL_OASIS/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/CPL_OASIS/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/ICE_ADV1D/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/ICE_ADV1D/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/ICE_ADV1D/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/ICE_ADV2D/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/ICE_ADV2D/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/ICE_ADV2D/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/ICE_AGRIF/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/ICE_AGRIF/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/ICE_AGRIF/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/ISOMIP+/EXPREF/namelist_cfg
===================================================================
--- /NEMO/trunk/tests/ISOMIP+/EXPREF/namelist_cfg (revision 13475)
+++ /NEMO/trunk/tests/ISOMIP+/EXPREF/namelist_cfg (revision 13476)
@@ -311,7 +311,7 @@
!
! ! S-EOS coefficients (ln_seos=T):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
! ! L-EOS coefficients (ln_seos=T):
- ! ! rd(T,S,Z)*rau0 = rau0*(-a0*dT+b0*dS)
+ ! ! rd(T,S,Z)*rho0 = rho0*(-a0*dT+b0*dS)
rn_a0 = 3.7330e-5 ! thermal expension coefficient
rn_b0 = 7.8430e-4 ! saline expension coefficient
Index: /NEMO/trunk/tests/ISOMIP/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/ISOMIP/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/ISOMIP/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (revision 13476)
@@ -137,5 +137,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg
===================================================================
--- /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg (revision 13475)
+++ /NEMO/trunk/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg (revision 13476)
@@ -72,5 +72,5 @@
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
! ! S-EOS coefficients (nn_eos=1):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 0. ! saline expension coefficient (nn_eos= 1)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (revision 13476)
@@ -136,5 +136,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg
===================================================================
--- /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg (revision 13475)
+++ /NEMO/trunk/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg (revision 13476)
@@ -82,5 +82,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.2 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/VORTEX/EXPREF/1_context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/VORTEX/EXPREF/1_context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/VORTEX/EXPREF/1_context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/VORTEX/EXPREF/1_namelist_cfg
===================================================================
--- /NEMO/trunk/tests/VORTEX/EXPREF/1_namelist_cfg (revision 13475)
+++ /NEMO/trunk/tests/VORTEX/EXPREF/1_namelist_cfg (revision 13476)
@@ -131,5 +131,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.28 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/VORTEX/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/VORTEX/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/VORTEX/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/VORTEX/EXPREF/namelist_cfg
===================================================================
--- /NEMO/trunk/tests/VORTEX/EXPREF/namelist_cfg (revision 13475)
+++ /NEMO/trunk/tests/VORTEX/EXPREF/namelist_cfg (revision 13476)
@@ -125,5 +125,5 @@
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 0.28 ! thermal expension coefficient (for simplified equation of state)
rn_b0 = 0. ! saline expension coefficient (for simplified equation of state)
Index: /NEMO/trunk/tests/WAD/EXPREF/context_nemo.xml
===================================================================
--- /NEMO/trunk/tests/WAD/EXPREF/context_nemo.xml (revision 13475)
+++ /NEMO/trunk/tests/WAD/EXPREF/context_nemo.xml (revision 13476)
@@ -11,5 +11,5 @@
01
01
- 1026.0
+ 1026.0
3991.86795711963
0.99530670233846
Index: /NEMO/trunk/tests/WAD/EXPREF/namelist_cfg
===================================================================
--- /NEMO/trunk/tests/WAD/EXPREF/namelist_cfg (revision 13475)
+++ /NEMO/trunk/tests/WAD/EXPREF/namelist_cfg (revision 13476)
@@ -253,5 +253,5 @@
!
! ! S-EOS coefficients (ln_seos=T):
- ! ! rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
+ ! ! rd(T,S,Z)*rho0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
rn_a0 = 1.6550e-1 ! thermal expension coefficient (nn_eos= 1)
rn_b0 = 7.6554e-1 ! saline expension coefficient (nn_eos= 1)
@@ -263,5 +263,5 @@
!!org GYRE rn_alpha = 2.0e-4 ! thermal expension coefficient (nn_eos= 1 or 2)
!!org GYRE rn_beta = 7.7e-4 ! saline expension coefficient (nn_eos= 2)
-!!org caution now a0 = alpha / rau0 with rau0 = 1026
+!!org caution now a0 = alpha / rho0 with rho0 = 1026
/
!-----------------------------------------------------------------------