CarpetLib: resolve conflicts

darcs-hash:20050606162839-891bb-d7c2b48772dd8910ae362f0a96b34e1564f906b8.gz

1 files changed, 5 insertions, 4 deletions

diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index a5d7390f3..3b50abbee 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -276,7 +276,6 @@ void gdata::copy_into_sendbuffer (comm_state& state,
   } else {
     // copy to remote processor
     assert (src->_has_storage);
-    assert (src->_owns_storage);
     assert (state.collbufs.at(proc()).sendbuf -
             state.collbufs.at(proc()).sendbufbase <=
             (state.collbufs.at(proc()).sendbufsize - box.size()) *
@@ -319,9 +318,11 @@ void gdata::copy_into_sendbuffer (comm_state& state,
 void gdata::copy_from_recvbuffer (comm_state& state,
                                   const gdata* src, const ibbox& box)
 {
-  assert (state.collbufs.at(proc()).recvbuf -
-          state.collbufs.at(proc()).recvbufbase <=
-          (state.collbufs.at(proc()).recvbufsize-box.size()) * state.vartypesize);
+  assert (src->proc() < state.collbufs.size());
+  assert (state.collbufs[src->proc()].recvbuf -
+          state.collbufs[src->proc()].recvbufbase <=
+          (state.collbufs[src->proc()].recvbufsize-box.size()) *
+          state.vartypesize);
 
   // copy this processor's data from the recv buffer
   const ibbox& ext = extent();