Changeset 0d11bbe in OpenModelica

Timestamp:

2016-04-08T13:46:23+02:00 (8 years ago)

Author:

ptaeuber <patrick_marcel.taeuber@…>

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:

027b44e2

Parents:

fc4de9ec

git-author:

ptaeuber <patrick_marcel.taeuber@…> (04/08/16 12:50:33)

git-committer:

ptaeuber <patrick_marcel.taeuber@…> (04/08/16 13:46:23)

Message:

Introduce indexing of strong components

Allows access to single components e.g. to deactivate tearing or
to use a user defined tearing for selected components

Location:

Compiler

Files:

• BackEnd/Tearing.mo (modified) (11 diffs)
• Global/Global.mo (modified) (1 diff)

Compiler/BackEnd/Tearing.mo

@@ -60 +60 @@
 protected import ExpressionSolve;
 protected import Flags;
+protected import Global;
 protected import List;
 protected import Matching;
@@ -96 +97 @@
       TearingMethod method;
       BackendDAE.BackendDAEType DAEtype;
+      Integer strongComponentIndex = System.tmpTickIndex(Global.strongComponent_index);
 
     // if noTearing is selected, do nothing.
@@ -105 +107 @@
     // get method function and traverse systems
     case(_) equation
+
       methodString = Config.getTearingMethod();
       BackendDAE.SHARED(backendDAEType=DAEtype) = inDAE.shared;
@@ -114 +117 @@
         print("!\n" + UNDERLINE + UNDERLINE + "\n");
       end if;
-      (outDAE, _) = BackendDAEUtil.mapEqSystemAndFold(inDAE, tearingSystemWork, method);
+      (outDAE, (_,strongComponentIndex)) = BackendDAEUtil.mapEqSystemAndFold(inDAE, tearingSystemWork, (method, strongComponentIndex));
+      System.tmpTickSetIndex(strongComponentIndex, Global.strongComponent_index);
     then outDAE;
 
@@ -185 +189 @@
   input BackendDAE.EqSystem isyst;
   input BackendDAE.Shared inShared;
-  input TearingMethod inTearingMethod;
+  input tuple<TearingMethod,Integer> inTearingMethodAndIndex;
   output BackendDAE.EqSystem osyst;
   output BackendDAE.Shared outShared = inShared "unused";
-  output TearingMethod outTearingMethod = inTearingMethod "unused";
-protected
+  output tuple<TearingMethod,Integer> outTearingMethodAndIndex;
+protected
+  TearingMethod inTearingMethod = Util.tuple21(inTearingMethodAndIndex);
+  Integer strongComponentIndex = Util.tuple22(inTearingMethodAndIndex);
   BackendDAE.StrongComponents comps;
   Boolean b;
@@ -198 +204 @@
     print("\n" + BORDER + "\nBEGINNING of traverseComponents\n\n");
   end if;
-  (comps, b) := traverseComponents(comps, isyst, inShared, inTearingMethod);
+  (comps, b, strongComponentIndex) := traverseComponents(comps, isyst, inShared, inTearingMethod, strongComponentIndex);
   if Flags.isSet(Flags.TEARING_DUMPVERBOSE) then
     print("\nEND of traverseComponents\n" + BORDER + "\n\n");
   end if;
   osyst := if b then BackendDAEUtil.setEqSystMatching(isyst, BackendDAE.MATCHING(ass1, ass2, comps)) else isyst;
+  outTearingMethodAndIndex := (inTearingMethod,strongComponentIndex);
 end tearingSystemWork;
 
@@ -210 +217 @@
   input BackendDAE.Shared ishared;
   input TearingMethod inMethod;
+  input Integer strongComponentIndexIn;
   output BackendDAE.StrongComponents oComps;
   output Boolean outRunMatching = false;
+  output Integer strongComponentIndexOut=strongComponentIndexIn;
 algorithm
   oComps := list(match co
@@ -219 +228 @@
         case comp
           equation
-            (comp, b) = traverseComponents1(comp, isyst, ishared, inMethod);
+            (comp, b, strongComponentIndexOut) = traverseComponents1(comp, isyst, ishared, inMethod, strongComponentIndexOut);
             outRunMatching = outRunMatching or b;
           then comp;
@@ -230 +239 @@
   input BackendDAE.Shared ishared;
   input TearingMethod inMethod;
+  input Integer strongComponentIndexIn;
   output BackendDAE.StrongComponent oComp;
   output Boolean outRunMatching;
+  output Integer strongComponentIndexOut=strongComponentIndexIn;
 protected
   constant Boolean debug = false;
 algorithm
+  strongComponentIndexOut := match(inComp)
+    case(BackendDAE.EQUATIONSYSTEM(jac=BackendDAE.FULL_JACOBIAN())) equation
+      if Flags.isSet(Flags.TEARING_DUMP) or Flags.isSet(Flags.TEARING_DUMPVERBOSE) then
+        print("Handle strong component with index: " + intString(strongComponentIndexOut+1) + "\nTo disable tearing of this component use '--noTearingForComponent=" + intString(strongComponentIndexOut+1) + "'.\n");
+      end if;
+     then (strongComponentIndexOut + 1);
+    else strongComponentIndexOut;
+  end match;
+
   (oComp, outRunMatching) := matchcontinue (inComp, isyst, ishared, inMethod)
     local
@@ -254 +274 @@
       end if;
       if Flags.isSet(Flags.TEARING_DUMP) or Flags.isSet(Flags.TEARING_DUMPVERBOSE) then
-        print("\nCase linear in traverseComponents\nUse Flag '+d=tearingdumpV' for more details\n\n");
+        print("\nTearing of LINEAR component\nUse Flag '+d=tearingdumpV' for more details\n\n");
       end if;
       false = Flags.getConfigBool(Flags.DISABLE_LINEAR_TEARING);
@@ -278 +298 @@
       end if;
       if Flags.isSet(Flags.TEARING_DUMP) or Flags.isSet(Flags.TEARING_DUMPVERBOSE) then
-        print("\nCase non-linear in traverseComponents\nUse Flag '+d=tearingdumpV' for more details\n\n");
+        print("\nTearing of NONLINEAR component\nUse Flag '+d=tearingdumpV' for more details\n\n");
       end if;
       if Flags.isSet(Flags.TEARING_DUMPVERBOSE) then

Compiler/Global/Global.mo

@@ -73 +73 @@
 // csevar name
 constant Integer backendDAE_cseIndex = 23;
+// strong component index
+constant Integer strongComponent_index = 24;
 
 // ----------------------