[ViewVC] Diff of: group/branches/no-template-branch/OOPSE/libmdtools/Thermo.cpp

Comparing trunk/OOPSE/libmdtools/Thermo.cpp (file contents):
Revision 437 by mmeineke, Thu Mar 27 21:07:14 2003 UTC vs.
Revision 438 by chuckv, Mon Mar 31 21:50:59 2003 UTC

#	Line 10 \| Line 10 \| using namespace std;
10		#include "Thermo.hpp"
11		#include "SRI.hpp"
12		#include "Integrator.hpp"
13	+	#include "simError.h"
14
15		#ifdef IS_MPI
16		#define __C
#	Line 92 \| Line 93 \| double Thermo::getPotential(){
93		nSRI = entry_plug->n_SRI;
94
95		potential_local = 0.0;
96	+	potential = 0.0;
97		potential_local += entry_plug->lrPot;
98
99		for( el=0; el<entry_plug->n_mol; el++ ){
100		potential_local += molecules[el].getPotential();
101		}
102	+
103	+	#ifdef IS_MPI
104	+	/*
105	+	std::cerr << "node " << worldRank << ": before LONG RANGE pot = " << entry_plug->lrPot
106	+	<< "; pot_local = " << potential_local
107	+	<< "; pot = " << potential << "\n";
108	+	*/
109	+	#endif
110
111		// Get total potential for entire system from MPI.
112		#ifdef IS_MPI
#	Line 105 \| Line 115 \| double Thermo::getPotential(){
115		potential = potential_local;
116		#endif // is_mpi
117
118	+	#ifdef IS_MPI
119	+	/*
120	+	std::cerr << "node " << worldRank << ": after pot = " << potential << "\n";
121	+	*/
122	+	#endif
123	+
124		return potential;
125		}
126

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines