Changeset 605

Timestamp:

2007-02-20T17:12:23+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_013 : CT : - ensure the same computation of aht[uvw] fields either in Open-MP, mono or MPI

• take the minimum between aeiw and 1000 m2/s for depth levels lower than 20 ONLY for ORCAR2_LIM configuration

File:

• trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -124 +124 @@
             ! Compute aeiw by multiplying Ro^2 and T^-1
             aeiw(ji,jj) = zross(ji,jj) * zross(ji,jj) * SQRT( zah(ji,jj) / zhw(ji,jj) ) * tmask(ji,jj,1)
-            ! Take the minimum between aeiw and 1000m^2/s for depth levels
-            ! lower than 20 (21 in w- point)
-            IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
+            IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN   ! ORCA R02
+               ! Take the minimum between aeiw and aeiv0 for depth levels
+               ! lower than 20 (21 in w- point)
+               IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
+            ENDIF
          END DO
 
@@ -135 +137 @@
          END DO
   
-         ! ORCA R05: Take the minimum between aeiw  and 1000m2/s
+         ! ORCA R05: Take the minimum between aeiw and aeiv0
          IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN   ! ORCA R05
             DO ji = 2, jpim1
-               aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
+               aeiw(ji,jj) = MIN( aeiw(ji,jj), aeiv0 )
             END DO
          ENDIF
@@ -176 +178 @@
                zaht      = ( 1. -  MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min )  &
                   &      + aht0 * upsrnfh(ji,jj)                          ! enhanced near river mouths
-               ahtu(ji,jj) = MAX( zaht_min, aeiu(ji,jj) ) + zaht
-               ahtv(ji,jj) = MAX( zaht_min, aeiv(ji,jj) ) + zaht
-               ahtw(ji,jj) = MAX( zaht_min, aeiw(ji,jj) ) + zaht
+               ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )
+               ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )
+               ahtw(ji,jj) = MAX( MAX( zaht_min, aeiw(ji,jj) ) + zaht, aht0 )
             END DO
          END DO
@@ -298 +300 @@
             ! Compute aeiw by multiplying Ro^2 and T^-1
             aeiw(ji,jj) = zross(ji,jj) * zross(ji,jj) * SQRT( zah(ji,jj) / zhw(ji,jj) ) * tmask(ji,jj,1)
-            ! Take the minimum between aeiw and 1000m^2/s for depth levels
-            ! lower than 20 (21 in w- point)
-            IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
+            IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN   ! ORCA R02
+               ! Take the minimum between aeiw and aeiv0 for depth levels
+               ! lower than 20 (21 in w- point)
+               IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
+            ENDIF
          END DO
       END DO
 
       ! Decrease the coefficient in the tropics (20N-20S) 
-         zf20 = 2. * omega * sin( rad * 20. )
+      zf20 = 2. * omega * sin( rad * 20. )
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -312 +316 @@
       END DO
 
-      ! ORCA R05: Take the minimum between aeiw  and 1000m2/s
+      ! ORCA R05: Take the minimum between aeiw  and aeiv0
       IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN
          DO jj = 2, jpjm1