Merge remote-tracking branch 'central/master' into testonly-moistair-unit-error

Author: henrikt-ma

.CI/check_deprecated_line_color.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 '''
-Copyright (C) 2021, Modelica Association and contributors
+Copyright (C) 2021-2023, Modelica Association and contributors
 All rights reserved.
 
 Check for deprecated Text.lineColor annotation
@@ -13,7 +13,7 @@
 import re
 import sys
 
-PATTERN = re.compile(r'(Text\s*\([^\).]*)lineColor')
+PATTERN = re.compile(r'(?:Text\s*\([^\)]*?(?:\"(?:\\.|[^\"])*\")?[^\)]*?)(lineColor)')
 
 def _checkDeprecatedFileLineColor(file_name):
     errors = 0

.github/workflows/checkCI.yml

@@ -7,7 +7,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Build libraries
@@ -34,11 +34,11 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install python packages
@@ -68,7 +68,7 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Get moparser
@@ -86,11 +86,11 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Check deprecated Text.lineColor annotation

.github/workflows/checkCron.yml

@@ -11,11 +11,11 @@ jobs:
     if: github.repository_owner == 'modelica'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install python packages
@@ -28,37 +28,61 @@ jobs:
     if: github.repository_owner == 'modelica'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install python packages
-        run:  pip install --user codespell
+        run:  pip install --disable-pip-version-check --user codespell
       - name: Check for spelling errors
         run: |
           printf "[codespell]\nenable-colors=\n" >> .codespellrc
+          codespell -L additionals,inport,manuel ./Modelica/package.mo
+          codespell -L bu,nin ./Modelica/Clocked/RealSignals/Periodic/StateSpace.mo
           codespell -L mesures ./Modelica/Constants.mo
           codespell -L nin,inport,fo ./Modelica/StateGraph.mo
           codespell -L addd,nd,nin ./Modelica/Blocks/Continuous.mo
           codespell -L utput ./Modelica/Electrical/Digital.mo
           codespell -L ser ./Modelica/Electrical/Polyphase/Examples/PolyphaseRectifier.mo
           codespell -L ser ./Modelica/Electrical/Polyphase/Examples/Utilities/PolyphaseRectifierData.mo
+          codespell -L manuel ./Modelica/Fluid/package.mo
           codespell -L pres ./Modelica/Fluid/Dissipation.mo
-          codespell -L fo,alo,als,cacl,ba,nd ./Modelica/Media/IdealGases/package.mo
-          codespell -L fo,alo,als,cacl,ba,nd,alow ./Modelica/Media/IdealGases/Common/SingleGasesData.mo
+          codespell -L manuel ./Modelica/Fluid/Vessels.mo
+          codespell -L manuel,nin,inport ./Modelica/Fluid/Examples/AST_BatchPlant.mo
+          codespell -L fo,alo,als,cacl,ba,nd,ges,caf,inh ./Modelica/Media/IdealGases/package.mo
+          codespell -L fo,alo,als,cacl,ba,nd,alow,ges,caf,inh ./Modelica/Media/IdealGases/Common/SingleGasesData.mo
           codespell -L alow ./Modelica/Media/IdealGases/Common/Functions.mo
           codespell -L alow ./Modelica/Media/IdealGases/Common/package.mo
-          codespell -L dout ./Modelica/Media/Water/IF97_Utilities.mo
+          codespell -L delt ./Modelica/Media/Air/ReferenceAir.mo
+          codespell -L scrit,delt ./Modelica/Media/R134a.mo
+          codespell -L dout,scrit,delt ./Modelica/Media/Water/IF97_Utilities.mo
           codespell -L archiv ./Modelica/Electrical/Polyphase/UsersGuide/References.mo
+          codespell -L additionals,vie ./Modelica/Electrical/Spice3.mo
+          codespell -L vai ./Modelica/Electrical/Machines/BasicMachines/Components/PartialAirGapDC.mo
           codespell -L mot ./Modelica/Electrical/Machines/Examples/ControlledDCDrives
           codespell -L singal ./Modelica/Electrical/Analog/UsersGuide/References.mo
           codespell -L numer ./Modelica/Math/package.mo
-          codespell -L inport,nd,wit ./Modelica/Mechanics/Rotational
+          codespell -L inport,nd,supportt,wit ./Modelica/Mechanics/Rotational
           codespell -L wit ./Modelica/Mechanics/Translational
           codespell -L ist ./Modelica/Mechanics/MultiBody
           codespell -L klick ./Modelica/Magnetic/FluxTubes/UsersGuide/Contact.mo
+          codespell -L nife ./Modelica/Magnetic/FluxTubes/Material/SoftMagnetic/NickelIron
           codespell -L technik ./Modelica/Magnetic/FundamentalWave/UsersGuide/References.mo
-          codespell --skip ./ObsoleteModelica4.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/Dissipation.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/Water/IF97_Utilities.mo,./Modelica/Electrical/Polyphase/UsersGuide/References.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/FundamentalWave/UsersGuide/References.mo,./.CI,./.github,./.git,*.png -L nin,inport,te,sinc,vie,commutating
+          codespell -L supportt ./ModelicaTest/Rotational.mo
+          codespell -L lamda,inport ./ModelicaTestConversion4.mo
+          codespell --skip ./ObsoleteModelica4.mo,./Modelica/package.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/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
+  clean_workflow_runs:
+    timeout-minutes: 5
+    if: github.repository_owner == 'modelica'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Delete workflow runs
+      uses: dmvict/clean-workflow-runs@v1
+      with:
+        run_conclusions: skipped,success
+        save_period: 90
+        save_min_runs_number: 25
+        dry: false

.github/workflows/generateReleaseNotes.yml

@@ -17,19 +17,19 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 5
       - name: Setup python environment
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
       - name: Install python packages
         run: pip install --user requests
       - name: Generate MSL release notes from closed GitHub issues
         timeout-minutes: 3
         run: python ./Modelica/Resources/Documentation/Generate-ReleaseNotes.py ${{ github.event.inputs.milestone }} ${{ github.event.inputs.version }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ResolvedGitHubIssues-Version-${{ github.event.inputs.version }}
           path: ./Modelica/Resources/Documentation/Version-${{ github.event.inputs.version }}/

.mailmap

@@ -13,6 +13,8 @@ Anton Haumer <ahaumer@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Anton Haumer <anton.haumer@gmail.com>
 Anton Haumer <anton.haumer@oth-regensburg.de>
 Antonio Froio <antonio.froio39@gmail.com>
+Arunkumar Narasimhan <124154466+arunkumar-narasimhan@users.noreply.github.com>
+Arunkumar Narasimhan <arunkumar.narasimhan@modelon.com>
 Bernhard Thiele <bernhard.thiele@dlr.de>
 Bernhard Thiele <thiele@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Bruno Scaglioni <bruno.scaglioni@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
@@ -69,7 +71,9 @@ Kristin Majetta <majetta@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Leo Gall <leo.gall@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Leo Gall <leo.gall@ltx.de>
 Leo Zambito <lzambito@maplesoft.com>
+Luigi Vanfretti <luigi.vanfretti@gmail.com>
 Malte Lenz <maltel@wolfram.com>
+Manikantan Thiyagarajan <124235109+TManikantan@users.noreply.github.com>
 Marco Kessler <marco.kessler@3ds.com>
 Marcus Baur <baur_ma@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Martin Otter <Martin.Otter@dlr.de>
@@ -95,6 +99,8 @@ Per Östlund <perost86@gmail.com>
 Peter Harman <peter.harman@deltatheta.com>
 Peter Harman <pharman@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Philip Jordan <pjordan@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
+Quentin Lambert <quentinl@wolfram.com>
+Rüdiger Franke <rdgfranke@gmail.com>
 Rüdiger Franke <rfranke@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
 Stefan Vorkoetter <svorkoetter@maplesoft.com>
 Stefan Wischhusen <wischhusen@7ce873d0-865f-4ce7-a662-4bb36ea78beb>

Modelica/Blocks/Continuous.mo

@@ -598,7 +598,7 @@ This is discussed in the description of package
             textString="T=%T")}));
   end PI;
 
-  block PID "PID-controller in additive description form"
+  block PID "PID controller in additive description form"
     import Modelica.Blocks.Types.Init;
     extends Interfaces.SISO;
 
@@ -689,8 +689,8 @@ This is discussed in the description of package
             textString="Ti=%Ti")}),
       Documentation(info="<html>
 <p>
-This is the text-book version of a PID-controller.
-For a more practically useful PID-controller, use
+This is the text-book version of a PID controller.
+For a more practically useful PID controller, use
 block LimPID.
 </p>
 
@@ -765,7 +765,7 @@ to compute u by an algebraic equation.
       "Control error (set point - measurement)";
     parameter .Modelica.Blocks.Types.SimpleController controllerType=
            .Modelica.Blocks.Types.SimpleController.PID "Type of controller";
-    parameter Real k(min=0) = 1 "Gain of controller";
+    parameter Real k = 1 "Gain of controller, must be non-zero";
     parameter SI.Time Ti(min=Modelica.Constants.small)=0.5
       "Time constant of Integrator block" annotation (Dialog(enable=
             controllerType == .Modelica.Blocks.Types.SimpleController.PI or
@@ -881,6 +881,7 @@ to compute u by an algebraic equation.
       gainPID.y = y_start;
     end if;
   equation
+    assert(abs(k) >= Modelica.Constants.small, "Controller gain must be non-zero.");
     if initType == Init.InitialOutput and (y_start < yMin or y_start > yMax) then
         Modelica.Utilities.Streams.error("LimPID: Start value y_start (=" + String(y_start) +
            ") is outside of the limits of yMin (=" + String(yMin) +") and yMax (=" + String(yMax) + ")");
@@ -1011,18 +1012,18 @@ together) and using the following strategy:
 
 <ol>
 <li> Set very large limits, e.g., yMax = Modelica.Constants.inf</li>
-<li> Select a <strong>P</strong>-controller and manually enlarge parameter <strong>k</strong>
+<li> Select a <strong>P</strong> controller and manually enlarge parameter <strong>k</strong>
      (the total gain of the controller) until the closed-loop response
      cannot be improved any more.</li>
-<li> Select a <strong>PI</strong>-controller and manually adjust parameters
+<li> Select a <strong>PI</strong> controller and manually adjust parameters
      <strong>k</strong> and <strong>Ti</strong> (the time constant of the integrator).
      The first value of Ti can be selected, such that it is in the
      order of the time constant of the oscillations occurring with
-     the P-controller. If, e.g., vibrations in the order of T=10 ms
+     the P controller. If, e.g., vibrations in the order of T=10 ms
      occur in the previous step, start with Ti=0.01 s.</li>
 <li> If you want to make the reaction of the control loop faster
      (but probably less robust against disturbances and measurement noise)
-     select a <strong>PID</strong>-Controller and manually adjust parameters
+     select a <strong>PID</strong> controller and manually adjust parameters
      <strong>k</strong>, <strong>Ti</strong>, <strong>Td</strong> (time constant of derivative block).</li>
 <li> Set the limits yMax and yMin according to your specification.</li>
 <li> Perform simulations such that the output of the PID controller
@@ -1968,8 +1969,7 @@ The filters are implemented in the following, reliable way:
 
 <p>
 The development of this block was partially funded by BMBF within the
-     <a href=\"http://www.eurosyslib.com/\">ITEA2 EUROSYSLIB</a>
-      project.
+ITEA <a href=\"https://itea4.org/project/eurosyslib.html\">EUROSYSLIB</a> research project.
 </p>
 
 </html>"));

Modelica/Blocks/Discrete.mo

@@ -5,11 +5,11 @@ package Discrete
   extends Modelica.Icons.Package;
 
   block Sampler "Ideal sampling of continuous signals"
-    extends Interfaces.DiscreteSISO;
+    extends Interfaces.DiscreteSISO(y(start=0, fixed=true));
 
   equation
     when {sampleTrigger, initial()} then
-      y = u;
+      y = if time>=startTime then u else pre(y);
     end when;
     annotation (
       Icon(
@@ -44,7 +44,7 @@ via parameter <strong>samplePeriod</strong>.
 
   equation
     when {sampleTrigger, initial()} then
-      ySample = u;
+      ySample = if time>=startTime then u else pre(ySample);
     end when;
     /* Define y=ySample with an infinitesimal delay to break potential
        algebraic loops if both the continuous and the discrete part have
@@ -407,7 +407,7 @@ the initial value defined via parameter <strong>y0</strong>.
         Line(points={{-35.0,0.0},{28.0,-48.0}},
           color={0,0,127}),
         Text(extent={{-86.0,24.0},{82.0,82.0}},
-          color={0,0,127},
+          textColor={0,0,127},
           textString="max"),
         Ellipse(lineColor={0,0,127},
           fillColor={255,255,255},

Modelica/Blocks/Math.mo

@@ -2335,29 +2335,31 @@ Note: The output is updated after each period defined by 1/f.
   block ContinuousMean
     "Calculates the empirical expectation (mean) value of its input signal"
     extends Modelica.Blocks.Icons.Block;
-    parameter SI.Time t_eps(min= 100*Modelica.Constants.eps)=1e-7
+    parameter SI.Time t_eps(min= 0)=1e-7
       "Mean value calculation starts at startTime + t_eps"
       annotation(Dialog(group="Advanced"));
 
     Modelica.Blocks.Interfaces.RealInput u "Noisy input signal" annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
     Modelica.Blocks.Interfaces.RealOutput y
       "Expectation (mean) value of the input signal"
       annotation (Placement(transformation(extent={{100,-10},{120,10}})));
-
+    parameter Real startTime=-Modelica.Constants.inf "Starting point for mean if after simulation start-point";
   protected
-    Real mu "Internal integrator variable";
+    Real mu(start=0, fixed=true) "Internal integrator variable";
     parameter Real t_0(fixed=false) "Start time";
+    parameter Real actualStartTime=max(t_0, startTime);
   initial equation
     t_0 = time;
-    mu  = u;
   equation
-    der(mu) = noEvent(if time >= t_0 + t_eps then (u-mu)/(time-t_0) else 0);
-    y       = noEvent(if time >= t_0 + t_eps then mu                else u);
+    der(mu) = if time >= actualStartTime then u else 0;
+    y       = noEvent(if time > actualStartTime+t_eps then mu/(time-actualStartTime) else u);
 
     annotation (Documentation(revisions="<html>
 <table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
 <tr><th>Date</th> <th align=\"left\">Description</th></tr>
-
+<tr><td> June 13, 2023</td>
+<td>Hans Olsson. Avoid almost singularity for integrators.</td>
+</tr>
 <tr><td> June 22, 2015 </td>
     <td>
 
@@ -2380,8 +2382,8 @@ y = ------------------------
         time - startTime
 </pre></blockquote>
 <p>This can be used to determine the empirical expectation value of a random signal, such as generated by the <a href=\"modelica://Modelica.Blocks.Noise\">Noise</a> blocks.</p>
-<p>The parameter t_eps is used to guard against division by zero (the mean value computation
-starts at &lt;<em>simulation start time</em>&gt; + t_eps and before that time instant y = u).</p>
+<p>The parameter t_eps is used to avoid large fluctuations but can be set to zero (the mean value computation
+starts at &lt;<em>simulation start time</em>&gt; but is only returned after an additional t_eps and before that time instant y = u).</p>
 <p>See also the <a href=\"modelica://Modelica.Blocks.Math.Mean\">Mean</a> block for a sampled implementation.</p>
 
 <p>