Introduce clocked state variables

See ModelicaSpec33, section 16.4 Discrete States. The actual variable is declared as CLOCKED_STATE. It contains a component ref to previousName (cf. STATE containing derName).
OpenModelica · Oct 10, 2015 · 0a6d92e · 0a6d92e
1 parent e28a98f
commit 0a6d92e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/Compiler/BackEnd/BackendDAE.mo b/Compiler/BackEnd/BackendDAE.mo
@@ -243,6 +243,9 @@ uniontype VarKind "variable kind"
   record STATE_DER end STATE_DER;
   record DUMMY_DER end DUMMY_DER;
   record DUMMY_STATE end DUMMY_STATE;
+  record CLOCKED_STATE
+    .DAE.ComponentRef previousName "the name of the previous variable";
+  end CLOCKED_STATE;
   record DISCRETE end DISCRETE;
   record PARAM end PARAM;
   record CONST end CONST;

diff --git a/Compiler/BackEnd/BackendDump.mo b/Compiler/BackEnd/BackendDump.mo
@@ -2309,6 +2309,7 @@ algorithm
     case BackendDAE.STATE_DER()   then "STATE_DER";
     case BackendDAE.DUMMY_DER()   then "DUMMY_DER";
     case BackendDAE.DUMMY_STATE() then "DUMMY_STATE";
+    case BackendDAE.CLOCKED_STATE()  then "CLOCKED_STATE";
     case BackendDAE.DISCRETE()    then "DISCRETE";
     case BackendDAE.PARAM()       then "PARAM";
     case BackendDAE.CONST()       then "CONST";

diff --git a/Compiler/BackEnd/BackendVariable.mo b/Compiler/BackEnd/BackendVariable.mo
@@ -818,6 +818,9 @@ algorithm
       list<BackendDAE.VarKind> kind_lst;
 
     /* Real non discrete variable */
+    case (BackendDAE.VAR(varKind = BackendDAE.CLOCKED_STATE(_)))
+    then true;
+
     case (BackendDAE.VAR(varKind = kind, varType = DAE.T_REAL(_,_))) equation
       kind_lst = {BackendDAE.VARIABLE(), BackendDAE.DUMMY_DER(), BackendDAE.DUMMY_STATE(), BackendDAE.OPT_INPUT_WITH_DER(), BackendDAE.OPT_INPUT_DER()};
     then listMember(kind, kind_lst) or isOptLoopInput(kind);

diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -1984,7 +1984,7 @@ algorithm
       BackendDAE.EquationArray eqns;
       BackendDAE.Equation eqn;
       DAE.ComponentRef cr, preCR, derCR;
-      Boolean isFixed, isInput, b, preUsed;
+      Boolean isFixed, isInput, b, preUsed, previousUsed;
       DAE.Type ty;
       DAE.InstDims arryDim;
       Option<DAE.Exp> startValue;
@@ -2177,18 +2177,23 @@ algorithm
       true = BackendVariable.varFixed(var);
       isInput = BackendVariable.isVarOnTopLevelAndInput(var);
       startValue_ = BackendVariable.varStartValue(var);
-      preUsed = BaseHashSet.has(cr, hs) or BaseHashSet.has(cr, clkHS);
+      previousUsed = BaseHashSet.has(cr, clkHS);
+      preUsed = BaseHashSet.has(cr, hs) or previousUsed;
 
       var = BackendVariable.setVarFixed(var, false);
 
-      preCR = if BaseHashSet.has(cr, clkHS) then ComponentReference.crefPrefixString("$CLKPRE", cr) else ComponentReference.crefPrefixPre(cr);  // cr => $PRE.cr
+      preCR = if previousUsed then ComponentReference.crefPrefixString("$CLKPRE", cr) else ComponentReference.crefPrefixPre(cr);  // cr => $PRE.cr
       preVar = BackendVariable.copyVarNewName(preCR, var);
       preVar = BackendVariable.setVarDirection(preVar, DAE.BIDIR());
       preVar = BackendVariable.setBindExp(preVar, NONE());
       preVar = BackendVariable.setBindValue(preVar, NONE());
       preVar = BackendVariable.setVarFixed(preVar, true);
       preVar = BackendVariable.setVarStartValueOption(preVar, SOME(DAE.CREF(cr, ty)));
 
+      if previousUsed then
+        var = BackendVariable.setVarKind(var, BackendDAE.CLOCKED_STATE(previousName = preCR));
+      end if;
+
       eqn = BackendDAE.EQUATION(DAE.CREF(cr, ty), startValue_, DAE.emptyElementSource, BackendDAE.EQ_ATTR_DEFAULT_INITIAL);
 
       vars = if not isInput then BackendVariable.addVar(var, vars) else vars;