Skip to content
Snippets Groups Projects
Commit 8770c7a3 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Dune is not the right namespace

parent dec7ece6
No related branches found
No related tags found
No related merge requests found
...@@ -10,11 +10,10 @@ ...@@ -10,11 +10,10 @@
#include "localfriction.hh" #include "localfriction.hh"
namespace Dune {
template <size_t dim> class EllipticEnergy { template <size_t dim> class EllipticEnergy {
public: public:
using SmallVector = FieldVector<double, dim>; using SmallVector = Dune::FieldVector<double, dim>;
using SmallMatrix = FieldMatrix<double, dim, dim>; using SmallMatrix = Dune::FieldMatrix<double, dim, dim>;
using Nonlinearity = LocalFriction<dim>; using Nonlinearity = LocalFriction<dim>;
...@@ -44,5 +43,4 @@ template <size_t dim> class EllipticEnergy { ...@@ -44,5 +43,4 @@ template <size_t dim> class EllipticEnergy {
y[i] = 0; y[i] = 0;
} }
}; };
}
#endif #endif
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "frictiondata.hh" #include "frictiondata.hh"
namespace Dune {
class FrictionPotentialWrapper { class FrictionPotentialWrapper {
public: public:
virtual ~FrictionPotentialWrapper() {} virtual ~FrictionPotentialWrapper() {}
...@@ -21,7 +20,7 @@ class FrictionPotentialWrapper { ...@@ -21,7 +20,7 @@ class FrictionPotentialWrapper {
double virtual regularity(double s) const = 0; double virtual regularity(double s) const = 0;
double virtual evaluate(double x) const { double virtual evaluate(double x) const {
DUNE_THROW(NotImplemented, "evaluation not implemented"); DUNE_THROW(Dune::NotImplemented, "evaluation not implemented");
} }
void virtual updateLogState(double) = 0; void virtual updateLogState(double) = 0;
...@@ -92,5 +91,4 @@ class TrivialFunction : public FrictionPotentialWrapper { ...@@ -92,5 +91,4 @@ class TrivialFunction : public FrictionPotentialWrapper {
void updateLogState(double) {} void updateLogState(double) {}
}; };
}
#endif #endif
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
#include "frictionpotential.hh" #include "frictionpotential.hh"
#include "localfriction.hh" #include "localfriction.hh"
namespace Dune {
template <class Matrix, class Vector> class GlobalNonlinearity { template <class Matrix, class Vector> class GlobalNonlinearity {
protected: protected:
using ScalarVector = BlockVector<FieldVector<double, 1>>; using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
public: public:
using IndexSet = Dune::MatrixIndexSet; using IndexSet = Dune::MatrixIndexSet;
...@@ -83,5 +82,4 @@ template <class Matrix, class Vector> class GlobalNonlinearity { ...@@ -83,5 +82,4 @@ template <class Matrix, class Vector> class GlobalNonlinearity {
virtual void updateLogState(ScalarVector const &logState) = 0; virtual void updateLogState(ScalarVector const &logState) = 0;
}; };
}
#endif #endif
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "localfriction.hh" #include "localfriction.hh"
#include "frictionpotential.hh" #include "frictionpotential.hh"
namespace Dune {
template <class Matrix, class Vector> template <class Matrix, class Vector>
class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> { class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> {
public: public:
...@@ -55,5 +54,4 @@ class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> { ...@@ -55,5 +54,4 @@ class GlobalRuinaNonlinearity : public GlobalNonlinearity<Matrix, Vector> {
private: private:
std::vector<std::shared_ptr<Friction>> restrictions; std::vector<std::shared_ptr<Friction>> restrictions;
}; };
}
#endif #endif
...@@ -29,11 +29,10 @@ double dotFirstNormalised(Vector const &x, Vector const &y) { ...@@ -29,11 +29,10 @@ double dotFirstNormalised(Vector const &x, Vector const &y) {
return sum; return sum;
} }
namespace Dune {
template <size_t dimension> class LocalFriction { template <size_t dimension> class LocalFriction {
public: public:
using VectorType = FieldVector<double, dimension>; using VectorType = Dune::FieldVector<double, dimension>;
using MatrixType = FieldMatrix<double, dimension, dimension>; using MatrixType = Dune::FieldMatrix<double, dimension, dimension>;
explicit LocalFriction(std::shared_ptr<FrictionPotentialWrapper> func) explicit LocalFriction(std::shared_ptr<FrictionPotentialWrapper> func)
: func(func) {} : func(func) {}
...@@ -123,5 +122,4 @@ template <size_t dimension> class LocalFriction { ...@@ -123,5 +122,4 @@ template <size_t dimension> class LocalFriction {
private: private:
std::shared_ptr<FrictionPotentialWrapper> const func; std::shared_ptr<FrictionPotentialWrapper> const func;
}; };
}
#endif #endif
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "mydirectionalconvexfunction.hh" #include "mydirectionalconvexfunction.hh"
namespace Dune {
template <class Functional> template <class Functional>
void descentMinimisation(Functional const &J, void descentMinimisation(Functional const &J,
typename Functional::SmallVector &x, typename Functional::SmallVector &x,
...@@ -47,5 +46,4 @@ void minimise(Functional const &J, typename Functional::SmallVector &x, ...@@ -47,5 +46,4 @@ void minimise(Functional const &J, typename Functional::SmallVector &x,
descentMinimisation(J, x, v, bisection); descentMinimisation(J, x, v, bisection);
} }
} }
}
#endif #endif
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* Just for debugging */ /* Just for debugging */
template <class Matrix, class Vector> template <class Matrix, class Vector>
double computeEnergy(Matrix const &A, Vector const &x, Vector const &b, double computeEnergy(Matrix const &A, Vector const &x, Vector const &b,
Dune::GlobalNonlinearity<Matrix, Vector> const &phi) { GlobalNonlinearity<Matrix, Vector> const &phi) {
return computeEnergy(A, x, b) + phi(x); return computeEnergy(A, x, b) + phi(x);
} }
...@@ -95,7 +95,7 @@ template <class ConvexProblem> class MyBlockProblem { ...@@ -95,7 +95,7 @@ template <class ConvexProblem> class MyBlockProblem {
v /= vnorm; // Rescale for numerical stability v /= vnorm; // Rescale for numerical stability
MyDirectionalConvexFunction< MyDirectionalConvexFunction<
Dune::GlobalNonlinearity<MatrixType, VectorType>> const GlobalNonlinearity<MatrixType, VectorType>> const
psi(computeDirectionalA(problem.A, v), psi(computeDirectionalA(problem.A, v),
computeDirectionalb(problem.A, problem.f, u, v), problem.phi, u, v); computeDirectionalb(problem.A, problem.f, u, v), problem.phi, u, v);
...@@ -253,8 +253,8 @@ class MyBlockProblem<ConvexProblem>::IterateObject { ...@@ -253,8 +253,8 @@ class MyBlockProblem<ConvexProblem>::IterateObject {
assert(localA != nullptr); assert(localA != nullptr);
auto const phi = problem.phi.restriction(m); auto const phi = problem.phi.restriction(m);
Dune::EllipticEnergy<block_size> localJ(*localA, localb, phi, ignore); EllipticEnergy<block_size> localJ(*localA, localb, phi, ignore);
Dune::minimise(localJ, ui, localsteps, bisection); minimise(localJ, ui, localsteps, bisection);
} }
} }
......
...@@ -91,7 +91,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann( ...@@ -91,7 +91,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
template <class GridView, int dimension> template <class GridView, int dimension>
auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, FrictionData const &fd) BoundaryPatch<GridView> const &frictionalBoundary, FrictionData const &fd)
-> std::shared_ptr<Dune::GlobalNonlinearity<Matrix, Vector>> { -> std::shared_ptr<GlobalNonlinearity<Matrix, Vector>> {
// Lump negative normal stress (kludge) // Lump negative normal stress (kludge)
ScalarVector weights; ScalarVector weights;
{ {
...@@ -107,7 +107,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity( ...@@ -107,7 +107,7 @@ auto MyAssembler<GridView, dimension>::assembleFrictionNonlinearity(
Dune::BitSetVector<1> frictionalNodes; Dune::BitSetVector<1> frictionalNodes;
frictionalBoundary.getVertices(frictionalNodes); frictionalBoundary.getVertices(frictionalNodes);
return std::make_shared<Dune::GlobalRuinaNonlinearity<Matrix, Vector>>( return std::make_shared<GlobalRuinaNonlinearity<Matrix, Vector>>(
frictionalNodes, weights, fd); frictionalNodes, weights, fd);
} }
......
...@@ -52,7 +52,7 @@ template <class GridView, int dimension> class MyAssembler { ...@@ -52,7 +52,7 @@ template <class GridView, int dimension> class MyAssembler {
Dune::VirtualFunction<double, double> const &neumann, Dune::VirtualFunction<double, double> const &neumann,
double relativeTime); double relativeTime);
std::shared_ptr<Dune::GlobalNonlinearity<Matrix, Vector>> std::shared_ptr<GlobalNonlinearity<Matrix, Vector>>
assembleFrictionNonlinearity( assembleFrictionNonlinearity(
BoundaryPatch<GridView> const &frictionalBoundary, BoundaryPatch<GridView> const &frictionalBoundary,
FrictionData const &fd); FrictionData const &fd);
......
...@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { ...@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
using ScalarMatrix = Dune::BCRSMatrix<SmallScalarMatrix>; using ScalarMatrix = Dune::BCRSMatrix<SmallScalarMatrix>;
using Vector = Dune::BlockVector<SmallVector>; using Vector = Dune::BlockVector<SmallVector>;
using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>; using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
using Nonlinearity = Dune::GlobalNonlinearity<Matrix, Vector>; using Nonlinearity = GlobalNonlinearity<Matrix, Vector>;
auto const E = parset.get<double>("body.E"); auto const E = parset.get<double>("body.E");
auto const nu = parset.get<double>("body.nu"); auto const nu = parset.get<double>("body.nu");
...@@ -391,9 +391,9 @@ int main(int argc, char *argv[]) { ...@@ -391,9 +391,9 @@ int main(int argc, char *argv[]) {
writer.writeInfo(alpha_initial, u_initial, v_initial); writer.writeInfo(alpha_initial, u_initial, v_initial);
// Set up TNNMG solver // Set up TNNMG solver
using NonlinearFactory = SolverFactory< using NonlinearFactory =
dims, MyBlockProblem<ConvexProblem< SolverFactory<dims, MyBlockProblem<ConvexProblem<
Dune::GlobalNonlinearity<Matrix, Vector>, Matrix>>, GlobalNonlinearity<Matrix, Vector>, Matrix>>,
Grid>; Grid>;
NonlinearFactory factory(parset.sub("solver.tnnmg"), refinements, *grid, NonlinearFactory factory(parset.sub("solver.tnnmg"), refinements, *grid,
velocityDirichletNodes); velocityDirichletNodes);
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <dune/tectonic/myblockproblem.hh> #include <dune/tectonic/myblockproblem.hh>
template class SolverFactory< template class SolverFactory<
DIM, MyBlockProblem< DIM,
ConvexProblem<Dune::GlobalNonlinearity<Matrix, Vector>, Matrix>>, MyBlockProblem<ConvexProblem<GlobalNonlinearity<Matrix, Vector>, Matrix>>,
Grid>; Grid>;
template class SolverFactory< template class SolverFactory<
DIM, BlockNonlinearTNNMGProblem< DIM, BlockNonlinearTNNMGProblem<
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment