diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh index b903d18a6060a79bc1736f950b9d13da6a8e46ef..faf91cdbc4404af61cb451bbbc920c31f9cf201b 100644 --- a/dune/tectonic/globallaursennonlinearity.hh +++ b/dune/tectonic/globallaursennonlinearity.hh @@ -63,12 +63,12 @@ class GlobalLaursenNonlinearity } private: - shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity; - dataptr mu; dataptr normalStress; dataptr nodalIntegrals; + shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity; + std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions; }; } diff --git a/dune/tectonic/globalruinanonlinearity.hh b/dune/tectonic/globalruinanonlinearity.hh index c1eaf3c212d59e5bf0590f9650ce70c8b2245fa5..dd3af39be5e305aa15df2d94574bdee3b317e4c0 100644 --- a/dune/tectonic/globalruinanonlinearity.hh +++ b/dune/tectonic/globalruinanonlinearity.hh @@ -62,8 +62,6 @@ class GlobalRuinaNonlinearity } private: - shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity; - dataptr nodalIntegrals; dataptr a; dataptr mu; @@ -74,6 +72,8 @@ class GlobalRuinaNonlinearity dataptr L; double const h; + shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity; + std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions; }; } diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh index a69f2a0b2585361258564ed07076dc9850eab860..ca057affad8fdf4af3a9533d41df70c09e4ae293 100644 --- a/dune/tectonic/myblockproblem.hh +++ b/dune/tectonic/myblockproblem.hh @@ -240,14 +240,14 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem { } private: + Dune::ParameterTree const &parset; + // problem data MyConvexProblemType const &problem; // commonly used minimization stuff Bisection bisection; - Dune::ParameterTree const &parset; - mutable std::ostringstream outStream; };