/[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 2271 by jfenwick, Mon Feb 16 05:08:29 2009 UTC revision 2455 by jfenwick, Wed Jun 3 03:29:07 2009 UTC
# Line 40  extern "C" { Line 40  extern "C" {
40  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
41  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
42  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
 #include <boost/python/numeric.hpp>  
43    
44  #include "BufferGroup.h"  #include "BufferGroup.h"
45    
# Line 257  class Data { Line 256  class Data {
256    bool    bool
257    isProtected() const;    isProtected() const;
258    
  /**  
     \brief  
     Return the values of a data point on this process  
  */  
  ESCRIPT_DLL_API  
  const boost::python::numeric :: array  
  getValueOfDataPoint(int dataPointNo);  
259    
260    /**
261       \brief
262       Return teh value of a data point as a python tuple.
263    */
264    ESCRIPT_DLL_API    ESCRIPT_DLL_API
265    const boost::python::object    const boost::python::object
266    getValueOfDataPointAsTuple(int dataPointNo);    getValueOfDataPointAsTuple(int dataPointNo);
# Line 294  class Data { Line 290  class Data {
290    setValueOfDataPoint(int dataPointNo, const double);    setValueOfDataPoint(int dataPointNo, const double);
291    
292    /**    /**
293       \brief       \brief Return a data point across all processors as a python tuple.
      Return the value of the specified data-point across all processors  
294    */    */
295    ESCRIPT_DLL_API    ESCRIPT_DLL_API
   const boost::python::numeric::array  
   getValueOfGlobalDataPoint(int procNo, int dataPointNo);  
   
   ESCRIPT_DLL_API  
296    const boost::python::object    const boost::python::object
297    getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo);    getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo);
298    
# Line 790  contains datapoints. Line 781  contains datapoints.
781    grad() const;    grad() const;
782    
783    /**    /**
784       \brief      \brief
785       Calculate the integral over the function space domain.       Calculate the integral over the function space domain as a python tuple.
      *  
786    */    */
787    ESCRIPT_DLL_API    ESCRIPT_DLL_API
788    boost::python::object    boost::python::object
   integrate_const() const;  
   
   ESCRIPT_DLL_API  
   boost::python::object  
   integrate();  
   
   ESCRIPT_DLL_API  
   boost::python::object  
789    integrateToTuple_const() const;    integrateToTuple_const() const;
790    
791    
792      /**
793        \brief
794         Calculate the integral over the function space domain as a python tuple.
795      */
796    ESCRIPT_DLL_API    ESCRIPT_DLL_API
797    boost::python::object    boost::python::object
798    integrateToTuple();    integrateToTuple();

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

  ViewVC Help
Powered by ViewVC 1.1.26