Merged IBPSA with correction to line thickness

mwetter · mwetter · commit 6554f6977a31 · 2025-04-09T14:14:51.000-07:00
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
@@ -57,7 +57,6 @@ Modelica Standard Library.
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
@@ -57,7 +57,6 @@ Modelica Standard Library.
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
@@ -76,7 +76,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
@@ -54,7 +54,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
@@ -31,7 +31,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
@@ -62,7 +62,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo
@@ -31,7 +31,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
@@ -108,7 +108,6 @@ Modelica Standard Library.
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
@@ -63,7 +63,6 @@ equation
           extent={{-100,-100},{100,100}},
           lineColor={0,0,127},
           fillColor={223,211,169},
-          lineThickness=5.0,
           borderPattern=BorderPattern.Raised,
           fillPattern=FillPattern.Solid),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Integers/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Change.mo
@@ -32,7 +32,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/Equal.mo b/Buildings/Controls/OBC/CDL/Integers/Equal.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/Greater.mo b/Buildings/Controls/OBC/CDL/Integers/Greater.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
@@ -26,7 +26,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
@@ -22,7 +22,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/Less.mo b/Buildings/Controls/OBC/CDL/Integers/Less.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
@@ -22,7 +22,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
@@ -22,7 +22,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo
@@ -34,7 +34,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/Stage.mo b/Buildings/Controls/OBC/CDL/Integers/Stage.mo
@@ -74,7 +74,6 @@ annotation (defaultComponentName="sta",
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Integers/Switch.mo b/Buildings/Controls/OBC/CDL/Integers/Switch.mo
@@ -51,7 +51,6 @@ First implementation.
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Logical/And.mo b/Buildings/Controls/OBC/CDL/Logical/And.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Change.mo b/Buildings/Controls/OBC/CDL/Logical/Change.mo
@@ -25,7 +25,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/Edge.mo b/Buildings/Controls/OBC/CDL/Logical/Edge.mo
@@ -25,7 +25,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
@@ -29,7 +29,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
@@ -26,7 +26,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
@@ -35,7 +35,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
@@ -35,7 +35,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nand.mo b/Buildings/Controls/OBC/CDL/Logical/Nand.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nor.mo b/Buildings/Controls/OBC/CDL/Logical/Nor.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Not.mo b/Buildings/Controls/OBC/CDL/Logical/Not.mo
@@ -19,7 +19,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={215,215,215},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Logical/Or.mo b/Buildings/Controls/OBC/CDL/Logical/Or.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Pre.mo b/Buildings/Controls/OBC/CDL/Logical/Pre.mo
@@ -25,7 +25,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Proof.mo b/Buildings/Controls/OBC/CDL/Logical/Proof.mo
@@ -296,7 +296,6 @@ the feedback delay"),
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
@@ -83,7 +83,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
@@ -38,7 +38,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo
@@ -106,7 +106,6 @@ Initial CDL implementation based on continuous time table implementation in CDL.
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised,
           lineColor={0,0,0}),
diff --git a/Buildings/Controls/OBC/CDL/Logical/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Switch.mo
@@ -52,7 +52,6 @@ Modelica Standard Library.
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Timer.mo b/Buildings/Controls/OBC/CDL/Logical/Timer.mo
@@ -57,7 +57,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Logical/TimerAccumulating.mo b/Buildings/Controls/OBC/CDL/Logical/TimerAccumulating.mo
@@ -73,7 +73,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Line(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
@@ -54,7 +54,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Ellipse(
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo
@@ -51,7 +51,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo b/Buildings/Controls/OBC/CDL/Logical/VariablePulse.mo
@@ -127,7 +127,6 @@ protected
           Rectangle(
             extent={{-100,100},{100,-100}},
             lineColor={0,0,0},
-            lineThickness=5.0,
             fillColor={210,210,210},
             fillPattern=FillPattern.Solid,
             borderPattern=BorderPattern.Raised),
@@ -178,7 +177,6 @@ annotation (
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Logical/Xor.mo b/Buildings/Controls/OBC/CDL/Logical/Xor.mo
@@ -23,7 +23,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           fillColor={210,210,210},
-          lineThickness=5.0,
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
         Text(
diff --git a/Buildings/Controls/OBC/CDL/Reals/Greater.mo b/Buildings/Controls/OBC/CDL/Reals/Greater.mo
@@ -50,7 +50,6 @@ protected
           Rectangle(
             extent={{-100,100},{100,-100}},
             lineColor={0,0,0},
-            lineThickness=5.0,
             fillColor={210,210,210},
             fillPattern=FillPattern.Solid,
             borderPattern=BorderPattern.Raised),
@@ -93,7 +92,6 @@ protected
           Rectangle(
             extent={{-100,100},{100,-100}},
             lineColor={0,0,0},
-            lineThickness=5.0,
             fillColor={210,210,210},
             fillPattern=FillPattern.Solid,
             borderPattern=BorderPattern.Raised),
@@ -130,7 +128,6 @@ equation
         Rectangle(
           extent={{-100,100},{100,-100}},
           lineColor={0,0,0},
-          lineThickness=5.0,
           fillColor={210,210,210},
           fillPattern=FillPattern.Solid,
           borderPattern=BorderPattern.Raised),
diff --git a/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo
diff --git a/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo
diff --git a/Buildings/Controls/OBC/CDL/Reals/Less.mo b/Buildings/Controls/OBC/CDL/Reals/Less.mo
diff --git a/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo
diff --git a/Buildings/Controls/OBC/CDL/Reals/Switch.mo b/Buildings/Controls/OBC/CDL/Reals/Switch.mo
diff --git a/Buildings/Fluid/FMI/Adaptors/HVAC.mo b/Buildings/Fluid/FMI/Adaptors/HVAC.mo
diff --git a/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo b/Buildings/Fluid/FMI/Adaptors/ThermalZone.mo
