Changeset 8758 for branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_bdy_generic.h90

Timestamp:

2017-11-20T17:29:54+01:00 (6 years ago)

Author:

acc

Message:

Branch 2017/dev_r8126_ROBUST08_no_ghost. Changes to eliminate ghost rows and columns. Currently the halo width is still fixed as 1 but a single variable (nn_hls) has been introduced for the halo-size in preparation for allowing this to vary. nn_hls replaces jpreci and jprecj. These changes have passed full SETTE tests but iceberg exchanges across the north-fold remain untested (SETTE tests only release bergs in the SO) and will require further attention. Note layout.dat now reports the jpi and jpj values for the reporting processor only.

File:

• branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_bdy_generic.h90 (modified) (14 diffs)

branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/mpp_bdy_generic.h90

@@ -93 +93 @@
       ipf = F_SIZE(ptab)   ! 5th    -      use in "multi" case (array of pointers)
       !      
-      ALLOCATE( zt3ns(jpi,jprecj,ipk,ipl,ipf,2), zt3sn(jpi,jprecj,ipk,ipl,ipf,2),   &
-         &      zt3ew(jpj,jpreci,ipk,ipl,ipf,2), zt3we(jpj,jpreci,ipk,ipl,ipf,2)  )
+      ALLOCATE( zt3ns(jpi,nn_hls,ipk,ipl,ipf,2), zt3sn(jpi,nn_hls,ipk,ipl,ipf,2),   &
+         &      zt3ew(jpj,nn_hls,ipk,ipl,ipf,2), zt3we(jpj,nn_hls,ipk,ipl,ipf,2)  )
 
       zland = 0._wp
@@ -111 +111 @@
                ARRAY_IN(jpi,:,:,:,jf) = ARRAY_IN(  2  ,:,:,:,jf)
             ELSE                                   !* Closed
-               IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(     1       :jpreci,:,:,:,jf) = zland  ! east except F-point
-                                               ARRAY_IN(nlci-jpreci+1:jpi   ,:,:,:,jf) = zland  ! west
+               IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(     1       :nn_hls,:,:,:,jf) = zland  ! east except F-point
+                                               ARRAY_IN(nlci-nn_hls+1:jpi   ,:,:,:,jf) = zland  ! west
             ENDIF
          ELSEIF(nbondi == -1) THEN              ! subdomain to the east only
-            IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(1:jpreci,:,:,:,jf) = zland     ! south except F-point
+            IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(1:nn_hls,:,:,:,jf) = zland     ! south except F-point
             !
          ELSEIF(nbondi == 1) THEN               ! subdomain to the west only
-            ARRAY_IN(nlci-jpreci+1:jpi,:,:,:,jf) = zland    ! north
+            ARRAY_IN(nlci-nn_hls+1:jpi,:,:,:,jf) = zland    ! north
          ENDIF
          !                                ! North-South boundaries
          !
          IF (nbondj == 2 .OR. nbondj == -1) THEN      !* closed
-           IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(:,1:jprecj,:,:,jf) = zland            ! south except F-point
+           IF( .NOT. NAT_IN(jf) == 'F' )   ARRAY_IN(:,1:nn_hls,:,:,jf) = zland            ! south except F-point
          ELSEIF (nbondj == 2 .OR. nbondj == 1) THEN
-                                           ARRAY_IN(:,nlcj-jprecj+1:jpj,:,:,jf) = zland   ! north
+                                           ARRAY_IN(:,nlcj-nn_hls+1:jpj,:,:,jf) = zland   ! north
          ENDIF
       END DO
@@ -140 +140 @@
                DO jl = 1, ipl
                   DO jk = 1, ipk
-                     DO jh = 1, jpreci
-                        zt3ew(:,jh,jk,jl,jf,1) = ARRAY_IN(jpreci+jh,:,jk,jl,jf)
+                     DO jh = 1, nn_hls
+                        zt3ew(:,jh,jk,jl,jf,1) = ARRAY_IN(nn_hls+jh,:,jk,jl,jf)
                         zt3we(:,jh,jk,jl,jf,1) = ARRAY_IN(iihom +jh,:,jk,jl,jf)
                      END DO
@@ -149 +149 @@
          !
          !                           ! Migrations
-!!gm      imigr = jpreci * jpj * ipk * ipl * ipf
-         imigr = jpreci * jpj * ipk * ipl
+!!gm      imigr = nn_hls * jpj * ipk * ipl * ipf
+         imigr = nn_hls * jpj * ipk * ipl
          !
          SELECT CASE ( nbondi_bdy(IBD_IN(jf)) )
@@ -171 +171 @@
          !
          !                           ! Write Dirichlet lateral conditions
-         iihom = nlci-jpreci
+         iihom = nlci-nn_hls
          !
          !
@@ -178 +178 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jpreci
+                  DO jh = 1, nn_hls
                      ARRAY_IN(iihom+jh,:,jk,jl,jf) = zt3ew(:,jh,jk,jl,jf,2)
                   END DO
@@ -186 +186 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jpreci
+                  DO jh = 1, nn_hls
                      ARRAY_IN(jh      ,:,jk,jl,jf) = zt3we(:,jh,jk,jl,jf,2)
                      ARRAY_IN(iihom+jh,:,jk,jl,jf) = zt3ew(:,jh,jk,jl,jf,2)
@@ -195 +195 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jpreci
+                  DO jh = 1, nn_hls
                      ARRAY_IN(jh      ,:,jk,jl,jf) = zt3we(:,jh,jk,jl,jf,2)
                   END DO
@@ -213 +213 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jprecj
+                  DO jh = 1, nn_hls
                      zt3sn(:,jh,jk,jl,jf,1) = ARRAY_IN(:,ijhom +jh,jk,jl,jf)
-                     zt3ns(:,jh,jk,jl,jf,1) = ARRAY_IN(:,jprecj+jh,jk,jl,jf)
+                     zt3ns(:,jh,jk,jl,jf,1) = ARRAY_IN(:,nn_hls+jh,jk,jl,jf)
                   END DO
                END DO
@@ -222 +222 @@
          !
          !                           ! Migrations
-!!gm      imigr = jprecj * jpi * ipk * ipl * ipf
-         imigr = jprecj * jpi * ipk * ipl
+!!gm      imigr = nn_hls * jpi * ipk * ipl * ipf
+         imigr = nn_hls * jpi * ipk * ipl
          !
          SELECT CASE ( nbondj_bdy(IBD_IN(jf)) )
@@ -244 +244 @@
          !
          !                           ! Write Dirichlet lateral conditions
-         ijhom = nlcj-jprecj
+         ijhom = nlcj-nn_hls
          !
          SELECT CASE ( nbondj_bdy_b(IBD_IN(jf)) )
@@ -250 +250 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jprecj
+                  DO jh = 1, nn_hls
                      ARRAY_IN(:,ijhom+jh,jk,jl,jf) = zt3ns(:,jh,jk,jl,jf,2)
                   END DO
@@ -258 +258 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jprecj
+                  DO jh = 1, nn_hls
                      ARRAY_IN(:,      jh,jk,jl,jf) = zt3sn(:,jh,jk,jl,jf,2)
                      ARRAY_IN(:,ijhom+jh,jk,jl,jf) = zt3ns(:,jh,jk,jl,jf,2)
@@ -267 +267 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jh = 1, jprecj
+                  DO jh = 1, nn_hls
                      ARRAY_IN(:,jh,jk,jl,jf) = zt3sn(:,jh,jk,jl,jf,2)
                   END DO