Fix includes in Simulation runtime. Keep them relative. Keep simulati…

…on runtime header structure in build directory.

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

Compiler/Template/CodegenC.tpl

@@ -512,7 +512,7 @@ template simulationFile(SimCode simCode, String guid)
     <%simulationFileHeader(simCode)%>  
 
     #define prefixedName_performSimulation <%symbolName(modelNamePrefixStr,"performSimulation")%>
-    #include <perform_simulation.c>
+    #include <simulation/solver/perform_simulation.c>
 
     /* dummy VARINFO and FILEINFO */
     const FILE_INFO dummyFILE_INFO = omc_dummyFileInfo;
@@ -700,14 +700,14 @@ template simulationFileHeader(SimCode simCode)
     #include "openmodelica.h"
     #include "openmodelica_func.h"
     #include "simulation_data.h"
-    #include "simulation_info_xml.h"
-    #include "simulation_runtime.h"
-    #include "omc_error.h"
-    #include "model_help.h"
-    #include "delay.h"
-    #include "linearSystem.h"
-    #include "nonlinearSystem.h"
-    #include "mixedSystem.h"
+    #include "simulation/simulation_info_xml.h"
+    #include "simulation/simulation_runtime.h"
+    #include "util/omc_error.h"
+    #include "simulation/solver/model_help.h"
+    #include "simulation/solver/delay.h"
+    #include "simulation/solver/linearSystem.h"
+    #include "simulation/solver/nonlinearSystem.h"
+    #include "simulation/solver/mixedSystem.h"
 
     #include <assert.h>
     #include <string.h>
@@ -2654,7 +2654,7 @@ template functionODE(list<list<SimEqSystem>> derivativEquations, Text method, Op
     return 0;
   }
 
-  #include <simulation_inline_solver.h>
+  #include <simulation/solver/simulation_inline_solver.h>
   const char *_omc_force_solver=_OMC_FORCE_SOLVER;
   const int inline_work_states_ndims=_OMC_SOLVER_WORK_STATES_NDIMS;
   <%match method
@@ -4051,7 +4051,7 @@ template recordsFile(String filePrefix, list<RecordDeclaration> recordDecls)
 ::=
   <<
   /* Additional record code for <%filePrefix%> generated by the OpenModelica Compiler <%getVersionNr()%>. */
-  #include "meta_modelica.h"
+  #include "meta/meta_modelica.h"
 
   <%recordDecls |> rd => recordDeclaration(rd) ;separator="\n\n"%>
 
@@ -4066,7 +4066,7 @@ template simulationFunctionsHeaderFile(String filePrefix, list<Function> functio
   #ifndef <%stringReplace(filePrefix,".","_")%>__H
   #define <%stringReplace(filePrefix,".","_")%>__H
   <%commonHeader(filePrefix)%>
-  #include "simulation_runtime.h"
+  #include "simulation/simulation_runtime.h"
   #ifdef __cplusplus
   extern "C" {
   #endif
@@ -4338,9 +4338,9 @@ template commonHeader(String filePrefix)
 ::=
   <<
   <% if acceptMetaModelicaGrammar() then "#define __OPENMODELICA__METAMODELICA"%>
-  <% if acceptMetaModelicaGrammar() then "#include \"meta_modelica.h\"" %>
+  <% if acceptMetaModelicaGrammar() then "#include \"meta/meta_modelica.h\"" %>
 
-  #include "modelica.h"
+  #include "util/modelica.h"
   #include <stdio.h>
   #include <stdlib.h>
   #include <errno.h>
@@ -4370,7 +4370,7 @@ template functionsFile(String filePrefix,
   <% /* Note: The literals may not be part of the header due to separate compilation */
      literals |> literal hasindex i0 fromindex 0 => literalExpConst(literal,i0) ; separator="\n";empty
   %>
-  #include "modelica.h"
+  #include "util/modelica.h"
   <% if mainFunction then
   <<
   void (*omc_assert)(FILE_INFO info,const char *msg,...) = omc_assert_function;
@@ -10573,7 +10573,7 @@ let name = ("omc_" + underscorePath(entryPoint))
 <<
 /* This is an automatically generated entry point to a MetaModelica function */
 
-#include <meta_modelica.h>
+#include <meta/meta_modelica.h>
 #include <stdio.h>
 extern void <%name%>(threadData_t*,modelica_metatype);
 

Makefile.common

@@ -33,6 +33,14 @@ mkbuilddirs:
 	mkdir -p $(builddir_lib)/python
 	mkdir -p $(builddir_lib)/python/omniORB
 	mkdir -p $(builddir_inc)
+	mkdir -p $(builddir_inc)/linearization
+	mkdir -p $(builddir_inc)/optimization
+	mkdir -p $(builddir_inc)/simulation
+	mkdir -p $(builddir_inc)/simulation/results
+	mkdir -p $(builddir_inc)/simulation/solver
+	mkdir -p $(builddir_inc)/meta
+	mkdir -p $(builddir_inc)/meta/gc
+	mkdir -p $(builddir_inc)/util
 	mkdir -p $(builddir_java)
 	mkdir -p $(builddir_share)/omc/scripts/PythonInterface/OMPython/OMParser
 	mkdir -p $(builddir_share)/omc/scripts/PythonInterface/PySimulator

SimulationRuntime/c/Makefile.common

@@ -16,34 +16,46 @@ builddir = ../../build
 RUNTIME_HEADERS = $(LIBF2CHEADER) \
 ./omc_inline.h \
 ./math-support/blaswrap.h \
-./meta/gc/common.h \
-./meta/gc/mmc_gc.h \
-./meta/gc/generational.h \
-./meta/gc/marksweep.h \
-./meta/gc/roots.h \
-./meta/meta_modelica_builtin_boxptr.h \
-./meta/meta_modelica_builtin.h \
-./meta/meta_modelica.h \
-./meta/meta_modelica_real.h \
-./meta/meta_modelica_segv.h \
-./meta/meta_modelica_string_lit.h \
 ./openmodelica_func.h \
 ./openmodelica.h \
-./simulation_data.h \
-./simulation/modelinfo.h \
+./simulation_data.h 
+
+RUNTIMELINEAR_HEADERS = ./linearization/linearize.h 
+
+RUNTIMEOPTIMZ_HEADERS = ./optimization/interfaceOptimization.h 
+
+RUNTIMESIMULATION_HEADERS = ./simulation/modelinfo.h \
 ./simulation/options.h \
 ./simulation/simulation_info_xml.h \
 ./simulation/simulation_input_xml.h \
-./simulation/simulation_runtime.h \
-./simulation/solver/delay.h \
+./simulation/simulation_runtime.h 
+
+RUNTIMESIMRESULTS_HEADERS = ./simulation/results/simulation_result.h  
+
+RUNTIMESIMSOLVER_HEADERS = ./simulation/solver/delay.h \
 ./simulation/solver/mixedSystem.h \
 ./simulation/solver/linearSystem.h \
 ./simulation/solver/model_help.h \
 ./simulation/solver/nonlinearSystem.h \
 ./simulation/solver/simulation_inline_solver.h \
 ./simulation/solver/stateset.h \
-./simulation/results/simulation_result.h \
-./util/ModelicaUtilities.h \
+./simulation/solver/perform_simulation.c \
+./simulation/solver/dassl.h 
+
+RUNTIMEMETA_HEADERS = ./meta/meta_modelica_builtin_boxptr.h \
+./meta/meta_modelica_builtin.h \
+./meta/meta_modelica.h \
+./meta/meta_modelica_real.h \
+./meta/meta_modelica_segv.h \
+./meta/meta_modelica_string_lit.h 
+
+RUNTIMEMETAGC_HEADERS = ./meta/gc/common.h \
+./meta/gc/mmc_gc.h \
+./meta/gc/generational.h \
+./meta/gc/marksweep.h \
+./meta/gc/roots.h 
+
+RUNTIMEUTIL_HEADERS = ./util/ModelicaUtilities.h \
 ./util/base_array.h \
 ./util/boolean_array.h \
 ./util/division.h \
@@ -65,10 +77,6 @@ RUNTIME_HEADERS = $(LIBF2CHEADER) \
 ./util/string_array.h \
 ./util/utility.h \
 ./util/varinfo.h \
-./linearization/linearize.h \
-./simulation/solver/perform_simulation.c \
-./optimization/interfaceOptimization.h \
-./simulation/solver/dassl.h 
 
 
 RUNTIME_HEADERS_FMU = \
@@ -184,6 +192,14 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
 	cp $(INTERACTIVECLIENT) $(builddir_bin)
 	# copy header files
 	cp -p $(RUNTIME_HEADERS) $(builddir_inc)
+	cp -p $(RUNTIMELINEAR_HEADERS) $(builddir_inc)/linearization
+	cp -p $(RUNTIMEOPTIMZ_HEADERS) $(builddir_inc)/optimization
+	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 $(RUNTIMEMETA_HEADERS) $(builddir_inc)/meta
+	cp -p $(RUNTIMEMETAGC_HEADERS) $(builddir_inc)/meta/gc
+	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/util
 	# copy fmi stuff
 	cp -p $(RUNTIME_HEADERS_FMU) ../fmi/export/*.h \
 	   ../fmi/export/fmu_model_interface.c \

SimulationRuntime/c/meta/gc/common.c

@@ -30,7 +30,7 @@
  *
  */
 
-#include "modelica.h"
+#include "util/modelica.h"
 
 /***********************************************************************/
 /***********************************************************************/

SimulationRuntime/c/meta/gc/common.h

@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-#include "modelica.h"
+#include "util/modelica.h"
 
 /***********************************************************************/
 /***********************************************************************/

SimulationRuntime/c/meta/gc/generational.c

@@ -70,7 +70,7 @@
  * may refer to objects in the young region. The entire arrays present in the
  * trail are scanned for the pointers into younger region.
  */
-#include "modelica.h"
+#include "util/modelica.h"
 
 #include <stdio.h>
 #include <stdlib.h>

SimulationRuntime/c/meta/gc/generational.h

@@ -46,7 +46,7 @@
 extern "C" {
 #endif
 
-#include "modelica.h"
+#include "util/modelica.h"
 #include "mmc_gc.h"
 
 /* the allocated from C region */

SimulationRuntime/c/meta/gc/marksweep.c

@@ -39,7 +39,7 @@
  *
  */
 
-#include "modelica.h"
+#include "util/modelica.h"
 #include "mmc_gc.h"
 
 #if defined(_MMC_GC_)

SimulationRuntime/c/meta/gc/marksweep.h

@@ -67,7 +67,7 @@ extern "C"
 {
 #endif
 
-#include "modelica.h"
+#include "util/modelica.h"
 
 struct mmc_GC_mas_state_type /* the structure of GC state */
 {

SimulationRuntime/c/meta/gc/mmc_gc.h

@@ -60,7 +60,7 @@
 extern "C" {
 #endif
 
-#include "modelica.h"
+#include "util/modelica.h"
 #include "common.h"
 #include "roots.h"
 #include "generational.h"

SimulationRuntime/c/meta/gc/roots.c

@@ -37,7 +37,7 @@
  *
  */
 
-#include "modelica.h"
+#include "util/modelica.h"
 
 /* create the roots structure */
 mmc_GC_roots_type roots_create(size_t default_roots_size, size_t default_roots_mark_size)

SimulationRuntime/c/meta/meta_modelica.h

@@ -44,7 +44,7 @@ extern "C" {
 #include <pthread.h>
 
 #include "openmodelica.h"
-#include "mmc_gc.h"
+#include "gc/mmc_gc.h"
 #include "meta_modelica_string_lit.h"
 #include "meta_modelica_builtin.h"
 #include "meta_modelica_segv.h"

SimulationRuntime/c/meta/meta_modelica_builtin_boxptr.h

@@ -31,10 +31,10 @@
 /* Creates an implementation only if #define GEN_META_MODELICA_BUILTIN_BOXPTR is given.
  * Else, we only create a header.
  */
-#include "utility.h"
+#include "util/utility.h"
 #include "meta_modelica.h"
 #include "meta_modelica_real.h"
-#include "modelica_string.h"
+#include "util/modelica_string.h"
 
 #if !defined(META_MODELICA_BUILTIN_BOXPTR__H) || defined(GEN_META_MODELICA_BUILTIN_BOXPTR)
 #define META_MODELICA_BUILTIN_BOXPTR__H

SimulationRuntime/c/openmodelica_func.h

@@ -44,15 +44,15 @@ extern "C" {
 
 #include "simulation_data.h"
 
-#include "memory_pool.h"
-#include "index_spec.h"
-#include "boolean_array.h"
-#include "integer_array.h"
-#include "real_array.h"
-#include "string_array.h"
-#include "modelica_string.h"
-#include "division.h"
-#include "utility.h"
+#include "util/memory_pool.h"
+#include "util/index_spec.h"
+#include "util/boolean_array.h"
+#include "util/integer_array.h"
+#include "util/real_array.h"
+#include "util/string_array.h"
+#include "util/modelica_string.h"
+#include "util/division.h"
+#include "util/utility.h"
 
 struct OpenModelicaGeneratedFunctionCallbacks {
 int (*performSimulation)(DATA* data, void* solverInfo);

SimulationRuntime/c/simulation/options.h

@@ -32,7 +32,7 @@
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
-#include "simulation_options.h"
+#include "util/simulation_options.h"
 
 #ifdef __cplusplus
   extern "C" {

SimulationRuntime/c/simulation/simulation_runtime.h

@@ -41,15 +41,15 @@
 
 #include "simulation_data.h"
 
-#include "rtclock.h"
+#include "util/rtclock.h"
 #include <stdlib.h>
 #include <string.h>
 
 #ifdef __cplusplus
 #include <string>
 
-#include "linearize.h"
-#include "simulation_result.h"
+#include "linearization/linearize.h"
+#include "simulation/results/simulation_result.h"
 
 #ifndef NO_INTERACTIVE_DEPENDENCY
 #include "../../../interactive/socket.h"