Changeset 5866 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90

Timestamp:

2015-11-06T11:42:35+01:00 (8 years ago)

Author:

gm

Message:

#1613: vvl by default: add ln_linssh and remove key_vvl

File:

• branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90 (modified) (6 diffs)

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90

@@ -66 +66 @@
       !!      (N.B. bottom condition is applied through the masked field avt).
       !!              - the after tracer fields due to the whole trend is 
-      !!      obtained in leap-frog environment by :
-      !!          pta = zwx + p2dt pta
-      !!              - in case of variable level thickness (lk_vvl=T) the 
-      !!     the leap-frog is applied on thickness weighted tracer. That is:
+      !!      obtained in leap-frog environment applied on thickness weighted tracer by :
       !!          pta = [ ptb*e3tb + e3tn*( zwx - ptb + p2dt pta ) ] / e3tn
       !!
       !! ** Action : - after tracer fields pta
       !!---------------------------------------------------------------------
-      !
       INTEGER                              , INTENT(in   ) ::   kt          ! ocean time-step index
       INTEGER                              , INTENT(in   ) ::   kit000      ! first time step index
@@ -92 +88 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_zdf_exp')
       !
-      CALL wrk_alloc( jpi, jpj, jpk, zwx, zwy ) 
+      CALL wrk_alloc( jpi,jpj,jpk,   zwx, zwy ) 
       !
 
@@ -121 +117 @@
                DO jj = 2, jpjm1 
                   DO ji = fs_2, fs_jpim1   ! vector opt.
-                     zave3r = 1.e0 / e3w_n(ji,jj,jk) 
+                     zave3r = 1.e0 / e3w_n(ji,jj,jk)            !!gm here it should be e3w_b  ????
                      IF( cdtype == 'TRA' .AND. jn == jp_tem ) THEN  ! temperature : use of avt
                         zwy(ji,jj,jk) =   avt(ji,jj,jk) * ( zwx(ji,jj,jk-1) - zwx(ji,jj,jk) ) * zave3r
@@ -144 +140 @@
          ! After tracer due to all trends
          ! ------------------------------
-         IF( lk_vvl ) THEN          ! variable level thickness : leap-frog on tracer*e3t
+         IF( .NOT.ln_linssh ) THEN     ! variable level thickness : leap-frog on tracer*e3t
             DO jk = 1, jpkm1
                DO jj = 2, jpjm1 
@@ -154 +150 @@
                END DO
             END DO
-         ELSE                       ! fixed level thickness : leap-frog on tracers
+         ELSE                          ! fixed level thickness : leap-frog on tracers
             DO jk = 1, jpkm1
                DO jj = 2, jpjm1 
@@ -166 +162 @@
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj, jpk, zwx, zwy ) 
+      CALL wrk_dealloc( jpi,jpj,jpk,   zwx, zwy ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_zdf_exp')