/[escript]/branches/arrexp_trunk2098/escript/src/Data.h
ViewVC logotype

Diff of /branches/arrexp_trunk2098/escript/src/Data.h

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

revision 2118 by jfenwick, Tue Dec 2 01:58:34 2008 UTC revision 2119 by jfenwick, Tue Dec 2 06:06:04 2008 UTC
# Line 18  Line 18 
18  #define DATA_H  #define DATA_H
19  #include "system_dep.h"  #include "system_dep.h"
20    
21    #include "DataTypes.h"
22  #include "DataAbstract.h"  #include "DataAbstract.h"
23  #include "DataAlgorithm.h"  #include "DataAlgorithm.h"
24  #include "FunctionSpace.h"  #include "FunctionSpace.h"
25  #include "BinaryOp.h"  #include "BinaryOp.h"
26  #include "UnaryOp.h"  #include "UnaryOp.h"
27  #include "DataException.h"  #include "DataException.h"
28  #include "DataTypes.h"  
29    
30  extern "C" {  extern "C" {
31  #include "DataC.h"  #include "DataC.h"
# Line 145  class Data { Line 146  class Data {
146    Data(const Data& inData,    Data(const Data& inData,
147         const DataTypes::RegionType& region);         const DataTypes::RegionType& region);
148    
149    /**  //  /**
150       \brief  //     \brief
151       Constructor which copies data from a python numarray.  //     Constructor which copies data from a python numarray.
152    //
153       \param value - Input - Data value for a single point.  //     \param value - Input - Data value for a single point.
154       \param what - Input - A description of what this data represents.  //     \param what - Input - A description of what this data represents.
155       \param expanded - Input - Flag, if true fill the entire container with  //     \param expanded - Input - Flag, if true fill the entire container with
156                         the value. Otherwise a more efficient storage  //                       the value. Otherwise a more efficient storage
157                         mechanism will be used.  //                       mechanism will be used.
158    */  //  */
159    ESCRIPT_DLL_API  //   ESCRIPT_DLL_API
160    Data(const boost::python::numeric::array& value,  //   Data(const boost::python::numeric::array& value,
161         const FunctionSpace& what=FunctionSpace(),  //        const FunctionSpace& what=FunctionSpace(),
162         bool expanded=false);  //        bool expanded=false);
163    
164    /**    /**
165       \brief       \brief
# Line 1520  contains datapoints. Line 1521  contains datapoints.
1521                   const FunctionSpace& what,                   const FunctionSpace& what,
1522                   bool expanded);                   bool expanded);
1523    
1524      void
1525      initialise(const WrappedArray& value,
1526                     const FunctionSpace& what,
1527                     bool expanded);
1528    
1529    //    //
1530    // flag to protect the data object against any update    // flag to protect the data object against any update
1531    bool m_protected;    bool m_protected;

Legend:
Removed from v.2118  
changed lines
  Added in v.2119

  ViewVC Help
Powered by ViewVC 1.1.26