Changeset 2970 for branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2011-10-20T18:21:47+02:00 (13 years ago)

Author:

mlelod

Message:

thickness weighted outputs and additional outputs, see ticket/863?

File:

• branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (3 diffs)

branches/2011/dev_r2739_LOCEAN8_ZTC/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -278 +278 @@
       LOGICAL  ::   ll_tra, ll_tra_hpg, ll_traqsr   ! local logical
       INTEGER  ::   ji, jj, jk, jn              ! dummy loop indices
-      REAL(wp) ::   zfact1, ztc_a , ztc_n , ztc_b , ztc_f , ztc_d    ! local scalar
-      REAL(wp) ::   zfact2, ze3t_b, ze3t_n, ze3t_a, ze3t_f, ze3t_d   !   -      -
+      REAL(wp) ::   zfact1, ztc_a, ztc_n, ztc_b, ztc_f , ztc_d    ! local scalar
+      REAL(wp) ::   zfact2,                      ze3t_f, ze3t_d   !   -      -
       !!----------------------------------------------------------------------
 
@@ -304 +304 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  ze3t_b = fse3t_b(ji,jj,jk)
-                  ze3t_n = fse3t_n(ji,jj,jk)
-                  ze3t_a = fse3t_a(ji,jj,jk)
-                  !                                         ! tracer content at Before, now and after
-                  ztc_b  = ptb(ji,jj,jk,jn) * ze3t_b
-                  ztc_n  = ptn(ji,jj,jk,jn) * ze3t_n
-                  ztc_a  = pta(ji,jj,jk,jn) * ze3t_a
-                  !
-                  ze3t_d = ze3t_a - 2. * ze3t_n + ze3t_b
+                  !                                         ! tracer content at before, now and after
+                  ztc_b  = ptb(ji,jj,jk,jn) * fse3t_b(ji,jj,jk)
+                  ztc_n  = ptn(ji,jj,jk,jn) * fse3t_n(ji,jj,jk)
+                  ztc_a  = pta(ji,jj,jk,jn) * fse3t_a(ji,jj,jk)
+                  !
+                  ze3t_d = fse3t_a(ji,jj,jk) - 2. * fse3t_n(ji,jj,jk) + fse3t_b(ji,jj,jk)
                   ztc_d  = ztc_a  - 2. * ztc_n  + ztc_b
                   !
-                  ze3t_f = ze3t_n + atfp * ze3t_d
+                  ze3t_f = fse3t_n(ji,jj,jk) + atfp * ze3t_d
                   ztc_f  = ztc_n  + atfp * ztc_d
                   !
-                  IF( ll_tra .AND. jk == 1 ) THEN           ! first level only for T & S
-                      ze3t_f = ze3t_f - zfact2 * ( emp_b(ji,jj) - emp(ji,jj) )
-                      ztc_f  = ztc_f  - zfact1 * ( sbc_tsc(ji,jj,jn) - sbc_tsc_b(ji,jj,jn) )
+                  IF( jk == 1 ) THEN           ! first level
+                     ze3t_f = ze3t_f - zfact2 * ( emp_b(ji,jj) - emp(ji,jj) )
+                     IF( ll_tra ) ztc_f  = ztc_f  - zfact1 * ( sbc_tsc(ji,jj,jn) - sbc_tsc_b(ji,jj,jn) )   ! only T and S
                   ENDIF
                   IF( ll_traqsr .AND. jn == jp_tem .AND. jk <= nksr )   &     ! solar penetration (temperature only)
@@ -330 +327 @@
                    !
                    IF( ll_tra_hpg ) THEN        ! semi-implicit hpg (T & S only)
-                      ze3t_d           = 1.e0   / ( ze3t_n + rbcp * ze3t_d )
+                      ze3t_d           = 1.e0   / ( fse3t_n(ji,jj,jk) + rbcp * ze3t_d )
                       pta(ji,jj,jk,jn) = ze3t_d * ( ztc_n  + rbcp * ztc_d  )   ! ta <-- Brown & Campana average
                    ENDIF