Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.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/DYN/dynzad.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynzad.F90

@@ -21 +21 @@
    USE lib_mpp         ! MPP library
    USE prtctl         ! Print control
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -52 +54 @@
       !! ** Action  : - Update (ua,va) with the vert. momentum adv. trends
       !!              - Save the trends in (ztrdu,ztrdv) ('key_trddyn')
-     !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zww   => wrk_2d_1                        ! 2D workspace
-      USE oce     , ONLY:   zwuw  => ta       , zwvw  => sa          ! (ta,sa) used as 3D workspace
-      USE wrk_nemo, ONLY:   ztrdu => wrk_3d_1 , ztrdv => wrk_3d_2    ! 3D workspace
-      !
+      !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
       !
       INTEGER  ::   ji, jj, jk      ! dummy loop indices
       REAL(wp) ::   zua, zva        ! temporary scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwuw , zwvw
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::  zww
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
       !!----------------------------------------------------------------------
-      
-      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 1,2) ) THEN
-         CALL ctl_stop('dyn_zad: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_zad')
+      !
+      CALL wrk_alloc( jpi,jpj, zww ) 
+      CALL wrk_alloc( jpi,jpj,jpk, zwuw , zwvw ) 
+      !
       IF( kt == nit000 ) THEN
          IF(lwp)WRITE(numout,*)
@@ -74 +75 @@
 
       IF( l_trddyn )   THEN         ! Save ua and va trends
+         CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
          ztrdu(:,:,:) = ua(:,:,:) 
          ztrdv(:,:,:) = va(:,:,:) 
@@ -117 +119 @@
          ztrdv(:,:,:) = va(:,:,:) - ztrdv(:,:,:)
          CALL trd_mod(ztrdu, ztrdv, jpdyn_trd_zad, 'DYN', kt)
+         CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv ) 
       ENDIF
       !                             ! Control print
@@ -122 +125 @@
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF( wrk_not_released(2, 1)   .OR.   &
-          wrk_not_released(3, 1,2) )   CALL ctl_stop('dyn_zad: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, zww ) 
+      CALL wrk_dealloc( jpi,jpj,jpk, zwuw , zwvw ) 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_zad')
       !
    END SUBROUTINE dyn_zad