From fb278ba76b9bc962b2d5724010f94d230e097dac Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@zedat.fu-berlin.de>
Date: Fri, 19 Mar 2021 15:32:15 +0100
Subject: [PATCH] remove debug print, towards production
---
dune/tectonic/io/hdf5-writer.hh | 2 +-
dune/tectonic/spatial-solving/fixedpointiterator.cc | 4 ++--
dune/tectonic/spatial-solving/tnnmg/linearization.hh | 2 +-
src/foam/foam.cfg | 12 ++++++------
src/strikeslip/CMakeLists.txt | 1 +
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dune/tectonic/io/hdf5-writer.hh b/dune/tectonic/io/hdf5-writer.hh
index 45c3171b..7e3d7c55 100644
--- a/dune/tectonic/io/hdf5-writer.hh
+++ b/dune/tectonic/io/hdf5-writer.hh
@@ -48,7 +48,7 @@ class HDF5Writer {
Vector mortarV;
contactNetwork.nBodyAssembler().nodalToTransformed(programState.v, mortarV);
- printRegularityTruncation(friction, mortarV);
+ //printRegularityTruncation(friction, mortarV);
std::vector<Vector> v_rel;
split(mortarV, v_rel);
diff --git a/dune/tectonic/spatial-solving/fixedpointiterator.cc b/dune/tectonic/spatial-solving/fixedpointiterator.cc
index 63682ee5..265790d4 100644
--- a/dune/tectonic/spatial-solving/fixedpointiterator.cc
+++ b/dune/tectonic/spatial-solving/fixedpointiterator.cc
@@ -152,9 +152,9 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorms>::run(
nBodyAssembler_.postprocess(total_v, velocityIterates);
//Rprint(velocityIterates, "velocityIterates loop:");
updaters.rate_->postProcess(velocityIterates);
- bool breakCriterion = true; //displacementCriterion(updaters, last_u); //stateCriterion(alpha, newAlpha);
+ bool breakCriterion = displacementCriterion(updaters, last_u); //displacementCriterion(updaters, last_u); //stateCriterion(alpha, newAlpha);
- printRegularityTruncation(globalFriction_, total_v);
+ //printRegularityTruncation(globalFriction_, total_v);
if (lambda_ < 1e-12 or breakCriterion) {
fixedPointIteration++;
diff --git a/dune/tectonic/spatial-solving/tnnmg/linearization.hh b/dune/tectonic/spatial-solving/tnnmg/linearization.hh
index f266bf32..a12e15c2 100644
--- a/dune/tectonic/spatial-solving/tnnmg/linearization.hh
+++ b/dune/tectonic/spatial-solving/tnnmg/linearization.hh
@@ -52,7 +52,7 @@ class Linearization {
}
}
- std::cout << "regularityTruncation: " << count << std::endl;
+ //std::cout << "regularityTruncation: " << count << std::endl;
}
template<class NV, class NBV, class T>
diff --git a/src/foam/foam.cfg b/src/foam/foam.cfg
index 1a38611a..b0ce4bb0 100644
--- a/src/foam/foam.cfg
+++ b/src/foam/foam.cfg
@@ -1,12 +1,12 @@
# -*- mode:conf -*-
[general]
-outPath = friction-0.6 # output written to ./output/outPath
+outPath = pipping-2013-euler # output written to ./output/outPath
gravity = 9.81 # [m/s^2]
[body0]
length = 6.0 # [m]
height = 1.0 # [m]
-bulkModulus = 0.0 #4.12e9 # [Pa] #2190
+bulkModulus = 0.0 # 4.12e7 #4.12e9 # [Pa] #2190
poissonRatio = 0.0 #0.3 # [1] #0.11
[body0.elastic]
density = 5e3 # [kg/m^3] #750
@@ -52,7 +52,7 @@ b = 0.015 # [ ]
sigmaN = 0.0 # [Pa]
[boundary.dirichlet]
-finalVelocity = 2e-3 #2e-4 # [m/s]
+finalVelocity = 2e-4 # [m/s]
[io]
data.write = true
@@ -69,11 +69,11 @@ bodyCount = 2
[initialTime]
timeStep = 0
relativeTime = 0.0
-relativeTau = 5e-4 # 1e-6
+relativeTau = 1e-4 # 1e-6
[timeSteps]
-scheme = newmark
-timeSteps = 2e3
+scheme = backwardEuler # newmark
+timeSteps = 1e4
[u0.solver]
maximumIterations = 100
diff --git a/src/strikeslip/CMakeLists.txt b/src/strikeslip/CMakeLists.txt
index 95dfa88f..a7b520c3 100644
--- a/src/strikeslip/CMakeLists.txt
+++ b/src/strikeslip/CMakeLists.txt
@@ -27,6 +27,7 @@ set(STRIKESLIP_SOURCE_FILES
../../dune/tectonic/time-stepping/rate.cc
../../dune/tectonic/time-stepping/rate/rateupdater.cc
../../dune/tectonic/time-stepping/state.cc
+ ../../dune/tectonic/time-stepping/uniformtimestepper.cc
strikeslip.cc
)
--
GitLab