Changeset 1528 for trunk/NEMO/OPA_SRC/DOM/dommsk.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/dommsk.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -17 +17 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp
-   USE solisl          ! ???
    USE dynspg_oce      ! choice/control of key cpp for surface pressure gradient
 
@@ -48 +47 @@
       !!      tropic stream function  points (b).
       !!        Set mbathy to the number of non-zero w-levels of a water column
-      !!      (if island in the domain (lk_isl=T), this is done latter in
-      !!      routine solver_init)
       !!
       !! ** Method  :   The ocean/land mask is computed from the basin bathy-
       !!      metry in level (mbathy) which is defined or read in dommba.
-      !!      mbathy equals 0 over continental T-point, -n over the nth 
-      !!      island T-point, and the number of ocean level over the ocean.
+      !!      mbathy equals 0 over continental T-point 
+      !!      and the number of ocean level over the ocean.
       !!
       !!      At a given position (ji,jj,jk) the ocean/land mask is given by:
@@ -247 +244 @@
       
       ! Computation
-      IF( lk_dynspg_rl ) THEN
-         bmask(:,:) = fmask(:,:,1)       ! elliptic equation is written at f-point
-      ELSE
-         bmask(:,:) = tmask(:,:,1)       ! elliptic equation is written at t-point
-      ENDIF
+      bmask(:,:) = tmask(:,:,1)       ! elliptic equation is written at t-point
       
       ! Boundary conditions
@@ -267 +260 @@
       !   north fold : 
       IF( nperio == 3 .OR. nperio == 4 ) THEN
-         IF( lk_dynspg_rl ) THEN
-            ! T-pt pivot and F-pt elliptic eq. : bmask set to 0. on rows jpj-1 and jpj
-            bmask(:,jpj-1) = 0.e0
-            bmask(:,jpj  ) = 0.e0
-         ELSE
-            ! T-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj and on half jpjglo-1 row
-            DO ji = 1, jpi
-               ii = ji + nimpp - 1
-               bmask(ji,jpj-1) = bmask(ji,jpj-1) * tpol(ii)
-               bmask(ji,jpj  ) = 0.e0
-            END DO
-         ENDIF
+         ! T-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj and on half jpjglo-1 row
+         DO ji = 1, jpi
+            ii = ji + nimpp - 1
+            bmask(ji,jpj-1) = bmask(ji,jpj-1) * tpol(ii)
+            bmask(ji,jpj  ) = 0.e0
+         END DO
       ENDIF
       IF( nperio == 5 .OR. nperio == 6 ) THEN
-         IF( lk_dynspg_rl ) THEN
-            ! F-pt pivot and F-pt elliptic eq. : bmask set to 0. on row jpj and on half jpjglo-1 row
-            DO ji = 1, jpi
-               ii = ji + nimpp - 1
-               bmask(ji,jpj-1) = bmask(ji,jpj-1) * fpol(ii)
-               bmask(ji,jpj  ) = 0.e0
-            END DO
-         ELSE
-            ! F-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj
-            bmask(:,jpj) = 0.e0
-         ENDIF
+         ! F-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj
+         bmask(:,jpj) = 0.e0
       ENDIF
 
@@ -305 +283 @@
          ! north fold : bmask must be set to 0. on rows jpj-1 and jpj 
          IF( npolj == 3 .OR. npolj == 4 ) THEN
-            IF( lk_dynspg_rl ) THEN
-               DO ji = 1, nlci
-                  bmask(ji,nlcj-1) = 0.e0
-                  bmask(ji,nlcj  ) = 0.e0
-               END DO
-            ELSE
-               DO ji = 1, nlci
-                  ii = ji + nimpp - 1
-                  bmask(ji,nlcj-1) = bmask(ji,nlcj-1) * tpol(ii)
-                  bmask(ji,nlcj  ) = 0.e0
-               END DO
-            ENDIF
+            DO ji = 1, nlci
+               ii = ji + nimpp - 1
+               bmask(ji,nlcj-1) = bmask(ji,nlcj-1) * tpol(ii)
+               bmask(ji,nlcj  ) = 0.e0
+            END DO
          ENDIF
          IF( npolj == 5 .OR. npolj == 6 ) THEN
-            IF( lk_dynspg_rl ) THEN
-               DO ji = 1, nlci
-                  ii = ji + nimpp - 1
-                  bmask(ji,nlcj-1) = bmask(ji,nlcj-1) * fpol(ii)
-                  bmask(ji,nlcj  ) = 0.e0
-               END DO
-            ELSE
-               DO ji = 1, nlci
-                  bmask(ji,nlcj  ) = 0.e0
-               END DO
-            ENDIF
+            DO ji = 1, nlci
+               bmask(ji,nlcj  ) = 0.e0
+            END DO
          ENDIF
       ENDIF
@@ -408 +371 @@
       ! Mbathy set to the number of w-level (minimum value 2)
       ! -----------------------------------
-      IF( lk_isl ) THEN
-         ! this is done at the end of solver_init routine
-      ELSE
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               mbathy(ji,jj) = MAX( 1, mbathy(ji,jj) ) + 1
-            END DO
-         END DO
-      ENDIF
+      DO jj = 1, jpj
+         DO ji = 1, jpi
+            mbathy(ji,jj) = MAX( 1, mbathy(ji,jj) ) + 1
+         END DO
+      END DO
       
       ! Control print