From b8a68cb918f6f61d8bea1be58dc1cd2910fc6b18 Mon Sep 17 00:00:00 2001 From: OLSSON Hans Date: Tue, 4 Jan 2022 15:53:42 +0100 Subject: [PATCH] AsProposed --- chapters/derivationofstream.tex | 8 ++++---- chapters/functions.tex | 6 +++--- chapters/packages.tex | 6 +++--- chapters/statemachines.tex | 2 +- chapters/statements.tex | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/chapters/derivationofstream.tex b/chapters/derivationofstream.tex index 7fd0fe87a..9a19f06e3 100644 --- a/chapters/derivationofstream.tex +++ b/chapters/derivationofstream.tex @@ -152,12 +152,12 @@ \section{Rationale for the formulation of inStream}\label{rationale-for-the-form \section{Special cases covered by inStream definition}\label{special-cases-covered-by-the-instream-operator-definition} -\subsection{Stream connector is not connected (N = 1)}\label{stream-connector-is-not-connected-n-1} +\subsection{Unconnected stream connector - 1 stream connector}\label{stream-connector-is-not-connected-n-1}\label{unconnected-stream-connector-1-stream-connector} For this case, the return value of \lstinline!inStream! is arbitrary. Therefore, it is set to the outflow value. -\subsection{Connection of 2 stream connectors, one to one connections (N = 2)}\label{connection-of-2-stream-connectors-one-to-one-connections-n-2} +\subsection{One to one connections - Connection of 2 stream connectors}\label{connection-of-2-stream-connectors-one-to-one-connections-n-2}\label{one-to-one-connections-connection-of-2-stream-connectors} \begin{align*} \text{\lstinline!inStream!}(h_{\mathrm{outflow},1}) &= \frac{\operatorname{max}(-\tilde{m}_2,0)h_{\mathrm{outflow},2}}{\operatorname{max}(-\tilde{m}_2,0)}=h_{\mathrm{outflow},2}\\ @@ -170,7 +170,7 @@ \subsection{Connection of 2 stream connectors, one to one connections (N = 2)}\l simplifications of the form $a * b / a = b$ must be provided, or that this case is treated directly. -\subsection{Connection of 3 stream connectors where one mass flow rate is identical to zero}\label{connection-of-3-stream-connectors-where-one-mass-flow-rate-is-identical-to-zero-n-3-and} +\subsection{Zero mass flow rate - Connection of 3 stream connectors}\label{connection-of-3-stream-connectors-where-one-mass-flow-rate-is-identical-to-zero-n-3-and}\label{zero-mass-flow-rate-connection-of-3-stream-connectors} The case where $N=3$ and $\tilde{m}_3=0$ occurs when a one-port sensor (like a temperature sensor) is connected to two connected components. For the sensor, the \lstinline!min! attribute of the mass flow rate should be set to zero (no fluid exiting the component via this connector). @@ -206,7 +206,7 @@ \subsection{Connection of 3 stream connectors where one mass flow rate is identi part of an algebraic loop. Otherwise, it is advisable to regularize or filter the sensor signal. -\subsection{Connection of 3 stream connectors where two mass flow rates are positive (ideal splitting junction for uni-directional flow)}\label{connection-of-3-stream-connectors-where-two-mass-flow-rates-are-positive-ideal-splitting-junction-for-uni-directional-flow} +\subsection{Ideal splitting junction for uni-directional flow - Connection of 3 stream connectors where two mass flow rates are positive}\label{connection-of-3-stream-connectors-where-two-mass-flow-rates-are-positive-ideal-splitting-junction-for-uni-directional-flow}\label{ideal-splitting-junction-for-uni-directional-flow-connection-of-3-stream-connectors-where-two-mass-flow-rates-are-positive} If uni-directional flow is present and an ideal splitter is modelled, the required flow direction should be defined in the connector instance diff --git a/chapters/functions.tex b/chapters/functions.tex index f65e48798..e7144e4a5 100644 --- a/chapters/functions.tex +++ b/chapters/functions.tex @@ -822,7 +822,7 @@ \subsection{Flexible Array Sizes and Resizing of Arrays in Functions}\label{flex \end{lstlisting} \end{example} -\subsection{Scalar Functions Applied to Array Arguments}\label{scalar-functions-applied-to-array-arguments} +\subsection{Automatic Vectorization - Scalar Functions Applied to Array Arguments}\label{scalar-functions-applied-to-array-arguments}\label{automatic-vectorization-scalar-functions-applied-to-array-arguments} Functions with one scalar return value can be applied to arrays element-wise, e.g.\ if \lstinline!A! is a vector of reals, then \lstinline!sin(A)! is a vector where each element is the result of applying the function \lstinline!sin! to the corresponding element in \lstinline!A!. Only \lstinline!function! classes that are transitively non-replaceable (\cref{transitively-non-replaceable} and \cref{restrictions-on-base-classes-and-constraining-types-to-be-transitively-non-replaceable}) may be called vectorized. @@ -2643,7 +2643,7 @@ \subsection{Utility Functions}\label{utility-functions} This section describes the utility functions declared in \filename{ModelicaUtilities.h}, which can be called in external Modelica functions written in C. -\subsubsection{Utility Functions for Reporting Errors}\label{utility-functions-for-reporting-errors} +\subsubsection{Error Reporting Utility Functions}\label{utility-functions-for-reporting-errors}\label{error-reporting-utility-functions} The functions listed below produce a message in different ways. \begin{center} @@ -2715,7 +2715,7 @@ \subsubsection{Utility Functions for Reporting Errors}\label{utility-functions-f \end{semantics} \end{functiondefinition*} -\subsubsection{Utility Functions for Allocating Strings}\label{utility-functions-for-allocating-strings} +\subsubsection{String Allocation Utility Functions}\label{utility-functions-for-allocating-strings}\label{string-allocation-utility-functions} The functions listed below are related to string allocation. \begin{center} diff --git a/chapters/packages.tex b/chapters/packages.tex index c402e602a..9b982223f 100644 --- a/chapters/packages.tex +++ b/chapters/packages.tex @@ -108,7 +108,7 @@ \subsection{Lookup of Imported Names}\label{lookup-of-imported-names} \end{lstlisting} \end{nonnormative} -\subsection{Summary of Rules for Import-Clauses}\label{summary-of-rules-for-import-clauses} +\subsection{Rules for Import-Clauses}\label{summary-of-rules-for-import-clauses}\label{rules-for-import-clauses} The following rules apply to \lstinline!import!-clauses: \begin{itemize} @@ -214,7 +214,7 @@ \section{Mapping Package/Class Structures to a Hierarchical File System}\label{m Tools may also store classes in data-base systems, but that is not standardized. \end{nonnormative} -\subsection{Mapping a Package/Class Hierarchy into a Directory Hierarchy (Structured Entity)}\label{mapping-a-package-class-hierarchy-into-a-directory-hierarchy-structured-entity} +\subsection{Directory Hierarchy Mapping of a Package/Class Hierarchy}\label{mapping-a-package-class-hierarchy-into-a-directory-hierarchy-structured-entity}\label{directory-hierarchy-mapping-of-a-package-Class-hierarchy} A directory shall contain a node, the file \filename{package.mo}. The node shall contain a \lstinline[language=grammar]!stored-definition! that defines a class \lstinline!A! with a name matching the name of the structured entity. @@ -247,7 +247,7 @@ \subsection{Mapping a Package/Class Hierarchy into a Directory Hierarchy (Struct \filename{package.mo} (this ensures that the relative order between classes and constants stored in different ways is preserved). -\subsection{Mapping a Package/Class Hierarchy into a Single File (Nonstructured Entity)}\label{mapping-a-package-class-hierarchy-into-a-single-file-nonstructured-entity} +\subsection{Single File Mapping of a Package/Class Hierarchy}\label{mapping-a-package-class-hierarchy-into-a-single-file-nonstructured-entity}\label{single-file-mapping-of-a-package-class-hierarchy} When mapping a package or class-hierarchy to a file (e.g.\ the file \filename{A.mo}), that file shall only define a single class \lstinline!A! with a name matching the name of the nonstructured entity. In a file hierarchy the files shall have the extension \filename{.mo}. diff --git a/chapters/statemachines.tex b/chapters/statemachines.tex index 13e5df3ec..46687f36c 100644 --- a/chapters/statemachines.tex +++ b/chapters/statemachines.tex @@ -421,7 +421,7 @@ \subsection{Merging Variable Definitions}\label{merging-variable-definitions} A new assignment equation is formed which might be merged on higher levels in nested state machines. -\subsection{Merging Connections to Multiple Outputs}\label{merging-connections-to-multiple-outputs} +\subsection{Merging Connections to Outputs}\label{merging-connections-to-multiple-outputs}\label{merging-connections-to-outputs} \begin{nonnormative} The causal connection semantics of Modelica for non-state machines are generalized to states of state machines, using the fact that only one state is active at a time. diff --git a/chapters/statements.tex b/chapters/statements.tex index 60fc65588..653b1b02d 100644 --- a/chapters/statements.tex +++ b/chapters/statements.tex @@ -392,7 +392,7 @@ \subsection{When-Statements}\label{when-statements} Merging the \lstinline!when!-statements can lead to less efficient code and different models with different behavior depending on the order of the assignment to \lstinline!y1! and \lstinline!y3! in the algorithm. \end{example} -\subsubsection{Restrictions on Where a When-statement may occur}\label{restrictions-on-where-a-when-statement-may-occur} +\subsubsection{Where a When-statement may occur}\label{restrictions-on-where-a-when-statement-may-occur}\label{where-a-when-statement-may-occur} \begin{itemize} \item @@ -416,7 +416,7 @@ \subsubsection{Restrictions on Where a When-statement may occur}\label{restricti \end{lstlisting} \end{example} -\subsubsection{Restrictions on Statements within When-Statements}\label{restrictions-on-statements-within-when-statements} +\subsubsection{Statements within When-Statements}\label{restrictions-on-statements-within-when-statements}\label{statements-within-when-statements} \begin{nonnormative} In contrast to \lstinline!when!-equations, \cref{restrictions-on-equations-within-when-equations}, there are no additional restrictions within \lstinline!when!-statements: