/[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 1811 by ksteube, Thu Sep 25 23:11:13 2008 UTC revision 1841 by gross, Fri Oct 3 03:57:52 2008 UTC
# Line 479  Data::copyWithMask(const Data& other, Line 479  Data::copyWithMask(const Data& other,
479    }    }
480    Data mask1;    Data mask1;
481    Data mask2;    Data mask2;
   
482    mask1 = mask.wherePositive();    mask1 = mask.wherePositive();
   mask2.copy(mask1);  
483    
484      mask2.copy(mask1);
485    mask1 *= other;    mask1 *= other;
486    
487    mask2 *= *this;    mask2 *= *this;
488    mask2 = *this - mask2;    mask2 = *this - mask2;
   
489    *this = mask1 + mask2;    *this = mask1 + mask2;
490  }  }
491    

Legend:
Removed from v.1811  
changed lines
  Added in v.1841

  ViewVC Help
Powered by ViewVC 1.1.26