Commit 557b76e3 authored by Christian Engwer's avatar Christian Engwer
Browse files

merge revision 872:873 from trunk :

[[Imported from SVN: r874]]
parents d91366de 60c1d035
...@@ -206,10 +206,7 @@ namespace Dune ...@@ -206,10 +206,7 @@ namespace Dune
skip_[i] = skip[i]; skip_[i] = skip[i];
} }
for (unsigned int i=0; i<=numRows_; ++i) for (unsigned int i=0; i<=numRows_; ++i)
{ rows_[ i ] = coeff_ + (rows_[ i ] - coeff);
ptrdiff_t offset = ( rows_[i] - coeff);
rows_[i] = coeff_ + offset;
}
delete [] coeff; delete [] coeff;
delete [] skip; delete [] skip;
...@@ -236,7 +233,7 @@ namespace Dune ...@@ -236,7 +233,7 @@ namespace Dune
} }
} }
private: private:
SparseCoeffMatrix(const This &other) SparseCoeffMatrix ( const This &other )
: numRows_( other.numRows_ ), : numRows_( other.numRows_ ),
numCols_( other.numCols_ ) numCols_( other.numCols_ )
{ {
...@@ -250,8 +247,9 @@ namespace Dune ...@@ -250,8 +247,9 @@ namespace Dune
skip_[i] = other.skip_[i]; skip_[i] = other.skip_[i];
} }
for (unsigned int i=0; i<=numRows_; ++i) for (unsigned int i=0; i<=numRows_; ++i)
rows_[i] = other.rows_[i]+(coeff_-other.coeff_); rows_[ i ] = coeff_ + (other.rows_[ i ] - other.coeff_);
} }
This &operator= (const This&); This &operator= (const This&);
Field *coeff_; Field *coeff_;
Field **rows_; Field **rows_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment