From 2154bf3b14fc879a3afad01339394287e74b4f4a Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Tue, 18 Feb 2020 21:02:43 +0100
Subject: [PATCH] Simplify calling Python functions
---
src/cosserat-continuum.cc | 6 ++----
src/gradient-flow.cc | 3 +--
src/harmonicmaps.cc | 2 --
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/cosserat-continuum.cc b/src/cosserat-continuum.cc
index 45c0c528..1bd4144a 100644
--- a/src/cosserat-continuum.cc
+++ b/src/cosserat-continuum.cc
@@ -266,12 +266,10 @@ int main (int argc, char *argv[]) try
for (auto&& vertex : vertices(gridView))
{
- bool isDirichlet;
- pythonDirichletVertices.evaluate(vertex.geometry().corner(0), isDirichlet);
+ bool isDirichlet = pythonDirichletVertices(vertex.geometry().corner(0));
dirichletVertices[indexSet.index(vertex)] = isDirichlet;
- bool isNeumann;
- pythonNeumannVertices.evaluate(vertex.geometry().corner(0), isNeumann);
+ bool isNeumann = pythonNeumannVertices(vertex.geometry().corner(0));
neumannVertices[indexSet.index(vertex)] = isNeumann;
}
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index e9c32fb1..0ada4c17 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -164,8 +164,7 @@ int main (int argc, char *argv[]) try
for (auto&& vertex : vertices(grid->leafGridView()))
{
- bool isDirichlet;
- pythonDirichletVertices.evaluate(vertex.geometry().corner(0), isDirichlet);
+ bool isDirichlet = pythonDirichletVertices(vertex.geometry().corner(0));
dirichletVertices[indexSet.index(vertex)] = isDirichlet;
}
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 84a08d3f..772fc06e 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -224,9 +224,7 @@ int main (int argc, char *argv[])
for (auto&& vertex : vertices(gridView))
{
- //bool isDirichlet;
bool isDirichlet = pythonDirichletVertices(vertex.geometry().corner(0));
- pythonDirichletVertices.evaluate(vertex.geometry().corner(0), isDirichlet);
dirichletVertices[indexSet.index(vertex)] = isDirichlet;
}
--
GitLab