Changeset 99

Timestamp:

2004-06-25T10:38:42+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE065 : correction when computing the pressure prd in linear cases only

File:

• trunk/NEMO/OPA_SRC/eosbn2.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -38 +38 @@
    !! * Share module variables
    INTEGER , PUBLIC ::   &  !: nameos : ocean physical parameters
-      neos          ,    &  !: = 0/1/2 type of eq. of state and Brunt-Vaisala frequ.
+      neos      = 0,     &  !: = 0/1/2 type of eq. of state and Brunt-Vaisala frequ.
       neos_init = 0         !: control flag for initialization
 
    REAL(wp), PUBLIC ::   &  !: nameos : ocean physical parameters
-      ralpha        ,    &  !: thermal expension coeff. (linear equation of state)
-      rbeta                 !: saline  expension coeff. (linear equation of state)
+      ralpha = 2.0e-4,   &  !: thermal expension coeff. (linear equation of state)
+      rbeta  = 7.7e-4       !: saline  expension coeff. (linear equation of state)
    
    !! * Substitutions
@@ -207 +207 @@
                   zs = psal(ji,jj,jk)
                   !   ... density and potential volumic mass
-                  prd(ji,jj,jk) = (   rbeta  * zs - ralpha * zt - 1. ) * tmask(ji,jj,jk)
+                  prd(ji,jj,jk) = (   rbeta  * zs - ralpha * zt ) * tmask(ji,jj,jk)
                END DO
             END DO
@@ -392 +392 @@
                   zs = psal(ji,jj,jk)
                   !   ... density and potential volumic mass
-                  prd  (ji,jj,jk) = ( rbeta  * zs - ralpha * zt - 1. ) * tmask(ji,jj,jk)
+                  prd  (ji,jj,jk) = ( rbeta  * zs - ralpha * zt ) * tmask(ji,jj,jk)
                   prhop(ji,jj,jk) = ( rau0 * prd(ji,jj,jk) + rau0 )    * tmask(ji,jj,jk)
                END DO
@@ -570 +570 @@
             DO ji = 1, fs_jpim1   ! vector opt.
 #endif
-               prd(ji,jj) = ( rbeta * psal(ji,jj) - ralpha * ptem(ji,jj) - 1. ) * tmask(ji,jj,1) 
+               prd(ji,jj) = ( rbeta * psal(ji,jj) - ralpha * ptem(ji,jj) ) * tmask(ji,jj,1) 
             END DO
             !                                             ! ===============
@@ -790 +790 @@
       ! namelist nameos : ocean physical parameters
 
-      ! Default values
-      neos   =      0         ! flag of eos used
-      ralpha =     2.e-4_wp   ! thermal exp. coef. (linear eos)
-      rbeta  =     0.029_wp   ! haline  exp. coef. (linear eos)
-
       ! Read Namelist nameos : equation of state
       REWIND( numnam )