From 35dd73b8acf5a93b3a3810a54d6c0802527bd087 Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@mi.fu-berlin.de>
Date: Fri, 17 Dec 2021 13:54:06 +0100
Subject: [PATCH] .
---
.../faultfactories/cantorfaultfactory.hh | 3 ++-
.../faultfactories/rockfaultfactory.hh | 16 ++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/dune/faultnetworks/faultfactories/cantorfaultfactory.hh b/dune/faultnetworks/faultfactories/cantorfaultfactory.hh
index 2b4e84a..6ec4627 100644
--- a/dune/faultnetworks/faultfactories/cantorfaultfactory.hh
+++ b/dune/faultnetworks/faultfactories/cantorfaultfactory.hh
@@ -11,6 +11,7 @@
#include <dune/grid/common/mcmgmapper.hh>
+// levelinterfacenetwork -> midpoints of edges -> constructs and stores its index coordinates
class CantorIndexHierarchy {
public:
typedef std::map<std::pair<int,int>, bool> LevelCantorIndices;
@@ -100,7 +101,7 @@ class CantorFaultFactory
protected:
typedef OscUnitCube<GridType, 2> GridOb;
- static const int dimworld = GridType::dimensionworld ;
+ static const int dimworld = GridType::dimensionworld;
static const int dim = GridType::dimension;
typedef typename GridType::ctype ctype;
typedef typename GridType::LevelGridView GV;
diff --git a/dune/faultnetworks/faultfactories/rockfaultfactory.hh b/dune/faultnetworks/faultfactories/rockfaultfactory.hh
index ed50053..bb2dd27 100644
--- a/dune/faultnetworks/faultfactories/rockfaultfactory.hh
+++ b/dune/faultnetworks/faultfactories/rockfaultfactory.hh
@@ -504,22 +504,30 @@ protected:
auto bottom = vertexPositions_[newRock.bottom];
MyRock rock00;
- auto center00 = 1.0/2*(right + bottom);
+ auto center00 = right;
+ center00 += bottom;
+ center00 *= 1.0/2;
createRock(rock00, center00, separatingDofs, x2Fault->getInterfaceDofs(), 0, y1Fault->getInterfaceDofs(), 0);
rocks_.push_back(rock00);
MyRock rock01;
- auto center01 = 1.0/2*(left + bottom);
+ auto center01 = left;
+ center01 += bottom;
+ center01 *= 1.0/2;
createRock(rock01, center01, separatingDofs, x1Fault->getInterfaceDofs(), 0, y1Fault->getInterfaceDofs(), 1);
rocks_.push_back(rock01);
MyRock rock10;
- auto center10 = 1.0/2*(right + top);
+ auto center10 = right;
+ center10 += top;
+ center10 *= 1.0/2;
createRock(rock10, center10, separatingDofs, x2Fault->getInterfaceDofs(), 1, y2Fault->getInterfaceDofs(), 0);
rocks_.push_back(rock10);
MyRock rock11;
- auto center11 = 1.0/2*(left + top);
+ auto center11 = left;
+ center11 += top;
+ center11 *= 1.0/2;
createRock(rock11, center11, separatingDofs, x1Fault->getInterfaceDofs(), 1, y2Fault->getInterfaceDofs(), 1);
rocks_.push_back(rock11);
}
--
GitLab