Changeset 17fb906 in OpenModelica

Timestamp:

2012-11-16T16:27:56+01:00 (11 years ago)

Author:

Lennart Ochel <lennart.ochel@…>

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:

0bb1572

Parents:

f52e7dca

Message:

BackEnd

• remove unneeded vars

testsuite

• add initialization test for ModelicaTest.MultiBody.FourbarVariants.JointUSR (#1929)

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@13926 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• Compiler/BackEnd/BackendDAEUtil.mo (modified) (13 diffs)

Compiler/BackEnd/BackendDAEUtil.mo

@@ -9151 +9151 @@
       Env.Env env;
       DAE.FunctionTree functionTree;
-      list<BackendDAE.Equation> eqnslst;
       array<DAE.Constraint> constraints;
       array<DAE.ClassAttributes> classAttrs;
@@ -9203 +9202 @@
 
       // some debug prints
-      Debug.fcall(Flags.DUMP_INITIAL_SYSTEM, print, "Initial System:\n");
+      Debug.fcall(Flags.DUMP_INITIAL_SYSTEM, print, "initial system\n");
       Debug.fcall(Flags.DUMP_INITIAL_SYSTEM, BackendDump.dump, initdae);
       
@@ -9277 +9276 @@
   output BackendDAE.EqSystem outSystem;
 protected
-BackendDAE.EqSystem system;
+  BackendDAE.EqSystem system;
   BackendDAE.IncidenceMatrix m, mt;
 algorithm
@@ -9301 +9300 @@
       BackendDAE.Var var;
       DAE.ComponentRef cr, preCR;
-      Option<DAE.Exp> startValue;
       BackendDAE.EquationArray orderedEqs "orderedEqs ; ordered Equations" ;
       
       BackendDAE.Equation eqn;
-      DAE.Exp e, crExp, startExp, preExp;
+      DAE.Exp startExp, preExp;
       DAE.Type tp;
       String crStr;
@@ -9335 +9333 @@
       tp = BackendVariable.varType(var);
             
-      e = Expression.crefExp(cr);
-      tp = Expression.typeof(e);
-      startExp = Expression.makeBuiltinCall("$_start", {e}, tp);
+      startExp = Expression.crefExp(cr);
+      tp = Expression.typeof(startExp);
+      startExp = Expression.makeBuiltinCall("$_start", {startExp}, tp);
       
-      e = Expression.crefExp(preCR);
+      preExp = Expression.crefExp(preCR);
       
-      eqn = BackendDAE.EQUATION(e, startExp, DAE.emptyElementSource);
-      
+      eqn = BackendDAE.EQUATION(preExp, startExp, DAE.emptyElementSource);
       orderedEqs = BackendEquation.equationAdd(eqn, orderedEqs);
       
@@ -9376 +9373 @@
     local
       BackendDAE.EqSystem system;
-      list<tuple<pastoptimiseDAEModule, String, Boolean>> pastOptModules;
-      tuple<StructurallySingularSystemHandlerFunc, String, stateDeselectionFunc, String> daeHandler;
-      tuple<matchingAlgorithmFunc, String> matchingAlgorithm;
       Integer nVars, nEqns;
       BackendDAE.Variables vars;
@@ -9403 +9397 @@
     then system;
     
-    case (_, _)
+    else
     then inSystem;
   end matchcontinue;
@@ -9419 +9413 @@
   (outSucceed, outVars, outEqns) := matchcontinue(inDAE, inVars, inEqns)
     local
-      BackendDAE.SymbolicJacobian jacG;
       BackendDAE.SparsePattern sparsityPattern;
       BackendDAE.BackendDAE dae;
-      
-      .DAE.ComponentRef cr, currRes;
-      list< .DAE.ComponentRef> diffVars, diffedVars, currDependencies, someStates;
-      String str;
-      list<BackendDAE.Var> vars;    // all vars
+      list< .DAE.ComponentRef> someStates;
       list<BackendDAE.Var> outputs; // $res1 ... $resN (initial equations)
       list<BackendDAE.Var> states;
@@ -9433 +9422 @@
       Integer nVars, nStates, nEqns;
       BackendDAE.EquationArray eqns;
-      
       list<tuple< .DAE.ComponentRef, list< .DAE.ComponentRef>>> dep;
     
@@ -9531 +9519 @@
       BackendDAE.Equation eqn;
       BackendDAE.EquationArray eqns;
-      
       DAE.Exp e, e1, crefExp, startExp;
       DAE.ComponentRef cref;
@@ -9578 +9565 @@
       BackendDAE.Equation eqn;
       BackendDAE.EquationArray eqns;
-      
       DAE.Exp e, e1, crefExp, startExp;
-      DAE.ComponentRef cref;
       DAE.Type tp;
       String crStr;
@@ -9633 +9618 @@
   input BackendDAE.Variables inVars;
   output BackendDAE.Variables outVars;
-algorithm
-  outVars := match(isyst, inVars)
-    local
-      BackendDAE.Variables vars, ivars;
-    case (BackendDAE.EQSYSTEM(orderedVars=vars), ivars) equation
-      // collect vars for initial system
-      ivars = BackendVariable.traverseBackendDAEVars(vars, collectUnfixedStates, ivars);
-    then ivars;
-  end match;
+protected
+  BackendDAE.Variables vars;
+algorithm
+  BackendDAE.EQSYSTEM(orderedVars=vars) := isyst;
+  outVars := BackendVariable.traverseBackendDAEVars(vars, collectUnfixedStates, inVars);
 end collectUnfixedStatesFromSystem;
 
@@ -9650 +9631 @@
   outTpl := matchcontinue(inTpl)
     local
-      BackendDAE.Var var, preVar, derVar;
-      BackendDAE.Variables vars, fixvars;
-      DAE.ComponentRef cr, preCR, derCR;
-      Boolean isFixed;
-      DAE.Type ty;
-      DAE.InstDims arryDim;
-      Option<DAE.Exp> startValue;
+      BackendDAE.Var var;
+      BackendDAE.Variables vars;
     
     // state