+ Update include paths for FMI/FMU and bootstrapping.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19148 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 17, 2014 · 3198203 · 3198203
1 parent 1408d0d
commit 3198203
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 46 deletions.
diff --git a/Compiler/Template/CodegenFMU.tpl b/Compiler/Template/CodegenFMU.tpl
@@ -414,13 +414,13 @@ case SIMCODE(__) then
   #include "openmodelica.h"
   #include "openmodelica_func.h"
   #include "simulation_data.h"
-  #include "omc_error.h"
+  #include "util/omc_error.h"
   #include "<%fileNamePrefix%>_functions.h"
   #include "<%fileNamePrefix%>_literals.h"
   #include "fmiModelTypes.h"
   #include "fmiModelFunctions.h"
-  #include "initialization.h"
-  #include "events.h"
+  #include "simulation/solver/initialization/initialization.h"
+  #include "simulation/solver/events.h"
   #include "fmu_model_interface.h"
 
   #ifdef __cplusplus

diff --git a/Makefile.common b/Makefile.common
@@ -38,6 +38,7 @@ mkbuilddirs:
 	mkdir -p $(builddir_inc)/simulation
 	mkdir -p $(builddir_inc)/simulation/results
 	mkdir -p $(builddir_inc)/simulation/solver
+	mkdir -p $(builddir_inc)/simulation/solver/initialization
 	mkdir -p $(builddir_inc)/meta
 	mkdir -p $(builddir_inc)/meta/gc
 	mkdir -p $(builddir_inc)/util

diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -40,7 +40,9 @@ RUNTIMESIMSOLVER_HEADERS = ./simulation/solver/delay.h \
 ./simulation/solver/simulation_inline_solver.h \
 ./simulation/solver/stateset.h \
 ./simulation/solver/perform_simulation.c \
-./simulation/solver/dassl.h 
+./simulation/solver/dassl.h \
+./simulation/solver/events.h \
+./simulation/solver/solver_main.h 
 
 RUNTIMEMETA_HEADERS = ./meta/meta_modelica_builtin_boxptr.h \
 ./meta/meta_modelica_builtin.h \
@@ -77,14 +79,18 @@ RUNTIMEUTIL_HEADERS = ./util/ModelicaUtilities.h \
 ./util/string_array.h \
 ./util/utility.h \
 ./util/varinfo.h \
+./util/list.h 
 
-
-RUNTIME_HEADERS_FMU = \
+RUNTIMEINITIALIZATION_HEADERS = \
 ./simulation/solver/initialization/initialization.h \
-./simulation/solver/initialization/initialization_data.h \
-./simulation/solver/events.h \
-./simulation/solver/solver_main.h \
-./util/list.h \
+./simulation/solver/initialization/initialization_data.h 
+
+# RUNTIME_HEADERS_FMU = \
+# ./simulation/solver/initialization/initialization.h \
+# ./simulation/solver/initialization/initialization_data.h \
+# ./simulation/solver/events.h \
+# ./simulation/solver/solver_main.h \
+# ./util/list.h \
 
 .PHONY : clean all $(LIBF2C)
 
@@ -197,6 +203,7 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
 	cp -p $(RUNTIMESIMULATION_HEADERS) $(builddir_inc)/simulation
 	cp -p $(RUNTIMESIMRESULTS_HEADERS) $(builddir_inc)/simulation/results
 	cp -p $(RUNTIMESIMSOLVER_HEADERS) $(builddir_inc)/simulation/solver
+	cp -p $(RUNTIMEINITIALIZATION_HEADERS) $(builddir_inc)/simulation/solver/initialization
 	cp -p $(RUNTIMEMETA_HEADERS) $(builddir_inc)/meta
 	cp -p $(RUNTIMEMETAGC_HEADERS) $(builddir_inc)/meta/gc
 	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/util

diff --git a/SimulationRuntime/c/simulation/solver/dassl.c b/SimulationRuntime/c/simulation/solver/dassl.c
@@ -35,14 +35,14 @@
 #include "openmodelica_func.h"
 #include "simulation_data.h"
 
-#include "omc_error.h"
-#include "memory_pool.h"
+#include "util/omc_error.h"
+#include "util/memory_pool.h"
 
-#include "simulation_runtime.h"
-#include "solver_main.h"
-#include "model_help.h"
+#include "simulation/simulation_runtime.h"
+#include "simulation/solver/solver_main.h"
+#include "simulation/solver/model_help.h"
 
-#include "dassl.h"
+#include "simulation/solver/dassl.h"
 #include "f2c.h"
 
 static const char *dasslMethodStr[DASSL_MAX] = {"unknown",

diff --git a/SimulationRuntime/c/simulation/solver/dassl.h b/SimulationRuntime/c/simulation/solver/dassl.h
@@ -31,7 +31,7 @@
 #ifndef DASSL_H
 #define DASSL_H
 
-#include "solver_main.h"
+#include "simulation/solver/solver_main.h"
 
 #define DDASRT ddasrt_
 

diff --git a/SimulationRuntime/c/simulation/solver/delay.c b/SimulationRuntime/c/simulation/solver/delay.c
@@ -31,10 +31,10 @@
 /*! \file delay.c
  */
 
-#include "delay.h"
-#include "omc_error.h"
+#include "simulation/solver/delay.h"
+#include "util/omc_error.h"
 #include "simulation_data.h"
-#include "ringbuffer.h"
+#include "util/ringbuffer.h"
 #include "openmodelica.h"
 
 #include <stdio.h>

diff --git a/SimulationRuntime/c/simulation/solver/dopri45.c b/SimulationRuntime/c/simulation/solver/dopri45.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "simulation_runtime.h"
+#include "simulation/simulation_runtime.h"
 #include "dopri45.h"
 #include <stdlib.h>
 #include <math.h>

diff --git a/SimulationRuntime/c/simulation/solver/events.c b/SimulationRuntime/c/simulation/solver/events.c
@@ -28,16 +28,16 @@
  *
  */
 
-#include "events.h"
-#include "omc_error.h"
-#include "options.h"
+#include "simulation/solver/events.h"
+#include "util/omc_error.h"
+#include "simulation/options.h"
 #include "simulation_data.h"
-#include "simulation_result.h"
+#include "simulation/results/simulation_result.h"
 #include "openmodelica.h"         /* for modelica types */
 #include "openmodelica_func.h"    /* for modelica fucntion */
-#include "simulation_runtime.h"
-#include "solver_main.h"
-#include "model_help.h"
+#include "simulation/simulation_runtime.h"
+#include "simulation/solver/solver_main.h"
+#include "simulation/solver/model_help.h"
 
 #include <math.h>
 #include <stdio.h>

diff --git a/SimulationRuntime/c/simulation/solver/events.h b/SimulationRuntime/c/simulation/solver/events.h
@@ -36,8 +36,8 @@
 #define _EVENTS_H_
 
 #include "simulation_data.h"
-#include "solver_main.h"
-#include "list.h"
+#include "simulation/solver/solver_main.h"
+#include "util/list.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization.c b/SimulationRuntime/c/simulation/solver/initialization/initialization.c
@@ -40,7 +40,7 @@
 #include "method_ipopt.h"
 
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
 #include "model_help.h"

diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization_data.h b/SimulationRuntime/c/simulation/solver/initialization/initialization_data.h
@@ -36,7 +36,7 @@
 #define _INITIALIZATION_DATA_H_
 
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 
 typedef struct INIT_DATA
 {

diff --git a/SimulationRuntime/c/simulation/solver/initialization/method_ipopt.c b/SimulationRuntime/c/simulation/solver/initialization/method_ipopt.c
@@ -34,7 +34,7 @@
 #include "../../../../Compiler/runtime/config.h"
 #include "method_ipopt.h"
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 
 #ifdef WITH_IPOPT
   #include "openmodelica.h"

diff --git a/SimulationRuntime/c/simulation/solver/initialization/method_kinsol.c b/SimulationRuntime/c/simulation/solver/initialization/method_kinsol.c
@@ -34,7 +34,7 @@
 #include "../../../../Compiler/runtime/config.h"
 #include "method_kinsol.h"
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 
 #ifdef WITH_SUNDIALS
   #include "openmodelica.h"

diff --git a/SimulationRuntime/c/simulation/solver/initialization/method_nelderMeadEx.c b/SimulationRuntime/c/simulation/solver/initialization/method_nelderMeadEx.c
@@ -33,7 +33,7 @@
 
 #include "method_nelderMeadEx.h"
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
 #include "model_help.h"

diff --git a/SimulationRuntime/c/simulation/solver/initialization/method_newuoa.c b/SimulationRuntime/c/simulation/solver/initialization/method_newuoa.c
@@ -33,7 +33,7 @@
 
 #include "method_newuoa.h"
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
 #include "model_help.h"

diff --git a/SimulationRuntime/c/simulation/solver/initialization/method_simplex.c b/SimulationRuntime/c/simulation/solver/initialization/method_simplex.c
@@ -33,7 +33,7 @@
 
 #include "method_newuoa.h"
 #include "simulation_data.h"
-#include "omc_error.h"
+#include "util/omc_error.h"
 #include "openmodelica.h"
 #include "openmodelica_func.h"
 #include "model_help.h"

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.h b/SimulationRuntime/c/simulation/solver/solver_main.h
@@ -40,7 +40,7 @@
 
 #include "openmodelica.h"
 #include "simulation_data.h"
-#include "list.h"
+#include "util/list.h"
 
 typedef struct SOLVER_INFO
 {

diff --git a/SimulationRuntime/fmi/export/fmu_model_interface.c b/SimulationRuntime/fmi/export/fmu_model_interface.c
@@ -29,14 +29,14 @@
  *
  */
 #include "simulation_data.h"
-#include "stateset.h"
-#include "model_help.h"
-#include "nonlinearSystem.h"
-#include "linearSystem.h"
-#include "mixedSystem.h"
-#include "delay.h"
-#include "simulation_info_xml.h"
-#include "simulation_input_xml.h"
+#include "simulation/solver/stateset.h"
+#include "simulation/solver/model_help.h"
+#include "simulation/solver/nonlinearSystem.h"
+#include "simulation/solver/linearSystem.h"
+#include "simulation/solver/mixedSystem.h"
+#include "simulation/solver/delay.h"
+#include "simulation/simulation_info_xml.h"
+#include "simulation/simulation_input_xml.h"
 
 // array of value references of states
 #if NUMBER_OF_STATES>0