From ca9f22e3d781e2a69dfd3db2fdcf8d577d18e7df Mon Sep 17 00:00:00 2001 From: Hans Olsson Date: Mon, 3 May 2021 14:32:40 +0200 Subject: [PATCH] Don't repeatedly explain that non-discrete time is continuous-time (#2923) * Don't explain that non-discrete time is continuous-time all the time since: * It isn't true! Non-discrete-time is continuous-time except discrete-time. * It causes bad line break in one case. Closes #2891 Co-authored-by: Henrik Tidefelt Co-authored-by: Henrik Tidefelt --- chapters/equations.tex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapters/equations.tex b/chapters/equations.tex index 73adc646e..7e531824d 100644 --- a/chapters/equations.tex +++ b/chapters/equations.tex @@ -761,7 +761,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali The equations and assignments in these initial sections are purely algebraic, stating constraints between the variables at the initial time instant. It is not allowed to use when-clauses in these sections. \item - For a non-discrete (that is continuous-time) \lstinline!Real! variable \lstinline!vc!, the equation \lstinline!pre(vc) = vc! is added to the initialization equations. + For a non-discrete-time \lstinline!Real! variable \lstinline!vc!, the equation \lstinline!pre(vc) = vc! is added to the initialization equations. \begin{nonnormative} 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)!). @@ -770,7 +770,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali Implicitly by using the \lstinline!start! attribute for variables with \lstinline!fixed = true!. With \lstinline!start! given by \lstinline!startExpression!: \begin{itemize} \item - For a non-discrete-time (that is continuous-time) \lstinline!Real! variable \lstinline!vc!, the equation \lstinline!vc = startExpression! is added to the initialization equations. + For a non-discrete-time \lstinline!Real! variable \lstinline!vc!, the equation \lstinline!vc = startExpression! is added to the initialization equations. \item For a discrete-time variable \lstinline!vd!, the equation \lstinline!pre(vd) = startExpression! is added to the initialization equations. \item @@ -803,7 +803,7 @@ \section{Initialization, initial equation, and initial algorithm}\label{initiali \begin{nonnormative} In the case a parameter has both a binding equation and \lstinline!fixed = false! a diagnostics is recommended, but the parameter should be solved from the binding equation. -Non-discrete (that is continuous-time) \lstinline!Real! variables \lstinline!vc! have exactly one initialization value since the rules above assure that during initialization +Non-discrete-time \lstinline!Real! variables \lstinline!vc! have exactly one initialization value since the rules above assure that during initialization \lstinline!vc = pre(vc) = vc.startExpression! (if \lstinline!fixed = true!). Before the start of the integration, it must be guaranteed that for all variables \lstinline!v!, \lstinline!v = pre(v)!. If this is not the case for some variables