Commit 281556c2 by Praetorius, Simon

### A lot of cleanup, corrected DirichletBC, removed boost

parent e54ba68f
 ... @@ -19,7 +19,8 @@ namespace AMDiS ... @@ -19,7 +19,8 @@ namespace AMDiS * problems (see ProblemInstat). It contains a pointer to a ProblemInstat * problems (see ProblemInstat). It contains a pointer to a ProblemInstat * object. * object. */ */ class AdaptInstationary : public AdaptBase class AdaptInstationary : public AdaptBase { { public: public: /// Creates a AdaptInstationary object with the given name for the time /// Creates a AdaptInstationary object with the given name for the time ... @@ -75,19 +76,19 @@ namespace AMDiS ... @@ -75,19 +76,19 @@ namespace AMDiS protected: protected: /// Strategy for choosing one timestep /// Strategy for choosing one timestep int strategy; int strategy = 0; /// Parameter \f$\delta_1 \f$ used in time step reduction /// Parameter \f$\delta_1 \f$ used in time step reduction double timeDelta1; double timeDelta1 = 0.7071; /// Parameter \f$\delta_2 \f$ used in time step enlargement /// Parameter \f$\delta_2 \f$ used in time step enlargement double timeDelta2; double timeDelta2 = 1.4142; /// If this parameter is 1 and the instationary problem is stable, hence the number /// If this parameter is 1 and the instationary problem is stable, hence the number /// of solver iterations to solve the problem is zero, the adaption loop will stop. /// of solver iterations to solve the problem is zero, the adaption loop will stop. int breakWhenStable; bool breakWhenStable = false; /// /// min-timestep == max-timestep bool fixedTimestep; bool fixedTimestep; }; }; ... ...
 #pragma once #pragma once // std c++ headers #include #include // AMDiS includes #include #include #include #include ... @@ -13,6 +16,7 @@ namespace AMDiS ... @@ -13,6 +16,7 @@ namespace AMDiS static constexpr int dim = GridView::dimension; static constexpr int dim = GridView::dimension; using ctype = typename GridView::ctype; using ctype = typename GridView::ctype; using LocalQuadratureRules = Dune::QuadratureRules; using QuadratureRule = QuadratureRuleFactory_t; using QuadratureRule = QuadratureRuleFactory_t; using Geometry = typename Impl::Get::Geometry; using Geometry = typename Impl::Get::Geometry; ... @@ -24,7 +28,7 @@ namespace AMDiS ... @@ -24,7 +28,7 @@ namespace AMDiS : geometry(get_geometry(element)) : geometry(get_geometry(element)) { { int order = op.getQuadratureDegree(geometry.type(), geometry, degree, type); int order = op.getQuadratureDegree(geometry.type(), geometry, degree, type); auto const& quad = Dune::QuadratureRules::rule(geometry.type(), order); auto const& quad = LocalQuadratureRules::rule(geometry.type(), order); quadrature.reset(new QuadratureRule(element, quad)); quadrature.reset(new QuadratureRule(element, quad)); } } ... @@ -36,7 +40,7 @@ namespace AMDiS ... @@ -36,7 +40,7 @@ namespace AMDiS * elements this is a wrapper around the classical element quadrature rule. * elements this is a wrapper around the classical element quadrature rule. * Access the underlying dune-quadrature rule, with quadrature->getRule(). * Access the underlying dune-quadrature rule, with quadrature->getRule(). **/ **/ auto const& getQuadrature() const QuadratureRule const& getQuadrature() const { { return *quadrature; return *quadrature; } } ... ...