ViewVC Help

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

root/OpenMD/branches/development/src/constraints/ZconstraintForceManager.cpp

Comparing:
trunk/src/constraints/ZconstraintForceManager.cpp (file contents), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/constraints/ZconstraintForceManager.cpp (file contents), Revision 1627 by gezelter, Tue Sep 13 22:05:04 2011 UTC

#	Line 45 | Line 45
45		#include "utils/simError.h"
46		#include "utils/PhysicalConstants.hpp"
47		#include "utils/StringUtils.hpp"
48	+	#ifdef IS_MPI
49	+	#include <mpi.h>
50	+	#endif
51	+
52		namespace OpenMD {
53		ZconstraintForceManager::ZconstraintForceManager(SimInfo* info): ForceManager(info), infiniteTime(1e31) {
54		currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
#	Line 240 | Line 244 | namespace OpenMD {
244		currZconsTime_ = currSnapshot_->getTime();
245		}
246
247	<	void ZconstraintForceManager::calcForces(bool needPotential, bool needStress){
248	<	ForceManager::calcForces(needPotential, needStress);
247	>	void ZconstraintForceManager::calcForces(){
248	>	ForceManager::calcForces();
249
250		if (usingZconsGap_){
251		updateZPos();

Comparing:
trunk/src/constraints/ZconstraintForceManager.cpp (property svn:keywords), Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
branches/development/src/constraints/ZconstraintForceManager.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