From 146d56ad50887fd5a93dde34ad56eec17e41545e Mon Sep 17 00:00:00 2001 From: swhite Date: Wed, 8 Dec 2004 17:16:00 +0000 Subject: CarpetLib/src/*data* CarpetIOASCII/src/ioascii.cc MPI_Comm_rank wrappers Removed evil assert from otherwise harmless public accessor gdata::proc(). Very systematically checked that the assert is still done everywhere this function was previously called. New functions bool this_processor_is (int procno); bool lives_on_this_processor (); wrapper messy repeated MPI_Comm_rank code. Had to modify ioascii.cc due to missing assert as explained above, but found no other instances of calls to proc(). This patch contains the following changes: M ./Carpet/CarpetIOASCII/src/ioascii.cc +1 M ./Carpet/CarpetLib/src/data.cc -41 +21 M ./Carpet/CarpetLib/src/gdata.cc -6 +19 M ./Carpet/CarpetLib/src/gdata.hh -1 +3 darcs-hash:20041208171657-32473-11da4a7ec810f97b2c82c322119fa69a9ffb4640.gz --- Carpet/CarpetLib/src/gdata.hh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Carpet/CarpetLib/src/gdata.hh') diff --git a/Carpet/CarpetLib/src/gdata.hh b/Carpet/CarpetLib/src/gdata.hh index 26dd33251..75868852b 100644 --- a/Carpet/CarpetLib/src/gdata.hh +++ b/Carpet/CarpetLib/src/gdata.hh @@ -145,7 +145,6 @@ public: } int proc () const { - assert (_has_storage); return _proc; } @@ -219,6 +218,9 @@ public: public: protected: + bool this_processor_is (int procno); + bool lives_on_this_processor (); + virtual void copy_from_innerloop (const gdata* src, const ibbox& box) = 0; virtual void -- cgit v1.2.3