Changeset 9fc7e1

Timestamp:

Feb 10, 2012, 3:19:51 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

322469

Parents:

32ff22

Message:

Bugfix for trac ticket #61.

Removed all variable-length arrays, even those of POD datatypes. Throws no warnings/errors when compiled with GCC 4.6.1 and -pedantic.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1339 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

src/comm

Files:

• comm_mpi.cpp (modified) (2 diffs)
• mpi/settings.cpp (modified) (3 diffs)

src/comm/comm_mpi.cpp

@@ -400 +400 @@
 
   Index index;
-  int global_extent[6*size], send_sizes[size], recv_sizes[size];
-  Index begin_remote[size], end_remote[size];
-  std::vector<int> pos_indices[size], charge_indices[size];
-  MPI_Datatype dt_temp;
+  std::vector<int> global_extent, send_sizes, recv_sizes;
+  std::vector<Index> begin_remote, end_remote;
+  std::vector< std::vector<int> > pos_indices, charge_indices;
   std::vector<vmg_float> buffer_x, buffer_q;
   std::vector<vmg_int> buffer_ind;
+  MPI_Datatype dt_temp;
+
+  global_extent.resize(6*size);
+  send_sizes.resize(size);
+  recv_sizes.resize(size);
+  begin_remote.resize(size);
+  end_remote.resize(size);
+  pos_indices.resize(size);
+  charge_indices.resize(size);
 
   std::memcpy(&global_extent[6*rank], grid.Global().BeginLocal().vec(), 3*sizeof(int));
   std::memcpy(&global_extent[6*rank+3], grid.Global().EndLocal().vec(), 3*sizeof(int));
 
-  MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, global_extent, 6, MPI_INT, MPI_COMM_WORLD);
+  MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, &global_extent.front(), 6, MPI_INT, MPI_COMM_WORLD);
 
   for (int i=0; i<size; ++i) {
@@ -433 +441 @@
     send_sizes[i] = charge_indices[i].size();
 
-  MPI_Alltoall(send_sizes, 1, MPI_INT, recv_sizes, 1, MPI_INT, comm_global);
+  MPI_Alltoall(&send_sizes.front(), 1, MPI_INT, &recv_sizes.front(), 1, MPI_INT, comm_global);
 
   /*

src/comm/mpi/settings.cpp

@@ -287 +287 @@
     MPI_Comm_size(comm, &size);
 
-    int buffer[6*size];
+    std::vector<int> buffer;
+    buffer.resize(6*size);
 
     // Compute local offset for ghost cells
@@ -306 +307 @@
     }
 
-    MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, buffer, 6, MPI_INT, comm);
+    MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, &buffer.front(), 6, MPI_INT, comm);
 
     if (insert_result.second) {
@@ -341 +342 @@
     }
 
-    MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, buffer, 6, MPI_INT, comm);
+    MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, &buffer.front(), 6, MPI_INT, comm);
 
     if (insert_result.second) {