/[escript]/branches/arrayview_from_1695_trunk/escript/src/DataExpanded.cpp
ViewVC logotype

Diff of /branches/arrayview_from_1695_trunk/escript/src/DataExpanded.cpp

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

revision 1697 by jfenwick, Mon Aug 11 06:29:54 2008 UTC revision 1698 by jfenwick, Tue Aug 12 01:13:16 2008 UTC
# Line 233  DataExpanded::copy(const boost::python:: Line 233  DataExpanded::copy(const boost::python::
233    }    }
234    
235    // get the space for the data vector    // get the space for the data vector
236    int len = DataArrayView::noValues(tempShape);    int len = DataTypes::noValues(tempShape);
237    DataVector temp_data(len, 0.0, len);    DataVector temp_data(len, 0.0, len);
238    DataArrayView temp_dataView(temp_data, tempShape);    DataArrayView temp_dataView(temp_data, tempShape);
239    temp_dataView.copy(value);    temp_dataView.copy(value);
# Line 257  DataExpanded::initialise(const DataTypes Line 257  DataExpanded::initialise(const DataTypes
257  {  {
258    //    //
259    // resize data array to the required size    // resize data array to the required size
260    m_data.resize(noSamples,noDataPointsPerSample,DataArrayView::noValues(shape));    m_data.resize(noSamples,noDataPointsPerSample,DataTypes::noValues(shape));
261    //    //
262    // create the data view of the data array    // create the data view of the data array
263    DataArrayView temp(m_data.getData(),shape);    DataArrayView temp(m_data.getData(),shape);

Legend:
Removed from v.1697  
changed lines
  Added in v.1698

  ViewVC Help
Powered by ViewVC 1.1.26