[ViewVC] Diff of: OpenMD/branches/development/src/rnemd/RNEMD.cpp

Comparing trunk/src/integrators/RNEMD.cpp (file contents):
Revision 1329 by gezelter, Sat Mar 14 01:23:53 2009 UTC vs.
Revision 1330 by skuang, Thu Mar 19 21:03:36 2009 UTC

#	Line 63 \| Line 63 \| namespace oopse {
63
64		int seedValue;
65		Globals * simParams = info->getSimParams();
66	+
67	+	stringToEnumMap_["Kinetic"] = rnemdKinetic;
68	+	stringToEnumMap_["Px"] = rnemdPx;
69	+	stringToEnumMap_["Py"] = rnemdPy;
70	+	stringToEnumMap_["Pz"] = rnemdPz;
71	+	stringToEnumMap_["Unknown"] = rnemdUnknown;
72	+
73	+	const std::string st = simParams->getRNEMD_swapType();
74	+
75	+	std::map<std::string, RNEMDTypeEnum>::iterator i;
76	+	i = stringToEnumMap_.find(st);
77	+	rnemdType_ = (i == stringToEnumMap_.end()) ? RNEMD::rnemdUnknown : i->second;
78	+
79	+
80	+	set_RNEMD_swapTime(simParams->getRNEMD_swapTime());
81	+	set_RNEMD_nBins(simParams->getRNEMD_nBins());
82	+	exchangeSum_ = 0.0;
83
84		#ifndef IS_MPI
85		if (simParams->haveSeed()) {
#	Line 84 \| Line 101 \| namespace oopse {
101		RNEMD::~RNEMD() {
102		delete randNumGen_;
103		}
104	<
104	>
105		void RNEMD::doSwap() {
106		std::cerr << "in RNEMD!\n";
107	+	std::cerr << "nBins = " << nBins_ << "\n";
108	+	std::cerr << "swapTime = " << swapTime_ << "\n";
109	+	std::cerr << "exchangeSum = " << exchangeSum_ << "\n";
110	+	std::cerr << "swapType = " << rnemdType_ << "\n";
111		}
112		}

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