Additional fixes to #3137

- fix FMI generation and import for +target=msvc
- build static cminpack.lib for msvc
- export equations in Model_05evt.c
- compile fmil msvc (unfortunately static does not work for some reason)
- fix ansi C in the FMI interfaces files
- more CMakeLists.txt fixes in SimulationRuntime/c/


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24543 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adrpo

Compiler/Template/CodegenC.tpl

@@ -3052,6 +3052,7 @@ template functionZeroCrossing(list<ZeroCrossing> zeroCrossings, list<SimEqSystem
   let eqs = (equationsForZeroCrossings |> eq =>
        equation_(eq, contextSimulationNonDiscrete, &varDecls, &tmp, modelNamePrefix)
       ;separator="\n")
+  let forwardEqs = equationsForZeroCrossings |> eq => equationForward_(eq,contextSimulationNonDiscrete,modelNamePrefix); separator="\n"
 
   let &varDecls2 = buffer ""
   let zeroCrossingsCode = zeroCrossingsTpl(zeroCrossings, &varDecls2, &auxFunction)
@@ -3084,6 +3085,9 @@ template functionZeroCrossing(list<ZeroCrossing> zeroCrossings, list<SimEqSystem
   <<
   <%desc%>
 
+  /* forwarded equations */
+  <%forwardEqs%>
+
   int <%symbolName(modelNamePrefix,"function_ZeroCrossingsEquations")%>(DATA *data)
   {
     TRACE_PUSH

Compiler/Template/CodegenFMU.tpl

@@ -820,10 +820,12 @@ case SIMCODE(__) then
 
   // implementation of the Model Exchange functions
   <%if isFMIVersion20(FMUVersion) then
-  '#define fmu2_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
+  '  extern void <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>(DATA *data);
+  #define fmu2_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
   #include "fmu2_model_interface.c"'
   else
-  '#define fmu1_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
+  '  extern void <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>(DATA *data);
+  #define fmu1_model_interface_setupDataStruc <%symbolName(modelNamePrefix(simCode),"setupDataStruc")%>
   #include "fmu1_model_interface.c"'%>
 
   <%setDefaultStartValues(modelInfo)%>
@@ -1682,28 +1684,28 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /I - Include Directories
   # /DNOMINMAX - Define NOMINMAX (does what it says)
   # /TP - Use C++ Compiler
-  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc/c" <%if isFMIVersion20(FMUVersion) then '/I"<%makefileParams.omhome%>/include/omc/c/fmi2"' else '/I"<%makefileParams.omhome%>/include/omc/c/fmi1"'%> /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
+  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc/c" /I"<%makefileParams.omhome%>/include/omc/msvc/" <%if isFMIVersion20(FMUVersion) then '/I"<%makefileParams.omhome%>/include/omc/c/fmi2"' else '/I"<%makefileParams.omhome%>/include/omc/c/fmi1"'%> /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
 
   # /ZI enable Edit and Continue debug info
   CDFLAGS = /ZI
 
   # /MD - link with MSVCRT.LIB
   # /link - [linker options and libraries]
   # /LIBPATH: - Directories where libs can be found
-  LDFLAGS=/MD /link /dll /debug /pdb:"<%fileNamePrefix%>.pdb" /LIBPATH:"<%makefileParams.omhome%>/lib/omc/msvc/" /LIBPATH:"<%makefileParams.omhome%>/lib/omc/msvc/release/" <%dirExtra%> <%libsPos1%> <%libsPos2%> f2c.lib initialization.lib libexpat.lib math-support.lib meta.lib ModelicaExternalC.lib results.lib simulation.lib solver.lib sundials_kinsol.lib sundials_nvecserial.lib util.lib lapack_win32_MT.lib
+  LDFLAGS=/MD /link /dll /debug /pdb:"<%fileNamePrefix%>.pdb" /LIBPATH:"<%makefileParams.omhome%>/lib/omc/msvc/" /LIBPATH:"<%makefileParams.omhome%>/lib/omc/msvc/release/" <%dirExtra%> <%libsPos1%> <%libsPos2%> f2c.lib initialization.lib libexpat.lib math-support.lib meta.lib results.lib simulation.lib solver.lib sundials_kinsol.lib sundials_nvecserial.lib util.lib lapack_win32_MT.lib lis.lib  gc-lib.lib user32.lib pthreadVC2.lib wsock32.lib cminpack.lib umfpack.lib amd.lib
 
   # /MDd link with MSVCRTD.LIB debug lib
   # lib names should not be appended with a d just switch to lib/omc/msvc/debug
 
 
   FILEPREFIX=<%fileNamePrefix%>
-  MAINFILE=$(FILEPREFIX).c
-  MAINOBJ=$(FILEPREFIX).obj
+  MAINFILE=<%fileNamePrefix%>_FMU.c
+  MAINOBJ=<%fileNamePrefix%>_FMU.obj
   CFILES=<%fileNamePrefix%>.c <%fileNamePrefix%>_functions.c <%fileNamePrefix%>_records.c \
   <%fileNamePrefix%>_01exo.c <%fileNamePrefix%>_02nls.c <%fileNamePrefix%>_03lsy.c <%fileNamePrefix%>_04set.c <%fileNamePrefix%>_05evt.c <%fileNamePrefix%>_06inz.c <%fileNamePrefix%>_07dly.c \
   <%fileNamePrefix%>_08bnd.c <%fileNamePrefix%>_09alg.c <%fileNamePrefix%>_10asr.c <%fileNamePrefix%>_11mix.c <%fileNamePrefix%>_12jac.c <%fileNamePrefix%>_13opt.c <%fileNamePrefix%>_14lnz.c
   OFILES=$(CFILES:.c=.obj)
-  GENERATEDFILES=$(MAINFILE) <%fileNamePrefix%>_FMU.makefile <%fileNamePrefix%>_literals.h <%fileNamePrefix%>_functions.h <%fileNamePrefix%>_11mix.h <%fileNamePrefix%>_12jac.h <%fileNamePrefix%>_13opt.h $(CFILES)
+  GENERATEDFILES=$(MAINFILE) <%fileNamePrefix%>_FMU.makefile <%fileNamePrefix%>_literals.h <%fileNamePrefix%>_model.h <%fileNamePrefix%>_includes.h <%fileNamePrefix%>_functions.h  <%fileNamePrefix%>_11mix.h <%fileNamePrefix%>_12jac.h <%fileNamePrefix%>_13opt.h <%fileNamePrefix%>_init.c <%fileNamePrefix%>_info.c $(CFILES) <%fileNamePrefix%>_FMU.libs
 
   $(FILEPREFIX)$(FMUEXT): $(FILEPREFIX)$(DLLEXT) modelDescription.xml
       if not exist <%fmudirname%>\binaries\$(PLATWIN32) mkdir <%fmudirname%>\binaries\$(PLATWIN32)
@@ -1721,11 +1723,14 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
       copy <%fileNamePrefix%>_functions.h <%fmudirname%>\sources\<%fileNamePrefix%>_functions.h
       copy <%fileNamePrefix%>_records.c <%fmudirname%>\sources\<%fileNamePrefix%>_records.c
       copy modelDescription.xml <%fmudirname%>\modelDescription.xml
-      copy <%stringReplace(makefileParams.omhome,"/","\\")%>\lib\omc\libexec\gnuplot\binary\libexpat-1.dll <%fmudirname%>\binaries\$(PLATWIN32)
+      copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\SUNDIALS_KINSOL.DLL <%fmudirname%>\binaries\$(PLATWIN32)
+      copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\SUNDIALS_NVECSERIAL.DLL <%fmudirname%>\binaries\$(PLATWIN32)
+      copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\LAPACK_WIN32_MT.DLL <%fmudirname%>\binaries\$(PLATWIN32)
+      copy <%stringReplace(makefileParams.omhome,"/","\\")%>\bin\pthreadVC2.dll <%fmudirname%>\binaries\$(PLATWIN32)
       cd <%fmudirname%>
-      "$(MINGW)\bin\zip.exe" -r ../<%fileNamePrefix%>.fmu *
+      "zip.exe" -r ../<%fileNamePrefix%>.fmu *
       cd ..
-      rmdir /S /Q <%fmudirname%>
+      rm -rf <%fmudirname%>
 
   $(FILEPREFIX)$(DLLEXT): $(MAINOBJ) $(CFILES)
       $(CXX) /Fe$(FILEPREFIX)$(DLLEXT) $(MAINFILE) $(FILEPREFIX)_FMU.c $(CFILES) $(CFLAGS) $(LDFLAGS)

SimulationRuntime/c/CMakeLists.txt

@@ -92,6 +92,7 @@ ADD_SUBDIRECTORY(math-support)
 ADD_SUBDIRECTORY(meta)
 ADD_SUBDIRECTORY(simulation)
 ADD_SUBDIRECTORY(util)
+ADD_SUBDIRECTORY(fmi)
 
 # -------------------------------------------------------------
 # MACRO definitions

SimulationRuntime/c/fmi/CMakeLists.txt

@@ -0,0 +1,15 @@
+
+INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/3rdParty/FMIL/install_msvc/include")
+
+# Quellen und Header
+SET(fmi_sources  FMI1CoSimulation.c  FMI1Common.c  FMI1ModelExchange.c  FMI2Common.c  FMI2ModelExchange.c  FMICommon.c)
+
+SET(fmi_headers  FMI1Common.h  FMI2Common.h  FMICommon.h)
+
+# Library OpenModelicaFMIRuntimeC
+ADD_LIBRARY(OpenModelicaFMIRuntimeC ${fmi_sources} ${fmi_headers})
+
+# Install
+INSTALL(TARGETS OpenModelicaFMIRuntimeC
+    ARCHIVE DESTINATION lib/omc)
+

SimulationRuntime/c/fmi/FMI1CoSimulation.c

@@ -43,6 +43,8 @@ void* FMI1CoSimulationConstructor_OMC(int fmi_log_level, char* working_directory
     double timeout, int visible, int interactive, double tStart, int stopTimeDefined, double tStop)
 {
   FMI1CoSimulation* FMI1CS = malloc(sizeof(FMI1CoSimulation));
+  jm_status_enu_t status, instantiateSlaveStatus;
+  fmi1_status_t debugLoggingStatus;
   FMI1CS->FMILogLevel = fmi_log_level;
   /* JM callbacks */
   FMI1CS->JMCallbacks.malloc = malloc;
@@ -67,7 +69,7 @@ void* FMI1CoSimulationConstructor_OMC(int fmi_log_level, char* working_directory
     return 0;
   }
   /* Load the binary (dll/so) */
-  jm_status_enu_t status = fmi1_import_create_dllfmu(FMI1CS->FMIImportInstance, FMI1CS->FMICallbackFunctions, 0);
+  status = fmi1_import_create_dllfmu(FMI1CS->FMIImportInstance, FMI1CS->FMICallbackFunctions, 0);
   if (status == jm_status_error) {
     ModelicaFormatError("Loading of FMU dynamic link library failed with status : %s\n", jm_log_level_to_string(status));
     return 0;
@@ -81,13 +83,13 @@ void* FMI1CoSimulationConstructor_OMC(int fmi_log_level, char* working_directory
   FMI1CS->FMITimeOut = timeout;
   FMI1CS->FMIVisible = visible;
   FMI1CS->FMIInteractive = interactive;
-  jm_status_enu_t instantiateSlaveStatus = fmi1_import_instantiate_slave(FMI1CS->FMIImportInstance, FMI1CS->FMIInstanceName, FMI1CS->FMIFmuLocation, FMI1CS->FMIMimeType, FMI1CS->FMITimeOut, FMI1CS->FMIVisible, FMI1CS->FMIInteractive);
+  instantiateSlaveStatus = fmi1_import_instantiate_slave(FMI1CS->FMIImportInstance, FMI1CS->FMIInstanceName, FMI1CS->FMIFmuLocation, FMI1CS->FMIMimeType, FMI1CS->FMITimeOut, FMI1CS->FMIVisible, FMI1CS->FMIInteractive);
   if (instantiateSlaveStatus == jm_status_error) {
     ModelicaFormatError("fmiInstantiateSlave failed with status : %s\n", jm_log_level_to_string(instantiateSlaveStatus));
     return 0;
   }
   FMI1CS->FMIDebugLogging = debugLogging;
-  fmi1_status_t debugLoggingStatus = fmi1_import_set_debug_logging(FMI1CS->FMIImportInstance, FMI1CS->FMIDebugLogging);
+  debugLoggingStatus = fmi1_import_set_debug_logging(FMI1CS->FMIImportInstance, FMI1CS->FMIDebugLogging);
   if (debugLoggingStatus != fmi1_status_ok && debugLoggingStatus != fmi1_status_warning) {
     ModelicaFormatMessage("fmiSetDebugLogging failed with status : %s\n", fmi1_status_to_string(debugLoggingStatus));
   }

SimulationRuntime/c/fmi/FMI1ModelExchange.c

@@ -42,6 +42,8 @@ extern "C" {
 void* FMI1ModelExchangeConstructor_OMC(int fmi_log_level, char* working_directory, char* instanceName, int debugLogging)
 {
   FMI1ModelExchange* FMI1ME = malloc(sizeof(FMI1ModelExchange));
+  jm_status_enu_t status, instantiateModelStatus;
+  fmi1_status_t debugLoggingStatus;
   FMI1ME->FMILogLevel = fmi_log_level;
   /* JM callbacks */
   FMI1ME->JMCallbacks.malloc = malloc;
@@ -65,20 +67,20 @@ void* FMI1ModelExchangeConstructor_OMC(int fmi_log_level, char* working_director
     return 0;
   }
   /* Load the binary (dll/so) */
-  jm_status_enu_t status = fmi1_import_create_dllfmu(FMI1ME->FMIImportInstance, FMI1ME->FMICallbackFunctions, 0);
+  status = fmi1_import_create_dllfmu(FMI1ME->FMIImportInstance, FMI1ME->FMICallbackFunctions, 0);
   if (status == jm_status_error) {
     ModelicaFormatError("Loading of FMU dynamic link library failed with status : %s\n", jm_log_level_to_string(status));
     return 0;
   }
   FMI1ME->FMIInstanceName = (char*) malloc(strlen(instanceName)+1);
   strcpy(FMI1ME->FMIInstanceName, instanceName);
   FMI1ME->FMIDebugLogging = debugLogging;
-  jm_status_enu_t instantiateModelStatus = fmi1_import_instantiate_model(FMI1ME->FMIImportInstance, FMI1ME->FMIInstanceName);
+  instantiateModelStatus = fmi1_import_instantiate_model(FMI1ME->FMIImportInstance, FMI1ME->FMIInstanceName);
   if (instantiateModelStatus == jm_status_error) {
     ModelicaFormatError("fmiInstantiateModel failed with status : %s\n", jm_log_level_to_string(instantiateModelStatus));
     return 0;
   }
-  fmi1_status_t debugLoggingStatus = fmi1_import_set_debug_logging(FMI1ME->FMIImportInstance, FMI1ME->FMIDebugLogging);
+  debugLoggingStatus = fmi1_import_set_debug_logging(FMI1ME->FMIImportInstance, FMI1ME->FMIDebugLogging);
   if (debugLoggingStatus != fmi1_status_ok && debugLoggingStatus != fmi1_status_warning) {
     ModelicaFormatMessage("fmiSetDebugLogging failed with status : %s\n", fmi1_status_to_string(debugLoggingStatus));
   }

SimulationRuntime/c/fmi/FMI2Common.c

@@ -173,7 +173,6 @@ void fmi2SetInteger_OMC(void* in_fmi2, int numberOfValueReferences, double* inte
 void fmi2GetBoolean_OMC(void* in_fmi2, int numberOfValueReferences, double* booleanValuesReferences, double flowStatesInput, signed char* booleanValues, int fmiType)
 {
   if (fmiType == 1) {
-  int i;
     FMI2ModelExchange* FMI2ME = (FMI2ModelExchange*)in_fmi2;
     fmi2_value_reference_t* valuesReferences_int = real_to_fmi2_value_reference(numberOfValueReferences, booleanValuesReferences);
     int* fmiBoolean = malloc(sizeof(int)*numberOfValueReferences);
@@ -201,8 +200,9 @@ void fmi2SetBoolean_OMC(void* in_fmi2, int numberOfValueReferences, double* bool
     FMI2ModelExchange* FMI2ME = (FMI2ModelExchange*)in_fmi2;
     fmi2_value_reference_t* valuesReferences_int = real_to_fmi2_value_reference(numberOfValueReferences, booleanValuesReferences);
     int* fmiBoolean = malloc(sizeof(int)*numberOfValueReferences);
+	fmi2_status_t status;
     signedchar_to_int(booleanValues, fmiBoolean, numberOfValueReferences);
-    fmi2_status_t status = fmi2_import_set_boolean(FMI2ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, fmiBoolean);
+    status = fmi2_import_set_boolean(FMI2ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, fmiBoolean);
     free(fmiBoolean);
     free(valuesReferences_int);
     if (status != fmi2_status_ok && status != fmi2_status_warning) {

SimulationRuntime/c/fmi/FMI2ModelExchange.c

@@ -42,6 +42,7 @@ extern "C" {
 void* FMI2ModelExchangeConstructor_OMC(int fmi_log_level, char* working_directory, char* instanceName, int debugLogging)
 {
   FMI2ModelExchange* FMI2ME = malloc(sizeof(FMI2ModelExchange));
+  jm_status_enu_t status, instantiateModelStatus;
   FMI2ME->FMILogLevel = fmi_log_level;
   /* JM callbacks */
   FMI2ME->JMCallbacks.malloc = malloc;
@@ -66,15 +67,15 @@ void* FMI2ModelExchangeConstructor_OMC(int fmi_log_level, char* working_director
   FMI2ME->FMICallbackFunctions.freeMemory = free;
   FMI2ME->FMICallbackFunctions.componentEnvironment = FMI2ME->FMIImportInstance;
   /* Load the binary (dll/so) */
-  jm_status_enu_t status = fmi2_import_create_dllfmu(FMI2ME->FMIImportInstance, fmi2_import_get_fmu_kind(FMI2ME->FMIImportInstance), &FMI2ME->FMICallbackFunctions);
+  status = fmi2_import_create_dllfmu(FMI2ME->FMIImportInstance, fmi2_import_get_fmu_kind(FMI2ME->FMIImportInstance), &FMI2ME->FMICallbackFunctions);
   if (status == jm_status_error) {
     ModelicaFormatError("Loading of FMU dynamic link library failed with status : %s\n", jm_log_level_to_string(status));
     return 0;
   }
   FMI2ME->FMIInstanceName = (char*) malloc(strlen(instanceName)+1);
   strcpy(FMI2ME->FMIInstanceName, instanceName);
   FMI2ME->FMIDebugLogging = debugLogging;
-  jm_status_enu_t instantiateModelStatus = fmi2_import_instantiate(FMI2ME->FMIImportInstance, FMI2ME->FMIInstanceName, fmi2_model_exchange, NULL, fmi2_false);
+  instantiateModelStatus = fmi2_import_instantiate(FMI2ME->FMIImportInstance, FMI2ME->FMIInstanceName, fmi2_model_exchange, NULL, fmi2_false);
   if (instantiateModelStatus == jm_status_error) {
     ModelicaFormatError("fmi2InstantiateModel failed with status : %s\n", jm_log_level_to_string(instantiateModelStatus));
     return 0;
@@ -83,13 +84,15 @@ void* FMI2ModelExchangeConstructor_OMC(int fmi_log_level, char* working_director
   if (FMI2ME->FMIDebugLogging) {
     int i;
     size_t categoriesSize = 0;
+	fmi2_status_t debugLoggingStatus;
+	fmi2_string_t *categories;
     /* Read the log categories size */
     categoriesSize = fmi2_import_get_log_categories_num(FMI2ME->FMIImportInstance);
-    fmi2_string_t categories[categoriesSize];
+    categories = (fmi2_string_t*)malloc(categoriesSize*sizeof(fmi2_string_t));
     for (i = 0 ; i < categoriesSize ; i++) {
       categories[i] = fmi2_import_get_log_category(FMI2ME->FMIImportInstance, i);
     }
-    fmi2_status_t debugLoggingStatus = fmi2_import_set_debug_logging(FMI2ME->FMIImportInstance, FMI2ME->FMIDebugLogging, categoriesSize, categories);
+    debugLoggingStatus = fmi2_import_set_debug_logging(FMI2ME->FMIImportInstance, FMI2ME->FMIDebugLogging, categoriesSize, categories);
     if (debugLoggingStatus != fmi2_status_ok && debugLoggingStatus != fmi2_status_warning) {
       ModelicaFormatMessage("fmi2SetDebugLogging failed with status : %s\n", fmi1_status_to_string(debugLoggingStatus));
     }

SimulationRuntime/c/util/CMakeLists.txt

@@ -2,13 +2,15 @@
 SET(util_sources  base_array.c boolean_array.c omc_error.c division.c index_spec.c
           integer_array.c java_interface.c libcsv.c list.c memory_pool.c modelica_string.c
           read_write.c read_matlab4.c read_csv.c real_array.c ringbuffer.c
-          rtclock.c simulation_options.c string_array.c utility.c varinfo.c omc_msvc.c OldModelicaTables.c cJSON.o omc_mmap.c)
+          rtclock.c simulation_options.c string_array.c utility.c varinfo.c omc_msvc.c OldModelicaTables.c cJSON.o omc_mmap.c
+		  ModelicaUtilities.c)
 
 
 SET(util_headers  base_array.h boolean_array.h division.h omc_error.h index_spec.h integer_array.h
                   java_interface.h jni.h jni_md.h jni_md_solaris.h jni_md_windows.h list.h memory_pool.h
           modelica.h modelica_string.h read_write.h read_matlab4.h real_array.h
-          ringbuffer.h rtclock.h simulation_options.h string_array.h utility.h varinfo.h omc_mmap.h)
+          ringbuffer.h rtclock.h simulation_options.h string_array.h utility.h varinfo.h omc_mmap.h
+		  ../ModelicaUtilities.h)
 
 if(MSVC)
     INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/3rdParty/regex-0.12)

SimulationRuntime/c/util/ModelicaUtilities.c

@@ -63,8 +63,8 @@ void OpenModelica_Simulation_ModelicaVFormatError(const char*string, va_list arg
   va_throwStreamPrint(NULL, string, args);
 }
 
-MODELICA_NORETURN void (*OpenModelica_ModelicaError)(const char*) MODELICA_NORETURNATTR = OpenModelica_Simulation_ModelicaError;
-MODELICA_NORETURN void (*OpenModelica_ModelicaVFormatError)(const char*,va_list) MODELICA_NORETURNATTR = OpenModelica_Simulation_ModelicaVFormatError;
+void (*OpenModelica_ModelicaError)(const char*) MODELICA_NORETURNATTR = OpenModelica_Simulation_ModelicaError;
+void (*OpenModelica_ModelicaVFormatError)(const char*,va_list) MODELICA_NORETURNATTR = OpenModelica_Simulation_ModelicaVFormatError;
 
 void ModelicaError(const char* string) {
   OpenModelica_ModelicaError(string);