rename "velocity modules" to "flux modules"

that's because these modules do not necessarily use a velocity to
calculate fluxes...
This commit is contained in:
Andreas Lauser 2015-01-04 19:11:02 +01:00
parent 5389c9fdfb
commit 506d14b2e4
3 changed files with 10 additions and 10 deletions

View File

@ -229,8 +229,8 @@ public:
{
std::ostringstream oss;
oss << "powerinjection_";
if (std::is_same<typename GET_PROP_TYPE(TypeTag, VelocityModule),
Ewoms::DarcyVelocityModule<TypeTag> >::value)
if (std::is_same<typename GET_PROP_TYPE(TypeTag, FluxModule),
Ewoms::DarcyFluxModule<TypeTag> >::value)
oss << "darcy";
else
oss << "forchheimer";

View File

@ -29,11 +29,11 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(PowerInjectionProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel,
PowerInjectionBaseProblem));
NEW_TYPE_TAG(PowerInjectionProblem,
INHERITS_FROM(ImmiscibleTwoPhaseModel,
PowerInjectionBaseProblem));
SET_TYPE_PROP(PowerInjectionProblem, VelocityModule,
Ewoms::DarcyVelocityModule<TypeTag>);
SET_TYPE_PROP(PowerInjectionProblem, FluxModule, Ewoms::DarcyFluxModule<TypeTag>);
}}
int main(int argc, char **argv)

View File

@ -29,11 +29,11 @@
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(PowerInjectionProblem, INHERITS_FROM(ImmiscibleTwoPhaseModel,
PowerInjectionBaseProblem));
NEW_TYPE_TAG(PowerInjectionProblem,
INHERITS_FROM(ImmiscibleTwoPhaseModel,
PowerInjectionBaseProblem));
SET_TYPE_PROP(PowerInjectionProblem, VelocityModule,
Ewoms::ForchheimerVelocityModule<TypeTag>);
SET_TYPE_PROP(PowerInjectionProblem, FluxModule, Ewoms::ForchheimerFluxModule<TypeTag>);
}}
int main(int argc, char **argv)