Skip to content

Commit 853b72b

Browse files
AHaumerAHaumer
authored
Merge pull request #4659 from AHaumer/MasterVersion
Setting master version to 4.2.0 dev
2 parents 3f72865 + d3bad98 commit 853b72b

File tree

11 files changed

+112
-31
lines changed

11 files changed

+112
-31
lines changed

‎Complex.mo‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,12 @@ operator record Complex "Complex number with overloaded operators"
249249
end 'String';
250250

251251
annotation (
252-
version="4.1.0",
253-
versionDate="2024-01-12",
254-
dateModified = "2024-01-12 19:40:00Z",
252+
version="4.2.0 dev",
253+
versionDate="20xx-xx-xx",
254+
dateModified = "2025-05-23 15:00:00Z",
255255
revisionId="$Format:%h %ci$",
256256
conversion(
257+
noneFromVersion="4.1.0",
257258
noneFromVersion="4.0.0",
258259
noneFromVersion="3.2.3",
259260
noneFromVersion="3.2.2",

‎Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<td style="vertical-align: middle; text-align: center;"><b>Modelica400 with alias name: Modelica Standard Library - Version 4.0.0</b>
1515
</td>
1616
</tr>
17-
<td> Version: 4.1.0</td><td> Version: 4.0.0</td><tr><td> Version date: 2025-04-17</td><td> Version date: 2020-06-04</td><tr></tbody></table><br><br>
17+
<td> Version: 4.1.0</td><td> Version: 4.0.0</td><tr><td> Version date: 2025-05-23</td><td> Version date: 2020-06-04</td><tr></tbody></table><br><br>
1818
<big style="font-family: Arial;">block Blocks.Continuous.Integrator</big><br><br>
1919
<table style="border-collapse: collapse;text-align: left; width: 100%;height: 44px;"
2020
cellpadding="5">

‎Modelica/UsersGuide/ReleaseNotes.mo‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,84 @@ more of the following changes.
126126
</html>"));
127127
end VersionManagement;
128128

129+
class Version_4_2_0 "Version 4.2.0 (mmm dd, yyyy)"
130+
extends Modelica.Icons.ReleaseNotes;
131+
132+
annotation (Documentation(info="<html>
133+
<p>Version 4.2.0 is backward compatible to version 4.1.0. This means, there is no need to convert user models, because no renaming or moving has been done on the library.</p>
134+
<p>Short overview:</p>
135+
<ul>
136+
<li>xx new components (e.g. Blocks for recording of min and max of a signal)</li>
137+
<li>xx improved components (e.g. tables can now read CSV)</li>
138+
<li>xx potentially non-backwards-compatible changes (especially Constants.inf, Constants.small, Constants.eps)</li>
139+
<li>xx bug fixes, which may cause the simulation results to change for the better</li>
140+
<li>xx models marked as obsolete</li>
141+
<li>This version is based on the recent Modelica language standard version 3.6.</li>
142+
<li>About [Link to resolved] issues xxx issues (including xxx pull requests) have been addressed for this release.</li>
143+
</ul>
144+
<p>
145+
The following libraries, that were previously using version Modelica 4.0.0, were tested successfully with version 4.1.0 without any modification, using Dymola 2025x Refresh 1 and/or OpenModelica 1.25.0
146+
(alphabetical list):
147+
</p>
148+
149+
<p><br>The following <strong><font color=\"blue\">new components</font></strong> have been added to <strong><font color=\"blue\">existing</font></strong> libraries: </p>
150+
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
151+
<tr>
152+
<td colspan=\"2\"><h4>Modelica.Electrical.Analog.Ideal</h4></td>
153+
</tr>
154+
<tr>
155+
<td>OpAmpLimited</td>
156+
<td>Replaces the deprecated IdealizedOpAmpLimited which caused numerical problems.</td>
157+
</tr>
158+
</table>
159+
160+
<p><br><br>The following <strong><font color=\"blue\">existing components</font></strong> have been <strong><font color=\"blue\">improved</font></strong> in a <strong><font color=\"blue\">backward compatible</font></strong> way:</p>
161+
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
162+
<tr>
163+
<td colspan=\"2\"><h4>Library</h4></td>
164+
</tr>
165+
<tr>
166+
<td>Component(s)</td>
167+
<td>Description.</td>
168+
</tr>
169+
</table>
170+
171+
<p><br><br>The following <strong><font color=\"blue\">existing components</font></strong> have been <strong><font color=\"blue\">changed</font></strong> in a <strong><font color=\"blue\">non-backward compatible</font></strong> way, even though this is not expected in general to affect models using the library, except in very rare cases:</p>
172+
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
173+
<tr>
174+
<td colspan=\"2\"><h4>Library</h4></td>
175+
</tr>
176+
<tr>
177+
<td>Component(s)</td>
178+
<td>Description.</td>
179+
</tr>
180+
</table>
181+
182+
<p><br><br>The following <strong><font color=\"blue\">critical errors</font></strong> have been fixed (i.e., errors that can lead to wrong simulation results): </p>
183+
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
184+
<tr>
185+
<td colspan=\"2\"><h4>Library</h4></td>
186+
</tr>
187+
<tr>
188+
<td>Component(s)</td>
189+
<td>Description.</td>
190+
</tr>
191+
</table>
192+
193+
<p><br><br>The following models were declared as <strong><font color=\"blue\">obsolete</font></strong>, thus to be preferably replaced with better, more general ones:</p>
194+
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
195+
<tr>
196+
<td colspan=\"2\"><h4>Modelica.Electrical.Analog.Ideal</h4></td>
197+
</tr>
198+
<tr>
199+
<td>IdealizedOpAmpLimited</td>
200+
<td>Replaced by OpAmpLimited.</td>
201+
</tr>
202+
</table>
203+
204+
</html>"));
205+
end Version_4_2_0;
206+
129207
class Version_4_1_0 "Version 4.1.0 (May 23, 2025)"
130208
extends Modelica.Icons.ReleaseNotes;
131209

‎Modelica/package.mo‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ extends Modelica.Icons.Package;
44

55
annotation (
66
preferredView="info",
7-
version="4.1.0",
8-
versionDate="2024-01-12",
9-
dateModified = "2024-01-12 19:40:00Z",
7+
version="4.2.0 dev",
8+
versionDate="20xx-xx-xx",
9+
dateModified = "2025-05-23 15:00:00Z",
1010
revisionId="$Format:%h %ci$",
11-
uses(Complex(version="4.1.0"), ModelicaServices(version="4.1.0")),
11+
uses(Complex(version="4.2.0 dev"), ModelicaServices(version="4.2.0 dev")),
1212
conversion(
13+
noneFromVersion="4.1.0",
1314
noneFromVersion="4.0.0",
1415
from(version={"3.0", "3.0.1", "3.1", "3.2", "3.2.1", "3.2.2", "3.2.3"}, script="modelica://Modelica/Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos")),
1516
Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={

‎ModelicaReference/package.mo‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7309,9 +7309,9 @@ end Icons;
73097309

73107310
annotation (
73117311
DocumentationClass=true,
7312-
version="4.1.0",
7313-
versionDate="2024-01-12",
7314-
dateModified = "2024-01-12 19:40:00Z",
7312+
version="4.2.0 dev",
7313+
versionDate="20xx-xx-xx",
7314+
dateModified = "2025-05-23 15:00:00Z",
73157315
revisionId="$Format:%h %ci$",
73167316
Documentation(info="<html>
73177317
<p>

‎ModelicaServices/package.mo‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,20 @@ Specification (version &ge; 3.3).
232232

233233
annotation (
234234
preferredView="info",
235-
version="4.1.0",
236-
versionDate="2024-01-12",
237-
dateModified = "2024-01-12 19:40:00Z",
235+
version="4.2.0 dev",
236+
versionDate="20xx-xx-xx",
237+
dateModified = "2025-05-23 15:00:00Z",
238238
revisionId="$Format:%h %ci$",
239-
uses(Modelica(version="4.1.0")),
239+
uses(Modelica(version="4.2.0 dev")),
240240
conversion(
241241
noneFromVersion="1.0",
242242
noneFromVersion="1.1",
243243
noneFromVersion="1.2",
244244
noneFromVersion="3.2.1",
245245
noneFromVersion="3.2.2",
246246
noneFromVersion="3.2.3",
247-
noneFromVersion="4.0.0"),
247+
noneFromVersion="4.0.0",
248+
noneFromVersion="4.1.0"),
248249
Documentation(info="<html>
249250
<p>
250251
This package contains a set of functions and models to be used in the

‎ModelicaTest/package.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ algorithm
5151
end testAllFunctions;
5252

5353
annotation (preferredView="info",
54-
version="4.1.0",
55-
versionDate="2024-01-12",
56-
dateModified = "2024-01-12 19:40:00Z",
54+
version="4.2.0 dev",
55+
versionDate="20xx-xx-xx",
56+
dateModified = "2025-05-23 15:00:00Z",
5757
revisionId="$Format:%h %ci$",
58-
uses(Modelica(version="4.1.0")),
58+
uses(Modelica(version="4.2.0 dev")),
5959
Documentation(info="<html>
6060
<p>
6161
This library provides models and functions to test components of

‎ModelicaTestOverdetermined.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,11 @@ The initial equations are consistent however and a tool shall reduce them approp
608608
fillColor={75,138,73},
609609
fillPattern=FillPattern.Solid)}),
610610
preferredView="info",
611-
version="4.1.0",
612-
versionDate="2024-01-12",
613-
dateModified = "2024-01-12 19:40:00Z",
611+
version="4.2.0 dev",
612+
versionDate="20xx-xx-xx",
613+
dateModified = "2025-05-23 15:00:00Z",
614614
revisionId="$Id:: $",
615-
uses(Modelica(version="4.1.0")),
615+
uses(Modelica(version="4.2.0 dev")),
616616
Documentation(info="<html>
617617
<p>
618618
This library provides models and functions to test components of

‎ObsoleteModelica4.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2875,10 +2875,10 @@ Obsolete saliency cage model, see
28752875
end BasicMachines;
28762876
end FundamentalWave;
28772877
end Magnetic;
2878-
annotation (uses(Modelica(version="4.1.0")),
2879-
version="4.1.0",
2880-
versionDate="2024-01-12",
2881-
dateModified = "2024-01-12 19:40:00Z",
2878+
annotation (uses(Modelica(version="4.2.0 dev")),
2879+
version="4.2.0 dev",
2880+
versionDate="20xx-xx-xx",
2881+
dateModified = "2025-05-23 15:00:00Z",
28822882
revisionId="$Format:%h %ci$",
28832883
Documentation(info="<html>
28842884
<p>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ it can be redistributed and/or modified under the terms of the [3-Clause BSD Lic
2828
## Status
2929

3030
[![CI checks](https://github.com/modelica/ModelicaStandardLibrary/workflows/CI/badge.svg)](https://github.com/modelica/ModelicaStandardLibrary/actions) [![CLA assistant](https://cla-assistant.io/readme/badge/modelica/ModelicaStandardLibrary)](https://cla-assistant.io/modelica/ModelicaStandardLibrary)
31-
[![Modelica v4.1.0-dev regression test](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fwww.ltx.de%2Fdownload%2FMA%2FCompare_MSL_v4.1.0%2FTestruns%2FDymola%2FModelica%2Ftestrun_report.html&query=%2F%2Fspan%5B%40class%3D'has-text-success'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-danger'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-warning'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-timeout'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-grey'%5D&label=Modelica%20v4.1.0-dev%20regression%20test)](https://www.ltx.de/download/MA/Compare_MSL_v4.1.0/comparison_report_overview.html)
32-
[![ModelicaTest v4.1.0-dev regression test](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fwww.ltx.de%2Fdownload%2FMA%2FCompare_MSL_v4.1.0%2FTestruns%2FDymola%2FModelicaTest%2Ftestrun_report.html&query=%2F%2Fspan%5B%40class%3D'has-text-success'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-danger'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-warning'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-timeout'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-grey'%5D&label=ModelicaTest%20v4.1.0-dev%20regression%20test)](https://www.ltx.de/download/MA/Compare_MSL_v4.1.0/comparison_report_overview.html)
31+
[![Modelica v4.1.0 regression test](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fwww.ltx.de%2Fdownload%2FMA%2FCompare_MSL_v4.1.0%2FTestruns%2FDymola%2FModelica%2Ftestrun_report.html&query=%2F%2Fspan%5B%40class%3D'has-text-success'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-danger'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-warning'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-timeout'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-grey'%5D&label=Modelica%20v4.1.0-dev%20regression%20test)](https://www.ltx.de/download/MA/Compare_MSL_v4.1.0/comparison_report_overview.html)
32+
[![ModelicaTest v4.1.0 regression test](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Fwww.ltx.de%2Fdownload%2FMA%2FCompare_MSL_v4.1.0%2FTestruns%2FDymola%2FModelicaTest%2Ftestrun_report.html&query=%2F%2Fspan%5B%40class%3D'has-text-success'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-danger'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-warning'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-timeout'%5D%20%7C%20%2F%2Fspan%5B%40class%3D'has-text-grey'%5D&label=ModelicaTest%20v4.1.0-dev%20regression%20test)](https://www.ltx.de/download/MA/Compare_MSL_v4.1.0/comparison_report_overview.html)
3333

3434
## Development and contribution
3535

0 commit comments

Comments
 (0)