- fix partitionIndependentBlocks for nowrappereqns

- continue nowrappereqns git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12200 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 24, 2012 · 7be649f · 7be649f
1 parent d9f46ec
commit 7be649f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -8045,7 +8045,7 @@ algorithm
           {s1,s2}, Absyn.dummyInfo);
 
         partitionEquations(BackendDAEUtil.equationArraySize(arr),arr,ixs,ea);
-        partitionVars(BackendDAEUtil.equationArraySize(arr),arr,vars,ixs,mT,va);
+        partitionVars(i2,arr,vars,ixs,mT,va);
         el = arrayList(ea);
         vl = arrayList(va);
         (systs,true) = List.threadMapFold(el,vl,createEqSystem,true);

diff --git a/Compiler/BackEnd/BackendEquation.mo b/Compiler/BackEnd/BackendEquation.mo
@@ -1866,18 +1866,24 @@ public function addOperation
 algorithm
   oeq := match (eq,op)
     local
-      Integer i1,i2;
+      Integer i1,i2,size;
       DAE.Exp e1,e2;
       list<DAE.Exp> es,es1,es2,conditions;
       DAE.ElementSource source;
       BackendDAE.WhenEquation whenEquation;
       DAE.ComponentRef cr1;
       list<BackendDAE.Equation> eqnsfalse;
       list<list<BackendDAE.Equation>> eqnstrue;
+      list<Integer> ds;
+      DAE.Algorithm alg;
     case (BackendDAE.EQUATION(e1,e2,source),op)
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);
       then BackendDAE.EQUATION(e1,e2,source);
+    case (BackendDAE.ARRAY_EQUATION(ds,e1,e2,source),op)
+      equation
+        source = DAEUtil.addSymbolicTransformation(source,op);
+      then BackendDAE.ARRAY_EQUATION(ds,e1,e2,source);
     case (BackendDAE.ARRAY_EQUATIONWRAPPER(i1,es1,source),op)
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);
@@ -1890,6 +1896,10 @@ algorithm
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);
       then BackendDAE.RESIDUAL_EQUATION(e1,source);
+    case (BackendDAE.ALGORITHM(size,alg,source),op)
+      equation
+        source = DAEUtil.addSymbolicTransformation(source,op);
+      then BackendDAE.ALGORITHM(size,alg,source);
     case (BackendDAE.ALGORITHMWRAPPER(i1,es1,es2,source),op)
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);
@@ -1898,6 +1908,10 @@ algorithm
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);
       then BackendDAE.WHEN_EQUATION(whenEquation,source);
+    case (BackendDAE.COMPLEX_EQUATION(size,e1,e2,source),op)
+      equation
+        source = DAEUtil.addSymbolicTransformation(source,op);
+      then BackendDAE.COMPLEX_EQUATION(size,e1,e2,source);
     case (BackendDAE.COMPLEX_EQUATIONWRAPPER(i1,es1,source),op)
       equation
         source = DAEUtil.addSymbolicTransformation(source,op);