Skip to content
Snippets Groups Projects

Exchange troubled cell

Merged Robert K requested to merge feature/exchange-troubled-cell into master
Compare and Show latest version
5 files
+ 162
109
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -13,8 +13,6 @@
#include <dune/fem/quadrature/cornerpointset.hh>
#include <dune/fem/io/parameter.hh>
#include <dune/fem/operator/1order/localmassmatrix.hh>
#include <dune/fem/space/common/adaptationmanager.hh>
#include <dune/fem/space/common/basesetlocalkeystorage.hh>
#include <dune/fem/space/common/capabilities.hh>
@@ -425,7 +423,6 @@ namespace Fem
matrixCacheVec_( gridPart_.grid().maxLevel() + 1 ),
factors_(),
numbers_(),
localMassMatrix_( spc_ , [this](const int order) { return DefaultQuadrature<DiscreteFunctionSpaceType >::volumeOrder(order); } ),
adaptive_((AdaptationMethodType(gridPart_.grid())).adaptive()),
cartesianGrid_( CheckCartesianType::check( gridPart_ ) ),
stepTime_(3, 0.0),
@@ -868,9 +865,6 @@ namespace Fem
// timer for shock detection
Dune::Timer indiTime;
// extract types
enum { dim = EntityType :: dimension };
// check argument is not zero
assert( arg_ );
@@ -1218,7 +1212,6 @@ namespace Fem
const Geometry& geo,
const LocalFunctionImp& uEn) const
{
enum { dim = dimGrid };
if( discreteModel_.hasPhysical() )
{
if( en.type().isNone() )
@@ -1281,10 +1274,8 @@ namespace Fem
const LinearFunction& linearFunction,
LocalFunctionImp& limitEn ) const
{
enum { dim = dimGrid };
// true if geometry mapping is affine
const bool affineMapping = localMassMatrix_.affine();
const bool affineMapping = geo.affine();
// set zero dof to zero
uTmpLocal_.init( en );
@@ -1380,8 +1371,9 @@ namespace Fem
RangeType& val) const
{
bool notphysical = false;
if( Dune::Fem::Capabilities::isHierarchic< DiscreteFunctionSpaceType > :: v
&& localMassMatrix_.affine() )
const Geometry& geo = en.geometry();
if( Dune::Fem::Capabilities::isHierarchic< DiscreteFunctionSpaceType > :: v && geo.affine() )
{
// get point quadrature
VolumeQuadratureType quad( en, 0 );
@@ -1402,8 +1394,6 @@ namespace Fem
}
else
{
const Geometry& geo = en.geometry();
// get quadrature
VolumeQuadratureType quad( en, volumeQuadratureOrder( en ) );
@@ -1550,7 +1540,6 @@ namespace Fem
RangeType& adaptIndicator ) const
{
const EntityType& en = uEn.entity();
enum { dim = EntityType :: dimension };
// calculate circume during neighbor check
double circume = 0.0;
@@ -1864,7 +1853,6 @@ namespace Fem
// vector for stroing the information which elements have been computed already
mutable std::vector< bool > visited_;
LocalMassMatrixType localMassMatrix_;
//! true if limiter is used in adaptive scheme
const bool adaptive_;
//! true if grid is cartesian like
Loading