Changeset 290 for trunk/NEMO/OPA_SRC/mppini_2.h90

Timestamp:

2005-09-22T12:46:33+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_007 : CT : - one bug when reading the bathymetry inthe case jpizoom, jpjzoom different from one

• one bug in the criterion to eliminate processors

File:

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

trunk/NEMO/OPA_SRC/mppini_2.h90

@@ -74 +74 @@
          imask                                ! temporary global workspace
 
-      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   &
+      REAL(wp), DIMENSION(jpidta,jpjdta) ::   &
          zlamt, zphit, zdta                   ! temporary data workspace
       REAL(wp), DIMENSION(jpk) ::   &   
@@ -126 +126 @@
       IF( llbon ) THEN
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '         read level bathymetry in ', clname
+            IF(lwp) WRITE(numout,*) '         read bathymetry in ', clname
             IF(lwp) WRITE(numout,*)
             itime = 1
@@ -134 +134 @@
             zdt = rdt
 
-            CALL flinopen( clname, jpizoom, jpiglo, jpjzoom, jpjglo, .FALSE.,   &
+            CALL flinopen( clname, 1, jpidta, 1, jpjdta, .FALSE.,   &
                            ipi, ipj, ipk, zlamt, zphit, zdept, itime, istep, zdate0, zdt, inum )
-            CALL flinget( inum, clvar, jpiglo, jpjglo, 1,   &
-                          itime, 1, 1, jpizoom, jpiglo, jpjzoom, jpjglo, zdta(:,:) )
+            CALL flinget( inum, clvar, jpidta, jpjdta, 1,   &
+                          itime, 1, 1, 1, jpidta, 1, jpjdta, zdta(:,:) )
             CALL flinclo( inum )
       ELSE
@@ -148 +148 @@
 
       imask(:,:)=1
-      WHERE ( zdta(:,:) <= 0. ) imask = 0
+      WHERE ( zdta(jpizoom:(jpizoom+jpiglo-1),jpjzoom:(jpjglo+jpjzoom-1)) <= 0. ) imask = 0
 
       !  1. Dimension arrays for subdomains
@@ -321 +321 @@
 
          isurf = 0
-         DO jj = 1, ilj
-            DO  ji = 1, ili
+         DO jj = 1+jprecj, ilj-jprecj
+            DO  ji = 1+jpreci, ili-jpreci
                IF( imask(ji+iimppt(ii,ij)-1, jj+ijmppt(ii,ij)-1) == 1) isurf = isurf+1
             END DO
@@ -560 +560 @@
       ENDIF
 
-      ! Periodicity : no corner if nbondi = 2 and nperio != 1
-
-      IF(lwp) WRITE(numout,*) ' nproc=  ',nproc
-      IF(lwp) WRITE(numout,*) ' nowe=   ',nowe
-      IF(lwp) WRITE(numout,*) ' noea=   ',noea
-      IF(lwp) WRITE(numout,*) ' nono=   ',nono
-      IF(lwp) WRITE(numout,*) ' noso=   ',noso
-      IF(lwp) WRITE(numout,*) ' nbondi= ',nbondi
-      IF(lwp) WRITE(numout,*) ' nbondj= ',nbondj
-      IF(lwp) WRITE(numout,*) ' npolj=  ',npolj
-      IF(lwp) WRITE(numout,*) ' nperio= ',nperio
-      IF(lwp) WRITE(numout,*) ' nlci=   ',nlci
-      IF(lwp) WRITE(numout,*) ' nlcj=   ',nlcj
-      IF(lwp) WRITE(numout,*) ' nimpp=  ',nimpp
-      IF(lwp) WRITE(numout,*) ' njmpp=  ',njmpp
-      IF(lwp) WRITE(numout,*) ' nbse=   ',nbse,' npse= ',npse
-      IF(lwp) WRITE(numout,*) ' nbsw=   ',nbsw,' npsw= ',npsw
-      IF(lwp) WRITE(numout,*) ' nbne=   ',nbne,' npne= ',npne
-      IF(lwp) WRITE(numout,*) ' nbnw=   ',nbnw,' npnw= ',npnw
-
       IF( nperio == 1 .AND.jpni /= 1 ) THEN
          IF(lwp) WRITE(numout,cform_err)
@@ -588 +568 @@
       ! Prepare mpp north fold
 
-      IF (jperio >= 3 .AND. jperio <= 6 .AND. jpni > 1 ) THEN
+      IF( jperio >= 3 .AND. jperio <= 6 .AND. jpni > 1 ) THEN
          CALL mpp_ini_north
          IF(lwp) WRITE(numout,*) ' mpp_init2 : North fold boundary prepared for jpni >1'
-      END IF
+      ENDIF
 
       ! Defined npolj, either 0, 3 , 4 , 5 , 6
@@ -601 +581 @@
       ij = ijn(narea)
 
-      IF (jperio == 3 .OR. jperio == 4 ) THEN
-         IF ( ij == jpnj ) npolj = 3
+      IF( jperio == 3 .OR. jperio == 4 ) THEN
+         IF( ij == jpnj ) npolj = 3
       ENDIF
 
       IF( jperio == 5 .OR. jperio == 6 ) THEN
-         IF ( ij == jpnj ) npolj = 5
-      ENDIF
-
+         IF( ij == jpnj ) npolj = 5
+      ENDIF
+      
+      ! Prepare NetCDF output file (if necessary)
+      CALL mpp_init_ioipsl
+
+      ! Periodicity : no corner if nbondi = 2 and nperio != 1
+
+      IF(lwp) THEN
+         WRITE(numout,*) ' nproc=  ',nproc
+         WRITE(numout,*) ' nowe=   ',nowe
+         WRITE(numout,*) ' noea=   ',noea
+         WRITE(numout,*) ' nono=   ',nono
+         WRITE(numout,*) ' noso=   ',noso
+         WRITE(numout,*) ' nbondi= ',nbondi
+         WRITE(numout,*) ' nbondj= ',nbondj
+         WRITE(numout,*) ' npolj=  ',npolj
+         WRITE(numout,*) ' nperio= ',nperio
+         WRITE(numout,*) ' nlci=   ',nlci
+         WRITE(numout,*) ' nlcj=   ',nlcj
+         WRITE(numout,*) ' nimpp=  ',nimpp
+         WRITE(numout,*) ' njmpp=  ',njmpp
+         WRITE(numout,*) ' nbse=   ',nbse,' npse= ',npse
+         WRITE(numout,*) ' nbsw=   ',nbsw,' npsw= ',npsw
+         WRITE(numout,*) ' nbne=   ',nbne,' npne= ',npne
+         WRITE(numout,*) ' nbnw=   ',nbnw,' npnw= ',npnw
+      ENDIF
 
    END SUBROUTINE mpp_init2