/[escript]/trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2089 by jfenwick, Mon Nov 24 06:07:29 2008 UTC revision 2105 by jfenwick, Fri Nov 28 01:52:12 2008 UTC
# Line 211  Data::Data(const object& value, Line 211  Data::Data(const object& value,
211      // get the space for the data vector      // get the space for the data vector
212      int len1 = DataTypes::noValues(tempShape);      int len1 = DataTypes::noValues(tempShape);
213      DataVector temp_data(len1, 0.0, len1);      DataVector temp_data(len1, 0.0, len1);
214      temp_data.copyFromNumArray(asNumArray);      temp_data.copyFromNumArray(asNumArray,1);
215    
216      int len = DataTypes::noValues(other.getDataPointShape());      int len = DataTypes::noValues(other.getDataPointShape());
217    
# Line 407  Data::getShapeTuple() const Line 407  Data::getShapeTuple() const
407  // It can't work out what type the function is based soley on its name.  // It can't work out what type the function is based soley on its name.
408  // There are ways to fix this involving creating function pointer variables for each form  // There are ways to fix this involving creating function pointer variables for each form
409  // but there doesn't seem to be a need given that the methods have the same name from the python point of view  // but there doesn't seem to be a need given that the methods have the same name from the python point of view
410  Data*  Data
411  Data::copySelf()  Data::copySelf()
412  {  {
413     DataAbstract* temp=m_data->deepCopy();     DataAbstract* temp=m_data->deepCopy();
414     return new Data(temp);     return Data(temp);
415  }  }
416    
417  void  void
# Line 2437  Data::setTaggedValue(int tagKey, Line 2437  Data::setTaggedValue(int tagKey,
2437    }    }
2438    
2439    DataVector temp_data2;    DataVector temp_data2;
2440    temp_data2.copyFromNumArray(asNumArray);    temp_data2.copyFromNumArray(asNumArray,1);
2441    
2442    m_data->setTaggedValue(tagKey,tempShape, temp_data2);    m_data->setTaggedValue(tagKey,tempShape, temp_data2);
2443  }  }

Legend:
Removed from v.2089  
changed lines
  Added in v.2105

  ViewVC Help
Powered by ViewVC 1.1.26