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

trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domngb.F90

@@ -11 +11 @@
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean space and time domain
+   USE in_out_manager ! I/O manager
    USE lib_mpp        ! for mppsum
+   USE wrk_nemo       ! Memory allocation
+   USE timing         ! Timing
 
    IMPLICIT NONE
@@ -34 +37 @@
       !!                -> not good if located at too high latitude...
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zglam => wrk_2d_2 , zgphi => wrk_2d_3 , zmask => wrk_2d_4 , zdist => wrk_2d_5
       !
       REAL(wp)        , INTENT(in   ) ::   plon, plat   ! longitude,latitude of the point
@@ -43 +44 @@
       INTEGER , DIMENSION(2) ::   iloc
       REAL(wp)               ::   zlon, zmini
+      REAL(wp), POINTER, DIMENSION(:,:) ::  zglam, zgphi, zmask, zdist
       !!--------------------------------------------------------------------
       !
-      IF( wrk_in_use(2, 2,3,4,5) )   CALL ctl_stop('dom_ngb: Requested workspaces already in use')
+      IF( nn_timing == 1 )  CALL timing_start('dom_ngb')
+      !
+      CALL wrk_alloc( jpi, jpj, zglam, zgphi, zmask, zdist )
       !
       zmask(:,:) = 0._wp
@@ -72 +76 @@
       ENDIF
       !
-      IF( wrk_not_released(2, 2,3,4,5) )   CALL ctl_stop('dom_ngb: error releasing workspaces')
+      CALL wrk_dealloc( jpi, jpj, zglam, zgphi, zmask, zdist )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dom_ngb')
       !
    END SUBROUTINE dom_ngb