Changeset 261 for trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90

Timestamp:

2005-09-08T15:18:32+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_05:RB+OA:Update and rewritting of (part of) the TOP component

File:

• trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90 (modified) (10 diffs)

trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90

@@ -14 +14 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE trcbbl          ! advective passive tracers in the BBL
+   USE lib_mpp
 
    IMPLICIT NONE
@@ -21 +22 @@
    PUBLIC trc_adv_muscl  ! routine called by trcstp.F90
 
-   !! * Module variable
-   REAL(wp), DIMENSION(jpk) ::   &
-      rdttrc                     ! vertical profile of tracer time-step
-
    !! * Substitutions
 #  include "passivetrc_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   TOP 1.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !!   OPA 9.0 , LODYC-IPSL (2003)
    !!----------------------------------------------------------------------
 
@@ -77 +72 @@
       REAL(wp) ::   zu, zv, zw, zeu, zev, zew, zbtr, ztra
       REAL(wp) ::   z0u, z0v, z0w
-      REAL(wp) ::   zzt1, zzt2, zalpha
+      REAL(wp) ::   zzt1, zzt2, zalpha, z2dtt
 #if defined key_trc_diatrd
       REAL(wp) ::   ztai, ztaj
@@ -90 +85 @@
          WRITE(numout,*) 'trc_adv : MUSCL advection scheme'
          WRITE(numout,*) '~~~~~~~'
-         rdttrc(:) =  rdttra(:) * FLOAT(ndttrc)
       ENDIF
 
@@ -145 +139 @@
          ztp2(:,:,jpk) = 0.e0
 
-
          ! Slopes limitation
          DO jk = 1, jpkm1
             DO jj = 2, jpj
-               DO ji = fs_2, fs_jpim1   ! vector opt.
+               DO ji = fs_2, jpi   ! vector opt.
                   ztp1(ji,jj,jk) = SIGN( 1., ztp1(ji,jj,jk) )   &
                      &           * MIN(    ABS( ztp1(ji  ,jj,jk) ),   &
@@ -163 +156 @@
             END DO
          END DO
-
 
          ! Advection terms
@@ -179 +171 @@
 #endif
                   ! MUSCL fluxes
+                  z2dtt = rdttra(jk) * FLOAT(ndttrc)
                   z0u = SIGN( 0.5, zun(ji,jj,jk) )            
                   zalpha = 0.5 - z0u
-                  zu  = z0u - 0.5 * zun(ji,jj,jk) * rdttrc(jk) / e1u(ji,jj)
+                  zu  = z0u - 0.5 * zun(ji,jj,jk) * z2dtt / e1u(ji,jj)
                   zzt1 = trb(ji+1,jj,jk,jn) + zu*ztp1(ji+1,jj,jk)
                   zzt2 = trb(ji  ,jj,jk,jn) + zu*ztp1(ji  ,jj,jk)
                   zt1(ji,jj,jk) = zeu * ( zalpha * zzt1 + (1.-zalpha) * zzt2 )
-
                   z0v = SIGN( 0.5, zvn(ji,jj,jk) )            
                   zalpha = 0.5 - z0v
-                  zv  = z0v - 0.5 * zvn(ji,jj,jk) * rdttrc(jk) / e2v(ji,jj)
+                  zv  = z0v - 0.5 * zvn(ji,jj,jk) * z2dtt / e2v(ji,jj)
                   zzt1 = trb(ji,jj+1,jk,jn) + zv*ztp2(ji,jj+1,jk)
                   zzt2 = trb(ji,jj  ,jk,jn) + zv*ztp2(ji,jj  ,jk)
@@ -238 +230 @@
          END DO
 
-         IF(l_ctl) THEN         ! print mean trends (used for debugging)
-            ztra = SUM( tra(2:nictl,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )
+         IF(ln_ctl) THEN         ! print mean trends (used for debugging)
+            ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
             WRITE(numout,*) ' trc/had  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl' 
             tra_ctl(jn) = ztra 
@@ -284 +276 @@
             DO jj = 2, jpjm1      
                DO ji = fs_2, fs_jpim1   ! vector opt.
+                  z2dtt = rdttra(jk) * FLOAT(ndttrc)
                   zew = zwn(ji,jj,jk+1)
                   z0w = SIGN( 0.5, zwn(ji,jj,jk+1) )
                   zalpha = 0.5 + z0w
-                  zw  = z0w - 0.5 * zwn(ji,jj,jk+1)*rdttrc(jk) / fse3w(ji,jj,jk+1)
+                  zw  = z0w - 0.5 * zwn(ji,jj,jk+1)*z2dtt / fse3w(ji,jj,jk+1)
                   zzt1 = trb(ji,jj,jk+1,jn) + zw*ztp1(ji,jj,jk+1)
                   zzt2 = trb(ji,jj,jk  ,jn) + zw*ztp1(ji,jj,jk  )
@@ -322 +315 @@
          END DO
 
-         IF(l_ctl) THEN         ! print mean trends (used for debugging)
-            ztra = SUM( tra(2:nictl,2:njctl,1:jpkm1,jn) * tmask(2:nictl,2:njctl,1:jpkm1) )
+         IF(ln_ctl) THEN         ! print mean trends (used for debugging)
+            ztra = SUM( tra(2:nictle,2:njctle,1:jpkm1,jn) * tmask(2:nictle,2:njctle,1:jpkm1) )
             WRITE(numout,*) ' trc/zad  - ',ctrcnm(jn),' : ', ztra-tra_ctl(jn), ' muscl' 
             tra_ctl(jn) = ztra