/[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 1331 by matt, Mon Oct 15 03:23:15 2007 UTC revision 1332 by matt, Tue Oct 23 03:28:51 2007 UTC
# Line 1510  Data::powO(const boost::python::object& Line 1510  Data::powO(const boost::python::object&
1510    return powD(tmp);    return powD(tmp);
1511  }  }
1512    
1513    /* Data */
1514    /* Data::powD(const Data& right) const */
1515    /* { */
1516    /*   Data result; */
1517    /*   if (getDataPointRank()<right.getDataPointRank()) { */
1518    /*      result.copy(right); */
1519    /*      result.binaryOp(*this,escript::rpow); */
1520    /*   } else { */
1521    /*      result.copy(*this); */
1522    /*      result.binaryOp(right,(Data::BinaryDFunPtr)::pow); */
1523    /*   } */
1524    /*   return result; */
1525    /* } */
1526    
1527  Data  Data
1528  Data::powD(const Data& right) const  Data::powD(const Data& right) const
1529  {  {
1530    Data result;    return C_TensorBinaryOperation(*this, right, ::pow);
   if (getDataPointRank()<right.getDataPointRank()) {  
      result.copy(right);  
      result.binaryOp(*this,escript::rpow);  
   } else {  
      result.copy(*this);  
      result.binaryOp(right,(Data::BinaryDFunPtr)::pow);  
   }  
   return result;  
1531  }  }
1532    
   
1533  //  //
1534  // NOTE: It is essential to specify the namespace this operator belongs to  // NOTE: It is essential to specify the namespace this operator belongs to
1535  Data  Data

Legend:
Removed from v.1331  
changed lines
  Added in v.1332

  ViewVC Help
Powered by ViewVC 1.1.26