From b098628825fadfbbe835758e80cd45f0dda13077 Mon Sep 17 00:00:00 2001
From: Phil Ahrenkiel <Phil Ahrenkiel@DESKTOP-5PJG564>
Date: Thu, 15 Feb 2024 12:03:29 -0700
Subject: [PATCH] Re-sort vars.

---
 src/HPWH.hh            | 29 ++++++++++++-----------------
 src/HPWHHeatSources.cc |  5 -----
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/HPWH.hh b/src/HPWH.hh
index da6b9b7d..ec982807 100644
--- a/src/HPWH.hh
+++ b/src/HPWH.hh
@@ -1203,12 +1203,10 @@ class HPWH::HeatSource
 
     HeatSource(const HeatSource& hSource);            /// copy constructor
     HeatSource& operator=(const HeatSource& hSource); /// assignment operator
-    /**< the copy constructor and assignment operator basically just checks if there
-        are backup/companion pointers - these can't be copied */
 
     void setupAsResistiveElement(int node, double Watts, int condensitySize = CONDENSITY_SIZE);
-    /**< configure the heat source to be a resisive element, positioned at the
-        specified node, with the specified power in watts */
+    /// configure the heat source to be a resisive element, positioned at the
+    /// specified node, with the specified power in watts
 
     bool isEngaged() const;
     /**< return whether or not the heat source is engaged */
@@ -1293,8 +1291,8 @@ class HPWH::HeatSource
     /// owner of the heat source, necessary to access HPWH variables
     HPWH* hpwh;
 
-    HEATSOURCE_TYPE typeOfHeatSource; /**< compressor, resistance, extra, none */
-    COIL_CONFIG configuration;        /**<  submerged, wrapped, external */
+    HEATSOURCE_TYPE typeOfHeatSource; /// compressor, resistance, extra, none
+    COIL_CONFIG configuration;        /// submerged, wrapped, external
 
     // state/output variables
 
@@ -1403,14 +1401,12 @@ class HPWH::HeatSource
     /// A list of points for the defrost derate factor ordered by increasing external temperature
     std::vector<defrostPoint> defrostMap;
 
+    ///  maximum output temperature at the minimum operating temperature (minT) of HPWH environment
     struct maxOut_minAir
     {
         double outT_C;
         double airT_C;
-    };
-
-    ///  maximum output temperature at the minimum operating temperature (minT) of HPWH environment
-    maxOut_minAir maxOut_at_LowT;
+    } maxOut_at_LowT;
 
     /// approximate a secondary
     /// heat exchanger by adding extra input energy for the pump and an increase in the water to the
@@ -1466,18 +1462,17 @@ class HPWH::HeatSource
     /// cop (not capacity) for cases where the air flow is restricted - typically ducting
     double airflowFreedom;
 
-    /// The node height at which the external multipass or single pass HPWH
-    /// adds heated water to the storage tank, defaults to top for single pass.
+    /// The node height at which the external HPWH adds heated water to the storage tank.
+    /// Defaults to top for single pass.
     int externalInletHeight;
 
+    /// The node height at which the external HPWH takes cold water out of the storage tank.
+    /// Defaults to bottom for single pass.
+    int externalOutletHeight;
+
     /// number of the first non-zero condensity entry
     int lowestNode;
 
-    /// The node height at which the external multipass or single pass
-    /// HPWH takes cold water out of the storage tank, defaults to
-    /// bottom for single pass.
-    int externalOutletHeight;
-
     /// The multipass flow rate
     double mpFlowRate_LPS;
 
diff --git a/src/HPWHHeatSources.cc b/src/HPWHHeatSources.cc
index a600ab75..660acc8c 100644
--- a/src/HPWHHeatSources.cc
+++ b/src/HPWHHeatSources.cc
@@ -30,13 +30,10 @@ HPWH::HeatSource::HeatSource(HPWH* hpwh_in /* = nullptr */)
     , companionHeatSource(NULL)
     , followedByHeatSource(NULL)
     , Tshrinkage_C(1.)
-
     , useBtwxtGrid(false)
     , extrapolationMethod(EXTRAP_LINEAR)
-
     , standbyLogic(NULL)
     , maxOut_at_LowT {100, -273.15}
-
     , secondaryHeatExchanger {0., 0., 0.}
     , minT(-273.15)
     , maxT(100)
@@ -44,11 +41,9 @@ HPWH::HeatSource::HeatSource(HPWH* hpwh_in /* = nullptr */)
     , hysteresis_dC(0)
     , depressesTemperature(false)
     , airflowFreedom(1.)
-
     , externalInletHeight(-1)
     , externalOutletHeight(-1)
     , lowestNode(0)
-
     , mpFlowRate_LPS(0.)
     , isMultipass(true)
 {