Changeset 291 for trunk/NEMO

Timestamp:

2005-09-22T12:47:37+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_008 : CT : - If using the KPP closure scheme, the mask on the Bab El Manbed must be applied only if using ORCAs configurations

• correct the computation error of the tmask_i(:,:) array for ORCA2_LIM so that it is the same in mono and multi processors runs

File:

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

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -173 +173 @@
       END DO  
 
-
 #if defined key_zdfkpp
-      ! land point on Bab el Mandeb zonal section
-      ij0 =  87   ;   ij1 =  88
-      ii0 = 160   ;   ii1 = 161
-      tmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 0.e0
+      IF( cp_cfg == 'orca' )   THEN
+         IF( jp_cfg = 2 )   THEN
+            ! land point on Bab el Mandeb zonal section
+            ij0 =  87   ;   ij1 =  88
+            ii0 = 160   ;   ii1 = 161
+            tmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 0.e0
+         ELSE
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,cform_war)
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*)'          A mask must be applied on Bab el Mandeb strait'
+            IF(lwp) WRITE(numout,*)'          in case of ORCAs configurations'
+            IF(lwp) WRITE(numout,*)'          This is a problem which is not yet solved'
+            IF(lwp) WRITE(numout,*)
+         ENDIF
+      ENDIF
 #endif
+
       ! Interior domain mask (used for global sum)
       ! --------------------
@@ -200 +212 @@
          tpol(jpiglo/2+1:jpiglo) = 0.e0
          fpol(     1    :jpiglo) = 0.e0
+         ! T-point pivot: only half of the nlcj-1 row
+         IF( mjg(nlej) == jpjglo )   THEN
+            DO ji = iif+1, iil-1
+               tmask_i(ji,nlej-1) = tmask_i(ji,nlej-1) * tpol(mig(ji))
+            END DO
+         ENDIF
       ENDIF
       IF( jperio == 5 .OR. jperio == 6 ) THEN      ! F-point pivot
@@ -205 +223 @@
          fpol(jpiglo/2+1:jpiglo) = 0.e0
       ENDIF
-
-      IF( nperio == 3 .OR. nperio == 4 ) THEN      ! T-point pivot: only half of the nlcj-1 row
-         DO ji = iif+1, iil-1
-            tmask_i(ji,ijl-1) = tmask_i(ji,ijl-1) * tpol(mig(ji))
-         END DO
-      ENDIF 
-
 
       ! 2. Ocean/land mask at u-,  v-, and z-points (computed from tmask)