/[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

revision 790 by bcumming, Wed Jul 26 23:12:34 2006 UTC revision 1031 by phornby, Wed Mar 14 06:03:21 2007 UTC
# Line 350  Data::isTagged() const Line 350  Data::isTagged() const
350    return (temp!=0);    return (temp!=0);
351  }  }
352    
 /* TODO */  
 /* global reduction -- the local data being empty does not imply that it is empty on other processers*/  
353  bool  bool
354  Data::isEmpty() const  Data::isEmpty() const
355  {  {
# Line 422  Data::tag() Line 420  Data::tag()
420    }    }
421  }  }
422    
423  void  Data
424  Data::reshapeDataPoint(const DataArrayView::ShapeType& shape)  Data::oneOver() const
425  {  {
426    m_data->reshapeDataPoint(shape);  #if defined DOPROF
427      profData->where++;
428    #endif
429      return escript::unaryOp(*this,bind1st(divides<double>(),1.));
430  }  }
431    
432  Data  Data
# Line 547  Data::getDataPointShape() const Line 548  Data::getDataPointShape() const
548    return getPointDataView().getShape();    return getPointDataView().getShape();
549  }  }
550    
551    
552    
553  void  void
554  Data::fillFromNumArray(const boost::python::numeric::array num_array)  Data::fillFromNumArray(const boost::python::numeric::array num_array)
555  {  {
# Line 639  Data::convertToNumArray() Line 642  Data::convertToNumArray()
642        }        }
643        if (dataPointRank==1) {        if (dataPointRank==1) {
644          for (int i=0; i<dataPointShape[0]; i++) {          for (int i=0; i<dataPointShape[0]; i++) {
645            numArray[dataPoint][i]=dataPointView(i);            numArray[make_tuple(dataPoint,i)]=dataPointView(i);
646          }          }
647        }        }
648        if (dataPointRank==2) {        if (dataPointRank==2) {
649          for (int i=0; i<dataPointShape[0]; i++) {          for (int i=0; i<dataPointShape[0]; i++) {
650            for (int j=0; j<dataPointShape[1]; j++) {            for (int j=0; j<dataPointShape[1]; j++) {
651              numArray[dataPoint][i][j] = dataPointView(i,j);              numArray[make_tuple(dataPoint,i,j)] = dataPointView(i,j);
652            }            }
653          }          }
654        }        }
# Line 653  Data::convertToNumArray() Line 656  Data::convertToNumArray()
656          for (int i=0; i<dataPointShape[0]; i++) {          for (int i=0; i<dataPointShape[0]; i++) {
657            for (int j=0; j<dataPointShape[1]; j++) {            for (int j=0; j<dataPointShape[1]; j++) {
658              for (int k=0; k<dataPointShape[2]; k++) {              for (int k=0; k<dataPointShape[2]; k++) {
659                numArray[dataPoint][i][j][k]=dataPointView(i,j,k);                numArray[make_tuple(dataPoint,i,j,k)]=dataPointView(i,j,k);
660              }              }
661            }            }
662          }          }
# Line 663  Data::convertToNumArray() Line 666  Data::convertToNumArray()
666            for (int j=0; j<dataPointShape[1]; j++) {            for (int j=0; j<dataPointShape[1]; j++) {
667              for (int k=0; k<dataPointShape[2]; k++) {              for (int k=0; k<dataPointShape[2]; k++) {
668                for (int l=0; l<dataPointShape[3]; l++) {                for (int l=0; l<dataPointShape[3]; l++) {
669                  numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);                  numArray[make_tuple(dataPoint,i,j,k,l)]=dataPointView(i,j,k,l);
670                }                }
671              }              }
672            }            }
# Line 678  Data::convertToNumArray() Line 681  Data::convertToNumArray()
681    return numArray;    return numArray;
682  }  }
683    
684  const  
685    const
686  boost::python::numeric::array  boost::python::numeric::array
687  Data::convertToNumArrayFromSampleNo(int sampleNo)  Data:: getValueOfDataPoint(int dataPointNo)
688  {  {
689    //    size_t length=0;
690    // Check a valid sample number has been supplied    int i, j, k, l;
   if (sampleNo >= getNumSamples()) {  
     throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");  
   }  
   
   //  
   // determine the number of data points per sample  
   int numDataPointsPerSample = getNumDataPointsPerSample();  
   
691    //    //
692    // determine the rank and shape of each data point    // determine the rank and shape of each data point
693    int dataPointRank = getDataPointRank();    int dataPointRank = getDataPointRank();
# Line 702  Data::convertToNumArrayFromSampleNo(int Line 698  Data::convertToNumArrayFromSampleNo(int
698    boost::python::numeric::array numArray(0.0);    boost::python::numeric::array numArray(0.0);
699    
700    //    //
701    // the rank of the returned numeric array will be the rank of    // the shape of the returned numeric array will be the same
702    // the data points, plus one. Where the rank of the array is n,    // as that of the data point
703    // the last n-1 dimensions will be equal to the shape of the    int arrayRank = dataPointRank;
704    // data points, whilst the first dimension will be equal to the    DataArrayView::ShapeType arrayShape = dataPointShape;
   // 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(numDataPointsPerSample);  
   for (int d=0; d<dataPointRank; d++) {  
      arrayShape.push_back(dataPointShape[d]);  
   }  
705    
706    //    //
707    // resize the numeric array to the shape just calculated    // resize the numeric array to the shape just calculated
708      if (arrayRank==0) {
709        numArray.resize(1);
710      }
711    if (arrayRank==1) {    if (arrayRank==1) {
712      numArray.resize(arrayShape[0]);      numArray.resize(arrayShape[0]);
713    }    }
# Line 729  Data::convertToNumArrayFromSampleNo(int Line 720  Data::convertToNumArrayFromSampleNo(int
720    if (arrayRank==4) {    if (arrayRank==4) {
721      numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);      numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
722    }    }
   if (arrayRank==5) {  
     numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);  
   }  
723    
724    //    if (getNumDataPointsPerSample()>0) {
725    // loop through each data point in turn, loading the values for that data point         int sampleNo = dataPointNo/getNumDataPointsPerSample();
726    // into the numeric array.         int dataPointNoInSample = dataPointNo - sampleNo * getNumDataPointsPerSample();
727    for (int dataPoint = 0; dataPoint < numDataPointsPerSample; dataPoint++) {         //
728      DataArrayView dataPointView = getDataPoint(sampleNo, dataPoint);         // Check a valid sample number has been supplied
729      if (dataPointRank==0) {         if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {
730        numArray[dataPoint]=dataPointView();             throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
731      }         }
732      if (dataPointRank==1) {                
733        for (int i=0; i<dataPointShape[0]; i++) {         //
734          numArray[dataPoint][i]=dataPointView(i);         // Check a valid data point number has been supplied
735        }         if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {
736      }             throw DataException("Error - Data::convertToNumArray: invalid dataPointNoInSample.");
737      if (dataPointRank==2) {         }
738        for (int i=0; i<dataPointShape[0]; i++) {         // TODO: global error handling
739          for (int j=0; j<dataPointShape[1]; j++) {         // create a view of the data if it is stored locally
740            numArray[dataPoint][i][j] = dataPointView(i,j);         DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);
741          }          
742        }         switch( dataPointRank ){
743      }              case 0 :
744      if (dataPointRank==3) {                  numArray[0] = dataPointView();
745        for (int i=0; i<dataPointShape[0]; i++) {                  break;
746          for (int j=0; j<dataPointShape[1]; j++) {              case 1 :        
747            for (int k=0; k<dataPointShape[2]; k++) {                  for( i=0; i<dataPointShape[0]; i++ )
748              numArray[dataPoint][i][j][k]=dataPointView(i,j,k);                      numArray[i]=dataPointView(i);
749            }                  break;
750          }              case 2 :        
751        }                  for( i=0; i<dataPointShape[0]; i++ )
752      }                      for( j=0; j<dataPointShape[1]; j++)
753      if (dataPointRank==4) {                          numArray[make_tuple(i,j)]=dataPointView(i,j);
754        for (int i=0; i<dataPointShape[0]; i++) {                  break;
755          for (int j=0; j<dataPointShape[1]; j++) {              case 3 :        
756            for (int k=0; k<dataPointShape[2]; k++) {                  for( i=0; i<dataPointShape[0]; i++ )
757              for (int l=0; l<dataPointShape[3]; l++) {                      for( j=0; j<dataPointShape[1]; j++ )
758                numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);                          for( k=0; k<dataPointShape[2]; k++)
759              }                              numArray[make_tuple(i,j,k)]=dataPointView(i,j,k);
760            }                  break;
761          }              case 4 :
762        }                  for( i=0; i<dataPointShape[0]; i++ )
763      }                      for( j=0; j<dataPointShape[1]; j++ )
764                            for( k=0; k<dataPointShape[2]; k++ )
765                                for( l=0; l<dataPointShape[3]; l++)
766                                    numArray[make_tuple(i,j,k,l)]=dataPointView(i,j,k,l);
767                    break;
768        }
769    }    }
   
770    //    //
771    // return the loaded array    // return the array
772    return numArray;    return numArray;
 }  
   
 const  
 boost::python::numeric::array  
 Data::convertToNumArrayFromDPNo(int procNo,  
                                 int sampleNo,  
                                                                 int dataPointNo)  
773    
774    }
775    void
776    Data::setValueOfDataPointToArray(int dataPointNo, const boost::python::numeric::array num_array)
777  {  {
778      size_t length=0;    if (isProtected()) {
779      int i, j, k, l, pos;          throw DataException("Error - attempt to update protected Data object.");
780      }
781      //
782      // check rank
783      if (num_array.getrank()<getDataPointRank())
784          throw DataException("Rank of numarray does not match Data object rank");
785    
786    //    //
787    // Check a valid sample number has been supplied    // check shape of num_array
788    if (sampleNo >= getNumSamples()) {    for (int i=0; i<getDataPointRank(); i++) {
789      throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");      if (extract<int>(num_array.getshape()[i])!=getDataPointShape()[i])
790           throw DataException("Shape of numarray does not match Data object rank");
791      }
792      //
793      // make sure data is expanded:
794      if (!isExpanded()) {
795        expand();
796      }
797      if (getNumDataPointsPerSample()>0) {
798           int sampleNo = dataPointNo/getNumDataPointsPerSample();
799           int dataPointNoInSample = dataPointNo - sampleNo * getNumDataPointsPerSample();
800           m_data->copyToDataPoint(sampleNo, dataPointNoInSample,num_array);
801      } else {
802           m_data->copyToDataPoint(-1, 0,num_array);
803    }    }
804    }
805    
806    void
807    Data::setValueOfDataPoint(int dataPointNo, const double value)
808    {
809      if (isProtected()) {
810            throw DataException("Error - attempt to update protected Data object.");
811      }
812    //    //
813    // Check a valid data point number has been supplied    // make sure data is expanded:
814    if (dataPointNo >= getNumDataPointsPerSample()) {    if (!isExpanded()) {
815      throw DataException("Error - Data::convertToNumArray: invalid dataPointNo.");      expand();
816      }
817      if (getNumDataPointsPerSample()>0) {
818           int sampleNo = dataPointNo/getNumDataPointsPerSample();
819           int dataPointNoInSample = dataPointNo - sampleNo * getNumDataPointsPerSample();
820           m_data->copyToDataPoint(sampleNo, dataPointNoInSample,value);
821      } else {
822           m_data->copyToDataPoint(-1, 0,value);
823    }    }
824    }
825    
826    const
827    boost::python::numeric::array
828    Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)
829    {
830      size_t length=0;
831      int i, j, k, l, pos;
832    //    //
833    // determine the rank and shape of each data point    // determine the rank and shape of each data point
834    int dataPointRank = getDataPointRank();    int dataPointRank = getDataPointRank();
# Line 835  Data::convertToNumArrayFromDPNo(int proc Line 862  Data::convertToNumArrayFromDPNo(int proc
862      numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);      numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
863    }    }
864    
865      // added for the MPI communication    // added for the MPI communication
866      length=1;    length=1;
867      for( i=0; i<arrayRank; i++ )    for( i=0; i<arrayRank; i++ ) length *= arrayShape[i];
868          length *= arrayShape[i];    double *tmpData = new double[length];
     double *tmpData = new double[length];  
869    
870    //    //
871    // load the values for the data point into the numeric array.    // load the values for the data point into the numeric array.
872    
873      // updated for the MPI case      // updated for the MPI case
874      if( get_MPIRank()==procNo ){      if( get_MPIRank()==procNo ){
875                 if (getNumDataPointsPerSample()>0) {
876                    int sampleNo = dataPointNo/getNumDataPointsPerSample();
877                    int dataPointNoInSample = dataPointNo - sampleNo * getNumDataPointsPerSample();
878                    //
879                    // Check a valid sample number has been supplied
880                    if ((sampleNo >= getNumSamples()) || (sampleNo < 0 )) {
881                      throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
882                    }
883                  
884                    //
885                    // Check a valid data point number has been supplied
886                    if ((dataPointNoInSample >= getNumDataPointsPerSample()) || (dataPointNoInSample < 0)) {
887                      throw DataException("Error - Data::convertToNumArray: invalid dataPointNoInSample.");
888                    }
889                    // TODO: global error handling
890          // create a view of the data if it is stored locally          // create a view of the data if it is stored locally
891          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNoInSample);
892                    
893          // pack the data from the view into tmpData for MPI communication          // pack the data from the view into tmpData for MPI communication
894          pos=0;          pos=0;
# Line 878  Data::convertToNumArrayFromDPNo(int proc Line 919  Data::convertToNumArrayFromDPNo(int proc
919                                  tmpData[pos]=dataPointView(i,j,k,l);                                  tmpData[pos]=dataPointView(i,j,k,l);
920                  break;                  break;
921          }          }
922                }
923      }      }
924  #ifdef PASO_MPI          #ifdef PASO_MPI
925          // broadcast the data to all other processes          // broadcast the data to all other processes
926          MPI_Bcast( tmpData, length, MPI_DOUBLE, procNo, get_MPIComm() );      MPI_Bcast( tmpData, length, MPI_DOUBLE, procNo, get_MPIComm() );
927  #endif          #endif
928    
929      // unpack the data      // unpack the data
930      switch( dataPointRank ){      switch( dataPointRank ){
931          case 0 :          case 0 :
932              numArray[i]=tmpData[0];              numArray[0]=tmpData[0];
933              break;              break;
934          case 1 :                  case 1 :        
935              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
# Line 896  Data::convertToNumArrayFromDPNo(int proc Line 938  Data::convertToNumArrayFromDPNo(int proc
938          case 2 :                  case 2 :        
939              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
940                  for( j=0; j<dataPointShape[1]; j++ )                  for( j=0; j<dataPointShape[1]; j++ )
941                      tmpData[i+j*dataPointShape[0]];                     numArray[make_tuple(i,j)]=tmpData[i+j*dataPointShape[0]];
942              break;              break;
943          case 3 :                  case 3 :        
944              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
945                  for( j=0; j<dataPointShape[1]; j++ )                  for( j=0; j<dataPointShape[1]; j++ )
946                      for( k=0; k<dataPointShape[2]; k++ )                      for( k=0; k<dataPointShape[2]; k++ )
947                          tmpData[i+dataPointShape[0]*(j*+k*dataPointShape[1])];                          numArray[make_tuple(i,j,k)]=tmpData[i+dataPointShape[0]*(j*+k*dataPointShape[1])];
948              break;              break;
949          case 4 :          case 4 :
950              for( i=0; i<dataPointShape[0]; i++ )              for( i=0; i<dataPointShape[0]; i++ )
951                  for( j=0; j<dataPointShape[1]; j++ )                  for( j=0; j<dataPointShape[1]; j++ )
952                      for( k=0; k<dataPointShape[2]; k++ )                      for( k=0; k<dataPointShape[2]; k++ )
953                          for( l=0; l<dataPointShape[3]; l++ )                          for( l=0; l<dataPointShape[3]; l++ )
954                              tmpData[i+dataPointShape[0]*(j*+dataPointShape[1]*(k+l*dataPointShape[2]))];                                  numArray[make_tuple(i,j,k,l)]=tmpData[i+dataPointShape[0]*(j*+dataPointShape[1]*(k+l*dataPointShape[2]))];
955              break;              break;
956      }      }
957    
958      delete [] tmpData;        delete [] tmpData;  
 /*  
   if (dataPointRank==0) {  
     numArray[0]=dataPointView();  
   }  
   if (dataPointRank==1) {  
     for (int i=0; i<dataPointShape[0]; i++) {  
       numArray[i]=dataPointView(i);  
     }  
   }  
   if (dataPointRank==2) {  
     for (int i=0; i<dataPointShape[0]; i++) {  
       for (int j=0; j<dataPointShape[1]; j++) {  
         numArray[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[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[i][j][k][l]=dataPointView(i,j,k,l);  
           }  
         }  
       }  
     }  
   }  
 */  
   
959    //    //
960    // return the loaded array    // return the loaded array
961    return numArray;    return numArray;
962  }  }
963    
964    
965    
966  boost::python::numeric::array  boost::python::numeric::array
967  Data::integrate() const  Data::integrate() const
968  {  {
# Line 1073  Data::acos() const Line 1079  Data::acos() const
1079    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::acos);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::acos);
1080  }  }
1081    
1082    
1083  Data  Data
1084  Data::atan() const  Data::atan() const
1085  {  {
# Line 1109  Data::tanh() const Line 1116  Data::tanh() const
1116    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tanh);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tanh);
1117  }  }
1118    
1119    
1120    Data
1121    Data::erf() const
1122    {
1123    #if defined DOPROF
1124      profData->unary++;
1125    #endif
1126    #ifdef _WIN32
1127      throw DataException("Error - Data:: erf function is not supported on _WIN32 platforms.");
1128    #else
1129      return escript::unaryOp(*this,(Data::UnaryDFunPtr)::erf);
1130    #endif
1131    }
1132    
1133  Data  Data
1134  Data::asinh() const  Data::asinh() const
1135  {  {
# Line 1316  Data::minval() const Line 1337  Data::minval() const
1337  }  }
1338    
1339  Data  Data
1340  Data::trace() const  Data::swapaxes(const int axis0, const int axis1) const
1341  {  {
1342  #if defined DOPROF       int axis0_tmp,axis1_tmp;
1343    profData->reduction2++;       #if defined DOPROF
1344  #endif       profData->unary++;
1345    Trace trace_func;       #endif
1346    return dp_algorithm(trace_func,0);       DataArrayView::ShapeType s=getDataPointShape();
1347         DataArrayView::ShapeType ev_shape;
1348         // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]
1349         // which goes thru all shape vector elements starting with axis_offset (at index=rank wrap around to 0)
1350         int rank=getDataPointRank();
1351         if (rank<2) {
1352            throw DataException("Error - Data::swapaxes argument must have at least rank 2.");
1353         }
1354         if (axis0<0 || axis0>rank-1) {
1355            throw DataException("Error - Data::swapaxes: axis0 must be between 0 and rank-1=" + rank-1);
1356         }
1357         if (axis1<0 || axis1>rank-1) {
1358             throw DataException("Error - Data::swapaxes: axis1 must be between 0 and rank-1=" + rank-1);
1359         }
1360         if (axis0 == axis1) {
1361             throw DataException("Error - Data::swapaxes: axis indices must be different.");
1362         }
1363         if (axis0 > axis1) {
1364             axis0_tmp=axis1;
1365             axis1_tmp=axis0;
1366         } else {
1367             axis0_tmp=axis0;
1368             axis1_tmp=axis1;
1369         }
1370         for (int i=0; i<rank; i++) {
1371           if (i == axis0_tmp) {
1372              ev_shape.push_back(s[axis1_tmp]);
1373           } else if (i == axis1_tmp) {
1374              ev_shape.push_back(s[axis0_tmp]);
1375           } else {
1376              ev_shape.push_back(s[i]);
1377           }
1378         }
1379         Data ev(0.,ev_shape,getFunctionSpace());
1380         ev.typeMatchRight(*this);
1381         m_data->swapaxes(ev.m_data.get(), axis0_tmp, axis1_tmp);
1382         return ev;
1383    
1384  }  }
1385    
1386  Data  Data
# Line 1388  Data::nonsymmetric() const Line 1446  Data::nonsymmetric() const
1446  }  }
1447    
1448  Data  Data
1449  Data::matrixtrace(int axis_offset) const  Data::trace(int axis_offset) const
1450  {  {
1451       #if defined DOPROF       #if defined DOPROF
1452          profData->unary++;          profData->unary++;
# Line 1398  Data::matrixtrace(int axis_offset) const Line 1456  Data::matrixtrace(int axis_offset) const
1456          DataArrayView::ShapeType ev_shape;          DataArrayView::ShapeType ev_shape;
1457          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1458          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1459          m_data->matrixtrace(ev.m_data.get(), axis_offset);          m_data->trace(ev.m_data.get(), axis_offset);
1460          return ev;          return ev;
1461       }       }
1462       if (getDataPointRank()==3) {       if (getDataPointRank()==3) {
# Line 1413  Data::matrixtrace(int axis_offset) const Line 1471  Data::matrixtrace(int axis_offset) const
1471          }          }
1472          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1473          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1474          m_data->matrixtrace(ev.m_data.get(), axis_offset);          m_data->trace(ev.m_data.get(), axis_offset);
1475          return ev;          return ev;
1476       }       }
1477       if (getDataPointRank()==4) {       if (getDataPointRank()==4) {
# Line 1432  Data::matrixtrace(int axis_offset) const Line 1490  Data::matrixtrace(int axis_offset) const
1490      }      }
1491          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1492          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1493      m_data->matrixtrace(ev.m_data.get(), axis_offset);      m_data->trace(ev.m_data.get(), axis_offset);
1494          return ev;          return ev;
1495       }       }
1496       else {       else {
1497          throw DataException("Error - Data::matrixtrace can only be calculated for rank 2, 3 or 4 object.");          throw DataException("Error - Data::trace can only be calculated for rank 2, 3 or 4 object.");
1498       }       }
1499  }  }
1500    
1501  Data  Data
1502  Data::transpose(int axis_offset) const  Data::transpose(int axis_offset) const
1503  {  {
1504  #if defined DOPROF       #if defined DOPROF
1505       profData->reduction2++;       profData->unary++;
1506  #endif       #endif
1507       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1508       DataArrayView::ShapeType ev_shape;       DataArrayView::ShapeType ev_shape;
1509       // 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 1507  Data::eigenvalues_and_eigenvectors(const Line 1565  Data::eigenvalues_and_eigenvectors(const
1565  }  }
1566    
1567  const boost::python::tuple  const boost::python::tuple
1568  Data::mindp() const  Data::minGlobalDataPoint() const
1569  {  {
1570    // NB: calc_mindp had to be split off from mindp as boost::make_tuple causes an    // NB: calc_minGlobalDataPoint( had to be split off from minGlobalDataPoint( as boost::make_tuple causes an
1571    // abort (for unknown reasons) if there are openmp directives with it in the    // abort (for unknown reasons) if there are openmp directives with it in the
1572    // surrounding function    // surrounding function
1573    
   int SampleNo;  
1574    int DataPointNo;    int DataPointNo;
1575      int ProcNo;    int ProcNo;
1576    calc_mindp(ProcNo,SampleNo,DataPointNo);    calc_minGlobalDataPoint(ProcNo,DataPointNo);
1577    return make_tuple(ProcNo,SampleNo,DataPointNo);    return make_tuple(ProcNo,DataPointNo);
1578  }  }
1579    
1580  void  void
1581  Data::calc_mindp(   int& ProcNo,  Data::calc_minGlobalDataPoint(int& ProcNo,
1582                  int& SampleNo,                          int& DataPointNo) const
         int& DataPointNo) const  
1583  {  {
1584    int i,j;    int i,j;
1585    int lowi=0,lowj=0;    int lowi=0,lowj=0;
# Line 1581  Data::calc_mindp(  int& ProcNo, Line 1637  Data::calc_mindp(  int& ProcNo,
1637  #else  #else
1638      ProcNo = 0;      ProcNo = 0;
1639  #endif  #endif
1640    SampleNo = lowi;    DataPointNo = lowj + lowi * numDPPSample;
   DataPointNo = lowj;  
1641  }  }
1642    
1643  void  void
# Line 1609  Data::operator+=(const Data& right) Line 1664  Data::operator+=(const Data& right)
1664    if (isProtected()) {    if (isProtected()) {
1665          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1666    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1667    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1668    return (*this);    return (*this);
1669  }  }
# Line 1619  Data::operator+=(const Data& right) Line 1671  Data::operator+=(const Data& right)
1671  Data&  Data&
1672  Data::operator+=(const boost::python::object& right)  Data::operator+=(const boost::python::object& right)
1673  {  {
1674    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1675          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,plus<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,plus<double>());  
1676    return (*this);    return (*this);
1677  }  }
1678    
# Line 1635  Data::operator-=(const Data& right) Line 1682  Data::operator-=(const Data& right)
1682    if (isProtected()) {    if (isProtected()) {
1683          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1684    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1685    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1686    return (*this);    return (*this);
1687  }  }
# Line 1645  Data::operator-=(const Data& right) Line 1689  Data::operator-=(const Data& right)
1689  Data&  Data&
1690  Data::operator-=(const boost::python::object& right)  Data::operator-=(const boost::python::object& right)
1691  {  {
1692    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1693          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,minus<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,minus<double>());  
1694    return (*this);    return (*this);
1695  }  }
1696    
# Line 1661  Data::operator*=(const Data& right) Line 1700  Data::operator*=(const Data& right)
1700    if (isProtected()) {    if (isProtected()) {
1701          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1702    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1703    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1704    return (*this);    return (*this);
1705  }  }
# Line 1671  Data::operator*=(const Data& right) Line 1707  Data::operator*=(const Data& right)
1707  Data&  Data&
1708  Data::operator*=(const boost::python::object& right)  Data::operator*=(const boost::python::object& right)
1709  {  {
1710    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1711          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,multiplies<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,multiplies<double>());  
1712    return (*this);    return (*this);
1713  }  }
1714    
# Line 1687  Data::operator/=(const Data& right) Line 1718  Data::operator/=(const Data& right)
1718    if (isProtected()) {    if (isProtected()) {
1719          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1720    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1721    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1722    return (*this);    return (*this);
1723  }  }
# Line 1697  Data::operator/=(const Data& right) Line 1725  Data::operator/=(const Data& right)
1725  Data&  Data&
1726  Data::operator/=(const boost::python::object& right)  Data::operator/=(const boost::python::object& right)
1727  {  {
1728    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1729          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,divides<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,divides<double>());  
1730    return (*this);    return (*this);
1731  }  }
1732    
1733  Data  Data
1734  Data::rpowO(const boost::python::object& left) const  Data::rpowO(const boost::python::object& left) const
1735  {  {
   if (isProtected()) {  
         throw DataException("Error - attempt to update protected Data object.");  
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1736    Data left_d(left,*this);    Data left_d(left,*this);
1737    return left_d.powD(*this);    return left_d.powD(*this);
1738  }  }
# Line 1723  Data::rpowO(const boost::python::object& Line 1740  Data::rpowO(const boost::python::object&
1740  Data  Data
1741  Data::powO(const boost::python::object& right) const  Data::powO(const boost::python::object& right) const
1742  {  {
1743  #if defined DOPROF    Data tmp(right,getFunctionSpace(),false);
1744    profData->binary++;    return powD(tmp);
 #endif  
   Data result;  
   result.copy(*this);  
   result.binaryOp(right,(Data::BinaryDFunPtr)::pow);  
   return result;  
1745  }  }
1746    
1747  Data  Data
1748  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1749  {  {
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1750    Data result;    Data result;
1751    result.copy(*this);    if (getDataPointRank()<right.getDataPointRank()) {
1752    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);       result.copy(right);
1753         result.binaryOp(*this,escript::rpow);
1754      } else {
1755         result.copy(*this);
1756         result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
1757      }
1758    return result;    return result;
1759  }  }
1760    
# Line 1753  escript::operator+(const Data& left, con Line 1767  escript::operator+(const Data& left, con
1767    Data result;    Data result;
1768    //    //
1769    // perform a deep copy    // perform a deep copy
1770    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1771    result+=right;       result.copy(right);
1772         result+=left;
1773      } else {
1774         result.copy(left);
1775         result+=right;
1776      }
1777    return result;    return result;
1778  }  }
1779    
# Line 1766  escript::operator-(const Data& left, con Line 1785  escript::operator-(const Data& left, con
1785    Data result;    Data result;
1786    //    //
1787    // perform a deep copy    // perform a deep copy
1788    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1789    result-=right;       result=right.neg();
1790         result+=left;
1791      } else {
1792         result.copy(left);
1793         result-=right;
1794      }
1795    return result;    return result;
1796  }  }
1797    
# Line 1779  escript::operator*(const Data& left, con Line 1803  escript::operator*(const Data& left, con
1803    Data result;    Data result;
1804    //    //
1805    // perform a deep copy    // perform a deep copy
1806    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1807    result*=right;       result.copy(right);
1808         result*=left;
1809      } else {
1810         result.copy(left);
1811         result*=right;
1812      }
1813    return result;    return result;
1814  }  }
1815    
# Line 1792  escript::operator/(const Data& left, con Line 1821  escript::operator/(const Data& left, con
1821    Data result;    Data result;
1822    //    //
1823    // perform a deep copy    // perform a deep copy
1824    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1825    result/=right;       result=right.oneOver();
1826         result*=left;
1827      } else {
1828         result.copy(left);
1829         result/=right;
1830      }
1831    return result;    return result;
1832  }  }
1833    
# Line 1802  escript::operator/(const Data& left, con Line 1836  escript::operator/(const Data& left, con
1836  Data  Data
1837  escript::operator+(const Data& left, const boost::python::object& right)  escript::operator+(const Data& left, const boost::python::object& right)
1838  {  {
1839    //    return left+Data(right,left.getFunctionSpace(),false);
   // Convert to DataArray format if possible  
   DataArray temp(right);  
   Data result;  
   //  
   // perform a deep copy  
   result.copy(left);  
   result+=right;  
   return result;  
1840  }  }
1841    
1842  //  //
# Line 1818  escript::operator+(const Data& left, con Line 1844  escript::operator+(const Data& left, con
1844  Data  Data
1845  escript::operator-(const Data& left, const boost::python::object& right)  escript::operator-(const Data& left, const boost::python::object& right)
1846  {  {
1847    //    return left-Data(right,left.getFunctionSpace(),false);
   // Convert to DataArray format if possible  
   DataArray temp(right);  
   Data result;  
   //  
   // perform a deep copy  
   result.copy(left);  
   result-=right;  
   return result;  
1848  }  }
1849    
1850  //  //
# Line 1834  escript::operator-(const Data& left, con Line 1852  escript::operator-(const Data& left, con
1852  Data  Data
1853  escript::operator*(const Data& left, const boost::python::object& right)  escript::operator*(const Data& left, const boost::python::object& right)
1854  {  {
1855    //    return left*Data(right,left.getFunctionSpace(),false);
   // Convert to DataArray format if possible  
   DataArray temp(right);  
   Data result;  
   //  
   // perform a deep copy  
   result.copy(left);  
   result*=right;  
   return result;  
1856  }  }
1857    
1858  //  //
# Line 1850  escript::operator*(const Data& left, con Line 1860  escript::operator*(const Data& left, con
1860  Data  Data
1861  escript::operator/(const Data& left, const boost::python::object& right)  escript::operator/(const Data& left, const boost::python::object& right)
1862  {  {
1863    //    return left/Data(right,left.getFunctionSpace(),false);
   // Convert to DataArray format if possible  
   DataArray temp(right);  
   Data result;  
   //  
   // perform a deep copy  
   result.copy(left);  
   result/=right;  
   return result;  
1864  }  }
1865    
1866  //  //
# Line 1866  escript::operator/(const Data& left, con Line 1868  escript::operator/(const Data& left, con
1868  Data  Data
1869  escript::operator+(const boost::python::object& left, const Data& right)  escript::operator+(const boost::python::object& left, const Data& right)
1870  {  {
1871    //    return Data(left,right.getFunctionSpace(),false)+right;
   // Construct the result using the given value and the other parameters  
   // from right  
   Data result(left,right);  
   result+=right;  
   return result;  
1872  }  }
1873    
1874  //  //
# Line 1879  escript::operator+(const boost::python:: Line 1876  escript::operator+(const boost::python::
1876  Data  Data
1877  escript::operator-(const boost::python::object& left, const Data& right)  escript::operator-(const boost::python::object& left, const Data& right)
1878  {  {
1879    //    return Data(left,right.getFunctionSpace(),false)-right;
   // Construct the result using the given value and the other parameters  
   // from right  
   Data result(left,right);  
   result-=right;  
   return result;  
1880  }  }
1881    
1882  //  //
# Line 1892  escript::operator-(const boost::python:: Line 1884  escript::operator-(const boost::python::
1884  Data  Data
1885  escript::operator*(const boost::python::object& left, const Data& right)  escript::operator*(const boost::python::object& left, const Data& right)
1886  {  {
1887    //    return Data(left,right.getFunctionSpace(),false)*right;
   // Construct the result using the given value and the other parameters  
   // from right  
   Data result(left,right);  
   result*=right;  
   return result;  
1888  }  }
1889    
1890  //  //
# Line 1905  escript::operator*(const boost::python:: Line 1892  escript::operator*(const boost::python::
1892  Data  Data
1893  escript::operator/(const boost::python::object& left, const Data& right)  escript::operator/(const boost::python::object& left, const Data& right)
1894  {  {
1895    //    return Data(left,right.getFunctionSpace(),false)/right;
   // Construct the result using the given value and the other parameters  
   // from right  
   Data result(left,right);  
   result/=right;  
   return result;  
1896  }  }
1897    
1898  //  //
# Line 2116  Data::getTagNumber(int dpno) Line 2098  Data::getTagNumber(int dpno)
2098    return m_data->getTagNumber(dpno);    return m_data->getTagNumber(dpno);
2099  }  }
2100    
 /* TODO */  
 /* global reduction */  
 void  
 Data::setRefValue(int ref,  
                   const boost::python::numeric::array& value)  
 {  
   if (isProtected()) {  
         throw DataException("Error - attempt to update protected Data object.");  
   }  
   //  
   // Construct DataArray from boost::python::object input value  
   DataArray valueDataArray(value);  
   
   //  
   // Call DataAbstract::setRefValue  
   m_data->setRefValue(ref,valueDataArray);  
 }  
   
 /* TODO */  
 /* global reduction */  
 void  
 Data::getRefValue(int ref,  
                   boost::python::numeric::array& value)  
 {  
   //  
   // Construct DataArray for boost::python::object return value  
   DataArray valueDataArray(value);  
   
   //  
   // Load DataArray with values from data-points specified by ref  
   m_data->getRefValue(ref,valueDataArray);  
   
   //  
   // Load values from valueDataArray into return numarray  
   
   // extract the shape of the numarray  
   int rank = value.getrank();  
   DataArrayView::ShapeType shape;  
   for (int i=0; i < rank; i++) {  
     shape.push_back(extract<int>(value.getshape()[i]));  
   }  
   
   // and load the numarray with the data from the DataArray  
   DataArrayView valueView = valueDataArray.getView();  
   
   if (rank==0) {  
       boost::python::numeric::array temp_numArray(valueView());  
       value = temp_numArray;  
   }  
   if (rank==1) {  
     for (int i=0; i < shape[0]; i++) {  
       value[i] = valueView(i);  
     }  
   }  
   if (rank==2) {  
     for (int i=0; i < shape[0]; i++) {  
       for (int j=0; j < shape[1]; j++) {  
         value[i][j] = valueView(i,j);  
       }  
     }  
   }  
   if (rank==3) {  
     for (int i=0; i < shape[0]; i++) {  
       for (int j=0; j < shape[1]; j++) {  
         for (int k=0; k < shape[2]; k++) {  
           value[i][j][k] = valueView(i,j,k);  
         }  
       }  
     }  
   }  
   if (rank==4) {  
     for (int i=0; i < shape[0]; i++) {  
       for (int j=0; j < shape[1]; j++) {  
         for (int k=0; k < shape[2]; k++) {  
           for (int l=0; l < shape[3]; l++) {  
             value[i][j][k][l] = valueView(i,j,k,l);  
           }  
         }  
       }  
     }  
   }  
   
 }  
   
2101  void  void
2102  Data::archiveData(const std::string fileName)  Data::archiveData(const std::string fileName)
2103  {  {
# Line 2241  Data::archiveData(const std::string file Line 2139  Data::archiveData(const std::string file
2139    DataArrayView::ShapeType dataPointShape = getDataPointShape();    DataArrayView::ShapeType dataPointShape = getDataPointShape();
2140    vector<int> referenceNumbers(noSamples);    vector<int> referenceNumbers(noSamples);
2141    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
2142      referenceNumbers[sampleNo] = getFunctionSpace().getReferenceNoFromSampleNo(sampleNo);      referenceNumbers[sampleNo] = getFunctionSpace().getReferenceIDOfSample(sampleNo);
2143    }    }
2144    vector<int> tagNumbers(noSamples);    vector<int> tagNumbers(noSamples);
2145    if (isTagged()) {    if (isTagged()) {
# Line 2450  Data::extractData(const std::string file Line 2348  Data::extractData(const std::string file
2348      throw DataException("extractData Error: incompatible FunctionSpace");      throw DataException("extractData Error: incompatible FunctionSpace");
2349    }    }
2350    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
2351      if (referenceNumbers[sampleNo] != fspace.getReferenceNoFromSampleNo(sampleNo)) {      if (referenceNumbers[sampleNo] != fspace.getReferenceIDOfSample(sampleNo)) {
2352        throw DataException("extractData Error: incompatible FunctionSpace");        throw DataException("extractData Error: incompatible FunctionSpace");
2353      }      }
2354    }    }
# Line 2541  ostream& escript::operator<<(ostream& o, Line 2439  ostream& escript::operator<<(ostream& o,
2439    return o;    return o;
2440  }  }
2441    
2442    Data
2443    escript::C_GeneralTensorProduct(Data& arg_0,
2444                         Data& arg_1,
2445                         int axis_offset,
2446                         int transpose)
2447    {
2448      // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)
2449      // SM is the product of the last axis_offset entries in arg_0.getShape().
2450    
2451      #if defined DOPROF
2452        // profData->binary++;
2453      #endif
2454    
2455      // Interpolate if necessary and find an appropriate function space
2456      Data arg_0_Z, arg_1_Z;
2457      if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
2458        if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {
2459          arg_0_Z = arg_0.interpolate(arg_1.getFunctionSpace());
2460          arg_1_Z = Data(arg_1);
2461        }
2462        else if (arg_1.probeInterpolation(arg_0.getFunctionSpace())) {
2463          arg_1_Z=arg_1.interpolate(arg_0.getFunctionSpace());
2464          arg_0_Z =Data(arg_0);
2465        }
2466        else {
2467          throw DataException("Error - C_GeneralTensorProduct: arguments have incompatible function spaces.");
2468        }
2469      } else {
2470          arg_0_Z = Data(arg_0);
2471          arg_1_Z = Data(arg_1);
2472      }
2473      // Get rank and shape of inputs
2474      int rank0 = arg_0_Z.getDataPointRank();
2475      int rank1 = arg_1_Z.getDataPointRank();
2476      DataArrayView::ShapeType shape0 = arg_0_Z.getDataPointShape();
2477      DataArrayView::ShapeType shape1 = arg_1_Z.getDataPointShape();
2478    
2479      // Prepare for the loops of the product and verify compatibility of shapes
2480      int start0=0, start1=0;
2481      if (transpose == 0)       {}
2482      else if (transpose == 1)  { start0 = axis_offset; }
2483      else if (transpose == 2)  { start1 = rank1-axis_offset; }
2484      else              { throw DataException("C_GeneralTensorProduct: Error - transpose should be 0, 1 or 2"); }
2485    
2486      // Adjust the shapes for transpose
2487      DataArrayView::ShapeType tmpShape0;
2488      DataArrayView::ShapeType tmpShape1;
2489      for (int i=0; i<rank0; i++)   { tmpShape0.push_back( shape0[(i+start0)%rank0] ); }
2490      for (int i=0; i<rank1; i++)   { tmpShape1.push_back( shape1[(i+start1)%rank1] ); }
2491    
2492    #if 0
2493      // For debugging: show shape after transpose
2494      char tmp[100];
2495      std::string shapeStr;
2496      shapeStr = "(";
2497      for (int i=0; i<rank0; i++)   { sprintf(tmp, "%d,", tmpShape0[i]); shapeStr += tmp; }
2498      shapeStr += ")";
2499      cout << "C_GeneralTensorProduct: Shape of arg0 is " << shapeStr << endl;
2500      shapeStr = "(";
2501      for (int i=0; i<rank1; i++)   { sprintf(tmp, "%d,", tmpShape1[i]); shapeStr += tmp; }
2502      shapeStr += ")";
2503      cout << "C_GeneralTensorProduct: Shape of arg1 is " << shapeStr << endl;
2504    #endif
2505    
2506      // Prepare for the loops of the product
2507      int SL=1, SM=1, SR=1;
2508      for (int i=0; i<rank0-axis_offset; i++)   {
2509        SL *= tmpShape0[i];
2510      }
2511      for (int i=rank0-axis_offset; i<rank0; i++)   {
2512        if (tmpShape0[i] != tmpShape1[i-(rank0-axis_offset)]) {
2513          throw DataException("C_GeneralTensorProduct: Error - incompatible shapes");
2514        }
2515        SM *= tmpShape0[i];
2516      }
2517      for (int i=axis_offset; i<rank1; i++)     {
2518        SR *= tmpShape1[i];
2519      }
2520    
2521      // Define the shape of the output
2522      DataArrayView::ShapeType shape2;
2523      for (int i=0; i<rank0-axis_offset; i++) { shape2.push_back(tmpShape0[i]); } // First part of arg_0_Z
2524      for (int i=axis_offset; i<rank1; i++)   { shape2.push_back(tmpShape1[i]); } // Last part of arg_1_Z
2525    
2526      // Declare output Data object
2527      Data res;
2528    
2529      if      (arg_0_Z.isConstant()   && arg_1_Z.isConstant()) {
2530        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());    // DataConstant output
2531        double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[0]);
2532        double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[0]);
2533        double *ptr_2 = &((res.getPointDataView().getData())[0]);
2534        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2535      }
2536      else if (arg_0_Z.isConstant()   && arg_1_Z.isTagged()) {
2537    
2538        // Prepare the DataConstant input
2539        DataConstant* tmp_0=dynamic_cast<DataConstant*>(arg_0_Z.borrowData());
2540        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2541    
2542        // Borrow DataTagged input from Data object
2543        DataTagged* tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2544        if (tmp_1==0) { throw DataException("GTP_1 Programming error - casting to DataTagged."); }
2545    
2546        // Prepare a DataTagged output 2
2547        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());    // DataTagged output
2548        res.tag();
2549        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2550        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2551    
2552        // Prepare offset into DataConstant
2553        int offset_0 = tmp_0->getPointOffset(0,0);
2554        double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2555        // Get the views
2556        DataArrayView view_1 = tmp_1->getDefaultValue();
2557        DataArrayView view_2 = tmp_2->getDefaultValue();
2558        // Get the pointers to the actual data
2559        double *ptr_1 = &((view_1.getData())[0]);
2560        double *ptr_2 = &((view_2.getData())[0]);
2561        // Compute an MVP for the default
2562        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2563        // Compute an MVP for each tag
2564        const DataTagged::DataMapType& lookup_1=tmp_1->getTagLookup();
2565        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2566        for (i=lookup_1.begin();i!=lookup_1.end();i++) {
2567          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2568          DataArrayView view_1 = tmp_1->getDataPointByTag(i->first);
2569          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2570          double *ptr_1 = &view_1.getData(0);
2571          double *ptr_2 = &view_2.getData(0);
2572          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2573        }
2574    
2575      }
2576      else if (arg_0_Z.isConstant()   && arg_1_Z.isExpanded()) {
2577    
2578        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2579        DataConstant* tmp_0=dynamic_cast<DataConstant*>(arg_0_Z.borrowData());
2580        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2581        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2582        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2583        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2584        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2585        int sampleNo_1,dataPointNo_1;
2586        int numSamples_1 = arg_1_Z.getNumSamples();
2587        int numDataPointsPerSample_1 = arg_1_Z.getNumDataPointsPerSample();
2588        int offset_0 = tmp_0->getPointOffset(0,0);
2589        #pragma omp parallel for private(sampleNo_1,dataPointNo_1) schedule(static)
2590        for (sampleNo_1 = 0; sampleNo_1 < numSamples_1; sampleNo_1++) {
2591          for (dataPointNo_1 = 0; dataPointNo_1 < numDataPointsPerSample_1; dataPointNo_1++) {
2592            int offset_1 = tmp_1->getPointOffset(sampleNo_1,dataPointNo_1);
2593            int offset_2 = tmp_2->getPointOffset(sampleNo_1,dataPointNo_1);
2594            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2595            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2596            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2597            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2598          }
2599        }
2600    
2601      }
2602      else if (arg_0_Z.isTagged()     && arg_1_Z.isConstant()) {
2603    
2604        // Borrow DataTagged input from Data object
2605        DataTagged* tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2606        if (tmp_0==0) { throw DataException("GTP_0 Programming error - casting to DataTagged."); }
2607    
2608        // Prepare the DataConstant input
2609        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());
2610        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2611    
2612        // Prepare a DataTagged output 2
2613        res = Data(0.0, shape2, arg_0_Z.getFunctionSpace());    // DataTagged output
2614        res.tag();
2615        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2616        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2617    
2618        // Prepare offset into DataConstant
2619        int offset_1 = tmp_1->getPointOffset(0,0);
2620        double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2621        // Get the views
2622        DataArrayView view_0 = tmp_0->getDefaultValue();
2623        DataArrayView view_2 = tmp_2->getDefaultValue();
2624        // Get the pointers to the actual data
2625        double *ptr_0 = &((view_0.getData())[0]);
2626        double *ptr_2 = &((view_2.getData())[0]);
2627        // Compute an MVP for the default
2628        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2629        // Compute an MVP for each tag
2630        const DataTagged::DataMapType& lookup_0=tmp_0->getTagLookup();
2631        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2632        for (i=lookup_0.begin();i!=lookup_0.end();i++) {
2633          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2634          DataArrayView view_0 = tmp_0->getDataPointByTag(i->first);
2635          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2636          double *ptr_0 = &view_0.getData(0);
2637          double *ptr_2 = &view_2.getData(0);
2638          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2639        }
2640    
2641      }
2642      else if (arg_0_Z.isTagged()     && arg_1_Z.isTagged()) {
2643    
2644        // Borrow DataTagged input from Data object
2645        DataTagged* tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2646        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2647    
2648        // Borrow DataTagged input from Data object
2649        DataTagged* tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2650        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2651    
2652        // Prepare a DataTagged output 2
2653        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());
2654        res.tag();  // DataTagged output
2655        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2656        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2657    
2658        // Get the views
2659        DataArrayView view_0 = tmp_0->getDefaultValue();
2660        DataArrayView view_1 = tmp_1->getDefaultValue();
2661        DataArrayView view_2 = tmp_2->getDefaultValue();
2662        // Get the pointers to the actual data
2663        double *ptr_0 = &((view_0.getData())[0]);
2664        double *ptr_1 = &((view_1.getData())[0]);
2665        double *ptr_2 = &((view_2.getData())[0]);
2666        // Compute an MVP for the default
2667        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2668        // Merge the tags
2669        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2670        const DataTagged::DataMapType& lookup_0=tmp_0->getTagLookup();
2671        const DataTagged::DataMapType& lookup_1=tmp_1->getTagLookup();
2672        for (i=lookup_0.begin();i!=lookup_0.end();i++) {
2673          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue()); // use tmp_2 to get correct shape
2674        }
2675        for (i=lookup_1.begin();i!=lookup_1.end();i++) {
2676          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2677        }
2678        // Compute an MVP for each tag
2679        const DataTagged::DataMapType& lookup_2=tmp_2->getTagLookup();
2680        for (i=lookup_2.begin();i!=lookup_2.end();i++) {
2681          DataArrayView view_0 = tmp_0->getDataPointByTag(i->first);
2682          DataArrayView view_1 = tmp_1->getDataPointByTag(i->first);
2683          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2684          double *ptr_0 = &view_0.getData(0);
2685          double *ptr_1 = &view_1.getData(0);
2686          double *ptr_2 = &view_2.getData(0);
2687          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2688        }
2689    
2690      }
2691      else if (arg_0_Z.isTagged()     && arg_1_Z.isExpanded()) {
2692    
2693        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2694        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2695        DataTagged*   tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2696        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2697        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2698        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2699        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2700        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2701        int sampleNo_0,dataPointNo_0;
2702        int numSamples_0 = arg_0_Z.getNumSamples();
2703        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2704        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2705        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2706          int offset_0 = tmp_0->getPointOffset(sampleNo_0,0); // They're all the same, so just use #0
2707          double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2708          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2709            int offset_1 = tmp_1->getPointOffset(sampleNo_0,dataPointNo_0);
2710            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2711            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2712            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2713            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2714          }
2715        }
2716    
2717      }
2718      else if (arg_0_Z.isExpanded()   && arg_1_Z.isConstant()) {
2719    
2720        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2721        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2722        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());
2723        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2724        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2725        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2726        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2727        int sampleNo_0,dataPointNo_0;
2728        int numSamples_0 = arg_0_Z.getNumSamples();
2729        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2730        int offset_1 = tmp_1->getPointOffset(0,0);
2731        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2732        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2733          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2734            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2735            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2736            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2737            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2738            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2739            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2740          }
2741        }
2742    
2743    
2744      }
2745      else if (arg_0_Z.isExpanded()   && arg_1_Z.isTagged()) {
2746    
2747        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2748        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2749        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2750        DataTagged*   tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2751        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2752        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2753        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2754        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2755        int sampleNo_0,dataPointNo_0;
2756        int numSamples_0 = arg_0_Z.getNumSamples();
2757        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2758        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2759        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2760          int offset_1 = tmp_1->getPointOffset(sampleNo_0,0);
2761          double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2762          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2763            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2764            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2765            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2766            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2767            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2768          }
2769        }
2770    
2771      }
2772      else if (arg_0_Z.isExpanded()   && arg_1_Z.isExpanded()) {
2773    
2774        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2775        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2776        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2777        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2778        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2779        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2780        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2781        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2782        int sampleNo_0,dataPointNo_0;
2783        int numSamples_0 = arg_0_Z.getNumSamples();
2784        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2785        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2786        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2787          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2788            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2789            int offset_1 = tmp_1->getPointOffset(sampleNo_0,dataPointNo_0);
2790            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2791            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2792            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2793            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2794            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2795          }
2796        }
2797    
2798      }
2799      else {
2800        throw DataException("Error - C_GeneralTensorProduct: unknown combination of inputs");
2801      }
2802    
2803      return res;
2804    }
2805    
2806    DataAbstract*
2807    Data::borrowData() const
2808    {
2809      return m_data.get();
2810    }
2811    
2812  /* Member functions specific to the MPI implementation */  /* Member functions specific to the MPI implementation */
2813    
2814  void  void

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

  ViewVC Help
Powered by ViewVC 1.1.26