Changeset 3765

Timestamp:

2013-01-24T11:39:28+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: add missing bugfix in r3692 see ticket #1029

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (1 diff)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -307 +307 @@
             ! multiplied by z2dt
 #if defined key_obc
+            IF(lk_obc) THEN
             ! caution : grad D = 0 along open boundaries
             ! Remark: The filtering force could be reduced here in the FRS zone
             !         by multiplying spgu/spgv by (1-alpha) ??  
-            spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
-            spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
+               spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
+               spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
+            ELSE
+               spgu(ji,jj) = z2dt * ztdgu
+               spgv(ji,jj) = z2dt * ztdgv
+            ENDIF
 #elif defined key_bdy
+            IF(lk_bdy) THEN
             ! caution : grad D = 0 along open boundaries
-            spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj)
-            spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)
+               spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj)
+               spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)
+            ELSE
+               spgu(ji,jj) = z2dt * ztdgu
+               spgv(ji,jj) = z2dt * ztdgv
+            ENDIF
 #else
             spgu(ji,jj) = z2dt * ztdgu