Changeset 354 for trunk/NEMO

Timestamp:

2005-12-12T16:56:48+01:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : CT : Switch to IOIPSL-3-0 new library

Location:

trunk/NEMO/OFF_SRC

Files:

• DOM/domrea.F90 (modified) (3 diffs)
• mppini.F90 (modified) (3 diffs)

trunk/NEMO/OFF_SRC/DOM/domrea.F90

@@ -128 +128 @@
             CALL restini( clnam0, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mesh_mask.nc' file
             &             jpk   , gdept , trim(clnam0)        ,  &   ! in unit inum0
-            &             itime , zdate0, rdt   , inum0          )
+            &             itime , zdate0, rdt   , inum0, domain_id=nidom )
             inum2 = inum0                                            ! put all the informations
             inum3 = inum0                                            ! in unit inum0
@@ -141 +141 @@
             CALL restini( clnam1, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mesh.nc' file 
             &             jpk   , gdept , trim(clnam1)        ,  &   ! in unit inum1 
-            &             itime , zdate0, rdt   , inum1          )
+            &             itime , zdate0, rdt   , inum1, domain_id=nidom )
             CALL restini( clnam2, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mask.nc' file 
             &             jpk   , gdept , trim(clnam2)        ,  &   ! in unit inum2 
-            &             itime , zdate0, rdt   , inum2          )
+            &             itime , zdate0, rdt   , inum2, domain_id=nidom )
             inum3 = inum1                                            ! put mesh informations 
             inum4 = inum1                                            ! in unit inum1 
@@ -157 +157 @@
             CALL restini( clnam3, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mesh_hgr.nc' file
             &             jpk   , gdept , trim(clnam3)        ,  &   ! in unit inum3
-            &             itime , zdate0, rdt   , inum3          )
+            &             itime , zdate0, rdt   , inum3, domain_id=nidom )
             CALL restini( clnam4, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mesh_zgr.nc' file
             &             jpk   , gdept , trim(clnam4)        ,  &   ! in unit inum4
-            &             itime , zdate0, rdt   , inum4          )
+            &             itime , zdate0, rdt   , inum4, domain_id=nidom )
             CALL restini( clnam2, jpidta   , jpjdta   , glamt, gphit,  &   ! create 'mask.nc' file
             &             jpk   , gdept , trim(clnam2)        ,  &   ! in unit inum2
-            &             itime , zdate0, rdt   , inum2          ) 
+            &             itime , zdate0, rdt   , inum2, domain_id=nidom )
 
          END SELECT

trunk/NEMO/OFF_SRC/mppini.F90

@@ -15 +15 @@
    USE in_out_manager  ! I/O Manager
    USE lib_mpp         ! distribued memory computing library
+   USE ioipsl
 
    IMPLICIT NONE
@@ -63 +64 @@
       nbondi = 2
       nbondj = 2
+      nidom  = FLIO_DOM_NONE
+
       IF(lwp) THEN
          WRITE(numout,*)
@@ -498 +501 @@
       !!   9.0  !  04-03  (G. Madec)  MPP-IOIPSL 
       !!----------------------------------------------------------------------
-      USE ioipsl
-      INTEGER, DIMENSION(4) ::   &
-         iglo, iloc, iabsf, iabsl, ihals, ihale   ! ???
-      !!----------------------------------------------------------------------
+      !! Local declarations
+
+      INTEGER, DIMENSION(2) ::   &
+         iglo, iloc, iabsf, iabsl, ihals, ihale, idid
+      INTEGER ::   &
+         inbondi, inbondj
+      !!----------------------------------------------------------------------
+
+      ! The domain is splitted only horizontally along i- or/and j- direction
+      ! So we need at the most only 1D arrays with 2 elements
       iglo(1) = jpiglo
       iglo(2) = jpjglo
-      iglo(3) = jpk
-      iglo(4) = 1
       iloc(1) = nlci
       iloc(2) = nlcj
-      iloc(3) = jpk
-      iloc(4) = 1
       iabsf(1) = nimppt(narea)
       iabsf(2) = njmppt(narea)
-      iabsf(3) = 1
-      iabsf(4) = 1
       iabsl(:) = iabsf(:) + iloc(:) - 1
       ihals(1) = jpreci
       ihals(2) = jprecj
-      ihals(3) = 0
-      ihals(4) = 0
       ihale(1) = jpreci
       ihale(2) = jprecj
-      ihale(3) = 0
-      ihale(4) = 0
-      IF( nbondi == -1 .OR. nbondi == 2 )   ihals(1) = 0
-      IF( nbondi ==  1 .OR. nbondi == 2 )   ihale(1) = 0
-      IF( nbondj == -1 .OR. nbondj == 2 )   ihals(2) = 0
-      IF( nbondj ==  1 .OR. nbondj == 2 )   ihale(2) = 0
+      idid(1) = 1
+      idid(2) = 2
+
+      inbondj = -1                                   ! general case
+      IF( narea   >  jpni          )   inbondj = 0      ! first row of processor
+      IF( narea   >  (jpnj-1)*jpni )   inbondj = 1      ! last  row of processor
+      IF( jpnj    == 1             )   inbondj = 2      ! one processor only in j-direction
+      IF( inbondj == -1 .OR. inbondj == 2 )   ihals(2) = 0
+      IF( inbondj ==  1 .OR. inbondj == 2 )   ihale(2) = 0
+         
+      inbondi = 0                                    ! 
+      IF( MOD( narea, jpni ) == 1 )   inbondi = -1      !
+      IF( MOD( narea, jpni ) == 0 )   inbondi =  1      !
+      IF( jpni               == 1 )   inbondi =  2      ! one processor only in i-direction
+      IF( inbondi == -1 .OR. inbondi == 2 )   ihals(1) = 0
+      IF( inbondi ==  1 .OR. inbondi == 2 )   ihale(1) = 0
+
+
       IF(lwp) THEN
-          WRITE(numout,*) 'mpp_init_ioipsl :   iloc  = ', iloc (1), iloc (2), iloc (3), iloc (4)
-          WRITE(numout,*) '~~~~~~~~~~~~~~~     iabsf = ', iabsf(1), iabsf(2), iabsf(3), iabsf(4)
-          WRITE(numout,*) '                    ihals = ', ihals(1), ihals(2), ihals(3), ihals(4)
-          WRITE(numout,*) '                    ihale = ', ihale(1), ihale(2), ihale(3), ihale(4)
-      ENDIF
-
-      CALL ioipsl_inimpp( jpnij, nproc, iglo, iloc, iabsf, iabsl, ihals, ihale )
+          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