/[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 710 by gross, Fri Mar 31 06:27:56 2006 UTC revision 711 by gross, Wed Apr 26 22:39:51 2006 UTC
# Line 116  Data::Data(const Data& inData, Line 116  Data::Data(const Data& inData,
116  Data::Data(const Data& inData,  Data::Data(const Data& inData,
117             const FunctionSpace& functionspace)             const FunctionSpace& functionspace)
118  {  {
119    #if defined DOPROF
120      // create entry in global profiling table for this object
121      profData = dataProfTable.newData();
122    #endif
123    if (inData.getFunctionSpace()==functionspace) {    if (inData.getFunctionSpace()==functionspace) {
124      m_data=inData.m_data;      m_data=inData.m_data;
125    } else {    } else {
126        #if defined DOPROF
127        profData->interpolate++;
128        #endif
129      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);      Data tmp(0,inData.getPointDataView().getShape(),functionspace,true);
130      // Note: Must use a reference or pointer to a derived object      // Note: Must use a reference or pointer to a derived object
131      // in order to get polymorphic behaviour. Shouldn't really      // in order to get polymorphic behaviour. Shouldn't really
# Line 132  Data::Data(const Data& inData, Line 139  Data::Data(const Data& inData,
139      }      }
140      m_data=tmp.m_data;      m_data=tmp.m_data;
141    }    }
 #if defined DOPROF  
   // create entry in global profiling table for this object  
   profData = dataProfTable.newData();  
 #endif  
142  }  }
143    
144  Data::Data(const DataTagged::TagListType& tagKeys,  Data::Data(const DataTagged::TagListType& tagKeys,

Legend:
Removed from v.710  
changed lines
  Added in v.711

  ViewVC Help
Powered by ViewVC 1.1.26