Changeset 13056 for utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/mppini.F90

Timestamp:

2020-06-07T18:26:09+02:00 (4 years ago)

Author:

rblod

Message:

ticket #2129 : cleaning domcfg

File:

• utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/mppini.F90 (modified) (13 diffs)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/mppini.F90

@@ -17 +17 @@
    !!  mpp_init          : Lay out the global domain over processors with/without land processor elimination
    !!  mpp_init_mask     : Read global bathymetric information to facilitate land suppression
-   !!  mpp_init_ioipsl   : IOIPSL initialization in mpp 
    !!  mpp_init_partition: Calculate MPP domain decomposition
    !!  factorise         : Calculate the factors of the no. of MPI processes
@@ -23 +22 @@
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean space and time domain
-   USE bdy_oce        ! open BounDarY  
    !
    USE lbcnfd  , ONLY : isendto, nsndto, nfsloop, nfeloop   ! Setup of north fold exchanges 
@@ -37 +35 @@
 
    INTEGER :: numbot = -1  ! 'bottom_level' local logical unit
-   INTEGER :: numbdy = -1  ! 'bdy_msk'      local logical unit
    
    !!----------------------------------------------------------------------
@@ -83 +80 @@
       nbondi = 2
       nbondj = 2
-      nidom  = FLIO_DOM_NONE
       npolj = jperio
       l_Iperio = jpni == 1 .AND. (jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7)
@@ -186 +182 @@
       INTEGER, ALLOCATABLE, DIMENSION(:,:) ::   ilej, ildj, ioso, iowe         !  -     -
       LOGICAL, ALLOCATABLE, DIMENSION(:,:) ::   llisoce                        !  -     -
-      NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,           &
-           &             ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta,     &
-           &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &  
-           &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
-           &             cn_ice, nn_ice_dta,                                     &
-           &             rn_ice_tem, rn_ice_sal, rn_ice_age,                     &
-           &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
-      !!----------------------------------------------------------------------
-
-      llwrtlay = lwp .OR. ln_ctl .OR. sn_cfctl%l_layout
-      ! do we need to take into account bdy_msk?
-      REWIND( numnam_ref )              ! Namelist nambdy in reference namelist : BDY
-      READ  ( numnam_ref, nambdy, IOSTAT = ios, ERR = 903)
-903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nambdy in reference namelist (mppini)', lwp )
-      REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist : BDY
-      READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 904 )
-904   IF( ios >  0 )   CALL ctl_nam ( ios , 'nambdy in configuration namelist (mppini)', lwp )
+      !!----------------------------------------------------------------------
+
+      llwrtlay = lwp 
       !
       IF(               ln_read_cfg ) CALL iom_open( cn_domcfg,    numbot )
-      IF( ln_bdy .AND. ln_mask_file ) CALL iom_open( cn_mask_file, numbdy )
       !
       !  1. Dimension arrays for subdomains
@@ -280 +261 @@
 
       IF( numbot /= -1 )   CALL iom_close( numbot )
-      IF( numbdy /= -1 )   CALL iom_close( numbdy )
     
       ALLOCATE(  nfiimpp(jpni,jpnj), nfipproc(jpni,jpnj), nfilcit(jpni,jpnj) ,    &
@@ -666 +646 @@
       ENDIF
       !
-      CALL mpp_init_ioipsl       ! Prepare NetCDF output file (if necessary)
-      !
       IF( ln_nnogather ) THEN
          CALL mpp_init_nfdcom     ! northfold neighbour lists
@@ -902 +880 @@
 
       ! if therr is no land and no print
-      IF( .NOT. llist .AND. numbot == -1 .AND. numbdy == -1 ) THEN
+      IF( .NOT. llist .AND. numbot == -1 ) THEN
          ! get the smaller partition which gives the smallest subdomain size
          ii = MINLOC(inbij1, mask = iszij1 == MINVAL(iszij1), dim = 1)
@@ -997 +975 @@
       !!----------------------------------------------------------------------
       ! do nothing if there is no land-sea mask
-      IF( numbot == -1 .and. numbdy == -1 ) THEN
+      IF( numbot == -1 ) THEN
          propland = 0.
          RETURN
@@ -1053 +1031 @@
       !!----------------------------------------------------------------------
       ! do nothing if there is no land-sea mask
-      IF( numbot == -1 .AND. numbdy == -1 ) THEN
+      IF( numbot == -1  ) THEN
          ldisoce(:,:) = .TRUE.
          RETURN
@@ -1108 +1086 @@
       !
       INTEGER                           ::   inumsave                ! local logical unit
-      REAL(wp), DIMENSION(jpiglo,kjcnt) ::   zbot, zbdy 
+      REAL(wp), DIMENSION(jpiglo,kjcnt) ::   zbot
       !!----------------------------------------------------------------------
       !
@@ -1119 +1097 @@
       ENDIF
 
-       IF( numbdy /= -1 ) THEN                  ! Adjust with bdy_msk if it exists    
-         CALL iom_get ( numbdy, jpdom_unknown, 'bdy_msk', zbdy, kstart = (/1,kjstr/), kcount = (/jpiglo, kjcnt/) )
-         zbot(:,:) = zbot(:,:) * zbdy(:,:)
-      ENDIF
       !
       ldoce(:,:) = zbot(:,:) > 0.
@@ -1128 +1102 @@
       !
    END SUBROUTINE mpp_init_readbot_strip
-
-
-   SUBROUTINE mpp_init_ioipsl
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE mpp_init_ioipsl  ***
-      !!
-      !! ** Purpose :   
-      !!
-      !! ** Method  :   
-      !!
-      !! History :
-      !!   9.0  !  04-03  (G. Madec )  MPP-IOIPSL 
-      !!   " "  !  08-12  (A. Coward)  addition in case of jpni*jpnj < jpnij
-      !!----------------------------------------------------------------------
-      INTEGER, DIMENSION(2) ::   iglo, iloc, iabsf, iabsl, ihals, ihale, idid
-      !!----------------------------------------------------------------------
-
-      ! The domain is split only horizontally along i- or/and j- direction
-      ! So we need at the most only 1D arrays with 2 elements.
-      ! Set idompar values equivalent to the jpdom_local_noextra definition
-      ! used in IOM. This works even if jpnij .ne. jpni*jpnj.
-      iglo(1) = jpiglo
-      iglo(2) = jpjglo
-      iloc(1) = nlci
-      iloc(2) = nlcj
-      iabsf(1) = nimppt(narea)
-      iabsf(2) = njmppt(narea)
-      iabsl(:) = iabsf(:) + iloc(:) - 1
-      ihals(1) = nldi - 1
-      ihals(2) = nldj - 1
-      ihale(1) = nlci - nlei
-      ihale(2) = nlcj - nlej
-      idid(1) = 1
-      idid(2) = 2
-
-      IF(lwp) THEN
-          WRITE(numout,*)
-          WRITE(numout,*) 'mpp_init_ioipsl :   iloc  = ', iloc (1), iloc (2)
-          WRITE(numout,*) '~~~~~~~~~~~~~~~     iabsf = ', iabsf(1), iabsf(2)
-          WRITE(numout,*) '                    ihals = ', ihals(1), ihals(2)
-          WRITE(numout,*) '                    ihale = ', ihale(1), ihale(2)
-      ENDIF
-      !
-      CALL flio_dom_set ( jpnij, nproc, idid, iglo, iloc, iabsf, iabsl, ihals, ihale, 'BOX', nidom)
-      !
-   END SUBROUTINE mpp_init_ioipsl  
-
 
    SUBROUTINE mpp_init_nfdcom