From d67e7b1b10450000bddb1985acf00ac9a9fe63b2 Mon Sep 17 00:00:00 2001
From: Julie PATELA <julie.patela.ocre@cea.fr>
Date: Wed, 29 Jul 2020 11:46:07 +0200
Subject: [PATCH] Use MeshData to get face lenght/area
---
.../algorithms/Heat5PointsAlgorithm.cpp | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/language/algorithms/Heat5PointsAlgorithm.cpp b/src/language/algorithms/Heat5PointsAlgorithm.cpp
index 05cf171dd..b46f0739f 100644
--- a/src/language/algorithms/Heat5PointsAlgorithm.cpp
+++ b/src/language/algorithms/Heat5PointsAlgorithm.cpp
@@ -116,26 +116,15 @@ Heat5PointsAlgorithm<Dimension>::Heat5PointsAlgorithm(
0, true); // forces last output
const CellValue<const double> dual_Vj = diamond_mesh_data.Vj();
- const auto& face_to_node_matrix = mesh->connectivity().faceToNodeMatrix();
- const FaceValue<const double> mes_l = [=] {
- FaceValue<double> compute_mes_l{mesh->connectivity()};
- const NodeValue<const TinyVector<Dimension>>& xr = mesh->xr();
+ const FaceValue<const double> mes_l = [&] {
if constexpr (Dimension == 1) {
+ FaceValue<double> compute_mes_l{mesh->connectivity()};
compute_mes_l.fill(1);
- } else if constexpr (Dimension == 2) {
- parallel_for(
- mesh->numberOfFaces(), PUGS_LAMBDA(FaceId face_id) {
- const auto& face_to_node = face_to_node_matrix[face_id];
- const NodeId node_id1 = face_to_node[0];
- const NodeId node_id2 = face_to_node[1];
- const TinyVector<Dimension, double> r = xr[node_id1] - xr[node_id2];
- compute_mes_l[face_id] = l2Norm(r);
- });
+ return compute_mes_l;
} else {
- throw NotImplementedError("Not implemented in 3D");
+ return mesh_data.ll();
}
- return compute_mes_l;
}();
const CellValue<const double> dual_mes_l_j = [=] {
--
GitLab