From db4e9b3566d43fca366f3af81fa0a08be12d39df Mon Sep 17 00:00:00 2001
From: David Blum <dhblum@lbl.gov>
Date: Mon, 16 Oct 2023 13:06:03 -0700
Subject: [PATCH] Various small cleanup

---
 .../CHPs/OrganicRankine/BaseClasses/BottomingCycle.mo    | 2 +-
 .../Fluid/CHPs/OrganicRankine/BaseClasses/Equations.mo   | 6 +++---
 .../CHPs/OrganicRankine/BaseClasses/EvaporatorLimited.mo | 4 +++-
 .../CHPs/OrganicRankine/BaseClasses/HeaterCooler_Q.mo    | 4 +++-
 Buildings/Fluid/CHPs/OrganicRankine/BottomingCycle.mo    | 9 +++++----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/BottomingCycle.mo b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/BottomingCycle.mo
index 3a4f623ec49..e71a2004c99 100644
--- a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/BottomingCycle.mo
+++ b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/BottomingCycle.mo
@@ -14,7 +14,7 @@ model BottomingCycle "Organic Rankine cycle as a bottoming"
     min=0,
     final quantity="Power",
     final unit="W") "Power output of the expander"
-                                   annotation (Placement(transformation(extent={{100,40},
+    annotation (Placement(transformation(extent={{100,40},
             {120,60}}),            iconTransformation(extent={{100,50},{120,70}})));
   Modelica.Blocks.Interfaces.RealOutput etaThe(
     min=0,
diff --git a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Equations.mo b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Equations.mo
index bb4b2ef2948..036258c965e 100644
--- a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Equations.mo
+++ b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/Equations.mo
@@ -50,18 +50,18 @@ model Equations "Core equations of a Rankine cycle"
   final Modelica.Units.SI.SpecificEnergy dhExp =
     (hExpOut_i - hExpInl) * etaExp
     "Enthalpy differential at the expander (negative)";
-  final Modelica.Units.SI.SpecificEnergy dhCon = - dhEva - dhExp
+  final Modelica.Units.SI.SpecificEnergy dhCon = -dhEva - dhExp
     "Enthalpy differential at the condenser (negative)";
 
   Modelica.Blocks.Interfaces.RealOutput etaThe(
     min=0,
-    final unit="1")=-dhExp/dhEva      "Thermal efficiency"
+    final unit="1") = -dhExp/dhEva "Thermal efficiency"
     annotation (Placement(
         transformation(extent={{100,30},{120,50}}),   iconTransformation(extent={{100,30},
             {120,50}})));
   Modelica.Blocks.Interfaces.RealOutput rConEva(
     max=0,
-    final unit="1")=dhCon/dhEva
+    final unit="1") = dhCon/dhEva
     "Ratio of heat flow of condenser to evaporator (<0)"
     annotation (Placement(
         transformation(extent={{100,-50},{120,-30}}), iconTransformation(extent={{100,-50},
diff --git a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/EvaporatorLimited.mo b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/EvaporatorLimited.mo
index 500d288388c..d1d195bdc67 100644
--- a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/EvaporatorLimited.mo
+++ b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/EvaporatorLimited.mo
@@ -20,7 +20,9 @@ model EvaporatorLimited
     final dp_nominal=dp_nominal) "Evaporator"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
-  Modelica.Blocks.Interfaces.RealOutput Q_flow(unit="W")
+  Modelica.Blocks.Interfaces.RealOutput Q_flow(
+    final quantity="Power",
+    final unit="W")
     "Heat added to the fluid"
     annotation (Placement(transformation(extent={{100,-70},{120,-50}}),
         iconTransformation(extent={{100,-70},{120,-50}})));
diff --git a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/HeaterCooler_Q.mo b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/HeaterCooler_Q.mo
index 2c2da12471b..06d5da5dcda 100644
--- a/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/HeaterCooler_Q.mo
+++ b/Buildings/Fluid/CHPs/OrganicRankine/BaseClasses/HeaterCooler_Q.mo
@@ -5,7 +5,9 @@ model HeaterCooler_Q
     redeclare final Buildings.Fluid.MixingVolumes.MixingVolume vol(
     final prescribedHeatFlowRate=true));
 
-  Modelica.Blocks.Interfaces.RealInput Q_flow(unit="W")
+  Modelica.Blocks.Interfaces.RealInput Q_flow(
+    final quantity="Power",
+    final unit="W")
     "Heat added to the fluid"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
 protected
diff --git a/Buildings/Fluid/CHPs/OrganicRankine/BottomingCycle.mo b/Buildings/Fluid/CHPs/OrganicRankine/BottomingCycle.mo
index 238fdd404f2..75ab919de99 100644
--- a/Buildings/Fluid/CHPs/OrganicRankine/BottomingCycle.mo
+++ b/Buildings/Fluid/CHPs/OrganicRankine/BottomingCycle.mo
@@ -35,19 +35,20 @@ model BottomingCycle
     min=0,
     final quantity="Power",
     final unit="W") "Power output of the expander"
-                                   annotation (Placement(transformation(extent={{100,20},
+    annotation (Placement(transformation(extent={{100,20},
             {120,40}}),            iconTransformation(extent={{100,20},{120,40}})));
   Modelica.Blocks.Interfaces.RealOutput etaThe(min=0, final unit="1")
-                    "Thermal efficiency"
+    "Thermal efficiency"
     annotation (Placement(
         transformation(extent={{100,-10},{120,10}}),  iconTransformation(extent={{100,-40},
             {120,-20}})));
   Modelica.Blocks.Interfaces.RealOutput QCon_flow(final quantity="Power",
-      final unit="W") "Heat rejected through condensation"
+    final unit="W") "Heat rejected through condensation"
     annotation (Placement(transformation(extent={{100,-100},{120,-80}}),
         iconTransformation(extent={{100,-110},{120,-90}})));
   Modelica.Blocks.Interfaces.RealOutput QEva_flow(final quantity="Power",
-      final unit="W") "Heat added through evaporation" annotation (Placement(
+    final unit="W") "Heat added through evaporation"
+    annotation (Placement(
         transformation(extent={{100,82},{120,102}}), iconTransformation(extent={
             {100,90},{120,110}})));
 equation