Changeset 2645 for branches

Timestamp:

2011-03-03T11:14:19+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; correct small bug in dtatem & dtasal ierr3 not initialized, ierr2 should be set to 0

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DTA

Files:

• dtasal.F90 (modified) (1 diff)
• dtatem.F90 (modified) (1 diff)

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

@@ -92 +92 @@
                                    ! 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' )
+         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 )

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

@@ -99 +99 @@
                                    ! Allocate temperature data array 
                                 ALLOCATE( t_dta(jpi,jpj,jpk)           , STAT=ierr  )
-         IF( ierr > 0 )                      CALL ctl_stop( 'STOP', 'dta_tem: unable to allocate t_dta array' )
+         IF( ierr > 0              )   CALL ctl_stop( 'STOP', 'dta_tem: unable to allocate t_dta array' )
                                    ! Allocate sf_tem structure
-                                ALLOCATE( sf_tem(1)                    , STAT=ierr1 )
-                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)  , STAT=ierr2 )
-         IF( sn_tem%ln_tint )   ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2), STAT=ierr3 )
-         IF( ierr0+ierr1+ierr2+ierr3 > 0 )   CALL ctl_stop( 'STOP', 'dta_tem: unable to allocate sf_tem structure' )
+                                ierr2 = 0
+                                ALLOCATE( sf_tem(1)                    , STAT=ierr0 )
+                                ALLOCATE( sf_tem(1)%fnow(jpi,jpj,jpk)  , STAT=ierr1 )
+         IF( sn_tem%ln_tint )   ALLOCATE( sf_tem(1)%fdta(jpi,jpj,jpk,2), STAT=ierr2 )
+         IF( ierr0+ierr1+ierr2 > 0 )   CALL ctl_stop( 'STOP', 'dta_tem: unable to allocate sf_tem structure' )
          !                         ! fill sf_tem with sn_tem and control print
          CALL fld_fill( sf_tem, (/ sn_tem /), cn_dir, 'dta_tem', 'Temperature data', 'namdta_tem' )