[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/integrators/NPTf.cpp

Comparing trunk/OOPSE-2.0/src/integrators/NPTf.cpp (file contents):
Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 1625 by tim, Thu Oct 21 16:22:01 2004 UTC

#	Line 29 \| Line 29 \| *template<typename T> NPTf<T>::NPTf ( SimInfo theInfo,**
29		T( theInfo, the_ff )
30		{
31		GenericData* data;
32	<	DoubleArrayData * etaValue;
33	<	vector<double> etaArray;
32	>	DoubleVectorGenericData * etaValue;
33		int i,j;
34
35		for(i = 0; i < 3; i++){
#	Line 46 \| Line 45 \| *template<typename T> NPTf<T>::NPTf ( SimInfo theInfo,**
45		// retrieve eta array from simInfo if it exists
46		data = info->getProperty(ETAVALUE_ID);
47		if(data){
48	<	etaValue = dynamic_cast<DoubleArrayData*>(data);
48	>	etaValue = dynamic_cast<DoubleVectorGenericData*>(data);
49
50		if(etaValue){
52	–	etaArray = etaValue->getData();
51
52		for(i = 0; i < 3; i++){
53		for (j = 0; j < 3; j++){
54	<	eta[i][j] = etaArray[3*i+j];
54	>	eta[i][j] = (etaValue)[3i+j];
55		oldEta[i][j] = eta[i][j];
56		}
57		}

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