From c4ade0044faa462707ecd48b19b5f85f4ef6c9af Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 22 Sep 2011 12:37:22 +0000
Subject: [PATCH] Move back to storing coefficients in a std::vector instead of
a std::array.
We need the extra flexibility for higher-order functions.
Run-time loss is around 1% -- that's okay.
[[Imported from SVN: r7836]]
---
dune/gfe/averagedistanceassembler.hh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dune/gfe/averagedistanceassembler.hh b/dune/gfe/averagedistanceassembler.hh
index 3adc9295..33319bc7 100644
--- a/dune/gfe/averagedistanceassembler.hh
+++ b/dune/gfe/averagedistanceassembler.hh
@@ -13,7 +13,13 @@ class AverageDistanceAssembler
public:
AverageDistanceAssembler(const Dune::array<TargetSpace,N>& coefficients,
- const Dune::array<double,N>& weights)
+ const Dune::array<double,N>& weights) DUNE_DEPRECATED
+ : coefficients_(coefficients.begin(), coefficients.end()),
+ weights_(weights.begin(), weights.end())
+ {}
+
+ AverageDistanceAssembler(const std::vector<TargetSpace>& coefficients,
+ const std::vector<double>& weights)
: coefficients_(coefficients),
weights_(weights)
{}
@@ -75,9 +81,9 @@ public:
}
- const Dune::array<TargetSpace,N> coefficients_;
+ const std::vector<TargetSpace> coefficients_;
- const Dune::array<double,N> weights_;
+ const std::vector<double> weights_;
};
--
GitLab