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

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

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

revision 1780 by jfenwick, Fri Sep 5 06:26:29 2008 UTC revision 1781 by jfenwick, Thu Sep 11 05:03:14 2008 UTC
# Line 103  class Data { Line 103  class Data {
103    Data(const Data& inData,    Data(const Data& inData,
104         const FunctionSpace& what);         const FunctionSpace& what);
105    
 //  /**  
 /*     \brief  
      Constructor which copies data from a DataArrayView.  
   
      \param value - Input - Data value for a single point.  
      \param what - Input - A description of what this data represents.  
      \param expanded - Input - Flag, if true fill the entire container with  
                        the value. Otherwise a more efficient storage  
                        mechanism will be used.*/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   Data(const DataArrayView& value,  
 //        const FunctionSpace& what=FunctionSpace(),  
 //        bool expanded=false);  
   
106    /**    /**
107      \brief Copy Data from an existing vector      \brief Copy Data from an existing vector
108    */    */
# Line 156  class Data { Line 141  class Data {
141    Data(const Data& inData,    Data(const Data& inData,
142         const DataTypes::RegionType& region);         const DataTypes::RegionType& region);
143    
 //  /**  
 /*     \brief  
      Constructor which will create Tagged data if expanded is false.  
      No attempt is made to ensure the tag keys match the tag keys  
      within the function space.  
   
      \param tagKeys - Input - List of tag values.  
      \param values - Input - List of values, one for each tag.  
      \param defaultValue - Input - A default value, used if tag doesn't exist.  
      \param what - Input - A description of what this data represents.  
      \param expanded - Input - Flag, if true fill the entire container with  
                        the appropriate values.  
     ==>**/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   Data(const DataTagged::TagListType& tagKeys,  
 //        const DataTagged::ValueListType& values,  
 //        const DataArrayView& defaultValue,  
 //        const FunctionSpace& what=FunctionSpace(),  
 //        bool expanded=false);  
   
144    /**    /**
145       \brief       \brief
146       Constructor which copies data from a python numarray.       Constructor which copies data from a python numarray.
# Line 322  class Data { Line 286  class Data {
286       \brief       \brief
287       Return the tag number associated with the given data-point.       Return the tag number associated with the given data-point.
288    
      The data-point number here corresponds to the data-point number in the  
      numarray returned by convertToNumArray.  
289    */    */
290    ESCRIPT_DLL_API    ESCRIPT_DLL_API
291    int    int
# Line 1516  class Data { Line 1478  class Data {
1478    
1479    
1480  /**  /**
1481       Modify a filename for MPI parallel output to multiple files
1482    */
1483    char *Escript_MPI_appendRankToFileName(const char *, int, int);
1484    
1485    /**
1486     Binary Data object operators.     Binary Data object operators.
1487  */  */
1488  inline double rpow(double x,double y)  inline double rpow(double x,double y)

Legend:
Removed from v.1780  
changed lines
  Added in v.1781

  ViewVC Help
Powered by ViewVC 1.1.26