Changeset 15 for trunk/NEMO/OPA_SRC/eosbn2.F90

Timestamp:

2004-02-17T08:25:44+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

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

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -37 +37 @@
 
    !! * Share module variables
-   INTEGER, PUBLIC ::   & !!! nameos : ocean physical parameters
-      neos     ,        &  ! = 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)
+   INTEGER , PUBLIC ::   &  !: nameos : ocean physical parameters
+      neos          ,    &  !: = 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)
    
    !! * Substitutions
@@ -594 +594 @@
       !!         The brunt-vaisala frequency is computed using the polynomial
       !!      polynomial expression of McDougall (1987):
-      !!            N^2 = g * beta * ( alpha/beta*dk[ t ] - dk[ s ] )/e3w
+      !!            N^2 = grav * beta * ( alpha/beta*dk[ t ] - dk[ s ] )/e3w
       !!      If lk_zdfddm=T, the heat/salt buoyancy flux ratio Rrau is
       !!      computed and used in zdfddm module :
       !!              Rrau = alpha/beta * ( dk[ t ] / dk[ s ] )
       !!       * neos = 1  : linear equation of state (temperature only)
-      !!            N^2 = g * ralpha * dk[ t ]/e3w
+      !!            N^2 = grav * ralpha * dk[ t ]/e3w
       !!       * neos = 2  : linear equation of state (temperature & salinity)
-      !!            N^2 = g * (ralpha * dk[ t ] - rbeta * dk[ s ] ) / e3w
+      !!            N^2 = grav * (ralpha * dk[ t ] - rbeta * dk[ s ] ) / e3w
       !!      The use of potential density to compute N^2 introduces e r r o r
       !!      in the sign of N^2 at great depths. We recommand the use of 
@@ -631 +631 @@
       REAL(wp) ::   &
          zgde3w, zt, zs, zh,  &  ! temporary scalars 
-         zalbet, zbeta, zds      !    "         "
+         zalbet, zbeta           !    "         "
+#if defined key_zdfddm
+      REAL(wp) ::   zds          ! temporary scalars
+#endif
       !!----------------------------------------------------------------------
       !!  OPA8.5, LODYC-IPSL (2002)
@@ -653 +656 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  zgde3w = g/fse3w(ji,jj,jk)
-                  zt = 0.5*( ptem(ji,jj,jk) + ptem(ji,jj,jk-1) )          ! potential temperature at w-point
-                  zs = 0.5*( psal(ji,jj,jk) + psal(ji,jj,jk-1) ) - 35.0   ! salinity anomaly (s-35) at w-point
-                  zh = fsdepw(ji,jj,jk)                                   ! depth in meters  at w-point
+                  zgde3w = grav / fse3w(ji,jj,jk)
+                  zt = 0.5 * ( ptem(ji,jj,jk) + ptem(ji,jj,jk-1) )          ! potential temperature at w-point
+                  zs = 0.5 * ( psal(ji,jj,jk) + psal(ji,jj,jk-1) ) - 35.0   ! salinity anomaly (s-35) at w-point
+                  zh = fsdepw(ji,jj,jk)                                     ! depth in meters  at w-point
 
                   zalbet = ( ( ( - 0.255019e-07 * zt + 0.298357e-05 ) * zt   &   ! ratio alpha/beta
@@ -706 +709 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  zgde3w = g/fse3w(ji,jj,jk) * tmask(ji,jj,jk)
+                  zgde3w = grav / fse3w(ji,jj,jk) * tmask(ji,jj,jk)
                   pn2(ji,jj,jk) = zgde3w * ralpha * ( ptem(ji,jj,jk-1) - ptem(ji,jj,jk) )
                END DO
@@ -722 +725 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  zgde3w = g/fse3w(ji,jj,jk) * tmask(ji,jj,jk)
+                  zgde3w = grav / fse3w(ji,jj,jk) * tmask(ji,jj,jk)
                   pn2(ji,jj,jk) = zgde3w * (  ralpha * ( ptem(ji,jj,jk-1) - ptem(ji,jj,jk) )   &
                      &                      - rbeta  * ( psal(ji,jj,jk-1) - psal(ji,jj,jk) )  )