[ViewVC] Diff of: OpenMD/branches/development/src/brains/ForceManager.cpp

Comparing branches/development/src/brains/ForceManager.cpp (file contents):
Revision 1709 by gezelter, Tue May 15 13:04:08 2012 UTC vs.
Revision 1710 by gezelter, Fri May 18 21:44:02 2012 UTC

#	Line 201 \| Line 201 \| namespace OpenMD {
201		// electrostaticSummationMethod keyword.
202
203		if (simParams_->haveElectrostaticSummationMethod()) {
204	<	std::string myMethod = simParams_->getElectrostaticSummationMethod();
204	>	string myMethod = simParams_->getElectrostaticSummationMethod();
205		toUpper(myMethod);
206
207		if (myMethod == "SHIFTED_POTENTIAL") {
#	Line 256 \| Line 256 \| namespace OpenMD {
256		stringToCutoffPolicy["MAX"] = MAX;
257		stringToCutoffPolicy["TRADITIONAL"] = TRADITIONAL;
258
259	<	std::string cutPolicy;
259	>	string cutPolicy;
260		if (forceFieldOptions_.haveCutoffPolicy()){
261		cutPolicy = forceFieldOptions_.getCutoffPolicy();
262		}else if (simParams_->haveCutoffPolicy()) {

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