Skip to content
Snippets Groups Projects
Commit 35ad2537 authored by Stefan Girke's avatar Stefan Girke
Browse files

[bugfix] id_ enum for diffusion fluxes was invalid...

parent 93baa093
No related branches found
No related tags found
No related merge requests found
...@@ -165,10 +165,11 @@ namespace Fem ...@@ -165,10 +165,11 @@ namespace Fem
*/ */
DGPrimalDiffusionFluxImpl( GridPartType& gridPart, DGPrimalDiffusionFluxImpl( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters ) : const ParameterType& parameters,
const EnumType staticMethod ) :
BaseType( model, true, parameters ), BaseType( model, true, parameters ),
gridPart_( gridPart ), gridPart_( gridPart ),
method_( BaseType::ParameterType::id_ == EnumType::general ? parameters.getMethod() : BaseType::ParameterType::id_ ), method_( staticMethod == EnumType::general ? parameters.getMethod() : staticMethod ),
penalty_( parameter().penalty() ), penalty_( parameter().penalty() ),
nipgFactor_( (method_ == EnumType::nipg) || nipgFactor_( (method_ == EnumType::nipg) ||
(method_ == EnumType::bo) (method_ == EnumType::bo)
......
...@@ -46,7 +46,7 @@ namespace Fem ...@@ -46,7 +46,7 @@ namespace Fem
DGPrimalDiffusionFlux( GridPartType& gridPart, DGPrimalDiffusionFlux( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters = ParameterType() ) const ParameterType& parameters = ParameterType() )
: BaseType( gridPart, model, parameters ) : BaseType( gridPart, model, parameters, PrimalDiffusionFlux::Enum::general )
{ {
} }
}; };
...@@ -76,7 +76,7 @@ namespace Fem ...@@ -76,7 +76,7 @@ namespace Fem
DGPrimalDiffusionFlux( GridPartType& gridPart, DGPrimalDiffusionFlux( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters = ParameterType() ) const ParameterType& parameters = ParameterType() )
: BaseType( gridPart, model, parameters ) : BaseType( gridPart, model, parameters, PrimalDiffusionFlux::Enum::cdg2 )
{ {
} }
}; };
...@@ -107,7 +107,7 @@ namespace Fem ...@@ -107,7 +107,7 @@ namespace Fem
DGPrimalDiffusionFlux( GridPartType& gridPart, DGPrimalDiffusionFlux( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters = ParameterType() ) const ParameterType& parameters = ParameterType() )
: BaseType( gridPart, model, parameters ) : BaseType( gridPart, model, parameters, PrimalDiffusionFlux::Enum::cdg )
{ {
} }
}; };
...@@ -138,7 +138,7 @@ namespace Fem ...@@ -138,7 +138,7 @@ namespace Fem
DGPrimalDiffusionFlux( GridPartType& gridPart, DGPrimalDiffusionFlux( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters = ParameterType() ) const ParameterType& parameters = ParameterType() )
: BaseType( gridPart, model, parameters ) : BaseType( gridPart, model, parameters, PrimalDiffusionFlux::Enum::br2 )
{ {
} }
}; };
...@@ -169,7 +169,7 @@ namespace Fem ...@@ -169,7 +169,7 @@ namespace Fem
DGPrimalDiffusionFlux( GridPartType& gridPart, DGPrimalDiffusionFlux( GridPartType& gridPart,
const Model& model, const Model& model,
const ParameterType& parameters = ParameterType() ) const ParameterType& parameters = ParameterType() )
: BaseType( gridPart, model, parameters ) : BaseType( gridPart, model, parameters, PrimalDiffusionFlux::Enum::ip )
{ {
} }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment