diff --git a/dumux/boxmodels/common/pdelabboxassembler.hh b/dumux/boxmodels/common/pdelabboxassembler.hh index 28e1356eb19135928d7db4ca6b47d0c48c58115a..aab09f1ea836ed3f322f88e24cd61b06ee7892ef 100644 --- a/dumux/boxmodels/common/pdelabboxassembler.hh +++ b/dumux/boxmodels/common/pdelabboxassembler.hh @@ -187,42 +187,6 @@ public: residual_[globI] = 0; u[globI] = 0; } -// typedef typename Matrix::RowIterator RowIterator; -// typedef typename Matrix::ColIterator ColIterator; -// const typename Matrix::block_type::size_type rowsInBlock = Matrix::block_type::rows; -// const typename Matrix::block_type::size_type colsInBlock = Matrix::block_type::cols; -// Scalar diagonalEntry[rowsInBlock]; -// RowIterator endIBlock = matrix_->end(); -// for (RowIterator iBlock = matrix_->begin(); iBlock != endIBlock; ++iBlock) { -// BlockType &diagBlock = (*iBlock)[iBlock.index()]; -// -// for (int i = 0; i < rowsInBlock; ++i) { -// diagonalEntry[i] = 0; -// for (int j = 0; j < colsInBlock; ++j) { -// diagonalEntry[i] = std::max(diagonalEntry[i], -// std::abs(diagBlock[i][j])); -// } -// -// if (diagonalEntry[i] < 1e-14) -// diagonalEntry[i] = 1.0; -// } -// -// // divide right-hand side -// for (int i = 0; i < rowsInBlock; i++) { -// (residual_)[iBlock.index()][i] /= diagonalEntry[i]; -// } -// -// // divide row of the jacobian -// ColIterator endJBlock = iBlock->end(); -// for (ColIterator jBlock = iBlock->begin(); jBlock != endJBlock; ++jBlock) { -// for (int i = 0; i < rowsInBlock; i++) { -// for (int j = 0; j < colsInBlock; j++) { -// (*jBlock)[i][j] /= diagonalEntry[i]; -// } -// } -// } -// } - } void setMatrixReuseable(bool yesno = true) diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh index 9066bd2bc3b057da7e970c6808cac0f866b2f328..ca3c4ddd41c160dd180d8ca3f97b272f0d6ab9f2 100644 --- a/test/boxmodels/1p/1ptestproblem.hh +++ b/test/boxmodels/1p/1ptestproblem.hh @@ -20,6 +20,7 @@ #include <dune/grid/io/file/dgfparser/dgfug.hh> #include <dune/grid/io/file/dgfparser/dgfs.hh> #include <dune/grid/io/file/dgfparser/dgfyasp.hh> +#include <dune/grid/io/file/dgfparser/dgfalu.hh> #include <dune/grid/io/file/gmshreader.hh> #include <dumux/boxmodels/1p/1pmodel.hh> @@ -47,7 +48,7 @@ public: // Set the grid type #if HAVE_UG -SET_PROP(OnePTestProblem, Grid) { typedef Dune::UGGrid<3> type; }; +SET_PROP(OnePTestProblem, Grid) { typedef Dune::ALUCubeGrid<3,3> type; }; #else //SET_PROP(OnePTestProblem, Grid) { typedef Dune::SGrid<3, 3> type; }; SET_TYPE_PROP(OnePTestProblem, Grid, Dune::YaspGrid<3>);