diff --git a/dumux/multidomain/embedded/couplingmanager1d3d.hh b/dumux/multidomain/embedded/couplingmanager1d3d.hh index 0b9c09038ccae294cb8eee4ce11746cde9868b9f..53e647e594d54014599d6d30fa6a6e1c62b7ed31 100644 --- a/dumux/multidomain/embedded/couplingmanager1d3d.hh +++ b/dumux/multidomain/embedded/couplingmanager1d3d.hh @@ -33,6 +33,7 @@ #include <dumux/common/properties.hh> #include <dumux/common/indextraits.hh> +#include <dumux/common/geometry/distance.hh> #include <dumux/multidomain/embedded/pointsourcedata.hh> #include <dumux/multidomain/embedded/integrationpointsource.hh> #include <dumux/multidomain/embedded/couplingmanagerbase.hh> @@ -1040,7 +1041,7 @@ public: this->pointSourceData().emplace_back(std::move(psData)); // compute average distance to bulk cell - this->averageDistanceToBulkCell().push_back(this->computeDistance(outside.geometry(), globalPos)); + this->averageDistanceToBulkCell().push_back(averageDistancePointGeometry(globalPos, outside.geometry())); // export the lowdim coupling stencil // we insert all vertices / elements and make it unique later diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh index b130b9edd1021e8fbe7d2675fa4e68c3b90dbafb..7e0bc1621e0b82637b51466673d4f64ede749f16 100644 --- a/dumux/multidomain/embedded/couplingmanagerbase.hh +++ b/dumux/multidomain/embedded/couplingmanagerbase.hh @@ -36,6 +36,7 @@ #include <dune/geometry/quadraturerules.hh> #include <dumux/common/properties.hh> +#include <dumux/common/geometry/distance.hh> #include <dumux/common/geometry/intersectingentities.hh> #include <dumux/discretization/method.hh> #include <dumux/multidomain/couplingmanager.hh> @@ -318,7 +319,7 @@ public: this->pointSourceData().emplace_back(std::move(psData)); // compute average distance to bulk cell - averageDistanceToBulkCell_.push_back(computeDistance(outside.geometry(), globalPos)); + averageDistanceToBulkCell_.push_back(averageDistancePointGeometry(globalPos, outside.geometry())); // export the lowdim coupling stencil // we insert all vertices / elements and make it unique later @@ -477,16 +478,6 @@ protected: glue_->build(bulkGridGeometry.boundingBoxTree(), lowDimGridGeometry.boundingBoxTree()); } - template<class Geometry, class GlobalPosition> - Scalar computeDistance(const Geometry& geometry, const GlobalPosition& p) const - { - Scalar avgDist = 0.0; - const auto& quad = Dune::QuadratureRules<Scalar, bulkDim>::rule(geometry.type(), 5); - for (auto&& qp : quad) - avgDist += (geometry.global(qp.position())-p).two_norm()*qp.weight(); - return avgDist; - } - //! Return reference to point source data vector member std::vector<PointSourceData>& pointSourceData() { return pointSourceData_; }