diff --git a/dune/fem-dg/main/caching.hh b/dune/fem-dg/main/caching.hh index 2c1191c99572e8c35e80e04222c37563283d056c..2e0d002fd50cb45ad5ce42e120d074dd3a5e861b 100644 --- a/dune/fem-dg/main/caching.hh +++ b/dune/fem-dg/main/caching.hh @@ -15,7 +15,7 @@ #include <dune/fem/quadrature/caching/registry.hh> #include <dune/fem/quadrature/cachingpointlist.hh> #include <dune/fem/quadrature/quadrature.hh> -#include <dune/fem/space/common/arrays.hh> +#include <dune/fem/storage/dynamicarray.hh> #include <dune/fem/misc/threads/threadsafevalue.hh> namespace Dune @@ -40,8 +40,8 @@ namespace Dune typedef typename ShapeFunctionSet::JacobianRangeType JacobianRangeType; typedef typename ShapeFunctionSet::HessianRangeType HessianRangeType; - typedef MutableArray< MutableArray<RangeType> > RangeVectorType; - typedef MutableArray< MutableArray<JacobianRangeType> > JacobianRangeVectorType; + typedef DynamicArray< DynamicArray<RangeType> > RangeVectorType; + typedef DynamicArray< DynamicArray<JacobianRangeType> > JacobianRangeVectorType; typedef std::vector< RangeVectorType > ValueCacheVectorType ; typedef std::vector< JacobianRangeVectorType > JacobianCacheVectorType; @@ -147,7 +147,7 @@ namespace Dune // make sure cache has the appropriate size storage.resize( nop ); - typedef MutableArray<RangeType> RangeVector; + typedef DynamicArray<RangeType> RangeVector; for( unsigned int qp = 0 ; qp < nop; ++ qp ) { const int cacheQp = quad.cachingPoint( qp ); @@ -174,7 +174,7 @@ namespace Dune // make sure cache has the appropriate size storage.resize( nop ); - typedef MutableArray<JacobianRangeType> JacobianRangeVector; + typedef DynamicArray<JacobianRangeType> JacobianRangeVector; for( unsigned int qp = 0 ; qp < nop; ++ qp ) { const int cacheQp = quad.cachingPoint( qp ); @@ -282,7 +282,7 @@ namespace Dune ::evaluateEach ( const Quadrature &quadrature, std::size_t pt, Functor functor, std::integral_constant< bool, true > ) const { - typedef MutableArray<RangeType> RangeVector; + typedef DynamicArray<RangeType> RangeVector; const RangeVector& cache = valueCaches_[ quadrature.id() ][ quadrature.cachingPoint( pt ) ]; const std::size_t numShapeFunctions = size(); for( std::size_t i = 0; i < numShapeFunctions; ++i ) @@ -296,7 +296,7 @@ namespace Dune ::jacobianEach ( const Quadrature &quadrature, std::size_t pt, Functor functor, std::integral_constant< bool, true > ) const { - typedef MutableArray<JacobianRangeType> JacobianRangeVector; + typedef DynamicArray<JacobianRangeType> JacobianRangeVector; const JacobianRangeVector& cache = jacobianCaches_[ quadrature.id() ][ quadrature.cachingPoint( pt ) ]; const std::size_t numShapeFunctions = size(); @@ -353,8 +353,8 @@ namespace Dune jacobianCaches_[ id ][ pt ].resize( numShapeFunctions ); } - typedef MutableArray<RangeType> RangeVector; - typedef MutableArray<JacobianRangeType> JacobianRangeVector; + typedef DynamicArray<RangeType> RangeVector; + typedef DynamicArray<JacobianRangeType> JacobianRangeVector; for( std::size_t pt = 0; pt < numPoints; ++pt ) { evaluateEach( points[ pt ], AssignFunctor< RangeVector >( valueCaches_[ id ][ pt ] ) ); diff --git a/dune/fem-dg/main/default.hh b/dune/fem-dg/main/default.hh index 2a94480358e3b2306a5e380d7d51aae92432d7e4..2ef0da0abca0120ed917171ca546ff7d7b2ab113 100644 --- a/dune/fem-dg/main/default.hh +++ b/dune/fem-dg/main/default.hh @@ -16,7 +16,8 @@ #include <dune/geometry/referenceelements.hh> #include <dune/geometry/type.hh> -#include <dune/fem/space/common/arrays.hh> +#include <dune/fem/storage/dynamicarray.hh> + //#define NEWBASEFCT_CACHING @@ -119,8 +120,8 @@ namespace Dune typedef std::vector< ScalarRangeType > RangeVectorType; typedef std::vector< ScalarJacobianRangeType > JacobianRangeVectorType; #else - typedef MutableArray< MutableArray< ScalarRangeType > > RangeVectorType; - typedef MutableArray< MutableArray< ScalarJacobianRangeType > > JacobianRangeVectorType; + typedef DynamicArray< DynamicArray< ScalarRangeType > > RangeVectorType; + typedef DynamicArray< DynamicArray< ScalarJacobianRangeType > > JacobianRangeVectorType; #endif //! \brief constructor DefaultBasisFunctionSet () diff --git a/dune/fem-dg/operator/fluxes/diffusion/dgprimalfluxes.hh b/dune/fem-dg/operator/fluxes/diffusion/dgprimalfluxes.hh index 0fa93fd358699f156034bc9574d8b3c846105026..5c795f42b8975ce5253bfac82e1e6dc598156171 100644 --- a/dune/fem-dg/operator/fluxes/diffusion/dgprimalfluxes.hh +++ b/dune/fem-dg/operator/fluxes/diffusion/dgprimalfluxes.hh @@ -9,7 +9,7 @@ #include <dune/fem-dg/pass/context.hh> #include <dune/fem/quadrature/cachingquadrature.hh> #include <dune/fem/solver/timeprovider.hh> -#include <dune/fem/space/common/arrays.hh> +#include <dune/fem/storage/dynamicarray.hh> #include <dune/fem-dg/pass/dgmasspass.hh> #include "fluxbase.hh" @@ -1165,8 +1165,8 @@ namespace Fem #ifdef LOCALDEBUG std::unique_ptr< Lifting > LeMinusLifting2_; #endif - mutable Fem::MutableArray< GradientType > liftingEvalLeMinus_ ; - mutable Fem::MutableArray< GradientType > liftingEvalLePlus_ ; + mutable Fem::DynamicArray< GradientType > liftingEvalLeMinus_ ; + mutable Fem::DynamicArray< GradientType > liftingEvalLePlus_ ; double maxNeighborsVolumeRatio_; // for CDG2 only double ainsworthFactor_; diff --git a/dune/fem-dg/pass/dgpass.hh b/dune/fem-dg/pass/dgpass.hh index 595a189cd5894186a8fc09f399afe1d4d753f6cf..3cb621b0fe597d3e1a3c1ff4d3f8d796ef0efd2b 100644 --- a/dune/fem-dg/pass/dgpass.hh +++ b/dune/fem-dg/pass/dgpass.hh @@ -14,7 +14,8 @@ #include <dune/fem/quadrature/intersectionquadrature.hh> #include <dune/fem/solver/timeprovider.hh> #include <dune/fem/space/common/allgeomtypes.hh> -#include <dune/fem/space/common/arrays.hh> +#include <dune/fem/storage/dynamicarray.hh> + #include <dune/fem-dg/pass/dgmodelcaller.hh> #include <dune/fem/misc/compatibility.hh> @@ -942,17 +943,17 @@ namespace Fem const IndexSetType& indexSet_; // indicator for grid walk - mutable Fem::MutableArray<bool> visited_; + mutable Fem::DynamicArray<bool> visited_; mutable TemporaryLocalFunctionType updEn_; mutable TemporaryLocalFunctionType updNeigh_; //! Some helper variables - mutable Fem::MutableArray< RangeType > valEnVec_; - mutable Fem::MutableArray< RangeType > valNbVec_; + mutable Fem::DynamicArray< RangeType > valEnVec_; + mutable Fem::DynamicArray< RangeType > valNbVec_; - mutable Fem::MutableArray< JacobianRangeType > valJacEn_; - mutable Fem::MutableArray< JacobianRangeType > valJacNb_; + mutable Fem::DynamicArray< JacobianRangeType > valJacEn_; + mutable Fem::DynamicArray< JacobianRangeType > valJacNb_; mutable double dtMin_; const double minLimit_; diff --git a/dune/fem-dg/pass/threadpass.hh b/dune/fem-dg/pass/threadpass.hh index bbf4fb970152279031e967c085f5e60f718098cf..96e343232dd192a15b957988de03d61fb8b5cf13 100644 --- a/dune/fem-dg/pass/threadpass.hh +++ b/dune/fem-dg/pass/threadpass.hh @@ -8,7 +8,6 @@ #include <dune/fem/quadrature/intersectionquadrature.hh> #include <dune/fem/solver/timeprovider.hh> #include <dune/fem/space/common/allgeomtypes.hh> -#include <dune/fem/space/common/arrays.hh> #include "threadhandle.hh"