/[escript]/trunk/escript/src/Data.cpp
ViewVC logotype

Diff of /trunk/escript/src/Data.cpp

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

trunk/escript/src/Data.cpp revision 964 by gross, Tue Feb 13 05:10:26 2007 UTC temp/escript/src/Data.cpp revision 1387 by trankine, Fri Jan 11 07:45:26 2008 UTC
# Line 1  Line 1 
 // $Id$  
1    
2  /*  /* $Id$ */
3   ************************************************************  
4   *          Copyright 2006 by ACcESS MNRF                   *  /*******************************************************
5   *                                                          *   *
6   *              http://www.access.edu.au                    *   *           Copyright 2003-2007 by ACceSS MNRF
7   *       Primary Business: Queensland, Australia            *   *       Copyright 2007 by University of Queensland
8   *  Licensed under the Open Software License version 3.0    *   *
9   *     http://www.opensource.org/licenses/osl-3.0.php       *   *                http://esscc.uq.edu.au
10   *                                                          *   *        Primary Business: Queensland, Australia
11   ************************************************************   *  Licensed under the Open Software License version 3.0
12  */   *     http://www.opensource.org/licenses/osl-3.0.php
13     *
14     *******************************************************/
15    
16  #include "Data.h"  #include "Data.h"
17    
18  #include "DataExpanded.h"  #include "DataExpanded.h"
19  #include "DataConstant.h"  #include "DataConstant.h"
20  #include "DataTagged.h"  #include "DataTagged.h"
21  #include "DataEmpty.h"  #include "DataEmpty.h"
 #include "DataArray.h"  
22  #include "DataArrayView.h"  #include "DataArrayView.h"
 #include "DataProf.h"  
23  #include "FunctionSpaceFactory.h"  #include "FunctionSpaceFactory.h"
24  #include "AbstractContinuousDomain.h"  #include "AbstractContinuousDomain.h"
25  #include "UnaryFuncs.h"  #include "UnaryFuncs.h"
26    extern "C" {
27    #include "escript/blocktimer.h"
28    }
29    
30  #include <fstream>  #include <fstream>
31  #include <algorithm>  #include <algorithm>
# Line 38  using namespace boost::python; Line 41  using namespace boost::python;
41  using namespace boost;  using namespace boost;
42  using namespace escript;  using namespace escript;
43    
 #if defined DOPROF  
 //  
 // global table of profiling data for all Data objects  
 DataProf dataProfTable;  
 #endif  
   
44  Data::Data()  Data::Data()
45  {  {
46    //    //
# Line 52  Data::Data() Line 49  Data::Data()
49    shared_ptr<DataAbstract> temp_data(temp);    shared_ptr<DataAbstract> temp_data(temp);
50    m_data=temp_data;    m_data=temp_data;
51    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
52  }  }
53    
54  Data::Data(double value,  Data::Data(double value,
# Line 67  Data::Data(double value, Line 60  Data::Data(double value,
60    for (int i = 0; i < shape.attr("__len__")(); ++i) {    for (int i = 0; i < shape.attr("__len__")(); ++i) {
61      dataPointShape.push_back(extract<const int>(shape[i]));      dataPointShape.push_back(extract<const int>(shape[i]));
62    }    }
63    DataArray temp(dataPointShape,value);  
64    initialise(temp.getView(),what,expanded);    int len = DataArrayView::noValues(dataPointShape);
65      DataVector temp_data(len,value,len);
66      DataArrayView temp_dataView(temp_data, dataPointShape);
67    
68      initialise(temp_dataView, what, expanded);
69    
70    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
71  }  }
72    
73  Data::Data(double value,  Data::Data(double value,
# Line 81  Data::Data(double value, Line 75  Data::Data(double value,
75         const FunctionSpace& what,         const FunctionSpace& what,
76             bool expanded)             bool expanded)
77  {  {
78    DataArray temp(dataPointShape,value);    int len = DataArrayView::noValues(dataPointShape);
79    pair<int,int> dataShape=what.getDataShape();  
80    initialise(temp.getView(),what,expanded);    DataVector temp_data(len,value,len);
81      DataArrayView temp_dataView(temp_data, dataPointShape);
82    
83      initialise(temp_dataView, what, expanded);
84    
85    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
86  }  }
87    
88  Data::Data(const Data& inData)  Data::Data(const Data& inData)
89  {  {
90    m_data=inData.m_data;    m_data=inData.m_data;
91    m_protected=inData.isProtected();    m_protected=inData.isProtected();
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
92  }  }
93    
94  Data::Data(const Data& inData,  Data::Data(const Data& inData,
# Line 110  Data::Data(const Data& inData, Line 100  Data::Data(const Data& inData,
100    shared_ptr<DataAbstract> temp_data(tmp);    shared_ptr<DataAbstract> temp_data(tmp);
101    m_data=temp_data;    m_data=temp_data;
102    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
103  }  }
104    
105  Data::Data(const Data& inData,  Data::Data(const Data& inData,
106             const FunctionSpace& functionspace)             const FunctionSpace& functionspace)
107  {  {
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
108    if (inData.getFunctionSpace()==functionspace) {    if (inData.getFunctionSpace()==functionspace) {
109      m_data=inData.m_data;      m_data=inData.m_data;
110    } else {    } else {
     #if defined DOPROF  
     profData->interpolate++;  
     #endif  
111      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);
112      // Note: Must use a reference or pointer to a derived object      // Note: Must use a reference or pointer to a derived object
113      // in order to get polymorphic behaviour. Shouldn't really      // in order to get polymorphic behaviour. Shouldn't really
# Line 158  Data::Data(const DataTagged::TagListType Line 137  Data::Data(const DataTagged::TagListType
137    if (expanded) {    if (expanded) {
138      expand();      expand();
139    }    }
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
140  }  }
141    
142  Data::Data(const numeric::array& value,  Data::Data(const numeric::array& value,
# Line 170  Data::Data(const numeric::array& value, Line 145  Data::Data(const numeric::array& value,
145  {  {
146    initialise(value,what,expanded);    initialise(value,what,expanded);
147    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
148  }  }
149    
150  Data::Data(const DataArrayView& value,  Data::Data(const DataArrayView& value,
# Line 182  Data::Data(const DataArrayView& value, Line 153  Data::Data(const DataArrayView& value,
153  {  {
154    initialise(value,what,expanded);    initialise(value,what,expanded);
155    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
156  }  }
157    
158  Data::Data(const object& value,  Data::Data(const object& value,
# Line 195  Data::Data(const object& value, Line 162  Data::Data(const object& value,
162    numeric::array asNumArray(value);    numeric::array asNumArray(value);
163    initialise(asNumArray,what,expanded);    initialise(asNumArray,what,expanded);
164    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
165  }  }
166    
167    
168  Data::Data(const object& value,  Data::Data(const object& value,
169             const Data& other)             const Data& other)
170  {  {
171    
172      numeric::array asNumArray(value);
173    
174    
175      // extract the shape of the numarray
176      DataArrayView::ShapeType tempShape;
177      for (int i=0; i < asNumArray.getrank(); i++) {
178        tempShape.push_back(extract<int>(asNumArray.getshape()[i]));
179      }
180      // get the space for the data vector
181      int len = DataArrayView::noValues(tempShape);
182      DataVector temp_data(len, 0.0, len);
183      DataArrayView temp_dataView(temp_data, tempShape);
184      temp_dataView.copy(asNumArray);
185    
186    //    //
187    // Create DataConstant using the given value and all other parameters    // Create DataConstant using the given value and all other parameters
188    // copied from other. If value is a rank 0 object this Data    // copied from other. If value is a rank 0 object this Data
189    // will assume the point data shape of other.    // will assume the point data shape of other.
190    DataArray temp(value);  
191    if (temp.getView().getRank()==0) {    if (temp_dataView.getRank()==0) {
192      //      int len = DataArrayView::noValues(other.getPointDataView().getShape());
193      // Create a DataArray with the scalar value for all elements  
194      DataArray temp2(other.getPointDataView().getShape(),temp.getView()());      DataVector temp2_data(len, temp_dataView(), len);
195      initialise(temp2.getView(),other.getFunctionSpace(),false);      DataArrayView temp2_dataView(temp2_data, other.getPointDataView().getShape());
196        initialise(temp2_dataView, other.getFunctionSpace(), false);
197    
198    } else {    } else {
199      //      //
200      // Create a DataConstant with the same sample shape as other      // Create a DataConstant with the same sample shape as other
201      initialise(temp.getView(),other.getFunctionSpace(),false);      initialise(temp_dataView, other.getFunctionSpace(), false);
202    }    }
203    m_protected=false;    m_protected=false;
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
204  }  }
205    
206  Data::~Data()  Data::~Data()
# Line 266  Data::getShapeTuple() const Line 243  Data::getShapeTuple() const
243          throw DataException("Error - illegal Data rank.");          throw DataException("Error - illegal Data rank.");
244    }    }
245  }  }
   
246  void  void
247  Data::copy(const Data& other)  Data::copy(const Data& other)
248  {  {
# Line 319  Data::copy(const Data& other) Line 295  Data::copy(const Data& other)
295    throw DataException("Error - Copy not implemented for this Data type.");    throw DataException("Error - Copy not implemented for this Data type.");
296  }  }
297    
298    
299    void
300    Data::setToZero()
301    {
302      {
303        DataExpanded* temp=dynamic_cast<DataExpanded*>(m_data.get());
304        if (temp!=0) {
305           temp->setToZero();
306           return;
307        }
308      }
309      {
310        DataTagged* temp=dynamic_cast<DataTagged*>(m_data.get());
311        if (temp!=0) {
312          temp->setToZero();
313          return;
314        }
315      }
316      {
317        DataConstant* temp=dynamic_cast<DataConstant*>(m_data.get());
318        if (temp!=0) {
319          temp->setToZero();
320          return;
321        }
322      }
323      throw DataException("Error - Data can not be set to zero.");
324    }
325    
326  void  void
327  Data::copyWithMask(const Data& other,  Data::copyWithMask(const Data& other,
328                     const Data& mask)                     const Data& mask)
# Line 365  Data::isConstant() const Line 369  Data::isConstant() const
369  }  }
370    
371  void  void
372  Data::setProtection()  Data::setProtection()
373  {  {
374     m_protected=true;     m_protected=true;
375  }  }
376    
377  bool  bool
378  Data::isProtected() const  Data::isProtected() const
379  {  {
380     return m_protected;     return m_protected;
381  }  }
382    
# Line 423  Data::tag() Line 427  Data::tag()
427  Data  Data
428  Data::oneOver() const  Data::oneOver() const
429  {  {
430  #if defined DOPROF    return C_TensorUnaryOperation(*this, bind1st(divides<double>(),1.));
   profData->where++;  
 #endif  
   return escript::unaryOp(*this,bind1st(divides<double>(),1.));  
431  }  }
432    
433  Data  Data
434  Data::wherePositive() const  Data::wherePositive() const
435  {  {
436  #if defined DOPROF    return C_TensorUnaryOperation(*this, bind2nd(greater<double>(),0.0));
   profData->where++;  
 #endif  
   return escript::unaryOp(*this,bind2nd(greater<double>(),0.0));  
437  }  }
438    
439  Data  Data
440  Data::whereNegative() const  Data::whereNegative() const
441  {  {
442  #if defined DOPROF    return C_TensorUnaryOperation(*this, bind2nd(less<double>(),0.0));
   profData->where++;  
 #endif  
   return escript::unaryOp(*this,bind2nd(less<double>(),0.0));  
443  }  }
444    
445  Data  Data
446  Data::whereNonNegative() const  Data::whereNonNegative() const
447  {  {
448  #if defined DOPROF    return C_TensorUnaryOperation(*this, bind2nd(greater_equal<double>(),0.0));
   profData->where++;  
 #endif  
   return escript::unaryOp(*this,bind2nd(greater_equal<double>(),0.0));  
449  }  }
450    
451  Data  Data
452  Data::whereNonPositive() const  Data::whereNonPositive() const
453  {  {
454  #if defined DOPROF    return C_TensorUnaryOperation(*this, bind2nd(less_equal<double>(),0.0));
   profData->where++;  
 #endif  
   return escript::unaryOp(*this,bind2nd(less_equal<double>(),0.0));  
455  }  }
456    
457  Data  Data
458  Data::whereZero(double tol) const  Data::whereZero(double tol) const
459  {  {
 #if defined DOPROF  
   profData->where++;  
 #endif  
460    Data dataAbs=abs();    Data dataAbs=abs();
461    return escript::unaryOp(dataAbs,bind2nd(less_equal<double>(),tol));    return C_TensorUnaryOperation(dataAbs, bind2nd(less_equal<double>(),tol));
462  }  }
463    
464  Data  Data
465  Data::whereNonZero(double tol) const  Data::whereNonZero(double tol) const
466  {  {
 #if defined DOPROF  
   profData->where++;  
 #endif  
467    Data dataAbs=abs();    Data dataAbs=abs();
468    return escript::unaryOp(dataAbs,bind2nd(greater<double>(),tol));    return C_TensorUnaryOperation(dataAbs, bind2nd(greater<double>(),tol));
469  }  }
470    
471  Data  Data
472  Data::interpolate(const FunctionSpace& functionspace) const  Data::interpolate(const FunctionSpace& functionspace) const
473  {  {
 #if defined DOPROF  
   profData->interpolate++;  
 #endif  
474    return Data(*this,functionspace);    return Data(*this,functionspace);
475  }  }
476    
# Line 512  Data::probeInterpolation(const FunctionS Line 492  Data::probeInterpolation(const FunctionS
492  Data  Data
493  Data::gradOn(const FunctionSpace& functionspace) const  Data::gradOn(const FunctionSpace& functionspace) const
494  {  {
495  #if defined DOPROF    double blocktimer_start = blocktimer_time();
   profData->grad++;  
 #endif  
496    if (functionspace.getDomain()!=getDomain())    if (functionspace.getDomain()!=getDomain())
497      throw DataException("Error - gradient cannot be calculated on different domains.");      throw DataException("Error - gradient cannot be calculated on different domains.");
498    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();
499    grad_shape.push_back(functionspace.getDim());    grad_shape.push_back(functionspace.getDim());
500    Data out(0.0,grad_shape,functionspace,true);    Data out(0.0,grad_shape,functionspace,true);
501    getDomain().setToGradient(out,*this);    getDomain().setToGradient(out,*this);
502      blocktimer_increment("grad()", blocktimer_start);
503    return out;    return out;
504  }  }
505    
# Line 550  Data::getDataPointShape() const Line 529  Data::getDataPointShape() const
529    
530    
531    
 void  
 Data::fillFromNumArray(const boost::python::numeric::array num_array)  
 {  
   if (isProtected()) {  
         throw DataException("Error - attempt to update protected Data object.");  
   }  
   //  
   // check rank  
   if (num_array.getrank()<getDataPointRank())  
       throw DataException("Rank of numarray does not match Data object rank");  
   
   //  
   // check shape of num_array  
   for (int i=0; i<getDataPointRank(); i++) {  
     if (extract<int>(num_array.getshape()[i+1])!=getDataPointShape()[i])  
        throw DataException("Shape of numarray does not match Data object rank");  
   }  
   
   //  
   // make sure data is expanded:  
   if (!isExpanded()) {  
     expand();  
   }  
   
   //  
   // and copy over  
   m_data->copyAll(num_array);  
 }  
   
532  const  const
533  boost::python::numeric::array  boost::python::numeric::array
534  Data::convertToNumArray()  Data:: getValueOfDataPoint(int dataPointNo)
 {  
   //  
   // determine the total number of data points  
   int numSamples = getNumSamples();  
   int numDataPointsPerSample = getNumDataPointsPerSample();  
   int numDataPoints = numSamples * numDataPointsPerSample;  
   
   //  
   // determine the rank and shape of each data point  
   int dataPointRank = getDataPointRank();  
   DataArrayView::ShapeType dataPointShape = getDataPointShape();  
   
   //  
   // create the numeric array to be returned  
   boost::python::numeric::array numArray(0.0);  
   
   //  
   // the rank of the returned numeric array will be the rank of  
   // the data points, plus one. Where the rank of the array is n,  
   // the last n-1 dimensions will be equal to the shape of the  
   // data points, whilst the first dimension will be equal to the  
   // total number of data points. Thus the array will consist of  
   // a serial vector of the data points.  
   int arrayRank = dataPointRank + 1;  
   DataArrayView::ShapeType arrayShape;  
   arrayShape.push_back(numDataPoints);  
   for (int d=0; d<dataPointRank; d++) {  
      arrayShape.push_back(dataPointShape[d]);  
   }  
   
   //  
   // resize the numeric array to the shape just calculated  
   if (arrayRank==1) {  
     numArray.resize(arrayShape[0]);  
   }  
   if (arrayRank==2) {  
     numArray.resize(arrayShape[0],arrayShape[1]);  
   }  
   if (arrayRank==3) {  
     numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);  
   }  
   if (arrayRank==4) {  
     numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);  
   }  
   if (arrayRank==5) {  
     numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);  
   }  
   
   //  
   // loop through each data point in turn, loading the values for that data point  
   // into the numeric array.  
   int dataPoint = 0;  
   for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {  
     for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {  
       DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);  
       if (dataPointRank==0) {  
         numArray[dataPoint]=dataPointView();  
       }  
       if (dataPointRank==1) {  
         for (int i=0; i<dataPointShape[0]; i++) {  
           numArray[make_tuple(dataPoint,i)]=dataPointView(i);  
         }  
       }  
       if (dataPointRank==2) {  
         for (int i=0; i<dataPointShape[0]; i++) {  
           for (int j=0; j<dataPointShape[1]; j++) {  
             numArray[make_tuple(dataPoint,i,j)] = dataPointView(i,j);  
           }  
         }  
       }  
       if (dataPointRank==3) {  
         for (int i=0; i<dataPointShape[0]; i++) {  
           for (int j=0; j<dataPointShape[1]; j++) {  
             for (int k=0; k<dataPointShape[2]; k++) {  
               numArray[make_tuple(dataPoint,i,j,k)]=dataPointView(i,j,k);  
             }  
           }  
         }  
       }  
       if (dataPointRank==4) {  
         for (int i=0; i<dataPointShape[0]; i++) {  
           for (int j=0; j<dataPointShape[1]; j++) {  
             for (int k=0; k<dataPointShape[2]; k++) {  
               for (int l=0; l<dataPointShape[3]; l++) {  
                 numArray[make_tuple(dataPoint,i,j,k,l)]=dataPointView(i,j,k,l);  
               }  
             }  
           }  
         }  
       }  
       dataPoint++;  
     }  
   }  
   
   //  
   // return the loaded array  
   return numArray;  
 }  
   
   
 const  
 boost::python::numeric::array  
 Data:: getValueOfDataPoint(int dataPointNo)  
535  {  {
536    size_t length=0;    size_t length=0;
537    int i, j, k, l;    int i, j, k, l;
# Line 729  Data:: getValueOfDataPoint(int dataPoint Line 576  Data:: getValueOfDataPoint(int dataPoint
576         if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {         if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {
577             throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");             throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
578         }         }
579                  
580         //         //
581         // Check a valid data point number has been supplied         // Check a valid data point number has been supplied
582         if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {         if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {
# Line 738  Data:: getValueOfDataPoint(int dataPoint Line 585  Data:: getValueOfDataPoint(int dataPoint
585         // TODO: global error handling         // TODO: global error handling
586         // create a view of the data if it is stored locally         // create a view of the data if it is stored locally
587         DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);         DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);
588            
589         switch( dataPointRank ){         switch( dataPointRank ){
590              case 0 :              case 0 :
591                  numArray[0] = dataPointView();                  numArray[0] = dataPointView();
592                  break;                  break;
593              case 1 :                      case 1 :
594                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
595                      numArray[i]=dataPointView(i);                      numArray[i]=dataPointView(i);
596                  break;                  break;
597              case 2 :                      case 2 :
598                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
599                      for( j=0; j<dataPointShape[1]; j++)                      for( j=0; j<dataPointShape[1]; j++)
600                          numArray[make_tuple(i,j)]=dataPointView(i,j);                          numArray[make_tuple(i,j)]=dataPointView(i,j);
601                  break;                  break;
602              case 3 :                      case 3 :
603                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
604                      for( j=0; j<dataPointShape[1]; j++ )                      for( j=0; j<dataPointShape[1]; j++ )
605                          for( k=0; k<dataPointShape[2]; k++)                          for( k=0; k<dataPointShape[2]; k++)
# Line 773  Data:: getValueOfDataPoint(int dataPoint Line 620  Data:: getValueOfDataPoint(int dataPoint
620    
621  }  }
622  void  void
623  Data::setValueOfDataPointToArray(int dataPointNo, const boost::python::numeric::array num_array)  Data::setValueOfDataPointToPyObject(int dataPointNo, const boost::python::object& py_object)
624    {
625        // this will throw if the value cannot be represented
626        boost::python::numeric::array num_array(py_object);
627        setValueOfDataPointToArray(dataPointNo,num_array);
628    
629    
630    }
631    
632    void
633    Data::setValueOfDataPointToArray(int dataPointNo, const boost::python::numeric::array& num_array)
634  {  {
635    if (isProtected()) {    if (isProtected()) {
636          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
637    }    }
638    //    //
639    // check rank    // check rank
640    if (num_array.getrank()<getDataPointRank())    if (num_array.getrank()<getDataPointRank())
641        throw DataException("Rank of numarray does not match Data object rank");        throw DataException("Rank of numarray does not match Data object rank");
642    
643    //    //
# Line 823  Data::setValueOfDataPoint(int dataPointN Line 680  Data::setValueOfDataPoint(int dataPointN
680    }    }
681  }  }
682    
683  const  const
684  boost::python::numeric::array  boost::python::numeric::array
685  Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)  Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)
686  {  {
687    size_t length=0;    size_t length=0;
688    int i, j, k, l, pos;    int i, j, k, l, pos;
# Line 880  Data::getValueOfGlobalDataPoint(int proc Line 737  Data::getValueOfGlobalDataPoint(int proc
737                  if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {                  if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {
738                    throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");                    throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
739                  }                  }
740                  
741                  //                  //
742                  // Check a valid data point number has been supplied                  // Check a valid data point number has been supplied
743                  if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {                  if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {
# Line 889  Data::getValueOfGlobalDataPoint(int proc Line 746  Data::getValueOfGlobalDataPoint(int proc
746                  // TODO: global error handling                  // TODO: global error handling
747          // create a view of the data if it is stored locally          // create a view of the data if it is stored locally
748          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);
749            
750          // pack the data from the view into tmpData for MPI communication          // pack the data from the view into tmpData for MPI communication
751          pos=0;          pos=0;
752          switch( dataPointRank ){          switch( dataPointRank ){
753              case 0 :              case 0 :
754                  tmpData[0] = dataPointView();                  tmpData[0] = dataPointView();
755                  break;                  break;
756              case 1 :                      case 1 :
757                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
758                      tmpData[i]=dataPointView(i);                      tmpData[i]=dataPointView(i);
759                  break;                  break;
760              case 2 :                      case 2 :
761                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
762                      for( j=0; j<dataPointShape[1]; j++, pos++ )                      for( j=0; j<dataPointShape[1]; j++, pos++ )
763                          tmpData[pos]=dataPointView(i,j);                          tmpData[pos]=dataPointView(i,j);
764                  break;                  break;
765              case 3 :                      case 3 :
766                  for( i=0; i<dataPointShape[0]; i++ )                  for( i=0; i<dataPointShape[0]; i++ )
767                      for( j=0; j<dataPointShape[1]; j++ )                      for( j=0; j<dataPointShape[1]; j++ )
768                          for( k=0; k<dataPointShape[2]; k++, pos++ )                          for( k=0; k<dataPointShape[2]; k++, pos++ )
# Line 921  Data::getValueOfGlobalDataPoint(int proc Line 778  Data::getValueOfGlobalDataPoint(int proc
778          }          }
779              }              }
780      }      }
781          #ifdef PASO_MPI          #ifdef PASO_MPI
782          // broadcast the data to all other processes          // broadcast the data to all other processes
783      MPI_Bcast( tmpData, length, MPI_DOUBLE, procNo, get_MPIComm() );      MPI_Bcast( tmpData, length, MPI_DOUBLE, procNo, get_MPIComm() );
784          #endif          #endif
# Line 931  Data::getValueOfGlobalDataPoint(int proc Line 788  Data::getValueOfGlobalDataPoint(int proc
788          case 0 :          case 0 :
789              numArray[0]=tmpData[0];              numArray[0]=tmpData[0];
790              break;              break;
791          case 1 :                  case 1 :
792              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
793                  numArray[i]=tmpData[i];                  numArray[i]=tmpData[i];
794              break;              break;
795          case 2 :                  case 2 :
796              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
797                  for( j=0; j<dataPointShape[1]; j++ )                  for( j=0; j<dataPointShape[1]; j++ )
798                     numArray[make_tuple(i,j)]=tmpData[i+j*dataPointShape[0]];                     numArray[make_tuple(i,j)]=tmpData[i+j*dataPointShape[0]];
799              break;              break;
800          case 3 :                  case 3 :
801              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
802                  for( j=0; j<dataPointShape[1]; j++ )                  for( j=0; j<dataPointShape[1]; j++ )
803                      for( k=0; k<dataPointShape[2]; k++ )                      for( k=0; k<dataPointShape[2]; k++ )
# Line 955  Data::getValueOfGlobalDataPoint(int proc Line 812  Data::getValueOfGlobalDataPoint(int proc
812              break;              break;
813      }      }
814    
815      delete [] tmpData;        delete [] tmpData;
816    //    //
817    // return the loaded array    // return the loaded array
818    return numArray;    return numArray;
# Line 969  Data::integrate() const Line 826  Data::integrate() const
826    int index;    int index;
827    int rank = getDataPointRank();    int rank = getDataPointRank();
828    DataArrayView::ShapeType shape = getDataPointShape();    DataArrayView::ShapeType shape = getDataPointShape();
829      int dataPointSize = getDataPointSize();
 #if defined DOPROF  
   profData->integrate++;  
 #endif  
830    
831    //    //
832    // calculate the integral values    // calculate the integral values
833    vector<double> integrals(getDataPointSize());    vector<double> integrals(dataPointSize);
834      vector<double> integrals_local(dataPointSize);
835    #ifdef PASO_MPI
836      AbstractContinuousDomain::asAbstractContinuousDomain(getDomain()).setToIntegrals(integrals_local,*this);
837      // Global sum: use an array instead of a vector because elements of array are guaranteed to be contiguous in memory
838      double *tmp = new double[dataPointSize];
839      double *tmp_local = new double[dataPointSize];
840      for (int i=0; i<dataPointSize; i++) { tmp_local[i] = integrals_local[i]; }
841      MPI_Allreduce( &tmp_local[0], &tmp[0], dataPointSize, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD );
842      for (int i=0; i<dataPointSize; i++) { integrals[i] = tmp[i]; }
843      delete[] tmp;
844      delete[] tmp_local;
845    #else
846    AbstractContinuousDomain::asAbstractContinuousDomain(getDomain()).setToIntegrals(integrals,*this);    AbstractContinuousDomain::asAbstractContinuousDomain(getDomain()).setToIntegrals(integrals,*this);
847    #endif
848    
849    //    //
850    // create the numeric array to be returned    // create the numeric array to be returned
# Line 1035  Data::integrate() const Line 902  Data::integrate() const
902  }  }
903    
904  Data  Data
 Data::erf() const  
 {  
 #if defined DOPROF  
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::erf);  
 }  
   
 Data  
905  Data::sin() const  Data::sin() const
906  {  {
907  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sin);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sin);  
908  }  }
909    
910  Data  Data
911  Data::cos() const  Data::cos() const
912  {  {
913  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::cos);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cos);  
914  }  }
915    
916  Data  Data
917  Data::tan() const  Data::tan() const
918  {  {
919  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::tan);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tan);  
920  }  }
921    
922  Data  Data
923  Data::asin() const  Data::asin() const
924  {  {
925  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::asin);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::asin);  
926  }  }
927    
928  Data  Data
929  Data::acos() const  Data::acos() const
930  {  {
931  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::acos);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::acos);  
932  }  }
933    
934    
935  Data  Data
936  Data::atan() const  Data::atan() const
937  {  {
938  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::atan);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::atan);  
939  }  }
940    
941  Data  Data
942  Data::sinh() const  Data::sinh() const
943  {  {
944  #if defined DOPROF      return C_TensorUnaryOperation<double (*)(double)>(*this, ::sinh);
945    profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sinh);  
946  }  }
947    
948  Data  Data
949  Data::cosh() const  Data::cosh() const
950  {  {
951  #if defined DOPROF      return C_TensorUnaryOperation<double (*)(double)>(*this, ::cosh);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cosh);  
952  }  }
953    
954  Data  Data
955  Data::tanh() const  Data::tanh() const
956  {  {
957  #if defined DOPROF      return C_TensorUnaryOperation<double (*)(double)>(*this, ::tanh);
958    profData->unary++;  }
959    
960    
961    Data
962    Data::erf() const
963    {
964    #ifdef _WIN32
965      throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");
966    #else
967      return C_TensorUnaryOperation(*this, ::erf);
968  #endif  #endif
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tanh);  
969  }  }
970    
971  Data  Data
972  Data::asinh() const  Data::asinh() const
973  {  {
974  #if defined DOPROF  #ifdef _WIN32
975    profData->unary++;    return C_TensorUnaryOperation(*this, escript::asinh_substitute);
976    #else
977      return C_TensorUnaryOperation(*this, ::asinh);
978  #endif  #endif
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::asinh);  
979  }  }
980    
981  Data  Data
982  Data::acosh() const  Data::acosh() const
983  {  {
984  #if defined DOPROF  #ifdef _WIN32
985    profData->unary++;    return C_TensorUnaryOperation(*this, escript::acosh_substitute);
986    #else
987      return C_TensorUnaryOperation(*this, ::acosh);
988  #endif  #endif
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::acosh);  
989  }  }
990    
991  Data  Data
992  Data::atanh() const  Data::atanh() const
993  {  {
994  #if defined DOPROF  #ifdef _WIN32
995    profData->unary++;    return C_TensorUnaryOperation(*this, escript::atanh_substitute);
996    #else
997      return C_TensorUnaryOperation(*this, ::atanh);
998  #endif  #endif
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::atanh);  
999  }  }
1000    
1001  Data  Data
1002  Data::log10() const  Data::log10() const
1003  {  {
1004  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log10);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log10);  
1005  }  }
1006    
1007  Data  Data
1008  Data::log() const  Data::log() const
1009  {  {
1010  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::log);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log);  
1011  }  }
1012    
1013  Data  Data
1014  Data::sign() const  Data::sign() const
1015  {  {
1016  #if defined DOPROF    return C_TensorUnaryOperation(*this, escript::fsign);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,escript::fsign);  
1017  }  }
1018    
1019  Data  Data
1020  Data::abs() const  Data::abs() const
1021  {  {
1022  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::fabs);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::fabs);  
1023  }  }
1024    
1025  Data  Data
1026  Data::neg() const  Data::neg() const
1027  {  {
1028  #if defined DOPROF    return C_TensorUnaryOperation(*this, negate<double>());
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,negate<double>());  
1029  }  }
1030    
1031  Data  Data
1032  Data::pos() const  Data::pos() const
1033  {  {
 #if defined DOPROF  
   profData->unary++;  
 #endif  
1034    Data result;    Data result;
1035    // perform a deep copy    // perform a deep copy
1036    result.copy(*this);    result.copy(*this);
# Line 1211  Data::pos() const Line 1040  Data::pos() const
1040  Data  Data
1041  Data::exp() const  Data::exp() const
1042  {  {
1043  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::exp);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::exp);  
1044  }  }
1045    
1046  Data  Data
1047  Data::sqrt() const  Data::sqrt() const
1048  {  {
1049  #if defined DOPROF    return C_TensorUnaryOperation<double (*)(double)>(*this, ::sqrt);
   profData->unary++;  
 #endif  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sqrt);  
1050  }  }
1051    
1052  double  double
1053  Data::Lsup() const  Data::Lsup() const
1054  {  {
1055    double localValue, globalValue;    double localValue, globalValue;
 #if defined DOPROF  
   profData->reduction1++;  
 #endif  
1056    //    //
1057    // set the initial absolute maximum value to zero    // set the initial absolute maximum value to zero
1058    
# Line 1247  Data::Lsup() const Line 1067  Data::Lsup() const
1067  }  }
1068    
1069  double  double
 Data::Linf() const  
 {  
   double localValue, globalValue;  
 #if defined DOPROF  
   profData->reduction1++;  
 #endif  
   //  
   // set the initial absolute minimum value to max double  
   AbsMin abs_min_func;  
   localValue = algorithm(abs_min_func,numeric_limits<double>::max());  
   
 #ifdef PASO_MPI  
   MPI_Allreduce( &localValue, &globalValue, 1, MPI_DOUBLE, MPI_MIN, MPI_COMM_WORLD );  
   return globalValue;  
 #else  
   return localValue;  
 #endif  
 }  
   
 double  
1070  Data::sup() const  Data::sup() const
1071  {  {
1072    double localValue, globalValue;    double localValue, globalValue;
 #if defined DOPROF  
   profData->reduction1++;  
 #endif  
1073    //    //
1074    // set the initial maximum value to min possible double    // set the initial maximum value to min possible double
1075    FMax fmax_func;    FMax fmax_func;
# Line 1289  double Line 1086  double
1086  Data::inf() const  Data::inf() const
1087  {  {
1088    double localValue, globalValue;    double localValue, globalValue;
 #if defined DOPROF  
   profData->reduction1++;  
 #endif  
1089    //    //
1090    // set the initial minimum value to max possible double    // set the initial minimum value to max possible double
1091    FMin fmin_func;    FMin fmin_func;
# Line 1309  Data::inf() const Line 1103  Data::inf() const
1103  Data  Data
1104  Data::maxval() const  Data::maxval() const
1105  {  {
 #if defined DOPROF  
   profData->reduction2++;  
 #endif  
1106    //    //
1107    // set the initial maximum value to min possible double    // set the initial maximum value to min possible double
1108    FMax fmax_func;    FMax fmax_func;
# Line 1321  Data::maxval() const Line 1112  Data::maxval() const
1112  Data  Data
1113  Data::minval() const  Data::minval() const
1114  {  {
 #if defined DOPROF  
   profData->reduction2++;  
 #endif  
1115    //    //
1116    // set the initial minimum value to max possible double    // set the initial minimum value to max possible double
1117    FMin fmin_func;    FMin fmin_func;
# Line 1334  Data Line 1122  Data
1122  Data::swapaxes(const int axis0, const int axis1) const  Data::swapaxes(const int axis0, const int axis1) const
1123  {  {
1124       int axis0_tmp,axis1_tmp;       int axis0_tmp,axis1_tmp;
      #if defined DOPROF  
      profData->unary++;  
      #endif  
1125       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1126       DataArrayView::ShapeType ev_shape;       DataArrayView::ShapeType ev_shape;
1127       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]
# Line 1363  Data::swapaxes(const int axis0, const in Line 1148  Data::swapaxes(const int axis0, const in
1148       }       }
1149       for (int i=0; i<rank; i++) {       for (int i=0; i<rank; i++) {
1150         if (i == axis0_tmp) {         if (i == axis0_tmp) {
1151            ev_shape.push_back(s[axis1_tmp]);            ev_shape.push_back(s[axis1_tmp]);
1152         } else if (i == axis1_tmp) {         } else if (i == axis1_tmp) {
1153            ev_shape.push_back(s[axis0_tmp]);            ev_shape.push_back(s[axis0_tmp]);
1154         } else {         } else {
1155            ev_shape.push_back(s[i]);            ev_shape.push_back(s[i]);
1156         }         }
1157       }       }
1158       Data ev(0.,ev_shape,getFunctionSpace());       Data ev(0.,ev_shape,getFunctionSpace());
# Line 1380  Data::swapaxes(const int axis0, const in Line 1165  Data::swapaxes(const int axis0, const in
1165  Data  Data
1166  Data::symmetric() const  Data::symmetric() const
1167  {  {
      #if defined DOPROF  
         profData->unary++;  
      #endif  
1168       // check input       // check input
1169       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1170       if (getDataPointRank()==2) {       if (getDataPointRank()==2) {
1171          if(s[0] != s[1])          if(s[0] != s[1])
1172             throw DataException("Error - Data::symmetric can only be calculated for rank 2 object with equal first and second dimension.");             throw DataException("Error - Data::symmetric can only be calculated for rank 2 object with equal first and second dimension.");
1173       }       }
1174       else if (getDataPointRank()==4) {       else if (getDataPointRank()==4) {
# Line 1405  Data::symmetric() const Line 1187  Data::symmetric() const
1187  Data  Data
1188  Data::nonsymmetric() const  Data::nonsymmetric() const
1189  {  {
      #if defined DOPROF  
         profData->unary++;  
      #endif  
1190       // check input       // check input
1191       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1192       if (getDataPointRank()==2) {       if (getDataPointRank()==2) {
1193          if(s[0] != s[1])          if(s[0] != s[1])
1194             throw DataException("Error - Data::nonsymmetric can only be calculated for rank 2 object with equal first and second dimension.");             throw DataException("Error - Data::nonsymmetric can only be calculated for rank 2 object with equal first and second dimension.");
1195          DataArrayView::ShapeType ev_shape;          DataArrayView::ShapeType ev_shape;
1196          ev_shape.push_back(s[0]);          ev_shape.push_back(s[0]);
# Line 1442  Data::nonsymmetric() const Line 1221  Data::nonsymmetric() const
1221  Data  Data
1222  Data::trace(int axis_offset) const  Data::trace(int axis_offset) const
1223  {  {
      #if defined DOPROF  
         profData->unary++;  
      #endif  
1224       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1225       if (getDataPointRank()==2) {       if (getDataPointRank()==2) {
1226          DataArrayView::ShapeType ev_shape;          DataArrayView::ShapeType ev_shape;
# Line 1495  Data::trace(int axis_offset) const Line 1271  Data::trace(int axis_offset) const
1271  Data  Data
1272  Data::transpose(int axis_offset) const  Data::transpose(int axis_offset) const
1273  {  {
      #if defined DOPROF  
      profData->unary++;  
      #endif  
1274       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1275       DataArrayView::ShapeType ev_shape;       DataArrayView::ShapeType ev_shape;
1276       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]       // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]
# Line 1519  Data::transpose(int axis_offset) const Line 1292  Data::transpose(int axis_offset) const
1292  Data  Data
1293  Data::eigenvalues() const  Data::eigenvalues() const
1294  {  {
      #if defined DOPROF  
         profData->unary++;  
      #endif  
1295       // check input       // check input
1296       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1297       if (getDataPointRank()!=2)       if (getDataPointRank()!=2)
1298          throw DataException("Error - Data::eigenvalues can only be calculated for rank 2 object.");          throw DataException("Error - Data::eigenvalues can only be calculated for rank 2 object.");
1299       if(s[0] != s[1])       if(s[0] != s[1])
1300          throw DataException("Error - Data::eigenvalues can only be calculated for object with equal first and second dimension.");          throw DataException("Error - Data::eigenvalues can only be calculated for object with equal first and second dimension.");
1301       // create return       // create return
1302       DataArrayView::ShapeType ev_shape(1,s[0]);       DataArrayView::ShapeType ev_shape(1,s[0]);
# Line 1539  Data::eigenvalues() const Line 1309  Data::eigenvalues() const
1309  const boost::python::tuple  const boost::python::tuple
1310  Data::eigenvalues_and_eigenvectors(const double tol) const  Data::eigenvalues_and_eigenvectors(const double tol) const
1311  {  {
      #if defined DOPROF  
         profData->unary++;  
      #endif  
1312       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1313       if (getDataPointRank()!=2)       if (getDataPointRank()!=2)
1314          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for rank 2 object.");          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for rank 2 object.");
1315       if(s[0] != s[1])       if(s[0] != s[1])
1316          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for object with equal first and second dimension.");          throw DataException("Error - Data::eigenvalues and eigenvectors can only be calculated for object with equal first and second dimension.");
1317       // create return       // create return
1318       DataArrayView::ShapeType ev_shape(1,s[0]);       DataArrayView::ShapeType ev_shape(1,s[0]);
# Line 1615  Data::calc_minGlobalDataPoint(int& ProcN Line 1382  Data::calc_minGlobalDataPoint(int& ProcN
1382      int lowProc = 0;      int lowProc = 0;
1383      double *globalMins = new double[get_MPISize()+1];      double *globalMins = new double[get_MPISize()+1];
1384      int error = MPI_Gather ( &next, 1, MPI_DOUBLE, globalMins, 1, MPI_DOUBLE, 0, get_MPIComm() );      int error = MPI_Gather ( &next, 1, MPI_DOUBLE, globalMins, 1, MPI_DOUBLE, 0, get_MPIComm() );
1385        
1386      if( get_MPIRank()==0 ){      if( get_MPIRank()==0 ){
1387          next = globalMins[lowProc];          next = globalMins[lowProc];
1388          for( i=1; i<get_MPISize(); i++ )          for( i=1; i<get_MPISize(); i++ )
# Line 1669  Data::operator+=(const boost::python::ob Line 1436  Data::operator+=(const boost::python::ob
1436    binaryOp(tmp,plus<double>());    binaryOp(tmp,plus<double>());
1437    return (*this);    return (*this);
1438  }  }
1439    Data&
1440    Data::operator=(const Data& other)
1441    {
1442      copy(other);
1443      return (*this);
1444    }
1445    
1446  Data&  Data&
1447  Data::operator-=(const Data& right)  Data::operator-=(const Data& right)
# Line 1741  Data::powO(const boost::python::object& Line 1514  Data::powO(const boost::python::object&
1514  Data  Data
1515  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1516  {  {
1517    Data result;    return C_TensorBinaryOperation<double (*)(double, double)>(*this, right, ::pow);
   if (getDataPointRank()<right.getDataPointRank()) {  
      result.copy(right);  
      result.binaryOp(*this,escript::rpow);  
   } else {  
      result.copy(*this);  
      result.binaryOp(right,(Data::BinaryDFunPtr)::pow);  
   }  
   return result;  
1518  }  }
1519    
   
1520  //  //
1521  // NOTE: It is essential to specify the namespace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1522  Data  Data
1523  escript::operator+(const Data& left, const Data& right)  escript::operator+(const Data& left, const Data& right)
1524  {  {
1525    Data result;    return C_TensorBinaryOperation(left, right, plus<double>());
   //  
   // perform a deep copy  
   if (left.getDataPointRank()<right.getDataPointRank()) {  
      result.copy(right);  
      result+=left;  
   } else {  
      result.copy(left);  
      result+=right;  
   }  
   return result;  
1526  }  }
1527    
1528  //  //
# Line 1776  escript::operator+(const Data& left, con Line 1530  escript::operator+(const Data& left, con
1530  Data  Data
1531  escript::operator-(const Data& left, const Data& right)  escript::operator-(const Data& left, const Data& right)
1532  {  {
1533    Data result;    return C_TensorBinaryOperation(left, right, minus<double>());
   //  
   // perform a deep copy  
   if (left.getDataPointRank()<right.getDataPointRank()) {  
      result=right.neg();  
      result+=left;  
   } else {  
      result.copy(left);  
      result-=right;  
   }  
   return result;  
1534  }  }
1535    
1536  //  //
# Line 1794  escript::operator-(const Data& left, con Line 1538  escript::operator-(const Data& left, con
1538  Data  Data
1539  escript::operator*(const Data& left, const Data& right)  escript::operator*(const Data& left, const Data& right)
1540  {  {
1541    Data result;    return C_TensorBinaryOperation(left, right, multiplies<double>());
   //  
   // perform a deep copy  
   if (left.getDataPointRank()<right.getDataPointRank()) {  
      result.copy(right);  
      result*=left;  
   } else {  
      result.copy(left);  
      result*=right;  
   }  
   return result;  
1542  }  }
1543    
1544  //  //
# Line 1812  escript::operator*(const Data& left, con Line 1546  escript::operator*(const Data& left, con
1546  Data  Data
1547  escript::operator/(const Data& left, const Data& right)  escript::operator/(const Data& left, const Data& right)
1548  {  {
1549    Data result;    return C_TensorBinaryOperation(left, right, divides<double>());
   //  
   // perform a deep copy  
   if (left.getDataPointRank()<right.getDataPointRank()) {  
      result=right.oneOver();  
      result*=left;  
   } else {  
      result.copy(left);  
      result/=right;  
   }  
   return result;  
1550  }  }
1551    
1552  //  //
# Line 1937  escript::operator/(const boost::python:: Line 1661  escript::operator/(const boost::python::
1661  /* TODO */  /* TODO */
1662  /* global reduction */  /* global reduction */
1663  Data  Data
1664  Data::getItem(const boost::python::object& key) const  Data::getItem(const boost::python::object& key) const
1665  {  {
1666    const DataArrayView& view=getPointDataView();    const DataArrayView& view=getPointDataView();
1667    
# Line 1955  Data::getItem(const boost::python::objec Line 1679  Data::getItem(const boost::python::objec
1679  Data  Data
1680  Data::getSlice(const DataArrayView::RegionType& region) const  Data::getSlice(const DataArrayView::RegionType& region) const
1681  {  {
 #if defined DOPROF  
   profData->slicing++;  
 #endif  
1682    return Data(*this,region);    return Data(*this,region);
1683  }  }
1684    
# Line 1971  Data::setItemO(const boost::python::obje Line 1692  Data::setItemO(const boost::python::obje
1692    setItemD(key,tempData);    setItemD(key,tempData);
1693  }  }
1694    
 /* TODO */  
 /* global reduction */  
1695  void  void
1696  Data::setItemD(const boost::python::object& key,  Data::setItemD(const boost::python::object& key,
1697                 const Data& value)                 const Data& value)
# Line 1990  Data::setItemD(const boost::python::obje Line 1709  Data::setItemD(const boost::python::obje
1709    }    }
1710  }  }
1711    
 /* TODO */  
 /* global reduction */  
1712  void  void
1713  Data::setSlice(const Data& value,  Data::setSlice(const Data& value,
1714                 const DataArrayView::RegionType& region)                 const DataArrayView::RegionType& region)
# Line 1999  Data::setSlice(const Data& value, Line 1716  Data::setSlice(const Data& value,
1716    if (isProtected()) {    if (isProtected()) {
1717          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1718    }    }
 #if defined DOPROF  
   profData->slicing++;  
 #endif  
1719    Data tempValue(value);    Data tempValue(value);
1720    typeMatchLeft(tempValue);    typeMatchLeft(tempValue);
1721    typeMatchRight(tempValue);    typeMatchRight(tempValue);
# Line 2036  Data::typeMatchRight(const Data& right) Line 1750  Data::typeMatchRight(const Data& right)
1750    }    }
1751  }  }
1752    
1753  /* TODO */  void
1754  /* global reduction */  Data::setTaggedValueByName(std::string name,
1755                               const boost::python::object& value)
1756    {
1757         if (getFunctionSpace().getDomain().isValidTagName(name)) {
1758            int tagKey=getFunctionSpace().getDomain().getTag(name);
1759            setTaggedValue(tagKey,value);
1760         }
1761    }
1762  void  void
1763  Data::setTaggedValue(int tagKey,  Data::setTaggedValue(int tagKey,
1764                       const boost::python::object& value)                       const boost::python::object& value)
# Line 2047  Data::setTaggedValue(int tagKey, Line 1768  Data::setTaggedValue(int tagKey,
1768    }    }
1769    //    //
1770    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
1771    tag();    if (isConstant()) tag();
1772    
1773    if (!isTagged()) {    numeric::array asNumArray(value);
1774      throw DataException("Error - DataTagged conversion failed!!");  
1775    
1776      // extract the shape of the numarray
1777      DataArrayView::ShapeType tempShape;
1778      for (int i=0; i < asNumArray.getrank(); i++) {
1779        tempShape.push_back(extract<int>(asNumArray.getshape()[i]));
1780    }    }
1781    
1782    //    // get the space for the data vector
1783    // Construct DataArray from boost::python::object input value    int len = DataArrayView::noValues(tempShape);
1784    DataArray valueDataArray(value);    DataVector temp_data(len, 0.0, len);
1785      DataArrayView temp_dataView(temp_data, tempShape);
1786      temp_dataView.copy(asNumArray);
1787    
1788    //    //
1789    // Call DataAbstract::setTaggedValue    // Call DataAbstract::setTaggedValue
1790    m_data->setTaggedValue(tagKey,valueDataArray.getView());    m_data->setTaggedValue(tagKey,temp_dataView);
1791  }  }
1792    
 /* TODO */  
 /* global reduction */  
1793  void  void
1794  Data::setTaggedValueFromCPP(int tagKey,  Data::setTaggedValueFromCPP(int tagKey,
1795                              const DataArrayView& value)                              const DataArrayView& value)
# Line 2073  Data::setTaggedValueFromCPP(int tagKey, Line 1799  Data::setTaggedValueFromCPP(int tagKey,
1799    }    }
1800    //    //
1801    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
1802    tag();    if (isConstant()) tag();
1803    
   if (!isTagged()) {  
     throw DataException("Error - DataTagged conversion failed!!");  
   }  
                                                                                                                 
1804    //    //
1805    // Call DataAbstract::setTaggedValue    // Call DataAbstract::setTaggedValue
1806    m_data->setTaggedValue(tagKey,value);    m_data->setTaggedValue(tagKey,value);
1807  }  }
1808    
 /* TODO */  
 /* global reduction */  
1809  int  int
1810  Data::getTagNumber(int dpno)  Data::getTagNumber(int dpno)
1811  {  {
1812    return m_data->getTagNumber(dpno);    return getFunctionSpace().getTagFromSampleNo(dpno);
1813  }  }
1814    
1815  void  void
# Line 2442  escript::C_GeneralTensorProduct(Data& ar Line 2162  escript::C_GeneralTensorProduct(Data& ar
2162    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)    // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)
2163    // SM is the product of the last axis_offset entries in arg_0.getShape().    // SM is the product of the last axis_offset entries in arg_0.getShape().
2164    
   #if defined DOPROF  
     // profData->binary++;  
   #endif  
   
2165    // Interpolate if necessary and find an appropriate function space    // Interpolate if necessary and find an appropriate function space
2166    Data arg_0_Z, arg_1_Z;    Data arg_0_Z, arg_1_Z;
2167    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
# Line 2806  Data::borrowData() const Line 2522  Data::borrowData() const
2522  /* Member functions specific to the MPI implementation */  /* Member functions specific to the MPI implementation */
2523    
2524  void  void
2525  Data::print()  Data::print()
2526  {  {
2527    int i,j;    int i,j;
2528      
2529    printf( "Data is %dX%d\n", getNumSamples(), getNumDataPointsPerSample() );    printf( "Data is %dX%d\n", getNumSamples(), getNumDataPointsPerSample() );
2530    for( i=0; i<getNumSamples(); i++ )    for( i=0; i<getNumSamples(); i++ )
2531    {    {
# Line 2819  Data::print() Line 2535  Data::print()
2535      printf( "\n" );      printf( "\n" );
2536    }    }
2537  }  }
2538    void
2539    Data::dump(const std::string fileName) const
2540    {
2541      try
2542         {
2543            return m_data->dump(fileName);
2544         }
2545         catch (exception& e)
2546         {
2547            cout << e.what() << endl;
2548         }
2549    }
2550    
2551  int  int
2552  Data::get_MPISize() const  Data::get_MPISize() const
# Line 2846  Data::get_MPIRank() const Line 2574  Data::get_MPIRank() const
2574    
2575  MPI_Comm  MPI_Comm
2576  Data::get_MPIComm() const  Data::get_MPIComm() const
2577  {  {
2578  #ifdef PASO_MPI  #ifdef PASO_MPI
2579      return MPI_COMM_WORLD;      return MPI_COMM_WORLD;
2580  #else  #else

Legend:
Removed from v.964  
changed lines
  Added in v.1387

  ViewVC Help
Powered by ViewVC 1.1.26