OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

use if constexpr to eliminate some polymer code

Browse Source
This commit is contained in:
Arne Morten Kvarving 2021-05-14 21:38:47 +02:00
parent 1fa74b5889
commit 83595d84c3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/MultisegmentWell_impl.hpp
View File

@ -65,7 +65,7 @@ namespace Opm
OPM_THROW(std::runtime_error, "solvent is not supported by multisegment well yet"); OPM_THROW(std::runtime_error, "solvent is not supported by multisegment well yet");
} }
if (has_polymer) { if constexpr (has_polymer) {
OPM_THROW(std::runtime_error, "polymer is not supported by multisegment well yet"); OPM_THROW(std::runtime_error, "polymer is not supported by multisegment well yet");
} }

6
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -773,7 +773,7 @@ namespace Opm
} }
} }
if (has_polymer) { if constexpr (has_polymer) {
// TODO: the application of well efficiency factor has not been tested with an example yet // TODO: the application of well efficiency factor has not been tested with an example yet
const unsigned waterCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::waterCompIdx); const unsigned waterCompIdx = Indices::canonicalToActiveComponentIndex(FluidSystem::waterCompIdx);
EvalWell cq_s_poly = cq_s[waterCompIdx]; EvalWell cq_s_poly = cq_s[waterCompIdx];
@ -957,13 +957,13 @@ namespace Opm
} }
// this may not work if viscosity and relperms has been modified? // this may not work if viscosity and relperms has been modified?
if (has_solvent) { if constexpr (has_solvent) {
OPM_DEFLOG_THROW(std::runtime_error, "individual mobility for wells does not work in combination with solvent", deferred_logger); OPM_DEFLOG_THROW(std::runtime_error, "individual mobility for wells does not work in combination with solvent", deferred_logger);
} }
} }
// modify the water mobility if polymer is present // modify the water mobility if polymer is present
if (has_polymer) { if constexpr (has_polymer) {
if (!FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) { if (!FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) {
OPM_DEFLOG_THROW(std::runtime_error, "Water is required when polymer is active", deferred_logger); OPM_DEFLOG_THROW(std::runtime_error, "Water is required when polymer is active", deferred_logger);
} }