Changeset 9449 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

Timestamp:

2018-03-30T17:37:02+02:00 (6 years ago)

Author:

smasson

Message:

dev_merge_2017: agrif bugfix for non-constant jpi/jpj + some cleaning...

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90 (modified) (5 diffs)

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

@@ -106 +106 @@
    !!----------------------------------------------------------------------
 
+
    SUBROUTINE mpp_init
       !!----------------------------------------------------------------------
@@ -159 +160 @@
       ! If dimensions of processor grid weren't specified in the namelist file
       ! then we calculate them here now that we have our communicator size
-      IF( jpni < 1 .OR. jpnj < 1 ) THEN
-         IF( Agrif_Root() )   CALL mpp_init_partition( mppsize )
-      ENDIF
+      IF( jpni < 1 .OR. jpnj < 1 )   CALL mpp_init_partition( mppsize )
       !
 #if defined key_agrif
       IF( jpnij /= jpni*jpnj ) CALL ctl_stop( 'STOP', 'Cannot remove land proc with AGRIF' )
 #endif
-
       !
       ALLOCATE(  nfiimpp(jpni,jpnj), nfipproc(jpni,jpnj), nfilcit(jpni,jpnj) ,    &
@@ -183 +181 @@
       
       !
-#if defined key_agrif
       IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
-         jpiglo  = nbcellsx + 2 + 2*nbghostcells
-         jpjglo  = nbcellsy + 2 + 2*nbghostcells
-         jpimax  = ( jpiglo-2*nn_hls + (jpni-1+0) ) / jpni + 2*nn_hls
-         jpjmax  = ( jpjglo-2*nn_hls + (jpnj-1+0) ) / jpnj + 2*nn_hls
-         jperio  = 0
-         ln_use_jattr = .false.
-      ENDIF
+         IF( jpiglo /= nbcellsx + 2 + 2*nbghostcells )   &
+            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nbghostcells' )
+         IF( jpjglo /= nbcellsy + 2 + 2*nbghostcells )   &
+            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nbghostcells' )
+         IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' )
+      ENDIF
+
+#if defined key_nemocice_decomp
+      jpimax = ( nx_global+2-2*nn_hls + (jpni-1) ) / jpni + 2*nn_hls    ! first  dim.
+      jpjmax = ( ny_global+2-2*nn_hls + (jpnj-1) ) / jpnj + 2*nn_hls    ! second dim. 
+#else
+      jpimax = ( jpiglo - 2*nn_hls + (jpni-1) ) / jpni + 2*nn_hls    ! first  dim.
+      jpjmax = ( jpjglo - 2*nn_hls + (jpnj-1) ) / jpnj + 2*nn_hls    ! second dim.
 #endif
-
-      IF( Agrif_Root() ) THEN       ! AGRIF mother: specific setting from jpni and jpnj
-#if defined key_nemocice_decomp
-         jpimax = ( nx_global+2-2*nn_hls + (jpni-1) ) / jpni + 2*nn_hls    ! first  dim.
-         jpjmax = ( ny_global+2-2*nn_hls + (jpnj-1) ) / jpnj + 2*nn_hls    ! second dim. 
-#else
-         jpimax = ( jpiglo - 2*nn_hls + (jpni-1) ) / jpni + 2*nn_hls    ! first  dim.
-         jpjmax = ( jpjglo - 2*nn_hls + (jpnj-1) ) / jpnj + 2*nn_hls    ! second dim.
-#endif
-      ENDIF
 
       !
@@ -449 +442 @@
       ii_noea(:) = -1
       ii_nowe(:) = -1 
-      DO jarea = 1, jpnij
-         ii = iin(jarea)
-         ij = ijn(jarea)
+      DO jproc = 1, jpnij
+         ii = iin(jproc)
+         ij = ijn(jproc)
          IF( 0 <= ioso(ii,ij) .AND. ioso(ii,ij) <= (jpni*jpnj-1) ) THEN
             iiso = 1 + MOD( ioso(ii,ij) , jpni )
             ijso = 1 +      ioso(ii,ij) / jpni
-            ii_noso(jarea) = ipproc(iiso,ijso)
+            ii_noso(jproc) = ipproc(iiso,ijso)
          ENDIF
          IF( 0 <= iowe(ii,ij) .AND. iowe(ii,ij) <= (jpni*jpnj-1) ) THEN
           iiwe = 1 + MOD( iowe(ii,ij) , jpni )
           ijwe = 1 +      iowe(ii,ij) / jpni
-          ii_nowe(jarea) = ipproc(iiwe,ijwe)
+          ii_nowe(jproc) = ipproc(iiwe,ijwe)
          ENDIF
          IF( 0 <= ioea(ii,ij) .AND. ioea(ii,ij) <= (jpni*jpnj-1) ) THEN
             iiea = 1 + MOD( ioea(ii,ij) , jpni )
             ijea = 1 +      ioea(ii,ij) / jpni
-            ii_noea(jarea)= ipproc(iiea,ijea)
+            ii_noea(jproc)= ipproc(iiea,ijea)
          ENDIF
          IF( 0 <= iono(ii,ij) .AND. iono(ii,ij) <= (jpni*jpnj-1) ) THEN
             iino = 1 + MOD( iono(ii,ij) , jpni )
             ijno = 1 +      iono(ii,ij) / jpni
-            ii_nono(jarea)= ipproc(iino,ijno)
+            ii_nono(jproc)= ipproc(iino,ijno)
          ENDIF
       END DO
@@ -501 +494 @@
       ! Save maximum number of levels in jpkglo, then define all vertical grids with this number.
       ! Suppress once vertical online interpolation is ok
-      IF(.NOT.Agrif_Root())   jpkglo = Agrif_Parent( jpkglo )
+!!$      IF(.NOT.Agrif_Root())   jpkglo = Agrif_Parent( jpkglo )
 #endif
       jpim1 = jpi-1                                            ! inner domain indices