Changeset 9440 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

Timestamp:

2018-03-27T15:52:54+02:00 (6 years ago)

Author:

acc

Message:

Branch 2017/dev_merge_2017. Reorganisation of nemogcm.F90 and mppini.F90. Stage 5: Enhancement to prtctl and suppression of overlap option; see ticket #2070

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) (9 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -42 +42 @@
 
    SUBROUTINE prt_ctl (tab2d_1, tab3d_1, mask1, clinfo1, tab2d_2, tab3d_2,   &
-      &                                  mask2, clinfo2, ovlap, kdim, clinfo3 )
+      &                                  mask2, clinfo2, kdim, clinfo3 )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE prt_ctl  ***
@@ -74 +74 @@
       !!                    mask2   : mask (3D) to apply to the tab[23]d_2 array
       !!                    clinfo2 : information about the tab[23]d_2 array
-      !!                    ovlap   : overlap value
       !!                    kdim    : k- direction for 3D arrays 
       !!                    clinfo3 : additional information 
@@ -86 +85 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL ::   mask2
       CHARACTER (len=*)         , INTENT(in), OPTIONAL ::   clinfo2
-      INTEGER                   , INTENT(in), OPTIONAL ::   ovlap
       INTEGER                   , INTENT(in), OPTIONAL ::   kdim
       CHARACTER (len=*)         , INTENT(in), OPTIONAL ::   clinfo3
       !
       CHARACTER (len=15) :: cl2
-      INTEGER ::   overlap, jn, sind, eind, kdir,j_id
+      INTEGER ::  jn, sind, eind, kdir,j_id
       REAL(wp) :: zsum1, zsum2, zvctl1, zvctl2
       REAL(wp), DIMENSION(jpi,jpj)     :: ztab2d_1, ztab2d_2
@@ -98 +96 @@
 
       ! Arrays, scalars initialization 
-      overlap   = 0
       kdir      = jpkm1
       cl2       = ''
@@ -114 +111 @@
       ! Control of optional arguments
       IF( PRESENT(clinfo2) )   cl2                  = clinfo2
-      IF( PRESENT(ovlap)   )   overlap              = ovlap
       IF( PRESENT(kdim)    )   kdir                 = kdim
       IF( PRESENT(tab2d_1) )   ztab2d_1(:,:)        = tab2d_1(:,:)
@@ -138 +134 @@
          IF( .NOT. lsp_area ) THEN
             IF (lk_mpp .AND. jpnij > 1)   THEN
-               nictls = MAX( 1, nlditl(jn) - overlap )
-               nictle = nleitl(jn) + overlap * MIN( 1, nlcitl(jn) - nleitl(jn)) 
-               njctls = MAX( 1, nldjtl(jn) - overlap )
-               njctle = nlejtl(jn) + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn))
+               nictls = MAX(  1, nlditl(jn) )
+               nictle = MIN(jpi, nleitl(jn) )
+               njctls = MAX(  1, nldjtl(jn) )
+               njctle = MIN(jpj, nlejtl(jn) )
                ! Do not take into account the bound of the domain
                IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls)
@@ -148 +144 @@
                IF( ibonjtl(jn) ==  1 .OR. ibonjtl(jn) == 2 ) njctle = MIN(njctle, nlejtl(jn) - 1)
             ELSE
-               nictls = MAX( 1, nimpptl(jn) + nlditl(jn) - 1 - overlap )
-               nictle = nimpptl(jn) + nleitl(jn) - 1 + overlap * MIN( 1, nlcitl(jn) - nleitl(jn) ) 
-               njctls = MAX( 1, njmpptl(jn) + nldjtl(jn) - 1 - overlap )
-               njctle = njmpptl(jn) + nlejtl(jn) - 1 + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn) ) 
+               nictls = MAX(  1, nimpptl(jn) - 1 + nlditl(jn) )
+               nictle = MIN(jpi, nimpptl(jn) - 1 + nleitl(jn) )
+               njctls = MAX(  1, njmpptl(jn) - 1 + nldjtl(jn) )
+               njctle = MIN(jpj, njmpptl(jn) - 1 + nlejtl(jn) )
                ! Do not take into account the bound of the domain
                IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls)
@@ -420 +416 @@
       INTEGER, DIMENSION(jpi,jpj) ::   iimpptl, ijmpptl, ilcitl, ilcjtl   ! workspace
       REAL(wp) ::   zidom, zjdom            ! temporary scalars
+      INTEGER ::   inum                     ! local logical unit
       !!----------------------------------------------------------------------
 
@@ -569 +566 @@
       END DO
       !
+      ! Save processor layout in layout_prtctl.dat file 
+      IF(lwp) THEN
+         CALL ctl_opn( inum, 'layout_prtctl.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea )
+         WRITE(inum,'(a)') 'nproc nlcil nlcjl nldil nldjl nleil nlejl nimpptl njmpptl ibonitl ibonjtl'
+         !
+         DO jn = 1, ijsplt
+            WRITE(inum,'(i5,6i6,4i8)') jn-1,nlcitl(jn),  nlcjtl(jn), &
+               &                            nlditl(jn),  nldjtl(jn), &
+               &                            nleitl(jn),  nlejtl(jn), &
+               &                           nimpptl(jn), njmpptl(jn), &
+               &                           ibonitl(jn), ibonjtl(jn)
+         END DO
+         CLOSE(inum)   
+      END IF
       !
       !