Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.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/OPA_SRC/DTA/dtasal.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DTA/dtasal.F90

@@ -18 +18 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
+   USE phycst          ! physical constants
    USE fldread         ! read input fields
    USE in_out_manager  ! I/O manager
-   USE phycst          ! physical constants
+   USE lib_mpp         ! MPP library
 
    IMPLICIT NONE
    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
-
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal       ! structure of input SST (file informations, fields read)
+   PUBLIC   dta_sal    ! called by step.F90 and inidta.F90
+
+   LOGICAL , PUBLIC, PARAMETER                     ::   lk_dtasal = .TRUE. !: salinity data flag
+   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:) ::   s_dta              !: salinity data at given time-step
+
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sal   ! structure of input SST (file informations, fields read)
 
    !! * Substitutions
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
    !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -52 +53 @@
       !!                between two monthly values.
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt             ! ocean time step
+      INTEGER, INTENT(in) ::   kt   ! ocean time step
       !
-      INTEGER ::   ji, jj, jk, jl, jkk            ! dummy loop indicies
-      INTEGER ::   ik, ierror                     ! temporary integers
+      INTEGER ::   ji, jj, jk, jl, jkk       ! local loop indicies
+      INTEGER ::   ik, ierr, ierr0, ierr1, ierr2   ! local integers
 #if defined key_tradmp
-      INTEGER ::   il0, il1, ii0, ii1, ij0, ij1   ! temporary integers
+      INTEGER ::   il0, il1, ii0, ii1, ij0, ij1   ! local integers
 #endif
       REAL(wp)::   zl
@@ -88 +89 @@
             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)   )
-         IF( sn_sal%ln_tint )   ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2) )
+
+                                   ! Allocate salinity data array 
+                                ALLOCATE( s_dta(jpi,jpj,jpk)           , STAT=ierr  )
+         IF( ierr > 0              )   CALL ctl_stop( 'STOP', 'dta_sal: unable to allocate s_dta array' )
+                                   ! Allocate sf_tem structure
+                                ierr2 = 0
+                                ALLOCATE( sf_sal(1)                    , STAT=ierr0 )
+                                ALLOCATE( sf_sal(1)%fnow(jpi,jpj,jpk)  , STAT=ierr1 )
+         IF( sn_sal%ln_tint )   ALLOCATE( sf_sal(1)%fdta(jpi,jpj,jpk,2), STAT=ierr2 )
+         IF( ierr0+ierr1+ierr2 > 0 )   CALL ctl_stop( 'STOP', 'dta_sal: unable to allocate sf_sal structure' )
          !                         ! fill sf_sal with sn_sal and control print
          CALL fld_fill( sf_sal, (/ sn_sal /), cn_dir, 'dta_sal', 'Salinity data', 'namdta_sal' )