diff --git a/dune/tectonic/io/hdf5-writer.hh b/dune/tectonic/io/hdf5-writer.hh index 45c3171bc9135a54fd7a326a00117c6acbc0cfb4..7e3d7c556a86ea20f0ef9e8e140aa6bab005a24b 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 63682ee5a4344fc25ddb6e33dbd6c2bb67b62a31..265790d4de74e9c1e46ecc21aa082c8d824adb63 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 f266bf326fd7c108e3b66c40cba08e34bb8482c5..a12e15c2afab1ffa102555f851a814054ebb02f0 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 1a38611a3beb8e94cd0874946798fe7d3a3f04dc..b0ce4bb0044aca99641654dbad7d77848e8c0c9e 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 95dfa88f73b9d524482fba05ad01ebccf2bc527c..a7b520c3774802f0f06c5b836417e1b2cc2b683c 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 )