Attempt to fix #3741

OpenModelica · Mar 5, 2016 · 12ddb6a · 12ddb6a
1 parent f31e10e
commit 12ddb6a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Compiler/BackEnd/RemoveSimpleEquations.mo b/Compiler/BackEnd/RemoveSimpleEquations.mo
@@ -390,13 +390,24 @@ protected function addUnreplaceable
   output HashSet.HashSet outUnreplaceable = inUnreplaceable;
 protected
   BackendDAE.Variables orderedVars;
+  Integer idx;
+  BackendDAE.SubPartition subPartition;
+  DAE.ComponentRef cr;
 algorithm
   BackendDAE.EQSYSTEM(orderedVars=orderedVars) := syst;
   for var in BackendVariable.varList(orderedVars) loop
     if BackendVariable.varUnreplaceable(var) then
       outUnreplaceable := BaseHashSet.add(BackendVariable.varCref(var), outUnreplaceable);
     end if;
   end for;
+  // add discrete states to unreplaceable (#3741)
+  if BackendDAEUtil.isClockedSyst(syst) then
+    BackendDAE.CLOCKED_PARTITION(idx) := syst.partitionKind;
+    subPartition := shared.partitionsInfo.subPartitions[idx];
+    for cr in subPartition.prevVars loop
+      outUnreplaceable := BaseHashSet.add(cr, outUnreplaceable);
+    end for;
+  end if;
 end addUnreplaceable;
 
 protected function fastAcausal1 "author: Frenkel TUD 2012-12