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

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

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

revision 1813 by jfenwick, Fri Sep 26 00:58:05 2008 UTC revision 1820 by jfenwick, Wed Oct 1 03:48:18 2008 UTC
# Line 428  contains datapoints. Line 428  contains datapoints.
428    */    */
429    ESCRIPT_DLL_API    ESCRIPT_DLL_API
430    inline    inline
431    const AbstractDomain&  //   const AbstractDomain&
432      const_Domain_ptr
433    getDomain() const    getDomain() const
434    {    {
435       return getFunctionSpace().getDomain();       return getFunctionSpace().getDomain();
# Line 1767  C_TensorBinaryOperation(Data const &arg_ Line 1768  C_TensorBinaryOperation(Data const &arg_
1768    }    }
1769    // Interpolate if necessary and find an appropriate function space    // Interpolate if necessary and find an appropriate function space
1770    Data arg_0_Z, arg_1_Z;    Data arg_0_Z, arg_1_Z;
1771    std::cerr << "C_TensorBinaryOperation fs1=" << &(arg_0.getFunctionSpace()) << " fs2=" << &(arg_1.getFunctionSpace())
1772    << std::endl;
1773    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {    if (arg_0.getFunctionSpace()!=arg_1.getFunctionSpace()) {
1774      if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {      if (arg_0.probeInterpolation(arg_1.getFunctionSpace())) {
1775        arg_0_Z = arg_0.interpolate(arg_1.getFunctionSpace());        arg_0_Z = arg_0.interpolate(arg_1.getFunctionSpace());

Legend:
Removed from v.1813  
changed lines
  Added in v.1820

  ViewVC Help
Powered by ViewVC 1.1.26