ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/minimizers/Minimizer.cpp

Comparing:
trunk/src/minimizers/Minimizer.cpp (file contents), Revision 1422 by gezelter, Tue Mar 30 15:04:45 2010 UTC vs.
branches/development/src/minimizers/Minimizer.cpp (file contents), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

#	Line 45 | Line 45
45		#include "io/StatWriter.hpp"
46		#include "minimizers/Minimizer.hpp"
47		#include "primitives/Molecule.hpp"
48	+	#ifdef IS_MPI
49	+	#include <mpi.h>
50	+	#endif
51		namespace OpenMD {
52		RealType dotProduct(const std::vector<RealType>& v1, const std::vector<RealType>& v2) {
53		if (v1.size() != v2.size()) {
#	Line 902 | Line 905 | namespace OpenMD {
905
906
907		RealType Minimizer::calcPotential() {
908	<	forceMan->calcForces(true, false);
908	>	forceMan->calcForces();
909
910		Snapshot* curSnapshot = info->getSnapshotManager()->getCurrentSnapshot();
911		RealType potential_local = curSnapshot->statData[Stats::LONG_RANGE_POTENTIAL] +

Comparing:
trunk/src/minimizers/Minimizer.cpp (property svn:keywords), Revision 1422 by gezelter, Tue Mar 30 15:04:45 2010 UTC vs.
branches/development/src/minimizers/Minimizer.cpp (property svn:keywords), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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