From f2c3cc418f86f88f8e19c07a6ba8ac8acc9bb62a Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@mi.fu-berlin.de>
Date: Fri, 13 Mar 2020 14:53:24 +0100
Subject: [PATCH] .
---
dune/tectonic/io/uniform-grid-writer.cc | 2 +-
.../spatial-solving/fixedpointiterator.cc | 2 +-
src/multi-body-problem/multi-body-problem.cc | 4 +-
src/multi-body-problem/multi-body-problem.cfg | 69 +++++++++++--------
src/strikeslip/strikeslip-2D.cfg | 4 +-
5 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/dune/tectonic/io/uniform-grid-writer.cc b/dune/tectonic/io/uniform-grid-writer.cc
index f35759ac..cf7d466d 100644
--- a/dune/tectonic/io/uniform-grid-writer.cc
+++ b/dune/tectonic/io/uniform-grid-writer.cc
@@ -10,7 +10,7 @@
// #include <dune/common/parametertree.hh>
// #include <dune/common/parametertreeparser.hh>
-#include "assemblers.hh"
+#include "../assemblers.hh"
#include "gridselector.hh"
#include "io/vtk.hh"
diff --git a/dune/tectonic/spatial-solving/fixedpointiterator.cc b/dune/tectonic/spatial-solving/fixedpointiterator.cc
index 0a9ad5c1..b3080a54 100644
--- a/dune/tectonic/spatial-solving/fixedpointiterator.cc
+++ b/dune/tectonic/spatial-solving/fixedpointiterator.cc
@@ -272,7 +272,7 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorms>::run(
//print(alpha, "alpha: ");
- //std::cout << "-FixedPointIteration finished! " << std::endl;
+ std::cout << "-FixedPointIteration finished with " << fixedPointIteration << " iterations, lambda " << lambda_ << "! " << std::endl;
if (fixedPointIteration == fixedPointMaxIterations_)
DUNE_THROW(Dune::Exception, "FPI failed to converge");
diff --git a/src/multi-body-problem/multi-body-problem.cc b/src/multi-body-problem/multi-body-problem.cc
index 62da56ba..b94a7beb 100644
--- a/src/multi-body-problem/multi-body-problem.cc
+++ b/src/multi-body-problem/multi-body-problem.cc
@@ -57,7 +57,7 @@
#include <dune/tectonic/factories/stackedblocksfactory.hh>
#include <dune/tectonic/factories/threeblocksfactory.hh>
-#include <dune/tectonic/io/hdf5-levelwriter.hh>
+#include <dune/tectonic/io/hdf5-writer.hh>
#include <dune/tectonic/io/hdf5/restart-io.hh>
#include <dune/tectonic/io/vtk.hh>
@@ -254,7 +254,7 @@ int main(int argc, char *argv[]) {
auto dataWriter =
writeData ? std::make_unique<
- HDF5LevelWriter<MyProgramState, MyVertexBasis, DefLeafGridView>>(
+ HDF5Writer<MyProgramState, MyVertexBasis, DefLeafGridView>>(
*dataFile, vertexCoordinates, vertexBases,
frictionPatches, weakPatches)
: nullptr;
diff --git a/src/multi-body-problem/multi-body-problem.cfg b/src/multi-body-problem/multi-body-problem.cfg
index 53f96e97..8a5362a1 100644
--- a/src/multi-body-problem/multi-body-problem.cfg
+++ b/src/multi-body-problem/multi-body-problem.cfg
@@ -1,59 +1,68 @@
# -*- mode:conf -*-
gravity = 9.81 # [m/s^2]
-[io]
-data.write = false
-printProgress = true
-restarts.first = 0
-restarts.spacing= 20
-restarts.write = false #true
-vtk.write = true
-
-[problem]
-finalTime = 1000 # [s] #1000
-bodyCount = 3
[body]
-bulkModulus = 0.5e5 # [Pa]
-poissonRatio = 0.3 # [1]
+bulkModulus = 1.5e5 # [Pa]
+poissonRatio = 0.11 # [1]
[body.elastic]
-density = 900 # [kg/m^3]
-shearViscosity = 1e3 # [Pas]
-bulkViscosity = 1e3 # [Pas]
+density = 1300 # [kg/m^3]
+shearViscosity = 0 # [Pas]
+bulkViscosity = 0 # [Pas]
[body.viscoelastic]
-density = 1000 # [kg/m^3]
+density = 1300 # [kg/m^3]
shearViscosity = 1e4 # [Pas]
bulkViscosity = 1e4 # [Pas]
+
[boundary.friction]
-C = 10 # [Pa]
-mu0 = 0.7 # [ ]
-V0 = 5e-5 # [m/s]
-L = 2.25e-5 # [m]
-initialAlpha = 0 # [ ]
+C = 6 # [Pa]
+mu0 = 0.48 # [ ]
+V0 = 1e-3 # [m/s]
+L = 1e-6 # [m]
+initialAlpha = 0 # [ ]
stateModel = AgeingLaw
frictionModel = Truncated #Regularised
[boundary.friction.weakening]
-a = 0.002 # [ ]
-b = 0.017 # [ ]
+a = 0.054 # [ ]
+b = 0.074 # [ ]
[boundary.friction.strengthening]
-a = 0.020 # [ ]
-b = 0.005 # [ ]
+a = 0.054 # [ ]
+b = 0.074 # [ ]
+
[boundary.neumann]
-sigmaN = 0.0 # [Pa]
+sigmaN = 200.0 # [Pa]
+
[boundary.dirichlet]
-finalVelocity = 5e-5 # [m/s]
+finalVelocity = 1e-4 # [m/s]
+
[initialTime]
timeStep = 0
relativeTime = 0.0
-relativeTau = 5e-4 # 1e-6
+relativeTau = 2e-4 # 1e-6
+
[timeSteps]
scheme = newmark
-timeSteps = 1
+timeSteps = 5000
+
+
+[problem]
+finalTime = 100 # [s] #1000
+bodyCount = 3
+
+
+[io]
+data.write = false
+printProgress = true
+restarts.first = 0
+restarts.spacing= 20
+restarts.write = false #true
+vtk.write = true
+
[u0.solver]
maximumIterations = 100
diff --git a/src/strikeslip/strikeslip-2D.cfg b/src/strikeslip/strikeslip-2D.cfg
index 05590e22..5fb2c390 100644
--- a/src/strikeslip/strikeslip-2D.cfg
+++ b/src/strikeslip/strikeslip-2D.cfg
@@ -6,7 +6,7 @@ smallestDiameter = 0.05 # 2e-3 [m]
smallestDiameter = 0.05 # 2e-3 [m]
[timeSteps]
-refinementTolerance = 1e-4 # 1e-5
+refinementTolerance = 5e-6 # 1e-5
[u0.solver]
tolerance = 1e-8
@@ -18,7 +18,7 @@ tolerance = 1e-8
tolerance = 1e-8
[v.fpi]
-tolerance = 1e-4 # 1e-5
+tolerance = 1e-5 # 1e-5
[solver.tnnmg.preconditioner.basesolver]
tolerance = 1e-10
--
GitLab