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

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

@@ -20 +20 @@
    USE lib_mpp        ! MPP library
    USE prtctl         ! Print control
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -47 +49 @@
       !! ** Action  :   (ua,va) updated with the now vorticity term trend
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE oce     , ONLY:   zfu   => ta       , zfv   => sa       ! (ta,sa) used as 3D workspace
-      USE wrk_nemo, ONLY:   zfu_t => wrk_3d_1 , zfv_t => wrk_3d_4 , zfu_uw =>wrk_3d_6   ! 3D workspaces
-      USE wrk_nemo, ONLY:   zfu_f => wrk_3d_2 , zfv_f => wrk_3d_5 , zfv_vw =>wrk_3d_7
-      USE wrk_nemo, ONLY:   zfw   => wrk_3d_3 
-      !
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zbu, zbv     ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zfu_t, zfv_t, zfu_f, zfv_f, zfu_uw, zfv_vw, zfw
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zfu, zfv
       !!----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_adv_cen2')
+      !
+      CALL wrk_alloc( jpi, jpj, jpk, zfu_t, zfv_t, zfu_f, zfv_f, zfu_uw, zfv_vw, zfu, zfv, zfw )
+      !
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
@@ -64 +66 @@
          WRITE(numout,*) '~~~~~~~~~~~~'
       ENDIF
-
-      ! Check that global workspace arrays aren't already in use
-      IF( wrk_in_use(3, 1,2,3,4,5,6,7) ) THEN
-         CALL ctl_stop('dyn_adv_cen2 : requested workspace array unavailable')   ;   RETURN
-      ENDIF
-
+      !
       IF( l_trddyn ) THEN           ! Save ua and va trends
          zfu_uw(:,:,:) = ua(:,:,:)
@@ -162 +159 @@
          &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      IF( wrk_not_released(3, 1,2,3,4,5,6,7) )   CALL ctl_stop('dyn_adv_cen2: failed to release workspace array')
+      CALL wrk_dealloc( jpi, jpj, jpk, zfu_t, zfv_t, zfu_f, zfv_f, zfu_uw, zfv_vw, zfu, zfv, zfw )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_adv_cen2')
       !
    END SUBROUTINE dyn_adv_cen2