From 0fdce4c6ae065820930440db7c9a39a529efab01 Mon Sep 17 00:00:00 2001 From: AHaumer Date: Tue, 10 Jun 2025 17:28:10 +0200 Subject: [PATCH 1/6] Setting version to 4.2.0 and provide ReleaseNotes.mo for 4.2.0, including the already merged OpAmp (#4643 and #4653) --- Complex.mo | 5 +- Modelica/Blocks/package.mo | 1 - .../Analog/Semiconductors/package.mo | 1 - Modelica/Fluid/package.mo | 1 - Modelica/Math/package.mo | 1 - Modelica/Mechanics/MultiBody/package.mo | 1 - Modelica/Media/Water/package.mo | 3 - Modelica/UsersGuide/ReleaseNotes.mo | 76 +++++++++++++++++++ Modelica/Utilities/package.mo | 1 - Modelica/package.mo | 7 +- ModelicaReference/package.mo | 4 +- ModelicaServices/package.mo | 7 +- ModelicaTest/package.mo | 6 +- ModelicaTestOverdetermined.mo | 6 +- ObsoleteModelica4.mo | 6 +- 15 files changed, 98 insertions(+), 28 deletions(-) diff --git a/Complex.mo b/Complex.mo index cf37fe950c..adb8f6e73c 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", +version="4.2.0", +versionDate="20xx-xx-xx", dateModified = "2024-01-12 19:40: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/Blocks/package.mo b/Modelica/Blocks/package.mo index e05280f660..b4a7d177c1 100644 --- a/Modelica/Blocks/package.mo +++ b/Modelica/Blocks/package.mo @@ -3214,7 +3214,6 @@ usage of package blocks.

")); end Examples; - annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100.0,-100.0},{100.0,100.0}}), graphics={ Rectangle( origin={0.0,35.1488}, diff --git a/Modelica/Electrical/Analog/Semiconductors/package.mo b/Modelica/Electrical/Analog/Semiconductors/package.mo index 708921b77b..d84b186b79 100644 --- a/Modelica/Electrical/Analog/Semiconductors/package.mo +++ b/Modelica/Electrical/Analog/Semiconductors/package.mo @@ -41,7 +41,6 @@ protected algorithm z := if x < Minexp then exp(Minexp)*(1 + x - Minexp) else exlin(x, Maxexp); end exlin2; - annotation ( Documentation(info="

This package contains semiconductor devices:

diff --git a/Modelica/Fluid/package.mo b/Modelica/Fluid/package.mo index 5e9227c528..50bea31a66 100644 --- a/Modelica/Fluid/package.mo +++ b/Modelica/Fluid/package.mo @@ -1701,7 +1701,6 @@ substance medium with one or more phases might be used.

")); end UsersGuide; - annotation (Icon(graphics={ Polygon(points={{-70,26},{68,-44},{68,26},{2,-10},{-70,-42},{-70,26}}), Line(points={{2,42},{2,-10}}), diff --git a/Modelica/Math/package.mo b/Modelica/Math/package.mo index 6a875a6082..0c9801363d 100644 --- a/Modelica/Math/package.mo +++ b/Modelica/Math/package.mo @@ -11653,7 +11653,6 @@ with u > 0: ")); end log10; - annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100}, {100,100}}), graphics={Line(points={{-80,0},{-68.7,34.2},{-61.5,53.1}, {-55.1,66.4},{-49.4,74.6},{-43.8,79.1},{-38.2,79.8},{-32.6,76.6},{ diff --git a/Modelica/Mechanics/MultiBody/package.mo b/Modelica/Mechanics/MultiBody/package.mo index c4c9743c82..e8c281336b 100644 --- a/Modelica/Mechanics/MultiBody/package.mo +++ b/Modelica/Mechanics/MultiBody/package.mo @@ -459,7 +459,6 @@ of these axes can be set via parameters.

")); end World; - annotation ( Documentation(info="

diff --git a/Modelica/Media/Water/package.mo b/Modelica/Media/Water/package.mo index 0a98045bb9..031318b16b 100644 --- a/Modelica/Media/Water/package.mo +++ b/Modelica/Media/Water/package.mo @@ -66,10 +66,8 @@ end ConstantPropertyLiquidWater; package StandardWater = WaterIF97_ph "Water using the IF97 standard, explicit in p and h. Recommended for most applications"; - package StandardWaterOnePhase = WaterIF97_pT "Water using the IF97 standard, explicit in p and T. Recommended for one-phase applications"; - package WaterIF97OnePhase_ph "Water using the IF97 standard, explicit in p and h, and only valid outside the two-phase dome" extends WaterIF97_base( @@ -1034,7 +1032,6 @@ package WaterIF97_R3ph "Region 3 water according to IF97 standard" ")); end WaterIF97_R3ph; - annotation (Documentation(info="

This package contains different medium models for water: