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

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

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

revision 2142 by jfenwick, Mon Dec 8 00:26:34 2008 UTC revision 2143 by jfenwick, Tue Dec 9 06:28:10 2008 UTC
# Line 1051  Data::getLength() const Line 1051  Data::getLength() const
1051    return m_data->getLength();    return m_data->getLength();
1052  }  }
1053    
1054    #ifndef NONUMARRAY
1055  const  const
1056  boost::python::numeric :: array  boost::python::numeric :: array
1057  Data:: getValueOfDataPoint(int dataPointNo)  Data:: getValueOfDataPoint(int dataPointNo)
1058  {  {
1059      return boost::python::numeric::array(getValueOfDataPointAsTuple(dataPointNo));      return boost::python::numeric::array(getValueOfDataPointAsTuple(dataPointNo));
1060  }  }
1061    #endif
1062    
1063  const boost::python::object  const boost::python::object
1064  Data::getValueOfDataPointAsTuple(int dataPointNo)  Data::getValueOfDataPointAsTuple(int dataPointNo)
# Line 1154  Data::setValueOfDataPoint(int dataPointN Line 1156  Data::setValueOfDataPoint(int dataPointN
1156    }    }
1157  }  }
1158    
1159    #ifndef NONUMARRAY
1160  const  const
1161  boost::python::numeric::array  boost::python::numeric::array
1162  Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)  Data::getValueOfGlobalDataPoint(int procNo, int dataPointNo)
1163  {  {
1164     return boost::python::numeric::array(getValueOfGlobalDataPointAsTuple(procNo, dataPointNo));     return boost::python::numeric::array(getValueOfGlobalDataPointAsTuple(procNo, dataPointNo));
1165  }  }
1166    #endif
1167    
1168  const  const
1169  boost::python::object  boost::python::object
# Line 1238  Data::integrateToTuple() Line 1242  Data::integrateToTuple()
1242    
1243  }  }
1244    
1245    #ifndef NONUMARRAY
1246  boost::python::object  boost::python::numeric::array
1247  Data::integrate_const() const  Data::integrate_const() const
1248  {  {
1249    if (isLazy())    if (isLazy())
# Line 1249  Data::integrate_const() const Line 1253  Data::integrate_const() const
1253    return boost::python::numeric::array(integrateWorker());    return boost::python::numeric::array(integrateWorker());
1254  }  }
1255    
1256  boost::python::object  boost::python::numeric::array
1257  Data::integrate()  Data::integrate()
1258  {  {
1259    if (isLazy())    if (isLazy())
# Line 1259  Data::integrate() Line 1263  Data::integrate()
1263    return boost::python::numeric::array(integrateWorker());    return boost::python::numeric::array(integrateWorker());
1264  }  }
1265    
1266    #endif
1267    
1268  boost::python::object  boost::python::object
1269  Data::integrateWorker() const  Data::integrateWorker() const

Legend:
Removed from v.2142  
changed lines
  Added in v.2143

  ViewVC Help
Powered by ViewVC 1.1.26