Changeset 2374

Timestamp:

2010-11-10T22:45:27+01:00 (13 years ago)

Author:

rblod

Message:

Correct fix for obcfla on the trunk

File:

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

trunk/NEMO/OPA_SRC/OBC/obcfla.F90

@@ -86 +86 @@
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5        &
                &            - sshfoe(jj) )  ) * uemsk(jj,1)
-         END DO
-         DO jj = 1, jpj
             sshfoe_b(ji,jj) = sshfoe_b(ji,jj) + sqrt( grav*hur(ji,jj) )     &
                &             * ( ( sshn_e(ji,jj) + sshn_e(ji+1,jj) ) * 0.5  &
-               &                 - sshfoe(jj) ) * uemsk(jj,1)
+               &            - sshfoe(jj) )  ) * uemsk(jj,1)
+         END DO
+      END DO
+      DO ji = nie0p1, nie1p1
+         DO jj = 1, jpj
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - temsk(jj,1) ) &
                &            + temsk(jj,1) * sshfoe(jj)
@@ -153 +155 @@
                &            * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5         &
                &                - sshfon(ji) ) ) * vnmsk(ji,1)
-         END DO
-         DO ji = 1, jpi
             sshfon_b(ji,jj) = sshfon_b(ji,jj) + sqrt( grav * hvr(ji,jj) )  &
                &              * ( ( sshn_e(ji,jj) + sshn_e(ji,jj+1) ) * 0.5    &
                &                  - sshfon(ji) ) * vnmsk(ji,1)
+         END DO
+      END DO
+      DO jj = njn0p1, njn1p1
+         DO ji = 1, jpi
             ssha_e(ji,jj) = ssha_e(ji,jj) * ( 1. - tnmsk(ji,1) ) &
                &            + sshfon(ji) * tnmsk(ji,1)