From e1f0aa7d986e234ba185085a6dc12b1d2b501e20 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 22 Feb 2014 22:02:04 +0100
Subject: [PATCH] [Cleanup] Work around lack of FieldVector(initializer_list)
---
src/mygeometry.hh | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/mygeometry.hh b/src/mygeometry.hh
index 9f73081e..42f1fa60 100644
--- a/src/mygeometry.hh
+++ b/src/mygeometry.hh
@@ -1,15 +1,26 @@
#ifndef MY_GEOMETRY_HH
#define MY_GEOMETRY_HH
+#include <dune/common/fassign.hh>
+#include <dune/common/fvector.hh>
+
+// kludge because fieldvectors have no initialiser_list constructor,see
+// https://dune-project.org/flyspray/index.php?do=details&task_id=1166
+Dune::FieldVector<double, 2> generateVector(double x, double y) {
+ Dune::FieldVector<double, 2> tmp;
+ tmp <<= x, y;
+ return tmp;
+}
+
struct MyGeometry {
MyGeometry() {}
- Dune::FieldVector<double, 2> A = { 0, 0 };
- Dune::FieldVector<double, 2> B = { 5, 0 };
- Dune::FieldVector<double, 2> C = { 5, 1 };
- Dune::FieldVector<double, 2> D = { 0, 1 };
+ Dune::FieldVector<double, 2> A = generateVector(0, 0);
+ Dune::FieldVector<double, 2> B = generateVector(5, 0);
+ Dune::FieldVector<double, 2> C = generateVector(5, 1);
+ Dune::FieldVector<double, 2> D = generateVector(0, 1);
- Dune::FieldVector<double, 2> zenith = { 0, 1 };
+ Dune::FieldVector<double, 2> zenith = generateVector(0, 1);
};
#endif
--
GitLab