Changeset 3169 for branches

Timestamp:

2011-11-22T10:53:46+01:00 (13 years ago)

Author:

cetlod

Message:

New memory allocation for some forgotten TOP routines

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC

Files:

• prtctl_trc.F90 (modified) (6 diffs)
• trcini.F90 (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/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

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -60 +60 @@
       INTEGER ::   ierr          ! local integer
       CHARACTER (len=25) :: charout
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::  ztrcdta   ! 4D  workspace
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) ::  ztrcdta   ! 4D  workspace
       !!---------------------------------------------------------------------
       !
@@ -118 +118 @@
         ENDIF
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
-            ALLOCATE( ztrcdta(jpi,jpj,jpk,nb_trcdta), STAT=ierr )
-            IF( ierr > 0 ) THEN
-               CALL ctl_stop( 'trc_ini: unable to allocate ztrcdta array' )   ;   RETURN
-            ENDIF
+            !
+            CALL wrk_alloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )    ! Memory allocation
             !
             CALL trc_dta( nit000, ztrcdta )   ! read tracer data at nit000
@@ -131 +129 @@
                ENDIF
             ENDDO
-            DEALLOCATE( ztrcdta ) 
+            CALL wrk_dealloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )
         ENDIF
         !