From ec28c4684216c163cbca27d237eb337763c9387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Fri, 20 May 2016 16:21:14 +0200 Subject: [PATCH] WellState::report() to make opm-output Well data --- opm/core/simulator/BlackoilState.cpp | 2 ++ opm/core/simulator/WellState.hpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/opm/core/simulator/BlackoilState.cpp b/opm/core/simulator/BlackoilState.cpp index 66d83938e..97d39f72b 100644 --- a/opm/core/simulator/BlackoilState.cpp +++ b/opm/core/simulator/BlackoilState.cpp @@ -1,6 +1,8 @@ #include "BlackoilState.hpp" #include #include +#include +#include using namespace Opm; diff --git a/opm/core/simulator/WellState.hpp b/opm/core/simulator/WellState.hpp index bbf0694b2..999dfcfff 100644 --- a/opm/core/simulator/WellState.hpp +++ b/opm/core/simulator/WellState.hpp @@ -22,6 +22,8 @@ #include #include +#include + #include #include #include @@ -208,6 +210,18 @@ namespace Opm return wellRates().size() / numWells(); } + virtual data::Wells report() const + { + return { { /* WellState offers no completion data, so that has to be added later */ }, + this->bhp(), + this->temperature(), + this->wellRates(), + this->perfPress(), + this->perfRates() }; + } + + virtual ~WellState() {} + private: std::vector bhp_; std::vector thp_;