Changeset 3159 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

Timestamp:

2011-11-18T22:41:44+01:00 (13 years ago)

Author:

cetlod

Message:

New dynamical allocation + timing on TRA/ routines

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (11 diffs)

branches/2011/dev_NEMO_MERGE_2011/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_2      ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -91 +93 @@
       !!----------------------------------------------------------------------
 
+      !
+      IF( nn_timing == 1 )  CALL timing_start('tra_adv_qck')
+      !
       IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
@@ -108 +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
 
@@ -116 +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_11 , zfc => wrk_3d_12, zfd => wrk_3d_13   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -130 +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, 11,12,13) ) 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
@@ -229 +233 @@
       END DO
       !
-      IF( wrk_not_released(3, 11,12,13) )   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
@@ -239 +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_11 , zfc => wrk_3d_12, zfd => wrk_3d_13   ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -253 +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, 11,12,13))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
@@ -360 +361 @@
       END DO
       !
-      IF( wrk_not_released(3, 11,12,13) )   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
@@ -437 +438 @@
       REAL(wp) ::  zc, zcurv, zfho          !   -      -
       !----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('quickest')
+      !
       DO jk = 1, jpkm1
          DO jj = 1, jpj
@@ -468 +471 @@
       END DO
       !
+      IF( nn_timing == 1 )  CALL timing_stop('quickest')
+      !
    END SUBROUTINE quickest