Skip to content

Commit

Permalink
[Backend] fix text of algebraic loops jacobian
Browse files Browse the repository at this point in the history
Belonging to [master]:
  - OpenModelica/OMCompiler#2582
  • Loading branch information
Willi Braun authored and OpenModelica-Hudson committed Aug 2, 2018
1 parent a9fc037 commit 8fd8d3e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Compiler/BackEnd/BackendDAEOptimize.mo
Expand Up @@ -5602,15 +5602,15 @@ 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;

case (BackendDAE.EQUATIONSYSTEM(vars=vlst, jacType=BackendDAE.JAC_NO_ANALYTIC())::rest, _) equation
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;

Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/BackendDAEUtil.mo
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions Compiler/BackEnd/Initialization.mo
Expand Up @@ -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.
Expand Down

0 comments on commit 8fd8d3e

Please sign in to comment.