Merge remote-tracking branch 'origin/master' into masterMW

Author: Marcus Walther

Compiler/BackEnd/BackendDAEUtil.mo

@@ -7676,6 +7676,7 @@ algorithm
                         (Tearing.tearingSystem, "tearingSystem", false),
                         (DynamicOptimization.removeLoops, "extendDynamicOptimization", false),
                         (DynamicOptimization.reduceDynamicOptimization, "reduceDynamicOptimization", false),
+                        (DynamicOptimization.simplifyConstraints, "simplifyConstraints", false),
                         (HpcOmEqSystems.partitionLinearTornSystem, "partlintornsystem", false),
                         (BackendDAEOptimize.addInitialStmtsToAlgorithms, "addInitialStmtsToAlgorithms", false),
                         (SymbolicJacobian.calculateStrongComponentJacobians, "calculateStrongComponentJacobians", false),
@@ -8269,21 +8270,21 @@ algorithm
   comp := BackendDAE.SINGLEEQUATION(eqIdx,varIdx);
 end makeSingleEquationComp;
 
-public function getAliasVars
+public function getAliasVars "author: lochel"
   input BackendDAE.BackendDAE inDAE;
   output BackendDAE.Variables outAliasVars;
 algorithm
   BackendDAE.DAE(shared=BackendDAE.SHARED(aliasVars=outAliasVars)) := inDAE;
 end getAliasVars;
 
-public function getKnownVars
+public function getKnownVars "author: lochel"
   input BackendDAE.BackendDAE inDAE;
   output BackendDAE.Variables outKnownVars;
 algorithm
   BackendDAE.DAE(shared=BackendDAE.SHARED(knownVars=outKnownVars)) := inDAE;
 end getKnownVars;
 
-public function setAliasVars
+public function setAliasVars "author: lochel"
   input BackendDAE.BackendDAE inDAE;
   input BackendDAE.Variables inAliasVars;
   output BackendDAE.BackendDAE outDAE;
@@ -8296,7 +8297,7 @@ algorithm
   outDAE := BackendDAE.DAE(eqs, shared);
 end setAliasVars;
 
-public function setKnownVars
+public function setKnownVars "author: lochel"
   input BackendDAE.BackendDAE inDAE;
   input BackendDAE.Variables inKnownVars;
   output BackendDAE.BackendDAE outDAE;

Compiler/BackEnd/BackendDump.mo

@@ -2312,23 +2312,27 @@ protected
   list<Absyn.Path> paths;
   list<String> paths_lst;
   String path_str;
-algorithm
-  BackendDAE.VAR(varName = cr,
-                 varKind = kind,
-                 varDirection = dir,
-                 varType = var_type,
-                 arryDim = arrayDim,
-                 bindExp = bindExp,
-                 source = source,
-                 values = dae_var_attr,
-                 comment = comment,
-                 connectorType = ct) := inVar;
+  Boolean unreplaceable;
+  String unreplaceableStr;
+algorithm
+  BackendDAE.VAR(varName=cr,
+                 varKind=kind,
+                 varDirection=dir,
+                 varType=var_type,
+                 arryDim=arrayDim,
+                 bindExp=bindExp,
+                 source=source,
+                 values=dae_var_attr,
+                 comment=comment,
+                 connectorType=ct,
+                 unreplaceable=unreplaceable) := inVar;
   paths := DAEUtil.getElementSourceTypes(source);
   paths_lst := List.map(paths, Absyn.pathString);
+  unreplaceableStr := if unreplaceable then " unreplaceable" else "";
   outStr := DAEDump.dumpDirectionStr(dir) + ComponentReference.printComponentRefStr(cr) + ":"
             + kindString(kind) + "(" + connectorTypeString(ct) + attributesString(dae_var_attr)
             + ") " + optExpressionString(bindExp,"") + DAEDump.dumpCommentAnnotationStr(comment)
-            + stringDelimitList(paths_lst, ", ") + " type: " + dumpTypeStr(var_type) + "["+ExpressionDump.dimensionsString(arrayDim)+"]";
+            + stringDelimitList(paths_lst, ", ") + " type: " + dumpTypeStr(var_type) + "["+ExpressionDump.dimensionsString(arrayDim) + "]" + unreplaceableStr;
 end varString;
 
 public function dumpKind

Compiler/BackEnd/BackendEquation.mo

@@ -1186,7 +1186,7 @@ algorithm
   eqns_1 := List.fold(eqnlst, addEquation, eqns);
 end addEquations;
 
-public function mergeEquationArray "author: vitalij
+public function mergeEquationArray "
   This function returns an EquationArray containing all the equations from both
   inputs."
   input BackendDAE.EquationArray inEqns1;