/[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 790 by bcumming, Wed Jul 26 23:12:34 2006 UTC
# Line 29  extern "C" { Line 29  extern "C" {
29  #include "paso/Paso.h"  #include "paso/Paso.h"
30  }  }
31    
32    #ifndef PASO_MPI
33    #define MPI_Comm long
34    #endif
35    
36  #include <string>  #include <string>
37  #include <algorithm>  #include <algorithm>
38    
# Line 234  class Data { Line 238  class Data {
238    
239    /**    /**
240       \brief       \brief
241         switches on update protection
242    
243      */
244      ESCRIPT_DLL_API
245      void
246      setProtection();
247    
248      /**
249         \brief
250         Returns trueif the data object is protected against update
251    
252      */
253      ESCRIPT_DLL_API
254      bool
255      isProtected() const;
256      /**
257         \brief
258       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.
259    */    */
260    ESCRIPT_DLL_API    ESCRIPT_DLL_API
# Line 252  class Data { Line 273  class Data {
273       \brief       \brief
274       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.
275    */    */
276    #ifndef PASO_MPI  
277    ESCRIPT_DLL_API    ESCRIPT_DLL_API
278    const boost::python::numeric::array    const boost::python::numeric::array
279    convertToNumArrayFromDPNo(int sampleNo,    convertToNumArrayFromDPNo(int ProcNo,
280                                                            int sampleNo,
281                              int dataPointNo);                              int dataPointNo);
282    #else
283      ESCRIPT_DLL_API
284      const boost::python::numeric::array
285      convertToNumArrayFromDPNo(int procNo,
286                    int sampleNo,
287                    int dataPointNo);
288    #endif
289    
290    
291    /**    /**
292       \brief       \brief
# Line 528  class Data { Line 559  class Data {
559    getDataPoint(int sampleNo,    getDataPoint(int sampleNo,
560                 int dataPointNo)                 int dataPointNo)
561    {    {
562      return m_data->getDataPoint(sampleNo,dataPointNo);          return m_data->getDataPoint(sampleNo,dataPointNo);
563    }    }
564    
565    /**    /**
# Line 766  class Data { Line 797  class Data {
797    
798    ESCRIPT_DLL_API    ESCRIPT_DLL_API
799    void    void
 #ifndef PASO_MPI  
   calc_mindp(int& SampleNo,  
              int& DataPointNo) const;  
 #else  
800    calc_mindp(int& ProcNo,    calc_mindp(int& ProcNo,
801                          int& SampleNo,                            int& SampleNo,  
802               int& DataPointNo) const;               int& DataPointNo) const;
 #endif  
803    /**    /**
804       \brief       \brief
805       Return the sign of each data point of this Data object.       Return the sign of each data point of this Data object.
# Line 1217  class Data { Line 1243  class Data {
1243                const FunctionSpace& fspace);                const FunctionSpace& fspace);
1244    
1245    
 #ifdef PASO_MPI  
1246    /**    /**
1247       \brief       \brief
1248       print the data values to stdout. Used for debugging       print the data values to stdout. Used for debugging
# Line 1254  class Data { Line 1279  class Data {
1279    ESCRIPT_DLL_API    ESCRIPT_DLL_API
1280      MPI_Comm      MPI_Comm
1281      get_MPIComm(void) const;      get_MPIComm(void) const;
 #endif  
1282            
1283   protected:   protected:
1284    
# Line 1359  class Data { Line 1383  class Data {
1383    reshapeDataPoint(const DataArrayView::ShapeType& shape);    reshapeDataPoint(const DataArrayView::ShapeType& shape);
1384    
1385    //    //
1386      // flag to protect the data object against any update
1387      bool m_protected;
1388    
1389      //
1390    // pointer to the actual data object    // pointer to the actual data object
1391    boost::shared_ptr<DataAbstract> m_data;    boost::shared_ptr<DataAbstract> m_data;
1392    

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

  ViewVC Help
Powered by ViewVC 1.1.26