From 773f322c755c03704330375b8e40ad1fa75267d2 Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Thu, 16 May 2024 11:40:15 +0200 Subject: [PATCH] Replace non-existing IBPSA models by a similar model in the MSL --- .../BaseClasses/PartialSolarCollector.mo | 6 ++++-- .../SolarCollectors/Controls/CollectorPump.mo | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo b/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo index d02e6f69e1..dd577ab769 100644 --- a/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo +++ b/IBPSA/Fluid/SolarCollectors/BaseClasses/PartialSolarCollector.mo @@ -125,9 +125,11 @@ partial model PartialSolarCollector "Partial model for solar collectors" rotation=180, origin={0,-20}))); - 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}}))); - 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 7dd62d0cd2..6598a0a637 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}}))); - IBPSA.Controls.OBC.CDL.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,19 @@ model CollectorPump final azi=azi) "Direct solar irradiation on a tilted surface" annotation (Placement(transformation(extent={{-60,20},{-40,40}}))); - IBPSA.Controls.OBC.CDL.Reals.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}}))); - IBPSA.Controls.OBC.CDL.Reals.Hysteresis hys( + Modelica.Blocks.Logical.Hysteresis hys( final uLow=0, final uHigh=delQ_flow) annotation (Placement(transformation(extent={{60,-10},{80,10}}))); protected - IBPSA.Controls.OBC.CDL.Reals.Subtract sub + Modelica.Blocks.Math.Add sub(k2=-1) "Difference between incident solar and required incident to compensate thermal losses" annotation (Placement(transformation(extent={{20,-10},{40,10}}))); equation @@ -82,12 +82,12 @@ equation connect(HDirTil.H, HTotTil.u2) annotation (Line(points={{-39,30},{-30,30},{-30, 44},{-22,44}}, color={0,0,127})); connect(HTotTil.y, sub.u1) - annotation (Line(points={{2,50},{10,50},{10,6},{18,6}}, color={0,0,127})); + annotation (Line(points={{1,50},{10,50},{10,6},{18,6}}, color={0,0,127})); connect(criSol.G_TC, sub.u2) annotation (Line(points={{-38.4,-10},{10,-10},{10, -6},{18,-6}}, color={0,0,127})); connect(hys.u, sub.y) - annotation (Line(points={{58,0},{42,0}}, color={0,0,127})); - connect(on, hys.y) annotation (Line(points={{120,0},{82,0}}, + annotation (Line(points={{58,0},{41,0}}, color={0,0,127})); + connect(on, hys.y) annotation (Line(points={{120,0},{81,0}}, color={255,0,255})); annotation ( defaultComponentName = "pumCon",