Re-arrange boundary parameters

src/one-body-sample.cc

@@ -220,12 +220,12 @@ int main(int argc, char *argv[]) {
       std::vector<double> coefficientOfFriction;
       coefficientOfFriction.resize(grid.size(grid.maxLevel(), dim));
       std::fill(coefficientOfFriction.begin(), coefficientOfFriction.end(),
-                parset.get<double>("boundary.mu"));
+                parset.get<double>("boundary.friction.mu"));
 
       std::vector<double> normalStress;
       normalStress.resize(grid.size(grid.maxLevel(), dim));
       std::fill(normalStress.begin(), normalStress.end(),
-                parset.get<double>("boundary.normalstress"));
+                parset.get<double>("boundary.friction.normalstress"));
 
       Dune::GlobalNonlinearity<dim> *myGlobalNonlinearity;
 
@@ -234,11 +234,13 @@ int main(int argc, char *argv[]) {
       if (friction_model == std::string("Ruina")) {
         std::vector<double> a;
         a.resize(grid.size(grid.maxLevel(), dim));
-        std::fill(a.begin(), a.end(), parset.get<double>("boundary.a"));
+        std::fill(a.begin(), a.end(),
+                  parset.get<double>("boundary.friction.ruina.a"));
 
         std::vector<double> eta;
         eta.resize(grid.size(grid.maxLevel(), dim));
-        std::fill(eta.begin(), eta.end(), parset.get<double>("boundary.eta"));
+        std::fill(eta.begin(), eta.end(),
+                  parset.get<double>("boundary.friction.eta"));
 
         myGlobalNonlinearity = new Dune::GlobalRuinaNonlinearity<dim>(
             nodalIntegrals, a, coefficientOfFriction, eta, normalStress);

src/one-body-sample.parset

@@ -11,11 +11,11 @@ nu = 0.3
 maxiterations = 100000
 tolerance = 1e-6
 
-[boundary]
-a = 0.0015
+[boundary.friction]
 normalstress = 0.1
 mu = 0.75
 eta = 1
-
-[boundary.friction]
 model = Laursen
+
+[boundary.friction.ruina]
+a = 0.0015