Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.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/LDF/ldfeiv.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -25 +25 @@
    USE prtctl          ! Print control
    USE iom             ! I/O library
+   USE wrk_nemo        ! work arrays
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -53 +55 @@
       !!             - wslpi, wslpj : i- and j-slopes of neutral surfaces at w-points. 
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zn  => wrk_2d_1 , zah   => wrk_2d_2   ! 2D workspace
-      USE wrk_nemo, ONLY:   zhw => wrk_2d_3 , zross => wrk_2d_4
-      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step inedx
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zfw, ze3w, zn2, zf20, zaht, zaht_min      ! temporary scalars
+      REAL(wp), DIMENSION(:,:), POINTER ::   zn, zah, zhw, zross   ! 2D workspace
       !!----------------------------------------------------------------------
-      
-      IF( wrk_in_use(2, 1,2,3,4) ) THEN
-         CALL ctl_stop('ldf_eiv: requested workspace arrays are unavailable.')   ;   RETURN
-      ENDIF
+      !
+      IF( nn_timing == 1 )  CALL timing_start('ldf_eiv')
+      !
+      CALL wrk_alloc( jpi,jpj, zn, zah, zhw, zross )
 
       IF( kt == nit000 ) THEN
@@ -243 +242 @@
       CALL iom_put( "aht2d_eiv", aeiw )   ! EIV lateral eddy diffusivity
       !  
-      IF( wrk_not_released(2, 1,2,3,4) )   CALL ctl_stop('ldf_eiv: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, zn, zah, zhw, zross )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('ldf_eiv')
       !
    END SUBROUTINE ldf_eiv