Commit e2f8db60 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[cleanup] Use array from std:: instead of Dune::

(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15047 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 2e1f2e45
......@@ -92,7 +92,7 @@ class CROperatorAssemblerTwoP
typedef typename MatrixType::block_type MBlockType;
typedef typename MatrixType::RowIterator rowiterator;
typedef typename MatrixType::ColIterator coliterator;
typedef Dune::array<BoundaryConditions::Flags,1> BCBlockType; // componentwise boundary conditions
typedef std::array<BoundaryConditions::Flags,1> BCBlockType; // componentwise boundary conditions
typedef Dune::BlockVector< Dune::FieldVector<double,1> > SatType;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,FaceLayout> FaceMapper;
......
......@@ -92,7 +92,7 @@ class CROperatorAssemblerTwoPAdaptive
typedef typename MatrixType::block_type MBlockType;
typedef typename MatrixType::RowIterator rowiterator;
typedef typename MatrixType::ColIterator coliterator;
typedef Dune::array<BoundaryConditions::Flags,1> BCBlockType; // componentwise boundary conditions
typedef std::array<BoundaryConditions::Flags,1> BCBlockType; // componentwise boundary conditions
typedef Dune::BlockVector< Dune::FieldVector<double,1> > SatType;
typedef Dumux::IntersectionMapper<GridView> IntersectionMapper;
......
......@@ -20,6 +20,7 @@
#ifndef DUMUX_LOCAL_STIFFNESS_HH
#define DUMUX_LOCAL_STIFFNESS_HH
#include <array>
#include<iostream>
#include<vector>
#include<set>
......@@ -28,7 +29,6 @@
#include<dune/common/timer.hh>
#include<dune/common/fvector.hh>
#include<dune/common/fmatrix.hh>
#include<dune/common/array.hh>
#include<dune/geometry/type.hh>
#include<dune/grid/common/grid.hh>
#include<dune/istl/operators.hh>
......@@ -76,7 +76,7 @@ namespace Dumux
// types for matrics, vectors and boundary conditions
typedef Dune::FieldMatrix<Scalar,m,m> MBlockType; // one entry in the stiffness matrix
typedef Dune::FieldVector<Scalar,m> VBlockType; // one entry in the global vectors
typedef Dune::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
typedef std::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
virtual ~LocalStiffness ()
......@@ -256,7 +256,7 @@ namespace Dumux
// types for matrics, vectors and boundary conditions
typedef Dune::FieldMatrix<Scalar,m,m> MBlockType; // one entry in the stiffness matrix
typedef Dune::FieldVector<Scalar,m> VBlockType; // one entry in the global vectors
typedef Dune::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
typedef std::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
/*! initialize local stiffness matrix */
LinearLocalStiffness ()
......
......@@ -72,11 +72,11 @@ class MPNCVtkWriterEnergy<TypeTag, /*enableEnergy = */ true, /* numEnergyEquatio
typedef typename ParentType::ScalarVector ScalarVector;
typedef typename ParentType::PhaseVector PhaseVector;
typedef typename ParentType::ComponentVector ComponentVector;
typedef Dune::array<ScalarVector, numEnergyEqs> EnergyEqVector;
typedef std::array<ScalarVector, numEnergyEqs> EnergyEqVector;
typedef Dune::FieldVector<Scalar, dimWorld> DimWorldVector;
typedef Dune::BlockVector<DimWorldVector> DimWorldField;
typedef Dune::array<DimWorldField, numPhases> PhaseDimWorldField;
typedef std::array<DimWorldField, numPhases> PhaseDimWorldField;
public:
......@@ -321,11 +321,11 @@ class MPNCVtkWriterEnergy<TypeTag, /*enableEnergy = */ true, /* numEnergyEquatio
typedef typename ParentType::ScalarVector ScalarVector;
typedef typename ParentType::PhaseVector PhaseVector;
typedef typename ParentType::ComponentVector ComponentVector;
typedef Dune::array<ScalarVector, numEnergyEqs> EnergyEqVector;
typedef std::array<ScalarVector, numEnergyEqs> EnergyEqVector;
typedef Dune::FieldVector<Scalar, dimWorld> DimWorldVector;
typedef Dune::BlockVector<DimWorldVector> DimWorldField;
typedef Dune::array<DimWorldField, numPhases> PhaseDimWorldField;
typedef std::array<DimWorldField, numPhases> PhaseDimWorldField;
public:
......
......@@ -74,13 +74,13 @@ class MPNCModelKinetic : public MPNCModel<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::BlockVector<GlobalPosition> GlobalPositionField;
typedef Dune::array<GlobalPositionField, numPhases> PhaseGlobalPositionField;
typedef std::array<GlobalPositionField, numPhases> PhaseGlobalPositionField;
typedef std::vector<Dune::FieldVector<Scalar, 1> > ScalarVector;
typedef Dune::array<ScalarVector, numPhases> PhaseVector;
typedef std::array<ScalarVector, numPhases> PhaseVector;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::BlockVector<DimVector> DimVectorField;
typedef Dune::array<DimVectorField, numPhases> PhaseDimVectorField;
typedef std::array<DimVectorField, numPhases> PhaseDimVectorField;
public:
/*!
......
......@@ -63,7 +63,7 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> DimWorldVector;
typedef Dune::BlockVector<DimWorldVector> DimWorldField;
typedef Dune::array<DimWorldField, numPhases> PhaseDimWorldField;
typedef std::array<DimWorldField, numPhases> PhaseDimWorldField;
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
enum { dofCodim = isBox ? dim : 0 };
......
......@@ -26,9 +26,9 @@
#ifndef DUMUX_MPNC_VTK_BASE_WRITER_HH
#define DUMUX_MPNC_VTK_BASE_WRITER_HH
#include <array>
#include <cstdio>
#include <dune/common/array.hh>
#include <dune/istl/bvector.hh>
#include <dumux/io/vtkmultiwriter.hh>
......@@ -63,9 +63,9 @@ class MPNCVtkWriterModule
public:
typedef std::vector<Dune::FieldVector<Scalar, 1> > ScalarVector;
typedef Dune::array<ScalarVector, numPhases> PhaseVector;
typedef Dune::array<ScalarVector, numComponents> ComponentVector;
typedef Dune::array<ComponentVector, numPhases> PhaseComponentMatrix;
typedef std::array<ScalarVector, numPhases> PhaseVector;
typedef std::array<ScalarVector, numComponents> ComponentVector;
typedef std::array<ComponentVector, numPhases> PhaseComponentMatrix;
MPNCVtkWriterModule(const Problem &problem)
: problem_(problem)
......
......@@ -60,7 +60,7 @@ public:
*/
static void makeGrid()
{
Dune::array< unsigned int, dim > cellRes;
std::array< unsigned int, dim > cellRes;
Dune::FieldVector<Scalar, dim> upperRight;
Dune::FieldVector<Scalar, dim> lowerLeft;
......
......@@ -58,7 +58,7 @@ public:
*/
static void makeGrid()
{
Dune::array< unsigned int, dim > cellRes;
std::array< unsigned int, dim > cellRes;
Dune::FieldVector<Scalar, dim> upperRight;
Dune::FieldVector<Scalar, dim> lowerLeft;
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_PRESSURE_OVERLAY_FLUID_STATE_HH
#define DUMUX_PRESSURE_OVERLAY_FLUID_STATE_HH
#include <dune/common/array.hh>
#include <array>
#include <dumux/common/valgrind.hh>
......@@ -205,7 +205,7 @@ public:
protected:
const FluidState *fs_;
Dune::array<Scalar, numPhases> pressure_;
std::array<Scalar, numPhases> pressure_;
};
} // end namespace Dumux
......
......@@ -26,7 +26,7 @@
#ifndef DUMUX_SATURATION_OVERLAY_FLUID_STATE_HH
#define DUMUX_SATURATION_OVERLAY_FLUID_STATE_HH
#include <dune/common/array.hh>
#include <array>
#include <dumux/common/valgrind.hh>
......@@ -204,7 +204,7 @@ public:
protected:
const FluidState *fs_;
Dune::array<Scalar, numPhases> saturation_;
std::array<Scalar, numPhases> saturation_;
};
} // end namespace Dumux
......
......@@ -69,7 +69,7 @@ int main(int argc, char** argv)
////////////////////////////////////////////////////////////
// create the grid
////////////////////////////////////////////////////////////
Dune::array<unsigned int, dim> cellRes;
std::array<unsigned int, dim> cellRes;
cellRes.fill(1);
GlobalPosition lowerLeft(0.0);
GlobalPosition upperRight(1.0);
......
......@@ -24,6 +24,7 @@
*/
#include "config.h"
#include <array>
#include <iostream>
#include <dune/common/exceptions.hh>
......@@ -90,7 +91,7 @@ int main(int argc, char** argv)
////////////////////////////////////////////////////////////
// create the grid
////////////////////////////////////////////////////////////
Dune::array<int,dim> N;
std::array<int,dim> N;
std::fill(N.begin(), N.end(), 10);
Dune::FieldVector<double,dim> H(10.0);
Grid grid(H, N);
......
......@@ -234,10 +234,10 @@ class EvaporationAtmosphereProblem
typedef Dune::FieldVector<typename GridView::Grid::ctype, dimWorld> GlobalPosition;
typedef std::vector<Dune::FieldVector<Scalar, 1> > ScalarBuffer;
typedef Dune::array<ScalarBuffer, numPhases> PhaseBuffer;
typedef std::array<ScalarBuffer, numPhases> PhaseBuffer;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::BlockVector<DimVector> VelocityField;
typedef Dune::array<VelocityField, numPhases> PhaseVelocityField;
typedef std::array<VelocityField, numPhases> PhaseVelocityField;
public:
/*!
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment