Bump used Modelica language version to 3.6 (modelica#4208)

* Bump used Modelica language version to 3.6 * Fix bad &nbsp> Detected by html_documentation_checks. * Skip main entry when linking to getInstanceName in specification * Re-trigger CI checks
Parti-Gyle · Jan 9, 2024 · 18320a6 · 18320a6
1 parent f4b029c
commit 18320a6
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/Modelica/Blocks/Noise.mo b/Modelica/Blocks/Noise.mo
@@ -588,7 +588,7 @@ the desired situation. For this purpose the following parameters can be defined:
          of the instances are the same).<br>
          If <strong>useAutomaticLocalSeed = true</strong>, the
          local seed is determined automatically using a hash value of the instance name of the model that is
-         inquired with the Modelica built-in operator <a href=\"https://specification.modelica.org/v3.4/Ch3.html#getinstancename\">getInstanceName()</a>.
+         inquired with the Modelica built-in operator <a href=\"https://specification.modelica.org/maint/3.6/operators-and-expressions.html#getinstancename\">getInstanceName()</a>.
          Note, this means that the noise changes if the component is renamed.<br>
          If <strong>useAutomaticLocalSeed = false</strong>, the local seed is defined
          explicitly by parameter fixedLocalSeed. It is then guaranteed that the generated noise

diff --git a/Modelica/Blocks/package.mo b/Modelica/Blocks/package.mo
@@ -1030,7 +1030,7 @@ at hand of this model (Modelica.Blocks.Examples.BusUsage):
      used to exchange signals between different components. It is
      defined as \"expandable connector\" in order that <strong>no</strong> central definition
      of the connector is needed but is automatically constructed by the
-     signals connected to it (see also <a href=\"https://specification.modelica.org/v3.4/Ch9.html#expandable-connectors\">Section 9.1.3 (Expandable Connectors) of the Modelica 3.4 specification</a>).</li>
+     signals connected to it (see also <a href=\"https://specification.modelica.org/maint/3.6/connectors-and-connections.html#expandable-connectors\">Section&nbsp;9.1.3 <em>Expandable Connectors</em> of the Modelica&nbsp;3.6 specification</a>).</li>
 <li> Input/output signals can be directly connected to the \"controlBus\".</li>
 <li> A component, such as \"part\", can be directly connected to the \"controlBus\",
      provided it has also a bus connector, or the \"part\" connector is a

diff --git a/Modelica/Electrical/QuasiStatic/Types/Reference.mo b/Modelica/Electrical/QuasiStatic/Types/Reference.mo
@@ -9,7 +9,7 @@ record Reference "Reference angle"
     assert(abs(reference1.gamma - reference2.gamma) < 1E-6*2*Modelica.Constants.pi,
       "Reference angles should be equal!");
     annotation (Documentation(info="<html>
-Equality constraint for the reference angle, according to the <a href=\"https://specification.modelica.org/v3.4/Ch9.html#equation-operators-for-overconstrained-connection-based-equation-systems1\">Section 9.4 (Equation Operators for Overconstrained Connection-Based Equation Systems) of the Modelica 3.4 specification</a>.
+Equality constraint for the reference angle, according to the <a href=\"https://specification.modelica.org/maint/3.6/connectors-and-connections.html#equation-operators-for-overconstrained-connection-based-equation-systems1\">Section&nbsp;9.4 <em>Overconstrained Connections</em> of the Modelica&nbsp;3.6 specification</a>.
 </html>"));
   end equalityConstraint;
   annotation (Documentation(info="<html>

diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo
@@ -17,7 +17,7 @@ The reference angle <code>gamma</code>:
   <li>is defined by the sources.</li>
 </ul>
 <p>
-Designing new components, the guidelines of <a href=\"https://specification.modelica.org/v3.4/Ch9.html#overconstrained-equation-operators-for-connection-graphs\">Section 9.4.1 (Overconstrained Equation Operators for Connection Graphs) of the Modelica 3.4 specification</a> have to be taken into account.
+Designing new components, the guidelines of <a href=\"https://specification.modelica.org/maint/3.6/connectors-and-connections.html#connection-graphs-and-their-operators\">Section&nbsp;9.4.1 <em>Connection Graphs and Their Operators</em> of the Modelica&nbsp;3.6 specification</a> have to be taken into account.
 </p>
 
 <h4>See also</h4>

diff --git a/Modelica/Fluid/package.mo b/Modelica/Fluid/package.mo
@@ -170,7 +170,7 @@ and a Modelica translator will check that the quantity and unit attributes
 of connected interfaces are identical. Therefore, an error occurs,
 if connected FluidPorts do not have a medium with the same medium name.<br>
 Automatic propagation of fluid models through the ports is not directly possible with the
-Modelica 3.4 specification, but might be supported by the Modelica tool. For example,
+Modelica&nbsp;3.6 specification, but might be supported by the Modelica tool. For example,
 in Dymola the option <code>Advanced.MediaPropagation</code>=<code>1</code> can be set
 to apply automatic propagation of media models in a circuit.
 </p>
@@ -190,7 +190,7 @@ flowing out of the connector, regardless of the actual direction of the flow. Th
 avoiding singularities when the mass flow goes through zero. The stream properties for the
 other flow direction can be inquired with the built-in operator inStream(..), while the
 value of the stream variable corresponding to the actual flow direction can be inquired
-through the built-in operator <a href=\"https://specification.modelica.org/v3.4/Ch15.html#stream-operator-actualstream\">actualStream(..)</a>.
+through the built-in operator <a href=\"https://specification.modelica.org/maint/3.6/operators-and-expressions.html#modelica:actualStream\">actualStream(…)</a>.
 </p>
 <p>
 The actual equations corresponding to these operators are introduced and solved automatically

diff --git a/Modelica/Math/Nonlinear.mo b/Modelica/Math/Nonlinear.mo
@@ -812,8 +812,8 @@ functions.
 For details about how to define and to use functions as input arguments
 to functions, see
 <a href=\"modelica://ModelicaReference.Classes.'function'\">ModelicaReference.Classes.'function'</a>
-or <a href=\"https://specification.modelica.org/v3.4/Ch12.html#functional-input-arguments-to-functions\">Section 12.4.2
-(Functional Input Arguments to Functions) of the Modelica 3.4 specification</a>.
+or <a href=\"https://specification.modelica.org/maint/3.6/functions.html#functional-input-arguments-to-functions\">Section&nbsp;12.4.2
+<em>Functional Input Arguments</em> of the Modelica&nbsp;3.6 specification</a>.
 </p>
 
 </html>", revisions="<html>

diff --git a/Modelica/Math/Random.mo b/Modelica/Math/Random.mo
@@ -1013,7 +1013,7 @@ seed = Utilities.<strong>automaticLocalSeed</strong>(path);
 <p>
 Returns an automatically computed seed (Integer) from the hash value of
 the full path name of an instance (has to be inquired in the model or block
-where this function is called by the Modelica built-in operator <a href=\"https://specification.modelica.org/v3.4/Ch3.html#getinstancename\">getInstanceName()</a>).
+where this function is called by the Modelica built-in operator <a href=\"https://specification.modelica.org/maint/3.6/operators-and-expressions.html#getinstancename\">getInstanceName()</a>).
 Contrary to <a href=\"modelica://Modelica.Math.Random.Utilities.automaticGlobalSeed\">automaticGlobalSeed()</a>,
 this is a pure function, that is, the same seed is returned, if an identical
 path is provided.
@@ -1031,7 +1031,7 @@ path is provided.
 
 <h4>See also</h4>
 <p>
-<a href=\"modelica://Modelica.Math.Random.Utilities.automaticGlobalSeed\">automaticGlobalSeed</a>, <a href=\"modelica://Modelica.Utilities.Strings.hashString\">hashString</a> and <a href=\"https://specification.modelica.org/v3.4/Ch3.html#getinstancename\">getInstanceName</a>.
+<a href=\"modelica://Modelica.Math.Random.Utilities.automaticGlobalSeed\">automaticGlobalSeed</a>, <a href=\"modelica://Modelica.Utilities.Strings.hashString\">hashString</a> and <a href=\"https://specification.modelica.org/maint/3.6/operators-and-expressions.html#getinstancename\">getInstanceName</a>.
 </p>
 </html>",     revisions="<html>
 <table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">

diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo
@@ -1798,8 +1798,8 @@ Index reduction leads to the equations:
 <p>
 Note, that <strong>der</strong>(y,x) is the partial derivative of y with respect to x
 and that this operator is available in Modelica only for declaring partial derivative functions,
-see <a href=\"https://specification.modelica.org/v3.4/Ch12.html#partial-derivatives-of-functions\">Section&nbsp;12.7.2
-(Partial Derivatives of Functions) of the Modelica 3.4 specification</a>.
+see <a href=\"https://specification.modelica.org/maint/3.6/functions.html#partial-derivatives-of-functions\">Section&nbsp;12.7.2
+<em>Partial Derivatives of Functions</em> of the Modelica&nbsp;3.6 specification</a>.
 </p>
 <p>
 The above equations imply, that if p,T are provided from the
@@ -4096,7 +4096,7 @@ Please note that this doesn't mean that the additional equations
 should be connection equations, nor that exactly those variables
 should be supplied, in order to complete the model.
 For further information, see the <a href=\"modelica://Modelica.Media.UsersGuide\">Modelica.Media User's guide</a>, and
-<a href=\"https://specification.modelica.org/v3.4/Ch4.html#balanced-models\">Section 4.7 (Balanced Models) of the Modelica 3.4 specification</a>.</p>
+<a href=\"https://specification.modelica.org/maint/3.6/class-predefined-types-and-declarations.html#balanced-models\">Section&nbsp;4.7 <em>Balanced Models</em> of the Modelica&nbsp;3.6 specification</a>.</p>
 </html>"));
     end BaseProperties;
 

diff --git a/Modelica/StateGraph.mo b/Modelica/StateGraph.mo
@@ -256,7 +256,7 @@ Then, simulation continuous until a new event is triggered,
 With the Modelica \"sample(..)\" operator, a StateGraph might also
 be executed within a discrete controller that is called
 at regular time instants. Furthermore, clocked state machines
-are directly supported by the Modelica language itself, see <a href=\"https://specification.modelica.org/v3.4/Ch17.html\">Section 17 (State Machines) of the Modelica 3.4 specification</a>.
+are directly supported by the Modelica language itself, see <a href=\"https://specification.modelica.org/maint/3.6/state-machines.html\">Chapter&nbsp;17 (State Machines) of the Modelica&nbsp;3.6 specification</a>.
 </p>
 <h4>Parallel and Alternative Execution</h4>
 <p>
@@ -480,7 +480,7 @@ step \"emptyTanks\" is active. Otherwise, valve2 is closed.
 An evolved, but non-standard conforming Modelica library, called \"Modelica_StateGraph2\", is available from <a href=\"https://github.com/HansOlsson/Modelica_StateGraph2\">https://github.com/HansOlsson/Modelica_StateGraph2</a>.
 Find below a comparison with respect to Modelica.StateGraph.
 A third option, especially for modeling of discrete controllers, are the clocked state machines, which
-are available as built-in Modelica language elements, see <a href=\"https://specification.modelica.org/v3.4/Ch17.html\">Section 17 (State Machines) of the Modelica 3.4 specification</a>.
+are available as built-in Modelica language elements, see <a href=\"https://specification.modelica.org/maint/3.6/state-machines.html\">Chapter&nbsp;17 <em>State Machines</em> of the Modelica&nbsp;3.6 specification</a>.
 </p>
 
 <p>

diff --git a/Modelica/package.mo b/Modelica/package.mo
@@ -2519,7 +2519,7 @@ Short Overview:
 </p>
 <ul>
 <li>About <a href=\"modelica://Modelica/Resources/Documentation/Version-4.0.0/ResolvedGitHubIssues.html\">649 issues (including 432 pull requests)</a> have been addressed for this release.</li>
-<li>This version is based on the recent Modelica language standard version 3.4.</li>
+<li>This version is based on the recent Modelica language standard version 3.6.</li>
 <li>The library version (i.e., \"4.0.0\") follows semantic versioning using the convention <code>MAJOR.MINOR.BUGFIX</code>
 (see <a href=\"modelica://Modelica.UsersGuide.ReleaseNotes.VersionManagement\">Version Management</a> for details)
  and was decoupled from the version of the utilized version of the Modelica language standard.</li>
@@ -9145,7 +9145,7 @@ This version of the Modelica Standard Library consists of
 </ul>
 <p>
 that are directly usable (= number of public, non-partial, non-internal and non-obsolete classes). It is fully compliant
-to <a href=\"https://modelica.org/documents/ModelicaSpec34.pdf\">Modelica Specification version 3.4</a>
+to <a href=\"https://specification.modelica.org/maint/3.6/MLS.html\">Modelica Specification version 3.6</a>
 and it has been tested with Modelica tools from different vendors.
 </p>
 

diff --git a/ModelicaReference/package.mo b/ModelicaReference/package.mo
@@ -4066,7 +4066,7 @@ Additional equations need to be generated for the stream variables of outside co
 <p>
 Neglecting zero flow conditions, the above implicit equations can be
 analytically solved for the inStream(..) operators.
-The details are given in <a href=\"https://specification.modelica.org/v3.4/Ch15.html#stream-operator-instream-and-connection-equations\">Section 15.2 (Stream Operator inStream and Connection Equations) of the Modelica 3.4 specification</a>.
+The details are given in <a href=\"https://specification.modelica.org/maint/3.6/stream-connectors.html#instream-and-connection-equations\">Section&nbsp;15.2 <em>inStream and Connection Equations</em> of the Modelica&nbsp;3.6 specification</a>.
 The stream connection equations have singularities and/or multiple solutions if one or more
 of the flow variables become zero. When all the flows are zero, a singularity is always
 present, so it is necessary to approximate the solution in an open neighborhood
@@ -6689,7 +6689,7 @@ equation
 In this example we will start in <strong>increase</strong> and increase <strong>v</strong> until a limit, and then decrease it, and repeat.
 
 <h4>Description</h4>
-A detailed description of the State Machines using Synchronous Language Elements is given in <a href=\"https://specification.modelica.org/v3.4/Ch17.html\">Chapter 17 (State Machines) of the Modelica 3.4 specification</a>.
+A detailed description of the State Machines using Synchronous Language Elements is given in <a href=\"https://specification.modelica.org/maint/3.6/state-machines.html\">Chapter&nbsp;17 <em>State Machines</em> of the Modelica&nbsp;3.6 specification</a>.
 </html>"));
 end StateMachines;
 
@@ -6789,9 +6789,9 @@ operators inside the components provide the \"ideal mixing\" equations:
 
 <p>
 A detailed description of the stream keyword and the inStream operator is given
-in <a href=\"https://specification.modelica.org/v3.4/Ch15.html\">Chapter 15 (Stream Connectors)</a>
-and <a href=\"https://specification.modelica.org/v3.4/A4.html\">Appendix D (Derivation of Stream Equations)</a>
-of the Modelica 3.4 specification.
+in <a href=\"https://specification.modelica.org/maint/3.6/stream-connectors.html\">Chapter&nbsp;15 <em>Stream Connectors</em></a>
+and <a href=\"https://specification.modelica.org/maint/3.6/derivation-of-stream-equations.html\">Appendix&nbsp;C <em>Derivation of Stream Equations</em></a>
+of the Modelica&nbsp;3.6 specification.
 An overview and a rational is provided in a
 <a href=\"modelica://Modelica/Resources/Documentation/Fluid/Stream-Connectors-Overview-Rationale.pdf\">slide set</a>.
 </p>
@@ -6928,7 +6928,7 @@ In this example <strong>dc.xd</strong> and <strong>dc.ud</strong> are Clocked va
 At time instants where the associated clock is not active, the value of a clocked variable can be inquired by using an explicit cast operator, e.g., <strong>hold</strong>.
 
 <h4>Description</h4>
-A detailed description of the Synchronous Language Elements is given in <a href=\"https://specification.modelica.org/v3.4/Ch16.html\">Chapter 16 (Synchronous Language Elements) of the Modelica 3.4 specification</a>.
+A detailed description of the Synchronous Language Elements is given in <a href=\"https://specification.modelica.org/maint/3.6/synchronous-language-elements.html\">Chapter&nbsp;16 <em>Synchronous Language Elements</em> of the Modelica&nbsp;3.6 specification</a>.
 </html>"));
 end Synchronous;
 

diff --git a/ModelicaServices/package.mo b/ModelicaServices/package.mo
@@ -283,7 +283,7 @@ These are:
 <li> <a href=\"modelica://ModelicaServices.Types.SolverMethod\">Types.SolverMethod</a>
      provides a string defining the integration method to solve differential equations in
      a clocked discretized continuous-time partition
-     (see <a href=\"https://specification.modelica.org/v3.4/Ch16.html#solver-methods\">Section 16.8.2 (Solver Methods) of the Modelica 3.4 specification</a>).</li>
+     (see <a href=\"https://specification.modelica.org/maint/3.6/synchronous-language-elements.html#solver-methods\">Section&nbsp;16.8.2 <em>Solver Methods</em> of the Modelica 3.6 specification</a>).</li>
 </ul>
 
 <p>