Changeset 3159 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.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/traldf_iso_grif.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90

@@ -26 +26 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp         ! MPP library
+   USE wrk_nemo_2      ! Memory Allocation
+   USE timing          ! Timing
+
 
    IMPLICIT NONE
@@ -89 +92 @@
       !! ** Action :   Update pta arrays with the before rotated diffusion
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   zftu => ua       , zftv => va            ! (ua,va) used as 3D workspace
-      USE wrk_nemo, ONLY:   zdit => wrk_3d_6 , zdjt => wrk_3d_7 , ztfw => wrk_3d_8   ! 3D workspace
-      USE wrk_nemo, ONLY:   z2d  => wrk_2d_1                                         ! 2D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt         ! ocean time-step index
@@ -116 +116 @@
       REAL(wp) ::   zztmp              ! local scalar
 #endif
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: z2d
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zdit, zdjt, ztfw 
       !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(3, 6,7,8) .OR. wrk_in_use(2, 1) ) THEN
-         CALL ctl_stop('tra_ldf_iso_grif: requested workspace arrays unavailable.')   ;   RETURN
-      ENDIF
+      !
+      IF( nn_timing == 1 )  CALL timing_start('tra_ldf_iso_grif')
+      !
+      CALL wrk_alloc( jpi, jpj,      z2d ) 
+      CALL wrk_alloc( jpi, jpj, jpk, zdit, zdjt, ztfw  ) 
+      !
 
       IF( kt == kit000 .AND. .NOT.ALLOCATED(ah_wslp2) )  THEN
@@ -394 +398 @@
       END DO
       !
-      IF( wrk_not_released(3, 6,7,8) .OR.   &
-          wrk_not_released(2, 1)       )   CALL ctl_stop('tra_ldf_iso_grif: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj,      z2d ) 
+      CALL wrk_dealloc( jpi, jpj, jpk, zdit, zdjt, ztfw  ) 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('tra_ldf_iso_grif')
       !
   END SUBROUTINE tra_ldf_iso_grif