From f99748a7263af48af1ea2e1e5a9da6302cba3747 Mon Sep 17 00:00:00 2001
From: Casper Fu <91219266+hcasperfu@users.noreply.github.com>
Date: Wed, 18 May 2022 10:00:09 -0500
Subject: [PATCH] Maint 8.1.x issue3016 text and graphic errors (#3019)
* checked out files under OBC from issue3016
* release notes
---
.../OBC/CDL/Conversions/BooleanToInteger.mo | 10 ++++++++--
.../OBC/CDL/Conversions/BooleanToReal.mo | 18 ++++++++++++------
.../Conversions/Validation/BooleanToInteger.mo | 8 ++++----
.../Conversions/Validation/BooleanToReal.mo | 8 ++++----
.../Conversions/Validation/IntegerToReal.mo | 8 ++++----
Buildings/package.mo | 11 +++++++++++
6 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
index 4b56e68c8e3..458f3b00154 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
@@ -23,8 +23,8 @@ equation
Documentation(
info="
-Block that outputs the Boolean
-equivalent of the Integer input.
+Block that outputs the Integer
+equivalent of the Boolean input.
y = if u then integerTrue else integerFalse;
@@ -38,6 +38,12 @@ and integerTrue and integerFalse are parameters.
revisions="
-
+May 17, 2022, by Hongxiang Fu:
+Corrected documentation texts where the variables were described with wrong types.
+This is for
+#3016.
+
+-
January 3, 2017, by Michael Wetter:
First implementation, based on the implementation of the
Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
index e41e32e7697..96ad28ecd23 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
@@ -9,7 +9,7 @@ block BooleanToReal
"Connector of Boolean input signal"
annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
Interfaces.RealOutput y
- "Connector of Integer output signal"
+ "Connector of Real output signal"
annotation (Placement(transformation(extent={{100,-20},{140,20}})));
equation
@@ -23,21 +23,27 @@ equation
Documentation(
info="
-Block that outputs the Boolean
-equivalent of the Integer input.
+Block that outputs the Real
+equivalent of the Boolean input.
- y = if u then integerTrue else integerFalse;
+ y = if u then realTrue else realFalse;
where u is of Boolean and y
-of Integer type,
-and integerTrue and integerFalse are parameters.
+of Real type,
+and realTrue and realFalse are parameters.
",
revisions="
-
+May 17, 2022, by Hongxiang Fu:
+Corrected documentation texts where the variables were described with wrong types.
+This is for
+#3016.
+
+-
April 10, 2017, by Jianjun Hu:
First implementation, based on the implementation of the
Modelica Standard Library.
diff --git a/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToInteger.mo
index 2e9d25e5000..73563fd4452 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToInteger.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToInteger.mo
@@ -2,16 +2,16 @@ within Buildings.Controls.OBC.CDL.Conversions.Validation;
model BooleanToInteger
"Validation model for the BooleanToInteger block"
Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt
- "Block that convert Boolean to Integer signal"
+ "Block that converts Boolean to Integer signal"
annotation (Placement(transformation(extent={{30,-10},{50,10}})));
Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
period=1)
- "Generate output cyclic on and off"
+ "Generate cyclic on-and-off output"
annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
equation
connect(booPul.y,booToInt.u)
- annotation (Line(points={{1,0},{28,0},{28,0}},color={255,0,255}));
+ annotation (Line(points={{2,0},{28,0},{28,0}},color={255,0,255}));
annotation (
experiment(
StopTime=4.0,
@@ -30,7 +30,7 @@ Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger.
-
March 31, 2017, by Jianjun Hu:
-First implementation..
+First implementation.
"),
diff --git a/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToReal.mo
index 44ca49c8bc2..0b3e49aaa21 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/Validation/BooleanToReal.mo
@@ -2,16 +2,16 @@ within Buildings.Controls.OBC.CDL.Conversions.Validation;
model BooleanToReal
"Validation model for the BooleanToReal block"
Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
- "Block that convert Boolean to Real signal"
+ "Block that converts Boolean to Real signal"
annotation (Placement(transformation(extent={{30,-10},{50,10}})));
Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
period=1)
- "Generate output cyclic on and off"
+ "Generate cyclic on-and-off output"
annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
equation
connect(booPul.y,booToRea.u)
- annotation (Line(points={{1,0},{28,0},{28,0}},color={255,0,255}));
+ annotation (Line(points={{2,0},{28,0},{28,0}},color={255,0,255}));
annotation (
experiment(
StopTime=4.0,
@@ -30,7 +30,7 @@ Buildings.Controls.OBC.CDL.Conversions.BooleanToReal.
-
April 10, 2017, by Jianjun Hu:
-First implementation..
+First implementation.
"),
diff --git a/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo
index 1a3836118db..78e15cdb4e8 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/Validation/IntegerToReal.mo
@@ -2,7 +2,7 @@ within Buildings.Controls.OBC.CDL.Conversions.Validation;
model IntegerToReal
"Validation model for the IntegerToReal block"
Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea
- "Block that convert Integer to Real signal"
+ "Block that converts Integer to Real signal"
annotation (Placement(transformation(extent={{40,-10},{60,10}})));
Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp ramp1(
duration=1,
@@ -20,11 +20,11 @@ model IntegerToReal
equation
connect(ramp1.y,round2.u)
- annotation (Line(points={{-59,0},{-42,0}},color={0,0,127}));
+ annotation (Line(points={{-58,0},{-42,0}},color={0,0,127}));
connect(round2.y,reaToInt1.u)
- annotation (Line(points={{-19,0},{-2,0}},color={0,0,127}));
+ annotation (Line(points={{-18,0},{-2,0}},color={0,0,127}));
connect(reaToInt1.y,intToRea.u)
- annotation (Line(points={{21,0},{28,0},{28,0},{38,0}},color={255,127,0}));
+ annotation (Line(points={{22,0},{28,0},{28,0},{38,0}},color={255,127,0}));
annotation (
experiment(
StopTime=1.0,
diff --git a/Buildings/package.mo b/Buildings/package.mo
index ea99eee6108..a5cbc868f26 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -245,6 +245,17 @@ have been improved in a
backward compatible way:
+| Buildings.Controls
+ |
+
+Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger
+ Buildings.Controls.OBC.CDL.Conversions.BooleanToReal
+ |
+ Corrected documentation texts where the variables were described with wrong types.
+ This is for
+ #3016.
+ |
+
| Buildings.Fluid
|