Changeset 1528 for trunk/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2009-07-23T16:38:47+02:00 (15 years ago)

Author:

rblod

Message:

Suppress rigid-lid option, see ticket #486

File:

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

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -33 +33 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE closea          ! closed seas
-   USE solisl          ! solver - island in rigid-lid
    USE c1d             ! 1D configuration
 
@@ -258 +257 @@
       !!                              at t-point (ji,jj).
       !!                            = 0  over the continental t-point.
-      !!                            = -n over the nth island t-point.
       !!      The array mbathy is checked to verified its consistency with
       !!      model option. in particular:
@@ -625 +623 @@
       ENDIF
 
-      ! 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'
-         IF(lwp) WRITE(numout,*) '         ----------------------------'
-         !
-         mbathy(:,:) = MAX( 0, mbathy(:,:) )
-         !
-         !  Boundary condition on mbathy
-         IF( .NOT.lk_mpp ) THEN 
-!!gm        !!bug ???  think about it !
-            !   ... mono- or macro-tasking: T-point, >0, 2D array, no slab
-            zbathy(:,:) = FLOAT( mbathy(:,:) )
-            CALL lbc_lnk( zbathy, 'T', 1. )
-            mbathy(:,:) = INT( zbathy(:,:) )
-         ENDIF
+      ! Set to zero mbathy over islands if necessary
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) '         mbathy set to 0 over islands'
+      IF(lwp) WRITE(numout,*) '         ----------------------------'
+      !
+      mbathy(:,:) = MAX( 0, mbathy(:,:) )
+      !
+      !  Boundary condition on mbathy
+      IF( .NOT.lk_mpp ) THEN 
+!!gm     !!bug ???  think about it !
+         !   ... mono- or macro-tasking: T-point, >0, 2D array, no slab
+         zbathy(:,:) = FLOAT( mbathy(:,:) )
+         CALL lbc_lnk( zbathy, 'T', 1. )
+         mbathy(:,:) = INT( zbathy(:,:) )
       ENDIF