Changeset 7277 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/LDF

Timestamp:

2016-11-21T09:55:07+01:00 (8 years ago)

Author:

flavoni

Message:

update 2016 branch with simplif-2

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (modified) (3 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90

@@ -298 +298 @@
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zaht, zaht_min, z1_f20       ! local scalar
+      REAL(wp) ::   zaht, zahf, zaht_min, z1_f20       ! local scalar
       !!----------------------------------------------------------------------
       !
@@ -327 +327 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zaht = ( 1._wp -  MIN( 1._wp , ABS( ff(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
+               !!gm CAUTION : here we assume lat/lon grid in 20deg N/S band (like all ORCA cfg)
+               !!     ==>>>   The Coriolis value is identical for t- & u_points, and for v- and f-points
+               zaht = ( 1._wp -  MIN( 1._wp , ABS( ff_t(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
+               zahf = ( 1._wp -  MIN( 1._wp , ABS( ff_f(ji,jj) * z1_f20 ) ) ) * ( rn_aht_0 - zaht_min )
                ahtu(ji,jj,1) = (  MAX( zaht_min, ahtu(ji,jj,1) ) + zaht  ) * umask(ji,jj,1)     ! min value zaht_min
-               ahtv(ji,jj,1) = (  MAX( zaht_min, ahtv(ji,jj,1) ) + zaht  ) * vmask(ji,jj,1)     ! increase within 20S-20N
+               ahtv(ji,jj,1) = (  MAX( zaht_min, ahtv(ji,jj,1) ) + zahf  ) * vmask(ji,jj,1)     ! increase within 20S-20N
             END DO
          END DO
@@ -555 +558 @@
       END DO
 
-!!gm      IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN   ! ORCA R2
-!!gm         DO jj = 2, jpjm1
-!!gm            DO ji = fs_2, fs_jpim1   ! vector opt.
-!!gm               ! Take the minimum between aeiw and 1000 m2/s over shelves (depth shallower than 650 m)
-!!gm               IF( mbkt(ji,jj) <= 20 )   zaeiw(ji,jj) = MIN( zaeiw(ji,jj), 1000. )
-!!gm            END DO
-!!gm         END DO
-!!gm      ENDIF
-
       !                                         !==  Bound on eiv coeff.  ==!
       z1_f20 = 1._wp / (  2._wp * omega * sin( rad * 20._wp )  )
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
-            zzaei = MIN( 1._wp, ABS( ff(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)       ! tropical decrease
+            zzaei = MIN( 1._wp, ABS( ff_t(ji,jj) * z1_f20 ) ) * zaeiw(ji,jj)       ! tropical decrease
             zaeiw(ji,jj) = MIN( zzaei , paei0 )                                  ! Max value = paei0
          END DO