From 954d9faa9a1b2ff52fc4c70058c0df394f6bee2d Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Wed, 18 Oct 2023 22:29:28 +0200 Subject: [PATCH 1/4] Bump used Modelica language version to 3.6 --- Modelica/Blocks/Noise.mo | 2 +- Modelica/Blocks/package.mo | 2 +- Modelica/Electrical/QuasiStatic/Types/Reference.mo | 2 +- .../UsersGuide/Overview/ReferenceSystem.mo | 2 +- Modelica/Fluid/package.mo | 4 ++-- Modelica/Math/Nonlinear.mo | 4 ++-- Modelica/Math/Random.mo | 4 ++-- Modelica/Media/package.mo | 6 +++--- Modelica/StateGraph.mo | 4 ++-- Modelica/package.mo | 4 ++-- ModelicaReference/package.mo | 12 ++++++------ ModelicaServices/package.mo | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Modelica/Blocks/Noise.mo b/Modelica/Blocks/Noise.mo index 8857e34e50..2627222f16 100644 --- 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).
If useAutomaticLocalSeed = true, 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 getInstanceName(). + inquired with the Modelica built-in operator getInstanceName(). Note, this means that the noise changes if the component is renamed.
If useAutomaticLocalSeed = false, 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 index d297b7a490..78a51b25c2 100644 --- 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 no central definition of the connector is needed but is automatically constructed by the - signals connected to it (see also Section 9.1.3 (Expandable Connectors) of the Modelica 3.4 specification). + signals connected to it (see also Section 9.1.3 Expandable Connectors of the Modelica 3.6 specification).
  • Input/output signals can be directly connected to the \"controlBus\".
  • 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 index 1428448fc0..2cdd07767c 100644 --- 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=" -Equality constraint for the reference angle, according to the Section 9.4 (Equation Operators for Overconstrained Connection-Based Equation Systems) of the Modelica 3.4 specification. +Equality constraint for the reference angle, according to the Section 9.4 Overconstrained Connections of the Modelica 3.6 specification. ")); end equalityConstraint; annotation (Documentation(info=" diff --git a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo index 8accb6bb5c..3058236378 100644 --- a/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo +++ b/Modelica/Electrical/QuasiStatic/UsersGuide/Overview/ReferenceSystem.mo @@ -17,7 +17,7 @@ The reference angle gamma:
  • is defined by the sources.

    • -Designing new components, the guidelines of Section 9.4.1 (Overconstrained Equation Operators for Connection Graphs) of the Modelica 3.4 specification have to be taken into account. +Designing new components, the guidelines of Section 9.4.1 Connection Graphs and Their Operators of the Modelica 3.6 specification have to be taken into account.

    See also

    diff --git a/Modelica/Fluid/package.mo b/Modelica/Fluid/package.mo index 1a1cd20b85..733a5f442a 100644 --- 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.
    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 3.6 specification, but might be supported by the Modelica tool. For example, in Dymola the option Advanced.MediaPropagation=1 can be set to apply automatic propagation of media models in a circuit.

    @@ -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 actualStream(..). +through the built-in operator actualStream(…).

    The actual equations corresponding to these operators are introduced and solved automatically diff --git a/Modelica/Math/Nonlinear.mo b/Modelica/Math/Nonlinear.mo index 09e275da3f..62d6ce19e8 100644 --- 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 ModelicaReference.Classes.'function' -or Section 12.4.2 -(Functional Input Arguments to Functions) of the Modelica 3.4 specification. +or Section 12.4.2 +Functional Input Arguments of the Modelica 3.6 specification.

    ", revisions=" diff --git a/Modelica/Math/Random.mo b/Modelica/Math/Random.mo index 3ce4ef9896..7bdd14bc28 100644 --- a/Modelica/Math/Random.mo +++ b/Modelica/Math/Random.mo @@ -1013,7 +1013,7 @@ seed = Utilities.automaticLocalSeed(path);

    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 getInstanceName()). +where this function is called by the Modelica built-in operator getInstanceName()). Contrary to automaticGlobalSeed(), 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.

    See also

    -automaticGlobalSeed, hashString and getInstanceName. +automaticGlobalSeed, hashString and getInstanceName.

    ", revisions=" diff --git a/Modelica/Media/package.mo b/Modelica/Media/package.mo index c6ac41c801..33019da1f2 100644 --- a/Modelica/Media/package.mo +++ b/Modelica/Media/package.mo @@ -1798,8 +1798,8 @@ Index reduction leads to the equations:

    Note, that der(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 Section 12.7.2 -(Partial Derivatives of Functions) of the Modelica 3.4 specification. +see Section 12.7.2 +Partial Derivatives of Functions of the Modelica 3.6 specification.

    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 Modelica.Media User's guide, and -Section 4.7 (Balanced Models) of the Modelica 3.4 specification.

    +Section 4.7 Balanced Models of the Modelica 3.6 specification.

    ")); end BaseProperties; diff --git a/Modelica/StateGraph.mo b/Modelica/StateGraph.mo index f61c3fb09f..57b35237c8 100644 --- 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 Section 17 (State Machines) of the Modelica 3.4 specification. +are directly supported by the Modelica language itself, see Chapter 17 (State Machines) of the Modelica 3.6 specification.

    Parallel and Alternative Execution

    @@ -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 https://github.com/HansOlsson/Modelica_StateGraph2. 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 Section 17 (State Machines) of the Modelica 3.4 specification. +are available as built-in Modelica language elements, see Chapter 17 State Machines of the Modelica 3.6 specification.

    diff --git a/Modelica/package.mo b/Modelica/package.mo index 5d7d941ef7..640442f76c 100644 --- a/Modelica/package.mo +++ b/Modelica/package.mo @@ -2444,7 +2444,7 @@ Short Overview:

    that are directly usable (= number of public, non-partial, non-internal and non-obsolete classes). It is fully compliant -to Modelica Specification version 3.4 +to Modelica Specification version 3.6 and it has been tested with Modelica tools from different vendors.

    diff --git a/ModelicaReference/package.mo b/ModelicaReference/package.mo index f066dcd197..a3a2fd640f 100644 --- 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

    Neglecting zero flow conditions, the above implicit equations can be analytically solved for the inStream(..) operators. -The details are given in Section 15.2 (Stream Operator inStream and Connection Equations) of the Modelica 3.4 specification. +The details are given in Section 15.2 inStream and Connection Equations of the Modelica 3.6 specification. 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 increase and increase v until a limit, and then decrease it, and repeat.

    Description

    -A detailed description of the State Machines using Synchronous Language Elements is given in Chapter 17 (State Machines) of the Modelica 3.4 specification. +A detailed description of the State Machines using Synchronous Language Elements is given in Chapter 17 State Machines of the Modelica 3.6 specification. ")); end StateMachines; @@ -6789,9 +6789,9 @@ operators inside the components provide the \"ideal mixing\" equations:

    A detailed description of the stream keyword and the inStream operator is given -in Chapter 15 (Stream Connectors) -and Appendix D (Derivation of Stream Equations) -of the Modelica 3.4 specification. +in Chapter 15 Stream Connectors +and Appendix C Derivation of Stream Equations +of the Modelica 3.6 specification. An overview and a rational is provided in a slide set.

    @@ -6928,7 +6928,7 @@ In this example dc.xd and dc.ud 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., hold.

    Description

    -A detailed description of the Synchronous Language Elements is given in Chapter 16 (Synchronous Language Elements) of the Modelica 3.4 specification. +A detailed description of the Synchronous Language Elements is given in Chapter >16 Synchronous Language Elements of the Modelica 3.6 specification. ")); end Synchronous; diff --git a/ModelicaServices/package.mo b/ModelicaServices/package.mo index 59a4674db5..5ae8c8b748 100644 --- a/ModelicaServices/package.mo +++ b/ModelicaServices/package.mo @@ -283,7 +283,7 @@ These are:
  • Types.SolverMethod provides a string defining the integration method to solve differential equations in a clocked discretized continuous-time partition - (see Section 16.8.2 (Solver Methods) of the Modelica 3.4 specification).
    • + (see Section 16.8.2 Solver Methods of the Modelica 3.6 specification).

    From fec15ed6a1d7a6aaa881927b8c07e0929d2ffc47 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Mon, 23 Oct 2023 11:06:43 +0200 Subject: [PATCH 2/4] Fix bad  > Detected by html_documentation_checks. --- ModelicaReference/package.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModelicaReference/package.mo b/ModelicaReference/package.mo index a3a2fd640f..7ec8b293f2 100644 --- a/ModelicaReference/package.mo +++ b/ModelicaReference/package.mo @@ -6928,7 +6928,7 @@ In this example dc.xd and dc.ud 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., hold.

    Description

    -A detailed description of the Synchronous Language Elements is given in Chapter >16 Synchronous Language Elements of the Modelica 3.6 specification. +A detailed description of the Synchronous Language Elements is given in Chapter 16 Synchronous Language Elements of the Modelica 3.6 specification. ")); end Synchronous; From 04386fc2b5134e2c7be9ac3200993c24bf522a33 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Wed, 15 Nov 2023 08:38:50 +0100 Subject: [PATCH 3/4] Skip main entry when linking to getInstanceName in specification --- Modelica/Blocks/Noise.mo | 2 +- Modelica/Math/Random.mo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modelica/Blocks/Noise.mo b/Modelica/Blocks/Noise.mo index 2627222f16..851fa1d3f2 100644 --- 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).
    If useAutomaticLocalSeed = true, 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 getInstanceName(). + inquired with the Modelica built-in operator getInstanceName(). Note, this means that the noise changes if the component is renamed.
    If useAutomaticLocalSeed = false, the local seed is defined explicitly by parameter fixedLocalSeed. It is then guaranteed that the generated noise diff --git a/Modelica/Math/Random.mo b/Modelica/Math/Random.mo index 7bdd14bc28..966b85ec37 100644 --- a/Modelica/Math/Random.mo +++ b/Modelica/Math/Random.mo @@ -1013,7 +1013,7 @@ seed = Utilities.automaticLocalSeed(path);

    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 getInstanceName()). +where this function is called by the Modelica built-in operator getInstanceName()). Contrary to automaticGlobalSeed(), 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.

    See also

    -automaticGlobalSeed, hashString and getInstanceName. +automaticGlobalSeed, hashString and getInstanceName.

    ", revisions="
    From 2128d8ac7331ea8c8ea9dfe777b2c25a286ebefd Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Tue, 9 Jan 2024 14:54:12 +0100 Subject: [PATCH 4/4] Re-trigger CI checks