diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh index b7720ea5f73452548342feb65070ee85c9ff44e3..1a40187aaa4603b6209f9442e1fc6569271ec99f 100644 --- a/test/common/generalproblem/generallensproblem.hh +++ b/test/common/generalproblem/generallensproblem.hh @@ -412,7 +412,7 @@ private: { Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0]; Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width; - return onUpperBoundary_(globalPos) && 0.5 < lambda && lambda < 2.0/3.0; + return onUpperBoundary_(globalPos) && 0.5 < lambda + eps_ && lambda < 2.0/3.0 + eps_; } Scalar temperature_; diff --git a/test/common/generalproblem/generallensspatialparams.hh b/test/common/generalproblem/generallensspatialparams.hh index 07636ab59a1d29bc908080439e043182e00ea921..06adf1a765cef783626937ec82aee862c7e6e722 100644 --- a/test/common/generalproblem/generallensspatialparams.hh +++ b/test/common/generalproblem/generallensspatialparams.hh @@ -89,7 +89,7 @@ public: typedef typename MaterialLaw::Params MaterialLawParams; GeneralLensSpatialParams(const GridView& gridView) - : ParentType(gridView) + : ParentType(gridView), eps_(3e-6) { lensLowerLeft_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftX); lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftY); @@ -155,10 +155,10 @@ public: private: bool isInLens_(const GlobalPosition &globalPos) const { - for (int i = 0; i < dim; ++i) { - if (globalPos[i] < lensLowerLeft_[i] || globalPos[i] > lensUpperRight_[i]) + for (int i = 0; i < dim; ++i) + if (globalPos[i] < lensLowerLeft_[i] + eps_ || globalPos[i] > lensUpperRight_[i]) return false; - } + return true; } @@ -170,6 +170,8 @@ private: MaterialLawParams lensMaterialParams_; MaterialLawParams outerMaterialParams_; + + const Scalar eps_; }; } // end namespace