Changeset 7421 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LDF

Timestamp:

2016-12-01T18:10:41+01:00 (8 years ago)

Author:

flavoni

Message:

#1811 merge dev_CNRS_MERATOR_2016 with dev_merge_2016 branch

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LDF

Files:

• ldfc1d_c2d.F90 (modified) (2 diffs)
• ldftra.F90 (modified) (4 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LDF/ldfc1d_c2d.F90

@@ -59 +59 @@
       REAL(wp) ::   zw    , zdep2   !   -      -
       !!----------------------------------------------------------------------
+
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) '   ldf_c1d : set a given profile to eddy diffusivity/viscosity coefficients'
+         WRITE(numout,*) '   ~~~~~~~'
+      ENDIF
 
       ! initialization of the profile
@@ -130 +136 @@
       !
       IF(lwp) THEN
-         WRITE(numout,*) 'ldf_c2d :     aht = rn_aht0 *  max(e1,e2)/e_equator     (  laplacian) '
-         WRITE(numout,*) '~~~~~~~       or  = rn_bht0 * [max(e1,e2)/e_equator]**3 (bilaplacian)'
+         WRITE(numout,*)
+         WRITE(numout,*) '   ldf_c2d :     aht = rn_aht0 *  max(e1,e2)/e_equator     (  laplacian) '
+         WRITE(numout,*) '   ~~~~~~~       or  = rn_bht0 * [max(e1,e2)/e_equator]**3 (bilaplacian)'
          WRITE(numout,*)
       ENDIF

branches/2016/dev_merge_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
-      !!----------------------------------------------------------------------
-      !
-      IF( nn_aei_ijk_t == 21 ) THEN       ! eddy induced velocity coefficients
+      REAL(wp) ::   zaht, zahf, zaht_min, z1_f20       ! local scalar
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_ldfeiv .AND. nn_aei_ijk_t == 21 ) THEN       ! eddy induced velocity coefficients
          !                                ! =F(growth rate of baroclinic instability)
          !                                ! max value rn_aeiv_0 ; decreased to 0 within 20N-20S
          CALL ldf_eiv( kt, rn_aeiv_0, aeiu, aeiv )
-         IF(lwp .AND. kt<=nit000+20 )   WRITE(numout,*) ' kt , ldf_eiv appel', kt
       ENDIF
       !
@@ -314 +313 @@
          !                                             !   max value rn_aht_0 (rn_aeiv_0 if nn_aei_ijk_t=21)
          !                                             !   increase to rn_aht_0 within 20N-20S
-         IF( nn_aei_ijk_t /= 21 ) THEN
-            CALL ldf_eiv( kt, rn_aht_0, ahtu, ahtv )
-            IF(lwp .AND. kt<=nit000+20 )   WRITE(numout,*) ' kt , ldf_eiv appel  2', kt
-         ELSE
+         IF( ln_ldfeiv .AND. nn_aei_ijk_t == 21 ) THEN   ! use the already computed aei.
             ahtu(:,:,1) = aeiu(:,:,1)
             ahtv(:,:,1) = aeiv(:,:,1)
-            IF(lwp .AND. kt<=nit000+20 )   WRITE(numout,*) ' kt , ahtu=aeiu', kt
+         ELSE                                            ! compute aht. 
+            CALL ldf_eiv( kt, rn_aht_0, ahtu, ahtv )
          ENDIF
          !
@@ -327 +324 @@
          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 +555 @@
       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