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

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

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

revision 1796 by jfenwick, Wed Sep 17 01:45:46 2008 UTC revision 2005 by jfenwick, Mon Nov 10 01:21:39 2008 UTC
# Line 1  Line 1 
1    
 /* $Id$ */  
   
2  /*******************************************************  /*******************************************************
3   *  *
4   *           Copyright 2003-2007 by ACceSS MNRF  * Copyright (c) 2003-2008 by University of Queensland
5   *       Copyright 2007 by University of Queensland  * Earth Systems Science Computational Center (ESSCC)
6   *  * http://www.uq.edu.au/esscc
7   *                http://esscc.uq.edu.au  *
8   *        Primary Business: Queensland, Australia  * Primary Business: Queensland, Australia
9   *  Licensed under the Open Software License version 3.0  * Licensed under the Open Software License version 3.0
10   *     http://www.opensource.org/licenses/osl-3.0.php  * http://www.opensource.org/licenses/osl-3.0.php
11   *  *
12   *******************************************************/  *******************************************************/
13    
14    
15  #if !defined escript_DataExpanded_20040323_H  #if !defined escript_DataExpanded_20040323_H
16  #define escript_DataExpanded_20040323_H  #define escript_DataExpanded_20040323_H
17  #include "system_dep.h"  #include "system_dep.h"
18    
19  #include "DataAbstract.h"  #include "DataReady.h"
20  #include "DataBlocks2D.h"  #include "DataBlocks2D.h"
21    
22  #include <boost/python/numeric.hpp>  #include <boost/python/numeric.hpp>
# Line 41  class DataTagged; Line 40  class DataTagged;
40     template must satisfy.     template must satisfy.
41  */  */
42    
43  class DataExpanded : public DataAbstract {  class DataExpanded : public DataReady {
44    
45    typedef DataReady parent;
46    
47   public:   public:
48    
# Line 63  class DataExpanded : public DataAbstract Line 64  class DataExpanded : public DataAbstract
64    DataExpanded(const boost::python::numeric::array& value,    DataExpanded(const boost::python::numeric::array& value,
65                 const FunctionSpace& what);                 const FunctionSpace& what);
66    
 //  /**  
 //      \brief  
 //      Alternative constructor for DataExpanded.  
 //  
 //      Description:  
 //      Alternative Constructor for DataExpanded.  
 //  
 //      The given single data value is copied to all the data points in  
 //      this data object, where the number of data points is defined by  
 //      the given function space.  
 //  
 //      \param value - Input - A single data value.  
 //      \param what - Input - A description of what this data represents.  
 //  */  
 //   ESCRIPT_DLL_API  
 //   DataExpanded(const DataArrayView& value,  
 //                const FunctionSpace& what);  
   
67    /**    /**
68       \brief       \brief
69       Alternative constructor for DataExpanded that copies a slice from       Alternative constructor for DataExpanded that copies a slice from
# Line 142  TODO Note that this constructor will als Line 125  TODO Note that this constructor will als
125    virtual    virtual
126    ~DataExpanded();    ~DataExpanded();
127    
128      ESCRIPT_DLL_API
129      bool
130      isExpanded() const
131      {
132        return true;
133      };
134    
135    /**    /**
136       \brief       \brief
137       Return a textual representation of the data.       Return a textual representation of the data.
# Line 150  TODO Note that this constructor will als Line 140  TODO Note that this constructor will als
140    virtual    virtual
141    std::string    std::string
142    toString() const;    toString() const;
143    
144      /**
145         \brief Return a deep copy of the current object.
146      */
147      ESCRIPT_DLL_API
148      virtual
149      DataAbstract*
150      deepCopy();
151    
152    
153   /**   /**
154       \brief       \brief
155       dumps the object into a netCDF file       dumps the object into a netCDF file
# Line 183  TODO Note that this constructor will als Line 183  TODO Note that this constructor will als
183    getPointOffset(int sampleNo,    getPointOffset(int sampleNo,
184                   int dataPointNo) const;                   int dataPointNo) const;
185    
186  //  /**    ESCRIPT_DLL_API
187  /*     \brief    virtual
188       Return a view into the data array for the data point specified.    DataTypes::ValueType::size_type
189      getPointOffset(int sampleNo,
190       NOTE: Construction of the DataArrayView is a relatively expensive                   int dataPointNo);
      operation.  
   
      \param sampleNo - Input - sample number.  
      \param dataPointNo - Input - data point number.  
      \return DataArrayView for the data point.*/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   DataArrayView  
 //   getDataPoint(int sampleNo,  
 //                int dataPointNo);  
   
191    
192    /**    /**
193       \brief       \brief
# Line 248  TODO Note that this constructor will als Line 237  TODO Note that this constructor will als
237    setSlice(const DataAbstract* value,    setSlice(const DataAbstract* value,
238             const DataTypes::RegionType& region);             const DataTypes::RegionType& region);
239    
   
 //  /**  
 /*     \brief  
      setTaggedValue  
   
      Description:  
      uses tag to set a new value  
   
      \param tagKey - Input - Integer key.  
      \param value - Input - Single DataArrayView value to be assigned to the tag.*/  
 //  */  
 //   ESCRIPT_DLL_API  
 //   virtual  
 //   void  
 //   setTaggedValue(int tagKey,  
 //                  const DataArrayView& value);  
   
   
   
240    /**    /**
241       \brief       \brief
242       setTaggedValue       setTaggedValue

Legend:
Removed from v.1796  
changed lines
  Added in v.2005

  ViewVC Help
Powered by ViewVC 1.1.26