Changeset 2068 for branches/DEV_r1837_MLF/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2010-09-06T17:56:51+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 ensuring restartability and conservation

File:

• branches/DEV_r1837_MLF/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (7 diffs)

branches/DEV_r1837_MLF/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -178 +178 @@
       !!
       INTEGER  ::   ji, jj, jk      ! dummy loop indices
-      REAL(wp) ::   zt_m, zs_m      ! temporary scalars
+      REAL(wp) ::   zt_d, zs_d      ! temporary scalars
       REAL(wp) ::   ztn, zsn        !    -         -
       !!----------------------------------------------------------------------
@@ -203 +203 @@
                   !                                         ! time laplacian on tracers
                   !                                         ! used for both Asselin and Brown & Campana filters
-                  zt_m = ta(ji,jj,jk) - 2. * tn(ji,jj,jk) + tb(ji,jj,jk)
-                  zs_m = sa(ji,jj,jk) - 2. * sn(ji,jj,jk) + sb(ji,jj,jk)
+                  zt_d = ta(ji,jj,jk) - 2. * tn(ji,jj,jk) + tb(ji,jj,jk)
+                  zs_d = sa(ji,jj,jk) - 2. * sn(ji,jj,jk) + sb(ji,jj,jk)
                   !
                   !                                         ! swap of arrays
-                  tb(ji,jj,jk) = tn(ji,jj,jk) + atfp * zt_m               ! tb <-- tn filtered
-                  sb(ji,jj,jk) = sn(ji,jj,jk) + atfp * zs_m               ! sb <-- sn filtered
+                  tb(ji,jj,jk) = tn(ji,jj,jk) + atfp * zt_d               ! tb <-- tn filtered
+                  sb(ji,jj,jk) = sn(ji,jj,jk) + atfp * zs_d               ! sb <-- sn filtered
                   tn(ji,jj,jk) = ta(ji,jj,jk)                             ! tn <-- ta
                   sn(ji,jj,jk) = sa(ji,jj,jk)                             ! sn <-- sa
                   !                                         ! semi imlicit hpg computation (Brown & Campana)
                   IF( ln_dynhpg_imp ) THEN
-                     ta(ji,jj,jk) = ztn + rbcp * zt_m                     ! ta <-- Brown & Campana average
-                     sa(ji,jj,jk) = zsn + rbcp * zs_m                     ! sa <-- Brown & Campana average
+                     ta(ji,jj,jk) = ztn + rbcp * zt_d                     ! ta <-- Brown & Campana average
+                     sa(ji,jj,jk) = zsn + rbcp * zs_d                     ! sa <-- Brown & Campana average
                   ENDIF
                END DO
@@ -254 +254 @@
       REAL     ::   ztc_a, ztc_n, ztc_b            !    -         -
       REAL     ::   zsc_a, zsc_n, zsc_b            !    -         -
-      REAL     ::   ztc_f, zsc_f, ztc_m, zsc_m     !    -         -
-      REAL     ::   ze3t_f, ze3t_m                 !    -         -
+      REAL     ::   ztc_f, zsc_f, ztc_d, zsc_d     !    -         -
+      REAL     ::   ze3t_f, ze3t_d                 !    -         -
       REAL     ::   zfact1, zfact2                 !    -         -
       !!----------------------------------------------------------------------
@@ -274 +274 @@
       ELSE                                             ! apply filter on thickness weighted tracer and swap
          DO jk = 1, jpkm1
-            zfact1 = atfp * r2dt_t(jk)
+            zfact1 = atfp * rdttra(jk)
             zfact2 = zfact1 / rau0
             DO jj = 1, jpj
@@ -282 +282 @@
                   ze3t_n = fse3t_n(ji,jj,jk)
                   ze3t_a = fse3t_a(ji,jj,jk)
-                  ze3t_m = fse3t_m(ji,jj,jk)
+                  ze3t_d = fse3t_d(ji,jj,jk)
                   !                                         ! tracer content at Before, now and after
                   ztc_b  = tb(ji,jj,jk) * ze3t_b   ;   zsc_b = sb(ji,jj,jk) * ze3t_b
@@ -290 +290 @@
                   !                                         ! Time laplacian on tracer contents
                   !                                         ! used for both Asselin and Brown & Campana filters
-                  ztc_m  = ztc_a  - 2. * ztc_n  + ztc_b
-                  zsc_m  = zsc_a  - 2. * zsc_n  + zsc_b
+                  ztc_d  = ztc_a - 2. * ztc_n + ztc_b
+                  zsc_d  = zsc_a - 2. * zsc_n + zsc_b
                   !                                         ! Asselin Filter on thicknesses and tracer contents
-                  ze3t_f = ze3t_n + atfp * ze3t_m
-                  ztc_f  = ztc_n  + atfp * ztc_m
-                  zsc_f  = zsc_n  + atfp * zsc_m
+                  ze3t_f = ze3t_n + atfp * ze3t_d
+                  ztc_f  = ztc_n  + atfp * ztc_d
+                  zsc_f  = zsc_n  + atfp * zsc_d
                   !                                         ! Filter correction
                   IF( jk == 1 ) THEN
-                     ze3t_f = ze3t_f - zfact2 * ( emp_b       (ji,jj)    - emp         (ji,jj)    )
-                     ztc_f  = ztc_f  - zfact1 * ( sbc_trd_hc_n(ji,jj)    - sbc_trd_hc_b(ji,jj)    )
+                     ! WRITE(numout,*) 'filter correction: sbc_trd_hc_n'
+                     ze3t_f = ze3t_f - zfact2 * ( emp_b       (ji,jj) - emp         (ji,jj) )
+                     ztc_f  = ztc_f  - zfact1 * ( sbc_trd_hc_n(ji,jj) - sbc_trd_hc_b(ji,jj) )
                   ENDIF
                   IF( ln_traqsr .AND. ( jk .LE. nksr ) ) THEN
+                     ! WRITE(numout,*) 'jk =', jk
+                     ! WRITE(numout,*) 'filter correction: qsr_trd_hc_n'
                      ztc_f  = ztc_f  - zfact1 * ( qsr_trd_hc_n(ji,jj,jk) - qsr_trd_hc_b(ji,jj,jk) )
                   ENDIF
-                  !                                         ! swap of arrays
+                                                          ! swap of arrays
                   ze3t_f = 1.e0 / ze3t_f
                   tb(ji,jj,jk) = ztc_f * ze3t_f                           ! tb <-- tn filtered
@@ -312 +315 @@
                   !                                         ! semi imlicit hpg computation (Brown & Campana)
                   IF( ln_dynhpg_imp ) THEN
-                     ze3t_m       = 1.e0   / ( ze3t_n + rbcp * ze3t_m )
-                     ta(ji,jj,jk) = ze3t_m * ( ztc_n  + rbcp * ztc_m  )   ! ta <-- Brown & Campana average
-                     sa(ji,jj,jk) = ze3t_m * ( zsc_n  + rbcp * zsc_m  )   ! sa <-- Brown & Campana average
+                     ze3t_d       = 1.e0   / ( ze3t_n + rbcp * ze3t_d )
+                     ta(ji,jj,jk) = ze3t_d * ( ztc_n  + rbcp * ztc_d  )   ! ta <-- Brown & Campana average
+                     sa(ji,jj,jk) = ze3t_d * ( zsc_n  + rbcp * zsc_d  )   ! sa <-- Brown & Campana average
                   ENDIF
                END DO