Skip to content

Commit

Permalink
AsProposed
Browse files Browse the repository at this point in the history
  • Loading branch information
HansOlsson committed Jan 4, 2022
1 parent 799849a commit b8a68cb
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions chapters/derivationofstream.tex
Expand Up @@ -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}\\
Expand All @@ -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).
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions chapters/functions.tex
Expand Up @@ -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.
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions chapters/packages.tex
Expand Up @@ -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}
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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}.
Expand Down
2 changes: 1 addition & 1 deletion chapters/statemachines.tex
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions chapters/statements.tex
Expand Up @@ -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
Expand All @@ -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:
Expand Down

0 comments on commit b8a68cb

Please sign in to comment.