From 0a6f39c3294d06774db327fe86b4ba87fd84b737 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Wed, 23 Sep 2015 16:07:55 +0200
Subject: [PATCH] Use std::array instead of Dune::array.
---
.../geomexactstvenantkirchhofffunctionalassembler.hh | 3 ++-
.../geomexactstvenantkirchhoffoperatorassembler.hh | 5 +++--
.../assemblers/localassemblers/strainproductassembler.hh | 4 +++-
dune/fufem/assemblers/preconditioneddefectassembler.hh | 9 +++++----
dune/fufem/blockmatrixview.hh | 5 ++---
dune/fufem/estimators/refinementindicator.hh | 5 ++---
dune/fufem/functiontools/basisidmapper.hh | 3 ++-
dune/fufem/interval.hh | 9 ++-------
dune/fufem/matlab_io.hh | 4 ++--
dune/fufem/mechanics/newpfeassembler.hh | 3 ++-
dune/fufem/test/common.hh | 4 ++--
dune/fufem/test/functionintegratortest.cc | 3 ++-
dune/fufem/test/laplaceassemblertest.cc | 4 +++-
dune/fufem/test/secondorderassemblertest.cc | 4 +++-
dune/fufem/ulis_tools.hh | 1 -
15 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhofffunctionalassembler.hh b/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhofffunctionalassembler.hh
index 86d55ddd..977df4a9 100644
--- a/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhofffunctionalassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhofffunctionalassembler.hh
@@ -3,6 +3,7 @@
#ifndef DUNE_FUFEM_LOCAL_ASSEMBLERS_GEOMETRICALLY_EXACT_ST_VENANT_KIRCHHOFF_FUNCTIONAL_ASSEMBLER_HH
#define DUNE_FUFEM_LOCAL_ASSEMBLERS_GEOMETRICALLY_EXACT_ST_VENANT_KIRCHHOFF_FUNCTIONAL_ASSEMBLER_HH
+#include <array>
#include <memory>
#include <dune/common/fvector.hh>
@@ -130,7 +131,7 @@ public:
localConfGrad[i][i] += 1;
//compute linearized strain for all shapefunctions
- std::vector<Dune::array<SymmetricTensor<dim>,dim> > linStrain(rows);
+ std::vector<std::array<SymmetricTensor<dim>,dim> > linStrain(rows);
for (int i=0; i<rows; i++)
for (int k=0; k<dim; k++) {
diff --git a/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhoffoperatorassembler.hh b/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhoffoperatorassembler.hh
index f9924c15..f3c616e8 100644
--- a/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhoffoperatorassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/geomexactstvenantkirchhoffoperatorassembler.hh
@@ -3,6 +3,7 @@
#ifndef DUNE_FUFEM_LOCAL_ASSEMBLERS_GEOMETRICALLY_EXACT_ST_VENANT_KIRCHHOFF_OPERATOR_ASSEMBLER_HH
#define DUNE_FUFEM_LOCAL_ASSEMBLERS_GEOMETRICALLY_EXACT_ST_VENANT_KIRCHHOFF_OPERATOR_ASSEMBLER_HH
+#include <array>
#include <memory>
#include <dune/common/fvector.hh>
@@ -136,8 +137,8 @@ public:
// /////////////////////////////////////////////
// Compute linearized strain for all shape functions
// /////////////////////////////////////////////
- std::vector<Dune::array<FMdimdim, dim > > defGrad(rows);
- std::vector<Dune::array<SymmetricTensor<dim>,dim> > linStrain(rows);
+ std::vector<std::array<FMdimdim, dim > > defGrad(rows);
+ std::vector<std::array<SymmetricTensor<dim>,dim> > linStrain(rows);
for (int i=0; i<rows; i++) {
diff --git a/dune/fufem/assemblers/localassemblers/strainproductassembler.hh b/dune/fufem/assemblers/localassemblers/strainproductassembler.hh
index 719a779b..a7beb576 100644
--- a/dune/fufem/assemblers/localassemblers/strainproductassembler.hh
+++ b/dune/fufem/assemblers/localassemblers/strainproductassembler.hh
@@ -1,6 +1,8 @@
#ifndef STRAIN_PRODUCT_ASSEMBLER_HH
#define STRAIN_PRODUCT_ASSEMBLER_HH
+#include <array>
+
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
@@ -91,7 +93,7 @@ class StrainProductAssembler
// /////////////////////////////////////////////
// Compute strain for all shape functions
// /////////////////////////////////////////////
- std::vector<Dune::array<SymmetricTensor<dim>,dim> > strain(rows);
+ std::vector<std::array<SymmetricTensor<dim>,dim> > strain(rows);
for (int i=0; i<rows; i++) {
diff --git a/dune/fufem/assemblers/preconditioneddefectassembler.hh b/dune/fufem/assemblers/preconditioneddefectassembler.hh
index c161703b..2bc6f8b0 100644
--- a/dune/fufem/assemblers/preconditioneddefectassembler.hh
+++ b/dune/fufem/assemblers/preconditioneddefectassembler.hh
@@ -1,7 +1,8 @@
#ifndef PRECONDITIONED_DEFECT_ASSEMBLER_HH
#define PRECONDITIONED_DEFECT_ASSEMBLER_HH
-#include <dune/common/array.hh>
+#include <array>
+
#include <dune/istl/matrix.hh>
#include "dune/fufem/functionspacebases/functionspacebasis.hh"
@@ -31,9 +32,9 @@ class PreconditionedDefectAssembler
const GlobalLHSVectorType& x,
const bool lumping=false) const
{
- Dune::array<GlobalRHSVectorType*,1> b_wrapped = {{ &b }};
- Dune::array<const double,1> alpha_wrapped = {{ alpha}};
- Dune::array<const GlobalLHSVectorType*,1> x_wrapped = {{ &x }};
+ std::array<GlobalRHSVectorType*,1> b_wrapped = {{ &b }};
+ std::array<const double,1> alpha_wrapped = {{ alpha}};
+ std::array<const GlobalLHSVectorType*,1> x_wrapped = {{ &x }};
assembleMultipleResiduals(localAssembler, A, b_wrapped, alpha_wrapped, x_wrapped, lumping);
}
diff --git a/dune/fufem/blockmatrixview.hh b/dune/fufem/blockmatrixview.hh
index 4541a4a4..274ff14a 100644
--- a/dune/fufem/blockmatrixview.hh
+++ b/dune/fufem/blockmatrixview.hh
@@ -1,10 +1,9 @@
#ifndef BLOCK_MATRIX_VIEW_HH
#define BLOCK_MATRIX_VIEW_HH
+#include <array>
#include <vector>
-#include <dune/common/array.hh>
-
template <class MatrixType>
class BlockMatrixView
{
@@ -45,7 +44,7 @@ public:
static void setupBlockMatrix(const std::vector<const MatrixType*>& submat, MatrixType& mat);
protected:
- std::vector<Dune::array<int,2> > offsets_;
+ std::vector<std::array<int,2> > offsets_;
int nRows_, nCols_;
diff --git a/dune/fufem/estimators/refinementindicator.hh b/dune/fufem/estimators/refinementindicator.hh
index 01863626..c2d52191 100644
--- a/dune/fufem/estimators/refinementindicator.hh
+++ b/dune/fufem/estimators/refinementindicator.hh
@@ -3,10 +3,9 @@
#ifndef DUNE_FUFEM_ESTIMATORS_REFINEMENT_INDICATOR_HH
#define DUNE_FUFEM_ESTIMATORS_REFINEMENT_INDICATOR_HH
+#include <array>
#include <map>
-#include <dune/common/array.hh>
-
#include <dune/localfunctions/common/localkey.hh>
/** \brief Holds refinement indicators for a hierarchical grid
@@ -61,7 +60,7 @@ private:
const GridType* grid_;
// One map per codimension
- Dune::array<std::map<IdType, field_type>, dim+1> indicators_;
+ std::array<std::map<IdType, field_type>, dim+1> indicators_;
};
diff --git a/dune/fufem/functiontools/basisidmapper.hh b/dune/fufem/functiontools/basisidmapper.hh
index 69849d07..6f535160 100644
--- a/dune/fufem/functiontools/basisidmapper.hh
+++ b/dune/fufem/functiontools/basisidmapper.hh
@@ -1,6 +1,7 @@
#ifndef BASIS_ID_MAPPER_HH
#define BASIS_ID_MAPPER_HH
+#include <array>
#include <memory>
#include <dune/common/fvector.hh>
@@ -167,7 +168,7 @@ class BasisIdMapper
StoredFEMap storedFEs_;
std::map<IdType, const LocalFiniteElement*> elementToFE_;
- Dune::array< std::map<IdType, int> , dim+1 > indices_;
+ std::array< std::map<IdType, int> , dim+1 > indices_;
bool allowVanishingElements_;
};
diff --git a/dune/fufem/interval.hh b/dune/fufem/interval.hh
index 5332ab12..ebef2d1f 100644
--- a/dune/fufem/interval.hh
+++ b/dune/fufem/interval.hh
@@ -1,15 +1,10 @@
#ifndef DUNE_FUFEM_INTERVAL_HH
#define DUNE_FUFEM_INTERVAL_HH
+#include <array>
#include <iostream>
#include <algorithm>
-
-
-#include <dune/common/array.hh>
-
-
-
/** \brief Encapsulates a closed interval
* \tparam field_type The type used for real numbers
*/
@@ -65,7 +60,7 @@ public:
private:
/** \brief The actual data */
- Dune::array<field_type,2> data_;
+ std::array<field_type,2> data_;
};
//! Output operator for Interval
diff --git a/dune/fufem/matlab_io.hh b/dune/fufem/matlab_io.hh
index 982a3015..987347ae 100644
--- a/dune/fufem/matlab_io.hh
+++ b/dune/fufem/matlab_io.hh
@@ -1,11 +1,11 @@
#ifndef MATLAB_IO_HH
#define MATLAB_IO_HH
+#include <array>
#include <stdio.h>
#include <string>
#include <dune/common/exceptions.hh>
-#include <dune/common/array.hh>
/** \file
\brief Code for writing 1d-grid data in Matlab format
@@ -44,7 +44,7 @@ FILE* openFile(const std::string& filename, GridType& grid)
This is for domain decomposition stuff. We implicitly assume that the grids are 1D.
*/
template<class GridType>
-FILE* openFileDD(const std::string& filename, const Dune::array<GridType*, 2>& grid)
+FILE* openFileDD(const std::string& filename, const std::array<GridType*, 2>& grid)
{
enum {dim = GridType::dimension};
diff --git a/dune/fufem/mechanics/newpfeassembler.hh b/dune/fufem/mechanics/newpfeassembler.hh
index 52184dc3..e536b79d 100644
--- a/dune/fufem/mechanics/newpfeassembler.hh
+++ b/dune/fufem/mechanics/newpfeassembler.hh
@@ -1,6 +1,7 @@
#ifndef NEWPFEASSEMBLER_HH
#define NEWPFEASSEMBLER_HH
+#include <array>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
@@ -114,7 +115,7 @@ class NewPFEAssembler : public LocalOperatorAssembler < GridType, TrialLocalFE,
// /////////////////////////////////////////////
// Compute strain for all shape functions
// /////////////////////////////////////////////
- std::vector<Dune::array<SymmetricTensor<dim>,dim> > strain(rows);
+ std::vector<std::array<SymmetricTensor<dim>,dim> > strain(rows);
for (int i=0; i<rows; i++)
{
diff --git a/dune/fufem/test/common.hh b/dune/fufem/test/common.hh
index 872f5dcb..e309a10f 100644
--- a/dune/fufem/test/common.hh
+++ b/dune/fufem/test/common.hh
@@ -1,7 +1,7 @@
#ifndef DUNE_FUFEM_TEST_COMMON_HH
#define DUNE_FUFEM_TEST_COMMON_HH
-
+#include <array>
#include <vector>
#include <dune/common/fvector.hh>
@@ -272,7 +272,7 @@ Dune::YaspGrid<dim>* constructCoarseYaspGrid()
typedef Dune::YaspGrid<dim> GridType;
Dune::FieldVector<typename GridType::ctype,dim> L(1.0);
- typename Dune::array<int,dim> s;
+ typename std::array<int,dim> s;
std::fill(s.begin(), s.end(), 1);
GridType* grid = new GridType(L,s);
diff --git a/dune/fufem/test/functionintegratortest.cc b/dune/fufem/test/functionintegratortest.cc
index 3ca14c61..1200d8fe 100644
--- a/dune/fufem/test/functionintegratortest.cc
+++ b/dune/fufem/test/functionintegratortest.cc
@@ -1,5 +1,6 @@
#include <config.h>
+#include <array>
#include <cmath>
#include <stdio.h>
#include <list>
@@ -95,7 +96,7 @@ class TestPolynomial:
template <int dim>
struct PolyCoeff
{
- Dune::array<int,dim> multiindex;
+ std::array<int,dim> multiindex;
double coeff;
PolyCoeff():
diff --git a/dune/fufem/test/laplaceassemblertest.cc b/dune/fufem/test/laplaceassemblertest.cc
index 6c2f4511..ee2edc9b 100644
--- a/dune/fufem/test/laplaceassemblertest.cc
+++ b/dune/fufem/test/laplaceassemblertest.cc
@@ -1,5 +1,7 @@
#include <config.h>
+#include <array>
+
#include <dune/common/parallel/mpihelper.hh>
#include <dune/grid/yaspgrid.hh>
@@ -29,7 +31,7 @@ int main (int argc, char *argv[]) try
typedef YaspGrid<2> GridType;
FieldVector<double,2> h(3);
- Dune::array<int,2> n = {3,3};
+ std::array<int,2> n = {3,3};
GridType grid(h,n);
diff --git a/dune/fufem/test/secondorderassemblertest.cc b/dune/fufem/test/secondorderassemblertest.cc
index 3e003fa7..07124dcc 100644
--- a/dune/fufem/test/secondorderassemblertest.cc
+++ b/dune/fufem/test/secondorderassemblertest.cc
@@ -2,6 +2,8 @@
// vi: set ts=8 sw=2 et sts=2:
#include <config.h>
+#include <array>
+
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/timer.hh>
@@ -73,7 +75,7 @@ int main (int argc, char *argv[]) try
typedef YaspGrid<dim> GridType;
FieldVector<double,dim> h(1);
- Dune::array<int,dim> n;
+ std::array<int,dim> n;
n.fill(2);
n[0] = 3;
diff --git a/dune/fufem/ulis_tools.hh b/dune/fufem/ulis_tools.hh
index e24f6148..8f6c93dd 100644
--- a/dune/fufem/ulis_tools.hh
+++ b/dune/fufem/ulis_tools.hh
@@ -3,7 +3,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
-#include <dune/common/array.hh>
#include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/matrixindexset.hh>
--
GitLab