Changeset 2064 for trunk

Timestamp:

2010-08-27T13:22:40+02:00 (14 years ago)

Author:

rblod

Message:

Set correct value for uemsk and vemsk index, see ticket #708

File:

• trunk/NEMO/OPA_SRC/OBC/obcfla.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/OBC/obcfla.F90

@@ -78 +78 @@
       !!------------------------------------------------------------------------------
       !! * Local declaration
-      INTEGER ::   ji, jj, jk ! dummy loop indices
+      INTEGER ::   ji, jj ! dummy loop indices
       !!------------------------------------------------------------------------------
 
@@ -85 +85 @@
             ua_e(ji,jj) = (  ubtfoe(jj) * hur(ji,jj) + sqrt( grav*hur(ji,jj) )   &
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5        &
-               &            - sshfoe(jj) )  ) * uemsk(jj,jk)
+               &            - sshfoe(jj) )  ) * uemsk(jj,1)
          END DO
       END DO
@@ -95 +95 @@
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - temsk(jj,1) ) &
                &            + temsk(jj,1) * sshfoe(jj)
-            va_e(ji,jj) = vbtfoe(jj) * hvr(ji,jj) * uemsk(jj,jk)
+            va_e(ji,jj) = vbtfoe(jj) * hvr(ji,jj) * uemsk(jj,1)
          END DO
       END DO
@@ -114 +114 @@
       !!------------------------------------------------------------------------------
       !! * Local declaration
-      INTEGER ::   ji, jj, jk ! dummy loop indices
+      INTEGER ::   ji, jj ! dummy loop indices
       !!------------------------------------------------------------------------------
 
@@ -121 +121 @@
             ua_e(ji,jj) = ( ubtfow(jj) * hur(ji,jj) - sqrt( grav * hur(ji,jj) )   &
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5         &
-               &                - sshfow(jj) ) ) * uwmsk(jj,jk)
-            va_e(ji,jj) = vbtfow(jj) * hvr(ji,jj) * uwmsk(jj,jk)
+               &                - sshfow(jj) ) ) * uwmsk(jj,1)
+            va_e(ji,jj) = vbtfow(jj) * hvr(ji,jj) * uwmsk(jj,1)
          END DO
          DO jj = 1, jpj
@@ -147 +147 @@
       !!------------------------------------------------------------------------------
       !! * Local declaration
-      INTEGER ::   ji, jj, jk ! dummy loop indices
+      INTEGER ::   ji, jj ! dummy loop indices
       !!------------------------------------------------------------------------------
 
@@ -154 +154 @@
             va_e(ji,jj) = ( vbtfon(ji) * hvr(ji,jj) + sqrt( grav * hvr(ji,jj) )   &
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5         &
-               &                - sshfon(ji) ) ) * vnmsk(ji,jk)
+               &                - sshfon(ji) ) ) * vnmsk(ji,1)
          END DO
       END DO
@@ -164 +164 @@
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - tnmsk(ji,1) ) &
                &            + sshfon(ji) * tnmsk(ji,1)
-            ua_e(ji,jj) = ubtfon(ji) * hur(ji,jj) * vnmsk(ji,jk)
+            ua_e(ji,jj) = ubtfon(ji) * hur(ji,jj) * vnmsk(ji,1)
          END DO
       END DO
@@ -182 +182 @@
       !!------------------------------------------------------------------------------
       !! * Local declaration
-      INTEGER ::   ji, jj, jk ! dummy loop indices
+      INTEGER ::   ji, jj ! dummy loop indices
 
       !!------------------------------------------------------------------------------
@@ -190 +190 @@
             va_e(ji,jj) = ( vbtfos(ji) * hvr(ji,jj) - sqrt( grav * hvr(ji,jj) )   &
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5         &
-               &                - sshfos(ji) ) ) * vsmsk(ji,jk)
-            ua_e(ji,jj) = ubtfos(ji) * hur(ji,jj) * vsmsk(ji,jk)
+               &                - sshfos(ji) ) ) * vsmsk(ji,1)
+            ua_e(ji,jj) = ubtfos(ji) * hur(ji,jj) * vsmsk(ji,1)
          END DO
          DO ji = 1, jpi