Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_tvd.F90

Timestamp:

2010-09-10T12:32:58+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge of TRA-TRC, see ticket #717

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (11 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -32 +32 @@
    USE lbclnk          ! ocean lateral boundary condition (or mpp link) 
    USE diaptr          ! poleward transport diagnostics
+   USE trc_oce         ! share passive tracers/Ocean variables
 
 
@@ -52 +53 @@
 CONTAINS
 
-   SUBROUTINE tra_adv_tvd ( kt, cdtype, pun, pvn, pwn, &
-      &                                 ptb, ptn, pta, kjpt   )
+   SUBROUTINE tra_adv_tvd ( kt, cdtype, p2dt, pun, pvn, pwn, &
+      &                                       ptb, ptn, pta, kjpt   )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_adv_tvd  ***
@@ -73 +74 @@
       CHARACTER(len=3), INTENT(in   )                               ::   cdtype          ! =TRA or TRC (tracer indicator)
       INTEGER         , INTENT(in   )                               ::   kjpt            ! number of tracers
+      REAL(wp)        , INTENT(in   ), DIMENSION(jpk)               ::   p2dt            ! vertical profile of tracer time-step
       REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk)       ::   pun, pvn, pwn   ! 3 ocean velocity components
       REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk,kjpt)  ::   ptb, ptn        ! before and now tracer fields
@@ -79 +81 @@
       INTEGER  ::   ji, jj, jk, jn          ! dummy loop indices  
       REAL(wp) ::   &
-         z2, z2dtt, zbtr, ztra,              &  ! temporary scalar
+         z2dtt, zbtr, ztra,                  &  ! temporary scalar
          zfp_ui, zfp_vj, zfp_wk,             &  !    "         "
          zfm_ui, zfm_vj, zfm_wk                 !    "         "
@@ -86 +88 @@
       !!----------------------------------------------------------------------
 
-      zwi(:,:,:) = 0.e0
-
-      IF( kt == nit000 .AND. lwp ) THEN
+
+      IF( ( cdtype == 'TRA' .AND. kt == nit000 ) .OR. ( cdtype == 'TRC' .AND. kt == nittrc000 ) )  THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'tra_adv_tvd : TVD advection scheme'
+         WRITE(numout,*) 'tra_adv_tvd : TVD advection scheme on ', cdtype
          WRITE(numout,*) '~~~~~~~~~~~'
          !
@@ -103 +104 @@
       END IF
       !
-      IF( neuler == 0 .AND. kt == nit000 ) THEN   ;    z2 = 1.
-      ELSE                                        ;    z2 = 2.
-      ENDIF
+      zwi(:,:,:) = 0.e0
       !
       !                                                          ! ===========
@@ -150 +149 @@
          ! total advective trend
          DO jk = 1, jpkm1
-            z2dtt = z2 * rdttra(jk)
+            z2dtt = p2dt(jk)
             DO jj = 2, jpjm1
                DO ji = fs_2, fs_jpim1   ! vector opt.
@@ -209 +208 @@
          ! 4. monotonicity algorithm
          ! -------------------------
-         CALL nonosc( ptb(:,:,:,jn), zwx, zwy, zwz, zwi, z2 )
+         CALL nonosc( ptb(:,:,:,jn), zwx, zwy, zwz, zwi, p2dt )
 
 
@@ -253 +252 @@
 
 
-   SUBROUTINE nonosc( pbef, paa, pbb, pcc, paft, prdt )
+   SUBROUTINE nonosc( pbef, paa, pbb, pcc, paft, p2dt )
       !!---------------------------------------------------------------------
       !!                    ***  ROUTINE nonosc  ***
@@ -266 +265 @@
       !!       in-space based differencing for fluid
       !!----------------------------------------------------------------------
-      REAL(wp), INTENT( in ) ::   prdt   ! ???
+      REAL(wp), DIMENSION(jpk)         , INTENT( in    ) ::   &  
+         p2dt                               ! vertical profile of tracer time-step
       REAL(wp), DIMENSION (jpi,jpj,jpk), INTENT( in    ) ::   &
          pbef,                            & ! before field
@@ -299 +299 @@
       DO jk = 1, jpkm1
          ikm1 = MAX(jk-1,1)
-         z2dtt = prdt * rdttra(jk)
+         z2dtt = p2dt(jk)
          DO jj = 2, jpjm1
             DO ji = fs_2, fs_jpim1   ! vector opt.