Skip to content
Snippets Groups Projects
Commit 884ef870 authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Remove unused and rarely used typedefs

parent 2238bfbc
No related branches found
No related tags found
Loading
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
template<class GridType, class MatrixType, class VectorType, class BitVector> template<class GridType, class MatrixType, class VectorType, class BitVector>
void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10) void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10)
{ {
typedef VectorType Vector;
typedef MatrixType Matrix;
typedef EnergyNorm<Matrix, Vector> Norm;
// create double obstacle constraints // create double obstacle constraints
const int blockSize = VectorType::block_type::dimension; const int blockSize = VectorType::block_type::dimension;
...@@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat ...@@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
Dune::BitSetVector<blockSize> hasObstacle(x.size(),true); Dune::BitSetVector<blockSize> hasObstacle(x.size(),true);
mmgStep.hasObstacle_ = &hasObstacle; mmgStep.hasObstacle_ = &hasObstacle;
std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size()); std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size());
for (int i = 0; i < boxConstraints.size(); ++i) for (int i = 0; i < boxConstraints.size(); ++i)
{ {
for (int j = 0; j < blockSize; ++j) for (int j = 0; j < blockSize; ++j)
......
...@@ -28,15 +28,12 @@ ...@@ -28,15 +28,12 @@
template<class GridType, class MatrixType, class VectorType, class BitVector> template<class GridType, class MatrixType, class VectorType, class BitVector>
void solveObstacleProblemByQuadraticIPOptSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10) void solveObstacleProblemByQuadraticIPOptSolver(const GridType& grid, const MatrixType& mat, VectorType& x, const VectorType& rhs, const BitVector& ignore, int maxIterations=100, double tolerance=1.0e-10)
{ {
typedef VectorType Vector;
typedef MatrixType Matrix;
typedef EnergyNorm<Matrix, Vector> Norm;
typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver; typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver;
const int blockSize = VectorType::block_type::dimension; const int blockSize = VectorType::block_type::dimension;
// create double obstacle constraints // create double obstacle constraints
std::vector<BoxConstraint<typename Vector::field_type,blockSize> > boxConstraints(rhs.size()); std::vector<BoxConstraint<typename VectorType::field_type,blockSize> > boxConstraints(rhs.size());
for (int i = 0; i < boxConstraints.size(); ++i) for (int i = 0; i < boxConstraints.size(); ++i)
{ {
for (int j = 0; j < blockSize; ++j) for (int j = 0; j < blockSize; ++j)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment