Fix homotopy parameter in Cpp runtime (#7541)

OpenModelica · Jun 10, 2021 · 4583637 · 4583637
1 parent 438ac99
commit 4583637
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/OMCompiler/Compiler/Template/CodegenCppCommon.tpl b/OMCompiler/Compiler/Template/CodegenCppCommon.tpl
@@ -30,6 +30,7 @@ template localCref(ComponentRef cr, Boolean useFlatArrayNotation)
 ::=
   match cr
   case CREF_IDENT(ident = "time") then "_simTime"
+  case CREF_IDENT(ident = "__HOM_LAMBDA") then "1.0"
   case WILD(__) then ''
   else crefToCStr(cr,useFlatArrayNotation)
 end localCref;
@@ -1918,10 +1919,6 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/, Text &varD
     let var2 = daeExp(e2, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     '<%var1%>'
 
-  case CALL(path=IDENT(name="homotopyParameter"),
-            expLst={},attr=attr as CALL_ATTR(__)) then
-     '1.0'
-
   case CALL(path=IDENT(name="div"), expLst={e1,e2}, attr=CALL_ATTR(ty = T_INTEGER(__))) then
     let var1 = daeExp(e1, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     let var2 = daeExp(e2, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)

diff --git a/OMCompiler/Compiler/Template/CodegenCppCommonOld.tpl b/OMCompiler/Compiler/Template/CodegenCppCommonOld.tpl
@@ -30,6 +30,7 @@ template localCref(ComponentRef cr, Boolean useFlatArrayNotation)
 ::=
   match cr
   case CREF_IDENT(ident = "time") then "_simTime"
+  case CREF_IDENT(ident = "__HOM_LAMBDA") then "1.0"
   case WILD(__) then ''
   else crefToCStr(cr,useFlatArrayNotation)
 end localCref;
@@ -1911,10 +1912,6 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/, Text &varD
     let var2 = daeExp(e2, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     '<%var1%>'
 
-  case CALL(path=IDENT(name="homotopyParameter"),
-            expLst={},attr=attr as CALL_ATTR(__)) then
-     '1.0'
-
   case CALL(path=IDENT(name="div"), expLst={e1,e2}, attr=CALL_ATTR(ty = T_INTEGER(__))) then
     let var1 = daeExp(e1, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
     let var2 = daeExp(e2, context, &preExp, &varDecls,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)