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

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -21 +21 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
-   USE lib_mpp            ! MPP library
+   USE lib_mpp         ! MPP library
+   USE wrk_nemo        ! work arrays
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -91 +93 @@
       !! References :   Merryfield et al., JPO, 29, 1124-1142, 1999.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zmsks  => wrk_2d_1 , zmskf  => wrk_2d_2 , zmskd1 => wrk_2d_3   ! 2D workspace
-      USE wrk_nemo, ONLY:   zmskd2 => wrk_2d_4 , zmskd3 => wrk_2d_5                        !  -      -
-      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step indexocean time step
       !
@@ -101 +99 @@
       REAL(wp) ::   zavft, zavfs    !    -         -
       REAL(wp) ::   zavdt, zavds    !    -         -
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1,2,3,4,5) ) THEN
-         CALL ctl_stop('zdf_ddm: Requested workspace arrays already in use')   ;   RETURN
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zmsks, zmskf, zmskd1, zmskd2, zmskd3
+      !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('zdf_ddm')
+      !
+      CALL wrk_alloc( jpi,jpj, zmsks, zmskf, zmskd1, zmskd2, zmskd3 )
 
       !                                                ! ===============
@@ -197 +196 @@
       ENDIF
       !
-      IF( wrk_not_released(2, 1,2,3,4,5) )   CALL ctl_stop('zdf_ddm: Release of workspace arrays failed')
+      CALL wrk_dealloc( jpi,jpj, zmsks, zmskf, zmskd1, zmskd2, zmskd3 )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('zdf_ddm')
       !
    END SUBROUTINE zdf_ddm