From 56857aa01760b7e1d3c944e22c24a8e6a564b4bf Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Fri, 17 May 2024 13:41:33 -0700 Subject: [PATCH] Corrected format --- .../BaseClasses/PartialSolarCollector.mo | 8 +++---- .../SolarCollectors/Controls/CollectorPump.mo | 23 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo b/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo index dd577ab769..edf7bc0d65 100644 --- a/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo +++ b/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo @@ -125,11 +125,11 @@ partial model PartialSolarCollector "Partial model for solar collectors" rotation=180, origin={0,-20}))); - Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow - QGai[nSeg] "Rate of solar heat gain" + Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow QGai[nSeg] + "Rate of solar heat gain" annotation (Placement(transformation(extent={{50,40},{70,60}}))); - Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow - QLos[nSeg] "Rate of heat loss" + Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow QLos[nSeg] + "Rate of heat loss" annotation (Placement(transformation(extent={{50,10},{70,30}}))); replaceable parameter IBPSA.Fluid.SolarCollectors.Data.GenericASHRAE93 per constrainedby IBPSA.Fluid.SolarCollectors.Data.BaseClasses.Generic diff --git a/IBPSA/Fluid/SolarCollectors/Controls/CollectorPump.mo b/IBPSA/Fluid/SolarCollectors/Controls/CollectorPump.mo index 6598a0a637..24e32ec74b 100644 --- a/IBPSA/Fluid/SolarCollectors/Controls/CollectorPump.mo +++ b/IBPSA/Fluid/SolarCollectors/Controls/CollectorPump.mo @@ -25,7 +25,7 @@ model CollectorPump "Fluid temperature entering the collector" annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}))); - Modelica.Blocks.Interfaces.BooleanOutput on + Modelica.Blocks.Interfaces.BooleanOutput on "Ouputs true if collector pump should be on" annotation (Placement(transformation(extent={{100,-20},{140,20}}))); @@ -47,19 +47,20 @@ model CollectorPump final azi=azi) "Direct solar irradiation on a tilted surface" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - Modelica.Blocks.Math.Add HTotTil( + Modelica.Blocks.Math.Add HTotTil( u1(final unit="W/m2"), u2(final unit="W/m2"), y(final unit="W/m2")) "Total irradiation on tilted surface" annotation (Placement(transformation(extent={{-20,40},{0,60}}))); - Modelica.Blocks.Logical.Hysteresis hys( - final uLow=0, - final uHigh=delQ_flow) + Modelica.Blocks.Logical.Hysteresis hys( + final uLow=0, + final uHigh=delQ_flow) annotation (Placement(transformation(extent={{60,-10},{80,10}}))); protected - Modelica.Blocks.Math.Add sub(k2=-1) + Modelica.Blocks.Math.Add sub( + final k2=-1) "Difference between incident solar and required incident to compensate thermal losses" annotation (Placement(transformation(extent={{20,-10},{40,10}}))); equation @@ -96,16 +97,16 @@ Documentation(info=" Pump on/off controller for a solar thermal system.

-This controller outputs whether the pump should be commanded on or off +This controller outputs whether the pump should be commanded on or off based on the incident solar radiation, the collector inlet temperature, and the system parameters. -The pump is commanded on when the incident solar radiation is greater than -the critical radiation plus the offset delQ_flow, -and it is switched off if the incident solar radiation is +The pump is commanded on when the incident solar radiation is greater than +the critical radiation plus the offset delQ_flow, +and it is switched off if the incident solar radiation is below the critical radiation.

-The critical radiation is defined per Equation 6.8.2 in +The critical radiation is defined per Equation 6.8.2 in Duffie and Beckman (2006). It is