Changeset 2289

Timestamp:

2010-10-18T16:33:48+02:00 (14 years ago)

Author:

cetlod

Message:

Optimisation of tranxt routine

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (5 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -60 +60 @@
    !! * Substitutions
 #  include "domzgr_substitute.h90"
-
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO-Consortium (2010) 
@@ -212 +211 @@
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
       LOGICAL  ::   ll_tra_hpg       ! local logical
-      REAL(wp) ::   ztn, ztd, ztm    ! local scalars
+      REAL(wp) ::   ztn, ztd         ! local scalars
       !!----------------------------------------------------------------------
 
@@ -230 +229 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  IF( ll_tra_hpg )   ztn = ptn(ji,jj,jk,jn)                 ! semi-implicit hpg: keep tn, sn in memory
-                  ! 
-                  ztd = pta(ji,jj,jk,jn) - 2.* ptn(ji,jj,jk,jn) + ptb(ji,jj,jk,jn)      !  time laplacian on tracers
-                  !
-                  ptb(ji,jj,jk,jn) = ptn(ji,jj,jk,jn) + atfp * ztd                      ! ptb <-- filtered ptn 
-                  ptn(ji,jj,jk,jn) = pta(ji,jj,jk,jn)                                   ! ptn <-- pta
+                  ztn = ptn(ji,jj,jk,jn)                                    
+                  ztd = pta(ji,jj,jk,jn) - 2. * ztn + ptb(ji,jj,jk,jn)      !  time laplacian on tracers
+                  !
+                  ptb(ji,jj,jk,jn) = ztn + atfp * ztd                       ! ptb <-- filtered ptn 
+                  ptn(ji,jj,jk,jn) = pta(ji,jj,jk,jn)                       ! ptn <-- pta
                   !
                   IF( ll_tra_hpg )   pta(ji,jj,jk,jn) = ztn + rbcp * ztd    ! pta <-- Brown & Campana average
@@ -281 +279 @@
       INTEGER  ::   ji, jj, jk, jn              ! dummy loop indices
       REAL(wp) ::   ztc_a , ztc_n , ztc_b       ! local scalar
-      REAL(wp) ::   ztc_f , ztc_d , ztc_m       !   -      -
+      REAL(wp) ::   ztc_f , ztc_d               !   -      -
       REAL(wp) ::   ze3t_b, ze3t_n, ze3t_a      !   -      -
-      REAL(wp) ::   ze3t_f, ze3t_d, ze3t_m      !   -      -
+      REAL(wp) ::   ze3t_f, ze3t_d              !   -      -
       REAL(wp) ::   zfact1, zfact2              !   -      -
       !!----------------------------------------------------------------------
@@ -296 +294 @@
          ll_tra     = .TRUE.           ! active tracers case  
          ll_tra_hpg = ln_dynhpg_imp    ! active  tracers case  and  semi-implicit hpg
-         ll_traqsr  = ln_traqsr        ! active  tracers case  and  semi-implicit hpg
+         ll_traqsr  = ln_traqsr        ! active  tracers case  and  solar penetration
       ELSE                          
          ll_tra     = .FALSE.          ! passive tracers case
          ll_tra_hpg = .FALSE.          ! passive tracers case or NO semi-implicit hpg
-         ll_traqsr  = .FALSE.          ! active  tracers case  and  semi-implicit hpg
+         ll_traqsr  = .FALSE.          ! active  tracers case and NO solar penetration
       ENDIF
       !