Changeset 381 for trunk

Timestamp:

2006-02-01T09:48:11+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_019 : CT : allow to read either the levels (lk_zco) either the meters (lk_zps) bathymetry

File:

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

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -380 +380 @@
          !  EEL R5 configuration with east and west open boundaries.
          !  Two rows of zeroes are needed at the south and north for OBCs
+         !  This is for compatibility with the rigid lid option. 
           
          IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN
@@ -389 +390 @@
       ELSEIF( ntopo == 1 ) THEN                       !   read in file  !
          !                                            ! =============== !
-
-         clname = 'bathy_level.nc'                       ! Level bathymetry
-         INQUIRE( FILE=clname, EXIST=llbon )
-         IF( llbon ) THEN
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '         read level bathymetry in ', clname
-            IF(lwp) WRITE(numout,*)
-            itime = 1
-            ipi = jpidta
-            ipj = jpjdta
-            ipk = 1
-            zdt = rdt
-            CALL flinopen( clname, 1, jpidta, 1, jpjdta, .FALSE.,   &
-                           ipi, ipj, ipk, zlamt, zphit, zdept, itime, istep, zdate0, zdt, inum )
-            CALL flinget( inum, 'Bathy_level', jpidta, jpjdta, 1,   &
-                          itime, 1, 1, 1, jpidta, 1, jpjdta, zdta(:,:) )
-            idta(:,:) = zdta(:,:)
-            CALL flinclo( inum )
-
-         ELSE
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*)'    zgr_bat : unable to read the file', clname
-            nstop = nstop + 1
-         ENDIF     
-
-         clname = 'bathy_meter.nc'                       ! meter bathymetry
-         INQUIRE( FILE=clname, EXIST=llbon )
-         IF( llbon ) THEN
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '         read meter bathymetry in ', clname
-            IF(lwp) WRITE(numout,*)
-            itime = 1
-            ipi = jpidta
-            ipj = jpjdta
-            ipk = 1
-            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, 1, jpidta, 1, jpjdta, zdta(:,:) ) 
-            CALL flinclo( inum )
-         ELSE
-            IF( lk_zps .OR. lk_sco ) THEN
+         IF( lk_zco ) THEN
+            clname = 'bathy_level.nc'                       ! Level bathymetry
+            INQUIRE( FILE=clname, EXIST=llbon )
+            IF( llbon ) THEN
+               IF(lwp) WRITE(numout,*)
+               IF(lwp) WRITE(numout,*) '         read level bathymetry in ', clname
+               IF(lwp) WRITE(numout,*)
+               itime = 1
+               ipi = jpidta
+               ipj = jpjdta
+               ipk = 1
+               zdt = rdt
+               CALL flinopen( clname, 1, jpidta, 1, jpjdta, .FALSE.,   &
+                              ipi, ipj, ipk, zlamt, zphit, zdept, itime, istep, zdate0, zdt, inum )
+               CALL flinget( inum, 'Bathy_level', jpidta, jpjdta, 1,   &
+                             itime, 1, 1, 1, jpidta, 1, jpjdta, zdta(:,:) )
+               idta(:,:) = zdta(:,:)
+               CALL flinclo( inum )
+
+            ELSE
+               IF(lwp) WRITE(numout,cform_err)
+               IF(lwp) WRITE(numout,*)'    zgr_bat : unable to read the file', clname
+               nstop = nstop + 1
+            ENDIF   
+  
+         ELSEIF( lk_zps ) THEN
+            clname = 'bathy_meter.nc'                       ! meter bathymetry
+            INQUIRE( FILE=clname, EXIST=llbon )
+            IF( llbon ) THEN
+               IF(lwp) WRITE(numout,*)
+               IF(lwp) WRITE(numout,*) '         read meter bathymetry in ', clname
+               IF(lwp) WRITE(numout,*)
+               itime = 1
+               ipi = jpidta
+               ipj = jpjdta
+               ipk = 1
+               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, 1, jpidta, 1, jpjdta, zdta(:,:) ) 
+               CALL flinclo( inum )
+            ELSE
                IF(lwp) WRITE(numout,cform_err)       
                IF(lwp) WRITE(numout,*)'    zgr_bat : unable to read the file', clname
                nstop = nstop + 1
-            ELSE
-               zdta(:,:) = 0.e0
-               IF(lwp) WRITE(numout,*)'    zgr_bat : bathy_meter not found, but not used, bathy array set to zero'
             ENDIF
          ENDIF