OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename "velocity modules" to "flux modules"

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/problems/powerinjectionproblem.hh
View File

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

8
tests/powerinjection_darcy.cc
View File

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

8
tests/powerinjection_forchheimer.cc
View File

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