Changeset 2590 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DTA

Timestamp:

2011-02-18T13:49:27+01:00 (13 years ago)

Author:

trackstand2

Message:

Merge branch 'dynamic_memory' into master-svn-dyn

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (3 diffs)
• dtatem.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -25 +25 @@
    PRIVATE
 
-   PUBLIC   dta_sal   ! called by step.F90 and inidta.F90
-   
-   LOGICAL , PUBLIC, PARAMETER ::   lk_dtasal = .TRUE.    !: salinity data flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   s_dta    !: salinity data at given time-step
+   PUBLIC   dta_sal        ! called by step.F90 and inidta.F90
+   PUBLIC   dta_sal_alloc  ! Called by nemogcm.F90
+
+   LOGICAL , PUBLIC, PARAMETER              :: lk_dtasal = .TRUE. !: salinity data flag
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: s_dta !: salinity data at given time-step
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal       ! structure of input SST (file informations, fields read)
@@ -40 +41 @@
    !!----------------------------------------------------------------------
 CONTAINS
+
+   FUNCTION dta_sal_alloc()
+     IMPLICIT none
+     INTEGER :: dta_sal_alloc
+     INTEGER :: ierr
+
+     ALLOCATE(s_dta(jpi,jpj,jpk),  &
+              sf_sal(1),           &
+              Stat=ierr)
+     IF(ierr <= 0)THEN
+        ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)   )
+     END IF
+
+     dta_sal_alloc = ierr
+
+   END FUNCTION dta_sal_alloc
 
    SUBROUTINE dta_sal( kt )
@@ -88 +105 @@
             WRITE(numout,*) '~~~~~~~ '
          ENDIF
-         ALLOCATE( sf_sal(1), STAT=ierror )
-         IF( ierror > 0 ) THEN
-             CALL ctl_stop( 'dta_sal: unable to allocate sf_sal structure' )   ;   RETURN
-         ENDIF
-                                ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)   )
+! ARPDBG moved first two allocate's into dta_sal_alloc()
+!!$         ALLOCATE( sf_sal(1), STAT=ierror )
+!!$         IF( ierror > 0 ) THEN
+!!$             CALL ctl_stop( 'dta_sal: unable to allocate sf_sal structure' )   ;   RETURN
+!!$         ENDIF
+!!$                                ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)   )
          IF( sn_sal%ln_tint )   ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
          !                         ! fill sf_sal with sn_sal and control print

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DTA/dtatem.F90

@@ -25 +25 @@
    PRIVATE
 
-   PUBLIC   dta_tem    ! called by step.F90 and inidta.F90
+   PUBLIC   dta_tem        ! called by step.F90 and inidta.F90
+   PUBLIC   dta_tem_alloc  ! called by nemo_init in nemogcm.F90
 
    LOGICAL , PUBLIC, PARAMETER ::   lk_dtatem = .TRUE.   !: temperature data flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::  t_dta    !: temperature data at given time-step
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: t_dta !: temperature data at given time-step
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tem      ! structure of input SST (file informations, fields read)
@@ -40 +41 @@
    !!----------------------------------------------------------------------
 CONTAINS
+
+   FUNCTION dta_tem_alloc()
+     IMPLICIT none
+     INTEGER :: dta_tem_alloc
+     INTEGER :: ierror
+     ALLOCATE(t_dta(jpi,jpj,jpk), &
+              sf_tem(1),          &
+              STAT=ierror )
+     IF( ierror <= 0 ) THEN
+        ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk), STAT=ierror   )
+     END IF
+
+     dta_tem_alloc = ierror
+
+   END FUNCTION dta_tem_alloc
+
 
    SUBROUTINE dta_tem( kt )
@@ -95 +112 @@
             WRITE(numout,*) '~~~~~~~ '
          ENDIF
-         ALLOCATE( sf_tem(1), STAT=ierror )
-         IF( ierror > 0 ) THEN
-             CALL ctl_stop( 'dta_tem: unable to allocate sf_tem structure' )   ;   RETURN
-         ENDIF
-                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)   )
+! ARPDBG - moved into dta_tem_alloc()
+!!$         ALLOCATE( sf_tem(1), STAT=ierror )
+!!$         IF( ierror > 0 ) THEN
+!!$             CALL ctl_stop( 'dta_tem: unable to allocate sf_tem structure' )   ;   RETURN
+!!$         ENDIF
+!!$                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)   )
          IF( sn_tem%ln_tint )   ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2) )
          !                         ! fill sf_tem with sn_tem and control print