- c_runtime/CMakeLists.txt, c_runtime/ModelicaExternalC/CMakeLists.txt

  - add ModelicaExternalC to CMake
  - add macro for fmu
- c_runtime/fmu_model_interface.c, c_runtime/fmu_model_interface.h
  - bugfixes for visual studio
- SimCode
  - add model name to message for translated to FMU
- testsuite/libraries/msl31/simulate
  - add testcases for simulation of examples with start and end values 

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

Author: Jens Frenkel

Compiler/BackEnd/SimCode.mo

@@ -819,7 +819,7 @@ algorithm
   (outCache,outValue,outInteractiveSymbolTable,outBackendDAE,outStringLst,outFileDir,resultValues):=
   matchcontinue (inCache,inEnv,className,inInteractiveSymbolTable,inFileNamePrefix,addDummy, inSimSettingsOpt)
     local
-      String filenameprefix,file_dir;
+      String filenameprefix,file_dir,resstr;
       list<SCode.Class> p_1;
       DAE.DAElist dae;
       list<Env.Frame> env;
@@ -879,8 +879,17 @@ algorithm
            ("timeBackend",  Values.REAL(timeBackend)),
            ("timeFrontend", Values.REAL(timeFrontend))
            };   
+        resstr = Absyn.pathString(className);
+        resstr = stringAppendList({"SimCode: The model ",resstr," has been translated to FMU"});
       then
-        (cache,Values.STRING("SimCode: The model has been translated to FMU"),st,indexed_dlow,libs,file_dir, resultValues);
+        (cache,Values.STRING(resstr),st,indexed_dlow_1,libs,file_dir, resultValues);
+    case (_,_,className,_,_,_, _)
+      equation        
+        resstr = Absyn.pathString(className);
+        resstr = stringAppendList({"SimCode: The model ",resstr," could not been translated to FMU"});
+        Error.addMessage(Error.INTERNAL_ERROR, {resstr});
+      then
+        fail();        
   end matchcontinue;
 end translateModelFMU;
 

c_runtime/CMakeLists.txt

@@ -7,6 +7,7 @@ MESSAGE(" omc is " ${OMC_DEBUG})
 
 ADD_SUBDIRECTORY(libf2c)
 ADD_SUBDIRECTORY(sendData)
+ADD_SUBDIRECTORY(ModelicaExternalC)
 
 # -------------------------------------------------------------
 # MACRO definitions
@@ -42,7 +43,10 @@ MACRO(BUILDMODEL model dir Flags CSRC)
   SET(OMC_CODE   ${CMAKE_CURRENT_BINARY_DIR}/${model}.cpp
                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_init.txt)
-  SET(OMC_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${model}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h)
+  SET(OMC_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${model}.cpp
+                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
+				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
+				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
 
   # custom command fuer openmodelicacompiler
   ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
@@ -54,7 +58,7 @@ MACRO(BUILDMODEL model dir Flags CSRC)
   ADD_CUSTOM_TARGET(${model}codegen ALL DEPENDS ${OMC_OUTPUT})
 
   ADD_EXECUTABLE(${model} ${OMC_OUTPUT} ${CSRC})
-  TARGET_LINK_LIBRARIES(${model} sim c_runtime f2c sendData)
+  TARGET_LINK_LIBRARIES(${model} sim c_runtime f2c sendData ModelicaExternalC)
 
   # Dependencies
   ADD_DEPENDENCIES(${model} ${model}codegen)
@@ -66,6 +70,50 @@ MACRO(BUILDMODEL model dir Flags CSRC)
 #ENDFOREACH(model ${model_sources})
 ENDMACRO(BUILDMODEL)
 
+# MACRO BUILDMODEL
+MACRO(BUILDMODELFMU model dir Flags CSRC)
+
+  INCLUDE_DIRECTORIES(${OMCTRUNCHOME}/c_runtime)
+
+  SET(OMC_MODELNAME ${model})  
+  SET(OMC_MODELDIR ${dir})  
+  # generate model.mos 
+  FIND_FILE(MOSFILE_IN model_fmu.in PATHS ${OMCTRUNCHOME}/c_runtime)
+  CONFIGURE_FILE(${MOSFILE_IN} ${dir}/${model}.mos)
+  
+  # Variablen fuer openmodelica2sarturis
+  SET(OMC_CODE   ${CMAKE_CURRENT_BINARY_DIR}/${model}.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/${model}_init.txt)
+  SET(OMC_OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/${model}.cpp
+                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_FMU.cpp
+                  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.cpp
+				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_functions.h
+				  ${CMAKE_CURRENT_BINARY_DIR}/${model}_records.c)
+  # custom command fuer openmodelicacompiler
+  ADD_CUSTOM_COMMAND(OUTPUT ${OMC_OUTPUT}
+                     COMMAND ${OMC_DEBUG} ${Flags} ${dir}/${model}.mos
+                     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                     COMMENT "Erzeuge Code fuer ${model} with ${OMC_DEBUG}")
+  # 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)
+  
+  ADD_LIBRARY(${model} ${OMC_OUTPUT} ${CSRC} ${OMC_FMU_CODE})
+  TARGET_LINK_LIBRARIES(${model} sim c_runtime f2c sendData ModelicaExternalC)
+
+  # Dependencies
+  ADD_DEPENDENCIES(${model} ${model}codegen)
+  
+  IF(MODELS_INSTALL)
+    INSTALL(TARGETS ${model} ARCHIVE DESTINATION ${MODELS_INSTALL_PATH})
+    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${model}_init.txt DESTINATION ${MODELS_INSTALL_PATH})
+  ENDIF(MODELS_INSTALL)
+#ENDFOREACH(model ${model_sources})
+ENDMACRO(BUILDMODELFMU)
 
 
 # Check if example files are to be exported
@@ -137,7 +185,7 @@ if(WIN32)
 #add_definitions(/MT)
 endif(WIN32)
 ADD_LIBRARY(sim ${sim_sources} ${sim_headers})
-TARGET_LINK_LIBRARIES(sim c_runtime f2c)
+TARGET_LINK_LIBRARIES(sim c_runtime f2c ModelicaExternalC)
 
 # Install
 INSTALL(TARGETS c_runtime sim

c_runtime/ModelicaExternalC/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Sources and Headers
+set(ModelicaExternalC_sources ModelicaInternal.c ModelicaStrings.c ModelicaTablesImpl.c)
+
+SET(ModelicaExternalC_headers ModelicaTables.h) 
+
+# Library ModelicaExternalC
+add_library(ModelicaExternalC  ${ModelicaExternalC_sources} ${ModelicaExternalC_headers})
+
+# Install
+INSTALL(TARGETS ModelicaExternalC
+		ARCHIVE DESTINATION lib)
+INSTALL(FILES f2c.h DESTINATION include)
+