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

Diff of /branches/arrayview_from_1695_trunk/escript/src/DataConstant.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 41  DataConstant::DataConstant(const boost:: Line 41  DataConstant::DataConstant(const boost::
41    }    }
42    
43    // get the space for the data vector    // get the space for the data vector
44    int len = DataArrayView::noValues(tempShape);    int len = DataTypes::noValues(tempShape);
45    DataVector temp_data(len, 0.0, len);    DataVector temp_data(len, 0.0, len);
46    DataArrayView temp_dataView(temp_data, tempShape);    DataArrayView temp_dataView(temp_data, tempShape);
47    temp_dataView.copy(value);    temp_dataView.copy(value);
# Line 88  DataConstant::DataConstant(const DataCon Line 88  DataConstant::DataConstant(const DataCon
88    DataTypes::ShapeType shape(DataArrayView::getResultSliceShape(region));    DataTypes::ShapeType shape(DataArrayView::getResultSliceShape(region));
89    //    //
90    // allocate space for this new DataConstant's data    // allocate space for this new DataConstant's data
91    int len = DataArrayView::noValues(shape);    int len = DataTypes::noValues(shape);
92    m_data.resize(len,0.,len);    m_data.resize(len,0.,len);
93    //    //
94    // create a view of the data with the correct shape    // create a view of the data with the correct shape

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

  ViewVC Help
Powered by ViewVC 1.1.26