Changeset 7074

Timestamp:

2016-10-24T12:38:05+02:00 (8 years ago)

Author:

jenniewaters

Message:

Bug fix to prevent a memory error when a large number of observations are used.

File:

• branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90 (modified) (5 diffs)

branches/UKMO/dev_r4650_general_vert_coord_obsoper/NEMOGCM/NEMO/OPA_SRC/OBS/obs_mpp.F90

@@ -98 +98 @@
       !
       INTEGER :: ierr 
-      INTEGER, DIMENSION(kno) ::   ivals
-      !
-INCLUDE 'mpif.h'
-      !!----------------------------------------------------------------------
+      INTEGER, DIMENSION(:), ALLOCATABLE ::   ivals
+      !
+INCLUDE 'mpif.h'
+      !!----------------------------------------------------------------------
+
+      ALLOCATE( ivals(kno) )
 
       ! Call the MPI library to find the maximum across processors
@@ -107 +109 @@
          &                mpi_max, mpi_comm_opa, ierr )
       kvals(:) = ivals(:)
+
+      DEALLOCATE( ivals )
 #else
       ! no MPI: empty routine
@@ -138 +142 @@
       !
       INTEGER :: ji, isum
-      INTEGER, DIMENSION(kno) ::   iobsp
-      !!
-      !!
-
-      iobsp=kobsp
+      INTEGER, DIMENSION(:), ALLOCATABLE ::   iobsp
+      !!
+      !!
+
+      ALLOCATE( iobsp(kno) )
+
+      iobsp(:)=kobsp(:)
 
       WHERE( iobsp(:) == -1 )
@@ -148 +154 @@
       END WHERE
 
-      iobsp=-1*iobsp
+      iobsp(:)=-1*iobsp(:)
 
       CALL obs_mpp_max_integer( iobsp, kno )
 
-      kobsp=-1*iobsp
+      kobsp(:)=-1*iobsp(:)
 
       isum=0
@@ -168 +174 @@
       ENDIF
 
+      DEALLOCATE( iobsp )
+
 #else
       ! no MPI: empty routine