Changeset 2208 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90

Timestamp:

2010-10-12T11:20:53+02:00 (14 years ago)

Author:

rblod

Message:

Put FCM NEMO code changes in DEV_r2191_3partymerge2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (1 diff)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/DYN/divcur.F90

@@ -340 +340 @@
          ENDIF
 #endif         
+<<<<<<< .working
          IF( .NOT. AGRIF_Root() ) THEN
+=======
+#if defined key_bdy
+         ! unstructured open boundaries (div must be zero behind the open boundary)
+         DO jj = 1, jpj
+           DO ji = 1, jpi
+             hdivn(ji,jj,jk)=hdivn(ji,jj,jk)*bdytmask(ji,jj)
+           END DO
+         END DO
+#endif        
+         IF( .NOT. AGRIF_Root() ) THEN
+>>>>>>> .merge-right.r2207
             IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
             IF ((nbondi == -1).OR.(nbondi == 2)) hdivn(2      , :     ,jk) = 0.e0      ! west