Changeset 2715 for trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -23 +23 @@
    PRIVATE
 
-   PUBLIC trc_dta   ! called in trcini.F90 and trcdmp.F90
+   PUBLIC   trc_dta         ! called in trcini.F90 and trcdmp.F90
+   PUBLIC   trc_dta_alloc   ! called in nemogcm.F90
 
    LOGICAL , PUBLIC, PARAMETER ::   lk_dtatrc = .TRUE.   !: temperature data flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk,jptra) ::   trdta   !: tracer data at given time-step
-
-   REAL(wp), DIMENSION(jpi,jpj,jpk,jptra,2) ::   tracdta            ! tracer data at two consecutive times
-   INTEGER , DIMENSION(jptra) ::   nlectr      !: switch for reading once
-   INTEGER , DIMENSION(jptra) ::   ntrc1       !: number of first month when reading 12 monthly value
-   INTEGER , DIMENSION(jptra) ::   ntrc2       !: number of second month when reading 12 monthly value
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::   trdta   !: tracer data at given time-step
+
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:,:,:) ::   tracdta       ! tracer data at two consecutive times
+   INTEGER , ALLOCATABLE, SAVE, DIMENSION(:) ::   nlectr      !: switch for reading once
+   INTEGER , ALLOCATABLE, SAVE, DIMENSION(:) ::   ntrc1       !: number of 1st month when reading 12 monthly value
+   INTEGER , ALLOCATABLE, SAVE, DIMENSION(:) ::   ntrc2       !: number of 2nd month when reading 12 monthly value
 
    !! * Substitutions
@@ -38 +39 @@
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
@@ -55 +56 @@
       !!      two monthly values.
       !!----------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt     ! ocean time-step
+      INTEGER, INTENT(in) ::   kt     ! ocean time-step
       !!
       CHARACTER (len=39) ::   clname(jptra)
@@ -198 +199 @@
    END SUBROUTINE trc_dta
 
+
+   INTEGER FUNCTION trc_dta_alloc()
+      !!----------------------------------------------------------------------
+      !!                   ***  ROUTINE trc_dta_alloc  ***
+      !!----------------------------------------------------------------------
+      ALLOCATE( trdta  (jpi,jpj,jpk,jptra  ) ,                    &
+         &      tracdta(jpi,jpj,jpk,jptra,2) ,                    &
+         &      nlectr(jptra) , ntrc1(jptra) , ntrc2(jptra) , STAT=trc_dta_alloc)
+         !
+      IF( trc_dta_alloc /= 0 )   CALL ctl_warn('trc_dta_alloc : failed to allocate arrays')
+      !
+   END FUNCTION trc_dta_alloc
+
 #else
    !!----------------------------------------------------------------------