Changeset f11f59c2 in OpenModelica

Timestamp:

2016-04-08T17:42:27+02:00 (8 years ago)

Author:

Willi Braun <wbraun@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

6e3121a4

Parents:

1299763

git-author:

Willi Braun <wbraun@…> (04/08/16 15:52:52)

git-committer:

Willi Braun <wbraun@…> (04/08/16 17:42:27)

Message:

fixing ticket:3786

File:

• Compiler/BackEnd/SymbolicJacobian.mo (modified) (10 diffs)

Compiler/BackEnd/SymbolicJacobian.mo

@@ -1003 +1003 @@
   cols with the same color."
   input BackendDAE.BackendDAE inBackendDAE;
-  input list<BackendDAE.Var> inDiffVars "vars";
-  input list<BackendDAE.Var> inDiffedVars "eqns";
+  input list<BackendDAE.Var> inIndependentVars "vars";
+  input list<BackendDAE.Var> inDependentVars "eqns";
   output BackendDAE.SparsePattern outSparsePattern;
   output BackendDAE.SparseColoring outColoredCols;
 protected
-  constant Boolean debug = false;
-algorithm
-  (outSparsePattern,outColoredCols) := matchcontinue(inBackendDAE,inDiffVars,inDiffedVars)
+  constant Boolean debug = true;
+algorithm
+  (outSparsePattern,outColoredCols) := matchcontinue(inBackendDAE,inIndependentVars,inDependentVars)
     local
       BackendDAE.Shared shared;
@@ -1025 +1025 @@
       list<Integer> nodesList, nodesEqnsIndex;
       list<list<Integer>> sparsepattern,sparsepatternT, coloredlist;
-      list<BackendDAE.Var> jacDiffVars, indiffVars, indiffedVars;
+      list<BackendDAE.Var> jacDiffVars, dependentVars, independentVars;
       BackendDAE.Variables varswithDiffs;
       BackendDAE.EquationArray orderedEqns;
@@ -1032 +1032 @@
       array<list<Integer>> coloredArray;
 
-      list<DAE.ComponentRef> diffCompRefsLst, diffedCompRefsLst;
-      array<DAE.ComponentRef> diffCompRefs, diffedCompRefs;
+      list<DAE.ComponentRef> depCompRefsLst, inDepCompRefsLst;
+      array<DAE.ComponentRef> depCompRefs, inDepCompRefs;
 
       array<list<Integer>> eqnSparse, varSparse, sparseArray, sparseArrayT;
@@ -1042 +1042 @@
       list<tuple<DAE.ComponentRef,list<DAE.ComponentRef>>> sparsetuple, sparsetupleT;
 
-    case (_,{},_) then (({},{},({},{}), -1),{});
-    case (_,_,{}) then (({},{},({},{}), -1),{});
-    case(BackendDAE.DAE(eqs = (syst as BackendDAE.EQSYSTEM(matching=bdaeMatching as BackendDAE.MATCHING(comps=comps, ass1=ass1)))::{}),indiffVars,indiffedVars)
+    // if there are no independent var, no pattern needed, otherwise there
+    // is an empty pattern for the dependent variables
+    case (_,_,{}) then (({},{},({},{}),-1),{});
+    case(BackendDAE.DAE(eqs = (syst as BackendDAE.EQSYSTEM(matching=bdaeMatching as BackendDAE.MATCHING(comps=comps, ass1=ass1)))::{}),independentVars,dependentVars)
       equation
         if Flags.isSet(Flags.DUMP_SPARSE_VERBOSE) then
-          print(" start getting sparsity pattern diff Vars : " + intString(listLength(indiffedVars))  + " diffed vars: " + intString(listLength(indiffVars)) +"\n");
+          print(" start getting sparsity pattern for variables : " + intString(listLength(dependentVars))  + " and the independent vars: " + intString(listLength(independentVars)) +"\n");
         end if;
         if debug then execStat("generateSparsePattern -> do start "); end if;
         // prepare crefs
-        diffCompRefsLst = List.map(indiffVars, BackendVariable.varCref);
-        diffedCompRefsLst = List.map(indiffedVars, BackendVariable.varCref);
-        diffCompRefs = listArray(diffCompRefsLst);
-        diffedCompRefs = listArray(diffedCompRefsLst);
+        depCompRefsLst = List.map(dependentVars, BackendVariable.varCref);
+        inDepCompRefsLst = List.map(independentVars, BackendVariable.varCref);
+        depCompRefs = listArray(depCompRefsLst);
+        inDepCompRefs = listArray(inDepCompRefsLst);
         // create jacobian vars
-        jacDiffVars =  list(BackendVariable.createpDerVar(v) for v in indiffVars);
-        sizeN = arrayLength(diffCompRefs);
+        jacDiffVars =  list(BackendVariable.createpDerVar(v) for v in independentVars);
+        sizeN = arrayLength(inDepCompRefs);
 
         // generate adjacency matrix including diff vars
@@ -1075 +1076 @@
 
         // get indexes of diffed vars (rows)
-        nodesEqnsIndex = BackendVariable.getVarIndexFromVars(indiffedVars,varswithDiffs);
+        nodesEqnsIndex = BackendVariable.getVarIndexFromVars(dependentVars,varswithDiffs);
         nodesEqnsIndex = List.map1(nodesEqnsIndex, Array.getIndexFirst, ass1);
 
@@ -1091 +1092 @@
         mark = arrayCreate(adjSizeT, 0);
         usedvar = arrayCreate(adjSizeT, 0);
-        usedvar = Array.setRange(adjSizeT-(sizeN-1), adjSizeT, usedvar, 1);
+
+        // make dependent variables as used if there are some
+        // otherwise Array.setRange fails start is greater than end
+        if (sizeN>0) then
+          usedvar = Array.setRange(adjSizeT-(sizeN-1), adjSizeT, usedvar, 1);
+        end if;
 
         if debug then execStat("generateSparsePattern -> start "); end if;
@@ -1125 +1131 @@
 
         // translated to DAE.ComRefs
-        translated = list(list(arrayGet(diffCompRefs, i) for i in lst) for lst in sparsepattern);
-        sparsetuple = list((cr,t) threaded for cr in diffedCompRefs, t in translated);
-        translated = list(list(arrayGet(diffedCompRefs, i) for i in lst) for lst in sparsepatternT);
-        sparsetupleT = list((cr,t) threaded for cr in diffCompRefs, t in translated);
+        translated = list(list(arrayGet(inDepCompRefs, i) for i in lst) for lst in sparsepattern);
+        sparsetuple = list((cr,t) threaded for cr in depCompRefs, t in translated);
+        translated = list(list(arrayGet(depCompRefs, i) for i in lst) for lst in sparsepatternT);
+        sparsetupleT = list((cr,t) threaded for cr in inDepCompRefs, t in translated);
 
         // build up a bi-partied graph of pattern
@@ -1153 +1159 @@
         arraysparseGraph = listArray(sparseGraph);
         if debug then execStat("generateSparsePattern -> coloring start "); end if;
-        Graph.partialDistance2colorInt(sparseGraphT, forbiddenColor, nodesList, arraysparseGraph, colored);
+        if (sizeN>0) then
+          Graph.partialDistance2colorInt(sparseGraphT, forbiddenColor, nodesList, arraysparseGraph, colored);
+        end if;
         if debug then execStat("generateSparsePattern -> coloring end "); end if;
         // get max color used
@@ -1160 +1168 @@
         // map index of that array into colors
         coloredArray = arrayCreate(maxColor, {});
-        mapIndexColors(colored, arrayLength(diffCompRefs), coloredArray);
+        mapIndexColors(colored, arrayLength(inDepCompRefs), coloredArray);
 
         if Flags.isSet(Flags.DUMP_SPARSE) then
@@ -1167 +1175 @@
         end if;
 
-        coloring = list(list(arrayGet(diffCompRefs, i) for i in lst) for lst in coloredArray);
+        coloring = list(list(arrayGet(inDepCompRefs, i) for i in lst) for lst in coloredArray);
 
         //without coloring
-        //coloring = List.transposeList({diffCompRefs});
+        //coloring = List.transposeList({inDepCompRefs});
         if Flags.isSet(Flags.DUMP_SPARSE_VERBOSE) then
           print("analytical Jacobians[SPARSE] -> ready! " + realString(clock()) + "\n");
         end if;
         if debug then execStat("generateSparsePattern -> final end "); end if;
-      then ((sparsetupleT, sparsetuple, (diffCompRefsLst, diffedCompRefsLst), nonZeroElements), coloring);
+      then ((sparsetupleT, sparsetuple, (inDepCompRefsLst, depCompRefsLst), nonZeroElements), coloring);
     else
       algorithm