ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-2.0/src/integrators/NPTxyz.cpp
(Generate patch)

Comparing:
trunk/OOPSE-2.0/src/integrators/NPTxyz.cpp (file contents), Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/new_design/OOPSE-2.0/src/integrators/NPTxyz.cpp (file contents), Revision 1701 by tim, Wed Nov 3 16:08:43 2004 UTC

# Line 28 | Line 28 | template<typename T> NPTxyz<T>::NPTxyz ( SimInfo *theI
28    T( theInfo, the_ff )
29   {
30    GenericData* data;
31 <  DoubleArrayData * etaValue;
32 <  vector<double> etaArray;
31 >  DoubleVectorGenericData * etaValue;
32    int i,j;
33  
34    for(i = 0; i < 3; i++){
# Line 44 | Line 43 | template<typename T> NPTxyz<T>::NPTxyz ( SimInfo *theI
43    if( theInfo->useInitXSstate ){
44  
45      // retrieve eta array from simInfo if it exists
46 <    data = info->getProperty(ETAVALUE_ID);
46 >    data = info->getPropertyByName(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)[3*i+j];
55              oldEta[i][j] = eta[i][j];
56            }
57          }

Diff Legend

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