Changeset 716da7 for src/comm/mpi/datatype.hpp

Timestamp:

Apr 24, 2012, 2:26:14 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

b51c3b

Parents:

e3dbbf

Message:

Fix energy calculation.

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

File:

• src/comm/mpi/datatype.hpp (modified) (7 diffs)

src/comm/mpi/datatype.hpp

@@ -21 +21 @@
     _starts(0),
     _rank(-1),
-    _type(MPI_DATATYPE_NULL)
+    _tag_send(0),
+    _tag_recv(0),
+    _type(MPI_DATATYPE_NULL),
+    _alloc_buffer(false)
   {}
 
   Datatype(Index sizes, Index subsizes, Index starts, const int& rank,
-           const int& tag_send, const int& tag_receive) :
+           const int& tag_send, const int& tag_receive,
+           const bool& alloc_buffer) :
     _sizes(sizes),
     _subsizes(subsizes),
@@ -32 +36 @@
     _tag_send(tag_send),
     _tag_recv(tag_receive),
-    _buffer(subsizes.Product())
+    _alloc_buffer(alloc_buffer)
   {
     InitDatatype();
@@ -38 +42 @@
 
   Datatype(const GridIteratorSet& bounds, const Grid& grid, const int& rank,
-           const int& tag_send, const int& tag_receive) :
+           const int& tag_send, const int& tag_receive,
+           const bool& alloc_buffer) :
     _sizes(grid.Local().SizeTotal()),
     _subsizes(bounds.Begin().GetEnd() - bounds.Begin().GetBegin()),
@@ -45 +50 @@
     _tag_send(tag_send),
     _tag_recv(tag_receive),
-    _buffer(_subsizes.Product())
+    _alloc_buffer(alloc_buffer)
   {
     InitDatatype();
@@ -57 +62 @@
     _tag_send(other._tag_send),
     _tag_recv(other._tag_recv),
-    _buffer(_subsizes.Product())
+    _alloc_buffer(other._alloc_buffer)
   {
     InitDatatype();
@@ -84 +89 @@
   const MPI_Datatype& Type() const {return _type;}
 
+  std::vector<vmg_float>& Buffer() {return _buffer;}
   const std::vector<vmg_float>& Buffer() const {return _buffer;}
 
@@ -111 +117 @@
   MPI_Datatype _type;
   std::vector<vmg_float> _buffer;
+  bool _alloc_buffer;
 };