- add some code (commented out) to tear full mixed system

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13492 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 19, 2012 · c3f965d · c3f965d
1 parent 12ac05c
commit c3f965d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -9261,12 +9261,15 @@ algorithm
         (acc,b1);
     case (_,_,(comp as BackendDAE.MIXEDEQUATIONSYSTEM(condSystem=comp1,disc_eqns=eindex,disc_vars=vindx))::comps,_,_)
       equation
+        // only mixed part
         //(_,_) = tearingSystemNew1_1(isyst,ishared,eindex,vindx,NONE(),BackendDAE.JAC_NO_ANALYTIC());
+        // only continues part
+        (comp1::{},true) = tearingSystemNew1(isyst,ishared,{comp1},false,{});
+        (acc,b1) = tearingSystemNew1(isyst,ishared,comps,true,BackendDAE.MIXEDEQUATIONSYSTEM(comp1,eindex,vindx)::iAcc);
+        // mixed and continues part
         //(eindex,vindx) = BackendDAETransform.getEquationAndSolvedVarIndxes(comp);
-        //(_,_) = tearingSystemNew1_1(isyst,ishared,eindex,vindx,NONE(),BackendDAE.JAC_NO_ANALYTIC());
+        //(comp1,true) = tearingSystemNew1_1(isyst,ishared,eindex,vindx,NONE(),BackendDAE.JAC_NO_ANALYTIC());
         //(acc,b1) = tearingSystemNew1(isyst,ishared,comps,true,comp1::iAcc);
-        (comp1::_,true) = tearingSystemNew1(isyst,ishared,{comp1},false,{});
-        (acc,b1) = tearingSystemNew1(isyst,ishared,comps,true,BackendDAE.MIXEDEQUATIONSYSTEM(comp1,eindex,vindx)::iAcc);
       then
         (acc,b1);
     case (_,_,comp::comps,_,_)
@@ -9831,7 +9834,7 @@ algorithm
         points = List.fold2(states, calcVarWights,mt,ass2,points);
         eqns = Matching.getUnassigned(arrayLength(m),ass2,{});
         points = List.fold2(eqns,addEqnWights,m,ass1,points);
-        points = List.fold1(states,discriminateDiscrete,vars,points);
+        //points = List.fold1(states,discriminateDiscrete,vars,points);
         //points = List.fold2(states,addOneEdgeEqnWights,(m,mt),ass1,points);
          Debug.fcall(Flags.TEARING_DUMP,  BackendDump.dumpMatching,points);
         tvar = selectVarWithMostPoints(states,points,-1,-1);