From b948162962b81e9a11a791d7cc33b30c9e80c6d8 Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Tue, 25 May 2021 07:47:31 +0200
Subject: [PATCH] Assemble all non-wellcontainer WellState members

---
 opm/simulators/wells/WellState.hpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/opm/simulators/wells/WellState.hpp b/opm/simulators/wells/WellState.hpp
index fb687d34a..7fc40eac3 100644
--- a/opm/simulators/wells/WellState.hpp
+++ b/opm/simulators/wells/WellState.hpp
@@ -440,10 +440,17 @@ public:
 
 
 private:
+    WellMapType wellMap_;
+    // Use of std::optional<> here is a technical crutch, the
+    // WellStateFullyImplicitBlackoil class should be default constructible,
+    // whereas the GlobalWellInfo is not.
+    std::optional<GlobalWellInfo> global_well_info;
+    ALQState alq_state;
+    bool do_glift_optimization_;
+
     WellContainer<Well::Status> status_;
     WellContainer<std::vector<PerforationData>> well_perf_data_;
     WellContainer<const ParallelWellInfo*> parallel_well_info_;
-    WellMapType wellMap_;
     std::vector<double> bhp_;
     std::vector<double> thp_;
     std::vector<double> temperature_;
@@ -463,14 +470,8 @@ private:
     WellContainer<Opm::Well::InjectorCMode> current_injection_controls_;
     WellContainer<Well::ProducerCMode> current_production_controls_;
 
-    // Use of std::optional<> here is a technical crutch, the
-    // WellStateFullyImplicitBlackoil class should be default constructible,
-    // whereas the GlobalWellInfo is not.
-    std::optional<GlobalWellInfo> global_well_info;
     std::map<std::string, std::pair<bool, std::vector<double>>> well_rates;
 
-    ALQState alq_state;
-    bool do_glift_optimization_;
 
     std::vector<double> perfRateSolvent_;