cosmetics

- do not indent for namespace
- move constructors and destructors to top
- use public/protected/private order

opm/simulators/wells/WellState.hpp

@@ -34,6 +34,7 @@
 
 namespace Opm
 {
+
 class ParallelWellInfo;
 class SummaryState;
 
@@ -48,6 +49,12 @@ namespace Opm
         phase_usage_(pu)
     {}
 
+    WellState() = default;
+    WellState(const WellState& rhs)  = default;
+
+    virtual ~WellState() = default;
+
+    WellState& operator=(const WellState& rhs) = default;
 
     /// Allocate and initialize if wells is non-null.
     /// Also tries to give useful initial values to the bhp() and
@@ -122,8 +129,6 @@ namespace Opm
         return this->phase_usage_;
     }
 
-
-
     void openWell(int well_index) {
         this->status_[well_index] = Well::Status::OPEN;
     }
@@ -141,10 +146,11 @@ namespace Opm
     virtual void reportConnections(data::Well& well, const PhaseUsage&,
                                    const WellMapType::value_type& itr,
                                    const int* globalCellIdxMap) const;
-        virtual ~WellState() = default;
-        WellState() = default;
-        WellState(const WellState& rhs)  = default;
-        WellState& operator=(const WellState& rhs) = default;
+
+protected:
+    std::vector<Well::Status> status_;
+    std::vector<std::vector<PerforationData>> well_perf_data_;
+    std::vector<ParallelWellInfo*> parallel_well_info_;
 
 private:
     PhaseUsage phase_usage_;
@@ -154,9 +160,6 @@ namespace Opm
     std::vector<double> wellrates_;
     std::vector<double> perfrates_;
     std::vector<double> perfpress_;
-    protected:
-        std::vector<Well::Status> status_;
-    private:
 
     WellMapType wellMap_;
 
@@ -170,10 +173,6 @@ namespace Opm
                         const Well& well,
                         const ParallelWellInfo& well_info,
                         const SummaryState& summary_state);
-
-    protected:
-        std::vector<std::vector<PerforationData>> well_perf_data_;
-        std::vector<ParallelWellInfo*> parallel_well_info_;
 };
 
 } // namespace Opm