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

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

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

revision 1948 by jfenwick, Wed Oct 29 23:44:45 2008 UTC revision 1949 by jfenwick, Thu Oct 30 00:10:35 2008 UTC
# Line 489  Data::copyWithMask(const Data& other, Line 489  Data::copyWithMask(const Data& other,
489    }    }
490    Data other2(other);    Data other2(other);
491    Data mask2(mask);    Data mask2(mask);
492      other2.resolve();
493      mask2.resolve();
494      this->resolve();
495    FunctionSpace myFS=getFunctionSpace();    FunctionSpace myFS=getFunctionSpace();
496    FunctionSpace oFS=other2.getFunctionSpace();    FunctionSpace oFS=other2.getFunctionSpace();
497    FunctionSpace mFS=mask2.getFunctionSpace();    FunctionSpace mFS=mask2.getFunctionSpace();
# Line 535  Data::copyWithMask(const Data& other, Line 538  Data::copyWithMask(const Data& other,
538      throw DataException("Error - Unknown DataAbstract passed to copyWithMask.");      throw DataException("Error - Unknown DataAbstract passed to copyWithMask.");
539    }    }
540    // Now we iterate over the elements    // Now we iterate over the elements
541    DataVector& self=m_data->getVector();    DataVector& self=getReadyPtr()->getVector();
542    const DataVector& ovec=other2.m_data->getVector();    const DataVector& ovec=other2.getReadyPtr()->getVector();
543    const DataVector& mvec=mask2.m_data->getVector();    const DataVector& mvec=mask2.getReadyPtr()->getVector();
544    if ((self.size()!=ovec.size()) || (self.size()!=mvec.size()))    if ((self.size()!=ovec.size()) || (self.size()!=mvec.size()))
545    {    {
546      throw DataException("Error - size mismatch in arguments to copyWithMask.");      throw DataException("Error - size mismatch in arguments to copyWithMask.");

Legend:
Removed from v.1948  
changed lines
  Added in v.1949

  ViewVC Help
Powered by ViewVC 1.1.26