Skip to content

Setting master version to 4.2.0 dev #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 12, 2025
Merged

Setting master version to 4.2.0 dev #4659

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fdce4c
Setting version to 4.2.0 and provide ReleaseNotes.mo for 4.2.0, inclu…
AHaumer Jun 10, 2025
8382410
correct html
AHaumer Jun 10, 2025
b38751f
Restore unnecessary whitespace change as suggested by @maltelenz
AHaumer Jun 10, 2025
cbc76b1
Update Modelica/UsersGuide/ReleaseNotes.mo
AHaumer Jun 10, 2025
6a21f44
applying the same changes as #4661 but still renaming the master vers…
AHaumer Jun 10, 2025
bf28415
naming the version under development "4.2.0 dev"
AHaumer Jun 11, 2025
d3bad98
Merge branch 'master' into MasterVersion
AHaumer Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Complex.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,12 @@ operator record Complex "Complex number with overloaded operators"
end 'String';

annotation (
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
conversion(
noneFromVersion="4.1.0",
noneFromVersion="4.0.0",
noneFromVersion="3.2.3",
noneFromVersion="3.2.2",
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<td style="vertical-align: middle; text-align: center;"><b>Modelica400 with alias name: Modelica Standard Library - Version 4.0.0</b>
</td>
</tr>
<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>
<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>
<big style="font-family: Arial;">block Blocks.Continuous.Integrator</big><br><br>
<table style="border-collapse: collapse;text-align: left; width: 100%;height: 44px;"
cellpadding="5">
Expand Down
78 changes: 78 additions & 0 deletions Modelica/UsersGuide/ReleaseNotes.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,84 @@ more of the following changes.
</html>"));
end VersionManagement;

class Version_4_2_0 "Version 4.2.0 (mmm dd, yyyy)"
extends Modelica.Icons.ReleaseNotes;

annotation (Documentation(info="<html>
<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>
<p>Short overview:</p>
<ul>
<li>xx new components (e.g. Blocks for recording of min and max of a signal)</li>
<li>xx improved components (e.g. tables can now read CSV)</li>
<li>xx potentially non-backwards-compatible changes (especially Constants.inf, Constants.small, Constants.eps)</li>
<li>xx bug fixes, which may cause the simulation results to change for the better</li>
<li>xx models marked as obsolete</li>
<li>This version is based on the recent Modelica language standard version 3.6.</li>
<li>About [Link to resolved] issues xxx issues (including xxx pull requests) have been addressed for this release.</li>
</ul>
<p>
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
(alphabetical list):
</p>

<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>
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
<tr>
<td colspan=\"2\"><h4>Modelica.Electrical.Analog.Ideal</h4></td>
</tr>
<tr>
<td>OpAmpLimited</td>
<td>Replaces the deprecated IdealizedOpAmpLimited which caused numerical problems.</td>
</tr>
</table>

<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>
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
<tr>
<td colspan=\"2\"><h4>Library</h4></td>
</tr>
<tr>
<td>Component(s)</td>
<td>Description.</td>
</tr>
</table>

<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>
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
<tr>
<td colspan=\"2\"><h4>Library</h4></td>
</tr>
<tr>
<td>Component(s)</td>
<td>Description.</td>
</tr>
</table>

<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>
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
<tr>
<td colspan=\"2\"><h4>Library</h4></td>
</tr>
<tr>
<td>Component(s)</td>
<td>Description.</td>
</tr>
</table>

<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>
<table cellspacing=\"0\" cellpadding=\"2\" border=\"1\">
<tr>
<td colspan=\"2\"><h4>Modelica.Electrical.Analog.Ideal</h4></td>
</tr>
<tr>
<td>IdealizedOpAmpLimited</td>
<td>Replaced by OpAmpLimited.</td>
</tr>
</table>

</html>"));
end Version_4_2_0;

class Version_4_1_0 "Version 4.1.0 (May 23, 2025)"
extends Modelica.Icons.ReleaseNotes;

Expand Down
9 changes: 5 additions & 4 deletions Modelica/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ extends Modelica.Icons.Package;

annotation (
preferredView="info",
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
uses(Complex(version="4.1.0"), ModelicaServices(version="4.1.0")),
uses(Complex(version="4.2.0"), ModelicaServices(version="4.2.0")),
conversion(
noneFromVersion="4.1.0",
noneFromVersion="4.0.0",
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")),
Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
Expand Down
6 changes: 3 additions & 3 deletions ModelicaReference/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7309,9 +7309,9 @@ end Icons;

annotation (
DocumentationClass=true,
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
Documentation(info="<html>
<p>
Expand Down
9 changes: 5 additions & 4 deletions ModelicaServices/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ Specification (version &ge; 3.3).

annotation (
preferredView="info",
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
uses(Modelica(version="4.1.0")),
conversion(
Expand All @@ -244,7 +244,8 @@ Specification (version &ge; 3.3).
noneFromVersion="3.2.1",
noneFromVersion="3.2.2",
noneFromVersion="3.2.3",
noneFromVersion="4.0.0"),
noneFromVersion="4.0.0",
noneFromVersion="4.1.0"),
Documentation(info="<html>
<p>
This package contains a set of functions and models to be used in the
Expand Down
8 changes: 4 additions & 4 deletions ModelicaTest/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ algorithm
end testAllFunctions;

annotation (preferredView="info",
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
uses(Modelica(version="4.1.0")),
uses(Modelica(version="4.2.0")),
Documentation(info="<html>
<p>
This library provides models and functions to test components of
Expand Down
8 changes: 4 additions & 4 deletions ModelicaTestOverdetermined.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,11 +608,11 @@ The initial equations are consistent however and a tool shall reduce them approp
fillColor={75,138,73},
fillPattern=FillPattern.Solid)}),
preferredView="info",
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Id:: $",
uses(Modelica(version="4.1.0")),
uses(Modelica(version="4.2.0")),
Documentation(info="<html>
<p>
This library provides models and functions to test components of
Expand Down
8 changes: 4 additions & 4 deletions ObsoleteModelica4.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2875,10 +2875,10 @@ Obsolete saliency cage model, see
end BasicMachines;
end FundamentalWave;
end Magnetic;
annotation (uses(Modelica(version="4.1.0")),
version="4.1.0",
versionDate="2024-01-12",
dateModified = "2024-01-12 19:40:00Z",
annotation (uses(Modelica(version="4.2.0")),
version="4.2.0",
versionDate="20xx-xx-xx",
dateModified = "2025-05-23 15:00:00Z",
revisionId="$Format:%h %ci$",
Documentation(info="<html>
<p>
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Note, the usage of a Modelica library requires a Modelica simulation environment

## Current release

[Modelica Standard Library v4.0.0 (2020-06-04)](https://github.com/modelica/ModelicaStandardLibrary/releases/tag/v4.0.0)
[Modelica Standard Library v4.1.0 (2025-05-23)](https://github.com/modelica/ModelicaStandardLibrary/releases/tag/v4.1.0)

## Older Releases

Expand All @@ -28,8 +28,8 @@ it can be redistributed and/or modified under the terms of the [3-Clause BSD Lic
## Status

[![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)
[![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)
[![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)
[![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)
[![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)

## Development and contribution

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The following versions of the Modelica Standard Library are currently being supp

| Version | Supported |
| ------- | --------- |
| ≤ 4.0.0 | :x: |
| ≤ 4.1.0 | :x: |

## Reporting a Vulnerability

Expand Down