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
+ 9
8
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -265,7 +265,7 @@ namespace Fem
typedef CheckCartesian< GridPartType > CheckCartesianType;
//! function describing an external troubled cell indicator
typedef const std::function< double(const DestinationType&, const LocalFunctionType& ) > TroubledCellIndicatorType;
typedef const std::function< double(const ArgumentFunctionType&, const LocalFunctionType& ) > TroubledCellIndicatorType;
protected:
#if WANT_DUNE_OPTIM
@@ -365,7 +365,7 @@ namespace Fem
admissibleFunctions_( getAdmissibleFunctions( parameter ) ),
usedAdmissibleFunctions_( admissibleFunctions_ ),
extTroubledCellIndicator_( indicator_ == 2
? &ModalSmoothnessIndicator< DestinationType >::troubledCellIndicator : nullptr ),
? &ModalSmoothnessIndicator< ArgumentFunctionType >::troubledCellIndicator : nullptr ),
counter_( 0 )
{
if( Parameter :: verbose () )
@@ -1419,7 +1419,7 @@ namespace Fem
}
// calculate shock detector
bool calculateIndicator(const DestinationType& U,
bool calculateIndicator(const ArgumentFunctionType& U,
const LocalFunctionType& uEn,
const Geometry& geo,
const bool initLimiter,
@@ -1598,7 +1598,6 @@ namespace Fem
// multiply h pol ord with circume
const double circFactor = (circume > 0.0) ? (hPowPolOrder/(circume * tolFactor_ )) : 0.0;
double modalInd = -1;
if( extTroubledCellIndicator_ )
{
shockIndicator = ( tol_1_ * extTroubledCellIndicator_( U, uEn ) );
Loading