diff --git a/dune/fem-dg/assemble/primalmatrix.hh b/dune/fem-dg/assemble/primalmatrix.hh
index ba7aa6c2bb0d441c8140ff6cc5906d20f42058ae..e756d6a9ec98f0c3875f875dea6b4dc920aa9a8a 100644
--- a/dune/fem-dg/assemble/primalmatrix.hh
+++ b/dune/fem-dg/assemble/primalmatrix.hh
@@ -645,11 +645,11 @@ namespace Fem
baseSetNb.jacobianAll( faceQuadOutside[idx], dphiFaceNb[idx] );
}
- flux(dfSpace.gridPart(), intersectionStorage,
- faceQuadInside, faceQuadOutside,
- RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
- RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
- rhsValueEn, rhsDValueEn, rhsValueNb, rhsDValueNb, true );
+ numericalFlux(dfSpace.gridPart(), intersectionStorage,
+ faceQuadInside, faceQuadOutside,
+ RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
+ RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
+ rhsValueEn, rhsDValueEn, rhsValueNb, rhsDValueNb, true );
// compute fluxes and assemble matrix
for( unsigned int localCol = 0; localCol < numBasisFunctionsEn; ++localCol )
@@ -657,11 +657,11 @@ namespace Fem
// compute flux for one base function, i.e.,
// - uLeft=phiFaceEn[.][localCol]
// - uRight=0
- flux(dfSpace.gridPart(), intersectionStorage,
- faceQuadInside, faceQuadOutside,
- RangeValues(localCol,phiFaceEn), JacobianRangeValues(localCol,dphiFaceEn),
- RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
- valueEn, dvalueEn, valueNb, dvalueNb, true );
+ numericalFlux(dfSpace.gridPart(), intersectionStorage,
+ faceQuadInside, faceQuadOutside,
+ RangeValues(localCol,phiFaceEn), JacobianRangeValues(localCol,dphiFaceEn),
+ RangeValues(-1,phiFaceEn), JacobianRangeValues(-1,dphiFaceEn),
+ valueEn, dvalueEn, valueNb, dvalueNb, true );
for( size_t pt = 0; pt < numFaceQuadPoints; ++pt )
{
@@ -687,11 +687,11 @@ namespace Fem
// compute flux for one base function, i.e.,
// - uLeft=phiFaceEn[.][localCol]
// - uRight=0
- flux(dfSpace.gridPart(), intersectionStorage,
- faceQuadInside, faceQuadOutside,
- RangeValues(-1,phiFaceNb), JacobianRangeValues(-1,dphiFaceNb),
- RangeValues(localCol,phiFaceNb), JacobianRangeValues(localCol,dphiFaceNb),
- valueEn, dvalueEn, valueNb, dvalueNb, true );
+ numericalFlux(dfSpace.gridPart(), intersectionStorage,
+ faceQuadInside, faceQuadOutside,
+ RangeValues(-1,phiFaceNb), JacobianRangeValues(-1,dphiFaceNb),
+ RangeValues(localCol,phiFaceNb), JacobianRangeValues(localCol,dphiFaceNb),
+ valueEn, dvalueEn, valueNb, dvalueNb, true );
for( size_t pt = 0; pt < numFaceQuadPoints; ++pt )
{
const double weight = faceQuadInside.weight( pt );
@@ -777,14 +777,14 @@ namespace Fem
}
template <class Quadrature,class Value,class DValue,class RetType, class DRetType>
- void flux(const GridPartType &gridPart,
- const IntersectionStorage& intersectionStorage,
- const Quadrature &faceQuadInside, const Quadrature &faceQuadOutside,
- const Value &valueEn, const DValue &dvalueEn,
- const Value &valueNb, const DValue &dvalueNb,
- RetType &retEn, DRetType &dretEn,
- RetType &retNb, DRetType &dretNb,
- const bool initializeIntersection = true ) const
+ void numericalFlux(const GridPartType &gridPart,
+ const IntersectionStorage& intersectionStorage,
+ const Quadrature &faceQuadInside, const Quadrature &faceQuadOutside,
+ const Value &valueEn, const DValue &dvalueEn,
+ const Value &valueNb, const DValue &dvalueNb,
+ RetType &retEn, DRetType &dretEn,
+ RetType &retNb, DRetType &dretNb,
+ const bool initializeIntersection = true ) const
{
RangeType gLeft,gRight;
if( hasDiffusion & initializeIntersection )
@@ -841,8 +841,8 @@ namespace Fem
RetType &retNb, DRetType &dretNb,
DRetType &liftEn, DRetType &liftNb) const
{
- flux(left, right, valueEn,dvalueEn,valueNb,dvalueNb,
- retEn,dretEn,retNb,dretNb);
+ numericalFlux(left, right, valueEn,dvalueEn,valueNb,dvalueNb,
+ retEn,dretEn,retNb,dretNb);
if( hasDiffusion )
{
diff --git a/dune/fem-dg/examples/stokes/stokesalgorithm.hh b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
index 690483b8dc40620341a85c8743b9e66351074402..63d1502559d00099f2cbfa35d332a35343b21622 100644
--- a/dune/fem-dg/examples/stokes/stokesalgorithm.hh
+++ b/dune/fem-dg/examples/stokes/stokesalgorithm.hh
@@ -122,19 +122,19 @@ namespace Fem
oper_(oper)
{}
template <class Quadrature,class Value,class DValue,class RetType, class DRetType>
- void flux(const GridPartType &gridPart,
- const IntersectionType &intersection,
- const EntityType &entity, const EntityType &neighbor,
- const double time,
- const Quadrature &faceQuadInside, const Quadrature &faceQuadOutside,
- const Value &valueEn, const DValue &dvalueEn,
- const Value &valueNb, const DValue &dvalueNb,
- RetType &retEn, DRetType &dretEn,
- RetType &retNb, DRetType &dretNb) const
+ void numericalFlux(const GridPartType &gridPart,
+ const IntersectionType &intersection,
+ const EntityType &entity, const EntityType &neighbor,
+ const double time,
+ const Quadrature &faceQuadInside, const Quadrature &faceQuadOutside,
+ const Value &valueEn, const DValue &dvalueEn,
+ const Value &valueNb, const DValue &dvalueNb,
+ RetType &retEn, DRetType &dretEn,
+ RetType &retNb, DRetType &dretNb) const
{
//\hat{K}
- oper_.flux(gridPart,intersection,entity,neighbor,time,faceQuadInside,faceQuadOutside,
- valueEn,dvalueEn,valueNb,dvalueNb,retEn,dretEn,retNb,dretNb);
+ oper_.numericalFlux(gridPart,intersection,entity,neighbor,time,faceQuadInside,faceQuadOutside,
+ valueEn,dvalueEn,valueNb,dvalueNb,retEn,dretEn,retNb,dretNb);
typename DiscretePressureFunctionType::LocalFunctionType pEn = p_.localFunction(entity);
typename DiscretePressureFunctionType::LocalFunctionType pNb = p_.localFunction(neighbor);
std::vector< typename DiscretePressureFunctionType::RangeType > pValuesEn( faceQuadInside.nop() );
diff --git a/dune/fem-dg/operator/adaptation/poissonestimator.hh b/dune/fem-dg/operator/adaptation/poissonestimator.hh
index c2ad244b6b31418628be4730c9a23bb06fd074ed..5d8612a29040a3509a9c96dea427c6f9acc7602b 100644
--- a/dune/fem-dg/operator/adaptation/poissonestimator.hh
+++ b/dune/fem-dg/operator/adaptation/poissonestimator.hh
@@ -154,7 +154,7 @@ namespace Fem
// must implement evaluate
// DGOperator: Operator providing the flux, needs method
// model() to access the diffusion method
- // flux(dfSpace_.gridPart(),
+ // numericalFlux(dfSpace_.gridPart(),
// intersection, inside, outside, 0, quadInside, quadOutside,
// uValuesEn, duValuesEn, uValuesNb, duValuesNb,
// fluxEn, dfluxEn, fluxNb, dfluxNb):
@@ -872,11 +872,11 @@ namespace Fem
typedef typename DGOperatorType::IntersectionStorage IntersectionStorage;
IntersectionStorage intersectionStorage( intersection, inside, inside, volume, volume);
- oper_.flux(dfSpace_.gridPart(), intersectionStorage,
- quadInside, quadOutside,
- uValuesEn, duValuesEn, uValuesNb, duValuesNb,
- fluxEn, dfluxEn, fluxNb, dfluxNb
- );
+ oper_.numericalFlux(dfSpace_.gridPart(), intersectionStorage,
+ quadInside, quadOutside,
+ uValuesEn, duValuesEn, uValuesNb, duValuesNb,
+ fluxEn, dfluxEn, fluxNb, dfluxNb
+ );
sigmaValuesEn.resize( numQuadraturePoints );
sigmaValuesNb.resize( numQuadraturePoints );
diff --git a/dune/fem-dg/operator/adaptation/stokesestimator.hh b/dune/fem-dg/operator/adaptation/stokesestimator.hh
index ca5fa4f9cdb25913fcd04d2b1b26b294a039a402..a8c2bba10ce230d29de7f8f85708b313f9d2d217 100644
--- a/dune/fem-dg/operator/adaptation/stokesestimator.hh
+++ b/dune/fem-dg/operator/adaptation/stokesestimator.hh
@@ -20,7 +20,7 @@ namespace Fem
// must implement evaluate
// DGOperator: Operator providing the flux, needs method
// model() to access the diffusion method
- // flux(dfSpace_.gridPart(),
+ // numericalFlux(dfSpace_.gridPart(),
// intersection, inside, outside, 0, quadInside, quadOutside,
// uValuesEn, duValuesEn, uValuesNb, duValuesNb,
// fluxEn, dfluxEn, fluxNb, dfluxNb):
diff --git a/dune/fem-dg/operator/dg/operatorbase.hh b/dune/fem-dg/operator/dg/operatorbase.hh
index 6aa6e4600ddc053f57b2dfea34eb953d6d82ccf7..8de4220d1e573910474632966512d28711fc39c1 100644
--- a/dune/fem-dg/operator/dg/operatorbase.hh
+++ b/dune/fem-dg/operator/dg/operatorbase.hh
@@ -208,13 +208,13 @@ namespace Fem
}
template <class Entity, class Intersection, class Quadrature>
- inline void flux(const DestinationType &u,
- const Entity &entity, const Entity &nb,
- const Intersection &intersection,
- const Quadrature &faceQuadInner, const Quadrature &faceQuadOuter,
- const int l,
- typename DestinationType::RangeType &fluxEn,
- typename DestinationType::RangeType &fluxNb) const
+ inline void numericalFlux(const DestinationType &u,
+ const Entity &entity, const Entity &nb,
+ const Intersection &intersection,
+ const Quadrature &faceQuadInner, const Quadrature &faceQuadOuter,
+ const int l,
+ typename DestinationType::RangeType &fluxEn,
+ typename DestinationType::RangeType &fluxNb) const
{
pass1_.flux(u,entity,nb,intersection,faceQuadInner,faceQuadOuter,l,fluxEn,fluxNb);
}
diff --git a/dune/fem-dg/pass/dgpass.hh b/dune/fem-dg/pass/dgpass.hh
index a5e7cb3ceb1dd323111ebfdab6154ffc51f10223..5114b633f5c9aeb8d49cbf46ef157139040d522e 100644
--- a/dune/fem-dg/pass/dgpass.hh
+++ b/dune/fem-dg/pass/dgpass.hh
@@ -257,13 +257,13 @@ namespace Fem
}
template <class Entity, class Intersection, class Quadrature>
- inline void flux(const DestinationType &u,
- const Entity &entity, const Entity &nb,
- const Intersection &intersection,
- const Quadrature &faceQuadInner, const Quadrature &faceQuadOuter,
- const int l,
- typename DestinationType::RangeType &fluxEn,
- typename DestinationType::RangeType &fluxNb) const
+ inline void numericalFlux(const DestinationType &u,
+ const Entity &entity, const Entity &nb,
+ const Intersection &intersection,
+ const Quadrature &faceQuadInner, const Quadrature &faceQuadOuter,
+ const int l,
+ typename DestinationType::RangeType &fluxEn,
+ typename DestinationType::RangeType &fluxNb) const
{
// add u to argument tuple
this->previousPass_.pass(u);