From 21f32d46ecfccbdb3ebedd31c731de705203ccd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de>
Date: Tue, 21 Aug 2018 15:40:02 +0200
Subject: [PATCH] Cleanup code and do some bugfixes
---
bin/analyzegrid/test_2d_structured.ini | 2 --
bin/analyzegrid/test_2d_unstructured.ini | 2 --
bin/analyzegrid/test_3d_structured.ini | 2 --
bin/analyzegrid/test_3d_unstructured.ini | 2 --
dune/perftool/sumfact/invertgeometry.hh | 4 ++--
python/dune/perftool/sumfact/switch.py | 10 +++++++---
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/bin/analyzegrid/test_2d_structured.ini b/bin/analyzegrid/test_2d_structured.ini
index 29eca446..327827a8 100644
--- a/bin/analyzegrid/test_2d_structured.ini
+++ b/bin/analyzegrid/test_2d_structured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_2d_deg2_symdiff_nonquadvec_nongradvec
cells = 16 16
deg_suffix = deg2
diff_suffix = symdiff
diff --git a/bin/analyzegrid/test_2d_unstructured.ini b/bin/analyzegrid/test_2d_unstructured.ini
index 7e9d460d..c8f4c25a 100644
--- a/bin/analyzegrid/test_2d_unstructured.ini
+++ b/bin/analyzegrid/test_2d_unstructured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_2d_unstructured_deg2_symdiff_nonquadvec_nongradvec
deg_suffix = deg2
diff_suffix = symdiff
elementType = quadrilateral
diff --git a/bin/analyzegrid/test_3d_structured.ini b/bin/analyzegrid/test_3d_structured.ini
index 575f8877..83fc69b5 100644
--- a/bin/analyzegrid/test_3d_structured.ini
+++ b/bin/analyzegrid/test_3d_structured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_3d_deg2_symdiff_nonquadvec_nongradvec
cells = 8 8 8
deg_suffix = deg2
diff_suffix = symdiff
diff --git a/bin/analyzegrid/test_3d_unstructured.ini b/bin/analyzegrid/test_3d_unstructured.ini
index 900efe54..9f4e53b2 100644
--- a/bin/analyzegrid/test_3d_unstructured.ini
+++ b/bin/analyzegrid/test_3d_unstructured.ini
@@ -1,5 +1,3 @@
-__exec_suffix = deg2_symdiff_nonquadvec_nongradvec
-__name = /home/rene/phd/dune-les/build-optimized-clang60-python3/dune-perftool/test/sumfact/poisson/sumfact_poisson_dg_3d_unstructured_deg2_symdiff_nonquadvec_nongradvec
deg_suffix = deg2
diff_suffix = symdiff
elementType = quadrilateral
diff --git a/dune/perftool/sumfact/invertgeometry.hh b/dune/perftool/sumfact/invertgeometry.hh
index b24d6e2e..a20708e8 100644
--- a/dune/perftool/sumfact/invertgeometry.hh
+++ b/dune/perftool/sumfact/invertgeometry.hh
@@ -5,7 +5,7 @@
template<typename T>
inline T invert_and_return_determinant(const T a00, const T a10, const T a01, const T a11, T inverse[4]){
T det = a00 * a11 - a10 * a01;
- assert (det != 0.0);
+ assert (std::abs(det) > 1e-12);
inverse[0] = a11 / det;
inverse[1] = -a10 / det;
@@ -35,7 +35,7 @@ inline T invert_and_return_determinant(const T a00, const T a10, const T a20,
det += t12 * a12;
det -= t14 * a11;
- assert (det != 0.0);
+ assert (std::abs(det) > 1e-12);
T t17 = 1.0/det;
diff --git a/python/dune/perftool/sumfact/switch.py b/python/dune/perftool/sumfact/switch.py
index 1528d2c9..0aeef4f3 100644
--- a/python/dune/perftool/sumfact/switch.py
+++ b/python/dune/perftool/sumfact/switch.py
@@ -62,7 +62,11 @@ def decide_if_kernel_is_necessary(facedir_s, facemod_s, facedir_n, facemod_n):
with open(filename) as csv_file:
csv_reader = csv.reader(csv_file, delimiter=" ")
for row in csv_reader:
- if (facedir_s == int(row[1])) and (facemod_s == int(row[2])) and (facedir_n == int(row[3])) and (facemod_n == int(row[4])):
+ if (row[0] == 'skeleton' and
+ facedir_s == int(row[1])) and \
+ (facemod_s == int(row[2])) and \
+ (facedir_n == int(row[3])) and \
+ (facemod_n == int(row[4])):
return True
return False
else:
@@ -110,7 +114,7 @@ def generate_exterior_facet_switch():
),
args))
- block.append(" default: assert(false);")
+ block.append(" default: throw(std::exception());")
block.append(" }")
block.append("}")
@@ -143,7 +147,7 @@ def generate_interior_facet_switch():
),
args))
- block.append(" default: assert(false);")
+ block.append(" default: throw(std::exception());")
block.append(" }")
block.append("}")
--
GitLab