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

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

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

revision 782 by bcumming, Tue Jul 18 00:47:47 2006 UTC revision 789 by dhawcroft, Wed Jul 26 05:41:11 2006 UTC
# Line 234  class Data { Line 234  class Data {
234    
235    /**    /**
236       \brief       \brief
237         switches on update protection
238    
239      */
240      ESCRIPT_DLL_API
241      void
242      setProtection();
243    
244      /**
245         \brief
246         Returns trueif the data object is protected against update
247    
248      */
249      ESCRIPT_DLL_API
250      bool
251      isProtected() const;
252      /**
253         \brief
254       Return the values of all data-points as a single python numarray object.       Return the values of all data-points as a single python numarray object.
255    */    */
256    ESCRIPT_DLL_API    ESCRIPT_DLL_API
# Line 252  class Data { Line 269  class Data {
269       \brief       \brief
270       Return the value of the specified data-point as a single python numarray object.       Return the value of the specified data-point as a single python numarray object.
271    */    */
272    #ifndef PASO_MPI  
273    ESCRIPT_DLL_API    ESCRIPT_DLL_API
274    const boost::python::numeric::array    const boost::python::numeric::array
275    convertToNumArrayFromDPNo(int sampleNo,    convertToNumArrayFromDPNo(int sampleNo,
276                              int dataPointNo);                              int dataPointNo);
277    #else
278      ESCRIPT_DLL_API
279      const boost::python::numeric::array
280      convertToNumArrayFromDPNo(int procNo,
281                    int sampleNo,
282                    int dataPointNo);
283    #endif
284    
285    
286    /**    /**
287       \brief       \brief
# Line 1359  class Data { Line 1385  class Data {
1385    reshapeDataPoint(const DataArrayView::ShapeType& shape);    reshapeDataPoint(const DataArrayView::ShapeType& shape);
1386    
1387    //    //
1388      // flag to protect the data object against any update
1389      bool m_protected;
1390    
1391      //
1392    // pointer to the actual data object    // pointer to the actual data object
1393    boost::shared_ptr<DataAbstract> m_data;    boost::shared_ptr<DataAbstract> m_data;
1394    

Legend:
Removed from v.782  
changed lines
  Added in v.789

  ViewVC Help
Powered by ViewVC 1.1.26