- fix for fmu with nonlinear systems, call allocateNonlinearSystem be…

…fore simulate - fixes to compile fmu with visual studio git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13861 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 11, 2012 · b0a564a · b0a564a
1 parent 09dcbcf
commit b0a564a
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 22 deletions.
diff --git a/SimulationRuntime/c/CMakeLists.txt b/SimulationRuntime/c/CMakeLists.txt
@@ -281,6 +281,27 @@ ENDMACRO(BUILDMODELMOS)
 # MACRO BUILDMODEL
 MACRO(BUILDMODELFMU model dir Flags CSRC)
 
+IF(WIN32)
+  SET(COPY copy)
+else(WIN32)
+  SET(COPY cp)
+endif(WIN32)
+
+IF(SUNDIALS_INCLUDE_DIR AND
+   SUNDIALS_LIBRARY_CVODE AND
+   SUNDIALS_LIBRARY_IDA AND
+   SUNDIALS_LIBRARY_NVEC AND
+   SUNDIALS_KINSOL)
+
+  INCLUDE_DIRECTORIES(${SUNDIALS_INCLUDE_DIR})
+  SET(SUNDIALS_LIBRARIES ${SUNDIALS_LIBRARY_CVODE} ${SUNDIALS_LIBRARY_IDA} ${SUNDIALS_LIBRARY_NVEC} ${SUNDIALS_KINSOL}) 
+
+ENDIF(SUNDIALS_INCLUDE_DIR AND
+      SUNDIALS_LIBRARY_CVODE AND
+      SUNDIALS_LIBRARY_IDA AND
+   SUNDIALS_LIBRARY_NVEC AND 
+   SUNDIALS_KINSOL)
+
   # includes
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
@@ -327,9 +348,9 @@ MACRO(BUILDMODELFMU model dir Flags CSRC)
   # target fuer OM_OUTPUT
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
-  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/c_runtime/fmu_model_interface.h
-                   ${OMCTRUNCHOME}/c_runtime/fmiModelFunctions.h
-				   ${OMCTRUNCHOME}/c_runtime/fmiModelTypes.h)
+  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmu_model_interface.h
+                   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelFunctions.h
+				   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelTypes.h)
 
   ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
   TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat initialization)
@@ -347,6 +368,27 @@ ENDMACRO(BUILDMODELFMU)
 # MACRO BUILDMODEL
 MACRO(BUILDMODELFMUMOS model mos Flags CSRC)
 
+IF(WIN32)
+  SET(COPY copy)
+else(WIN32)
+  SET(COPY cp)
+endif(WIN32)
+
+IF(SUNDIALS_INCLUDE_DIR AND
+   SUNDIALS_LIBRARY_CVODE AND
+   SUNDIALS_LIBRARY_IDA AND
+   SUNDIALS_LIBRARY_NVEC AND
+   SUNDIALS_KINSOL)
+
+  INCLUDE_DIRECTORIES(${SUNDIALS_INCLUDE_DIR})
+  SET(SUNDIALS_LIBRARIES ${SUNDIALS_LIBRARY_CVODE} ${SUNDIALS_LIBRARY_IDA} ${SUNDIALS_LIBRARY_NVEC} ${SUNDIALS_KINSOL}) 
+
+ENDIF(SUNDIALS_INCLUDE_DIR AND
+      SUNDIALS_LIBRARY_CVODE AND
+      SUNDIALS_LIBRARY_IDA AND
+   SUNDIALS_LIBRARY_NVEC AND 
+   SUNDIALS_KINSOL)
+
   # includes
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/linearization)
@@ -358,8 +400,8 @@ MACRO(BUILDMODELFMUMOS model mos Flags CSRC)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/libf2c)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/results)
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simulation/solver/initialization)
-  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/simulation/solver/initialization)
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/c/util) 
   INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/SimulationRuntime/fmi/export) 
 
   # OMDEV PATH
@@ -370,33 +412,34 @@ MACRO(BUILDMODELFMUMOS model mos Flags CSRC)
   INCLUDE_DIRECTORIES(${OMDEV}/lib/expat-win32-msvc)
   link_directories(${OMDEV}/lib/expat-win32-msvc)  
 
-  SET(OMC_MODELNAME ${model})  
+  STRING(REPLACE "." "_" FMU_MODELNAME ${model})
   # generate model.mos 
 
   # Variablen fuer openmodelica2sarturis
-  SET(OMC_CODE   ${CMAKE_CURRENT_BINARY_DIR}/${model}.c
-                 ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.c
-                 ${CMAKE_CURRENT_BINARY_DIR}/${model}_init.txt)
-  SET(OMC_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${model}.c
-                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_FMU.c
-  #               ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
-				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
-				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
+  SET(OMC_CODE   ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}.c
+                 ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.c
+                 ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_init.txt)
+  SET(OMC_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}.c
+                  ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_FMU.c
+  #               ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.cpp
+				  ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_functions.h
+				  ${CMAKE_CURRENT_BINARY_DIR}/${FMU_MODELNAME}_records.c)
   # custom command fuer openmodelicacompiler
   ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
                      COMMAND ${OMC_DEBUG} ${Flags} ${mos}
                      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                     COMMENT "Erzeuge Code fuer ${model} with ${OMC_DEBUG}")
+                     COMMENT "Erzeuge Code fuer ${model} with ${OMC_DEBUG} in ${CMAKE_CURRENT_BINARY_DIR}")
   # target fuer OM_OUTPUT
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
-  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/c_runtime/fmu_model_interface.h
-                   ${OMCTRUNCHOME}/c_runtime/fmiModelFunctions.h
-				   ${OMCTRUNCHOME}/c_runtime/fmiModelTypes.h)
+  SET(OMC_FMU_CODE ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmu_model_interface.h
+                   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelFunctions.h
+				   ${OMCTRUNCHOME}/SimulationRuntime/fmi/export/fmiModelTypes.h)
 
-  ADD_DEFINITIONS(/TP ${model}.c)
+  ADD_DEFINITIONS(/TP ${FMU_MODELNAME}.c)
+  set_source_files_properties(${OMC_OUTPUT} PROPERTIES LANGUAGE CXX)
   ADD_LIBRARY(${model} SHARED ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
-  TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver f2c meta ModelicaExternalC libexpat initialization)
+  TARGET_LINK_LIBRARIES(${model} simulation util math-support results solver meta f2c ModelicaExternalC libexpat initialization ${SUNDIALS_LIBRARIES})
 
   # Dependencies
   ADD_DEPENDENCIES(${model} ${model}codegen)

diff --git a/SimulationRuntime/c/openmodelica_func.h b/SimulationRuntime/c/openmodelica_func.h
@@ -60,6 +60,7 @@ extern "C" {
 #include "nonlinearSystem.h"
 
 /* DATA* initializeDataStruc(); */ /*create in model code */
+extern void setupDataStruc(DATA *data);
 extern void setupDataStruc2(DATA *data);
 
 /* Function for calling external object constructors */

diff --git a/SimulationRuntime/c/simulation/solver/events.c b/SimulationRuntime/c/simulation/solver/events.c
@@ -41,6 +41,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 double bisection(DATA* data, double*, double*, double*, double*, LIST*, LIST*);
 modelica_boolean checkZeroCrossings(DATA *data, LIST *list, LIST*);
@@ -768,3 +771,6 @@ void saveZeroCrossingsAfterEvent(DATA* data)
   }
 }
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/SimulationRuntime/c/simulation/solver/events.h b/SimulationRuntime/c/simulation/solver/events.h
@@ -39,6 +39,10 @@
 #include "solver_main.h"
 #include "list.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 modelica_boolean sample(DATA *data, double start, double interval, int hindex);
 void initSample(DATA *data, double start, double stop);
 modelica_boolean activateSampleEvents(DATA *data);
@@ -54,4 +58,8 @@ int handleSampleEvent(DATA* data);
 
 void findRoot(DATA *data, LIST *eventList, double*);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/SimulationRuntime/c/util/real_array.c b/SimulationRuntime/c/util/real_array.c
@@ -891,7 +891,7 @@ void usub_real_array(real_array_t* a)
     }
 }
 
-void usub_alloc_real_array(real_array_t* a, real_array_t* dest)
+void usub_alloc_real_array(const real_array_t* a, real_array_t* dest)
 {
     size_t nr_of_elements, i;
     clone_real_array_spec(a,dest);

diff --git a/SimulationRuntime/c/util/real_array.h b/SimulationRuntime/c/util/real_array.h
@@ -152,7 +152,7 @@ extern void add_real_array(const real_array_t * a, const real_array_t * b, real_
 
 /* Unary subtraction */
 extern void usub_real_array(real_array_t* a);
-extern void usub_alloc_real_array(real_array_t* a, real_array_t* dest);
+extern void usub_alloc_real_array(const real_array_t* a, real_array_t* dest);
 extern void sub_real_array(const real_array_t * a, const real_array_t * b, real_array_t* dest);
 extern void sub_alloc_real_array(const real_array_t * a, const real_array_t * b, real_array_t* dest);
 

diff --git a/SimulationRuntime/fmi/export/fmu_model_interface.c b/SimulationRuntime/fmi/export/fmu_model_interface.c
@@ -527,6 +527,8 @@ fmiStatus fmiInitialize(fmiComponent c, fmiBoolean toleranceControlled, fmiReal
   //input_function(comp->fmuData);
   /* initial sample and delay before initial the system */
   callExternalObjectConstructors(comp->fmuData);
+  /* allocate memory for non-linear system solvers */
+  allocateNonlinearSystem(comp->fmuData);
   /*TODO: Simulation stop time is need to calculate in before hand all sample events
           We shouldn't generate them all in beforehand */
   initSample(comp->fmuData, comp->fmuData->localData[0]->timeValue,  100 /*should be stopTime*/);
@@ -647,6 +649,8 @@ fmiStatus fmiTerminate(fmiComponent c){
 
   /* deinitDelay(comp->fmuData); */
   callExternalObjectDestructors(comp->fmuData);
+  /* free nonlinear system data */
+  freeNonlinearSystem(comp->fmuData);
   deInitializeDataStruc(comp->fmuData);
   comp->functions.freeMemory(comp->fmuData);