Changeset 12965

Timestamp:

2020-05-25T09:34:57+02:00 (4 years ago)

Author:

jchanut

Message:

Further nbondi/nbondj removal with AGRIF - results unchanged - forgotten in task #2199

Location:

NEMO/trunk/src/OCE

Files:

• DOM/dommsk.F90 (modified) (1 diff)
• DYN/divhor.F90 (modified) (1 diff)
• DYN/sshwzv.F90 (modified) (1 diff)
• SBC/sbcwave.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/DOM/dommsk.F90

@@ -259 +259 @@
                ENDIF
             END DO
-#if defined key_agrif 
-            IF( .NOT. AGRIF_Root() ) THEN 
-               IF ((nbondi ==  1).OR.(nbondi == 2)) fmask(nlci-1 , :     ,jk) = 0.e0      ! east 
-               IF ((nbondi == -1).OR.(nbondi == 2)) fmask(1      , :     ,jk) = 0.e0      ! west 
-               IF ((nbondj ==  1).OR.(nbondj == 2)) fmask(:      ,nlcj-1 ,jk) = 0.e0      ! north 
-               IF ((nbondj == -1).OR.(nbondj == 2)) fmask(:      ,1      ,jk) = 0.e0      ! south 
-            ENDIF 
-#endif 
          END DO
          !

NEMO/trunk/src/OCE/DYN/divhor.F90

@@ -84 +84 @@
       END_3D
       !
-#if defined key_agrif
-      IF( .NOT. Agrif_Root() ) THEN
-         IF( nbondi == -1 .OR. nbondi == 2 )   hdiv(   2   ,  :   ,:) = 0._wp      ! west
-         IF( nbondi ==  1 .OR. nbondi == 2 )   hdiv( nlci-1,  :   ,:) = 0._wp      ! east
-         IF( nbondj == -1 .OR. nbondj == 2 )   hdiv(   :   ,  2   ,:) = 0._wp      ! south
-         IF( nbondj ==  1 .OR. nbondj == 2 )   hdiv(   :   ,nlcj-1,:) = 0._wp      ! north
-      ENDIF
-#endif
-      !
       IF( ln_rnf )   CALL sbc_rnf_div( hdiv, Kmm )                     !==  runoffs    ==!   (update hdiv field)
       !

NEMO/trunk/src/OCE/DYN/sshwzv.F90

@@ -202 +202 @@
 #if defined key_agrif 
       IF( .NOT. AGRIF_Root() ) THEN 
-         IF ((nbondi ==  1).OR.(nbondi == 2)) pww(nlci-1 , :     ,:) = 0.e0      ! east 
-         IF ((nbondi == -1).OR.(nbondi == 2)) pww(2      , :     ,:) = 0.e0      ! west 
-         IF ((nbondj ==  1).OR.(nbondj == 2)) pww(:      ,nlcj-1 ,:) = 0.e0      ! north 
-         IF ((nbondj == -1).OR.(nbondj == 2)) pww(:      ,2      ,:) = 0.e0      ! south 
+         ! Mask vertical velocity at first/last columns/row 
+         ! inside computational domain (cosmetic) 
+         ! --- West --- !
+         DO ji = mi0(2), mi1(2)
+            DO jj = 1, jpj
+               pww(ji,jj,:) = 0._wp 
+            ENDDO
+         ENDDO
+         !
+         ! --- East --- !
+         DO ji = mi0(jpiglo-1), mi1(jpiglo-1)
+            DO jj = 1, jpj
+               pww(ji,jj,:) = 0._wp
+            ENDDO
+         ENDDO
+         !
+         ! --- South --- !
+         DO jj = mj0(2), mj1(2)
+            DO ji = 1, jpi
+               pww(ji,jj,:) = 0._wp
+            ENDDO
+         ENDDO
+         !
+         ! --- North --- !
+         DO jj = mj0(jpjglo-1), mj1(jpjglo-1)
+            DO ji = 1, jpi
+               pww(ji,jj,:) = 0._wp
+            ENDDO
+         ENDDO
       ENDIF 
 #endif 

NEMO/trunk/src/OCE/SBC/sbcwave.F90

@@ -210 +210 @@
       END_3D
       !
-#if defined key_agrif
-      IF( .NOT. Agrif_Root() ) THEN
-         IF( nbondi == -1 .OR. nbondi == 2 )   ze3divh( 2:nbghostcells+1,:        ,:) = 0._wp      ! west
-         IF( nbondi ==  1 .OR. nbondi == 2 )   ze3divh( nlci-nbghostcells:nlci-1,:,:) = 0._wp      ! east
-         IF( nbondj == -1 .OR. nbondj == 2 )   ze3divh( :,2:nbghostcells+1        ,:) = 0._wp      ! south
-         IF( nbondj ==  1 .OR. nbondj == 2 )   ze3divh( :,nlcj-nbghostcells:nlcj-1,:) = 0._wp      ! north
-      ENDIF
-#endif
-      !
       CALL lbc_lnk( 'sbcwave', ze3divh, 'T', 1. )
       !