Changeset 1941 for trunk/NEMO/OPA_SRC/OBC/obcfla.F90

Timestamp:

2010-06-22T13:10:04+02:00 (14 years ago)

Author:

rblod

Message:

Correct weird things in obcfla

File:

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

trunk/NEMO/OPA_SRC/OBC/obcfla.F90

@@ -82 +82 @@
 
       DO ji = nie0, nie1
-         DO jk = 1, jpkm1
-            DO jj = 1, jpj
-               ua_e(ji,jj) = (  ubtfoe(jj) + sqrt( grav*hu(ji,jj) )           &
-                  &            * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5  &
-                  &            - sshfoe(jj) )  ) * uemsk(jj,jk)
-            END DO
+         DO jj = 1, jpj
+            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)
          END DO
       END DO
@@ -97 +95 @@
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - temsk(jj,1) ) &
                &            + temsk(jj,1) * sshfoe(jj)
-            va_e(ji,jj) = vbtfoe(jj) * uemsk(jj,jk)
+            va_e(ji,jj) = vbtfoe(jj) * hvr(ji,jj) * uemsk(jj,jk)
          END DO
       END DO
@@ -120 +118 @@
 
       DO ji = niw0, niw1
-         DO jk = 1, jpkm1
-            DO jj = 1, jpj
-               ua_e(ji,jj) = ( ubtfow(jj) - sqrt( grav * hu(ji,jj) )          &
-                  &            * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5  &
-                  &                - sshfow(jj) ) ) * uwmsk(jj,jk)
-               va_e(ji,jj) = vbtfow(jj) * uwmsk(jj,jk)
-            END DO
+         DO jj = 1, jpj
+            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)
          END DO
          DO jj = 1, jpj
@@ -155 +151 @@
 
       DO jj = njn0, njn1
-         DO jk = 1, jpkm1
-            DO ji = 1, jpi
-               va_e(ji,jj) = ( vbtfon(ji) + sqrt( grav * hv(ji,jj) )           &
-                  &            * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5   &
-                  &                - sshfon(ji) ) ) * vnmsk(ji,jk)
-            END DO
+         DO ji = 1, jpi
+            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)
          END DO
       END DO
@@ -170 +164 @@
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - tnmsk(ji,1) ) &
                &            + sshfon(ji) * tnmsk(ji,1)
-            ua_e(ji,jj) = ubtfon(ji) * vnmsk(ji,jk)
+            ua_e(ji,jj) = ubtfon(ji) * hur(ji,jj) * vnmsk(ji,jk)
          END DO
       END DO
@@ -193 +187 @@
 
       DO jj = njs0, njs1
-         DO jk = 1, jpkm1
-            DO ji = 1, jpi
-               va_e(ji,jj) = ( vbtfos(ji) - sqrt( grav * hv(ji,jj) )            &
-                  &            * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5    &
-                  &                - sshfos(ji) ) ) * vsmsk(ji,jk)
-               ua_e(ji,jj) = ubtfos(ji) * vsmsk(ji,jk)
-            END DO
+         DO ji = 1, jpi
+            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)
          END DO
          DO ji = 1, jpi