- comment out extendAllRecordEqns until testsuite library uses inline annotation

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

Author: Jens Frenkel

Compiler/CevalScript.mo

@@ -2331,9 +2331,9 @@ algorithm
         dae = DAEUtil.transformIfEqToExpr(dae,false);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(className,dae,env));
         dlow = DAELow.lower(dae, addDummy, true);
-        funcs = DAEUtil.daeFunctionTree(dae);
-        dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
-        dlow = DAELow.extendAllRecordEqns(dlow,funcs);
+        //funcs = DAEUtil.daeFunctionTree(dae);
+        //dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
+        //dlow = DAELow.extendAllRecordEqns(dlow,funcs);
         Debug.fprint("bltdump", "Lowered DAE:\n");
         Debug.fcall("bltdump", DAELow.dump, dlow);
         m = DAELow.incidenceMatrix(dlow);
@@ -3302,9 +3302,9 @@ algorithm
         RTOpts.setEliminationLevel(0); // No variable elimination
         (dlow as DAELow.DAELOW(orderedVars = DAELow.VARIABLES(numberOfVars = varSize),orderedEqs = eqns))
         = DAELow.lower(dae, false/* no dummy variable*/, true);
-        funcs = DAEUtil.daeFunctionTree(dae);
-        dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
-        dlow = DAELow.extendAllRecordEqns(dlow,funcs);
+        //funcs = DAEUtil.daeFunctionTree(dae);
+        //dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
+        //dlow = DAELow.extendAllRecordEqns(dlow,funcs);
         Debug.fcall("dumpdaelow", DAELow.dump, dlow);
         RTOpts.setEliminationLevel(elimLevel); // reset elimination level.
         eqnSize = DAELow.equationSize(eqns);

Compiler/DAELow.mo

@@ -6001,11 +6001,11 @@ algorithm
         e2_1 = Exp.simplify(e2);
         e1_2 = Exp.stringifyCrefs(e1_1);
         e2_2 = Exp.stringifyCrefs(e2_1);
-        complexEqs = {COMPLEX_EQUATION(-1,e1_2,e2_2,source)};
+        //complexEqs = {COMPLEX_EQUATION(-1,e1_2,e2_2,source)};
         // create as many equations as the dimension of the record
-        //ty = Exp.typeof(e1);
-        //i = Exp.sizeOf(ty);
-        //complexEqs = Util.listFill(COMPLEX_EQUATION(-1,e1_2,e2_2,source), i);
+        ty = Exp.typeof(e1);
+        i = Exp.sizeOf(ty);
+        complexEqs = Util.listFill(COMPLEX_EQUATION(-1,e1_2,e2_2,source), i);
       then
         complexEqs;
     // initial
@@ -6015,11 +6015,11 @@ algorithm
         e2_1 = Exp.simplify(e2);
         e1_2 = Exp.stringifyCrefs(e1_1);
         e2_2 = Exp.stringifyCrefs(e2_1);
-        complexEqs = {COMPLEX_EQUATION(-1,e1_2,e2_2,source)};
+        //complexEqs = {COMPLEX_EQUATION(-1,e1_2,e2_2,source)};
         // create as many equations as the dimension of the record
-        //ty = Exp.typeof(e1);
-        //i = Exp.sizeOf(ty);
-        //complexEqs = Util.listFill(COMPLEX_EQUATION(-1,e1_2,e2_2,source), i);
+        ty = Exp.typeof(e1);
+        i = Exp.sizeOf(ty);
+        complexEqs = Util.listFill(COMPLEX_EQUATION(-1,e1_2,e2_2,source), i);
       then
         complexEqs;
     case (_)

Compiler/Main.mo

@@ -766,9 +766,9 @@ algorithm
         true = runBackendQ();
         Debug.fcall("execstat",print, "*** Main -> To lower dae at time: " +& realString(clock()) +& "\n" );
         dlow = DAELow.lower(dae, /* add dummy state if needed */ true, /* simplify */ true);
-        funcs = DAEUtil.daeFunctionTree(dae);
-        dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
-        dlow = DAELow.extendAllRecordEqns(dlow,funcs);
+        //funcs = DAEUtil.daeFunctionTree(dae);
+        //dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
+        //dlow = DAELow.extendAllRecordEqns(dlow,funcs);
         Debug.fcall("dumpdaelow", DAELow.dump, dlow);
         m = DAELow.incidenceMatrix(dlow);
         mT = DAELow.transposeMatrix(m);

Compiler/SimCode.mo

@@ -522,9 +522,9 @@ algorithm
         dae = DAEUtil.transformIfEqToExpr(dae,false);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(className,dae,env));
         dlow = DAELow.lower(dae, addDummy, true);
-        funcs = DAEUtil.daeFunctionTree(dae);
-        dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
-        dlow = DAELow.extendAllRecordEqns(dlow,funcs);
+        //funcs = DAEUtil.daeFunctionTree(dae);
+        //dlow = Inline.inlineCalls(NONE(),SOME(funcs),{DAE.NORM_INLINE()},dlow);
+        //dlow = DAELow.extendAllRecordEqns(dlow,funcs);
         Debug.fprint("bltdump", "Lowered DAE:\n");
         Debug.fcall("bltdump", DAELow.dump, dlow);
         m = DAELow.incidenceMatrix(dlow);