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

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_exp.F90

@@ -31 +31 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! MPP library
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -48 +50 @@
 CONTAINS
 
-   SUBROUTINE tra_zdf_exp( kt, cdtype, p2dt, kn_zdfexp,   &
+   SUBROUTINE tra_zdf_exp( kt, kit000, cdtype, p2dt, kn_zdfexp,   &
       &                                ptb , pta      , kjpt )
       !!----------------------------------------------------------------------
@@ -73 +75 @@
       !! ** Action : - after tracer fields pta
       !!---------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zwx => wrk_3d_6, zwy => wrk_3d_7     ! 3D workspace
       !
       INTEGER                              , INTENT(in   ) ::   kt          ! ocean time-step index
+      INTEGER                              , INTENT(in   ) ::   kit000      ! first time step index
       CHARACTER(len=3)                     , INTENT(in   ) ::   cdtype      ! =TRA or TRC (tracer indicator)
       INTEGER                              , INTENT(in   ) ::   kjpt        ! number of tracers
@@ -87 +88 @@
       REAL(wp) ::  zlavmr, zave3r, ze3tr     ! local scalars
       REAL(wp) ::  ztra, ze3tb               !   -      -
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::  zwx, zwy
       !!---------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('tra_zdf_exp')
+      !
+      CALL wrk_alloc( jpi, jpj, jpk, zwx, zwy ) 
+      !
 
-      IF( wrk_in_use(3, 6,7) ) THEN
-         CALL ctl_stop('tra_zdf_exp: requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
-
-      IF( kt == nit000 )  THEN
+      IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'tra_zdf_exp : explicit vertical mixing on ', cdtype
@@ -164 +167 @@
       END DO
       !
-      IF( wrk_not_released(3, 6,7) )   CALL ctl_stop('tra_zdf_exp: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, jpk, zwx, zwy ) 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('tra_zdf_exp')
       !
    END SUBROUTINE tra_zdf_exp