Changeset 2639

Timestamp:

2011-03-02T19:23:26+01:00 (13 years ago)

Author:

cetlod

Message:

re-introduce missing allocated array

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• DTA/dtasal.F90 (modified) (2 diffs)
• DTA/dtatem.F90 (modified) (2 diffs)
• SBC/sbcssr.F90 (modified) (3 diffs)

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

@@ -56 +56 @@
       !
       INTEGER ::   ji, jj, jk, jl, jkk       ! local loop indicies
-      INTEGER ::   ik, ierr0, ierr1, ierr2   ! local integers
+      INTEGER ::   ik, ierr, ierr0, ierr1, ierr2   ! local integers
 #if defined key_tradmp
       INTEGER ::   il0, il1, ii0, ii1, ij0, ij1   ! local integers
@@ -89 +89 @@
             WRITE(numout,*) '~~~~~~~ '
          ENDIF
+
+                                   ! 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
                                 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

@@ -62 +62 @@
       !
       INTEGER ::   ji, jj, jk, jl, jkk       ! dummy loop indicies
-      INTEGER ::   ik, ierr0, ierr1, ierr2   ! local integers
+      INTEGER ::   ik, ierr, ierr0, ierr1, ierr2   ! local integers
 #if defined key_tradmp
       INTEGER ::   il0, il1, ii0, ii1, ij0, ij1   ! local integers
@@ -96 +96 @@
             WRITE(numout,*) '~~~~~~~ '
          ENDIF
-                                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_sal: unable to allocate sf_sal structure' )
+
+                                   ! 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' )
+                                   ! 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' )
          !                         ! fill sf_tem with sn_tem and control print
          CALL fld_fill( sf_tem, (/ sn_tem /), cn_dir, 'dta_tem', 'Temperature data', 'namdta_tem' )

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -107 +107 @@
          ENDIF
 
+         ! Allocate erp and qrp array
+         ALLOCATE( qrp(jpi,jpj), erp(jpi,jpj), STAT=ierror )
+         IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
+
          IF( nn_sstr == 1 ) THEN      !* set sf_sst structure & allocate arrays
             !
@@ -119 +123 @@
             IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate sf_sst data array' )
             !
-            ALLOCATE( qrp(jpi,jpj), STAT=ierror )
-            IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate qrp array' )
          ENDIF
          !
@@ -135 +137 @@
             IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate sf_sss data array' )
             !
-            ALLOCATE( erp(jpi,jpj), STAT=ierror )
-            IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp array' )
          ENDIF
          !