From a052de8483eb34fb540fd6432c2ba5ec1c5c6c16 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 6 Jun 2012 11:14:05 +0200
Subject: [PATCH] Fix up initialisation order
---
dune/tectonic/globallaursennonlinearity.hh | 4 ++--
dune/tectonic/globalruinanonlinearity.hh | 4 ++--
dune/tectonic/myblockproblem.hh | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dune/tectonic/globallaursennonlinearity.hh b/dune/tectonic/globallaursennonlinearity.hh
index b903d18a..faf91cdb 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 c1eaf3c2..dd3af39b 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 a69f2a0b..ca057aff 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;
};
--
GitLab