- the number of event indicators should now be correct for c and c++ …

…simulation runtime
OpenModelica · Jul 27, 2015 · cbe8e9d · cbe8e9d
1 parent d9b26e6
commit cbe8e9d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/Compiler/Template/CodegenCppInit.tpl b/Compiler/Template/CodegenCppInit.tpl
@@ -63,7 +63,7 @@ template fmiModelDescriptionAttributes(SimCode simCode, String guid)
       let generationDateAndTime = CodegenFMUCommon.xsdateTime(getCurrentDateTime())
       let variableNamingConvention = 'structured'
       let numberOfContinuousStates = vi.numStateVars
-      let numberOfEventIndicators = eventIndicatorsLength(simCode)
+      let numberOfEventIndicators = CodegenFMUCommon.getNumberOfEventIndicators(simCode)
       <<
       fmiVersion="<%fmiVersion%>"
       modelName="<%modelName%>"
@@ -231,15 +231,5 @@ template timeEventLength(SimCode simCode)
       >>
 end timeEventLength;
 
-template eventIndicatorsLength(SimCode simCode)
-::=
-  match simCode
-    case SIMCODE(modelInfo = MODELINFO(varInfo = vi as VARINFO(__))) then
-      let size = listLength(zeroCrossings)
-      <<
-      <%listLength(zeroCrossings)%>
-      >>
-end eventIndicatorsLength;
-
 annotation(__OpenModelica_Interface="backend");
 end CodegenCppInit;
diff --git a/Compiler/Template/CodegenFMU1.tpl b/Compiler/Template/CodegenFMU1.tpl
@@ -83,7 +83,7 @@ case SIMCODE(modelInfo = MODELINFO(varInfo = vi as VARINFO(__), vars = SIMVARS(s
   let generationDateAndTime = xsdateTime(getCurrentDateTime())
   let variableNamingConvention = 'structured'
   let numberOfContinuousStates = if intEq(vi.numStateVars,1) then statesnumwithDummy(listStates) else vi.numStateVars
-  let numberOfEventIndicators = vi.numZeroCrossings
+  let numberOfEventIndicators = getNumberOfEventIndicators(simCode)
   <<
   fmiVersion="<%fmiVersion%>"
   modelName="<%modelName%>"

diff --git a/Compiler/Template/CodegenFMU2.tpl b/Compiler/Template/CodegenFMU2.tpl
@@ -95,7 +95,7 @@ case SIMCODE(modelInfo = MODELINFO(varInfo = vi as VARINFO(__), vars = SIMVARS(s
   let generationTool= 'OpenModelica Compiler <%getVersionNr()%>'
   let generationDateAndTime = xsdateTime(getCurrentDateTime())
   let variableNamingConvention = 'structured'
-  let numberOfEventIndicators = vi.numZeroCrossings
+  let numberOfEventIndicators = getNumberOfEventIndicators(simCode)
   <<
   fmiVersion="<%fmiVersion%>"
   modelName="<%modelName%>"

diff --git a/Compiler/Template/CodegenFMUCommon.tpl b/Compiler/Template/CodegenFMUCommon.tpl
@@ -435,6 +435,18 @@ match varKind
   else "local"
 end getCausality2Helper;
 
+template getNumberOfEventIndicators(SimCode simCode)
+ "Get the number of event indicators, which depends on the selected code target (c or cpp)."
+::=
+match simCode
+  case SIMCODE(zeroCrossings = zeroCrossings, modelInfo = MODELINFO(varInfo = vi as VARINFO(__))) then
+    match Config.simCodeTarget()
+      case "Cpp" then listLength(zeroCrossings)
+      else vi.numZeroCrossings
+    end match
+  else ""
+end getNumberOfEventIndicators;
+
 template getInitialType(VarKind varKind, Option<DAE.Exp> initialValue, Causality c, Boolean isValueChangeable)
  "Returns the Initial Attribute of ScalarVariable."
 ::=

diff --git a/Compiler/Template/CodegenFMUCpp.tpl b/Compiler/Template/CodegenFMUCpp.tpl
@@ -238,7 +238,7 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
   #define MODEL_GUID "{<%guid%>}"
 
   <%ModelDefineData(modelInfo)%>
-  #define NUMBER_OF_EVENT_INDICATORS <%CodegenCppInit.eventIndicatorsLength(simCode)%>
+  #define NUMBER_OF_EVENT_INDICATORS <%CodegenFMUCommon.getNumberOfEventIndicators(simCode)%>
 
   <%if isFMIVersion20(FMUVersion) then
     '#include "FMU2/FMU2Wrapper.cpp"'