Changeset 3161 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

Timestamp:

2011-11-20T16:02:18+01:00 (13 years ago)

Author:

cetlod

Message:

New dynamical allocation & timing in OPA_SRC/DYN routines

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynkeg.F90

@@ -19 +19 @@
    USE lib_mpp         ! MPP library
    USE prtctl          ! Print control
+   USE wrk_nemo_2      ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -52 +54 @@
       !!             - save this trends (l_trddyn=T) for post-processing
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
       USE oce     , ONLY:   tsa             ! tsa used as 2 3D workspace
-      USE wrk_nemo, ONLY:   zhke  => wrk_3d_1                 ! 3D workspace
       !!
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -60 +60 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zu, zv       ! temporary scalars
-      REAL(wp), POINTER, DIMENSION(:,:,:) ::   ztrdu, ztrdv 
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zhke
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdu, ztrdv 
       !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(3,1) ) THEN
-         CALL ctl_stop('dyn_keg: requested workspace array is unavailable')   ;   RETURN
-      ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_keg')
+      !
+      CALL wrk_alloc( jpi, jpj, jpk, zhke )
+      !
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -140 +141 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF( wrk_not_released(3, 1) )   CALL ctl_stop('dyn_keg: failed to release workspace array')
+      CALL wrk_dealloc( jpi, jpj, jpk, zhke )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_keg')
       !
    END SUBROUTINE dyn_keg