Changeset 680 for trunk/NEMO/OPA_SRC

Timestamp:

2007-06-29T18:30:44+02:00 (17 years ago)

Author:

rblod

Message:

nemo_v2_bugfix_049 : SM : Patch to work when jpni*jpnj /= jpnij

File:

• trunk/NEMO/OPA_SRC/mppini_2.h90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/mppini_2.h90

@@ -64 +64 @@
          ione  , ionw  , iose  , iosw  ,   &  !    "           "
          ibne  , ibnw  , ibse  , ibsw         !    "           "
-      INTEGER, DIMENSION(jpi,jpj) ::   &
+      INTEGER,  DIMENSION(jpiglo,jpjglo) ::   &
          imask                                ! temporary global workspace
-      REAL(wp), DIMENSION(jpi,jpj) ::   &
+      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   &
          zdta                   ! temporary data workspace
       REAL(wp) ::   zidom , zjdom          ! temporary scalars
 
+      ! read namelist for ln_zco
+      NAMELIST/nam_zgr/ ln_zco, ln_zps, ln_sco
+
       !!----------------------------------------------------------------------
       !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-      !! $Header$ 
+      !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/mppini_2.h90,v 1.16 2007/06/05 10:27:49 opalod Exp $ 
       !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
       !!----------------------------------------------------------------------
+      ! Read Namelist nam_zgr : vertical coordinate'
+      ! ---------------------
+      REWIND ( numnam )
+      READ   ( numnam, nam_zgr )
+
 
 #if defined key_mpp_shmem
@@ -98 +106 @@
 
       ! open the file
+      ! Remember that at this level in the code, mpp is not yet initialized, so
+      ! the file must be open with jpdom_unknown, and kstart amd kcount forced 
       IF ( ln_zco ) THEN 
          CALL iom_open ( 'bathy_level.nc', inum )   ! Level bathymetry
-         CALL iom_get ( inum, jpdom_data, 'Bathy_level', zdta )
+         CALL iom_get ( inum, jpdom_unknown, 'Bathy_level', zdta, kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) )
       ELSE
          CALL iom_open ( 'bathy_meter.nc', inum )   ! Meter bathy in case of partial steps
-         CALL iom_get ( inum, jpdom_data, 'Bathymetry' , zdta )
+         CALL iom_get ( inum, jpdom_unknown, 'Bathymetry' , zdta, kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) )
       ENDIF
       CALL iom_close (inum)
@@ -285 +295 @@
          DO jj = 1+jprecj, ilj-jprecj
             DO  ji = 1+jpreci, ili-jpreci
-               IF( imask(ji, jj) == 1) isurf = isurf+1
+               IF( imask(ji+iimppt(ii,ij)-1, jj+ijmppt(ii,ij)-1) == 1) isurf = isurf+1
             END DO
          END DO