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

Merge pull request #2335 from joakim-hove/icd-status

Browse Source 
Update enum used in ICD status
This commit is contained in:
Joakim Hove 2020-02-13 07:47:33 +01:00 committed by GitHub
commit 388a44f1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opm/simulators/utils/ParallelRestart.cpp
View File

@ -42,6 +42,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
@ -5338,7 +5339,7 @@ void unpack(SpiralICD& data,
widthTransitionRegion, maxViscosityRatio;
int methodFlowScaling;
double maxAbsoluteRate;
SpiralICD::Status status;
ICDStatus status;
double scalingFactor;
unpack(strength, buffer, position, comm);
@ -5371,7 +5372,7 @@ void unpack(Valve& data,
double pipeDiameter;
double pipeRoughness;
double pipeCrossArea;
Valve::Status status;
ICDStatus status;
unpack(conFlowCoefficient, buffer, position, comm);
unpack(conCrossArea, buffer, position, comm);

5
tests/test_ParallelRestart.cpp
View File

@ -49,6 +49,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateModel.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
@ -1592,7 +1593,7 @@ BOOST_AUTO_TEST_CASE(SpiralICD)
{
#ifdef HAVE_MPI
Opm::SpiralICD val1(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8, 9.0,
Opm::SpiralICD::Status::OPEN, 10.0);
Opm::ICDStatus::OPEN, 10.0);
auto val2 = PackUnpack(val1);
DO_CHECKS(SpiralICD)
#endif
@ -1602,7 +1603,7 @@ BOOST_AUTO_TEST_CASE(SpiralICD)
BOOST_AUTO_TEST_CASE(Valve)
{
#ifdef HAVE_MPI
Opm::Valve val1(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, Opm::Valve::Status::OPEN);
Opm::Valve val1(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, Opm::ICDStatus::OPEN);
auto val2 = PackUnpack(val1);
DO_CHECKS(Valve)
#endif