/[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

trunk/esys2/escript/src/Data/Data.h revision 150 by jgs, Thu Sep 15 03:44:45 2005 UTC trunk/escript/src/Data.h revision 480 by jgs, Wed Feb 1 05:15:12 2006 UTC
# Line 18  Line 18 
18  #ifndef DATA_H  #ifndef DATA_H
19  #define DATA_H  #define DATA_H
20    
21  #include "escript/Data/DataAbstract.h"  #include "DataAbstract.h"
22  #include "escript/Data/DataTagged.h"  #include "DataAlgorithm.h"
23  #include "escript/Data/DataAlgorithm.h"  #include "FunctionSpace.h"
24  #include "escript/Data/FunctionSpace.h"  #include "BinaryOp.h"
25  #include "escript/Data/BinaryOp.h"  #include "UnaryOp.h"
26  #include "escript/Data/UnaryOp.h"  #include "DataException.h"
 #include "escript/Data/DataException.h"  
27    
28  extern "C" {  extern "C" {
29  #include "escript/Data/DataC.h"  #include "DataC.h"
30  }  }
31    
 #include <iostream>  
32  #include <string>  #include <string>
 #include <memory>  
33  #include <algorithm>  #include <algorithm>
34    
35  #include <boost/shared_ptr.hpp>  #include <boost/shared_ptr.hpp>
36  #include <boost/python/object.hpp>  #include <boost/python/object.hpp>
 #include <boost/python/list.hpp>  
37  #include <boost/python/tuple.hpp>  #include <boost/python/tuple.hpp>
38  #include <boost/python/numeric.hpp>  #include <boost/python/numeric.hpp>
39    
# Line 45  namespace escript { Line 41  namespace escript {
41    
42  //  //
43  // Forward declaration for various implementations of Data.  // Forward declaration for various implementations of Data.
 class DataEmpty;  
44  class DataConstant;  class DataConstant;
45  class DataTagged;  class DataTagged;
46  class DataExpanded;  class DataExpanded;
# Line 206  class Data { Line 201  class Data {
201         const boost::python::tuple& shape=boost::python::make_tuple(),         const boost::python::tuple& shape=boost::python::make_tuple(),
202         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
203         bool expanded=false);         bool expanded=false);
204      /**
205         \brief
206         Destructor
207      */
208      ~Data();
209    
210    /**    /**
211       \brief       \brief
# Line 701  class Data { Line 701  class Data {
701    
702    /**    /**
703       \brief       \brief
      Return the length of each data point of this Data object.  
      sqrt(sum(A[i,j,k,l]^2))  
      *  
   */  
   Data  
   length() const;  
   
   /**  
      \brief  
704       Return the sign of each data point of this Data object.       Return the sign of each data point of this Data object.
705       -1 for negative values, zero for zero values, 1 for positive values.       -1 for negative values, zero for zero values, 1 for positive values.
706       *       *
# Line 837  class Data { Line 828  class Data {
828       *       *
829    */    */
830    Data    Data
831    log() const;    log10() const;
832    
833    /**    /**
834       \brief       \brief
# Line 845  class Data { Line 836  class Data {
836       *       *
837    */    */
838    Data    Data
839    ln() const;    log() const;
840    
841    /**    /**
842       \brief       \brief

Legend:
Removed from v.150  
changed lines
  Added in v.480

  ViewVC Help
Powered by ViewVC 1.1.26