Changeset 2104 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_cen2.F90 (modified) (3 diffs)

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

@@ -15 +15 @@
 
    !!----------------------------------------------------------------------
-   !!   tra_adv_cen2 : update the tracer trend with the horizontal and
-   !!                  vertical advection trends using a seconder order
-   !!   ups_orca_set : allow mixed upstream/centered scheme in specific
-   !!                  area (set for orca 2 and 4 only)
+   !!   tra_adv_cen2 : update the tracer trend with the advection trends using a 2nd order centered scheme
+   !!   ups_orca_set : allow mixed upstream/centered scheme in specific area (set for orca 2 and 4 only)
    !!----------------------------------------------------------------------
    USE oce, ONLY: tsn  ! now ocean temperature and salinity
@@ -115 +113 @@
       USE oce         , zwy => va   ! use va as workspace
       !!
-      INTEGER         , INTENT(in   )                               ::   kt              ! ocean time-step index
-      CHARACTER(len=3), INTENT(in   )                               ::   cdtype          ! =TRA or TRC (tracer indicator)
-      REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk)       ::   pun, pvn, pwn   ! 3 ocean velocity components
-      INTEGER         , INTENT(in   )                               ::   kjpt            ! number of tracers
-      REAL(wp)        , INTENT(in   ), DIMENSION(jpi,jpj,jpk,kjpt)  ::   ptb, ptn        ! before and 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), DIMENSION(jpi,jpj,jpk     ), INTENT(in   ) ::   pun, pvn, pwn   ! 3 ocean velocity components
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(in   ) ::   ptb, ptn        ! before and now tracer fields
+      REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt), INTENT(inout) ::   pta             ! tracer trend 
       !!
       INTEGER  ::   ji, jj, jk, jn                   ! dummy loop indices
@@ -136 +134 @@
 
 
-      IF( ( cdtype == 'TRA' .AND. kt == nit000 ) .OR. ( cdtype == 'TRC' .AND. kt == nittrc000 ) )  THEN
+      IF( kt == nit000 )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_adv_cen2 : 2nd order centered advection scheme on ', cdtype
-         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~   Vector optimization case'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~ '
          IF(lwp) WRITE(numout,*)
          !