ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/devel_omp/src/utils/Report.cpp
(Generate patch)

Comparing branches/development/src/utils/Report.cpp (file contents):
Revision 1490 by chuckv, Fri Aug 13 15:02:28 2010 UTC vs.
Revision 1492 by chuckv, Mon Aug 16 18:07:50 2010 UTC

# Line 1 | Line 1
1 < #include <protomol/base/Report.h>
1 > #include "utils/Report.hpp"
2  
3   #include <iomanip>
4  
5 < #include <protomol/base/SystemUtilities.h>
5 > #include "utils/SystemUtilities.hpp"
6  
7   using namespace std;
8  
9 < namespace ProtoMol {
9 > namespace OpenMD {
10   //____ Report
11    namespace Report {
12      MyStreamer &debug::operator()(MyStreamer &stream) const {
# Line 313 | Line 313 | namespace ProtoMol {
313        stream.myAllNodes = true;
314        stream.myAllNodesSerial = true;
315        stream << flush;
316 <      protomolStartSerial(false);
316 >      openMDStartSerial(false);
317        return stream;
318      }
319  
# Line 321 | Line 321 | namespace ProtoMol {
321        stream.myAllNodes = true;
322        stream.myAllSlavesSerial = true;
323        stream << flush;
324 <      protomolStartSerial(true);
324 >      openMDStartSerial(true);
325        return stream;
326      }
327  
# Line 331 | Line 331 | namespace ProtoMol {
331          stream.mySilentHint = max(stream.mySilentHint - 1, 0);
332        if (stream.myQuit)
333          if (!stream.myAllNodesSerial || !stream.myAllSlavesSerial)
334 <          protomolExit();
335 <        else
336 <          protomolAbort();
334 >          openMDExit();
335 >        else
336 >          openMDAbort();
337        else if (stream.myAbort)
338 <        protomolAbort();
338 >        openMDAbort();
339        else if (stream.myAllNodesSerial)
340 <        protomolEndSerial(false);
340 >        openMDEndSerial(false);
341        else if (stream.myAllSlavesSerial)
342 <        protomolEndSerial(true);
342 >        openMDEndSerial(true);
343        stream.myAllSlavesSerial = false;
344        stream.myAllNodesSerial = false;
345        stream.myAllNodes = false;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines