diff --git a/Complex.mo b/Complex.mo index cf37fe950c..877e323c42 100644 --- a/Complex.mo +++ b/Complex.mo @@ -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 dev", +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", diff --git a/Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html b/Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html index 8803e1a578..4ac147ba31 100644 --- a/Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html +++ b/Modelica/Resources/Documentation/Version-4.1.0/DifferencesTo400.html @@ -14,7 +14,7 @@ Modelica400 with alias name: Modelica Standard Library - Version 4.0.0 - Version: 4.1.0 Version: 4.0.0 Version date: 2025-04-17 Version date: 2020-06-04

+ Version: 4.1.0 Version: 4.0.0 Version date: 2025-05-23 Version date: 2020-06-04

block Blocks.Continuous.Integrator

diff --git a/Modelica/UsersGuide/ReleaseNotes.mo b/Modelica/UsersGuide/ReleaseNotes.mo index 9ba2567d70..ac20ac0692 100644 --- a/Modelica/UsersGuide/ReleaseNotes.mo +++ b/Modelica/UsersGuide/ReleaseNotes.mo @@ -126,6 +126,84 @@ more of the following changes. ")); end VersionManagement; +class Version_4_2_0 "Version 4.2.0 (mmm dd, yyyy)" + extends Modelica.Icons.ReleaseNotes; + + annotation (Documentation(info=" +

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.

+

Short overview:

+ +

+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): +

+ +


The following new components have been added to existing libraries:

+
+ + + + + + + +

Modelica.Electrical.Analog.Ideal

OpAmpLimitedReplaces the deprecated IdealizedOpAmpLimited which caused numerical problems.
+ +



The following existing components have been improved in a backward compatible way:

+ + + + + + + + +

Library

Component(s)Description.
+ +



The following existing components have been changed in a non-backward compatible way, even though this is not expected in general to affect models using the library, except in very rare cases:

+ + + + + + + + +

Library

Component(s)Description.
+ +



The following critical errors have been fixed (i.e., errors that can lead to wrong simulation results):

+ + + + + + + + +

Library

Component(s)Description.
+ +



The following models were declared as obsolete, thus to be preferably replaced with better, more general ones:

+ + + + + + + + +

Modelica.Electrical.Analog.Ideal

IdealizedOpAmpLimitedReplaced by OpAmpLimited.
+ +")); +end Version_4_2_0; + class Version_4_1_0 "Version 4.1.0 (May 23, 2025)" extends Modelica.Icons.ReleaseNotes; diff --git a/Modelica/package.mo b/Modelica/package.mo index 02b5fb987d..9b42865328 100644 --- a/Modelica/package.mo +++ b/Modelica/package.mo @@ -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 dev", +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 dev"), ModelicaServices(version="4.2.0 dev")), 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={ diff --git a/ModelicaReference/package.mo b/ModelicaReference/package.mo index df81f4ce4d..e3f9bb1073 100644 --- a/ModelicaReference/package.mo +++ b/ModelicaReference/package.mo @@ -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 dev", + versionDate="20xx-xx-xx", + dateModified = "2025-05-23 15:00:00Z", revisionId="$Format:%h %ci$", Documentation(info="

diff --git a/ModelicaServices/package.mo b/ModelicaServices/package.mo index 590de48148..20dedbc736 100644 --- a/ModelicaServices/package.mo +++ b/ModelicaServices/package.mo @@ -232,11 +232,11 @@ Specification (version ≥ 3.3). annotation ( preferredView="info", - version="4.1.0", - versionDate="2024-01-12", - dateModified = "2024-01-12 19:40:00Z", + version="4.2.0 dev", + 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 dev")), conversion( noneFromVersion="1.0", noneFromVersion="1.1", @@ -244,7 +244,8 @@ Specification (version ≥ 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="

This package contains a set of functions and models to be used in the diff --git a/ModelicaTest/package.mo b/ModelicaTest/package.mo index 3f79e3e59f..9b7d30523f 100644 --- a/ModelicaTest/package.mo +++ b/ModelicaTest/package.mo @@ -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 dev", + 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 dev")), Documentation(info="

This library provides models and functions to test components of diff --git a/ModelicaTestOverdetermined.mo b/ModelicaTestOverdetermined.mo index e382235665..4ffdae9338 100644 --- a/ModelicaTestOverdetermined.mo +++ b/ModelicaTestOverdetermined.mo @@ -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 dev", + 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 dev")), Documentation(info="

This library provides models and functions to test components of diff --git a/ObsoleteModelica4.mo b/ObsoleteModelica4.mo index e1b41a4133..cf305ee6ee 100644 --- a/ObsoleteModelica4.mo +++ b/ObsoleteModelica4.mo @@ -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 dev")), + version="4.2.0 dev", + versionDate="20xx-xx-xx", + dateModified = "2025-05-23 15:00:00Z", revisionId="$Format:%h %ci$", Documentation(info="

diff --git a/README.md b/README.md index 54687b1b23..6b1455add2 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 diff --git a/SECURITY.md b/SECURITY.md index a6a77fedd3..456bc5902f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -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