Skip to content

Commit

Permalink
Merge pull request modelica#3479 from HansOlsson/SolverAssociation
Browse files Browse the repository at this point in the history
Separate applying, associating, and inferencing for solverMethod.
  • Loading branch information
HansOlsson committed Feb 21, 2024
2 parents 6f16b55 + 2e7161f commit 260db96
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions chapters/synchronous.tex
Expand Up @@ -1170,7 +1170,7 @@ \subsection{Discrete-time and Discretized Sub-Partitions}\label{clocked-discrete

\subsection{Solver Methods}\label{solver-methods}

The integration method associated with a discretized sub-partition is defined with a string.
A sub-partition can have an integration method, directly associated (\cref{associating-a-solver-to-a-partition}) or inferred from other sub-partitions (\cref{inferencing-of-solvermethod}).
A predefined type \lstinline!ModelicaServices.Types.SolverMethod! defines the methods supported by the respective tool by using the \lstinline!choices! annotation.

\begin{nonnormative}
Expand Down Expand Up @@ -1227,7 +1227,7 @@ \subsection{Solver Methods}\label{solver-methods}
\item $y(t)$ is the continuous-time or discrete-time \lstinline!Real!/\lstinline!Integer!/\lstinline!Boolean!/\lstinline!String! vector of algebraic and/or output variables
\end{itemize}

A solver method is applied to a sub-partition.
A solver method is applied to a discretized sub-partition.
Such a partition has explicit inputs $u$ marked by \lstinline!sample($u$)!, \lstinline!subSample($u$)!, \lstinline!superSample($u$)!, \lstinline!shiftSample($u$)! and/or \lstinline!backSample($u$)!.
Furthermore, the outputs $y$ of such a partition are marked by \lstinline!hold($y$)!, \lstinline!subSample($y$)!, \lstinline!superSample($y$)!, \lstinline!shiftSample($y$)!, and/or \lstinline!backSample($y$)!.
The arguments of these operators are to be used as input signals $u$ and output signals $y$ in the conceptual ordinary differential equation above, and in the discretization formulae below, respectively.
Expand Down Expand Up @@ -1365,6 +1365,7 @@ \subsection{Inferencing of solverMethod}\label{inferencing-of-solvermethod}
\item Otherwise, the specified \lstinline!solverMethod! is used.
\end{itemize}
\item If the set does not contain continuous-time equations, there is no need for a \lstinline!solverMethod!.
However, inferencing between sub-partitions works the same regardless of whether there are continuous-time equations.
\end{itemize}

\begin{example}
Expand Down

0 comments on commit 260db96

Please sign in to comment.