Skip to content

Commit

Permalink
Merge pull request modelica#3587 from HansOlsson/FixEventRef
Browse files Browse the repository at this point in the history
Fix Labels in HTML-code
  • Loading branch information
HansOlsson authored Oct 24, 2024
2 parents 3e4e5bd + 71b3f4c commit b4e921e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion chapters/dae.tex
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ \chapter{Modelica DAE Representation}\label{modelica-dae-representation}

As a result of this transformation process, a set of equations is obtained consisting of differential, algebraic and discrete equations of the following form where ($v := \lbrack p; t; \dot{x}; x; y; z; m; \text{\lstinline!pre!}(z); \text{\lstinline!pre!}(m)\rbrack$):
\begin{subequations}
\label{eq:hydrid-dae}
\begin{equation}\label{eq:dae}
0 = f_{\mathrm{x}}(v, c)
\end{equation}
Expand All @@ -32,7 +33,6 @@ \chapter{Modelica DAE Representation}\label{modelica-dae-representation}
\begin{equation}\label{eq:crossing}
c := f_{\mathrm{c}}(\mathit{relation}(v))
\end{equation}
\label{eq:hydrid-dae}
\end{subequations}
and where
\begin{itemize}
Expand Down
4 changes: 2 additions & 2 deletions chapters/derivationofstream.tex
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ \section{Rationale for inStream}\label{rationale-for-the-formulation-of-the-inst
The energy and mass balance equations for the connection set for 3
components are (see above):
\begin{subequations}
\label{eq:D1}
\begin{equation}
\begin{split}
0=&\tilde{m}_1\cdot
Expand All @@ -80,12 +81,12 @@ \section{Rationale for inStream}\label{rationale-for-the-formulation-of-the-inst
0=\tilde{m}_1+\tilde{m}_2+\tilde{m}_3
\label{eq:D1b}
\end{equation}
\label{eq:D1}
\end{subequations}

The balance equations are implemented using a $\operatorname{max}$ operator in place of
the piecewise expressions, taking care of the different flow directions:
\begin{subequations}
\label{eq:D2}
\begin{equation}
\begin{split}
0=&\operatorname{max}(\tilde{m}_1,0)h_{\mathrm{mix}}-\operatorname{max}(-\tilde{m}_1,0)h_{\mathrm{outflow},1}\\
Expand All @@ -103,7 +104,6 @@ \section{Rationale for inStream}\label{rationale-for-the-formulation-of-the-inst
\end{split}
\label{eq:D2b}
\end{equation}
\label{eq:D2}
\end{subequations}

Equation \eqref{eq:D2a} is solved for $h_{\mathrm{mix}}$
Expand Down

0 comments on commit b4e921e

Please sign in to comment.