Changeset 8758 for branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

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/mppini.F90 (modified) (4 diffs)

branches/2017/dev_r8126_ROBUST08_no_ghost/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -153 +153 @@
       !  dimensions divided by the number of processors minus the overlap array.
       !
-      nreci = 2 * jpreci
-      nrecj = 2 * jprecj
+      nreci = 2 * nn_hls
+      nrecj = 2 * nn_hls
       iresti = 1 + MOD( jpiglo - nreci -1 , jpni )
       irestj = 1 + MOD( jpjglo - nrecj -1 , jpnj )
       !
+      !  Need to use jpimax and jpjmax here since jpi and jpj have already been
+      !  shrunk to local sizes in nemogcm
 #if defined key_nemocice_decomp
       ! Change padding to be consistent with CICE
-      ilci(1:jpni-1      ,:) = jpi
-      ilci(jpni          ,:) = jpiglo - (jpni - 1) * (jpi - nreci)
-      !
-      ilcj(:,      1:jpnj-1) = jpj
-      ilcj(:,          jpnj) = jpjglo - (jpnj - 1) * (jpj - nrecj)
+      ilci(1:jpni-1      ,:) = jpimax
+      ilci(jpni          ,:) = jpiglo - (jpni - 1) * (jpimax - nreci)
+      !
+      ilcj(:,      1:jpnj-1) = jpjmax
+      ilcj(:,          jpnj) = jpjglo - (jpnj - 1) * (jpjmax - nrecj)
 #else
-      ilci(1:iresti      ,:) = jpi
-      ilci(iresti+1:jpni ,:) = jpi-1
-
-      ilcj(:,      1:irestj) = jpj
-      ilcj(:, irestj+1:jpnj) = jpj-1
+      ilci(1:iresti      ,:) = jpimax
+      ilci(iresti+1:jpni ,:) = jpimax-1
+
+      ilcj(:,      1:irestj) = jpjmax
+      ilcj(:, irestj+1:jpnj) = jpjmax-1
 #endif
       !
@@ -237 +239 @@
          ioea(ii,ij) = iproc + 1
          iono(ii,ij) = iproc + jpni
-         ildi(ii,ij) =  1  + jpreci
-         ilei(ii,ij) = ili - jpreci
+         ildi(ii,ij) =  1  + nn_hls
+         ilei(ii,ij) = ili - nn_hls
 
          IF( ibondi(ii,ij) == -1 .OR. ibondi(ii,ij) == 2 ) ildi(ii,ij) =  1
          IF( ibondi(ii,ij) ==  1 .OR. ibondi(ii,ij) == 2 ) ilei(ii,ij) = ili
-         ildj(ii,ij) =  1  + jprecj
-         ilej(ii,ij) = ilj - jprecj
+         ildj(ii,ij) =  1  + nn_hls
+         ilej(ii,ij) = ilj - nn_hls
          IF( ibondj(ii,ij) == -1 .OR. ibondj(ii,ij) == 2 ) ildj(ii,ij) =  1
          IF( ibondj(ii,ij) ==  1 .OR. ibondj(ii,ij) == 2 ) ilej(ii,ij) = ilj
@@ -441 +443 @@
       IF (lwp) THEN
          CALL ctl_opn( inum, 'layout.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea )
-         WRITE(inum,'(a)') '   jpnij     jpi     jpj     jpk  jpiglo  jpjglo'
-         WRITE(inum,'(6i8)') jpnij,jpi,jpj,jpk,jpiglo,jpjglo
+         WRITE(inum,'(a)') '   jpnij   jpimax  jpjmax    jpk  jpiglo  jpjglo'//&
+   &           ' ( local:    narea     jpi     jpj)'
+         WRITE(inum,'(6i8,a,3i8,a)') jpnij,jpimax,jpjmax,jpk,jpiglo,jpjglo,&
+   &           ' ( local: ',narea,jpi,jpj,' )'
          WRITE(inum,'(a)') 'NAREA nlci nlcj nldi nldj nlei nlej nimp njmp nono noso nowe noea nbondi nbondj '
 
@@ -488 +492 @@
          WRITE(numout,*) ' nreci  = ', nreci  
          WRITE(numout,*) ' nrecj  = ', nrecj  
-         WRITE(numout,*) ' jpreci = ', jpreci 
-         WRITE(numout,*) ' jprecj = ', jprecj 
+         WRITE(numout,*) ' nn_hls = ', nn_hls 
       ENDIF