From 19e0d69ee71660d2c04dd4842b18b28f7083f766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 10 Jul 2018 11:23:49 +0200
Subject: [PATCH] [ex3] introduce eps for isinlens query
---
exercises/exercise-fluidsystem/spatialparams.hh | 5 +++--
exercises/solution/ex3/spatialparams.hh | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/exercises/exercise-fluidsystem/spatialparams.hh b/exercises/exercise-fluidsystem/spatialparams.hh
index 36297290..ce90f611 100644
--- a/exercises/exercise-fluidsystem/spatialparams.hh
+++ b/exercises/exercise-fluidsystem/spatialparams.hh
@@ -147,11 +147,12 @@ public:
{
const auto x = globalPos[0];
const auto y = globalPos[1];
- return (x < 40 && x > 20 && y > 35 && y < 45) ||
- (x < 50 && x > 30 && y < 30 && y > 15);
+ return (x < 40 + eps_ && x > 20 - eps_ && y > 35 - eps_ && y < 45 + eps_) ||
+ (x < 50 + eps_ && x > 30 - eps_ && y < 30 + eps_ && y > 15 - eps_);
}
private:
+ static constexpr Scalar eps_ = 1e-6;
Dune::FieldMatrix<Scalar, dim, dim> K_;
Dune::FieldMatrix<Scalar, dim, dim> KLens_;
diff --git a/exercises/solution/ex3/spatialparams.hh b/exercises/solution/ex3/spatialparams.hh
index 36297290..68d62e48 100644
--- a/exercises/solution/ex3/spatialparams.hh
+++ b/exercises/solution/ex3/spatialparams.hh
@@ -147,14 +147,16 @@ public:
{
const auto x = globalPos[0];
const auto y = globalPos[1];
- return (x < 40 && x > 20 && y > 35 && y < 45) ||
- (x < 50 && x > 30 && y < 30 && y > 15);
+ return (x < 40 + eps_ && x > 20 - eps_ && y > 35 - eps_ && y < 45 + eps_) ||
+ (x < 50 + eps_ && x > 30 - eps_ && y < 30 + eps_ && y > 15 - eps_);
}
private:
+ static constexpr Scalar eps_ = 1e-6;
Dune::FieldMatrix<Scalar, dim, dim> K_;
Dune::FieldMatrix<Scalar, dim, dim> KLens_;
+
// Object that holds the values/parameters of the selected material law.
MaterialLawParams materialParams_;
MaterialLawParams materialParamsLens_;
--
GitLab