From dbf78f2edb219c0258d31429225563f84fba21d1 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Fri, 1 Dec 2017 12:16:05 +0100
Subject: [PATCH] Don't use deprecated header dune/common/array.hh
---
dune/gfe/globalgfetestfunction.hh | 6 +++---
dune/gfe/localgfetestfunctionbasis.hh | 2 +-
dune/gfe/quaternion.hh | 1 -
dune/gfe/realtuple.hh | 1 -
dune/gfe/rotation.hh | 3 ++-
dune/gfe/tensor3.hh | 2 +-
dune/gfe/tensorssd.hh | 3 ++-
src/compute-disc-error.cc | 4 +++-
src/gradient-flow.cc | 4 +++-
src/harmonicmaps.cc | 6 ++++--
src/mixed-cosserat-continuum.cc | 4 +++-
test/globalgfetestfunctionbasistest.cc | 4 ++--
test/localgfetestfunctiontest.cc | 6 +++---
13 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/dune/gfe/globalgfetestfunction.hh b/dune/gfe/globalgfetestfunction.hh
index 48c503b1..253bdb57 100644
--- a/dune/gfe/globalgfetestfunction.hh
+++ b/dune/gfe/globalgfetestfunction.hh
@@ -1,12 +1,12 @@
#ifndef GLOBAL_GEODESIC_FINITE_ELEMENT_TEST_FUNCTION_HH
#define GLOBAL_GEODESIC_FINITE_ELEMENT_TEST_FUNCTION_HH
+#include <array>
#include <vector>
#include <dune/istl/bvector.hh>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
-#include <dune/common/array.hh>
/** \brief Global geodesic finite element test function.
@@ -69,7 +69,7 @@ void GlobalGFETestFunction<Basis,TargetSpace,CoefficientType>::evaluateLocal(con
EmbeddedTangentVector& out) const
{
// values of the test basis functions
- std::vector<Dune::array<EmbeddedTangentVector, tangentDim> > values;
+ std::vector<std::array<EmbeddedTangentVector, tangentDim> > values;
// create local gfe test function
basis_.getLocalFiniteElement(element).localBasis().evaluateFunction(local, values);
@@ -91,7 +91,7 @@ void GlobalGFETestFunction<Basis,TargetSpace,CoefficientType>::evaluateDerivativ
Dune::FieldMatrix<ctype, embeddedDim, gridDim>& out) const
{
// jacobians of the test basis function - a lot of dims here...
- std::vector<Dune::array<Dune::FieldMatrix<ctype, embeddedDim, gridDim>, tangentDim> > refJacobians,jacobians;
+ std::vector<std::array<Dune::FieldMatrix<ctype, embeddedDim, gridDim>, tangentDim> > refJacobians,jacobians;
// evaluate local gfe test function basis
basis_.getLocalFiniteElement(element).localBasis().evaluateJacobian(local, refJacobians);
diff --git a/dune/gfe/localgfetestfunctionbasis.hh b/dune/gfe/localgfetestfunctionbasis.hh
index d6a257cb..ed1af0a3 100644
--- a/dune/gfe/localgfetestfunctionbasis.hh
+++ b/dune/gfe/localgfetestfunctionbasis.hh
@@ -1,10 +1,10 @@
#ifndef LOCAL_GFE_TEST_FUNCTION_HH
#define LOCAL_GFE_TEST_FUNCTION_HH
+#include <array>
#include <vector>
#include <dune/common/fvector.hh>
-#include <dune/common/array.hh>
#include <dune/geometry/type.hh>
#include <dune/gfe/localgeodesicfefunction.hh>
diff --git a/dune/gfe/quaternion.hh b/dune/gfe/quaternion.hh
index 56c92b78..e88ee526 100644
--- a/dune/gfe/quaternion.hh
+++ b/dune/gfe/quaternion.hh
@@ -2,7 +2,6 @@
#define QUATERNION_HH
#include <dune/common/fvector.hh>
-#include <dune/common/array.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/exceptions.hh>
diff --git a/dune/gfe/realtuple.hh b/dune/gfe/realtuple.hh
index 5921c9ea..64bb0ee9 100644
--- a/dune/gfe/realtuple.hh
+++ b/dune/gfe/realtuple.hh
@@ -1,7 +1,6 @@
#ifndef REAL_TUPLE_HH
#define REAL_TUPLE_HH
-#include <dune/common/array.hh>
#include <dune/common/fvector.hh>
#include <dune/istl/scaledidmatrix.hh>
diff --git a/dune/gfe/rotation.hh b/dune/gfe/rotation.hh
index b4e2fce9..619ac6e4 100644
--- a/dune/gfe/rotation.hh
+++ b/dune/gfe/rotation.hh
@@ -5,8 +5,9 @@
\brief Define rotations in Euclidean spaces
*/
+#include <array>
+
#include <dune/common/fvector.hh>
-#include <dune/common/array.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/exceptions.hh>
diff --git a/dune/gfe/tensor3.hh b/dune/gfe/tensor3.hh
index 4c0db934..89cd648e 100644
--- a/dune/gfe/tensor3.hh
+++ b/dune/gfe/tensor3.hh
@@ -5,7 +5,7 @@
\brief A third-rank tensor
*/
-#include <dune/common/array.hh>
+#include <array>
#include <dune/common/fmatrix.hh>
/** \brief A third-rank tensor
diff --git a/dune/gfe/tensorssd.hh b/dune/gfe/tensorssd.hh
index a1f1fe72..43680fe5 100644
--- a/dune/gfe/tensorssd.hh
+++ b/dune/gfe/tensorssd.hh
@@ -5,7 +5,8 @@
\brief A third-rank tensor with two static (SS) and one dynamic (D) dimension
*/
-#include <dune/common/array.hh>
+#include <array>
+
#include <dune/common/fmatrix.hh>
/** \brief A third-rank tensor with two static (SS) and one dynamic (D) dimension
diff --git a/src/compute-disc-error.cc b/src/compute-disc-error.cc
index d2469707..f20f327c 100644
--- a/src/compute-disc-error.cc
+++ b/src/compute-disc-error.cc
@@ -1,5 +1,7 @@
#include <config.h>
+#include <array>
+
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
@@ -344,7 +346,7 @@ int main (int argc, char *argv[]) try
lower = parameterSet.get<FieldVector<double,dimworld> >("lower");
upper = parameterSet.get<FieldVector<double,dimworld> >("upper");
- array<unsigned int,dim> elements = parameterSet.get<array<unsigned int,dim> >("elements");
+ auto elements = parameterSet.get<std::array<unsigned int,dim> >("elements");
grid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
referenceGrid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
}
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index c0f57032..e1fef548 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -7,6 +7,8 @@
#include <adolc/adouble.h>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
+#include <array>
+
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
@@ -122,7 +124,7 @@ int main (int argc, char *argv[]) try
lower = parameterSet.get<FieldVector<double,dimworld> >("lower");
upper = parameterSet.get<FieldVector<double,dimworld> >("upper");
- elements = parameterSet.get<array<unsigned int,dim> >("elements");
+ elements = parameterSet.get<std::array<unsigned int,dim> >("elements");
grid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
}
else
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index eb306a6e..b84095f9 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -7,6 +7,8 @@
#include <adolc/adouble.h>
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
+#include <array>
+
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
@@ -116,14 +118,14 @@ int main (int argc, char *argv[]) try
shared_ptr<GridType> grid;
FieldVector<double,dim> lower(0), upper(1);
- array<unsigned int,dim> elements;
+ std::array<unsigned int,dim> elements;
if (parameterSet.get<bool>("structuredGrid")) {
lower = parameterSet.get<FieldVector<double,dim> >("lower");
upper = parameterSet.get<FieldVector<double,dim> >("upper");
- elements = parameterSet.get<array<unsigned int,dim> >("elements");
+ elements = parameterSet.get<std::array<unsigned int,dim> >("elements");
grid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
} else {
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index 1204d07c..2a71adc5 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -10,6 +10,8 @@
#include <dune/fufem/utilities/adolcnamespaceinjections.hh>
+#include <array>
+
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
@@ -124,7 +126,7 @@ int main (int argc, char *argv[]) try
lower = parameterSet.get<FieldVector<double,dim> >("lower");
upper = parameterSet.get<FieldVector<double,dim> >("upper");
- array<unsigned int,dim> elements = parameterSet.get<array<unsigned int,dim> >("elements");
+ auto elements = parameterSet.get<std::array<unsigned int,dim> >("elements");
grid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
} else {
diff --git a/test/globalgfetestfunctionbasistest.cc b/test/globalgfetestfunctionbasistest.cc
index 3f671495..beb1d719 100644
--- a/test/globalgfetestfunctionbasistest.cc
+++ b/test/globalgfetestfunctionbasistest.cc
@@ -1,10 +1,10 @@
#include <config.h>
#include <fenv.h>
+#include <array>
#include <iostream>
#include <dune/common/fvector.hh>
-#include <dune/common/array.hh>
#include <dune/fufem/functionspacebases/p1nodalbasis.hh>
@@ -50,7 +50,7 @@ void test()
const typename GlobalBasis::LocalFiniteElement& lfe = basis.getLocalFiniteElement(*eIt);
FieldVector<double,1> stupidTestPoint(0);
- std::vector<Dune::array<typename TargetSpace::EmbeddedTangentVector, TargetSpace::TangentVector::dimension> > values;
+ std::vector<std::array<typename TargetSpace::EmbeddedTangentVector, TargetSpace::TangentVector::dimension> > values;
lfe.localBasis().evaluateFunction(stupidTestPoint, values);
for(size_t i=0;i<values.size();i++) {
std::cout<<values[i]<<std::endl;
diff --git a/test/localgfetestfunctiontest.cc b/test/localgfetestfunctiontest.cc
index e2944767..dee684c7 100644
--- a/test/localgfetestfunctiontest.cc
+++ b/test/localgfetestfunctiontest.cc
@@ -2,9 +2,9 @@
#include <fenv.h>
#include <iostream>
+#include <array>
#include <dune/common/fvector.hh>
-#include <dune/common/array.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include <dune/gfe/rotation.hh>
@@ -53,11 +53,11 @@ void test()
FieldVector<double,domainDim> stupidTestPoint(0);
// test whether evaluation of the shape functions works
- std::vector<array<typename TargetSpace::EmbeddedTangentVector, TargetSpace::TangentVector::dimension> > values;
+ std::vector<std::array<typename TargetSpace::EmbeddedTangentVector, TargetSpace::TangentVector::dimension> > values;
testFunctionSet.localBasis().evaluateFunction(stupidTestPoint, values);
// test whether evaluation of the shape function derivatives works
- std::vector<array<FieldMatrix<double, TargetSpace::EmbeddedTangentVector::dimension, domainDim>, TargetSpace::TangentVector::dimension> > derivatives;
+ std::vector<std::array<FieldMatrix<double, TargetSpace::EmbeddedTangentVector::dimension, domainDim>, TargetSpace::TangentVector::dimension> > derivatives;
testFunctionSet.localBasis().evaluateJacobian(stupidTestPoint, derivatives);
}
--
GitLab