Skip to content

Commit

Permalink
Get rid of \doublelabel in favor of plain \label
Browse files Browse the repository at this point in the history
As it has turned out that \doublelabel shouldn't do anything different than \label, it seems better to just stick with the standard command.
  • Loading branch information
henrikt-ma committed Jul 7, 2020
1 parent ba53f6a commit d4bc17b
Show file tree
Hide file tree
Showing 28 changed files with 463 additions and 465 deletions.
90 changes: 45 additions & 45 deletions chapters/annotations.tex

Large diffs are not rendered by default.

72 changes: 36 additions & 36 deletions chapters/arrays.tex

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions chapters/classes.tex

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions chapters/connectors.tex
@@ -1,11 +1,11 @@
\chapter{Connectors and Connections}\doublelabel{connectors-and-connections}
\chapter{Connectors and Connections}\label{connectors-and-connections}

This chapter covers connectors, connect-equations, and connections.

The special functions \lstinline!cardinality!, \lstinline!rooted! (deprecated),
\lstinline!Connections.isRoot!, and \lstinline!Connections.rooted! may not be used to control them.

\section{Connect-Equations and Connectors}\doublelabel{connect-equations-and-connectors}
\section{Connect-Equations and Connectors}\label{connect-equations-and-connectors}

Connections between objects are introduced by connect-equations in the
equation part of a class. A connect-equation has the following syntax:
Expand Down Expand Up @@ -68,13 +68,13 @@ \section{Connect-Equations and Connectors}\doublelabel{connect-equations-and-con
Generate equations for the complete model.
\end{itemize}

\subsection{Connection Sets}\doublelabel{connection-sets}
\subsection{Connection Sets}\label{connection-sets}

A connection set is a set of variables connected by means of
connect-equations. A connection set shall contain either only flow
variables or only non-flow variables.

\subsection{Inside and Outside Connectors}\doublelabel{inside-and-outside-connectors}
\subsection{Inside and Outside Connectors}\label{inside-and-outside-connectors}

In an element instance M, each connector element of M is called an
outside connector with respect to M. All other connector elements that
Expand Down Expand Up @@ -109,7 +109,7 @@ \subsection{Inside and Outside Connectors}\doublelabel{inside-and-outside-connec
\end{lstlisting}
\end{example}

\subsection{Expandable Connectors}\doublelabel{expandable-connectors}
\subsection{Expandable Connectors}\label{expandable-connectors}

If the \lstinline!expandable! qualifier is present on a connector definition, all
instances of that connector are referred to as expandable connectors.
Expand Down Expand Up @@ -361,7 +361,7 @@ \subsection{Expandable Connectors}\doublelabel{expandable-connectors}
\end{lstlisting}
\end{example}

\section{Generation of Connection Equations}\doublelabel{generation-of-connection-equations}
\section{Generation of Connection Equations}\label{generation-of-connection-equations}

When generating connection equations, \lstinline!outer! elements are resolved to the
corresponding \lstinline!inner! elements in the instance hierarchy (see instance
Expand Down Expand Up @@ -566,7 +566,7 @@ \section{Generation of Connection Equations}\doublelabel{generation-of-connectio
This corresponds to a direct connection of the resistor.
\end{example}

\section{Restrictions of Connections and Connectors}\doublelabel{restrictions-of-connections-and-connectors}
\section{Restrictions of Connections and Connectors}\label{restrictions-of-connections-and-connectors}

\begin{itemize}
\item
Expand Down Expand Up @@ -650,7 +650,7 @@ \section{Restrictions of Connections and Connectors}\doublelabel{restrictions-of
For conditional connectors, see \cref{conditional-component-declaration}.
\end{itemize}

\subsection{Balancing Restriction and Size of Connectors}\doublelabel{balancing-restriction-and-size-of-connectors}
\subsection{Balancing Restriction and Size of Connectors}\label{balancing-restriction-and-size-of-connectors}

For each non-partial non-expandable connector class the number of flow variables shall
be equal to the number of variables that are neither \lstinline!parameter!,
Expand Down Expand Up @@ -757,7 +757,7 @@ \subsection{Balancing Restriction and Size of Connectors}\doublelabel{balancing-
\end{lstlisting}
\end{example}

\section{Equation Operators for Overconstrained Connection-Based Equation Systems}\doublelabel{equation-operators-for-overconstrained-connection-based-equation-systems1}
\section{Equation Operators for Overconstrained Connection-Based Equation Systems}\label{equation-operators-for-overconstrained-connection-based-equation-systems1}

There is a special problem regarding equation systems resulting from
\emph{loops} in connection graphs where the connectors contain
Expand Down Expand Up @@ -804,7 +804,7 @@ \section{Equation Operators for Overconstrained Connection-Based Equation System
flow variables, that are not handled by the method described below.
\end{nonnormative}

\subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabel{overconstrained-equation-operators-for-connection-graphs}
\subsection{Overconstrained Equation Operators for Connection Graphs}\label{overconstrained-equation-operators-for-connection-graphs}

A type or record declaration may have an optional definition of function
\lstinline!equalityConstraint! that shall have the following prototype:
Expand Down Expand Up @@ -949,7 +949,7 @@ \subsection{Overconstrained Equation Operators for Connection Graphs}\doublelabe
\end{nonnormative}


\subsection{Converting the Connection Graph into Trees and Generating Connection Equations}\doublelabel{converting-the-connection-graph-into-trees-and-generating-connection-equations}
\subsection{Converting the Connection Graph into Trees and Generating Connection Equations}\label{converting-the-connection-graph-into-trees-and-generating-connection-equations}

Before \lstinline!connect! equations are generated, the virtual connection
graph is transformed into a set of spanning trees by removing optional spanning tree edges
Expand Down Expand Up @@ -988,7 +988,7 @@ \subsection{Converting the Connection Graph into Trees and Generating Connection
of \lstinline!A.R = B.R!.
\end{enumerate}

\subsection{Examples of Overconstrained Connection Graphs}\doublelabel{examples-of-overconstrained-connection-graphs}
\subsection{Examples of Overconstrained Connection Graphs}\label{examples-of-overconstrained-connection-graphs}

\begin{example}
\begin{figure}[H]
Expand All @@ -998,7 +998,7 @@ \subsection{Examples of Overconstrained Connection Graphs}\doublelabel{examples-
\end{figure}
\end{example}

\subsubsection{An Overdetermined Connector for Power Systems}\doublelabel{an-overdetermined-connector-for-power-systems}
\subsubsection{An Overdetermined Connector for Power Systems}\label{an-overdetermined-connector-for-power-systems}

\begin{nonnormative}
An overdetermined connector for power systems based on the
Expand Down Expand Up @@ -1062,7 +1062,7 @@ \subsubsection{An Overdetermined Connector for Power Systems}\doublelabel{an-ove
passed between components, in order to avoid redundant equations.
\end{nonnormative}

\subsubsection{An Overdetermined Connector for 3-dimensional Mechanical Systems}\doublelabel{an-overdetermined-connector-for-3-dimensional-mechanical-systems}
\subsubsection{An Overdetermined Connector for 3-dimensional Mechanical Systems}\label{an-overdetermined-connector-for-3-dimensional-mechanical-systems}

\begin{nonnormative}
An overdetermined connector for 3-dimensional mechanical systems
Expand Down
2 changes: 1 addition & 1 deletion chapters/dae.tex
@@ -1,4 +1,4 @@
\chapter{Modelica DAE Representation}\doublelabel{modelica-dae-representation}
\chapter{Modelica DAE Representation}\label{modelica-dae-representation}

In this appendix, the mapping of a Modelica model into an appropriate
mathematical description form is discussed.
Expand Down
16 changes: 8 additions & 8 deletions chapters/derivationofstream.tex
@@ -1,9 +1,9 @@
\chapter{Derivation of Stream Equations}\doublelabel{derivation-of-stream-equations}
\chapter{Derivation of Stream Equations}\label{derivation-of-stream-equations}

This appendix contains a derivation of the equation for stream
connectors from \cref{stream-connectors}.

\section{Reasons for avoiding the actual mixing enthalpy in connector definitions}\doublelabel{reasons-for-avoiding-the-actual-mixing-enthalpy-in-connector-definitions}
\section{Reasons for avoiding the actual mixing enthalpy in connector definitions}\label{reasons-for-avoiding-the-actual-mixing-enthalpy-in-connector-definitions}

Consider a connection set with \emph{n} connectors. The mixing enthalpy
is defined by the mass balance
Expand Down Expand Up @@ -47,7 +47,7 @@ \section{Reasons for avoiding the actual mixing enthalpy in connector definition
\end{center}
\end{figure}

\section{Rationale for the formulation of inStream}\doublelabel{rationale-for-the-formulation-of-the-instream-operator}
\section{Rationale for the formulation of inStream}\label{rationale-for-the-formulation-of-the-instream-operator}

For simplicity, the derivation of \lstinline!inStream! is shown at hand of 3 model components that are connected together.
The case for $N$ connections follows correspondingly.
Expand Down Expand Up @@ -149,12 +149,12 @@ \section{Rationale for the formulation of inStream}\doublelabel{rationale-for-th
\text{\lstinline!inStream!}(h_{outflow,i})=\frac{\sum_{j=1,...,n;j\neq i}\text{max}(-\dot{m}_j,0)h_{outflow,j}}{\sum_{j=1,...,n;j\neq i}\text{max}(-\dot{m}_j,0)}
\end{equation*}

\section{Special cases covered by inStream definition}\doublelabel{special-cases-covered-by-the-instream-operator-definition}
\subsection{Stream connector is not connected (N = 1)}\doublelabel{stream-connector-is-not-connected-n-1}
\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}
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)}\doublelabel{connection-of-2-stream-connectors-one-to-one-connections-n-2}
\subsection{Connection of 2 stream connectors, one to one connections (N = 2)}\label{connection-of-2-stream-connectors-one-to-one-connections-n-2}

\begin{align*}
\text{\lstinline!inStream!}(h_{outflow,1}) &= \frac{\text{max}(-\dot{m}_2,0)h_{outflow,2}}{\text{max}(-\dot{m}_2,0)}=h_{outflow,2}\\
Expand All @@ -167,7 +167,7 @@ \subsection{Connection of 2 stream connectors, one to one connections (N = 2)}\d
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}\doublelabel{connection-of-3-stream-connectors-where-one-mass-flow-rate-is-identical-to-zero-n-3-and}
\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}
The case where N=3 and $\dot{m}_3=0$ occurs when a one-port sensor (like a temperature sensor) is
connected to two connected components. For the sensor, the min attribute
of the mass flow rate should be set to zero (no fluid exiting the
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)}\doublelabel{connection-of-3-stream-connectors-where-two-mass-flow-rates-are-positive-ideal-splitting-junction-for-uni-directional-flow}
\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}

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

0 comments on commit d4bc17b

Please sign in to comment.