Changeset 3294 for trunk/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.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/TOP_SRC/prtctl_trc.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90

@@ -67 +67 @@
       INTEGER                              , INTENT(in), OPTIONAL ::   kdim      ! k- direction for 4D arrays
       !!
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: zmask, ztab3d 
       INTEGER  ::   overlap, jn, js, sind, eind, kdir, j_id
       REAL(wp) ::   zsum, zvctl
       CHARACTER (len=20), DIMENSION(jptra) ::   cl
       CHARACTER (len=10) ::   cl2
-      !!----------------------------------------------------------------------
-
-      ALLOCATE( zmask (jpi,jpj,jpk) )
-      ALLOCATE( ztab3d(jpi,jpj,jpk) )
+      REAL(wp), POINTER, DIMENSION(:,:,:)  :: zmask, ztab3d 
+      !!----------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi, jpj, jpk, zmask, ztab3d )
       !                                      ! Arrays, scalars initialization 
       overlap       = 0
@@ -151 +150 @@
       END DO
       !
-      DEALLOCATE( zmask  )
-      DEALLOCATE( ztab3d )
+      CALL wrk_dealloc( jpi, jpj, jpk, zmask, ztab3d )
       !
    END SUBROUTINE prt_ctl_trc
@@ -336 +334 @@
       INTEGER ::   nrecil, nrecjl, nldil, nleil, nldjl, nlejl
       REAL(wp) ::   zidom, zjdom            ! temporary scalars
-      INTEGER, DIMENSION(:,:), ALLOCATABLE ::   iimpptl, ijmpptl, ilcitl, ilcjtl   ! temporary workspace
-      !!----------------------------------------------------------------------
-
+      INTEGER, POINTER, DIMENSION(:,:) ::   iimpptl, ijmpptl, ilcitl, ilcjtl   ! temporary workspace
+      !!----------------------------------------------------------------------
+      !
+      CALL wrk_alloc( isplt, jsplt, ilcitl, ilcjtl, iimpptl, ijmpptl )
+      !
       ! Dimension arrays for subdomains
       ! -------------------------------
@@ -350 +350 @@
       ijpj = ( jpjglo-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj
 
-      ALLOCATE( ilcitl (isplt,jsplt) )
-      ALLOCATE( ilcjtl (isplt,jsplt) )
-
       nrecil  = 2 * jpreci
       nrecjl  = 2 * jprecj
@@ -391 +388 @@
       ! ---------------------------
 
-      ALLOCATE( iimpptl(isplt,jsplt) )
-      ALLOCATE( ijmpptl(isplt,jsplt) )
-      
       iimpptl(:,:) = 1
       ijmpptl(:,:) = 1
@@ -450 +444 @@
          nlejtl(js) = nlejl
       END DO
-
-      DEALLOCATE( iimpptl )
-      DEALLOCATE( ijmpptl )
-      DEALLOCATE( ilcitl )
-      DEALLOCATE( ilcjtl )
+      !
+      CALL wrk_dealloc( isplt, jsplt, ilcitl, ilcjtl, iimpptl, ijmpptl )
       !
    END SUBROUTINE sub_dom