Changeset 50

Timestamp:

2004-04-22T11:21:03+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX024 : # Remove the commentary '!CT' for EEL5 configuration

# Correction of the improper reading of bathy_meter in partial steps and mpp case
# Indices and comments correction for zoom functionalities
# Use logical key "lk_isl" instead of "l_isl"

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -284 +284 @@
       REAL(wp) ::   &
          r_bump, h_bump, h_oce,      &  ! bump characteristics 
-         zi, zj, zdate0                 ! temporary scalars
+         zi, zj, zdate0, zdt            ! temporary scalars
       REAL(wp), DIMENSION(jpidta,jpjdta) ::   &
          zlamt, zphit,               &  ! temporary workspace (NetCDF read)
@@ -365 +365 @@
          IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN
             idta( : , 2      ) = 0                 ;      zdta( : , 2      ) =  0.e0
-!!CT            idta( : ,jpjdta-1) = 0                 ;      zdta( : ,jpjdta-1) =  0.e0
+            idta( : ,jpjdta-1) = 0                 ;      zdta( : ,jpjdta-1) =  0.e0
          ENDIF
 
@@ -378 +378 @@
             IF(lwp) WRITE(numout,*) '         read level bathymetry in ', clname
             IF(lwp) WRITE(numout,*)
-!!bugs      OPEN( UNIT=inum, FILE=clname, FORM='FORMATTED', ACCESS='SEQUENTIAL', RECL=1 )
             OPEN( UNIT=inum, FILE=clname, FORM='FORMATTED', ACCESS='SEQUENTIAL', STATUS='OLD' )
 
@@ -396 +395 @@
             il1 = il1 + ifreq
          END DO
-            CLOSE(inum)
+         CLOSE(inum)
+
 9101     FORMAT(1x,a15,2i8)
 9201     FORMAT(3x,13(i3,12x))
@@ -414 +414 @@
             IF(lwp) WRITE(numout,*)
             itime = 1
-            ipi = jpi
-            ipj = jpj
+            ipi = jpidta
+            ipj = jpjdta
             ipk = 1
-            CALL flinopen( clname, jpizoom, jpi, jpjzoom, jpj, .FALSE.,   &    
-                           ipi, ipj, ipk, zlamt, zphit, zdept, itime, istep, zdate0, rdt, inum )
+            zdt = rdt
+            CALL flinopen( clname, 1, jpidta, 1, jpjdta, .FALSE.,   &    
+                           ipi, ipj, ipk, zlamt, zphit, zdept, itime, istep, zdate0, zdt, inum )
             CALL flinget( inum, 'Bathymetry', jpidta, jpjdta, 1,   &
-                          itime, 1, 1, jpizoom, jpi, jpjzoom, jpj, zdta(:,:) ) 
+                          itime, 1, 1, 1, jpidta, 1, jpjdta, zdta(:,:) ) 
             CALL flinclo( inum )
          ELSE
@@ -511 +512 @@
 
       ! Forced closed boundary if required
-      IF( lzoom_e )   mbathy( mi0(jpizoom):mi1(jpizoom) , :  ) = 0
+      IF( lzoom_w )   mbathy( mi0(jpizoom):mi1(jpizoom) , :  ) = 0
       IF( lzoom_s )   mbathy(  : , mj0(jpjzoom):mj1(jpjzoom) ) = 0
-      IF( lzoom_w )   mbathy( mi0(jpidta ):mi1(jpidta ) , :  ) = 0
-      IF( lzoom_n )   mbathy(  : , mj0(jpjdta ):mj1(jpjdta ) ) = 0
+      IF( lzoom_e )   mbathy( mi0(jpiglo+jpizoom-1):mi1(jpiglo+jpizoom-1) , :  ) = 0
+      IF( lzoom_n )   mbathy(  : , mj0(jpjglo+jpjzoom-1):mj1(jpjglo+jpjzoom-1) ) = 0
 
       ! Configuration specific domain modifications
@@ -655 +656 @@
       ENDIF
 
-      ! Set to zero mbathy over islands if necessary  (l_isl=F)
-      IF( .NOT. l_isl ) THEN    ! No island
+      ! Set to zero mbathy over islands if necessary  (lk_isl=F)
+      IF( .NOT. lk_isl ) THEN    ! No island
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '         mbathy set to 0 over islands'