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

Diff of /branches/schroedinger/escript/src/DataConstant.cpp

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

revision 1863 by jfenwick, Wed Oct 8 00:28:28 2008 UTC revision 1864 by jfenwick, Thu Oct 9 03:09:30 2008 UTC
# Line 36  namespace escript { Line 36  namespace escript {
36    
37  DataConstant::DataConstant(const boost::python::numeric::array& value,  DataConstant::DataConstant(const boost::python::numeric::array& value,
38                             const FunctionSpace& what)                             const FunctionSpace& what)
39    : DataAbstract(what,DataTypes::shapeFromNumArray(value))    : parent(what,DataTypes::shapeFromNumArray(value))
40  {  {
41  //   // extract the shape of the numarray  //   // extract the shape of the numarray
42  //   DataTypes::ShapeType tempShape;  //   DataTypes::ShapeType tempShape;
# Line 75  DataConstant::DataConstant(const boost:: Line 75  DataConstant::DataConstant(const boost::
75  // }  // }
76    
77  DataConstant::DataConstant(const DataConstant& other)  DataConstant::DataConstant(const DataConstant& other)
78    : DataAbstract(other.getFunctionSpace(),other.getShape())    : parent(other.getFunctionSpace(),other.getShape())
79  {  //  {  //
80    // copy the data in the correct format    // copy the data in the correct format
81    m_data=other.m_data;    m_data=other.m_data;
# Line 87  DataConstant::DataConstant(const DataCon Line 87  DataConstant::DataConstant(const DataCon
87    
88  DataConstant::DataConstant(const DataConstant& other,  DataConstant::DataConstant(const DataConstant& other,
89                             const DataTypes::RegionType& region)                             const DataTypes::RegionType& region)
90    : DataAbstract(other.getFunctionSpace(),DataTypes::getResultSliceShape(region))    : parent(other.getFunctionSpace(),DataTypes::getResultSliceShape(region))
91  {  {
92    //    //
93    // get the shape of the slice to copy from    // get the shape of the slice to copy from
# Line 110  DataConstant::DataConstant(const DataCon Line 110  DataConstant::DataConstant(const DataCon
110  DataConstant::DataConstant(const FunctionSpace& what,  DataConstant::DataConstant(const FunctionSpace& what,
111                             const DataTypes::ShapeType &shape,                             const DataTypes::ShapeType &shape,
112                             const DataTypes::ValueType &data)                             const DataTypes::ValueType &data)
113    : DataAbstract(what,shape)    : parent(what,shape)
114  {  {
115    //    //
116    // copy the data in the correct format    // copy the data in the correct format

Legend:
Removed from v.1863  
changed lines
  Added in v.1864

  ViewVC Help
Powered by ViewVC 1.1.26