Changeset 12807 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/TOP/prtctl_trc.F90

Timestamp:

2020-04-23T15:14:45+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: input file only over inner domain + new variables names, see #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/TOP/prtctl_trc.F90 (modified) (7 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/TOP/prtctl_trc.F90

@@ -18 +18 @@
    PRIVATE
 
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   numid_trc          !: logical unit 
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   nlditl , nldjtl    !: first, last indoor index for each i-domain
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   nleitl , nlejtl    !: first, last indoor index for each j-domain
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   nimpptl, njmpptl   !: i-, j-indexes for each processor
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   nlcitl , nlcjtl    !: dimensions of every subdomain
-   INTEGER , DIMENSION(:), ALLOCATABLE ::   ibonitl, ibonjtl
+   INTEGER , DIMENSION(:), ALLOCATABLE ::   numid_trc            !: logical unit 
+   INTEGER , DIMENSION(:), ALLOCATABLE ::   nis0allp, njs0allp   !: first, last indoor index for each i-domain
+   INTEGER , DIMENSION(:), ALLOCATABLE ::   nie0allp, nje0allp   !: first, last indoor index for each j-domain
+   INTEGER , DIMENSION(:), ALLOCATABLE ::    nimpptl,  njmpptl   !: i-, j-indexes for each processor
+   INTEGER , DIMENSION(:), ALLOCATABLE ::    jpiallp,  jpjallp   !: dimensions of every subdomain
+   INTEGER , DIMENSION(:), ALLOCATABLE ::    ibonitl,  ibonjtl
 
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   tra_ctl         !: previous trend values
@@ -105 +105 @@
          IF( .NOT. lsp_area ) THEN
             IF (lk_mpp )   THEN
-               nictls = MAX( 1, nlditl(js) - overlap )
-               nictle = nleitl(js) + overlap * MIN( 1, nlcitl(js) - nleitl(js)) 
-               njctls = MAX( 1, nldjtl(js) - overlap )
-               njctle = nlejtl(js) + overlap * MIN( 1, nlcjtl(js) - nlejtl(js))
+               nictls = MAX( 1, nis0allp(js) - overlap )
+               nictle = nie0allp(js) + overlap * MIN( 1, jpiallp(js) - nie0allp(js)) 
+               njctls = MAX( 1, njs0allp(js) - overlap )
+               njctle = nje0allp(js) + overlap * MIN( 1, jpjallp(js) - nje0allp(js))
                ! Do not take into account the bound of the domain
                IF( ibonitl(js) == -1 .OR. ibonitl(js) == 2 )   nictls = MAX( 2, nictls )
-               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 )   nictle = MIN( nictle, nleitl(js) - 1 )
+               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 )   nictle = MIN( nictle, nie0allp(js) - 1 )
                IF( ibonjtl(js) == -1 .OR. ibonjtl(js) == 2 )   njctls = MAX( 2, njctls )
-               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 )   njctle = MIN( njctle, nlejtl(js) - 1 )
+               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 )   njctle = MIN( njctle, nje0allp(js) - 1 )
             ELSE
-               nictls = MAX( 1, nimpptl(js) + nlditl(js) - 1 - overlap )
-               nictle = nimpptl(js) + nleitl(js) - 1 + overlap * MIN( 1, nlcitl(js) - nleitl(js) ) 
-               njctls = MAX( 1, njmpptl(js) + nldjtl(js) - 1 - overlap )
-               njctle = njmpptl(js) + nlejtl(js) - 1 + overlap * MIN( 1, nlcjtl(js) - nlejtl(js) ) 
+               nictls = MAX( 1, nimpptl(js) + nis0allp(js) - 1 - overlap )
+               nictle = nimpptl(js) + nie0allp(js) - 1 + overlap * MIN( 1, jpiallp(js) - nie0allp(js) ) 
+               njctls = MAX( 1, njmpptl(js) + njs0allp(js) - 1 - overlap )
+               njctle = njmpptl(js) + nje0allp(js) - 1 + overlap * MIN( 1, jpjallp(js) - nje0allp(js) ) 
                ! Do not take into account the bound of the domain
                IF( ibonitl(js) == -1 .OR. ibonitl(js) == 2 )   nictls = MAX( 2, nictls )
                IF( ibonjtl(js) == -1 .OR. ibonjtl(js) == 2 )   njctls = MAX( 2, njctls )
-               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 )   nictle = MIN( nictle, nimpptl(js) + nleitl(js) - 2 )
-               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 )   njctle = MIN( njctle, njmpptl(js) + nlejtl(js) - 2 )
+               IF( ibonitl(js) ==  1 .OR. ibonitl(js) == 2 )   nictle = MIN( nictle, nimpptl(js) + nie0allp(js) - 2 )
+               IF( ibonjtl(js) ==  1 .OR. ibonjtl(js) == 2 )   njctle = MIN( njctle, njmpptl(js) + nje0allp(js) - 2 )
             ENDIF
          ENDIF
@@ -193 +193 @@
 
       !                             ! Allocate arrays
-      ALLOCATE( nlditl (ijsplt) )
-      ALLOCATE( nldjtl (ijsplt) )
-      ALLOCATE( nleitl (ijsplt) )
-      ALLOCATE( nlejtl (ijsplt) )
+      ALLOCATE( nis0allp(ijsplt) )
+      ALLOCATE( njs0allp(ijsplt) )
+      ALLOCATE( nie0allp(ijsplt) )
+      ALLOCATE( nje0allp(ijsplt) )
       ALLOCATE( nimpptl(ijsplt) )
       ALLOCATE( njmpptl(ijsplt) )
-      ALLOCATE( nlcitl (ijsplt) )
-      ALLOCATE( nlcjtl (ijsplt) )
+      ALLOCATE( jpiallp(ijsplt) )
+      ALLOCATE( jpjallp(ijsplt) )
       ALLOCATE( tra_ctl(jptra,ijsplt) )
       ALLOCATE( ibonitl(ijsplt) )
@@ -213 +213 @@
          cl_run = 'MULTI processor run'
          ! use indices for each area computed by mpp_init subroutine
-         nlditl(1:jpnij) = nldit(:) 
-         nleitl(1:jpnij) = nleit(:) 
-         nldjtl(1:jpnij) = nldjt(:) 
-         nlejtl(1:jpnij) = nlejt(:) 
+         nis0allp(1:jpnij) = nis0all(:) 
+         nie0allp(1:jpnij) = nie0all(:) 
+         njs0allp(1:jpnij) = njs0all(:) 
+         nje0allp(1:jpnij) = nje0all(:) 
          !
          nimpptl(1:jpnij) = nimppt(:)
          njmpptl(1:jpnij) = njmppt(:)
          !
-         nlcitl(1:jpnij) = nlcit(:)
-         nlcjtl(1:jpnij) = nlcjt(:)
+         jpiallp(1:jpnij) = jpiall(:)
+         jpjallp(1:jpnij) = jpjall(:)
          !
          ibonitl(1:jpnij) = ibonit(:)
@@ -254 +254 @@
          IF( .NOT. lsp_area )   THEN
             IF ( lk_mpp )   THEN
-               nictls = nlditl(js) 
-               nictle = nleitl(js)
-               njctls = nldjtl(js)
-               njctle = nlejtl(js)
+               nictls = nis0allp(js) 
+               nictle = nie0allp(js)
+               njctls = njs0allp(js)
+               njctle = nje0allp(js)
             ELSE
-               nictls = nimpptl(js) + nlditl(js) - 1
-               nictle = nimpptl(js) + nleitl(js) - 1
-               njctls = njmpptl(js) + nldjtl(js) - 1
-               njctle = njmpptl(js) + nlejtl(js) - 1
+               nictls = nimpptl(js) + nis0allp(js) - 1
+               nictle = nimpptl(js) + nie0allp(js) - 1
+               njctls = njmpptl(js) + njs0allp(js) - 1
+               njctle = njmpptl(js) + nje0allp(js) - 1
             ENDIF
          ENDIF
@@ -269 +269 @@
          WRITE(j_id,*) '~~~~~~~'
          WRITE(j_id,*)
-         WRITE(j_id,9000)'                                nlej   = ', nlejtl(js), '              '
+         WRITE(j_id,9000)'                                Nje0   = ', nje0allp(js), '              '
          WRITE(j_id,9000)'                  ------------- njctle = ', njctle, ' -------------'
          WRITE(j_id,9001)'                  |                                       |'
@@ -275 +275 @@
          WRITE(j_id,9001)'                  |                                       |'
          WRITE(j_id,9002)'           nictls = ', nictls,  '                           nictle = ', nictle
-         WRITE(j_id,9002)'           nldi   = ', nlditl(js),  '                           nlei   = ', nleitl(js)
+         WRITE(j_id,9002)'           Nis0   = ', nis0allp(js),  '                           Nie0   = ', nie0allp(js)
          WRITE(j_id,9001)'                  |                                       |'
          WRITE(j_id,9001)'                  |                                       |'
          WRITE(j_id,9001)'                  |                                       |'
          WRITE(j_id,9004)'  njmpp  = ',njmpptl(js),'   ------------- njctls = ', njctls, ' -------------'
-         WRITE(j_id,9003)'           nimpp  = ', nimpptl(js), '        nldj   = ', nldjtl(js), '              '
+         WRITE(j_id,9003)'           nimpp  = ', nimpptl(js), '        Njs0   = ', njs0allp(js), '              '
          WRITE(j_id,*)
          WRITE(j_id,*)