Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (13 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

@@ -26 +26 @@
    USE diaptr          ! poleward transport diagnostics
    USE trc_oce         ! share passive tracers/Ocean variables
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -45 +47 @@
 CONTAINS
 
-   SUBROUTINE tra_adv_qck ( kt, cdtype, p2dt, pun, pvn, pwn,      &
+   SUBROUTINE tra_adv_qck ( kt, kit000, cdtype, p2dt, pun, pvn, pwn,      &
       &                                       ptb, ptn, pta, kjpt )
       !!----------------------------------------------------------------------
@@ -82 +84 @@
       !!----------------------------------------------------------------------
       INTEGER                              , INTENT(in   ) ::   kt              ! ocean time-step index
+      INTEGER                              , INTENT(in   ) ::   kit000          ! first time step index
       CHARACTER(len=3)                     , INTENT(in   ) ::   cdtype          ! =TRA or TRC (tracer indicator)
       INTEGER                              , INTENT(in   ) ::   kjpt            ! number of tracers
@@ -90 +93 @@
       !!----------------------------------------------------------------------
 
-      IF( kt == nit000 )  THEN
+      !
+      IF( nn_timing == 1 )  CALL timing_start('tra_adv_qck')
+      !
+      IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_adv_qck : 3rd order quickest advection scheme on ', cdtype
@@ -107 +113 @@
       CALL tra_adv_cen2_k( kt, cdtype, pwn,         ptn, pta, kjpt )
       !
+      IF( nn_timing == 1 )  CALL timing_stop('tra_adv_qck')
+      !
    END SUBROUTINE tra_adv_qck
 
@@ -115 +123 @@
       !!
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwx => ua       ! ua used as workspace
-      USE wrk_nemo, ONLY:   zfu => wrk_3d_1 , zfc => wrk_3d_2, zfd => wrk_3d_3   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -129 +135 @@
       INTEGER  :: ji, jj, jk, jn   ! dummy loop indices
       REAL(wp) :: ztra, zbtr, zdir, zdx, zdt, zmsk   ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zfu, zfc, zfd
       !----------------------------------------------------------------------
       !
-      IF( wrk_in_use(3, 1,2,3) ) THEN
-         CALL ctl_stop('tra_adv_qck_i: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      CALL wrk_alloc( jpi, jpj, jpk, zfu, zfc, zfd )
       !                                                          ! ===========
       DO jn = 1, kjpt                                            ! tracer loop
@@ -228 +233 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3) )   CALL ctl_stop('tra_adv_qck_i: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, jpk, zfu, zfc, zfd )
       !
    END SUBROUTINE tra_adv_qck_i
@@ -238 +243 @@
       !!
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zwy => ua       ! ua used as workspace
-      USE wrk_nemo, ONLY:   zfu => wrk_3d_1 , zfc => wrk_3d_2, zfd => wrk_3d_3   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -252 +255 @@
       INTEGER  :: ji, jj, jk, jn   ! dummy loop indices
       REAL(wp) :: ztra, zbtr, zdir, zdx, zdt, zmsk   ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zfu, zfc, zfd
       !----------------------------------------------------------------------
       !
-      IF(wrk_in_use(3, 1,2,3))THEN
-         CALL ctl_stop('tra_adv_qck_j: ERROR: requested workspace arrays unavailable')
-         RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj, jpk, zfu, zfc, zfd )
+      !
       !                                                          ! ===========
       DO jn = 1, kjpt                                            ! tracer loop
@@ -359 +361 @@
       END DO
       !
-      IF( wrk_not_released(3, 1,2,3) )   CALL ctl_stop('tra_adv_qck_j: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, jpk, zfu, zfc, zfd )
       !
    END SUBROUTINE tra_adv_qck_j
@@ -436 +438 @@
       REAL(wp) ::  zc, zcurv, zfho          !   -      -
       !----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('quickest')
+      !
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -467 +471 @@
       END DO
       !
+      IF( nn_timing == 1 )  CALL timing_stop('quickest')
+      !
    END SUBROUTINE quickest