/[escript]/branches/trilinos_from_5897/escriptcore/src/DataConstant.h
ViewVC logotype

Diff of /branches/trilinos_from_5897/escriptcore/src/DataConstant.h

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

revision 2270 by jfenwick, Mon Nov 10 01:21:39 2008 UTC revision 2271 by jfenwick, Mon Feb 16 05:08:29 2009 UTC
# Line 17  Line 17 
17  #include "system_dep.h"  #include "system_dep.h"
18    
19  #include "DataReady.h"  #include "DataReady.h"
20    #include "WrappedArray.h"
21    
22  #include <boost/python/numeric.hpp>  #include <boost/python/numeric.hpp>
23    
# Line 46  typedef DataReady parent; Line 47  typedef DataReady parent;
47       \param what - Input - A description of what this data object represents.       \param what - Input - A description of what this data object represents.
48    */    */
49    ESCRIPT_DLL_API    ESCRIPT_DLL_API
50    DataConstant(const boost::python::numeric::array& value,    DataConstant(const WrappedArray& value,
51                 const FunctionSpace& what);                 const FunctionSpace& what);
52    
53    
54    /**    /**
55       \brief       \brief
56       Copy constructor. Performs a deep copy.       Copy constructor. Performs a deep copy.
# Line 56  typedef DataReady parent; Line 58  typedef DataReady parent;
58    ESCRIPT_DLL_API    ESCRIPT_DLL_API
59    DataConstant(const DataConstant& other);    DataConstant(const DataConstant& other);
60    
 //  /**  
 /*     \brief  
      Alternative constructor for DataConstant objects.  
   
      Description:  
      Alternative Constructor for DataConstant objects.  
      \param value - Input - Data value for a single point.  
      \param what - Input - A description of what this data object represents.*/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   DataConstant(const DataArrayView& value,  
 //                const FunctionSpace& what);  
61    
62    /**    /**
63       \brief       \brief
# Line 162  typedef DataReady parent; Line 152  typedef DataReady parent;
152    getPointOffset(int sampleNo,    getPointOffset(int sampleNo,
153                   int dataPointNo);                   int dataPointNo);
154    
 //  /**  
 /*     \brief  
      Return a view into the data for the data point specified.  
      \param sampleNo - Input - sample number.  
      \param dataPointNo - Input - data point number for the sample.*/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   virtual  
 //   DataArrayView  
 //   getDataPoint(int sampleNo,  
 //                int dataPointNo);  
   
155    /**    /**
156       \brief       \brief
157       Return the number of doubles stored for the Data object.       Return the number of doubles stored for the Data object.
# Line 297  typedef DataReady parent; Line 275  typedef DataReady parent;
275    */    */
276    ESCRIPT_DLL_API    ESCRIPT_DLL_API
277    DataTypes::ValueType&    DataTypes::ValueType&
278    getVector();    getVectorRW();
279    
280    
281    ESCRIPT_DLL_API    ESCRIPT_DLL_API
282    const DataTypes::ValueType&    const DataTypes::ValueType&
283    getVector() const;    getVectorRO() const;
   
284    
285   protected:   protected:
286    
# Line 313  typedef DataReady parent; Line 291  typedef DataReady parent;
291    
292  };  };
293    
 inline  
 DataTypes::ValueType&  
 DataConstant::getVector()  
 {  
   return m_data;  
 }  
   
 inline  
 const DataTypes::ValueType&  
 DataConstant::getVector() const  
 {  
   return m_data;  
 }  
   
   
294  } // end of namespace  } // end of namespace
295  #endif  #endif

Legend:
Removed from v.2270  
changed lines
  Added in v.2271

  ViewVC Help
Powered by ViewVC 1.1.26