improve symbolic jacobian generation

- generate sparse pattern for algebraic loops with GENERIC_JACOBIAN()
OpenModelica · Nov 24, 2016 · 95e5e65 · 95e5e65
1 parent e4cfc38
commit 95e5e65
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 181 deletions.
diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
@@ -728,7 +728,7 @@ uniontype Jacobian
   end FULL_JACOBIAN;
 
   record GENERIC_JACOBIAN
-    SymbolicJacobian jacobian;
+    Option<SymbolicJacobian> jacobian;
     SparsePattern sparsePattern;
     SparseColoring coloring;
   end GENERIC_JACOBIAN;
@@ -754,6 +754,9 @@ type SparsePattern = tuple<list<tuple< .DAE.ComponentRef, list< .DAE.ComponentRe
                                  list< .DAE.ComponentRef>>,                           // diffed vars
                            Integer>;                                                  // nonZeroElements
 
+public
+constant SparsePattern emptySparsePattern = ({},{},({},{}),0);
+
 public
 type SparseColoring = list<list< .DAE.ComponentRef>>;   // colouring
 

diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -1917,7 +1917,7 @@ algorithm
       case BackendDAE.EMPTY_JACOBIAN()
         then -1;
       /* TODO: implement/check for GENERIC_JACOBIAN */
-      case BackendDAE.GENERIC_JACOBIAN(jacobian=(_,_,vars1,vars2,_))
+      case BackendDAE.GENERIC_JACOBIAN(jacobian=SOME((_,_,vars1,vars2,_)))
         guard
           listLength(vars1) == listLength(vars2)
         then listLength(vars1);

diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -5943,9 +5943,9 @@ algorithm
         BackendDAE.BackendDAE bdae;
       case BackendDAE.EQUATIONSYSTEM(jac=BackendDAE.FULL_JACOBIAN(SOME(jac)))
         then traverseBackendDAEExpsJacobianEqn(jac, inFunc, arg);
-      case BackendDAE.EQUATIONSYSTEM(jac=BackendDAE.GENERIC_JACOBIAN(jacobian = (bdae,_,_,_,_)))
+      case BackendDAE.EQUATIONSYSTEM(jac=BackendDAE.GENERIC_JACOBIAN(jacobian = SOME((bdae,_,_,_,_))))
         then traverseBackendDAEExps(bdae, inFunc, arg);
-      case BackendDAE.TORNSYSTEM(BackendDAE.TEARINGSET(jac=BackendDAE.GENERIC_JACOBIAN(jacobian = (bdae,_,_,_,_))))
+      case BackendDAE.TORNSYSTEM(BackendDAE.TEARINGSET(jac=BackendDAE.GENERIC_JACOBIAN(jacobian = SOME((bdae,_,_,_,_)))))
         then traverseBackendDAEExps(bdae, inFunc, arg);
       else arg;
     end match;
@@ -6001,7 +6001,7 @@ algorithm
       BackendDAE.BackendDAE bdae;
       Type_a arg;
     case ({}, _, _) then inTypeA;
-    case (BackendDAE.STATESET(jacobian = BackendDAE.GENERIC_JACOBIAN(jacobian = (bdae,_,_,_,_)))::rest, _, _)
+    case (BackendDAE.STATESET(jacobian = BackendDAE.GENERIC_JACOBIAN(jacobian = SOME((bdae,_,_,_,_))))::rest, _, _)
       equation
         arg = traverseBackendDAEExps(bdae, inFunc, inTypeA);
       then

diff --git a/Compiler/BackEnd/BackendDump.mo b/Compiler/BackEnd/BackendDump.mo
@@ -2241,12 +2241,19 @@ algorithm
       s = "FULL JACOBIAN:\n";
       s = s + dumpJacobianStr(fJac);
     then s;
-  case(BackendDAE.GENERIC_JACOBIAN(jacobian=sJac))
+  case(BackendDAE.GENERIC_JACOBIAN(jacobian=SOME(sJac),sparsePattern=sparsePattern))
     equation
       ((dae,_,_,_,_)) = sJac;
       s = "GENERIC JACOBIAN:\n";
       dumpBackendDAE(dae,"Directional Derivatives System");
+      dumpSparsityPattern(sparsePattern,"Sparse Pattern");
     then s;
+  case(BackendDAE.GENERIC_JACOBIAN(jacobian=NONE(),sparsePattern=sparsePattern))
+    equation
+      s = "GENERIC JACOBIAN:\n";
+      dumpSparsityPattern(sparsePattern,"Sparse Pattern");
+    then s;
+
   case(BackendDAE.EMPTY_JACOBIAN())
     equation
       s = "EMPTY JACOBIAN:\n";