From 506d14b2e458a4daae4f6bb8171436f8a56325c0 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Sun, 4 Jan 2015 19:11:02 +0100 Subject: [PATCH] rename "velocity modules" to "flux modules" that's because these modules do not necessarily use a velocity to calculate fluxes... --- examples/problems/powerinjectionproblem.hh | 4 ++-- tests/powerinjection_darcy.cc | 8 ++++---- tests/powerinjection_forchheimer.cc | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/problems/powerinjectionproblem.hh b/examples/problems/powerinjectionproblem.hh index 1cee801dc..c33f07dbd 100644 --- a/examples/problems/powerinjectionproblem.hh +++ b/examples/problems/powerinjectionproblem.hh @@ -229,8 +229,8 @@ public: { std::ostringstream oss; oss << "powerinjection_"; - if (std::is_same >::value) + if (std::is_same >::value) oss << "darcy"; else oss << "forchheimer"; diff --git a/tests/powerinjection_darcy.cc b/tests/powerinjection_darcy.cc index 312a57565..a96719a26 100644 --- a/tests/powerinjection_darcy.cc +++ b/tests/powerinjection_darcy.cc @@ -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); +SET_TYPE_PROP(PowerInjectionProblem, FluxModule, Ewoms::DarcyFluxModule); }} int main(int argc, char **argv) diff --git a/tests/powerinjection_forchheimer.cc b/tests/powerinjection_forchheimer.cc index 8f34a3841..529f5f4e6 100644 --- a/tests/powerinjection_forchheimer.cc +++ b/tests/powerinjection_forchheimer.cc @@ -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); +SET_TYPE_PROP(PowerInjectionProblem, FluxModule, Ewoms::ForchheimerFluxModule); }} int main(int argc, char **argv)