Skip to content

Commit 649c777

Browse files
mwettermwetter
authored
Merge pull request #2015 from ibpsa/2011_minFlowRateCounter
Fix error counter in heat pump safety control
2 parents eb0c5b1 + 4d09f38 commit 649c777

File tree

11 files changed

+149
-78
lines changed

11 files changed

+149
-78
lines changed

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/AntiFreeze.mo‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,21 @@ equation
4444
points={{1,20},{20,20},{20,0},{38,0}},
4545
color={255,0,255}));
4646
annotation (Documentation(revisions="<html><ul>
47-
<li>
48-
<i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
49-
Adapted based on IBPSA implementation (see issue <a href=
50-
\"https://github.com/ibpsa/modelica-ibpsa/issues/1576\">#1576</a>)
51-
</li>
52-
<li>
53-
<i>November 26, 2018</i> by Fabian Wuellhorst:<br/>
54-
First implementation (see issue <a href=
55-
\"https://github.com/RWTH-EBC/AixLib/issues/577\">AixLib #577</a>)
56-
</li>
47+
<li>
48+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
49+
Increase error counter only when device should turn on (see issue <a href=
50+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
51+
</li>
52+
<li>
53+
<i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
54+
Adapted based on IBPSA implementation (see issue <a href=
55+
\"https://github.com/ibpsa/modelica-ibpsa/issues/1576\">#1576</a>)
56+
</li>
57+
<li>
58+
<i>November 26, 2018</i> by Fabian Wuellhorst:<br/>
59+
First implementation (see issue <a href=
60+
\"https://github.com/RWTH-EBC/AixLib/issues/577\">AixLib #577</a>)
61+
</li>
5762
</ul>
5863
</html>", info="<html>
5964
<p>

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,36 @@ partial model PartialOperationalEnvelope
2626
final tab=tabUppHea,
2727
final dT=dTHys,
2828
final isUppBou=true) "Operational boundary map for heating operation"
29-
annotation (Placement(transformation(extent={{-80,40},{-20,100}})));
29+
annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
3030

3131
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses.BoundaryMap bouMapCoo(
3232
final tab=tabLowCoo,
3333
final dT=dTHys,
3434
final isUppBou=false) "Operational boundary map for cooling operation"
35-
annotation (Placement(transformation(extent={{-80,-80},{-20,-20}})));
35+
annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
3636
Modelica.Blocks.Logical.LogicalSwitch swiHeaCoo
3737
"Switch between heating and cooling envelope"
3838
annotation (Placement(transformation(extent={{-4,-10},{16,10}})));
3939
equation
40-
connect(ySet,swiErr.u1) annotation (Line(points={{-136,0},{-80,0},{-80,20},{
41-
70,20},{70,8},{78,8}},
40+
connect(ySet,swiErr.u1) annotation (Line(points={{-136,0},{-100,0},{-100,20},
41+
{70,20},{70,8},{78,8}},
4242
color={0,0,127}));
4343
connect(swiHeaCoo.y, booPasThr.u)
4444
annotation (Line(points={{17,0},{38,0}}, color={255,0,255}));
4545
connect(bouMapCoo.noErr, swiHeaCoo.u3)
46-
annotation (Line(points={{-17,-50},{-12,-50},{-12,-8},{-6,-8}},
46+
annotation (Line(points={{-59,-30},{-14,-30},{-14,-8},{-6,-8}},
4747
color={255,0,255}));
4848
connect(bouMapHea.noErr, swiHeaCoo.u1)
49-
annotation (Line(points={{-17,70},{-12,70},{-12,8},{-6,8}},
49+
annotation (Line(points={{-59,50},{-54,50},{-54,8},{-6,8}},
5050
color={255,0,255}));
5151

5252
annotation (Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
5353
Documentation(revisions="<html><ul>
54+
<li>
55+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
56+
Increase error counter only when device should turn on (see issue <a href=
57+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
58+
</li>
5459
<li>
5560
May 22, 2025, by Michael Wetter:<br/>
5661
Revised comment.<br/>

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialSafety.mo‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
within IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses;
22
partial model PartialSafety "Safety control with I/O"
3+
parameter Boolean onOffMea_start=true
4+
"Start value for the on-off signal of the device, true for on";
5+
parameter Real ySet_small
6+
"Threshold for relative speed for the device to be considered on";
37
Modelica.Blocks.Interfaces.RealInput ySet
48
"Input for relative compressor speed from 0 to 1"
59
annotation (Placement(transformation(extent={{-152,-16},{-120,16}}),
@@ -56,6 +60,11 @@ partial model PartialSafety "Safety control with I/O"
5660
textString="%name")}), Diagram(coordinateSystem(
5761
preserveAspectRatio=false, extent={{-120,-120},{120,120}})),
5862
Documentation(revisions="<html><ul>
63+
<li>
64+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
65+
Introduce partial parameters used in all safety blocks (see issue <a href=
66+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
67+
</li>
5968
<li>
6069
<i>November 26, 2018</i> by Fabian Wuellhorst:<br/>
6170
First implementation (see issue <a href=

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialSafetyWithCounter.mo‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.BaseClasses;
22
partial model PartialSafetyWithCounter
33
"Safety control which adds an error counter to the I/O"
44
extends PartialSafety;
5-
65
Modelica.Blocks.Logical.Switch swiErr
76
"Switches to zero when an error occurs"
87
annotation (Placement(transformation(extent={{80,-10},{100,10}})));
@@ -27,7 +26,7 @@ partial model PartialSafetyWithCounter
2726
annotation (Placement(transformation(
2827
extent={{-10,-10},{10,10}},
2928
rotation=0,
30-
origin={10,-90})));
29+
origin={-30,-70})));
3130
Modelica.Blocks.Sources.IntegerConstant intConOne(final k=1)
3231
"Used for display of current error"
3332
annotation (Placement(transformation(extent={{10,10},{-10,-10}},
@@ -36,25 +35,44 @@ partial model PartialSafetyWithCounter
3635
Modelica.Blocks.Routing.BooleanPassThrough booPasThr
3736
"Used to keep the connection to the counter"
3837
annotation (Placement(transformation(extent={{40,-10},{60,10}})));
38+
Modelica.Blocks.Logical.Hysteresis ySetOn(
39+
final pre_y_start=onOffMea_start,
40+
final uHigh=ySet_small,
41+
final uLow=ySet_small/2) "=true if device is set on"
42+
annotation (Placement(transformation(extent={{-40,-110},{-20,-90}})));
43+
Modelica.Blocks.Logical.And errAndSetOn
44+
"Error occured and the device should be on"
45+
annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
3946
equation
4047
connect(conZer.y,swiErr. u3) annotation (Line(points={{61,-30},{70,-30},{70,
4148
-8},{78,-8}}, color={0,0,127}));
4249
connect(disErr.y,err) annotation (Line(points={{102,-100},{130,-100}},
4350
color={255,127,0}));
44-
connect(notVal.y, disErr.trigger) annotation (Line(points={{21,-90},{28,-90},
45-
{28,-118},{84,-118},{84,-112}},
46-
color={255,0,255}));
4751
connect(intConOne.y, disErr.u) annotation (Line(points={{59,-100},{76,-100}},
4852
color={255,127,0}));
4953
connect(booPasThr.y, swiErr.u2)
5054
annotation (Line(points={{61,0},{78,0}}, color={255,0,255}));
51-
connect(booPasThr.y, notVal.u) annotation (Line(points={{61,0},{68,0},{68,-12},
52-
{-8,-12},{-8,-90},{-2,-90}}, color={255,0,255}));
55+
connect(booPasThr.y, notVal.u) annotation (Line(points={{61,0},{66,0},{66,-54},
56+
{-46,-54},{-46,-70},{-42,-70}}, color={255,0,255}));
5357
connect(swiErr.y, yOut) annotation (Line(points={{101,0},{110,0},{110,0},{130,
5458
0}}, color={0,0,127}));
59+
connect(ySetOn.u, ySet) annotation (Line(points={{-42,-100},{-100,-100},{-100,
60+
0},{-136,0}},
61+
color={0,0,127}));
62+
connect(errAndSetOn.u1, notVal.y) annotation (Line(points={{-2,-80},{-14,-80},
63+
{-14,-70},{-19,-70}}, color={255,0,255}));
64+
connect(errAndSetOn.y, disErr.trigger) annotation (Line(points={{21,-80},{28,
65+
-80},{28,-116},{84,-116},{84,-112}}, color={255,0,255}));
66+
connect(ySetOn.y, errAndSetOn.u2) annotation (Line(points={{-19,-100},{-10,-100},
67+
{-10,-88},{-2,-88}}, color={255,0,255}));
5568
annotation (Diagram(coordinateSystem(
5669
preserveAspectRatio=false, extent={{-120,-120},{120,120}})),
5770
Documentation(revisions="<html><ul>
71+
<li>
72+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
73+
Increase error counter only when device should turn on (see issue <a href=
74+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
75+
</li>
5876
<li>
5977
<i>November 26, 2018</i> by Fabian Wuellhorst:<br/>
6078
First implementation (see issue <a href=

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/AntiFreeze.mo‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Examples;
22
model AntiFreeze "Example for usage of antifreeze model"
33
extends BaseClasses.PartialSafety;
44
extends Modelica.Icons.Example;
5-
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.AntiFreeze antFre
5+
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.AntiFreeze antFre(
6+
onOffMea_start=false, ySet_small=hys.uHigh)
67
"Safety control for antifreeze"
78
annotation (Placement(transformation(extent={{0,0},{20,20}})));
89
Modelica.Blocks.Sources.Pulse ySetPul(amplitude=1, period=50)
@@ -31,7 +32,7 @@ equation
3132
extent={{-6,3},{-6,3}},
3233
horizontalAlignment=TextAlignment.Right));
3334
connect(ySetPul.y, antFre.ySet) annotation (Line(points={{-69,30},{-8,30},{-8,
34-
11.6667},{-1.33333,11.6667}},
35+
10},{-1.33333,10}},
3536
color={0,0,127}));
3637
connect(TEvaOutEmu.y, sigBus.TEvaOutMea) annotation (Line(points={{-69,-50},{
3738
-50,-50}}, color={0,0,127}), Text(
@@ -45,11 +46,11 @@ equation
4546
index=1,
4647
extent={{6,3},{6,3}},
4748
horizontalAlignment=TextAlignment.Left));
48-
connect(hys.u, antFre.yOut) annotation (Line(points={{22,-50},{44,-50},{44,
49-
11.6667},{20.8333,11.6667}},
49+
connect(hys.u, antFre.yOut) annotation (Line(points={{22,-50},{44,-50},{44,10},
50+
{20.8333,10}},
5051
color={0,0,127}));
51-
connect(antFre.yOut, yOut) annotation (Line(points={{20.8333,11.6667},{44,
52-
11.6667},{44,-40},{110,-40}},
52+
connect(antFre.yOut, yOut) annotation (Line(points={{20.8333,10},{44,10},{44,
53+
-40},{110,-40}},
5354
color={0,0,127}));
5455
connect(ySetPul.y, ySet) annotation (Line(points={{-69,30},{-8,30},{-8,40},{110,
5556
40}}, color={0,0,127}));

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/MinimalFlowRate.mo‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ model MinimalFlowRate
44
extends BaseClasses.PartialSafety;
55
extends Modelica.Icons.Example;
66
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.MinimalFlowRate minFloRatSaf(
7+
onOffMea_start=false,
8+
ySet_small=hys.uHigh,
79
mEvaMin_flow=0.1, mConMin_flow=0.1)
810
"Safety block for minimal flow rate safety"
911
annotation (Placement(transformation(extent={{0,0},{20,20}})));

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/OperationalEnvelope.mo‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ model OperationalEnvelope "Example for usage of operational envelope model"
33
extends BaseClasses.PartialSafety;
44
extends Modelica.Icons.Example;
55
IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.OperationalEnvelope opeEnv(
6+
onOffMea_start=false,
7+
ySet_small=hys.uHigh,
68
tabUppHea=[233.15,333.15; 313.15,333.15],
79
tabLowCoo=[233.15,288.15; 313.15,288.15]) "Safety control for operational envelope"
810
annotation (Placement(transformation(extent={{0,0},{20,20}})));
@@ -32,50 +34,52 @@ model OperationalEnvelope "Example for usage of operational envelope model"
3234
annotation (Placement(transformation(extent={{-90,60},{-70,80}})));
3335
equation
3436
connect(opeEnv.sigBus, sigBus) annotation (Line(
35-
points={{0.0833333,3.91667},{-50,3.91667},{-50,-52}},
37+
points={{0.0833333,3.91667},{-50,3.91667},{-50,-50}},
3638
color={255,204,51},
3739
thickness=0.5), Text(
3840
string="%second",
3941
index=1,
4042
extent={{-6,3},{-6,3}},
4143
horizontalAlignment=TextAlignment.Right));
4244
connect(ySetPul.y, opeEnv.ySet) annotation (Line(points={{-69,30},{-8,30},{-8,
43-
11.6667},{-1.33333,11.6667}},
45+
10},{-1.33333,10}},
4446
color={0,0,127}));
45-
connect(hys.u, opeEnv.yOut) annotation (Line(points={{22,-50},{44,-50},{44,
46-
11.6667},{20.8333,11.6667}},
47+
connect(hys.u, opeEnv.yOut) annotation (Line(points={{22,-50},{44,-50},{44,10},
48+
{20.8333,10}},
4749
color={0,0,127}));
48-
connect(opeEnv.yOut, yOut) annotation (Line(points={{20.8333,11.6667},{44,
49-
11.6667},{44,-40},{110,-40}},
50+
connect(opeEnv.yOut, yOut) annotation (Line(points={{20.8333,10},{44,10},{44,
51+
-40},{110,-40}},
5052
color={0,0,127}));
5153
connect(ySetPul.y, ySet) annotation (Line(points={{-69,30},{-8,30},{-8,40},{110,
5254
40}}, color={0,0,127}));
5355
connect(TConOutEmu.y, sigBus.TConOutMea) annotation (Line(points={{-69,-10},{
54-
-50,-10},{-50,-52}}, color={0,0,127}), Text(
56+
-50,-10},{-50,-50}}, color={0,0,127}), Text(
5557
string="%second",
5658
index=1,
5759
extent={{6,3},{6,3}},
5860
horizontalAlignment=TextAlignment.Left));
59-
connect(TEvaInEmu.y, sigBus.TEvaInMea) annotation (Line(points={{-69,-50},{-52,
60-
-50},{-52,-52},{-50,-52}}, color={0,0,127}), Text(
61+
connect(TEvaInEmu.y, sigBus.TEvaInMea) annotation (Line(points={{-69,-50},{
62+
-52,-50},{-52,-50},{-50,-50}}, color={0,0,127}), Text(
6163
string="%second",
6264
index=1,
6365
extent={{6,3},{6,3}},
6466
horizontalAlignment=TextAlignment.Left));
65-
connect(hea.y, sigBus.hea) annotation (Line(points={{-69,70},{-50,70},{-50,-52}},
66-
color={255,0,255}), Text(
67+
connect(hea.y, sigBus.hea) annotation (Line(points={{-69,70},{-50,70},{-50,
68+
-50}}, color={255,0,255}), Text(
6769
string="%second",
6870
index=1,
6971
extent={{6,3},{6,3}},
7072
horizontalAlignment=TextAlignment.Left));
71-
connect(TConOutEmu.y, sigBus.TConInMea) annotation (Line(points={{-69,-10},{-50,
72-
-10},{-50,-52}}, color={0,0,127}), Text(
73+
connect(TConOutEmu.y, sigBus.TConInMea) annotation (Line(points={{-69,-10},{
74+
-50,-10},{-50,-50}},
75+
color={0,0,127}), Text(
7376
string="%second",
7477
index=1,
7578
extent={{6,3},{6,3}},
7679
horizontalAlignment=TextAlignment.Left));
77-
connect(TEvaInEmu.y, sigBus.TEvaOutMea) annotation (Line(points={{-69,-50},{-52,
78-
-50},{-52,-52},{-50,-52}}, color={0,0,127}), Text(
80+
connect(TEvaInEmu.y, sigBus.TEvaOutMea) annotation (Line(points={{-69,-50},{
81+
-52,-50},{-52,-50},{-50,-50}},
82+
color={0,0,127}), Text(
7983
string="%second",
8084
index=1,
8185
extent={{6,3},{6,3}},

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/MinimalFlowRate.mo‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ model MinimalFlowRate "Safety control for minimum mass flow rate"
66
"Minimal mass flow rate in evaporator required to operate the device";
77
parameter Modelica.Units.SI.MassFlowRate mConMin_flow
88
"Minimal mass flow rate in condenser required to operate the device";
9+
parameter Boolean onOffMea_start=true
10+
"Start value for the on-off signal of the device, true for on";
11+
parameter Real ySet_small
12+
"Threshold for relative speed for the device to be considered on";
913
Modelica.Blocks.Logical.Hysteresis hysCon(
1014
final uLow=mConMin_flow,
1115
final uHigh=max(mConMin_flow*1.1, Modelica.Constants.eps),
@@ -21,7 +25,6 @@ model MinimalFlowRate "Safety control for minimum mass flow rate"
2125
Modelica.Blocks.Logical.And and1
2226
"Both condenser and evaporator have sufficient flow"
2327
annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
24-
2528
equation
2629
connect(hysCon.y, and1.u1) annotation (Line(points={{-39,20},{-28,20},{-28,0},
2730
{-22,0}}, color={255,0,255}));
@@ -56,6 +59,11 @@ equation
5659
or freezing of components.
5760
</p>
5861
</html>", revisions="<html><ul>
62+
<li>
63+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
64+
Increase error counter only when device should turn on (see issue <a href=
65+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
66+
</li>
5967
<li>
6068
<i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
6169
First implementation (see issue <a href=

‎IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/OperationalEnvelope.mo‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,55 @@ model OperationalEnvelope
44
extends BaseClasses.PartialOperationalEnvelope;
55
equation
66
if use_TConOutHea then
7-
connect(bouMapHea.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-84.2,
8-
82},{-104,82},{-104,-61},{-119,-61}}, color={0,
7+
connect(bouMapHea.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-81.4,
8+
54},{-104,54},{-104,-61},{-119,-61}}, color={0,
99
0,127}));
1010
else
11-
connect(bouMapHea.TUseSid, sigBus.TConInMea) annotation (Line(points={{-84.2,
12-
82},{-104,82},{-104,-61},{-119,-61}}, color={0,
11+
connect(bouMapHea.TUseSid, sigBus.TConInMea) annotation (Line(points={{-81.4,
12+
54},{-104,54},{-104,-61},{-119,-61}}, color={0,
1313
0,127}));
1414
end if;
1515
if use_TEvaOutCoo then
16-
connect(bouMapCoo.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.8,
17-
-62},{-104,-62},{-104,-61},{-119,-61}},
16+
connect(bouMapCoo.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-81.6,
17+
-34},{-104,-34},{-104,-61},{-119,-61}},
1818
color={0,0,127}));
1919
else
20-
connect(bouMapCoo.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-84.8,
21-
-62},{-104,-62},{-104,-61},{-119,-61}},
20+
connect(bouMapCoo.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-81.6,
21+
-34},{-104,-34},{-104,-61},{-119,-61}},
2222
color={0,0,127}));
2323
end if;
2424
if use_TEvaOutHea then
25-
connect(bouMapHea.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-84.8,
26-
58},{-104,58},{-104,-60},{-106,-60},{-106,-61},{-119,-61}},
25+
connect(bouMapHea.TAmbSid, sigBus.TEvaOutMea) annotation (Line(points={{-81.6,
26+
46},{-104,46},{-104,-60},{-106,-60},{-106,-61},{-119,-61}},
2727
color={0,0,127}));
2828
else
29-
connect(bouMapHea.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-84.8,
30-
58},{-104,58},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
29+
connect(bouMapHea.TAmbSid, sigBus.TEvaInMea) annotation (Line(points={{-81.6,
30+
46},{-104,46},{-104,-60},{-110,-60},{-110,-61},{-119,-61}},
3131
color={0,0,127}));
3232
end if;
3333
if use_TConOutCoo then
34-
connect(bouMapCoo.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-84.2,
35-
-38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
34+
connect(bouMapCoo.TUseSid, sigBus.TConOutMea) annotation (Line(points={{-81.4,
35+
-26},{-104,-26},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
3636
color={0,0,127}));
3737
else
38-
connect(bouMapCoo.TUseSid, sigBus.TConInMea) annotation (Line(points={{-84.2,
39-
-38},{-104,-38},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
38+
connect(bouMapCoo.TUseSid, sigBus.TConInMea) annotation (Line(points={{-81.4,
39+
-26},{-104,-26},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
4040
color={0,0,127}));
4141
end if;
42-
connect(swiHeaCoo.u2, sigBus.hea) annotation (Line(points={{-6,0},{-20,0},{
43-
-20,-4},{-104,-4},{-104,-60},{-112,-60},{-112,-61},{-119,-61}},
42+
connect(swiHeaCoo.u2, sigBus.hea) annotation (Line(points={{-6,0},{-98,0},{
43+
-98,-60},{-108,-60},{-108,-61},{-119,-61}},
4444
color={255,0,255}), Text(
4545
string="%second",
4646
index=1,
4747
extent={{-6,3},{-6,3}},
4848
horizontalAlignment=TextAlignment.Right));
4949
annotation (Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
5050
Documentation(revisions="<html><ul>
51+
<li>
52+
<i>May 26, 2025</i> by Fabian Wuellhorst and Michael Wetter:<br/>
53+
Increase error counter only when device should turn on (see issue <a href=
54+
\"https://github.com/ibpsa/modelica-ibpsa/issues/2011\">IBPSA #2011</a>)
55+
</li>
5156
<li>
5257
<i>November 26, 2018</i> by Fabian Wuellhorst:<br/>
5358
First implementation (see issue <a href=

0 commit comments

Comments
 (0)