Merge branch 'master' into 4242

AHaumer · web-flow · commit 2731836ea4be · 2026-02-16T12:28:33.000+01:00
diff --git a/.github/workflows/checkCI.yml b/.github/workflows/checkCI.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Configure
@@ -73,7 +73,7 @@ jobs:
             compiler: mingw
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Configure
@@ -96,6 +96,13 @@ jobs:
           fi
       - name: Run tests
         run: ctest --no-tests=error --test-dir build --build-config ${{ matrix.configuration }} --verbose
+      - name: Install
+        run: |
+          if [ "${{ matrix.compiler }}" == "msvc" ]; then
+            cmake --build build --target install --config ${{ matrix.configuration }}
+          else
+            cmake --build build --target install
+          fi
 
   external_c_checks_cmake_cygwin:
     name: external_c_checks_cmake_windows-cygwin
@@ -105,7 +112,7 @@ jobs:
       - name: Set git to use LF
         run: git config --global core.autocrlf input
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup cygwin
@@ -134,13 +141,18 @@ jobs:
           export PATH=/usr/bin:$PATH
           ctest --no-tests=error --test-dir build --build-config Debug --verbose
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
+      - name: Install
+        run: |
+          export PATH=/usr/bin:$PATH
+          cmake --build build --target install
+        shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
 
   html_documentation_checks:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup python environment
@@ -176,7 +188,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Get moparser
@@ -196,7 +208,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup python environment
diff --git a/.github/workflows/checkCron.yml b/.github/workflows/checkCron.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.repository_owner == 'modelica'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup python environment
@@ -28,7 +28,7 @@ jobs:
     if: github.repository_owner == 'modelica'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup python environment
@@ -59,7 +59,7 @@ jobs:
           codespell -L alow ./Modelica/Media/IdealGases/Common/Functions.mo
           codespell -L alow ./Modelica/Media/IdealGases/Common/package.mo
           codespell -L delt ./Modelica/Media/Air/ReferenceAir.mo
-          codespell -L scrit,delt ./Modelica/Media/R134a.mo
+          codespell -L scrit,delt,highT ./Modelica/Media/R134a.mo
           codespell -L dout,scrit,delt ./Modelica/Media/Water/IF97_Utilities.mo
           codespell -L rin ./Modelica/Electrical/Analog/Ideal/AD_Converter.mo
           codespell -L rin ./Modelica/Electrical/Analog/Examples/AD_DA_conversion.mo
@@ -76,8 +76,9 @@ jobs:
           codespell -L nife ./Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron
           codespell -L technik ./Modelica/Magnetic/FundamentalWave/UsersGuide/References.mo
           codespell -L supportt ./ModelicaTest/Rotational.mo
+          codespell -L fo ./ModelicaTest/Utilities.mo
           codespell -L lamda,inport ./ModelicaTestConversion4.mo
-          codespell --skip ./ObsoleteModelica4.mo,./Modelica/package.mo,./Modelica/UsersGuide/Contact.mo,./Modelica/UsersGuide/ReleaseNotes.mo,./Modelica/Clocked/RealSignals/Periodic/StateSpace.mo,./Modelica/Constants.mo,./Modelica/Blocks/Continuous.mo,./Modelica/StateGraph.mo,./Modelica/Electrical/Digital.mo,./Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo,./Modelica/Electrical/Polyphase/Examples/Utilities/PolyphaseRectifierData.mo,./Modelica/Fluid/package.mo,./Modelica/Fluid/Dissipation.mo,./Modelica/Fluid/Vessels.mo,./Modelica/Fluid/Examples/AST_BatchPlant.mo,./Modelica/Resources,./Modelica/Media/IdealGases/package.mo,./Modelica/Media/IdealGases/Common/SingleGasesData.mo,./Modelica/Media/IdealGases/Common/Functions.mo,./Modelica/Media/IdealGases/Common/package.mo,./Modelica/Media/Air/ReferenceAir.mo,./Modelica/Media/R134a.mo,./Modelica/Media/Water/IF97_Utilities.mo,./Modelica/Electrical/Analog/Ideal/AD_Converter.mo,./Modelica/Electrical/Analog/Examples/AD_DA_conversion.mo,./Modelica/Electrical/Polyphase/UsersGuide/References.mo,./Modelica/Electrical/Spice3.mo,./Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo,./Modelica/Electrical/Machines/Examples/ControlledDCDrives,./Modelica/Electrical/Analog/UsersGuide/References.mo,./Modelica/Math/package.mo,./Modelica/Mechanics/Rotational,./Modelica/Mechanics/Translational,./Modelica/Mechanics/MultiBody,./Modelica/Magnetic/FluxTubes/UsersGuide/Contact.mo,./Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron,./Modelica/Magnetic/FundamentalWave/UsersGuide/References.mo,./ModelicaTest/Rotational.mo,./ModelicaTestConversion4.mo,./.CI,./.github,./.git,*.png -L nin,inport,te,sinc,vie,commutating
+          codespell --skip ./ObsoleteModelica4.mo,./Modelica/package.mo,./Modelica/UsersGuide/Contact.mo,./Modelica/UsersGuide/ReleaseNotes.mo,./Modelica/Clocked/RealSignals/Periodic/StateSpace.mo,./Modelica/Constants.mo,./Modelica/Blocks/Continuous.mo,./Modelica/StateGraph.mo,./Modelica/Electrical/Digital.mo,./Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo,./Modelica/Electrical/Polyphase/Examples/Utilities/PolyphaseRectifierData.mo,./Modelica/Fluid/package.mo,./Modelica/Fluid/Dissipation.mo,./Modelica/Fluid/Vessels.mo,./Modelica/Fluid/Examples/AST_BatchPlant.mo,./Modelica/Resources,./Modelica/Media/IdealGases/package.mo,./Modelica/Media/IdealGases/Common/SingleGasesData.mo,./Modelica/Media/IdealGases/Common/Functions.mo,./Modelica/Media/IdealGases/Common/package.mo,./Modelica/Media/Air/ReferenceAir.mo,./Modelica/Media/R134a.mo,./Modelica/Media/Water/IF97_Utilities.mo,./Modelica/Electrical/Analog/Ideal/AD_Converter.mo,./Modelica/Electrical/Analog/Examples/AD_DA_conversion.mo,./Modelica/Electrical/Polyphase/UsersGuide/References.mo,./Modelica/Electrical/Spice3.mo,./Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo,./Modelica/Electrical/Machines/Examples/ControlledDCDrives,./Modelica/Electrical/Analog/UsersGuide/References.mo,./Modelica/Math/package.mo,./Modelica/Mechanics/Rotational,./Modelica/Mechanics/Translational,./Modelica/Mechanics/MultiBody,./Modelica/Magnetic/FluxTubes/UsersGuide/Contact.mo,./Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron,./Modelica/Magnetic/FundamentalWave/UsersGuide/References.mo,./ModelicaTest/Rotational.mo,./ModelicaTest/Utilities.mo,./ModelicaTestConversion4.mo,./.CI,./.github,./.git,*.png -L nin,inport,te,sinc,vie,commutating
   clean_workflow_runs:
     timeout-minutes: 5
     if: github.repository_owner == 'modelica'
diff --git a/.github/workflows/generateReleaseNotes.yml b/.github/workflows/generateReleaseNotes.yml
@@ -22,7 +22,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 5
       - name: Setup python environment
diff --git a/.mailmap b/.mailmap
@@ -1,6 +1,6 @@
 Adrian Pop <adrian.pop@liu.se>
 Adrian Pop <adrian.pop@liu.se> <adrpo@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
-Amedeo <amato.amedeo@gmail.com>
+Amedeo Amato <amato.amedeo@gmail.com>
 Andreas Heckmann <andreas.heckmann@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Andreas Heuermann <38031952+AnHeuermann@users.noreply.github.com>
 André Schneider <Andre@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
@@ -39,6 +39,7 @@ Dirk Zimmer <dirk.zimmer@dlr.de>
 Dirk Zimmer <dirk.zimmer@dlr.de> <dr.dirk.zimmer@gmail.com>
 Elena Shmoylova <eshmoylova@users.noreply.github.com>
 Esther Devakirubai <esther.devakirubai@modelon.com>
+Federico Zenith <federico.zenith@sintef.no>
 Francesco Casella <francesco.casella@polimi.it>
 Francesco Casella <francesco.casella@polimi.it> <Francesco@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Francesco Casella <francesco.casella@polimi.it> <fcasella@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
@@ -101,6 +102,7 @@ Michael Sielemann <msielemann@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Michael Wetter <mwetter@lbl.gov>
 Michael Wetter <mwetter@lbl.gov> <mwetter@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Mike Tiller <mtiller@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
+Nithish Selvan <nithish.selvan@modelon.com>
 ModelicaBook <ModelicaBook@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Otto Tronarp <otto@tronarp.se>
 Per Östlund <per.ostlund@liu.se>
@@ -124,4 +126,3 @@ Thomas Beutlich <modelica@tbeu.de> <beutlich@users.noreply.github.com>
 Thomas Beutlich <modelica@tbeu.de> <thomas.beutlich@esi-group.com>
 Thomas Bödrich <ThomasBoedrich@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Volker Waurich <12234403+vwaurich@users.noreply.github.com>
-carlj-w <41286817+carlj-w@users.noreply.github.com>
diff --git a/Modelica/Electrical/Analog/Examples/OpAmps/Multivibrator.mo b/Modelica/Electrical/Analog/Examples/OpAmps/Multivibrator.mo
@@ -64,7 +64,7 @@ equation
   annotation (Documentation(info="<html>
 <p>This is a Multivibrator with Schmitt trigger according to:</p>
 <p>U. Tietze and C. Schenk, Halbleiter-Schaltungstechnik (German), 11th edition, Springer 1999, Chapter 6.5.3</p>
-<p>As the initialization system has two solutions, the required solution is choosen by proper initialization of the opAmp at the LowerLimit.</p>
+<p>As the initialization system has two solutions, the required solution is chosen by proper initialization of the opAmp at the LowerLimit.</p>
 </html>"),
     experiment(
       StartTime=0,
diff --git a/Modelica/Electrical/Analog/Ideal/OpAmpLimited.mo b/Modelica/Electrical/Analog/Ideal/OpAmpLimited.mo
@@ -102,15 +102,15 @@ equation
 <p>Supply voltage is either defined by parameter <code>Vps</code> and <code>Vns</code> or by (optional) pins <code>s_p</code> and <code>s_n</code>.<br>
 In the first case the necessary power is drawn from an implicit internal supply, in the second case from the external supply.</p>
 <p>
-For most applications it is sufficient ot use default settings <code>useFirstOrder=false</code> (default on the Advanced-tab).
+For most applications it is sufficient to use default settings <code>useFirstOrder=false</code> (default on the Advanced-tab).
 In this case the intermediate voltage <code>v_int</code> is simply <code>V0*v_in</code>.<br>
 In some applications it might be necessary to set <code>useFirstOrder=true</code> 
 to let the intermediate voltage <code>v_int</code> rise according to a firstOrder with time constant <code>Tau</code>. 
 In that case the time constant <code>Tau</code> should fit to the dynamics of the input signal.
 </p>
 <p>
-If this intermediate voltage <code>v_int</code> gets higher than positive supply, Boolean <code>satPos</code> inidicates positive saturation.<br>
-If this intermediate voltage <code>v_int</code> gets lower  than negative supply, Boolean <code>satNeg</code> inidicates negative saturation.<br>
+If this intermediate voltage <code>v_int</code> gets higher than positive supply, Boolean <code>satPos</code> indicates positive saturation.<br>
+If this intermediate voltage <code>v_int</code> gets lower  than negative supply, Boolean <code>satNeg</code> indicates negative saturation.<br>
 Intermediate voltage <code>v_int</code> is limited between positive supply and negative supply to achieve output voltage <code>v_out</code> without further events.
 </p>
 <h4>Initialization</h4>
diff --git a/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable1.mo b/Modelica/Electrical/PowerConverters/Interfaces/Enable/Enable1.mo
@@ -17,8 +17,6 @@ partial model Enable1
 equation
   connect(andCondition_p.u1, fire_p) annotation (Line(
       points={{-60,-92},{-60,-120}}, color={255,0,255}));
-  connect(enableLogic.enable, enable) annotation (Line(
-      points={{100,-92},{100,-120}}, color={255,0,255}));
   connect(enableLogic.internalEnable[1], andCondition_p.u2) annotation (
       Line(
       points={{79,-80},{76,-80},{76,-96},{40,-96},{40,-76},{-40,-76},{-40,-100},
diff --git a/Modelica/Mechanics/MultiBody/Joints/Constraints/Prismatic.mo b/Modelica/Mechanics/MultiBody/Joints/Constraints/Prismatic.mo
@@ -161,7 +161,7 @@ equation
 </html>",revisions="<html><p><strong>Release Notes:</strong></p>
 <ul>
   <li><em>February 4, 2021</em><br>
-         Improved numeric stability by re-using <a href=\"Modelica://Modelica.Mechanics.MultiBody.Frames.Orientation.equalityConstraint\">equalityConstraint</a> from connection handling as constraint.
+         Improved numeric stability by reusing <a href=\"Modelica://Modelica.Mechanics.MultiBody.Frames.Orientation.equalityConstraint\">equalityConstraint</a> from connection handling as constraint.
          This ensures that the constraint has non-singular Jacobian and only one solution.
   </li>
 </ul>
diff --git a/Modelica/Media/Incompressible.mo b/Modelica/Media/Incompressible.mo
@@ -66,8 +66,8 @@ package Incompressible
     Medium.SpecificEntropy s=Medium.specificEntropy(medium.state);
     Medium.SpecificHeatCapacity cv=Medium.specificHeatCapacityCv(medium.state);
     Medium.SpecificInternalEnergy u=Medium.specificInternalEnergy(medium.state);
-    Medium.SpecificInternalEnergy h=Medium.specificEnthalpy(medium.state);
-    Medium.SpecificInternalEnergy d=Medium.density(medium.state);
+    Medium.SpecificEnthalpy h=Medium.specificEnthalpy(medium.state);
+    Medium.Density d=Medium.density(medium.state);
     protected
     constant SI.Time timeUnit = 1;
     constant SI.Temperature Ta = 1;
diff --git a/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake b/Modelica/Resources/BuildProjects/CMake/Modelica_platform.cmake
@@ -76,6 +76,8 @@ function(get_modelica_platform_name_with_compiler_version var)
       set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2019")
     elseif(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1950)
       set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2022")
+    elseif(MSVC_VERSION GREATER_EQUAL 1950 AND MSVC_VERSION LESS 1960)
+      set(PLATFORM_PATH_SUFFIX "${PLATFORM_PATH_SUFFIX}/vs2026")
     endif()
   endif()
 
diff --git a/Modelica/Resources/C-Sources/ModelicaInternal.c b/Modelica/Resources/C-Sources/ModelicaInternal.c
@@ -384,10 +384,12 @@ void ModelicaInternal_mkdir(_In_z_ const char* directoryName) {
 
 void ModelicaInternal_rmdir(_In_z_ const char* directoryName) {
     /* Remove directory */
-#if defined(__WATCOMC__) || defined(__LCC__) || defined(_POSIX_) || defined(__GNUC__)
+#if defined(__WATCOMC__) || defined(__LCC__)
     int result = rmdir(directoryName);
 #elif defined(__BORLANDC__) || defined(_WIN32)
     int result = _rmdir(directoryName);
+#elif defined(_POSIX_) || defined(__GNUC__)
+    int result = rmdir(directoryName);
 #else
     ModelicaNotExistError("ModelicaInternal_rmdir");
 #endif
@@ -1306,7 +1308,7 @@ void ModelicaInternal_setenv(_In_z_ const char* name,
         ModelicaError("Memory allocation error\n");
     }
 #elif defined(_POSIX_) && _POSIX_VERSION >= 200112L
-    int result;
+    int result = -1;
     if (1 == convertFromSlash) {
         char* buf = (char*)malloc((strlen(value) + 1)*sizeof(char));
         if (NULL != buf) {
diff --git a/Modelica/Units.mo b/Modelica/Units.mo
@@ -1100,16 +1100,16 @@ end UsersGuide;
               redeclare Modelica.Units.SI.CurrentDensity im "Imaginary part of complex current density")
       "Complex electric current density";
     operator record ComplexElectricPotential =
-      Complex(redeclare Modelica.Units.SI.ElectricPotential re "Imaginary part of complex electric potential",
-              redeclare Modelica.Units.SI.ElectricPotential im "Real part of complex electric potential")
+      Complex(redeclare Modelica.Units.SI.ElectricPotential re "Real part of complex electric potential",
+              redeclare Modelica.Units.SI.ElectricPotential im "Imaginary part of complex electric potential")
       "Complex electric potential";
     operator record ComplexPotentialDifference =
       Complex(redeclare Modelica.Units.SI.PotentialDifference re "Real part of complex potential difference",
               redeclare Modelica.Units.SI.PotentialDifference im "Imaginary part of complex potential difference")
       "Complex electric potential difference";
     operator record ComplexVoltage =
-      Complex(redeclare Modelica.Units.SI.Voltage re "Imaginary part of complex voltage",
-              redeclare Modelica.Units.SI.Voltage im "Real part of complex voltage")
+      Complex(redeclare Modelica.Units.SI.Voltage re "Real part of complex voltage",
+              redeclare Modelica.Units.SI.Voltage im "Imaginary part of complex voltage")
       "Complex electric voltage";
     operator record ComplexVoltageSlope =
       Complex(redeclare Modelica.Units.SI.VoltageSlope re "Real part of complex voltage slope",
diff --git a/ModelicaTest/MultiBody.mo b/ModelicaTest/MultiBody.mo
@@ -8741,8 +8741,6 @@ often possible to use the FreeMotion joint such that the singularity
               Text(
                 extent={{-150,-72},{-56,-90}},
                 textColor={255,85,85},
-                lineThickness=0.5,
-                fillPattern=FillPattern.Solid,
                 textString="Compare angles and position vector r",
                 fontSize=11),
               Line(
diff --git a/ModelicaTest/Rotational.mo b/ModelicaTest/Rotational.mo
@@ -515,8 +515,6 @@ package Rotational "Test models for Modelica.Mechanics.Rotational"
               fillPattern=FillPattern.Solid), Text(
               extent={{-80,100},{80,60}},
               textColor={0,0,255},
-              fillColor={255,213,170},
-              fillPattern=FillPattern.Solid,
               textString="Since the initialization was changed some elements here
 are redundant (e.g. inertia4, inertia5).
 But for compatibility reasons they were not deleted yet.")}));
diff --git a/ModelicaTest/Tables/CombiTable2Ds.mo b/ModelicaTest/Tables/CombiTable2Ds.mo
@@ -831,19 +831,15 @@ double mydummyfunc(double dummy_in) {
                   extent={{20,30},{45,15}}),
                 Text(
                   textString="1L",
-                  fillPattern=FillPattern.Solid,
                   extent={{25,35},{40,30}}),
                 Text(
                   textString="1R",
-                  fillPattern=FillPattern.Solid,
                   extent={{25,15},{40,10}}),
                 Text(
                   textString="2L",
-                  fillPattern=FillPattern.Solid,
                   extent={{10,25},{25,20}}),
                 Text(
                   textString="2R",
-                  fillPattern=FillPattern.Solid,
                   extent={{40,25},{55,20}})}),
       experiment(StartTime=0, StopTime=1));
   end Test22;
diff --git a/ModelicaTest/Tables/CombiTable2Dv.mo b/ModelicaTest/Tables/CombiTable2Dv.mo
@@ -656,19 +656,15 @@ double mydummyfunc(double dummy_in) {
                   extent={{20,30},{45,15}}),
                 Text(
                   textString="1L",
-                  fillPattern=FillPattern.Solid,
                   extent={{25,35},{40,30}}),
                 Text(
                   textString="1R",
-                  fillPattern=FillPattern.Solid,
                   extent={{25,15},{40,10}}),
                 Text(
                   textString="2L",
-                  fillPattern=FillPattern.Solid,
                   extent={{10,25},{25,20}}),
                 Text(
                   textString="2R",
-                  fillPattern=FillPattern.Solid,
                   extent={{40,25},{55,20}})}),
       experiment(StartTime=0, StopTime=1));
   end Test22;
diff --git a/ModelicaTest/Utilities.mo b/ModelicaTest/Utilities.mo
@@ -217,7 +217,7 @@ extends Modelica.Icons.ExamplesPackage;
 
     // Strings.contains
     assert(Strings.contains("", ""), "Strings.contains 1 failed (empty strings)");
-    assert(Strings.contains("foo bar", "o"), "Strings.contains 2 failed (multiple occurences)");
+    assert(Strings.contains("foo bar", "o"), "Strings.contains 2 failed (multiple occurrences)");
     assert(Strings.contains("foo bar", "o ba"), "Strings.contains 3 failed (occurrence at middle)");
     assert(Strings.contains("foo bar", "fo"), "Strings.contains 4 failed (occurrence at start)");
     assert(Strings.contains("foo bar", "ar"), "Strings.contains 5 failed (occurrence at end)");
