Disable default clock for FMI export

OpenModelica · Apr 13, 2016 · 12f928e · 12f928e
1 parent 8cf1a8f
commit 12f928e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -9753,19 +9753,22 @@ end eventHandlingInit;
 template clockIntervalsInit(SimCode simCode, Text& varDecls, Text& extraFuncs, Text& extraFuncsDecl, Text extraFuncsNamespace, Text stateDerVectorName /*=__zDot*/, Boolean useFlatArrayNotation)
 ::=
 match simCode
-case SIMCODE(modelInfo = MODELINFO(__)) then
+case SIMCODE(modelInfo = MODELINFO(__), modelStructure = fmims) then
   let i = tempDecl('int', &varDecls)
   <<
   <%i%> = 0;
   <%(clockedPartitions |> partition =>
     match partition
     case CLOCKED_PARTITION(__) then
       let &preExp = buffer "" /*BUFD*/
-      let intvl = match baseClock
+      let spec = daeExp(getClockInterval(baseClock), contextOther, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
+      // use default clock, except for FMI clocks that may be inferred
+      let intvl = match fmims case SOME(FmiModelStructure) then spec else
+        match baseClock
         case REAL_CLOCK()
         case INTEGER_CLOCK()
         case BOOLEAN_CLOCK() then
-          daeExp(getClockInterval(baseClock), contextOther, &preExp, &varDecls, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
+          spec
         else "unspecified"
       let interval = match intvl case "unspecified" then '1.0' else intvl
       let warning = match intvl case "unspecified" then