/[escript]/trunk/escript/src/DataFactory.h
ViewVC logotype

Diff of /trunk/escript/src/DataFactory.h

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

revision 615 by elspeth, Wed Mar 22 02:12:00 2006 UTC revision 757 by woo409, Mon Jun 26 13:12:56 2006 UTC
# Line 13  Line 13 
13                                                                                                                                                        
14  #if !defined escript_DataFactory_20040721_H  #if !defined escript_DataFactory_20040721_H
15  #define escript_DataFactory_20040721_H  #define escript_DataFactory_20040721_H
16    #include "system_dep.h"
17    
18  #include "FunctionSpace.h"  #include "FunctionSpace.h"
19  #include "Data.h"  #include "Data.h"
# Line 37  namespace escript { Line 38  namespace escript {
38                       the value. Otherwise a more efficient storage                       the value. Otherwise a more efficient storage
39                       mechanism will be used.                       mechanism will be used.
40  */  */
41  Data  ESCRIPT_DLL_API Data
42  Scalar(double value,  Scalar(double value,
43         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
44         bool expanded=false);         bool expanded=false);
# Line 47  Scalar(double value, Line 48  Scalar(double value,
48     Return a Data object containing vector data-points.     Return a Data object containing vector data-points.
49     ie: rank 1 data-points.     ie: rank 1 data-points.
50  */  */
51  Data  ESCRIPT_DLL_API Data
52  Vector(double value,  Vector(double value,
53         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
54         bool expanded=false);         bool expanded=false);
# Line 57  Vector(double value, Line 58  Vector(double value,
58     Return a Data object containing tensor datapoints.     Return a Data object containing tensor datapoints.
59     ie: rank 2 data-points.     ie: rank 2 data-points.
60  */  */
61  Data  ESCRIPT_DLL_API Data
62  Tensor(double value,  Tensor(double value,
63         const FunctionSpace& what=FunctionSpace(),         const FunctionSpace& what=FunctionSpace(),
64         bool expanded=false);         bool expanded=false);
# Line 67  Tensor(double value, Line 68  Tensor(double value,
68     Return a Data object containing tensor3 datapoints.     Return a Data object containing tensor3 datapoints.
69     ie: rank 3 data-points.     ie: rank 3 data-points.
70  */  */
71  Data  ESCRIPT_DLL_API Data
72  Tensor3(double value,  Tensor3(double value,
73          const FunctionSpace& what=FunctionSpace(),          const FunctionSpace& what=FunctionSpace(),
74          bool expanded=false);          bool expanded=false);
# Line 77  Tensor3(double value, Line 78  Tensor3(double value,
78     Return a Data object containing tensor4 datapoints.     Return a Data object containing tensor4 datapoints.
79     ie: rank 4 data-points.     ie: rank 4 data-points.
80  */  */
81  Data  ESCRIPT_DLL_API Data
82  Tensor4(double value,  Tensor4(double value,
83          const FunctionSpace& what=FunctionSpace(),          const FunctionSpace& what=FunctionSpace(),
84          bool expanded=false);          bool expanded=false);
# Line 89  Tensor4(double value, Line 90  Tensor4(double value,
90     interpolated data of values are returned. If value is not a data object it is tried to generate     interpolated data of values are returned. If value is not a data object it is tried to generate
91     the corresponding data object. escript::DataEmpty() is returned if value is identified as empty.     the corresponding data object. escript::DataEmpty() is returned if value is identified as empty.
92  */  */
93  Data  ESCRIPT_DLL_API Data
94  convertToData(const boost::python::object& value,  convertToData(const boost::python::object& value,
95                const FunctionSpace& what=FunctionSpace());                const FunctionSpace& what=FunctionSpace());
96    

Legend:
Removed from v.615  
changed lines
  Added in v.757

  ViewVC Help
Powered by ViewVC 1.1.26