Changeset 1273 for trunk/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2009-01-19T16:31:07+01:00 (15 years ago)

Author:

ctlod

Message:

update Gibrlatar, Bab El Mandeb and Sound straits in both full & partial steps bathymetry files such as closed seas, see ticket: #305

File:

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

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -237 +237 @@
       END DO
 
-      IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN
-         !                                           ! =======================
-         ! modified vmask value in                   !  ORCA_R2 configuration
-         ! the vicinity of some straits              ! =======================
-
-         IF( n_cla == 1 ) THEN 
-            !                                ! vmask = 0. on Gibraltar zonal section
-            ij0 = 101   ;   ij1 = 101
-            ii0 = 138   ;   ii1 = 139   ;   vmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 19:jpk ) = 0.e0
-            !                                ! vmask = 0. on Bab el Mandeb zonal section
-            ij0 =  87   ;   ij1 =  87
-            ii0 = 161   ;   ii1 = 163   ;   vmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 18:jpk ) = 0.e0
-         ENDIF
-
-      ENDIF
-      
       ! Lateral boundary conditions
       CALL lbc_lnk( umask, 'U', 1. )
@@ -398 +382 @@
          !
          IF( n_cla == 0 ) THEN
-            !                                ! Sound  strait
-            ij0 = 116   ;   ij1 = 117
-            ii0 = 147   ;   ii1 = 148   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 10.0e0
-         ELSE
-            !                                ! Gibraltar strait and Gulf of Cadiz
+            !                                ! Gibraltar strait  : partial slip (fmask=0.5)
+            ij0 = 101   ;   ij1 = 101
+            ii0 = 139   ;   ii1 = 140   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.5e0
             ij0 = 102   ;   ij1 = 102
-            ii0 = 137   ;   ii1 = 139   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.0e0
-            ij0 = 101   ;   ij1 = 101
-            ii0 = 139   ;   ii1 = 139   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.0e0
-            ij0 = 100   ;   ij1 = 100
-            ii0 = 137   ;   ii1 = 139   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.0e0
-            !                                ! Sound  strait
-            ij0 = 116   ;   ij1 = 117
-            ii0 = 147   ;   ii1 = 148   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 10.0e0
+            ii0 = 139   ;   ii1 = 140   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  0.5e0
+            !
+            !                                ! Bab el Mandeb : partial slip (fmask=1)
+            ij0 =  87   ;   ij1 =  88
+            ii0 = 160   ;   ii1 = 160   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  1.e0
+            ij0 =  88   ;   ij1 =  88
+            ii0 = 159   ;   ii1 = 159   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) =  1.e0
+            !
          ENDIF
+         !                                ! Sound  strait  : strong slip (fmask > 2)
+         ij0 = 115   ;   ij1 = 115
+         ii0 = 145   ;   ii1 = 146   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 4.0e0
+         ij0 = 116   ;   ij1 = 116
+         ii0 = 145   ;   ii1 = 146   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 4.0e0
          !
       ENDIF