Changeset 2240 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2010-10-13T10:48:48+02:00 (14 years ago)

Author:

cetlod

Message:

Suppression of key_zco everywhere in the code

File:

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

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

@@ -143 +143 @@
       ! Leap-Frog + Asselin filter time stepping
       IF( lk_vvl )   THEN   ;   CALL tra_nxt_vvl( kt, 'TRA', tsb, tsn, tsa, jpts )  ! variable volume level (vvl)     
-      ELSE                  ;   CALL tra_nxt_fix( kt,        tsb, tsn, tsa, jpts )  ! fixed    volume level 
+      ELSE                  ;   CALL tra_nxt_fix( kt, 'TRA', tsb, tsn, tsa, jpts )  ! fixed    volume level 
       ENDIF
 
@@ -172 +172 @@
 
 
-   SUBROUTINE tra_nxt_fix( kt, ptb, ptn, pta, kjpt )
+   SUBROUTINE tra_nxt_fix( kt, cdtype, ptb, ptn, pta, kjpt )
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE tra_nxt_fix  ***
@@ -195 +195 @@
       !!              - (ta,sa) time averaged (t,s)   (ln_dynhpg_imp = T)
       !!----------------------------------------------------------------------
-      INTEGER , INTENT(in   )                               ::  kt       ! ocean time-step index
-      INTEGER , INTENT(in   )                               ::  kjpt     ! number of tracers
-      REAL(wp), INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  ptb      ! before tracer fields
-      REAL(wp), INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  ptn      ! now tracer fields
-      REAL(wp), INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  pta      ! tracer trend
-      !!
+      INTEGER         , INTENT(in   )                               ::  kt       ! ocean time-step index
+      CHARACTER(len=3), INTENT(in   )                               ::  cdtype   ! =TRA or TRC (tracer indicator)
+      INTEGER         , INTENT(in   )                               ::  kjpt     ! number of tracers
+      REAL(wp)        , INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  ptb      ! before tracer fields
+      REAL(wp)        , INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  ptn      ! now tracer fields
+      REAL(wp)        , INTENT(inout), DIMENSION(jpi,jpj,jpk,kjpt)  ::  pta      ! tracer trend
       INTEGER  :: ji, jj, jk, jn   ! dummy loop indices
       REAL(wp) :: ztd, ztm         ! temporary scalars
@@ -222 +222 @@
       ELSE                                           ! general case (Leapfrog + Asselin filter
          !
-         !                                           ! ----------------------- !
-         IF( ln_dynhpg_imp ) THEN                    ! semi-implicite hpg case !
-            !                                        ! ----------------------- !
+         !                                                     ! ----------------------- !
+         IF( ln_dynhpg_imp .AND. cdtype == 'TRA' ) THEN        ! semi-implicite hpg case !
+            !                                                  ! ----------------------- !
             DO jn = 1, kjpt
                DO jk = 1, jpkm1
@@ -317 +317 @@
       ELSE                                           ! general case (Leapfrog + Asselin filter)
          !
-         !                                           ! ----------------------- !
-         IF( ln_dynhpg_imp ) THEN                    ! semi-implicite hpg case !
-            !                                        ! ----------------------- !
+         !                                                     ! ----------------------- !
+         IF( ln_dynhpg_imp .AND. cdtype == 'TRA' ) THEN        ! semi-implicite hpg case !
+            !                                                  ! ----------------------- !
             DO jn = 1, kjpt                          
                DO jk = 1, jpkm1