From 8fd8d3e213496c1ad65458d15bf66fd4135fb95c Mon Sep 17 00:00:00 2001 From: Willi Braun Date: Thu, 2 Aug 2018 15:59:28 +0200 Subject: [PATCH] [Backend] fix text of algebraic loops jacobian Belonging to [master]: - OpenModelica/OMCompiler#2582 --- Compiler/BackEnd/BackendDAEOptimize.mo | 4 ++-- Compiler/BackEnd/BackendDAEUtil.mo | 4 ++-- Compiler/BackEnd/Initialization.mo | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo index c109ec8185..f4a1783ec6 100644 --- a/Compiler/BackEnd/BackendDAEOptimize.mo +++ b/Compiler/BackEnd/BackendDAEOptimize.mo @@ -5602,7 +5602,7 @@ algorithm varlst = List.map1r(vlst, BackendVariable.getVarAt, inVars); false = listEmpty(varlst); - warning = "Iteration variables of equation system w/o analytic Jacobian:\n" + warnAboutVars(varlst); + warning = "Iteration variables of equation system with analytic Jacobian:\n" + warnAboutVars(varlst); warningList = listAllIterationVariables2(rest, inVars); then warning::warningList; @@ -5610,7 +5610,7 @@ algorithm varlst = List.map1r(vlst, BackendVariable.getVarAt, inVars); false = listEmpty(varlst); - warning = "Iteration variables of equation system w/o analytic Jacobian:\n" + warnAboutVars(varlst); + warning = "Iteration variables of equation system without analytic Jacobian:\n" + warnAboutVars(varlst); warningList = listAllIterationVariables2(rest, inVars); then warning::warningList; diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo index f073b6d0d9..f0b104a901 100644 --- a/Compiler/BackEnd/BackendDAEUtil.mo +++ b/Compiler/BackEnd/BackendDAEUtil.mo @@ -9432,9 +9432,9 @@ algorithm case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_NONLINEAR()) then ("nonlinear equation system in the " + daeTypeStr + " DAE:", vlst); case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_GENERIC()) - then ("equation system w/o analytic Jacobian in the " + daeTypeStr + " DAE:", vlst); + then ("equation system with analytic Jacobian in the " + daeTypeStr + " DAE:", vlst); case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_NO_ANALYTIC()) - then ("equation system w/o analytic Jacobian in the " + daeTypeStr + " DAE:", vlst); + then ("equation system without analytic Jacobian in the " + daeTypeStr + " DAE:", vlst); case BackendDAE.TORNSYSTEM(BackendDAE.TEARINGSET(tearingvars = vlst), linear = false) then ("torn nonlinear equation system in the " + daeTypeStr + " DAE:", vlst); // If the component is none of these types, do nothing. diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo index c8d79d242b..8bbb54b401 100644 --- a/Compiler/BackEnd/Initialization.mo +++ b/Compiler/BackEnd/Initialization.mo @@ -705,9 +705,9 @@ algorithm case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_NONLINEAR()) then ("nonlinear equation system:\n", vlst); case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_GENERIC()) - then ("equation system w/o analytic Jacobian:\n", vlst); + then ("equation system with analytic Jacobian:\n", vlst); case BackendDAE.EQUATIONSYSTEM(vars = vlst, jacType = BackendDAE.JAC_NO_ANALYTIC()) - then ("equation system w/o analytic Jacobian:\n", vlst); + then ("equation system without analytic Jacobian:\n", vlst); case BackendDAE.TORNSYSTEM(BackendDAE.TEARINGSET(tearingvars = vlst), linear = false) then ("torn nonlinear equation system:\n", vlst); // If the component is none of these types, do nothing.