/[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 1723 by jfenwick, Fri Aug 22 00:39:32 2008 UTC revision 1724 by jfenwick, Mon Aug 25 05:38:57 2008 UTC
# Line 186  DataExpanded::setSlice(const DataAbstrac Line 186  DataExpanded::setSlice(const DataAbstrac
186      throw DataException("Error - Invalid slice region.");      throw DataException("Error - Invalid slice region.");
187    }    }
188    if (tempDataExp->getPointDataView().getRank()>0 && !value->getPointDataView().checkShape(shape)) {    if (tempDataExp->getPointDataView().getRank()>0 && !value->getPointDataView().checkShape(shape)) {
189      throw DataException (value->getPointDataView().createShapeErrorMessage(      throw DataException (DataTypes::createShapeErrorMessage(
190          "Error - Couldn't copy slice due to shape mismatch.",shape));          "Error - Couldn't copy slice due to shape mismatch.",shape, value->getShape()));
191    }    }
192    //    //
193    // copy the data from the slice into this object    // copy the data from the slice into this object
# Line 244  DataExpanded::copy(const boost::python:: Line 244  DataExpanded::copy(const boost::python::
244    //    //
245    // check the input shape matches this shape    // check the input shape matches this shape
246    if (!getPointDataView().checkShape(temp_dataView.getShape())) {    if (!getPointDataView().checkShape(temp_dataView.getShape())) {
247      throw DataException(getPointDataView().createShapeErrorMessage(      throw DataException(DataTypes::createShapeErrorMessage(
248                          "Error - (DataExpanded) Cannot copy due to shape mismatch.",                          "Error - (DataExpanded) Cannot copy due to shape mismatch.",
249                          temp_dataView.getShape()));                          temp_dataView.getShape(),getShape()));
250    }    }
251    //    //
252    // now copy over the data    // now copy over the data
# Line 819  DataExpanded::reorderByReferenceIDs(int Line 819  DataExpanded::reorderByReferenceIDs(int
819     }     }
820  }  }
821    
822    DataTypes::ValueType&
823    DataExpanded::getVector()
824    {
825        return m_data.getData();
826    }
827    
828    const DataTypes::ValueType&
829    DataExpanded::getVector() const
830    {
831        return m_data.getData();
832    }
833    
834  }  // end of namespace  }  // end of namespace

Legend:
Removed from v.1723  
changed lines
  Added in v.1724

  ViewVC Help
Powered by ViewVC 1.1.26