[ViewVC] Diff of: OpenMD/branches/development/src/visitors/ZconsVisitor.cpp

Comparing trunk/src/visitors/ZconsVisitor.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

#	Line 43 \| Line 43
43		#include "visitors/ZconsVisitor.hpp"
44		#include "primitives/Molecule.hpp"
45		#include "utils/StringUtils.hpp"
46	+	#include "types/ZconsStamp.hpp"
47		namespace oopse {
48
49		ZConsVisitor::ZConsVisitor(SimInfo* info) : BaseVisitor(), info_(info), zconsReader_(NULL){
#	Line 51 \| Line 52 \| namespace oopse {
52		currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
53		Globals* simParam = info_->getSimParams();
54
55	<	if (simParam->haveZconstraintTime()){
55	>	if (simParam->haveZconsTime()){
56		zconsTime_ = simParam->getZconsTime();
57		}
58		else{
#	Line 76 \| Line 77 \| namespace oopse {
77		simError();
78		}
79
80	<	int nZconstraints = simParam->getNzConstraints();
81	<	ZconStamp** stamp = simParam->getZconStamp();
80	>	int nZconstraints = simParam->getNZconsStamps();
81	>	std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
82		for (int i = 0; i < nZconstraints; i++){
83		int zmolIndex = stamp[i]->getMolIndex();
84		zmolStates_.insert(std::make_pair(zmolIndex, zsMoving));

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