Changeset 7533 for branches/2016

Timestamp:

2017-01-09T12:31:34+01:00 (7 years ago)

Author:

flavoni

Message:

adapt comments to new nameos

Location:

branches/2016/dev_merge_2016/NEMOGCM/CONFIG

Files:

• GYRE/EXP00/namelist_cfg (modified) (1 diff)
• SHARED/namelist_ref (modified) (1 diff)

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg

@@ -144 +144 @@
 !-----------------------------------------------------------------------
    ln_eos80    = .true.         !  = Use EOS80 equation of state
-   !                             !
-!!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
 /
 !-----------------------------------------------------------------------

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -674 +674 @@
    !                     ! S-EOS coefficients (ln_seos=T):
    !                             !  rd(T,S,Z)*rau0 = -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)
+   rn_a0       =  1.6550e-1      !  thermal expension coefficient
+   rn_b0       =  7.6554e-1      !  saline  expension coefficient
    rn_lambda1  =  5.9520e-2      !  cabbeling coeff in T^2  (=0 for linear eos)
    rn_lambda2  =  7.4914e-4      !  cabbeling coeff in S^2  (=0 for linear eos)