/[escript]/branches/schroedinger/escript/src/Data.cpp
ViewVC logotype

Diff of /branches/schroedinger/escript/src/Data.cpp

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

revision 1898 by jfenwick, Thu Oct 16 05:57:09 2008 UTC revision 1899 by jfenwick, Mon Oct 20 05:13:24 2008 UTC
# Line 1043  Data::getValueOfGlobalDataPoint(int proc Line 1043  Data::getValueOfGlobalDataPoint(int proc
1043  }  }
1044    
1045    
1046    boost::python::numeric::array
1047    Data::integrate_const() const
1048    {
1049      if (isLazy())
1050      {
1051        throw DataException("Error - cannot integrate for constant lazy data.");
1052      }
1053      return integrateWorker();
1054    }
1055    
1056    boost::python::numeric::array
1057    Data::integrate()
1058    {
1059      if (isLazy())
1060      {
1061        expand();
1062      }
1063      return integrateWorker();
1064    }
1065    
1066    
1067    
1068  boost::python::numeric::array  boost::python::numeric::array
1069  Data::integrate() const  Data::integrateWorker() const
1070  {  {
1071    int index;    int index;
1072    int rank = getDataPointRank();    int rank = getDataPointRank();

Legend:
Removed from v.1898  
changed lines
  Added in v.1899

  ViewVC Help
Powered by ViewVC 1.1.26