From d68e25481149802b3a4cbe7a96140c1bde4efe83 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 5 Sep 2022 12:15:52 +0200 Subject: [PATCH 1/2] fixed: missing dynamicStatus in comparison operator --- opm/output/data/Wells.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/opm/output/data/Wells.hpp b/opm/output/data/Wells.hpp index 33de0a4b5..cb7ea475c 100644 --- a/opm/output/data/Wells.hpp +++ b/opm/output/data/Wells.hpp @@ -468,6 +468,7 @@ namespace Opm { thp == well2.thp && temperature == well2.temperature && control == well2.control && + dynamicStatus == well2.dynamicStatus && connections == well2.connections && segments == well2.segments && current_control == well2.current_control && From 645b3b3eaa2bb8849c611b71046f8dd3ddf4570e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 2 Sep 2022 18:12:09 +0200 Subject: [PATCH 2/2] data::Well: add serializer support --- opm/output/data/Wells.hpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/opm/output/data/Wells.hpp b/opm/output/data/Wells.hpp index cb7ea475c..51daed721 100644 --- a/opm/output/data/Wells.hpp +++ b/opm/output/data/Wells.hpp @@ -474,6 +474,36 @@ namespace Opm { current_control == well2.current_control && guide_rates == well2.guide_rates; } + + template + void serializeOp(Serializer& serializer) + { + rates.serializeOp(serializer); + serializer(bhp); + serializer(thp); + serializer(temperature); + serializer(control); + serializer(dynamicStatus); + serializer.vector(connections); + serializer.map(segments); + current_control.serializeOp(serializer); + guide_rates.serializeOp(serializer); + } + + static Well serializeObject() + { + return Well{Rates::serializeObject(), + 1.0, + 2.0, + 3.0, + 4, + ::Opm::Well::Status::SHUT, + {Connection::serializeObject()}, + {{0, Segment::serializeObject()}}, + CurrentControl::serializeObject(), + GuideRateValue::serializeObject() + }; + } };