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

Fix up initialisation order

parent ed5b103c
No related branches found
No related tags found
No related merge requests found
...@@ -63,12 +63,12 @@ class GlobalLaursenNonlinearity ...@@ -63,12 +63,12 @@ class GlobalLaursenNonlinearity
} }
private: private:
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
dataptr mu; dataptr mu;
dataptr normalStress; dataptr normalStress;
dataptr nodalIntegrals; dataptr nodalIntegrals;
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions; std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions;
}; };
} }
......
...@@ -62,8 +62,6 @@ class GlobalRuinaNonlinearity ...@@ -62,8 +62,6 @@ class GlobalRuinaNonlinearity
} }
private: private:
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
dataptr nodalIntegrals; dataptr nodalIntegrals;
dataptr a; dataptr a;
dataptr mu; dataptr mu;
...@@ -74,6 +72,8 @@ class GlobalRuinaNonlinearity ...@@ -74,6 +72,8 @@ class GlobalRuinaNonlinearity
dataptr L; dataptr L;
double const h; double const h;
shared_ptr<LocalNonlinearity<dim> const> const trivialNonlinearity;
std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions; std::vector<shared_ptr<LocalNonlinearity<dim> const>> mutable restrictions;
}; };
} }
......
...@@ -240,14 +240,14 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem { ...@@ -240,14 +240,14 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
} }
private: private:
Dune::ParameterTree const &parset;
// problem data // problem data
MyConvexProblemType const &problem; MyConvexProblemType const &problem;
// commonly used minimization stuff // commonly used minimization stuff
Bisection bisection; Bisection bisection;
Dune::ParameterTree const &parset;
mutable std::ostringstream outStream; mutable std::ostringstream outStream;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment