/[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 964 by gross, Tue Feb 13 05:10:26 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 1029  Data::integrate() const Line 1035  Data::integrate() const
1035  }  }
1036    
1037  Data  Data
1038    Data::erf() const
1039    {
1040    #if defined DOPROF
1041      profData->unary++;
1042    #endif
1043      return escript::unaryOp(*this,(Data::UnaryDFunPtr)::erf);
1044    }
1045    
1046    Data
1047  Data::sin() const  Data::sin() const
1048  {  {
1049  #if defined DOPROF  #if defined DOPROF
# Line 1316  Data::minval() const Line 1331  Data::minval() const
1331  }  }
1332    
1333  Data  Data
1334  Data::trace() const  Data::swapaxes(const int axis0, const int axis1) const
1335  {  {
1336  #if defined DOPROF       int axis0_tmp,axis1_tmp;
1337    profData->reduction2++;       #if defined DOPROF
1338  #endif       profData->unary++;
1339    Trace trace_func;       #endif
1340    return dp_algorithm(trace_func,0);       DataArrayView::ShapeType s=getDataPointShape();
1341         DataArrayView::ShapeType ev_shape;
1342         // Here's the equivalent of python s_out=s[axis_offset:]+s[:axis_offset]
1343         // which goes thru all shape vector elements starting with axis_offset (at index=rank wrap around to 0)
1344         int rank=getDataPointRank();
1345         if (rank<2) {
1346            throw DataException("Error - Data::swapaxes argument must have at least rank 2.");
1347         }
1348         if (axis0<0 || axis0>rank-1) {
1349            throw DataException("Error - Data::swapaxes: axis0 must be between 0 and rank-1=" + rank-1);
1350         }
1351         if (axis1<0 || axis1>rank-1) {
1352             throw DataException("Error - Data::swapaxes: axis1 must be between 0 and rank-1=" + rank-1);
1353         }
1354         if (axis0 == axis1) {
1355             throw DataException("Error - Data::swapaxes: axis indices must be different.");
1356         }
1357         if (axis0 > axis1) {
1358             axis0_tmp=axis1;
1359             axis1_tmp=axis0;
1360         } else {
1361             axis0_tmp=axis0;
1362             axis1_tmp=axis1;
1363         }
1364         for (int i=0; i<rank; i++) {
1365           if (i == axis0_tmp) {
1366              ev_shape.push_back(s[axis1_tmp]);
1367           } else if (i == axis1_tmp) {
1368              ev_shape.push_back(s[axis0_tmp]);
1369           } else {
1370              ev_shape.push_back(s[i]);
1371           }
1372         }
1373         Data ev(0.,ev_shape,getFunctionSpace());
1374         ev.typeMatchRight(*this);
1375         m_data->swapaxes(ev.m_data.get(), axis0_tmp, axis1_tmp);
1376         return ev;
1377    
1378  }  }
1379    
1380  Data  Data
# Line 1388  Data::nonsymmetric() const Line 1440  Data::nonsymmetric() const
1440  }  }
1441    
1442  Data  Data
1443  Data::matrixtrace(int axis_offset) const  Data::trace(int axis_offset) const
1444  {  {
1445       #if defined DOPROF       #if defined DOPROF
1446          profData->unary++;          profData->unary++;
# Line 1398  Data::matrixtrace(int axis_offset) const Line 1450  Data::matrixtrace(int axis_offset) const
1450          DataArrayView::ShapeType ev_shape;          DataArrayView::ShapeType ev_shape;
1451          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1452          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1453          m_data->matrixtrace(ev.m_data.get(), axis_offset);          m_data->trace(ev.m_data.get(), axis_offset);
1454          return ev;          return ev;
1455       }       }
1456       if (getDataPointRank()==3) {       if (getDataPointRank()==3) {
# Line 1413  Data::matrixtrace(int axis_offset) const Line 1465  Data::matrixtrace(int axis_offset) const
1465          }          }
1466          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1467          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1468          m_data->matrixtrace(ev.m_data.get(), axis_offset);          m_data->trace(ev.m_data.get(), axis_offset);
1469          return ev;          return ev;
1470       }       }
1471       if (getDataPointRank()==4) {       if (getDataPointRank()==4) {
# Line 1432  Data::matrixtrace(int axis_offset) const Line 1484  Data::matrixtrace(int axis_offset) const
1484      }      }
1485          Data ev(0.,ev_shape,getFunctionSpace());          Data ev(0.,ev_shape,getFunctionSpace());
1486          ev.typeMatchRight(*this);          ev.typeMatchRight(*this);
1487      m_data->matrixtrace(ev.m_data.get(), axis_offset);      m_data->trace(ev.m_data.get(), axis_offset);
1488          return ev;          return ev;
1489       }       }
1490       else {       else {
1491          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.");
1492       }       }
1493  }  }
1494    
1495  Data  Data
1496  Data::transpose(int axis_offset) const  Data::transpose(int axis_offset) const
1497  {  {
1498  #if defined DOPROF       #if defined DOPROF
1499       profData->reduction2++;       profData->unary++;
1500  #endif       #endif
1501       DataArrayView::ShapeType s=getDataPointShape();       DataArrayView::ShapeType s=getDataPointShape();
1502       DataArrayView::ShapeType ev_shape;       DataArrayView::ShapeType ev_shape;
1503       // 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 1559  Data::eigenvalues_and_eigenvectors(const
1559  }  }
1560    
1561  const boost::python::tuple  const boost::python::tuple
1562  Data::mindp() const  Data::minGlobalDataPoint() const
1563  {  {
1564    // 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
1565    // 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
1566    // surrounding function    // surrounding function
1567    
   int SampleNo;  
1568    int DataPointNo;    int DataPointNo;
1569      int ProcNo;    int ProcNo;
1570    calc_mindp(ProcNo,SampleNo,DataPointNo);    calc_minGlobalDataPoint(ProcNo,DataPointNo);
1571    return make_tuple(ProcNo,SampleNo,DataPointNo);    return make_tuple(ProcNo,DataPointNo);
1572  }  }
1573    
1574  void  void
1575  Data::calc_mindp(   int& ProcNo,  Data::calc_minGlobalDataPoint(int& ProcNo,
1576                  int& SampleNo,                          int& DataPointNo) const
         int& DataPointNo) const  
1577  {  {
1578    int i,j;    int i,j;
1579    int lowi=0,lowj=0;    int lowi=0,lowj=0;
# Line 1581  Data::calc_mindp(  int& ProcNo, Line 1631  Data::calc_mindp(  int& ProcNo,
1631  #else  #else
1632      ProcNo = 0;      ProcNo = 0;
1633  #endif  #endif
1634    SampleNo = lowi;    DataPointNo = lowj + lowi * numDPPSample;
   DataPointNo = lowj;  
1635  }  }
1636    
1637  void  void
# Line 1609  Data::operator+=(const Data& right) Line 1658  Data::operator+=(const Data& right)
1658    if (isProtected()) {    if (isProtected()) {
1659          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1660    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1661    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1662    return (*this);    return (*this);
1663  }  }
# Line 1619  Data::operator+=(const Data& right) Line 1665  Data::operator+=(const Data& right)
1665  Data&  Data&
1666  Data::operator+=(const boost::python::object& right)  Data::operator+=(const boost::python::object& right)
1667  {  {
1668    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1669          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,plus<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,plus<double>());  
1670    return (*this);    return (*this);
1671  }  }
1672    
# Line 1635  Data::operator-=(const Data& right) Line 1676  Data::operator-=(const Data& right)
1676    if (isProtected()) {    if (isProtected()) {
1677          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1678    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1679    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1680    return (*this);    return (*this);
1681  }  }
# Line 1645  Data::operator-=(const Data& right) Line 1683  Data::operator-=(const Data& right)
1683  Data&  Data&
1684  Data::operator-=(const boost::python::object& right)  Data::operator-=(const boost::python::object& right)
1685  {  {
1686    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1687          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,minus<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,minus<double>());  
1688    return (*this);    return (*this);
1689  }  }
1690    
# Line 1661  Data::operator*=(const Data& right) Line 1694  Data::operator*=(const Data& right)
1694    if (isProtected()) {    if (isProtected()) {
1695          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1696    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1697    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1698    return (*this);    return (*this);
1699  }  }
# Line 1671  Data::operator*=(const Data& right) Line 1701  Data::operator*=(const Data& right)
1701  Data&  Data&
1702  Data::operator*=(const boost::python::object& right)  Data::operator*=(const boost::python::object& right)
1703  {  {
1704    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1705          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,multiplies<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,multiplies<double>());  
1706    return (*this);    return (*this);
1707  }  }
1708    
# Line 1687  Data::operator/=(const Data& right) Line 1712  Data::operator/=(const Data& right)
1712    if (isProtected()) {    if (isProtected()) {
1713          throw DataException("Error - attempt to update protected Data object.");          throw DataException("Error - attempt to update protected Data object.");
1714    }    }
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1715    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1716    return (*this);    return (*this);
1717  }  }
# Line 1697  Data::operator/=(const Data& right) Line 1719  Data::operator/=(const Data& right)
1719  Data&  Data&
1720  Data::operator/=(const boost::python::object& right)  Data::operator/=(const boost::python::object& right)
1721  {  {
1722    if (isProtected()) {    Data tmp(right,getFunctionSpace(),false);
1723          throw DataException("Error - attempt to update protected Data object.");    binaryOp(tmp,divides<double>());
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
   binaryOp(right,divides<double>());  
1724    return (*this);    return (*this);
1725  }  }
1726    
1727  Data  Data
1728  Data::rpowO(const boost::python::object& left) const  Data::rpowO(const boost::python::object& left) const
1729  {  {
   if (isProtected()) {  
         throw DataException("Error - attempt to update protected Data object.");  
   }  
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1730    Data left_d(left,*this);    Data left_d(left,*this);
1731    return left_d.powD(*this);    return left_d.powD(*this);
1732  }  }
# Line 1723  Data::rpowO(const boost::python::object& Line 1734  Data::rpowO(const boost::python::object&
1734  Data  Data
1735  Data::powO(const boost::python::object& right) const  Data::powO(const boost::python::object& right) const
1736  {  {
1737  #if defined DOPROF    Data tmp(right,getFunctionSpace(),false);
1738    profData->binary++;    return powD(tmp);
 #endif  
   Data result;  
   result.copy(*this);  
   result.binaryOp(right,(Data::BinaryDFunPtr)::pow);  
   return result;  
1739  }  }
1740    
1741  Data  Data
1742  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1743  {  {
 #if defined DOPROF  
   profData->binary++;  
 #endif  
1744    Data result;    Data result;
1745    result.copy(*this);    if (getDataPointRank()<right.getDataPointRank()) {
1746    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);       result.copy(right);
1747         result.binaryOp(*this,escript::rpow);
1748      } else {
1749         result.copy(*this);
1750         result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
1751      }
1752    return result;    return result;
1753  }  }
1754    
# Line 1753  escript::operator+(const Data& left, con Line 1761  escript::operator+(const Data& left, con
1761    Data result;    Data result;
1762    //    //
1763    // perform a deep copy    // perform a deep copy
1764    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1765    result+=right;       result.copy(right);
1766         result+=left;
1767      } else {
1768         result.copy(left);
1769         result+=right;
1770      }
1771    return result;    return result;
1772  }  }
1773    
# Line 1766  escript::operator-(const Data& left, con Line 1779  escript::operator-(const Data& left, con
1779    Data result;    Data result;
1780    //    //
1781    // perform a deep copy    // perform a deep copy
1782    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1783    result-=right;       result=right.neg();
1784         result+=left;
1785      } else {
1786         result.copy(left);
1787         result-=right;
1788      }
1789    return result;    return result;
1790  }  }
1791    
# Line 1779  escript::operator*(const Data& left, con Line 1797  escript::operator*(const Data& left, con
1797    Data result;    Data result;
1798    //    //
1799    // perform a deep copy    // perform a deep copy
1800    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1801    result*=right;       result.copy(right);
1802         result*=left;
1803      } else {
1804         result.copy(left);
1805         result*=right;
1806      }
1807    return result;    return result;
1808  }  }
1809    
# Line 1792  escript::operator/(const Data& left, con Line 1815  escript::operator/(const Data& left, con
1815    Data result;    Data result;
1816    //    //
1817    // perform a deep copy    // perform a deep copy
1818    result.copy(left);    if (left.getDataPointRank()<right.getDataPointRank()) {
1819    result/=right;       result=right.oneOver();
1820         result*=left;
1821      } else {
1822         result.copy(left);
1823         result/=right;
1824      }
1825    return result;    return result;
1826  }  }
1827    
# Line 1802  escript::operator/(const Data& left, con Line 1830  escript::operator/(const Data& left, con
1830  Data  Data
1831  escript::operator+(const Data& left, const boost::python::object& right)  escript::operator+(const Data& left, const boost::python::object& right)
1832  {  {
1833    //    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;  
1834  }  }
1835    
1836  //  //
# Line 1818  escript::operator+(const Data& left, con Line 1838  escript::operator+(const Data& left, con
1838  Data  Data
1839  escript::operator-(const Data& left, const boost::python::object& right)  escript::operator-(const Data& left, const boost::python::object& right)
1840  {  {
1841    //    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;  
1842  }  }
1843    
1844  //  //
# Line 1834  escript::operator-(const Data& left, con Line 1846  escript::operator-(const Data& left, con
1846  Data  Data
1847  escript::operator*(const Data& left, const boost::python::object& right)  escript::operator*(const Data& left, const boost::python::object& right)
1848  {  {
1849    //    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;  
1850  }  }
1851    
1852  //  //
# Line 1850  escript::operator*(const Data& left, con Line 1854  escript::operator*(const Data& left, con
1854  Data  Data
1855  escript::operator/(const Data& left, const boost::python::object& right)  escript::operator/(const Data& left, const boost::python::object& right)
1856  {  {
1857    //    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;  
1858  }  }
1859    
1860  //  //
# Line 1866  escript::operator/(const Data& left, con Line 1862  escript::operator/(const Data& left, con
1862  Data  Data
1863  escript::operator+(const boost::python::object& left, const Data& right)  escript::operator+(const boost::python::object& left, const Data& right)
1864  {  {
1865    //    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;  
1866  }  }
1867    
1868  //  //
# Line 1879  escript::operator+(const boost::python:: Line 1870  escript::operator+(const boost::python::
1870  Data  Data
1871  escript::operator-(const boost::python::object& left, const Data& right)  escript::operator-(const boost::python::object& left, const Data& right)
1872  {  {
1873    //    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;  
1874  }  }
1875    
1876  //  //
# Line 1892  escript::operator-(const boost::python:: Line 1878  escript::operator-(const boost::python::
1878  Data  Data
1879  escript::operator*(const boost::python::object& left, const Data& right)  escript::operator*(const boost::python::object& left, const Data& right)
1880  {  {
1881    //    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;  
1882  }  }
1883    
1884  //  //
# Line 1905  escript::operator*(const boost::python:: Line 1886  escript::operator*(const boost::python::
1886  Data  Data
1887  escript::operator/(const boost::python::object& left, const Data& right)  escript::operator/(const boost::python::object& left, const Data& right)
1888  {  {
1889    //    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;  
1890  }  }
1891    
1892  //  //
# Line 2116  Data::getTagNumber(int dpno) Line 2092  Data::getTagNumber(int dpno)
2092    return m_data->getTagNumber(dpno);    return m_data->getTagNumber(dpno);
2093  }  }
2094    
 /* 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);  
           }  
         }  
       }  
     }  
   }  
   
 }  
   
2095  void  void
2096  Data::archiveData(const std::string fileName)  Data::archiveData(const std::string fileName)
2097  {  {
# Line 2241  Data::archiveData(const std::string file Line 2133  Data::archiveData(const std::string file
2133    DataArrayView::ShapeType dataPointShape = getDataPointShape();    DataArrayView::ShapeType dataPointShape = getDataPointShape();
2134    vector<int> referenceNumbers(noSamples);    vector<int> referenceNumbers(noSamples);
2135    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
2136      referenceNumbers[sampleNo] = getFunctionSpace().getReferenceNoFromSampleNo(sampleNo);      referenceNumbers[sampleNo] = getFunctionSpace().getReferenceIDOfSample(sampleNo);
2137    }    }
2138    vector<int> tagNumbers(noSamples);    vector<int> tagNumbers(noSamples);
2139    if (isTagged()) {    if (isTagged()) {
# Line 2450  Data::extractData(const std::string file Line 2342  Data::extractData(const std::string file
2342      throw DataException("extractData Error: incompatible FunctionSpace");      throw DataException("extractData Error: incompatible FunctionSpace");
2343    }    }
2344    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {    for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
2345      if (referenceNumbers[sampleNo] != fspace.getReferenceNoFromSampleNo(sampleNo)) {      if (referenceNumbers[sampleNo] != fspace.getReferenceIDOfSample(sampleNo)) {
2346        throw DataException("extractData Error: incompatible FunctionSpace");        throw DataException("extractData Error: incompatible FunctionSpace");
2347      }      }
2348    }    }
# Line 2541  ostream& escript::operator<<(ostream& o, Line 2433  ostream& escript::operator<<(ostream& o,
2433    return o;    return o;
2434  }  }
2435    
2436    Data
2437    escript::C_GeneralTensorProduct(Data& arg_0,
2438                         Data& arg_1,
2439                         int axis_offset,
2440                         int transpose)
2441    {
2442      // General tensor product: res(SL x SR) = arg_0(SL x SM) * arg_1(SM x SR)
2443      // SM is the product of the last axis_offset entries in arg_0.getShape().
2444    
2445      #if defined DOPROF
2446        // profData->binary++;
2447      #endif
2448    
2449      // Interpolate if necessary and find an appropriate function space
2450      Data arg_0_Z, arg_1_Z;
2451      if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
2452        if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {
2453          arg_0_Z = arg_0.interpolate(arg_1.getFunctionSpace());
2454          arg_1_Z = Data(arg_1);
2455        }
2456        else if (arg_1.probeInterpolation(arg_0.getFunctionSpace())) {
2457          arg_1_Z=arg_1.interpolate(arg_0.getFunctionSpace());
2458          arg_0_Z =Data(arg_0);
2459        }
2460        else {
2461          throw DataException("Error - C_GeneralTensorProduct: arguments have incompatible function spaces.");
2462        }
2463      } else {
2464          arg_0_Z = Data(arg_0);
2465          arg_1_Z = Data(arg_1);
2466      }
2467      // Get rank and shape of inputs
2468      int rank0 = arg_0_Z.getDataPointRank();
2469      int rank1 = arg_1_Z.getDataPointRank();
2470      DataArrayView::ShapeType shape0 = arg_0_Z.getDataPointShape();
2471      DataArrayView::ShapeType shape1 = arg_1_Z.getDataPointShape();
2472    
2473      // Prepare for the loops of the product and verify compatibility of shapes
2474      int start0=0, start1=0;
2475      if (transpose == 0)       {}
2476      else if (transpose == 1)  { start0 = axis_offset; }
2477      else if (transpose == 2)  { start1 = rank1-axis_offset; }
2478      else              { throw DataException("C_GeneralTensorProduct: Error - transpose should be 0, 1 or 2"); }
2479    
2480      // Adjust the shapes for transpose
2481      DataArrayView::ShapeType tmpShape0;
2482      DataArrayView::ShapeType tmpShape1;
2483      for (int i=0; i<rank0; i++)   { tmpShape0.push_back( shape0[(i+start0)%rank0] ); }
2484      for (int i=0; i<rank1; i++)   { tmpShape1.push_back( shape1[(i+start1)%rank1] ); }
2485    
2486    #if 0
2487      // For debugging: show shape after transpose
2488      char tmp[100];
2489      std::string shapeStr;
2490      shapeStr = "(";
2491      for (int i=0; i<rank0; i++)   { sprintf(tmp, "%d,", tmpShape0[i]); shapeStr += tmp; }
2492      shapeStr += ")";
2493      cout << "C_GeneralTensorProduct: Shape of arg0 is " << shapeStr << endl;
2494      shapeStr = "(";
2495      for (int i=0; i<rank1; i++)   { sprintf(tmp, "%d,", tmpShape1[i]); shapeStr += tmp; }
2496      shapeStr += ")";
2497      cout << "C_GeneralTensorProduct: Shape of arg1 is " << shapeStr << endl;
2498    #endif
2499    
2500      // Prepare for the loops of the product
2501      int SL=1, SM=1, SR=1;
2502      for (int i=0; i<rank0-axis_offset; i++)   {
2503        SL *= tmpShape0[i];
2504      }
2505      for (int i=rank0-axis_offset; i<rank0; i++)   {
2506        if (tmpShape0[i] != tmpShape1[i-(rank0-axis_offset)]) {
2507          throw DataException("C_GeneralTensorProduct: Error - incompatible shapes");
2508        }
2509        SM *= tmpShape0[i];
2510      }
2511      for (int i=axis_offset; i<rank1; i++)     {
2512        SR *= tmpShape1[i];
2513      }
2514    
2515      // Define the shape of the output
2516      DataArrayView::ShapeType shape2;
2517      for (int i=0; i<rank0-axis_offset; i++) { shape2.push_back(tmpShape0[i]); } // First part of arg_0_Z
2518      for (int i=axis_offset; i<rank1; i++)   { shape2.push_back(tmpShape1[i]); } // Last part of arg_1_Z
2519    
2520      // Declare output Data object
2521      Data res;
2522    
2523      if      (arg_0_Z.isConstant()   && arg_1_Z.isConstant()) {
2524        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());    // DataConstant output
2525        double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[0]);
2526        double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[0]);
2527        double *ptr_2 = &((res.getPointDataView().getData())[0]);
2528        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2529      }
2530      else if (arg_0_Z.isConstant()   && arg_1_Z.isTagged()) {
2531    
2532        // Prepare the DataConstant input
2533        DataConstant* tmp_0=dynamic_cast<DataConstant*>(arg_0_Z.borrowData());
2534        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2535    
2536        // Borrow DataTagged input from Data object
2537        DataTagged* tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2538        if (tmp_1==0) { throw DataException("GTP_1 Programming error - casting to DataTagged."); }
2539    
2540        // Prepare a DataTagged output 2
2541        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());    // DataTagged output
2542        res.tag();
2543        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2544        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2545    
2546        // Prepare offset into DataConstant
2547        int offset_0 = tmp_0->getPointOffset(0,0);
2548        double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2549        // Get the views
2550        DataArrayView view_1 = tmp_1->getDefaultValue();
2551        DataArrayView view_2 = tmp_2->getDefaultValue();
2552        // Get the pointers to the actual data
2553        double *ptr_1 = &((view_1.getData())[0]);
2554        double *ptr_2 = &((view_2.getData())[0]);
2555        // Compute an MVP for the default
2556        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2557        // Compute an MVP for each tag
2558        const DataTagged::DataMapType& lookup_1=tmp_1->getTagLookup();
2559        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2560        for (i=lookup_1.begin();i!=lookup_1.end();i++) {
2561          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2562          DataArrayView view_1 = tmp_1->getDataPointByTag(i->first);
2563          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2564          double *ptr_1 = &view_1.getData(0);
2565          double *ptr_2 = &view_2.getData(0);
2566          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2567        }
2568    
2569      }
2570      else if (arg_0_Z.isConstant()   && arg_1_Z.isExpanded()) {
2571    
2572        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2573        DataConstant* tmp_0=dynamic_cast<DataConstant*>(arg_0_Z.borrowData());
2574        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2575        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2576        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2577        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2578        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2579        int sampleNo_1,dataPointNo_1;
2580        int numSamples_1 = arg_1_Z.getNumSamples();
2581        int numDataPointsPerSample_1 = arg_1_Z.getNumDataPointsPerSample();
2582        int offset_0 = tmp_0->getPointOffset(0,0);
2583        #pragma omp parallel for private(sampleNo_1,dataPointNo_1) schedule(static)
2584        for (sampleNo_1 = 0; sampleNo_1 < numSamples_1; sampleNo_1++) {
2585          for (dataPointNo_1 = 0; dataPointNo_1 < numDataPointsPerSample_1; dataPointNo_1++) {
2586            int offset_1 = tmp_1->getPointOffset(sampleNo_1,dataPointNo_1);
2587            int offset_2 = tmp_2->getPointOffset(sampleNo_1,dataPointNo_1);
2588            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2589            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2590            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2591            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2592          }
2593        }
2594    
2595      }
2596      else if (arg_0_Z.isTagged()     && arg_1_Z.isConstant()) {
2597    
2598        // Borrow DataTagged input from Data object
2599        DataTagged* tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2600        if (tmp_0==0) { throw DataException("GTP_0 Programming error - casting to DataTagged."); }
2601    
2602        // Prepare the DataConstant input
2603        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());
2604        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2605    
2606        // Prepare a DataTagged output 2
2607        res = Data(0.0, shape2, arg_0_Z.getFunctionSpace());    // DataTagged output
2608        res.tag();
2609        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2610        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2611    
2612        // Prepare offset into DataConstant
2613        int offset_1 = tmp_1->getPointOffset(0,0);
2614        double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2615        // Get the views
2616        DataArrayView view_0 = tmp_0->getDefaultValue();
2617        DataArrayView view_2 = tmp_2->getDefaultValue();
2618        // Get the pointers to the actual data
2619        double *ptr_0 = &((view_0.getData())[0]);
2620        double *ptr_2 = &((view_2.getData())[0]);
2621        // Compute an MVP for the default
2622        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2623        // Compute an MVP for each tag
2624        const DataTagged::DataMapType& lookup_0=tmp_0->getTagLookup();
2625        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2626        for (i=lookup_0.begin();i!=lookup_0.end();i++) {
2627          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2628          DataArrayView view_0 = tmp_0->getDataPointByTag(i->first);
2629          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2630          double *ptr_0 = &view_0.getData(0);
2631          double *ptr_2 = &view_2.getData(0);
2632          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2633        }
2634    
2635      }
2636      else if (arg_0_Z.isTagged()     && arg_1_Z.isTagged()) {
2637    
2638        // Borrow DataTagged input from Data object
2639        DataTagged* tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2640        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2641    
2642        // Borrow DataTagged input from Data object
2643        DataTagged* tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2644        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2645    
2646        // Prepare a DataTagged output 2
2647        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace());
2648        res.tag();  // DataTagged output
2649        DataTagged* tmp_2=dynamic_cast<DataTagged*>(res.borrowData());
2650        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2651    
2652        // Get the views
2653        DataArrayView view_0 = tmp_0->getDefaultValue();
2654        DataArrayView view_1 = tmp_1->getDefaultValue();
2655        DataArrayView view_2 = tmp_2->getDefaultValue();
2656        // Get the pointers to the actual data
2657        double *ptr_0 = &((view_0.getData())[0]);
2658        double *ptr_1 = &((view_1.getData())[0]);
2659        double *ptr_2 = &((view_2.getData())[0]);
2660        // Compute an MVP for the default
2661        matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2662        // Merge the tags
2663        DataTagged::DataMapType::const_iterator i; // i->first is a tag, i->second is an offset into memory
2664        const DataTagged::DataMapType& lookup_0=tmp_0->getTagLookup();
2665        const DataTagged::DataMapType& lookup_1=tmp_1->getTagLookup();
2666        for (i=lookup_0.begin();i!=lookup_0.end();i++) {
2667          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue()); // use tmp_2 to get correct shape
2668        }
2669        for (i=lookup_1.begin();i!=lookup_1.end();i++) {
2670          tmp_2->addTaggedValue(i->first,tmp_2->getDefaultValue());
2671        }
2672        // Compute an MVP for each tag
2673        const DataTagged::DataMapType& lookup_2=tmp_2->getTagLookup();
2674        for (i=lookup_2.begin();i!=lookup_2.end();i++) {
2675          DataArrayView view_0 = tmp_0->getDataPointByTag(i->first);
2676          DataArrayView view_1 = tmp_1->getDataPointByTag(i->first);
2677          DataArrayView view_2 = tmp_2->getDataPointByTag(i->first);
2678          double *ptr_0 = &view_0.getData(0);
2679          double *ptr_1 = &view_1.getData(0);
2680          double *ptr_2 = &view_2.getData(0);
2681          matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2682        }
2683    
2684      }
2685      else if (arg_0_Z.isTagged()     && arg_1_Z.isExpanded()) {
2686    
2687        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2688        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2689        DataTagged*   tmp_0=dynamic_cast<DataTagged*>(arg_0_Z.borrowData());
2690        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2691        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2692        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2693        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2694        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2695        int sampleNo_0,dataPointNo_0;
2696        int numSamples_0 = arg_0_Z.getNumSamples();
2697        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2698        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2699        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2700          int offset_0 = tmp_0->getPointOffset(sampleNo_0,0); // They're all the same, so just use #0
2701          double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2702          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2703            int offset_1 = tmp_1->getPointOffset(sampleNo_0,dataPointNo_0);
2704            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2705            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2706            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2707            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2708          }
2709        }
2710    
2711      }
2712      else if (arg_0_Z.isExpanded()   && arg_1_Z.isConstant()) {
2713    
2714        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2715        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2716        DataConstant* tmp_1=dynamic_cast<DataConstant*>(arg_1_Z.borrowData());
2717        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2718        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2719        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataConstant."); }
2720        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2721        int sampleNo_0,dataPointNo_0;
2722        int numSamples_0 = arg_0_Z.getNumSamples();
2723        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2724        int offset_1 = tmp_1->getPointOffset(0,0);
2725        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2726        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2727          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2728            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2729            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2730            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2731            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2732            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2733            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2734          }
2735        }
2736    
2737    
2738      }
2739      else if (arg_0_Z.isExpanded()   && arg_1_Z.isTagged()) {
2740    
2741        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2742        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2743        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2744        DataTagged*   tmp_1=dynamic_cast<DataTagged*>(arg_1_Z.borrowData());
2745        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2746        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2747        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataTagged."); }
2748        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2749        int sampleNo_0,dataPointNo_0;
2750        int numSamples_0 = arg_0_Z.getNumSamples();
2751        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2752        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2753        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2754          int offset_1 = tmp_1->getPointOffset(sampleNo_0,0);
2755          double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2756          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2757            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2758            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2759            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2760            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2761            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2762          }
2763        }
2764    
2765      }
2766      else if (arg_0_Z.isExpanded()   && arg_1_Z.isExpanded()) {
2767    
2768        // After finding a common function space above the two inputs have the same numSamples and num DPPS
2769        res = Data(0.0, shape2, arg_1_Z.getFunctionSpace(),true); // DataExpanded output
2770        DataExpanded* tmp_0=dynamic_cast<DataExpanded*>(arg_0_Z.borrowData());
2771        DataExpanded* tmp_1=dynamic_cast<DataExpanded*>(arg_1_Z.borrowData());
2772        DataExpanded* tmp_2=dynamic_cast<DataExpanded*>(res.borrowData());
2773        if (tmp_0==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2774        if (tmp_1==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2775        if (tmp_2==0) { throw DataException("GTP Programming error - casting to DataExpanded."); }
2776        int sampleNo_0,dataPointNo_0;
2777        int numSamples_0 = arg_0_Z.getNumSamples();
2778        int numDataPointsPerSample_0 = arg_0_Z.getNumDataPointsPerSample();
2779        #pragma omp parallel for private(sampleNo_0,dataPointNo_0) schedule(static)
2780        for (sampleNo_0 = 0; sampleNo_0 < numSamples_0; sampleNo_0++) {
2781          for (dataPointNo_0 = 0; dataPointNo_0 < numDataPointsPerSample_0; dataPointNo_0++) {
2782            int offset_0 = tmp_0->getPointOffset(sampleNo_0,dataPointNo_0);
2783            int offset_1 = tmp_1->getPointOffset(sampleNo_0,dataPointNo_0);
2784            int offset_2 = tmp_2->getPointOffset(sampleNo_0,dataPointNo_0);
2785            double *ptr_0 = &((arg_0_Z.getPointDataView().getData())[offset_0]);
2786            double *ptr_1 = &((arg_1_Z.getPointDataView().getData())[offset_1]);
2787            double *ptr_2 = &((res.getPointDataView().getData())[offset_2]);
2788            matrix_matrix_product(SL, SM, SR, ptr_0, ptr_1, ptr_2, transpose);
2789          }
2790        }
2791    
2792      }
2793      else {
2794        throw DataException("Error - C_GeneralTensorProduct: unknown combination of inputs");
2795      }
2796    
2797      return res;
2798    }
2799    
2800    DataAbstract*
2801    Data::borrowData() const
2802    {
2803      return m_data.get();
2804    }
2805    
2806  /* Member functions specific to the MPI implementation */  /* Member functions specific to the MPI implementation */
2807    
2808  void  void

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

  ViewVC Help
Powered by ViewVC 1.1.26