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

Timestamp:

2010-07-09T15:07:02+02:00 (14 years ago)

Author:

mlelod

Message:

ticket: #663 MLF: second part (local compatibility essentially)

File:

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

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

@@ -282 +282 @@
                   ze3t_n = fse3t_n(ji,jj,jk)
                   ze3t_a = fse3t_a(ji,jj,jk)
+                  ze3t_m = fse3t_m(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
@@ -287 +288 @@
                   ztc_a  = ta(ji,jj,jk) * ze3t_a   ;   zsc_a = sa(ji,jj,jk) * ze3t_a
                   !
-                  !                                         ! Time laplacian on thickness and tracer content
+                  !                                         ! Time laplacian on tracer contents
                   !                                         ! used for both Asselin and Brown & Campana filters
-                  ze3t_m = ze3t_a - 2. * ze3t_n + ze3t_b
                   ztc_m  = ztc_a  - 2. * ztc_n  + ztc_b
                   zsc_m  = zsc_a  - 2. * zsc_n  + zsc_b
-                  !                                         ! Asselin Filter + correction
+                  !                                         ! 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
-
+                  !                                         ! Filter correction
                   IF( jk == 1 ) THEN
                      ze3t_f = ze3t_f - zfact2 * ( emp_b       (ji,jj)    - emp         (ji,jj)    )
@@ -312 +312 @@
                   !                                         ! semi imlicit hpg computation (Brown & Campana)
                   IF( ln_dynhpg_imp ) THEN
-                     ze3t_m = 1.e0 / ( ze3t_n + rbcp * ze3t_m )
-                     ta(ji,jj,jk) =  ( ztc_n  + rbcp * ztc_m  ) * ze3t_m  ! ta <-- Brown & Campana average
-                     sa(ji,jj,jk) =  ( zsc_n  + rbcp * zsc_m  ) * ze3t_m  ! sa <-- Brown & Campana average
+                     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
                   ENDIF
                END DO