Changeset 780

Timestamp:

2007-12-22T18:05:57+01:00 (16 years ago)

Author:

rblod

Message:

Correct a critical bug in divergence computation for AGRIF case, see ticket #40

File:

• trunk/NEMO/OPA_SRC/DYN/divcur.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/divcur.F90

@@ -27 +27 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/divcur.F90,v 1.7 2006/05/10 16:53:51 opalod Exp $ 
    !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
@@ -122 +122 @@
 
 #if defined key_obc
+#if defined key_agrif
+         IF (Agrif_Root() ) THEN
+#endif
          ! open boundaries (div must be zero behind the open boundary)
          !  mpp remark: The zeroing of hdivn can probably be extended to 1->jpi/jpj for the correct row/column
@@ -128 +131 @@
          IF( lp_obc_north )   hdivn(nin0  :nin1  ,njn0p1:njn1p1,jk) = 0.e0      ! north
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
+#if defined key_agrif
+         ENDIF
+#endif
 #endif         
+#if defined key_agrif
+         if ( .NOT. AGRIF_Root() ) then
+           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
+           IF ((nbondj ==  1).OR.(nbondj == 2)) hdivn(:      ,nlcj-1 ,jk) = 0.e0      ! north
+           IF ((nbondj == -1).OR.(nbondj == 2)) hdivn(:      ,2      ,jk) = 0.e0      ! south
+         endif
+#endif    
 
          !                                             ! --------
@@ -317 +331 @@
 
 #if defined key_obc
+#if defined key_agrif
+         IF ( Agrif_Root() ) THEN
+#endif
          ! open boundaries (div must be zero behind the open boundary)
          !  mpp remark: The zeroing of hdivn can probably be extended to 1->jpi/jpj for the correct row/column
@@ -323 +340 @@
          IF( lp_obc_north )   hdivn(nin0  :nin1  ,njn0p1:njn1p1,jk) = 0.e0      ! north
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
+#if defined key_agrif
+         ENDIF
+#endif
 #endif         
+#if defined key_agrif
+         if ( .NOT. AGRIF_Root() ) then
+            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
+            IF ((nbondj ==  1).OR.(nbondj == 2)) hdivn(:      ,nlcj-1 ,jk) = 0.e0      ! north
+            IF ((nbondj == -1).OR.(nbondj == 2)) hdivn(:      ,2      ,jk) = 0.e0      ! south
+         endif
+#endif    
+
          !                                             ! --------
          ! relative vorticity                          !   rot