Changeset 236 for trunk/NEMO

Timestamp:

2005-03-22T11:17:23+01:00 (19 years ago)

Author:

opalod

Message:

CT : BUGFIX170 : correction of a bug which occurs near Gibraltar and Bab El Mandeb straits in the ORCA 2� configuration when using partial-steps and the MUSCL or TVD advection scheme

Location:

trunk/NEMO/OPA_SRC

Files:

• DOM/domhgr.F90 (modified) (1 diff)
• DOM/dommsk.F90 (modified) (1 diff)
• step.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -140 +140 @@
             !                                             ! =====================
             IF( n_cla == 0 ) THEN
-               ii0 = 160   ;   ii1 = 161        ! Bab el Mandeb (e2u = 18 km)
+
+               ii0 = 139   ;   ii1 = 140        ! Gibraltar Strait (e2u = 20 km)
+               ij0 = 102   ;   ij1 = 102   ;   e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  20.e3
+               IF(lwp) WRITE(numout,*)
+               IF(lwp) WRITE(numout,*) '             orca_r2: Gibraltar : e2u reduced to 20 km'
+               ii0 = 160   ;   ii1 = 160        ! Bab el Mandeb (e2u = 18 km)
                ij0 =  88   ;   ij1 =  88   ;   e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) =  18.e3
                IF(lwp) WRITE(numout,*)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -381 +381 @@
          !
          IF( n_cla == 0 ) THEN
-            !                                ! Gibraltar strait and Gulf of Cadiz
-            ij0 = 101   ;   ij1 = 102
-            ii0 = 137   ;   ii1 = 140   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 14.7e0
-            !                                ! Bab el Mandeb strait
-            ij0 =  87   ;   ij1 =  88
-            ii0 = 162   ;   ii1 = 163   ;   fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 20.0e0
             !                                ! Sound  strait
             ij0 = 116   ;   ij1 = 117

trunk/NEMO/OPA_SRC/step.F90

@@ -167 +167 @@
       !! * local declarations
       INTEGER ::   indic    ! error indicator if < 0
-      INTEGER ::   ii0, ii1, ij0, ij1   ! temporary integers
       !! ---------------------------------------------------------------------
 
@@ -238 +237 @@
       IF( lk_zdfcst )   avt (:,:,:) = avt0 * tmask(:,:,:)          ! Constant Kz (reset avt to the background value)
 
-      IF( cp_cfg == "orca" ) THEN                           ! ORCA: Reduce vertical mixing in some straits
+      IF( cp_cfg == "orca" ) THEN                           ! ORCA: Reduce vertical mixing in some specific areas
          SELECT CASE ( jp_cfg )
             CASE ( 05 )                         ! ORCA R2 configuration
                avt  (:,:,2) = avt  (:,:,2) + 1.e-3 * upsrnfh(:,:)   ! increase diffusivity of rivers mouths
-            CASE ( 2  )                         ! ORCA R2 configuration
-               ij0 = 102   ;   ij1 = 102   ;   ii0 = 140   ;   ii1 = 140
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0    
-               ij0 =  88   ;   ij1 =  88   ;   ii0 = 161   ;   ii1 = 161
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Bab el Mandeb
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0
-            CASE ( 4  )                         ! ORCA R4 configuration
-               ij0 =  52   ;   ij1 =  52   ;   ii0 =  71   ;   ii1 =  71
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) =    &   ! Strait of Gibraltar
-               avt( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 2:jpkm1 ) / 5.e0
          END SELECT
       ENDIF