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

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

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

revision 3389 by jfenwick, Fri Nov 19 05:59:46 2010 UTC revision 3390 by jfenwick, Thu Dec 2 00:34:37 2010 UTC
# Line 184  class Data { Line 184  class Data {
184         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
185         bool expanded=false);         bool expanded=false);
186    
   
   
187    /**    /**
188      \brief Create a Data using an existing DataAbstract. Warning: The new object assumes ownership of the pointer!      \brief Create a Data using an existing DataAbstract. Warning: The new object assumes ownership of the pointer!
189      Once you have passed the pointer, do not delete it.      Once you have passed the pointer, do not delete it.
# Line 1519  instead of manually manipulating process Line 1517  instead of manually manipulating process
1517          DataTypes::ValueType::reference          DataTypes::ValueType::reference
1518          getDataAtOffsetRW(DataTypes::ValueType::size_type i);          getDataAtOffsetRW(DataTypes::ValueType::size_type i);
1519    
   
1520    
1521   protected:   protected:
1522    
# Line 1770  template <class BinaryOp> Line 1767  template <class BinaryOp>
1767    friend ESCRIPT_DLL_API Data applyBinaryCFunction(boost::python::object cfunc, boost::python::tuple shape, escript::Data& d, escript::Data& e);    friend ESCRIPT_DLL_API Data applyBinaryCFunction(boost::python::object cfunc, boost::python::tuple shape, escript::Data& d, escript::Data& e);
1768  #endif  #endif
1769    friend ESCRIPT_DLL_API Data condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);    friend ESCRIPT_DLL_API Data condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);
1770      friend ESCRIPT_DLL_API Data randomData(const boost::python::tuple& shape, const FunctionSpace& what, double seed);
1771    
1772  };  };
1773    
# Line 1786  Data Line 1784  Data
1784  condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);  condEval(escript::Data& mask, escript::Data& trueval, escript::Data& falseval);
1785    
1786    
1787    
1788    /**
1789     \brief Create a new Expanded Data object filled with (not very) random data.
1790    */
1791    ESCRIPT_DLL_API
1792    Data randomData(const boost::python::tuple& shape,
1793           const FunctionSpace& what,
1794           double seed);
1795    
1796    
1797  }   // end namespace escript  }   // end namespace escript
1798    
1799    

Legend:
Removed from v.3389  
changed lines
  Added in v.3390

  ViewVC Help
Powered by ViewVC 1.1.26