/[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 97 by jgs, Tue Dec 14 05:39:33 2004 UTC revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC
# Line 18  Line 18 
18  #include "escript/Data/Data.h"  #include "escript/Data/Data.h"
19    
20  #include <iostream>  #include <iostream>
21    #include <fstream>
22  #include <algorithm>  #include <algorithm>
23  #include <vector>  #include <vector>
24  #include <exception>  #include <exception>
# Line 29  Line 30 
30  #include <boost/python/long.hpp>  #include <boost/python/long.hpp>
31    
32  #include "escript/Data/DataException.h"  #include "escript/Data/DataException.h"
   
33  #include "escript/Data/DataExpanded.h"  #include "escript/Data/DataExpanded.h"
34  #include "escript/Data/DataConstant.h"  #include "escript/Data/DataConstant.h"
35  #include "escript/Data/DataTagged.h"  #include "escript/Data/DataTagged.h"
36  #include "escript/Data/DataEmpty.h"  #include "escript/Data/DataEmpty.h"
37  #include "escript/Data/DataArray.h"  #include "escript/Data/DataArray.h"
38  #include "escript/Data/DataAlgorithm.h"  #include "escript/Data/DataProf.h"
39  #include "escript/Data/FunctionSpaceFactory.h"  #include "escript/Data/FunctionSpaceFactory.h"
40  #include "escript/Data/AbstractContinuousDomain.h"  #include "escript/Data/AbstractContinuousDomain.h"
41  #include "escript/Data/UnaryFuncs.h"  #include "escript/Data/UnaryFuncs.h"
# Line 45  using namespace boost::python; Line 45  using namespace boost::python;
45  using namespace boost;  using namespace boost;
46  using namespace escript;  using namespace escript;
47    
48    //
49    // global table of profiling data for all Data objects
50    DataProf dataProfTable;
51    
52  Data::Data()  Data::Data()
53  {  {
54    //    //
# Line 52  Data::Data() Line 56  Data::Data()
56    DataAbstract* temp=new DataEmpty();    DataAbstract* temp=new DataEmpty();
57    shared_ptr<DataAbstract> temp_data(temp);    shared_ptr<DataAbstract> temp_data(temp);
58    m_data=temp_data;    m_data=temp_data;
59      // create entry in global profiling table for this object
60      profData = dataProfTable.newData();
61  }  }
62    
63  Data::Data(double value,  Data::Data(double value,
# Line 65  Data::Data(double value, Line 71  Data::Data(double value,
71    }    }
72    DataArray temp(dataPointShape,value);    DataArray temp(dataPointShape,value);
73    initialise(temp.getView(),what,expanded);    initialise(temp.getView(),what,expanded);
74      // create entry in global profiling table for this object
75      profData = dataProfTable.newData();
76  }  }
77    
78  Data::Data(double value,  Data::Data(double value,
# Line 75  Data::Data(double value, Line 83  Data::Data(double value,
83    DataArray temp(dataPointShape,value);    DataArray temp(dataPointShape,value);
84    pair<int,int> dataShape=what.getDataShape();    pair<int,int> dataShape=what.getDataShape();
85    initialise(temp.getView(),what,expanded);    initialise(temp.getView(),what,expanded);
86      // create entry in global profiling table for this object
87      profData = dataProfTable.newData();
88  }  }
89    
90  Data::Data(const Data& inData)  Data::Data(const Data& inData)
91  {  {
92    m_data=inData.m_data;    m_data=inData.m_data;
93      // create entry in global profiling table for this object
94      profData = dataProfTable.newData();
95  }  }
96    
97  Data::Data(const Data& inData,  Data::Data(const Data& inData,
# Line 90  Data::Data(const Data& inData, Line 102  Data::Data(const Data& inData,
102    DataAbstract* tmp = inData.m_data->getSlice(region);    DataAbstract* tmp = inData.m_data->getSlice(region);
103    shared_ptr<DataAbstract> temp_data(tmp);    shared_ptr<DataAbstract> temp_data(tmp);
104    m_data=temp_data;    m_data=temp_data;
105      // create entry in global profiling table for this object
106      profData = dataProfTable.newData();
107  }  }
108    
109  Data::Data(const Data& inData,  Data::Data(const Data& inData,
# Line 99  Data::Data(const Data& inData, Line 113  Data::Data(const Data& inData,
113      m_data=inData.m_data;      m_data=inData.m_data;
114    } else {    } else {
115      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);
116      // Note for Lutz, Must use a reference or pointer to a derived object      // Note: Must use a reference or pointer to a derived object
117      // in order to get polymorphic behaviour. Shouldn't really      // in order to get polymorphic behaviour. Shouldn't really
118      // be able to create an instance of AbstractDomain but that was done      // be able to create an instance of AbstractDomain but that was done
119      // as a boost python work around which may no longer be required.      // as a boost:python work around which may no longer be required.
120      const AbstractDomain& inDataDomain=inData.getDomain();      const AbstractDomain& inDataDomain=inData.getDomain();
121      if  (inDataDomain==functionspace.getDomain()) {      if  (inDataDomain==functionspace.getDomain()) {
122        inDataDomain.interpolateOnDomain(tmp,inData);        inDataDomain.interpolateOnDomain(tmp,inData);
# Line 111  Data::Data(const Data& inData, Line 125  Data::Data(const Data& inData,
125      }      }
126      m_data=tmp.m_data;      m_data=tmp.m_data;
127    }    }
128      // create entry in global profiling table for this object
129      profData = dataProfTable.newData();
130  }  }
131    
132  Data::Data(const DataTagged::TagListType& tagKeys,  Data::Data(const DataTagged::TagListType& tagKeys,
# Line 125  Data::Data(const DataTagged::TagListType Line 141  Data::Data(const DataTagged::TagListType
141    if (expanded) {    if (expanded) {
142      expand();      expand();
143    }    }
144      // create entry in global profiling table for this object
145      profData = dataProfTable.newData();
146  }  }
147    
148  Data::Data(const numeric::array& value,  Data::Data(const numeric::array& value,
# Line 132  Data::Data(const numeric::array& value, Line 150  Data::Data(const numeric::array& value,
150             bool expanded)             bool expanded)
151  {  {
152    initialise(value,what,expanded);    initialise(value,what,expanded);
153      // create entry in global profiling table for this object
154      profData = dataProfTable.newData();
155  }  }
156    
157  Data::Data(const DataArrayView& value,  Data::Data(const DataArrayView& value,
# Line 139  Data::Data(const DataArrayView& value, Line 159  Data::Data(const DataArrayView& value,
159             bool expanded)             bool expanded)
160  {  {
161    initialise(value,what,expanded);    initialise(value,what,expanded);
162      // create entry in global profiling table for this object
163      profData = dataProfTable.newData();
164  }  }
165    
166  Data::Data(const object& value,  Data::Data(const object& value,
# Line 147  Data::Data(const object& value, Line 169  Data::Data(const object& value,
169  {  {
170    numeric::array asNumArray(value);    numeric::array asNumArray(value);
171    initialise(asNumArray,what,expanded);    initialise(asNumArray,what,expanded);
172      // create entry in global profiling table for this object
173      profData = dataProfTable.newData();
174  }  }
175    
176  Data::Data(const object& value,  Data::Data(const object& value,
# Line 167  Data::Data(const object& value, Line 191  Data::Data(const object& value,
191      // Create a DataConstant with the same sample shape as other      // Create a DataConstant with the same sample shape as other
192      initialise(temp.getView(),other.getFunctionSpace(),false);      initialise(temp.getView(),other.getFunctionSpace(),false);
193    }    }
194      // create entry in global profiling table for this object
195      profData = dataProfTable.newData();
196  }  }
197    
198  escriptDataC  escriptDataC
# Line 185  Data::getDataC() const Line 211  Data::getDataC() const
211    return temp;    return temp;
212  }  }
213    
214  tuple  const boost::python::tuple
215  Data::getShapeTuple() const  Data::getShapeTuple() const
216  {  {
217    const DataArrayView::ShapeType& shape=getDataPointShape();    const DataArrayView::ShapeType& shape=getDataPointShape();
# Line 353  Data::reshapeDataPoint(const DataArrayVi Line 379  Data::reshapeDataPoint(const DataArrayVi
379  Data  Data
380  Data::wherePositive() const  Data::wherePositive() const
381  {  {
382      profData->where++;
383    return escript::unaryOp(*this,bind2nd(greater<double>(),0.0));    return escript::unaryOp(*this,bind2nd(greater<double>(),0.0));
384  }  }
385    
386  Data  Data
387  Data::whereNegative() const  Data::whereNegative() const
388  {  {
389      profData->where++;
390    return escript::unaryOp(*this,bind2nd(less<double>(),0.0));    return escript::unaryOp(*this,bind2nd(less<double>(),0.0));
391  }  }
392    
393  Data  Data
394  Data::whereNonNegative() const  Data::whereNonNegative() const
395  {  {
396      profData->where++;
397    return escript::unaryOp(*this,bind2nd(greater_equal<double>(),0.0));    return escript::unaryOp(*this,bind2nd(greater_equal<double>(),0.0));
398  }  }
399    
400  Data  Data
401  Data::whereNonPositive() const  Data::whereNonPositive() const
402  {  {
403      profData->where++;
404    return escript::unaryOp(*this,bind2nd(less_equal<double>(),0.0));    return escript::unaryOp(*this,bind2nd(less_equal<double>(),0.0));
405  }  }
406    
407  Data  Data
408  Data::whereZero() const  Data::whereZero() const
409  {  {
410      profData->where++;
411    return escript::unaryOp(*this,bind2nd(equal_to<double>(),0.0));    return escript::unaryOp(*this,bind2nd(equal_to<double>(),0.0));
412  }  }
413    
414  Data  Data
415  Data::whereNonZero() const  Data::whereNonZero() const
416  {  {
417      profData->where++;
418    return escript::unaryOp(*this,bind2nd(not_equal_to<double>(),0.0));    return escript::unaryOp(*this,bind2nd(not_equal_to<double>(),0.0));
419  }  }
420    
421  Data  Data
422  Data::interpolate(const FunctionSpace& functionspace) const  Data::interpolate(const FunctionSpace& functionspace) const
423  {  {
424      profData->interpolate++;
425    return Data(*this,functionspace);    return Data(*this,functionspace);
426  }  }
427    
# Line 410  Data::probeInterpolation(const FunctionS Line 443  Data::probeInterpolation(const FunctionS
443  Data  Data
444  Data::gradOn(const FunctionSpace& functionspace) const  Data::gradOn(const FunctionSpace& functionspace) const
445  {  {
446      profData->grad++;
447    if (functionspace.getDomain()!=getDomain())    if (functionspace.getDomain()!=getDomain())
448      throw DataException("Error - gradient cannot be calculated on different domains.");      throw DataException("Error - gradient cannot be calculated on different domains.");
449    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();    DataArrayView::ShapeType grad_shape=getPointDataView().getShape();
# Line 443  Data::getDataPointShape() const Line 477  Data::getDataPointShape() const
477    return getPointDataView().getShape();    return getPointDataView().getShape();
478  }  }
479    
480    void
481    Data::fillFromNumArray(const boost::python::numeric::array num_array)
482    {
483      //
484      // check rank:
485      if (num_array.getrank()<getDataPointRank())
486          throw DataException("Rank of numarray does not match Data object rank");
487      //
488      // check rank of num_array
489      for (int i=0; i<getDataPointRank(); i++) {
490        if (extract<int>(num_array.getshape()[i+1])!=getDataPointShape()[i])
491           throw DataException("Shape of numarray does not match Data object rank");
492      }
493      //
494      // make sure data is expanded:
495      if (! isExpanded()) expand();
496      //
497      // and copy over:
498      m_data->copyAll(num_array);
499      //
500      // the rank of the returned numeric array will be the rank of
501      // the data points, plus one. Where the rank of the array is n,
502      // the last n-1 dimensions will be equal to the shape of the
503      // data points, whilst the first dimension will be equal to the
504      // total number of data points. Thus the array will consist of
505      // a serial vector of the data points.
506      // int arrayRank = dataPointRank + 1;
507      // DataArrayView::ShapeType arrayShape;
508      // arrayShape.push_back(numDataPoints);
509      // for (int d=0; d<dataPointRank; d++) {
510      //    arrayShape.push_back(dataPointShape[d]);
511      // }
512    
513      //
514      // resize the numeric array to the shape just calculated
515      // if (arrayRank==1) {
516      //   numArray.resize(arrayShape[0]);
517      // }
518      // if (arrayRank==2) {
519      //   numArray.resize(arrayShape[0],arrayShape[1]);
520      // }
521      // if (arrayRank==3) {
522      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);
523      // }
524      // if (arrayRank==4) {
525      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
526      // }
527      // if (arrayRank==5) {
528      //   numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);
529      // }
530    
531      //
532      // loop through each data point in turn, loading the values for that data point
533      // into the numeric array.
534      // int dataPoint = 0;
535      // for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
536      //   for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
537      //     DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
538      //     if (dataPointRank==0) {
539      //       dataPointView()=numArray[dataPoint];
540      //     }
541      //     if (dataPointRank==1) {
542      //       for (int i=0; i<dataPointShape[0]; i++) {
543      //         dataPointView(i)=numArray[dataPoint][i];
544      //       }
545      //     }
546      //     if (dataPointRank==2) {
547      //       for (int i=0; i<dataPointShape[0]; i++) {
548      //         for (int j=0; j<dataPointShape[1]; j++) {
549      //           numArray[dataPoint][i][j] = dataPointView(i,j);
550      //         }
551      //       }
552      //     }
553      //     if (dataPointRank==3) {
554      //       for (int i=0; i<dataPointShape[0]; i++) {
555      //         for (int j=0; j<dataPointShape[1]; j++) {
556      //           for (int k=0; k<dataPointShape[2]; k++) {
557      //             numArray[dataPoint][i][j][k]=dataPointView(i,j,k);
558      //           }
559      //         }
560      //       }
561      //     }
562      //     if (dataPointRank==4) {
563      //       for (int i=0; i<dataPointShape[0]; i++) {
564      //         for (int j=0; j<dataPointShape[1]; j++) {
565      //           for (int k=0; k<dataPointShape[2]; k++) {
566      //             for (int l=0; l<dataPointShape[3]; l++) {
567      //               numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);
568      //             }
569      //           }
570      //         }
571      //       }
572      //     }
573      //     dataPoint++;
574      //   }
575      // }
576    
577      //
578      // return the loaded array
579      // return numArray;
580    
581    }
582    
583    const
584    boost::python::numeric::array
585    Data::convertToNumArray()
586    {
587      //
588      // determine the total number of data points
589      int numSamples = getNumSamples();
590      int numDataPointsPerSample = getNumDataPointsPerSample();
591      int numDataPoints = numSamples * numDataPointsPerSample;
592    
593      //
594      // determine the rank and shape of each data point
595      int dataPointRank = getDataPointRank();
596      DataArrayView::ShapeType dataPointShape = getDataPointShape();
597    
598      //
599      // create the numeric array to be returned
600      boost::python::numeric::array numArray(0.0);
601    
602      //
603      // the rank of the returned numeric array will be the rank of
604      // the data points, plus one. Where the rank of the array is n,
605      // the last n-1 dimensions will be equal to the shape of the
606      // data points, whilst the first dimension will be equal to the
607      // total number of data points. Thus the array will consist of
608      // a serial vector of the data points.
609      int arrayRank = dataPointRank + 1;
610      DataArrayView::ShapeType arrayShape;
611      arrayShape.push_back(numDataPoints);
612      for (int d=0; d<dataPointRank; d++) {
613         arrayShape.push_back(dataPointShape[d]);
614      }
615    
616      //
617      // resize the numeric array to the shape just calculated
618      if (arrayRank==1) {
619        numArray.resize(arrayShape[0]);
620      }
621      if (arrayRank==2) {
622        numArray.resize(arrayShape[0],arrayShape[1]);
623      }
624      if (arrayRank==3) {
625        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);
626      }
627      if (arrayRank==4) {
628        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
629      }
630      if (arrayRank==5) {
631        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);
632      }
633    
634      //
635      // loop through each data point in turn, loading the values for that data point
636      // into the numeric array.
637      int dataPoint = 0;
638      for (int sampleNo = 0; sampleNo < numSamples; sampleNo++) {
639        for (int dataPointNo = 0; dataPointNo < numDataPointsPerSample; dataPointNo++) {
640          DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
641          if (dataPointRank==0) {
642            numArray[dataPoint]=dataPointView();
643          }
644          if (dataPointRank==1) {
645            for (int i=0; i<dataPointShape[0]; i++) {
646              numArray[dataPoint][i]=dataPointView(i);
647            }
648          }
649          if (dataPointRank==2) {
650            for (int i=0; i<dataPointShape[0]; i++) {
651              for (int j=0; j<dataPointShape[1]; j++) {
652                numArray[dataPoint][i][j] = dataPointView(i,j);
653              }
654            }
655          }
656          if (dataPointRank==3) {
657            for (int i=0; i<dataPointShape[0]; i++) {
658              for (int j=0; j<dataPointShape[1]; j++) {
659                for (int k=0; k<dataPointShape[2]; k++) {
660                  numArray[dataPoint][i][j][k]=dataPointView(i,j,k);
661                }
662              }
663            }
664          }
665          if (dataPointRank==4) {
666            for (int i=0; i<dataPointShape[0]; i++) {
667              for (int j=0; j<dataPointShape[1]; j++) {
668                for (int k=0; k<dataPointShape[2]; k++) {
669                  for (int l=0; l<dataPointShape[3]; l++) {
670                    numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);
671                  }
672                }
673              }
674            }
675          }
676          dataPoint++;
677        }
678      }
679    
680      //
681      // return the loaded array
682      return numArray;
683    }
684    
685    const
686    boost::python::numeric::array
687    Data::convertToNumArrayFromSampleNo(int sampleNo)
688    {
689      //
690      // Check a valid sample number has been supplied
691      if (sampleNo >= getNumSamples()) {
692        throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
693      }
694    
695      //
696      // determine the number of data points per sample
697      int numDataPointsPerSample = getNumDataPointsPerSample();
698    
699      //
700      // determine the rank and shape of each data point
701      int dataPointRank = getDataPointRank();
702      DataArrayView::ShapeType dataPointShape = getDataPointShape();
703    
704      //
705      // create the numeric array to be returned
706      boost::python::numeric::array numArray(0.0);
707    
708      //
709      // the rank of the returned numeric array will be the rank of
710      // the data points, plus one. Where the rank of the array is n,
711      // the last n-1 dimensions will be equal to the shape of the
712      // data points, whilst the first dimension will be equal to the
713      // total number of data points. Thus the array will consist of
714      // a serial vector of the data points.
715      int arrayRank = dataPointRank + 1;
716      DataArrayView::ShapeType arrayShape;
717      arrayShape.push_back(numDataPointsPerSample);
718      for (int d=0; d<dataPointRank; d++) {
719         arrayShape.push_back(dataPointShape[d]);
720      }
721    
722      //
723      // resize the numeric array to the shape just calculated
724      if (arrayRank==1) {
725        numArray.resize(arrayShape[0]);
726      }
727      if (arrayRank==2) {
728        numArray.resize(arrayShape[0],arrayShape[1]);
729      }
730      if (arrayRank==3) {
731        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);
732      }
733      if (arrayRank==4) {
734        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
735      }
736      if (arrayRank==5) {
737        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3],arrayShape[4]);
738      }
739    
740      //
741      // loop through each data point in turn, loading the values for that data point
742      // into the numeric array.
743      for (int dataPoint = 0; dataPoint < numDataPointsPerSample; dataPoint++) {
744        DataArrayView dataPointView = getDataPoint(sampleNo, dataPoint);
745        if (dataPointRank==0) {
746          numArray[dataPoint]=dataPointView();
747        }
748        if (dataPointRank==1) {
749          for (int i=0; i<dataPointShape[0]; i++) {
750            numArray[dataPoint][i]=dataPointView(i);
751          }
752        }
753        if (dataPointRank==2) {
754          for (int i=0; i<dataPointShape[0]; i++) {
755            for (int j=0; j<dataPointShape[1]; j++) {
756              numArray[dataPoint][i][j] = dataPointView(i,j);
757            }
758          }
759        }
760        if (dataPointRank==3) {
761          for (int i=0; i<dataPointShape[0]; i++) {
762            for (int j=0; j<dataPointShape[1]; j++) {
763              for (int k=0; k<dataPointShape[2]; k++) {
764                numArray[dataPoint][i][j][k]=dataPointView(i,j,k);
765              }
766            }
767          }
768        }
769        if (dataPointRank==4) {
770          for (int i=0; i<dataPointShape[0]; i++) {
771            for (int j=0; j<dataPointShape[1]; j++) {
772              for (int k=0; k<dataPointShape[2]; k++) {
773                for (int l=0; l<dataPointShape[3]; l++) {
774                  numArray[dataPoint][i][j][k][l]=dataPointView(i,j,k,l);
775                }
776              }
777            }
778          }
779        }
780      }
781    
782      //
783      // return the loaded array
784      return numArray;
785    }
786    
787    const
788    boost::python::numeric::array
789    Data::convertToNumArrayFromDPNo(int sampleNo,
790                                    int dataPointNo)
791    {
792      //
793      // Check a valid sample number has been supplied
794      if (sampleNo >= getNumSamples()) {
795        throw DataException("Error - Data::convertToNumArray: invalid sampleNo.");
796      }
797    
798      //
799      // Check a valid data point number has been supplied
800      if (dataPointNo >= getNumDataPointsPerSample()) {
801        throw DataException("Error - Data::convertToNumArray: invalid dataPointNo.");
802      }
803    
804      //
805      // determine the rank and shape of each data point
806      int dataPointRank = getDataPointRank();
807      DataArrayView::ShapeType dataPointShape = getDataPointShape();
808    
809      //
810      // create the numeric array to be returned
811      boost::python::numeric::array numArray(0.0);
812    
813      //
814      // the shape of the returned numeric array will be the same
815      // as that of the data point
816      int arrayRank = dataPointRank;
817      DataArrayView::ShapeType arrayShape = dataPointShape;
818    
819      //
820      // resize the numeric array to the shape just calculated
821      if (arrayRank==0) {
822        numArray.resize(1);
823      }
824      if (arrayRank==1) {
825        numArray.resize(arrayShape[0]);
826      }
827      if (arrayRank==2) {
828        numArray.resize(arrayShape[0],arrayShape[1]);
829      }
830      if (arrayRank==3) {
831        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2]);
832      }
833      if (arrayRank==4) {
834        numArray.resize(arrayShape[0],arrayShape[1],arrayShape[2],arrayShape[3]);
835      }
836    
837      //
838      // load the values for the data point into the numeric array.
839      DataArrayView dataPointView = getDataPoint(sampleNo, dataPointNo);
840      if (dataPointRank==0) {
841        numArray[0]=dataPointView();
842      }
843      if (dataPointRank==1) {
844        for (int i=0; i<dataPointShape[0]; i++) {
845          numArray[i]=dataPointView(i);
846        }
847      }
848      if (dataPointRank==2) {
849        for (int i=0; i<dataPointShape[0]; i++) {
850          for (int j=0; j<dataPointShape[1]; j++) {
851            numArray[i][j] = dataPointView(i,j);
852          }
853        }
854      }
855      if (dataPointRank==3) {
856        for (int i=0; i<dataPointShape[0]; i++) {
857          for (int j=0; j<dataPointShape[1]; j++) {
858            for (int k=0; k<dataPointShape[2]; k++) {
859              numArray[i][j][k]=dataPointView(i,j,k);
860            }
861          }
862        }
863      }
864      if (dataPointRank==4) {
865        for (int i=0; i<dataPointShape[0]; i++) {
866          for (int j=0; j<dataPointShape[1]; j++) {
867            for (int k=0; k<dataPointShape[2]; k++) {
868              for (int l=0; l<dataPointShape[3]; l++) {
869                numArray[i][j][k][l]=dataPointView(i,j,k,l);
870              }
871            }
872          }
873        }
874      }
875    
876      //
877      // return the loaded array
878      return numArray;
879    }
880    
881  boost::python::numeric::array  boost::python::numeric::array
882  Data::integrate() const  Data::integrate() const
883  {  {
# Line 450  Data::integrate() const Line 885  Data::integrate() const
885    int rank = getDataPointRank();    int rank = getDataPointRank();
886    DataArrayView::ShapeType shape = getDataPointShape();    DataArrayView::ShapeType shape = getDataPointShape();
887    
888      profData->integrate++;
889    
890    //    //
891    // calculate the integral values    // calculate the integral values
892    vector<double> integrals(getDataPointSize());    vector<double> integrals(getDataPointSize());
# Line 460  Data::integrate() const Line 897  Data::integrate() const
897    // and load the array with the integral values    // and load the array with the integral values
898    boost::python::numeric::array bp_array(1.0);    boost::python::numeric::array bp_array(1.0);
899    if (rank==0) {    if (rank==0) {
900        bp_array.resize(1);
901      index = 0;      index = 0;
902      bp_array[0] = integrals[index];      bp_array[0] = integrals[index];
903    }    }
# Line 512  Data::integrate() const Line 950  Data::integrate() const
950  Data  Data
951  Data::sin() const  Data::sin() const
952  {  {
953      profData->unary++;
954    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sin);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sin);
955  }  }
956    
957  Data  Data
958  Data::cos() const  Data::cos() const
959  {  {
960      profData->unary++;
961    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cos);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::cos);
962  }  }
963    
964  Data  Data
965  Data::tan() const  Data::tan() const
966  {  {
967      profData->unary++;
968    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tan);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::tan);
969  }  }
970    
971  Data  Data
972  Data::log() const  Data::log() const
973  {  {
974      profData->unary++;
975    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log10);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log10);
976  }  }
977    
978  Data  Data
979  Data::ln() const  Data::ln() const
980  {  {
981      profData->unary++;
982    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log);    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::log);
983  }  }
984    
985    Data
986    Data::sign() const
987    {
988      profData->unary++;
989      return escript::unaryOp(*this,escript::fsign);
990    }
991    
992    Data
993    Data::abs() const
994    {
995      profData->unary++;
996      return escript::unaryOp(*this,(Data::UnaryDFunPtr)::fabs);
997    }
998    
999    Data
1000    Data::neg() const
1001    {
1002      profData->unary++;
1003      return escript::unaryOp(*this,negate<double>());
1004    }
1005    
1006    Data
1007    Data::pos() const
1008    {
1009      profData->unary++;
1010      return (*this);
1011    }
1012    
1013    Data
1014    Data::exp() const
1015    {
1016      profData->unary++;
1017      return escript::unaryOp(*this,(Data::UnaryDFunPtr)::exp);
1018    }
1019    
1020    Data
1021    Data::sqrt() const
1022    {
1023      profData->unary++;
1024      return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sqrt);
1025    }
1026    
1027  double  double
1028  Data::Lsup() const  Data::Lsup() const
1029  {  {
1030      profData->reduction1++;
1031    //    //
1032    // set the initial absolute maximum value to zero    // set the initial absolute maximum value to zero
1033    return algorithm(DataAlgorithmAdapter<AbsMax>(0));    AbsMax abs_max_func;
1034      return algorithm(abs_max_func,0);
1035    }
1036    
1037    double
1038    Data::Linf() const
1039    {
1040      profData->reduction1++;
1041      //
1042      // set the initial absolute minimum value to max double
1043      AbsMin abs_min_func;
1044      return algorithm(abs_min_func,numeric_limits<double>::max());
1045  }  }
1046    
1047  double  double
1048  Data::sup() const  Data::sup() const
1049  {  {
1050      profData->reduction1++;
1051    //    //
1052    // set the initial maximum value to min possible double    // set the initial maximum value to min possible double
1053    return algorithm(DataAlgorithmAdapter<FMax>(numeric_limits<double>::min()));    FMax fmax_func;
1054      return algorithm(fmax_func,numeric_limits<double>::max()*-1);
1055  }  }
1056    
1057  double  double
1058  Data::inf() const  Data::inf() const
1059  {  {
1060      profData->reduction1++;
1061    //    //
1062    // set the initial minimum value to max possible double    // set the initial minimum value to max possible double
1063    return algorithm(DataAlgorithmAdapter<FMin>(numeric_limits<double>::max()));    FMin fmin_func;
1064      return algorithm(fmin_func,numeric_limits<double>::max());
1065  }  }
1066    
1067  Data  Data
1068  Data::maxval() const  Data::maxval() const
1069  {  {
1070    // not implemented - will use dp_algorithm    profData->reduction2++;
1071    return (*this);    //
1072      // set the initial maximum value to min possible double
1073      FMax fmax_func;
1074      return dp_algorithm(fmax_func,numeric_limits<double>::max()*-1);
1075  }  }
1076    
1077  Data  Data
1078  Data::minval() const  Data::minval() const
1079  {  {
1080    // not implemented - will use dp_algorithm    profData->reduction2++;
1081    return (*this);    //
1082      // set the initial minimum value to max possible double
1083      FMin fmin_func;
1084      return dp_algorithm(fmin_func,numeric_limits<double>::max());
1085  }  }
1086    
1087  Data  Data
1088  Data::length() const  Data::length() const
1089  {  {
1090    // not implemented - will use dp_algorithm    profData->reduction2++;
1091    return (*this);    Length len_func;
1092      return dp_algorithm(len_func,0);
1093  }  }
1094    
1095  Data  Data
1096  Data::trace() const  Data::trace() const
1097  {  {
1098    // not implemented - will use dp_algorithm    profData->reduction2++;
1099    return (*this);    Trace trace_func;
1100      return dp_algorithm(trace_func,0);
1101  }  }
1102    
1103  Data  Data
1104  Data::transpose(int axis) const  Data::transpose(int axis) const
1105  {  {
1106      profData->reduction2++;
1107    // not implemented    // not implemented
1108    return (*this);    throw DataException("Error - Data::transpose not implemented yet.");
1109      return Data();
1110  }  }
1111    
1112  Data  const boost::python::tuple
1113  Data::sign() const  Data::mindp() const
1114  {  {
1115    return escript::unaryOp(*this,escript::fsign);    Data temp=minval();
 }  
1116    
1117  Data    int numSamples=temp.getNumSamples();
1118  Data::abs() const    int numDPPSample=temp.getNumDataPointsPerSample();
 {  
   return escript::unaryOp(*this,(Data::UnaryDFunPtr)::fabs);  
 }  
1119    
1120  Data    int i,j,lowi=0,lowj=0;
1121  Data::neg() const    double min=numeric_limits<double>::max();
 {  
   return escript::unaryOp(*this,negate<double>());  
 }  
1122    
1123  Data    for (i=0; i<numSamples; i++) {
1124  Data::pos() const      for (j=0; j<numDPPSample; j++) {
1125  {        double next=temp.getDataPoint(i,j)();
1126    return (*this);        if (next<min) {
1127            min=next;
1128            lowi=i;
1129            lowj=j;
1130          }
1131        }
1132      }
1133    
1134      return make_tuple(lowi,lowj);
1135  }  }
1136    
1137  Data  void
1138  Data::exp() const  Data::saveDX(std::string fileName) const
1139  {  {
1140    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::exp);    getDomain().saveDX(fileName,*this);
1141      return;
1142  }  }
1143    
1144  Data  void
1145  Data::sqrt() const  Data::saveVTK(std::string fileName) const
1146  {  {
1147    return escript::unaryOp(*this,(Data::UnaryDFunPtr)::sqrt);    getDomain().saveVTK(fileName,*this);
1148      return;
1149  }  }
1150    
1151  Data&  Data&
1152  Data::operator+=(const Data& right)  Data::operator+=(const Data& right)
1153  {  {
1154      profData->binary++;
1155    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1156    return (*this);    return (*this);
1157  }  }
# Line 644  Data::operator+=(const Data& right) Line 1159  Data::operator+=(const Data& right)
1159  Data&  Data&
1160  Data::operator+=(const boost::python::object& right)  Data::operator+=(const boost::python::object& right)
1161  {  {
1162      profData->binary++;
1163    binaryOp(right,plus<double>());    binaryOp(right,plus<double>());
1164    return (*this);    return (*this);
1165  }  }
# Line 651  Data::operator+=(const boost::python::ob Line 1167  Data::operator+=(const boost::python::ob
1167  Data&  Data&
1168  Data::operator-=(const Data& right)  Data::operator-=(const Data& right)
1169  {  {
1170      profData->binary++;
1171    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1172    return (*this);    return (*this);
1173  }  }
# Line 658  Data::operator-=(const Data& right) Line 1175  Data::operator-=(const Data& right)
1175  Data&  Data&
1176  Data::operator-=(const boost::python::object& right)  Data::operator-=(const boost::python::object& right)
1177  {  {
1178      profData->binary++;
1179    binaryOp(right,minus<double>());    binaryOp(right,minus<double>());
1180    return (*this);    return (*this);
1181  }  }
# Line 665  Data::operator-=(const boost::python::ob Line 1183  Data::operator-=(const boost::python::ob
1183  Data&  Data&
1184  Data::operator*=(const Data& right)  Data::operator*=(const Data& right)
1185  {  {
1186      profData->binary++;
1187    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1188    return (*this);    return (*this);
1189  }  }
# Line 672  Data::operator*=(const Data& right) Line 1191  Data::operator*=(const Data& right)
1191  Data&  Data&
1192  Data::operator*=(const boost::python::object& right)  Data::operator*=(const boost::python::object& right)
1193  {  {
1194      profData->binary++;
1195    binaryOp(right,multiplies<double>());    binaryOp(right,multiplies<double>());
1196    return (*this);    return (*this);
1197  }  }
# Line 679  Data::operator*=(const boost::python::ob Line 1199  Data::operator*=(const boost::python::ob
1199  Data&  Data&
1200  Data::operator/=(const Data& right)  Data::operator/=(const Data& right)
1201  {  {
1202      profData->binary++;
1203    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1204    return (*this);    return (*this);
1205  }  }
# Line 686  Data::operator/=(const Data& right) Line 1207  Data::operator/=(const Data& right)
1207  Data&  Data&
1208  Data::operator/=(const boost::python::object& right)  Data::operator/=(const boost::python::object& right)
1209  {  {
1210      profData->binary++;
1211    binaryOp(right,divides<double>());    binaryOp(right,divides<double>());
1212    return (*this);    return (*this);
1213  }  }
# Line 693  Data::operator/=(const boost::python::ob Line 1215  Data::operator/=(const boost::python::ob
1215  Data  Data
1216  Data::powO(const boost::python::object& right) const  Data::powO(const boost::python::object& right) const
1217  {  {
1218      profData->binary++;
1219    Data result;    Data result;
1220    result.copy(*this);    result.copy(*this);
1221    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
# Line 702  Data::powO(const boost::python::object& Line 1225  Data::powO(const boost::python::object&
1225  Data  Data
1226  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1227  {  {
1228      profData->binary++;
1229    Data result;    Data result;
1230    result.copy(*this);    result.copy(*this);
1231    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);    result.binaryOp(right,(Data::BinaryDFunPtr)::pow);
# Line 709  Data::powD(const Data& right) const Line 1233  Data::powD(const Data& right) const
1233  }  }
1234    
1235  //  //
1236  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1237  Data  Data
1238  escript::operator+(const Data& left, const Data& right)  escript::operator+(const Data& left, const Data& right)
1239  {  {
# Line 722  escript::operator+(const Data& left, con Line 1246  escript::operator+(const Data& left, con
1246  }  }
1247    
1248  //  //
1249  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1250  Data  Data
1251  escript::operator-(const Data& left, const Data& right)  escript::operator-(const Data& left, const Data& right)
1252  {  {
# Line 735  escript::operator-(const Data& left, con Line 1259  escript::operator-(const Data& left, con
1259  }  }
1260    
1261  //  //
1262  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1263  Data  Data
1264  escript::operator*(const Data& left, const Data& right)  escript::operator*(const Data& left, const Data& right)
1265  {  {
# Line 748  escript::operator*(const Data& left, con Line 1272  escript::operator*(const Data& left, con
1272  }  }
1273    
1274  //  //
1275  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1276  Data  Data
1277  escript::operator/(const Data& left, const Data& right)  escript::operator/(const Data& left, const Data& right)
1278  {  {
# Line 761  escript::operator/(const Data& left, con Line 1285  escript::operator/(const Data& left, con
1285  }  }
1286    
1287  //  //
1288  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1289  Data  Data
1290  escript::operator+(const Data& left, const boost::python::object& right)  escript::operator+(const Data& left, const boost::python::object& right)
1291  {  {
# Line 777  escript::operator+(const Data& left, con Line 1301  escript::operator+(const Data& left, con
1301  }  }
1302    
1303  //  //
1304  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1305  Data  Data
1306  escript::operator-(const Data& left, const boost::python::object& right)  escript::operator-(const Data& left, const boost::python::object& right)
1307  {  {
# Line 793  escript::operator-(const Data& left, con Line 1317  escript::operator-(const Data& left, con
1317  }  }
1318    
1319  //  //
1320  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1321  Data  Data
1322  escript::operator*(const Data& left, const boost::python::object& right)  escript::operator*(const Data& left, const boost::python::object& right)
1323  {  {
# Line 809  escript::operator*(const Data& left, con Line 1333  escript::operator*(const Data& left, con
1333  }  }
1334    
1335  //  //
1336  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1337  Data  Data
1338  escript::operator/(const Data& left, const boost::python::object& right)  escript::operator/(const Data& left, const boost::python::object& right)
1339  {  {
# Line 825  escript::operator/(const Data& left, con Line 1349  escript::operator/(const Data& left, con
1349  }  }
1350    
1351  //  //
1352  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1353  Data  Data
1354  escript::operator+(const boost::python::object& left, const Data& right)  escript::operator+(const boost::python::object& left, const Data& right)
1355  {  {
# Line 838  escript::operator+(const boost::python:: Line 1362  escript::operator+(const boost::python::
1362  }  }
1363    
1364  //  //
1365  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1366  Data  Data
1367  escript::operator-(const boost::python::object& left, const Data& right)  escript::operator-(const boost::python::object& left, const Data& right)
1368  {  {
# Line 851  escript::operator-(const boost::python:: Line 1375  escript::operator-(const boost::python::
1375  }  }
1376    
1377  //  //
1378  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1379  Data  Data
1380  escript::operator*(const boost::python::object& left, const Data& right)  escript::operator*(const boost::python::object& left, const Data& right)
1381  {  {
# Line 864  escript::operator*(const boost::python:: Line 1388  escript::operator*(const boost::python::
1388  }  }
1389    
1390  //  //
1391  // NOTE: It is essential to specify the namepsace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1392  Data  Data
1393  escript::operator/(const boost::python::object& left, const Data& right)  escript::operator/(const boost::python::object& left, const Data& right)
1394  {  {
# Line 877  escript::operator/(const boost::python:: Line 1401  escript::operator/(const boost::python::
1401  }  }
1402    
1403  //  //
 // NOTE: It is essential to specify the namepsace this operator belongs to  
1404  //bool escript::operator==(const Data& left, const Data& right)  //bool escript::operator==(const Data& left, const Data& right)
1405  //{  //{
1406  //  /*  //  /*
# Line 939  Data::getItem(const boost::python::objec Line 1462  Data::getItem(const boost::python::objec
1462  Data  Data
1463  Data::getSlice(const DataArrayView::RegionType& region) const  Data::getSlice(const DataArrayView::RegionType& region) const
1464  {  {
1465      profData->slicing++;
1466    return Data(*this,region);    return Data(*this,region);
1467  }  }
1468    
# Line 955  Data::setItemD(const boost::python::obje Line 1479  Data::setItemD(const boost::python::obje
1479                 const Data& value)                 const Data& value)
1480  {  {
1481    const DataArrayView& view=getPointDataView();    const DataArrayView& view=getPointDataView();
1482    
1483    DataArrayView::RegionType slice_region=view.getSliceRegion(key);    DataArrayView::RegionType slice_region=view.getSliceRegion(key);
1484    if (slice_region.size()!=view.getRank()) {    if (slice_region.size()!=view.getRank()) {
1485      throw DataException("Error - slice size does not match Data rank.");      throw DataException("Error - slice size does not match Data rank.");
1486    }    }
1487    setSlice(value,slice_region);    if (getFunctionSpace()!=value.getFunctionSpace()) {
1488         setSlice(Data(value,getFunctionSpace()),slice_region);
1489      } else {
1490         setSlice(value,slice_region);
1491      }
1492  }  }
1493    
1494  void  void
1495  Data::setSlice(const Data& value,  Data::setSlice(const Data& value,
1496                 const DataArrayView::RegionType& region)                 const DataArrayView::RegionType& region)
1497  {  {
1498      profData->slicing++;
1499    Data tempValue(value);    Data tempValue(value);
1500    typeMatchLeft(tempValue);    typeMatchLeft(tempValue);
1501    typeMatchRight(tempValue);    typeMatchRight(tempValue);
# Line 1021  Data::setTaggedValue(int tagKey, Line 1551  Data::setTaggedValue(int tagKey,
1551    m_data->setTaggedValue(tagKey,valueDataArray.getView());    m_data->setTaggedValue(tagKey,valueDataArray.getView());
1552  }  }
1553    
 /*  
 Note: this version removed for now. Not needed, and breaks escript.cpp  
1554  void  void
1555  Data::setTaggedValue(int tagKey,  Data::setTaggedValueFromCPP(int tagKey,
1556                       const DataArrayView& value)                              const DataArrayView& value)
1557  {  {
1558    //    //
1559    // Ensure underlying data object is of type DataTagged    // Ensure underlying data object is of type DataTagged
# Line 1039  Data::setTaggedValue(int tagKey, Line 1567  Data::setTaggedValue(int tagKey,
1567    // Call DataAbstract::setTaggedValue    // Call DataAbstract::setTaggedValue
1568    m_data->setTaggedValue(tagKey,value);    m_data->setTaggedValue(tagKey,value);
1569  }  }
1570  */  
1571    void
1572    Data::setRefValue(int ref,
1573                      const boost::python::numeric::array& value)
1574    {
1575      //
1576      // Construct DataArray from boost::python::object input value
1577      DataArray valueDataArray(value);
1578    
1579      //
1580      // Call DataAbstract::setRefValue
1581      m_data->setRefValue(ref,valueDataArray);
1582    }
1583    
1584    void
1585    Data::getRefValue(int ref,
1586                      boost::python::numeric::array& value)
1587    {
1588      //
1589      // Construct DataArray for boost::python::object return value
1590      DataArray valueDataArray(value);
1591    
1592      //
1593      // Load DataArray with values from data-points specified by ref
1594      m_data->getRefValue(ref,valueDataArray);
1595    
1596      //
1597      // Load values from valueDataArray into return numarray
1598    
1599      // extract the shape of the numarray
1600      int rank = value.getrank();
1601      DataArrayView::ShapeType shape;
1602      for (int i=0; i < rank; i++) {
1603        shape.push_back(extract<int>(value.getshape()[i]));
1604      }
1605    
1606      // and load the numarray with the data from the DataArray
1607      DataArrayView valueView = valueDataArray.getView();
1608    
1609      if (rank==0) {
1610          boost::python::numeric::array temp_numArray(valueView());
1611          value = temp_numArray;
1612      }
1613      if (rank==1) {
1614        for (int i=0; i < shape[0]; i++) {
1615          value[i] = valueView(i);
1616        }
1617      }
1618      if (rank==2) {
1619        for (int i=0; i < shape[0]; i++) {
1620          for (int j=0; j < shape[1]; j++) {
1621            value[i][j] = valueView(i,j);
1622          }
1623        }
1624      }
1625      if (rank==3) {
1626        for (int i=0; i < shape[0]; i++) {
1627          for (int j=0; j < shape[1]; j++) {
1628            for (int k=0; k < shape[2]; k++) {
1629              value[i][j][k] = valueView(i,j,k);
1630            }
1631          }
1632        }
1633      }
1634      if (rank==4) {
1635        for (int i=0; i < shape[0]; i++) {
1636          for (int j=0; j < shape[1]; j++) {
1637            for (int k=0; k < shape[2]; k++) {
1638              for (int l=0; l < shape[3]; l++) {
1639                value[i][j][k][l] = valueView(i,j,k,l);
1640              }
1641            }
1642          }
1643        }
1644      }
1645    
1646    }
1647    
1648    void
1649    Data::archiveData(const std::string fileName)
1650    {
1651      cout << "Archiving Data object to: " << fileName << endl;
1652    
1653      //
1654      // Determine type of this Data object
1655      int dataType = -1;
1656    
1657      if (isEmpty()) {
1658        dataType = 0;
1659        cout << "\tdataType: DataEmpty" << endl;
1660      }
1661      if (isConstant()) {
1662        dataType = 1;
1663        cout << "\tdataType: DataConstant" << endl;
1664      }
1665      if (isTagged()) {
1666        dataType = 2;
1667        cout << "\tdataType: DataTagged" << endl;
1668      }
1669      if (isExpanded()) {
1670        dataType = 3;
1671        cout << "\tdataType: DataExpanded" << endl;
1672      }
1673    
1674      if (dataType == -1) {
1675        throw DataException("archiveData Error: undefined dataType");
1676      }
1677    
1678      //
1679      // Collect data items common to all Data types
1680      int noSamples = getNumSamples();
1681      int noDPPSample = getNumDataPointsPerSample();
1682      int functionSpaceType = getFunctionSpace().getTypeCode();
1683      int dataPointRank = getDataPointRank();
1684      int dataPointSize = getDataPointSize();
1685      int dataLength = getLength();
1686      DataArrayView::ShapeType dataPointShape = getDataPointShape();
1687      int referenceNumbers[noSamples];
1688      for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1689        referenceNumbers[sampleNo] = getFunctionSpace().getReferenceNoFromSampleNo(sampleNo);
1690      }
1691      int tagNumbers[noSamples];
1692      if (isTagged()) {
1693        for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1694          tagNumbers[sampleNo] = getFunctionSpace().getTagFromSampleNo(sampleNo);
1695        }
1696      }
1697    
1698      cout << "\tnoSamples: " << noSamples << " noDPPSample: " << noDPPSample << endl;
1699      cout << "\tfunctionSpaceType: " << functionSpaceType << endl;
1700      cout << "\trank: " << dataPointRank << " size: " << dataPointSize << " length: " << dataLength << endl;
1701    
1702      //
1703      // Flatten Shape to an array of integers suitable for writing to file
1704      int flatShape[4] = {0,0,0,0};
1705      cout << "\tshape: < ";
1706      for (int dim=0; dim<dataPointRank; dim++) {
1707        flatShape[dim] = dataPointShape[dim];
1708        cout << dataPointShape[dim] << " ";
1709      }
1710      cout << ">" << endl;
1711    
1712      //
1713      // Open archive file
1714      ofstream archiveFile;
1715      archiveFile.open(fileName.data(), ios::out);
1716    
1717      if (!archiveFile.good()) {
1718        throw DataException("archiveData Error: problem opening archive file");
1719      }
1720    
1721      //
1722      // Write common data items to archive file
1723      archiveFile.write(reinterpret_cast<char *>(&dataType),sizeof(int));
1724      archiveFile.write(reinterpret_cast<char *>(&noSamples),sizeof(int));
1725      archiveFile.write(reinterpret_cast<char *>(&noDPPSample),sizeof(int));
1726      archiveFile.write(reinterpret_cast<char *>(&functionSpaceType),sizeof(int));
1727      archiveFile.write(reinterpret_cast<char *>(&dataPointRank),sizeof(int));
1728      archiveFile.write(reinterpret_cast<char *>(&dataPointSize),sizeof(int));
1729      archiveFile.write(reinterpret_cast<char *>(&dataLength),sizeof(int));
1730      for (int dim = 0; dim < 4; dim++) {
1731        archiveFile.write(reinterpret_cast<char *>(&flatShape[dim]),sizeof(int));
1732      }
1733      for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1734        archiveFile.write(reinterpret_cast<char *>(&referenceNumbers[sampleNo]),sizeof(int));
1735      }
1736      if (isTagged()) {
1737        for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1738          archiveFile.write(reinterpret_cast<char *>(&tagNumbers[sampleNo]),sizeof(int));
1739        }
1740      }
1741    
1742      if (!archiveFile.good()) {
1743        throw DataException("archiveData Error: problem writing to archive file");
1744      }
1745    
1746      //
1747      // Archive underlying data values for each Data type
1748      int noValues;
1749      switch (dataType) {
1750        case 0:
1751          // DataEmpty
1752          noValues = 0;
1753          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1754          cout << "\tnoValues: " << noValues << endl;
1755          break;
1756        case 1:
1757          // DataConstant
1758          noValues = m_data->getLength();
1759          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1760          cout << "\tnoValues: " << noValues << endl;
1761          if (m_data->archiveData(archiveFile,noValues)) {
1762            throw DataException("archiveData Error: problem writing data to archive file");
1763          }
1764          break;
1765        case 2:
1766          // DataTagged
1767          noValues = m_data->getLength();
1768          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1769          cout << "\tnoValues: " << noValues << endl;
1770          if (m_data->archiveData(archiveFile,noValues)) {
1771            throw DataException("archiveData Error: problem writing data to archive file");
1772          }
1773          break;
1774        case 3:
1775          // DataExpanded
1776          noValues = m_data->getLength();
1777          archiveFile.write(reinterpret_cast<char *>(&noValues),sizeof(int));
1778          cout << "\tnoValues: " << noValues << endl;
1779          if (m_data->archiveData(archiveFile,noValues)) {
1780            throw DataException("archiveData Error: problem writing data to archive file");
1781          }
1782          break;
1783      }
1784    
1785      if (!archiveFile.good()) {
1786        throw DataException("archiveData Error: problem writing data to archive file");
1787      }
1788    
1789      //
1790      // Close archive file
1791      archiveFile.close();
1792    
1793      if (!archiveFile.good()) {
1794        throw DataException("archiveData Error: problem closing archive file");
1795      }
1796    
1797    }
1798    
1799    void
1800    Data::extractData(const std::string fileName,
1801                      const FunctionSpace& fspace)
1802    {
1803      //
1804      // Can only extract Data to an object which is initially DataEmpty
1805      if (!isEmpty()) {
1806        throw DataException("extractData Error: can only extract to DataEmpty object");
1807      }
1808    
1809      cout << "Extracting Data object from: " << fileName << endl;
1810    
1811      int dataType;
1812      int noSamples;
1813      int noDPPSample;
1814      int functionSpaceType;
1815      int dataPointRank;
1816      int dataPointSize;
1817      int dataLength;
1818      DataArrayView::ShapeType dataPointShape;
1819      int flatShape[4];
1820    
1821      //
1822      // Open the archive file
1823      ifstream archiveFile;
1824      archiveFile.open(fileName.data(), ios::in);
1825    
1826      if (!archiveFile.good()) {
1827        throw DataException("extractData Error: problem opening archive file");
1828      }
1829    
1830      //
1831      // Read common data items from archive file
1832      archiveFile.read(reinterpret_cast<char *>(&dataType),sizeof(int));
1833      archiveFile.read(reinterpret_cast<char *>(&noSamples),sizeof(int));
1834      archiveFile.read(reinterpret_cast<char *>(&noDPPSample),sizeof(int));
1835      archiveFile.read(reinterpret_cast<char *>(&functionSpaceType),sizeof(int));
1836      archiveFile.read(reinterpret_cast<char *>(&dataPointRank),sizeof(int));
1837      archiveFile.read(reinterpret_cast<char *>(&dataPointSize),sizeof(int));
1838      archiveFile.read(reinterpret_cast<char *>(&dataLength),sizeof(int));
1839      for (int dim = 0; dim < 4; dim++) {
1840        archiveFile.read(reinterpret_cast<char *>(&flatShape[dim]),sizeof(int));
1841        if (flatShape[dim]>0) {
1842          dataPointShape.push_back(flatShape[dim]);
1843        }
1844      }
1845      int referenceNumbers[noSamples];
1846      for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1847        archiveFile.read(reinterpret_cast<char *>(&referenceNumbers[sampleNo]),sizeof(int));
1848      }
1849      int tagNumbers[noSamples];
1850      if (dataType==2) {
1851        for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1852          archiveFile.read(reinterpret_cast<char *>(&tagNumbers[sampleNo]),sizeof(int));
1853        }
1854      }
1855    
1856      if (!archiveFile.good()) {
1857        throw DataException("extractData Error: problem reading from archive file");
1858      }
1859    
1860      //
1861      // Verify the values just read from the archive file
1862      switch (dataType) {
1863        case 0:
1864          cout << "\tdataType: DataEmpty" << endl;
1865          break;
1866        case 1:
1867          cout << "\tdataType: DataConstant" << endl;
1868          break;
1869        case 2:
1870          cout << "\tdataType: DataTagged" << endl;
1871          break;
1872        case 3:
1873          cout << "\tdataType: DataExpanded" << endl;
1874          break;
1875        default:
1876          throw DataException("extractData Error: undefined dataType read from archive file");
1877          break;
1878      }
1879    
1880      cout << "\tnoSamples: " << noSamples << " noDPPSample: " << noDPPSample << endl;
1881      cout << "\tfunctionSpaceType: " << functionSpaceType << endl;
1882      cout << "\trank: " << dataPointRank << " size: " << dataPointSize << " length: " << dataLength << endl;
1883      cout << "\tshape: < ";
1884      for (int dim = 0; dim < dataPointRank; dim++) {
1885        cout << dataPointShape[dim] << " ";
1886      }
1887      cout << ">" << endl;
1888    
1889      //
1890      // Verify that supplied FunctionSpace object is compatible with this Data object.
1891      if ( (fspace.getTypeCode()!=functionSpaceType) ||
1892           (fspace.getNumSamples()!=noSamples) ||
1893           (fspace.getNumDPPSample()!=noDPPSample)
1894         ) {
1895        throw DataException("extractData Error: incompatible FunctionSpace");
1896      }
1897      for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1898        if (referenceNumbers[sampleNo] != fspace.getReferenceNoFromSampleNo(sampleNo)) {
1899          throw DataException("extractData Error: incompatible FunctionSpace");
1900        }
1901      }
1902      if (dataType==2) {
1903        for (int sampleNo=0; sampleNo<noSamples; sampleNo++) {
1904          if (tagNumbers[sampleNo] != fspace.getTagFromSampleNo(sampleNo)) {
1905            throw DataException("extractData Error: incompatible FunctionSpace");
1906          }
1907        }
1908      }
1909    
1910      //
1911      // Construct a DataVector to hold underlying data values
1912      DataVector dataVec(dataLength);
1913    
1914      //
1915      // Load this DataVector with the appropriate values
1916      int noValues;
1917      archiveFile.read(reinterpret_cast<char *>(&noValues),sizeof(int));
1918      cout << "\tnoValues: " << noValues << endl;
1919      switch (dataType) {
1920        case 0:
1921          // DataEmpty
1922          if (noValues != 0) {
1923            throw DataException("extractData Error: problem reading data from archive file");
1924          }
1925          break;
1926        case 1:
1927          // DataConstant
1928          if (dataVec.extractData(archiveFile,noValues)) {
1929            throw DataException("extractData Error: problem reading data from archive file");
1930          }
1931          break;
1932        case 2:
1933          // DataTagged
1934          if (dataVec.extractData(archiveFile,noValues)) {
1935            throw DataException("extractData Error: problem reading data from archive file");
1936          }
1937          break;
1938        case 3:
1939          // DataExpanded
1940          if (dataVec.extractData(archiveFile,noValues)) {
1941            throw DataException("extractData Error: problem reading data from archive file");
1942          }
1943          break;
1944      }
1945    
1946      if (!archiveFile.good()) {
1947        throw DataException("extractData Error: problem reading from archive file");
1948      }
1949    
1950      //
1951      // Close archive file
1952      archiveFile.close();
1953    
1954      if (!archiveFile.good()) {
1955        throw DataException("extractData Error: problem closing archive file");
1956      }
1957    
1958      //
1959      // Construct an appropriate Data object
1960      DataAbstract* tempData;
1961      switch (dataType) {
1962        case 0:
1963          // DataEmpty
1964          tempData=new DataEmpty();
1965          break;
1966        case 1:
1967          // DataConstant
1968          tempData=new DataConstant(fspace,dataPointShape,dataVec);
1969          break;
1970        case 2:
1971          // DataTagged
1972          tempData=new DataTagged(fspace,dataPointShape,tagNumbers,dataVec);
1973          break;
1974        case 3:
1975          // DataExpanded
1976          tempData=new DataExpanded(fspace,dataPointShape,dataVec);
1977          break;
1978      }
1979      shared_ptr<DataAbstract> temp_data(tempData);
1980      m_data=temp_data;
1981    }
1982    
1983  ostream& escript::operator<<(ostream& o, const Data& data)  ostream& escript::operator<<(ostream& o, const Data& data)
1984  {  {

Legend:
Removed from v.97  
changed lines
  Added in v.147

  ViewVC Help
Powered by ViewVC 1.1.26