Skip to content

Commit 6eeb87f

Browse files
authored
Merge pull request #3687 from henrikt-ma/cleanup/remaining-linebreaks
Change remaining files to sentence-based line breaks
2 parents 4937296 + 221e689 commit 6eeb87f

20 files changed

+434
-609
lines changed

chapters/annotations.tex

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,9 @@ \subsubsection{Variable Replacements}\label{variable-replacements}
401401
This is similar to the \lstinline!Text! graphical primitive in \cref{text}.
402402

403403
\begin{table}[H]
404-
\caption{Attributes that can use variable replacements.}
404+
\caption{
405+
Attributes that can use variable replacements.
406+
}
405407
\label{attributes-with-variable-replacements}
406408
\begin{center}
407409
\begin{tabular}{l l}
@@ -930,10 +932,11 @@ \subsubsection{Graphical Properties}\label{graphical-properties}
930932
\begin{center}
931933
\includegraphics{bezierpoints}
932934
\end{center}
933-
\caption{%
935+
\caption{
934936
Line with \lstinline!smooth = Bezier!.
935937
The four line points $P_{1}$, \ldots{}, $P_{4}$ result in two quadratic splines and two straight line segments.
936-
}\label{fig:smooth-bezier}
938+
}
939+
\label{fig:smooth-bezier}
937940
\end{figure}
938941

939942
The \lstinline!smooth! attribute specifies that a line can be drawn as straight line segments (\lstinline!None!) or using a spline (\lstinline!Bezier!), where the line's points specify control points of a quadratic Bezier curve, see \cref{fig:smooth-bezier}.
@@ -1361,8 +1364,7 @@ \subsubsection{Mouse Input}\label{mouse-input}
13611364
\end{lstlisting}
13621365

13631366
\begin{example}
1364-
A button can be represented by a rectangle changing color depending on a \lstinline!Boolean! variable \lstinline!on! and toggles the
1365-
variable when the rectangle is clicked on:
1367+
A button can be represented by a rectangle changing color depending on a \lstinline!Boolean! variable \lstinline!on! and toggles the variable when the rectangle is clicked on:
13661368
\begin{lstlisting}[language=modelica]
13671369
annotation(Icon(
13681370
graphics = {
@@ -1732,8 +1734,7 @@ \subsection{Connector Sizing}\label{connector-sizing}\annotationindex{connectorS
17321734
If \lstinline!connectorSizing = true!, the corresponding variable must be declared with the \lstinline!parameter! prefix, must be a subtype of a scalar \lstinline!Integer! and must have a literal default value of zero.
17331735

17341736
\begin{nonnormative}
1735-
The reason why \lstinline!connectorSizing! must be given a literal value is that if the value is an expression,
1736-
the \lstinline!connectorSizing! functionality is conditional and this will then lead easily to wrong models.
1737+
The reason why \lstinline!connectorSizing! must be given a literal value is that if the value is an expression, the \lstinline!connectorSizing! functionality is conditional and this will then lead easily to wrong models.
17371738

17381739
The default value of the variable must be zero since this annotation is designed for a parameter that is used as vector dimension, and the dimension of the vector should be zero when the component is dragged or redeclared.
17391740
Furthermore, when a tool does not support the \lstinline!connectorSizing! annotation, dragging will still result in a correct model.
@@ -1963,8 +1964,7 @@ \subsubsection{Conversion Rules}\label{conversion-rules}
19631964
convertClass("Modelica.SIunits", "Modelica.Units.SI");
19641965
convertClass("Modelica.SIunits.Icons", "Modelica.Units.Icons");
19651966
\end{lstlisting}
1966-
This ensures that for example \lstinline!Modelica.SIunits.Length! is converted to \lstinline!Modelica.Units.SI.Length!
1967-
and \lstinline!Modelica.SIunits.Icons! is converted to \lstinline!Modelica.Units.Icons!.
1967+
This ensures that for example \lstinline!Modelica.SIunits.Length! is converted to \lstinline!Modelica.Units.SI.Length! and \lstinline!Modelica.SIunits.Icons! is converted to \lstinline!Modelica.Units.Icons!.
19681968
\end{example}
19691969

19701970
\paragraph*{convertClassIf("OldClass", "oldElement", "whenValue", "NewClass")}\label{convertclassifoldclass-oldelement-whenvalue-newclass}\annotationindex{convertClassIf}
@@ -2205,8 +2205,7 @@ \subsection{Version Date and Build Information}\label{version-date-and-build-inf
22052205
The meanings of these annotations are:
22062206
\begin{itemize}
22072207
\item
2208-
\lstinline!version! is the version number of the released library,
2209-
see \cref{version-handling}.
2208+
\lstinline!version! is the version number of the released library, see \cref{version-handling}.
22102209
\item
22112210
\lstinline!versionDate! is the date in UTC format (according to ISO 8601) when the library was released.
22122211
This string is updated by the library author to correspond with the version number.

chapters/arrays.tex

Lines changed: 157 additions & 124 deletions
Large diffs are not rendered by default.

chapters/classes.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,7 @@ \subsection{Variability of Structured Entities}\label{variability-of-structured-
642642
\section{Class Declarations}\label{class-declarations}
643643

644644
Essentially everything in Modelica is a \firstuse{class}, from the predefined classes \lstinline!Integer! and \lstinline!Real!, to large packages such as the Modelica standard library.
645-
The description consists of a class definition, a modification environment that modifies the class definition, an optional list of dimension expressions if the class is an array class, and a lexically
646-
enclosing class for all classes.
645+
The description consists of a class definition, a modification environment that modifies the class definition, an optional list of dimension expressions if the class is an array class, and a lexically enclosing class for all classes.
647646

648647
The object generated by a class is called an \firstuse{instance}.
649648
An instance contains zero or more components (i.e., instances), equations, algorithms, and local classes.

chapters/connectors.tex

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ \subsection{Inside and Outside Connectors}\label{inside-and-outside-connectors}
7777
\begin{center}
7878
\includegraphics{innerouterconnector}
7979
\end{center}
80-
\caption{Example for inside and outside connectors.}
80+
\caption{
81+
Example for inside and outside connectors.
82+
}
8183
\end{figure}
8284
The figure visualizes the following \lstinline!connect!-equations to the connector \lstinline!c! in the models \lstinline!m!$i$.
8385
Consider the following \lstinline!connect!-equations found in the model for component \lstinline!m0!:
@@ -426,8 +428,7 @@ \section{Generation of Connection Equations}\label{generation-of-connection-equa
426428

427429
The bold-face $\mathbf{0}$ represents an array or scalar zero of appropriate dimensions (i.e., the same size as $z$).
428430

429-
For an \lstinline!operator record! type this uses the operator \lstinline!'0'! -- which must be defined in the operator record -- and all of the flow variables for the \lstinline!operator record!
430-
must be of the same \lstinline!operator record! type.
431+
For an \lstinline!operator record! type this uses the operator \lstinline!'0'! -- which must be defined in the operator record -- and all of the flow variables for the \lstinline!operator record! must be of the same \lstinline!operator record! type.
431432
This implies that in order to have flow variables of an \lstinline!operator record! type the \lstinline!operator record! must define addition, negation, and \lstinline!'0'!; and these operations should define an additive group.
432433

433434
In order to generate equations for flow variables (using the \lstinline!flow!\indexinline{flow} prefix), the sign used for the connector variable $z_{i}$ above is +1 for inside connectors and -1 for outside connectors ($z_{3}$ in the example above).
@@ -974,8 +975,8 @@ \subsection{Examples}\label{examples-of-overconstrained-connectors}
974975
\begin{center}
975976
\includegraphics{overdetermined}
976977
\end{center}
977-
\caption{%
978-
Example of a virtual connection graph.
978+
\caption{
979+
Example of a virtual connection graph.
979980
}
980981
\end{figure}
981982
\end{example}

chapters/derivationofstream.tex

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ \section{Mixing Enthalpy}\label{reasons-for-avoiding-the-actual-mixing-enthalpy-
3939
\begin{center}
4040
\includegraphics{fluidmix}
4141
\end{center}
42-
\caption{Exemplary connection set with three connected components and a common mixing enthalpy.}
42+
\caption{
43+
Exemplary connection set with three connected components and a common mixing enthalpy.
44+
}
4345
\end{figure}
4446

4547
\section{Rationale for inStream}\label{rationale-for-the-formulation-of-the-instream-operator}\label{rationale-for-instream}
@@ -128,7 +130,9 @@ \section{Rationale for inStream}\label{rationale-for-the-formulation-of-the-inst
128130
\begin{center}
129131
\includegraphics{fluidmix3}
130132
\end{center}
131-
\caption{Exemplary connection set with three connected components.}
133+
\caption{
134+
Exemplary connection set with three connected components.
135+
}
132136
\end{figure}
133137

134138
In the general case of a connection set with \emph{n} components, similar considerations lead to the following.
@@ -174,7 +178,9 @@ \subsection{Zero Mass Flow Rate -- Connection of 3 Stream Connectors}\label{conn
174178
\begin{center}
175179
\includegraphics{fluidmix4}
176180
\end{center}
177-
\caption{Example series connection of multiple models with stream connectors.}
181+
\caption{
182+
Example series connection of multiple models with stream connectors.
183+
}
178184
\end{figure}
179185

180186
For the two components with finite mass flow rates (not the sensor), the properties discussed for two connected components still hold.

chapters/equations.tex

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,7 @@ \subsection{reinit}\label{reinit}
449449
If there are multiple \lstinline!reinit! for a variable inside the same \lstinline!when!- or \lstinline!elsewhen!-clause, they must appear in different branches of an \lstinline!if!-equation (in order that at most one \lstinline!reinit! for the variable is active at any event).
450450
In case of \lstinline!reinit! active during initialization (due to \lstinline!when initial()!), see \cref{initialization-initial-equation-and-initial-algorithm}.
451451

452-
\lstinline!reinit! does not break the single assignment rule, because \lstinline!reinit(x, expr)! in equations evaluates \lstinline!expr! to a value,
453-
then at the end of the current event iteration step it assigns this value to \lstinline!x! (this copying from values to reinitialized state(s) is done after all other evaluations of the model and before copying \lstinline!x! to \lstinline!pre(x)!).
452+
\lstinline!reinit! does not break the single assignment rule, because \lstinline!reinit(x, expr)! in equations evaluates \lstinline!expr! to a value, then at the end of the current event iteration step it assigns this value to \lstinline!x! (this copying from values to reinitialized state(s) is done after all other evaluations of the model and before copying \lstinline!x! to \lstinline!pre(x)!).
454453

455454
\begin{example}
456455
If a higher index system is present, i.e., constraints between state variables, some state variables need to be redefined to non-state variables.
@@ -558,12 +557,10 @@ \section{Synchronous Data-Flow Principle and Single Assignment Rule}\label{synch
558557
Modelica is based on the synchronous data flow principle and the single assignment rule, which are defined in the following way:
559558
\begin{enumerate}
560559
\item Discrete-time variables keep their values until these variables are explicitly changed.
561-
Differentiated variables have \lstinline!der(x)! corresponding to the time-derivative of \lstinline!x!,
562-
and \lstinline!x! is continuous, except when \lstinline!reinit! is triggered, see \cref{reinit}.
560+
Differentiated variables have \lstinline!der(x)! corresponding to the time-derivative of \lstinline!x!, and \lstinline!x! is continuous, except when \lstinline!reinit! is triggered, see \cref{reinit}.
563561
Variable values can be accessed at any time instant during continuous integration and at event instants.
564562

565-
\item At every time instant, during continuous integration and at event instants,
566-
the equations express relations between variables which have to be fulfilled concurrently.
563+
\item At every time instant, during continuous integration and at event instants, the equations express relations between variables which have to be fulfilled concurrently.
567564

568565
\item Computation and communication at an event instant does not take time.
569566
\begin{nonnormative}
@@ -728,8 +725,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali
728725
\begin{nonnormative}
729726
If a \lstinline!when!-clause equation \lstinline!v = expr;! is not active during the initialization phase, the equation \lstinline!v = pre(v)! is added for initialization.
730727
This follows from the mapping rule of \lstinline!when!-clause equations.
731-
If the condition of the \lstinline!when!-clause contains \lstinline!initial()!,
732-
but not in one of the specific forms, the \lstinline!when!-clause is not active during initialization: \lstinline!when not initial() then print("simulation started"); end when;!
728+
If the condition of the \lstinline!when!-clause contains \lstinline!initial()!, but not in one of the specific forms, the \lstinline!when!-clause is not active during initialization: \lstinline!when not initial() then print("simulation started"); end when;!
733729
\end{nonnormative}
734730

735731
The algorithmic statements within a \lstinline!when!-statement are active during initialization, if and only if they are explicitly enabled with \lstinline!initial()!, and only in one of the two forms \lstinline!when initial() then! or \lstinline!when {$\ldots$, initial(), $\ldots$} then!.
@@ -738,8 +734,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali
738734
An active \lstinline!when!-clause inactivates the following \lstinline!elsewhen! (similarly as for \lstinline!when!-clauses during simulation), but apart from that the first \lstinline!elsewhen initial() then! or \lstinline!elsewhen {$\ldots$, initial(), $\ldots$} then! is similarly active during initialization as \lstinline!when initial() then! or \lstinline!when {$\ldots$, initial(), $\ldots$} then!.
739735

740736
\begin{nonnormative}
741-
That means that any subsequent \lstinline!elsewhen initial()! has no effect,
742-
similarly as \lstinline!when false then!.
737+
That means that any subsequent \lstinline!elsewhen initial()! has no effect, similarly as \lstinline!when false then!.
743738
\end{nonnormative}
744739

745740
\begin{nonnormative}
@@ -755,8 +750,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali
755750
\item
756751
For a continuous-time \lstinline!Real! variable \lstinline!vc!, the equation \lstinline!pre(vc) = vc! is added to the initialization equations.
757752
\begin{nonnormative}
758-
If \lstinline!pre(vc)! is not present in the flattened model, a tool may choose not to introduce this equation, or if it was introduced
759-
it can eliminate it (to avoid the introduction of many dummy variables \lstinline!pre(vc)!).
753+
If \lstinline!pre(vc)! is not present in the flattened model, a tool may choose not to introduce this equation, or if it was introduced it can eliminate it (to avoid the introduction of many dummy variables \lstinline!pre(vc)!).
760754
\end{nonnormative}
761755
\item
762756
Implicitly by using the \lstinline!start!-attribute for variables with \lstinline!fixed = true!.

0 commit comments

Comments
 (0)