fixes

Correcting minor errors for release v2.1.1.1
bslMS · May 2, 2023 · b1f7e47 · b1f7e47
1 parent 8acde2a
commit b1f7e47
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/BusinessSimulation/Converters/Vector/Times.mo b/BusinessSimulation/Converters/Vector/Times.mo
@@ -12,6 +12,6 @@ equation
   annotation(Documentation(info = "<html>
 <p class=\"aside\">This information is part of the Business Simulation&nbsp;Library (BSL).</p>
 <p>The output vector <strong>y</strong> is obtained by <em>elementwise multiplication</em> of the input vectors <strong>u1</strong> and <strong>u2</strong>, which need to have the same length nin:</p>
-<p><img src=\"modelica://BusinessSimulation/Resources/images/Converters/Vector/Times/Formula.svg\" alt=\"y_i = u1[i] * u2[i]\"></p>
+<p><img src=\"modelica://BusinessSimulation/Resources/Images/Converters/Vector/Times/Formula.svg\" alt=\"y_i = u1[i] * u2[i]\"></p>
 </html>"), Icon(coordinateSystem(extent = {{-100, -100}, {100, 100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {10, 10}), graphics = {Line(visible = true, points = {{15, 15}, {-15, -15}}, color = {0, 0, 128}, thickness = 4, arrowSize = 0), Line(visible = true, rotation = -270, points = {{15, 15}, {-15, -15}}, color = {0, 0, 128}, thickness = 4, arrowSize = 0)}), Diagram(coordinateSystem(extent = {{-148.5, -105}, {148.5, 105}}, preserveAspectRatio = true, initialScale = 0.1, grid = {5, 5})));
 end Times;
diff --git a/BusinessSimulation/Interfaces/PartialCLD/SourceOrSink.mo b/BusinessSimulation/Interfaces/PartialCLD/SourceOrSink.mo
@@ -10,7 +10,7 @@ encapsulated partial model SourceOrSink "Partial source or sink for causal loop
   extends TimedSource;
   RealInput u if hasFactor "Factor input" annotation(Placement(visible = true, transformation(origin = {-145, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-50, -80}, extent = {{-10, -10}, {10, 10}}, rotation = -270)));
   RealInput u_rate if not hasConstantRate "Rate input" annotation(Placement(visible = true, transformation(origin = {-145, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0), iconTransformation(origin = {-50, 50}, extent = {{-10, -10}, {10, 10}}, rotation = -90)));
-  parameter Rate rate = unspecified "Constant rate (optional)" annotation(Dialog(enable = hasConstantRate));
+  parameter OutputType rate = unspecified "Constant rate (optional)" annotation(Dialog(enable = hasConstantRate));
   parameter Boolean hasConstantRate = true "= true, if rate is a constant parameter" annotation(Evaluate = true, Dialog(group = "Structural Parameters"));
   parameter Boolean hasFactor = false "= true, if rate is to be multiplied with input u" annotation(Evaluate = true, Dialog(group = "Structural Parameters"));
 protected

diff --git a/BusinessSimulation/SourcesOrSinks/ExponentialDecay.mo b/BusinessSimulation/SourcesOrSinks/ExponentialDecay.mo
@@ -22,7 +22,7 @@ equation
   annotation(Documentation(info = "<html>
 <p class=\"aside\">This information is part of the Business Simulation&nbsp;Library (BSL).</p>
 <p><em>ExponentialDecay</em>&nbsp;is identical to&nbsp;&rarr;<a href=\"modelica://BusinessSimulation.SourcesOrSinks.ExponentialDecline\">ExponentialDecline</a>, e.g., the connected stock is drained at a rate proportional to its content into a sink with infinite capacity outside the border of the system in focus. Instead of using a fractional rate <em>&lambda;</em>&nbsp;to describe the process, we are using the mean <em>residence time&nbsp;&tau;</em> (aka mean <em>lifetime </em>or the exponential <em>time constant</em>) to parameterize the process:</p>
-<p><img src=\"modelica://BusinessSimulation/Resources/Images/SourcesOrSInks/ExponentialDecay/FormulaResidenceTime.svg\" alt=\"tau = 1/lambda\"></p>
+<p><img src=\"modelica://BusinessSimulation/Resources/Images/SourcesOrSinks/ExponentialDecay/FormulaResidenceTime.svg\" alt=\"tau = 1/lambda\"></p>
 <p>The mean residence time can be given either as a constant parameter (residenceTime) or as a continuous time input <strong>u</strong>.</p>
 <p>The effective rate of decay with respect to a connected stock <em>x</em> at any time will be given by</p>
 <p><img src=\"modelica://BusinessSimulation/Resources/Images/SourcesOrSinks/ExponentialDecay/FormulaRate.svg\" alt=\"dx/dt = -x/tau\"></p>

diff --git a/.../UsersGuide/ReleaseNotes/Version_2_2_0.mo → .../UsersGuide/ReleaseNotes/Version_2_1_1.mo b/.../UsersGuide/ReleaseNotes/Version_2_2_0.mo → .../UsersGuide/ReleaseNotes/Version_2_1_1.mo
@@ -1,19 +1,13 @@
 within BusinessSimulation.UsersGuide.ReleaseNotes;
 
-final class Version_2_2_0 "Version 2.2.0 ($versiondate)"
+final class Version_2_1_1 "Version 2.1.1 (2023-05-02)"
   annotation(Documentation(info = "<html>
 <p class=\"aside\">This information is part of the Business Simulation Library (BSL).</p>
 <p>Some <strong>errors were fixed</strong>:</p>
 <ul>
-<li>...</li><br>
-</ul>
-<p>This release <strong>adds the following classes</strong>:</p>
-<ul>
-<li>...</li><br>
-</ul>
-<p>The following <strong>modifications</strong> were made:</p>
-<ul>
-<li>...</li><br>
+<li>Fixed library reference in <code>uses</code> annotation.</li><br>
+<li>Class<code>Interfaces/PartialCLD/SourceOrSink.mo</code> needs to have <code>OutputType</code> for the parameter <code>rate</code>.</li><br>
+<li>Fixed spelling errors in some file references.</li><br>
 </ul>
 </html>"), Diagram(coordinateSystem(extent = {{-150, -90}, {150, 90}}, preserveAspectRatio = true, initialScale = 0.1, grid = {5, 5})), Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}, initialScale = 0.1, grid = {10, 10}), graphics = {Polygon(visible = true, lineColor = {56, 56, 56}, fillColor = {246, 246, 246}, fillPattern = FillPattern.Solid, points = {{-80, -100}, {-80, 100}, {20, 100}, {20, 40}, {80, 40}, {80, -100}, {-80, -100}}), Polygon(visible = true, lineColor = {56, 56, 56}, fillColor = {230, 230, 230}, fillPattern = FillPattern.Solid, points = {{20, 100}, {80, 40}, {20, 40}, {20, 100}}), Line(visible = true, points = {{2, -12}, {50, -12}}, color = {56, 56, 56}), Line(visible = true, points = {{2, -60}, {50, -60}}, color = {56, 56, 56}), Ellipse(visible = true, origin = {-35, -60}, lineColor = {56, 56, 56}, fillColor = {160, 160, 164}, fillPattern = FillPattern.Solid, extent = {{-12.5, -12.5}, {12.5, 12.5}}), Ellipse(visible = true, origin = {-35, -12.5}, lineColor = {56, 56, 56}, fillColor = {160, 160, 164}, fillPattern = FillPattern.Solid, extent = {{-12.5, -12.5}, {12.5, 12.5}})}));
-end Version_2_2_0;
+end Version_2_1_1;
diff --git a/BusinessSimulation/UsersGuide/ReleaseNotes/package.order b/BusinessSimulation/UsersGuide/ReleaseNotes/package.order
@@ -1,4 +1,4 @@
-Version_2_2_0
+Version_2_1_1
 Version_2_1_0
 Version_2_0_0
 Version_1_0_1

diff --git a/BusinessSimulation/package.mo b/BusinessSimulation/package.mo
@@ -1,5 +1,5 @@
 package BusinessSimulation "A library for modeling & simulation of dynamical systems in the social sciences, e.g., business, economics, and ecology using the System Dynamics metaphor"
-  annotation(version = "2.2.0-alpha", versionDate = "$versiondate", revisionId = "", uses(Modelica(version = "3.2.3")), Documentation(info = "<html>
+  annotation(version = "2.1.1", versionDate = "2023-05-02", revisionId = "", uses(Modelica(version = "3.2.3")), Documentation(info = "<html>
 <p class=\"aside\">This information is part of the Business Simulation Library (BSL).</p>
 <p>The <span style=\"color: #000080;\"><strong>BUSINESS SIMULATION LIBRARY (BSL)</strong></span> supports modeling &amp; simulation in the social sciences and ecology. Following John Sterman&nbsp;[<a href=\"modelica://BusinessSimulation.UsersGuide.References\">3</a>] the name \"Busines Simulation\" was chosen in a rather broad sense since ultimately modeling in these domains is concerned with \"control\", \"decision making\", and \"management\".</p>
 <p>The <span style=\"color: #000080;\"><strong>BSL</strong> </span>follows the widespread <span style=\"color: #000080;\"><strong>System Dynamics</strong></span> metaphor and modeling approach introduced by Jay W. Forrester [<a href=\"modelica://BusinessSimulation.UsersGuide.References\">1</a>], [<a href=\"modelica://BusinessSimulation.UsersGuide.References\">2</a>].&nbsp;System Dynamics offers a very general, low-level modeling paradigm, that lends itself perfectly to model, simulate, and analyze strategic business or public policy issues.</p>
@@ -19,7 +19,7 @@ package BusinessSimulation "A library for modeling & simulation of dynamical sys
 <hr>
 <h4><span style=\"color: #000080;\">Releases</span></h4>
 <ul>
-<li><span style=\"color: #000080;\"><a href=\"modelica://BusinessSimulation.UsersGuide.ReleaseNotes.Version_2_2_0\">Version 2.2.0 &nbsp;($versiondate)</a></span></li>
+<li><span style=\"color: #000080;\"><a href=\"modelica://BusinessSimulation.UsersGuide.ReleaseNotes.Version_2_1_1\">Version 2.1.1 &nbsp;(2022-05-02)</a></span></li>
 <li><span style=\"color: #000080;\"><a href=\"modelica://BusinessSimulation.UsersGuide.ReleaseNotes.Version_2_1_0\">Version 2.1.0 &nbsp;(2022-12-03)</a></span></li>
 <li><span style=\"color: #000080;\"><a href=\"modelica://BusinessSimulation.UsersGuide.ReleaseNotes.Version_2_0_0\">Version 2.0.0 &nbsp;(2021-12-06)</a></span></li>
 <li><span style=\"color: #000080;\"><a href=\"modelica://BusinessSimulation.UsersGuide.ReleaseNotes.Version_1_0_1\">Version 1.0.1 &nbsp;(2021-02-02)</a></span></li>