/[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 2142 by jfenwick, Mon Dec 8 00:26:34 2008 UTC revision 2143 by jfenwick, Tue Dec 9 06:28:10 2008 UTC
# Line 41  extern "C" { Line 41  extern "C" {
41  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
42  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
43  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
44  #include <boost/python/numeric.hpp>  #ifndef NONUMARRAY
45    #include <boost/python/numeric.hpp>     // to be removed once we no longer support numarray explicitly
46    #endif
47    
48  namespace escript {  namespace escript {
49    
# Line 275  class Data { Line 277  class Data {
277    bool    bool
278    isProtected() const;    isProtected() const;
279    
280    #ifndef NONUMARRAY
281   /**   /**
282      \brief      \brief
283      Return the values of a data point on this process      Return the values of a data point on this process
284        \deprecated Please use getValueOfDataPointAsTuple.
285   */   */
286   ESCRIPT_DLL_API   ESCRIPT_DLL_API
287   const boost::python::numeric :: array   const boost::python::numeric :: array
288   getValueOfDataPoint(int dataPointNo);   getValueOfDataPoint(int dataPointNo);
289    #endif
290    
291    
292    /**
293       \brief Return the value of a data point.
294    */
295    ESCRIPT_DLL_API    ESCRIPT_DLL_API
296    const boost::python::object    const boost::python::object
297    getValueOfDataPointAsTuple(int dataPointNo);    getValueOfDataPointAsTuple(int dataPointNo);
# Line 311  class Data { Line 320  class Data {
320    void    void
321    setValueOfDataPoint(int dataPointNo, const double);    setValueOfDataPoint(int dataPointNo, const double);
322    
323    #ifndef NONUMARRAY
324    /**    /**
325       \brief       \brief
326       Return the value of the specified data-point across all processors       Return the value of the specified data-point across all processors
327         \deprecated Please use getValueOfGlobalDataPointAsTuple instead.
328    */    */
329    ESCRIPT_DLL_API    ESCRIPT_DLL_API
330    const boost::python::numeric::array    const boost::python::numeric::array
331    getValueOfGlobalDataPoint(int procNo, int dataPointNo);    getValueOfGlobalDataPoint(int procNo, int dataPointNo);
332    #endif
333    
334      /**
335         \brief
336         Return the value of the specified data-point across all processors as a python tuple.
337      */
338    ESCRIPT_DLL_API    ESCRIPT_DLL_API
339    const boost::python::object    const boost::python::object
340    getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo);    getValueOfGlobalDataPointAsTuple(int procNo, int dataPointNo);
# Line 780  contains datapoints. Line 796  contains datapoints.
796    Data    Data
797    grad() const;    grad() const;
798    
799    
800    #ifndef NONUMARRAY
801    /**    /**
802       \brief       \brief
803       Calculate the integral over the function space domain.       Calculate the integral over the function space domain.
804         \deprecated Please use integrateToTuple_const instead.
805       *       *
806    */    */
807    ESCRIPT_DLL_API    ESCRIPT_DLL_API
808    boost::python::object    boost::python::numeric::array
809    integrate_const() const;    integrate_const() const;
810    
811      /**
812         \brief
813         Calculate the integral over the function space domain.
814         \deprecated Please use integrateToTuple instead.
815         *
816      */
817    ESCRIPT_DLL_API    ESCRIPT_DLL_API
818    boost::python::object    boost::python::numeric::array
819    integrate();    integrate();
820    #endif
821    
822      /**
823         \brief
824         Calculate the integral over the function space domain as a python tuple.
825         *
826      */
827    ESCRIPT_DLL_API    ESCRIPT_DLL_API
828    boost::python::object    boost::python::object
829    integrateToTuple_const() const;    integrateToTuple_const() const;
830    
831      /**
832         \brief
833         Calculate the integral over the function space domain as a python tuple.
834         *
835      */
836    ESCRIPT_DLL_API    ESCRIPT_DLL_API
837    boost::python::object    boost::python::object
838    integrateToTuple();    integrateToTuple();

Legend:
Removed from v.2142  
changed lines
  Added in v.2143

  ViewVC Help
Powered by ViewVC 1.1.26