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

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

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

revision 2452 by jfenwick, Wed Apr 29 01:37:54 2009 UTC revision 2453 by jfenwick, Tue Jun 2 22:54:20 2009 UTC
# Line 41  extern "C" { Line 41  extern "C" {
41  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
42  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
43    
 #ifndef NONUMARRAY  
 #include <boost/python/numeric.hpp>  
 #endif  
   
44  #include "BufferGroup.h"  #include "BufferGroup.h"
45    
46  namespace escript {  namespace escript {
# Line 261  class Data { Line 257  class Data {
257    isProtected() const;    isProtected() const;
258    
259    
 #ifndef NONUMARRAY  
   
  /**  
     \brief  
     Return the values of a data point on this process  
     \deprecated Please use getValueOfDataPointAsTuple  
  */  
   
  ESCRIPT_DLL_API  
  const boost::python::numeric :: array  
  getValueOfDataPoint(int dataPointNo);  
 #endif  
   
260  /**  /**
261     \brief     \brief
262     Return teh value of a data point as a python tuple.     Return teh value of a data point as a python tuple.
# Line 306  class Data { Line 289  class Data {
289    void    void
290    setValueOfDataPoint(int dataPointNo, const double);    setValueOfDataPoint(int dataPointNo, const double);
291    
 #ifndef NONUMARRAY  
   /**  
      \brief  
      Return the value of the specified data-point across all processors  
      \deprecated Please use getValueOfGlobalDataPointAsTuple  
  */  
   
   
   ESCRIPT_DLL_API  
   const boost::python::numeric::array  
   getValueOfGlobalDataPoint(int procNo, int dataPointNo);  
 #endif  
   
   
292    /**    /**
293       \brief Return a data point across all processors as a python tuple.       \brief Return a data point across all processors as a python tuple.
294    */    */
# Line 811  contains datapoints. Line 780  contains datapoints.
780    Data    Data
781    grad() const;    grad() const;
782    
 #ifndef NONUMARRAY  
   /**  
      \brief  
      Calculate the integral over the function space domain as a numarray.  
      \deprecated Please use the integrateToTuple forms.  
   */  
   ESCRIPT_DLL_API  
   boost::python::object  
   integrate_const() const;  
   
   ESCRIPT_DLL_API  
   boost::python::object  
   integrate();  
 #endif  
   
783    /**    /**
784      \brief      \brief
785       Calculate the integral over the function space domain as a python tuple.       Calculate the integral over the function space domain as a python tuple.

Legend:
Removed from v.2452  
changed lines
  Added in v.2453

  ViewVC Help
Powered by ViewVC 1.1.26