- added zeroFunc-Schedule to HPCOM

- fixed windows msvc build for cpp-runtime

.gitignore

@@ -141,6 +141,7 @@ Compiler/boot/LoadCompilerInterface.mos
 Compiler/boot/Makefile
 Compiler/boot/Makefile.depends
 Compiler/boot/Makefile.sources
+Compiler/boot/patches/*.patch
 Compiler/runtime/Makefile
 Compiler/runtime/config.unix.h
 Compiler/runtime/omc_communication.cc

Compiler/SimCode/HpcOmSimCode.mo

@@ -38,7 +38,7 @@ encapsulated package HpcOmSimCode
 
   public uniontype HpcOmData
     record HPCOMDATA
-      Option<tuple<HpcOmSimCode.Schedule, HpcOmSimCode.Schedule>> schedules; //<ode schedule, dae schedule>
+      Option<tuple<HpcOmSimCode.Schedule, HpcOmSimCode.Schedule, HpcOmSimCode.Schedule>> schedules; //<ode schedule, dae schedule, zeroFunc schedule>
       Option<HpcOmSimCode.MemoryMap> hpcOmMemory;
     end HPCOMDATA;
   end HpcOmData;

Compiler/Template/CodegenC.tpl

@@ -2596,7 +2596,7 @@ end functionWhenReinitStatementThen;
 // Begin: Modified functions for HpcOm
 //------------------------------------
 
-template functionXXX_systems_HPCOM(list<list<SimEqSystem>> eqs, String name, Text &loop, Text &varDecls, Option<tuple<Schedule,Schedule>> hpcOmSchedulesOpt, String modelNamePrefixStr)
+template functionXXX_systems_HPCOM(list<list<SimEqSystem>> eqs, String name, Text &loop, Text &varDecls, Option<tuple<Schedule,Schedule,Schedule>> hpcOmSchedulesOpt, String modelNamePrefixStr)
 ::=
  let funcs = (eqs |> eq hasindex i0 fromindex 0 => functionXXX_system_HPCOM(eq,name,i0,hpcOmSchedulesOpt, modelNamePrefixStr) ; separator="\n")
  match listLength(eqs)
@@ -2643,19 +2643,19 @@ template functionXXX_systems_HPCOM(list<list<SimEqSystem>> eqs, String name, Tex
        >>
 end functionXXX_systems_HPCOM;
 
-template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String name, Integer n, Option<tuple<Schedule,Schedule>> hpcOmSchedulesOpt, String modelNamePrefixStr)
+template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String name, Integer n, Option<tuple<Schedule,Schedule,Schedule>> hpcOmSchedulesOpt, String modelNamePrefixStr)
 ::=
   let type = getConfigString(HPCOM_CODE)
   match hpcOmSchedulesOpt
-    case SOME((hpcOmSchedule as EMPTYSCHEDULE(__),_)) then
+    case SOME((hpcOmSchedule as EMPTYSCHEDULE(__),_,_)) then
       <<
       void terminateHpcOmThreads()
       {
       }
 
       <%functionXXX_system(derivativEquations,name,n,modelNamePrefixStr)%>
       >>
-    case SOME((hpcOmSchedule as TASKDEPSCHEDULE(__),_)) then
+    case SOME((hpcOmSchedule as TASKDEPSCHEDULE(__),_,_)) then
       let taskEqs = functionXXX_system0_HPCOM_TaskDep(hpcOmSchedule.tasks, derivativEquations, type, name, modelNamePrefixStr); separator="\n"
       <<
       void terminateHpcOmThreads()
@@ -2668,7 +2668,7 @@ template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String n
         <%taskEqs%>
       }
       >>
-    case SOME((hpcOmSchedule as LEVELSCHEDULE(__),_)) then
+    case SOME((hpcOmSchedule as LEVELSCHEDULE(__),_,_)) then
       let odeEqs = hpcOmSchedule.tasksOfLevels |> tasks => functionXXX_system0_HPCOM_Level(derivativEquations,name,tasks,type,modelNamePrefixStr); separator="\n"
       <<
       void terminateHpcOmThreads()
@@ -2685,7 +2685,7 @@ template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String n
         }
       }
       >>
-   case SOME((hpcOmSchedule as THREADSCHEDULE(__),_)) then
+   case SOME((hpcOmSchedule as THREADSCHEDULE(__),_,_)) then
       let locks = hpcOmSchedule.outgoingDepTasks |> task => function_HPCOM_createLockByDepTask(task, "lock", type); separator="\n"
       let initlocks = hpcOmSchedule.outgoingDepTasks |> task => function_HPCOM_initializeLockByDepTask(task, "lock", type); separator="\n"
       let assignLocks = hpcOmSchedule.outgoingDepTasks |> task => function_HPCOM_assignLockByDepTask(task, "lock", type); separator="\n"
@@ -3294,7 +3294,7 @@ match eqlstlst
   error(sourceInfo(), 'TODO more than ODE list in <%name%> systems')
 end functionXXX_systems_arrayFormat;
 
-template functionODE(list<list<SimEqSystem>> derivativEquations, Text method, Option<tuple<Schedule,Schedule>> hpcOmSchedules, String modelNamePrefix)
+template functionODE(list<list<SimEqSystem>> derivativEquations, Text method, Option<tuple<Schedule,Schedule,Schedule>> hpcOmSchedules, String modelNamePrefix)
  "Generates function in simulation file."
 ::=
   let () = System.tmpTickReset(0)

Compiler/Template/CodegenCpp.tpl

@@ -1552,6 +1552,7 @@ let modelname = identOfPath(modelInfo.name)
 #include <Core/DataExchange/SimDouble.h>
 #include <Core/DataExchange/SimBoolean.h>
 #include <Core/SimController/ISimController.h>
+#include <Core/System/FactoryExport.h>
 
 #include <wvLib.h>
 #define PATH string
@@ -1859,6 +1860,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   #include <Core/ModelicaDefine.h>
   #include <Core/Modelica.h>
   #include <Core/SimController/ISimController.h>
+  #include <Core/System/FactoryExport.h>
   #include <Core/Utils/extension/logger.hpp>
 
   <%
@@ -1960,6 +1962,8 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
       %>
       try
       {
+            Logger::initialize();
+            Logger::setEnabled(false);
             <%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
                 <<
                 std::vector<MeasureTimeData> measureTimeArraySimulation = std::vector<MeasureTimeData>(2); //0 all, 1 setup
@@ -3128,14 +3132,15 @@ match simCode
 
             #ifdef MEASURETIME_MODELFUNCTIONS
             MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","functions",&measureTimeFunctionsArray);
-            measureTimeFunctionsArray = std::vector<MeasureTimeData>(4); //1 evaluateODE ; 2 evaluateAll; 3 writeOutput; 4 handleTimeEvents
+            measureTimeFunctionsArray = std::vector<MeasureTimeData>(5); //1 evaluateODE ; 2 evaluateAll; 3 writeOutput; 4 handleTimeEvents; 5 evaluateZeroFuncs
             measuredFunctionStartValues = MeasureTime::getZeroValues();
             measuredFunctionEndValues = MeasureTime::getZeroValues();
 
             measureTimeFunctionsArray[0] = MeasureTimeData("evaluateODE");
             measureTimeFunctionsArray[1] = MeasureTimeData("evaluateAll");
             measureTimeFunctionsArray[2] = MeasureTimeData("writeOutput");
             measureTimeFunctionsArray[3] = MeasureTimeData("handleTimeEvents");
+            measureTimeFunctionsArray[4] = MeasureTimeData("evaluateZeroFuncs");
             #endif //MEASURETIME_MODELFUNCTIONS
             >>
         %>
@@ -14078,7 +14083,7 @@ template createEvaluateAll( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenC
     bool state_var_reinitialized = false;
 
     <%varDecls%>
-    /* Evaluate Equations*/
+    // Evaluate Equations
     <%equation_all_func_calls%>
     // Reinits
     <%reinit%>
@@ -14125,7 +14130,7 @@ template createEvaluate(list<list<SimEqSystem>> odeEquations,list<SimWhenClause>
   {
     <%if createMeasureTime then generateMeasureTimeStartCode("measuredFunctionStartValues", "evaluateODE", "MEASURETIME_MODELFUNCTIONS") else ""%>
     <%varDecls%>
-    /* Evaluate Equations*/
+    // Evaluate Equations
     <%equation_ode_func_calls%>
     <%if createMeasureTime then generateMeasureTimeEndCode("measuredFunctionStartValues", "measuredFunctionEndValues", "measureTimeFunctionsArray[0]", "evaluateODE", "MEASURETIME_MODELFUNCTIONS") else ""%>
   }
@@ -14146,7 +14151,7 @@ template createEvaluateZeroFuncs( list<SimEqSystem> equationsForZeroCrossings, S
   void <%className%>::evaluateZeroFuncs(const UPDATETYPE command)
   {
     <%varDecls%>
-    /* Evaluate Equations*/
+    // Evaluate Equations
     <%equation_zero_func_calls%>
   }
   >>