[newSimulationRuntime]

 - added and adjusted FMU export for new simulation runtime(need more work)


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

Author: Willi Braun

Compiler/BackEnd/SimCode.mo

@@ -83,6 +83,7 @@ protected import Builtin;
 protected import CevalScript;
 protected import ClassInf;
 protected import CodegenC;
+protected import CodegenFMU;
 protected import ComponentReference;
 protected import Config;
 protected import DAEDump;
@@ -954,7 +955,7 @@ algorithm
   Debug.execStat("SimCode",CevalScript.RT_CLOCK_BUILD_MODEL);
 
   System.realtimeTick(CevalScript.RT_CLOCK_BUILD_MODEL);
-  Tpl.tplNoret(SimCodeFMU.translateModel, simCode);
+  callTargetTemplatesFMU(simCode, Config.simCodeTarget());
   timeTemplates := System.realtimeTock(CevalScript.RT_CLOCK_BUILD_MODEL);
 end generateModelCodeFMU;
 
@@ -1139,6 +1140,39 @@ algorithm
   end match;
 end callTargetTemplates;
 
+protected function callTargetTemplatesFMU
+"Generate target code by passing the SimCode data structure to templates."
+  input SimCode simCode;
+  input String target;
+algorithm
+  _ := match (simCode,target)
+    local
+      BackendDAE.BackendDAE outIndexedBackendDAE;
+      array<Integer> equationIndices, variableIndices;
+      BackendDAE.IncidenceMatrix incidenceMatrix;
+      BackendDAE.IncidenceMatrixT incidenceMatrixT;
+      BackendDAE.StrongComponents strongComponents;
+      
+    case (simCode,"C")
+      equation
+        Tpl.tplNoret(SimCodeFMU.translateModel, simCode);
+      then ();
+    case (simCode,"c")
+      equation
+        Tpl.tplNoret(CodegenFMU.translateModel, simCode);
+      then ();        
+    case (simCode,"Dump")
+      equation
+        // Yes, do this better later on...
+        print(Tpl.tplString(SimCodeDump.dumpSimCode, simCode));
+      then ();
+    case (_,target)
+      equation
+        target = "Unknown template target: " +& target;
+        Error.addMessage(Error.INTERNAL_ERROR, {target});
+      then fail();
+  end match;
+end callTargetTemplatesFMU;
 
 
 public function translateModel
@@ -5732,7 +5766,7 @@ algorithm
 
       e = Expression.crefExp(cref);
       tp = Expression.typeof(e);
-      startExp = Expression.makeBuiltinCall("start", {e}, tp);
+      startExp = Expression.makeBuiltinCall("$_start", {e}, tp);
       e2 = DAE.BINARY(crefExp, DAE.SUB(DAE.T_REAL_DEFAULT), startExp);
 
       e1 = DAE.BINARY(e1, DAE.MUL(DAE.T_REAL_DEFAULT), e2);
@@ -7626,7 +7660,7 @@ algorithm
         //startv = DAEUtil.getStartAttr(attr);
         e = Expression.crefExp(cr);
         tp = Expression.typeof(e);
-        startv = Expression.makeBuiltinCall("start", {e}, tp);
+        startv = Expression.makeBuiltinCall("$_start", {e}, tp);
       then
         ((v,(BackendDAE.EQUATION(e,startv,source)::eqns,av)));
     case (((v as BackendDAE.VAR(varName = cr,varKind = BackendDAE.STATE(),values = attr,source=source)),(eqns,av))) /* add equations for variables with fixed = true */
@@ -7637,7 +7671,7 @@ algorithm
         //startv = DAEUtil.getStartAttr(attr);
         e = Expression.crefExp(cr);
         tp = Expression.typeof(e);
-        startv = Expression.makeBuiltinCall("start", {e}, tp);
+        startv = Expression.makeBuiltinCall("$_start", {e}, tp);
       then
         ((v,(BackendDAE.EQUATION(e,startv,source)::eqns,av)));
     case ((inTpl)) then inTpl;

Compiler/Makefile.common

@@ -40,7 +40,6 @@ Ceval.mo \
 CevalFunction.mo \
 ClassInf.mo \
 ClassLoader.mo \
-CodegenC.mo \
 ComponentReference.mo \
 Connect.mo \
 ConnectUtil.mo \
@@ -127,6 +126,8 @@ GLOBAL = \
 Global.mo
 
 TEMPLATE = \
+CodegenC.mo \
+CodegenFMU.mo \
 SCodeDumpTpl.mo \
 SimCodeC.mo \
 SimCodeCSharp.mo \

Compiler/susan_codegen/SimCode/CodegenC.tpl

@@ -110,6 +110,7 @@ case simCode as SIMCODE(modelInfo=MODELINFO(__)) then
   >>
 end simulationHeaderFile;
 
+
 template simulationFile(SimCode simCode, String guid)
  "Generates code for main C file for simulation target."
 ::=
@@ -118,6 +119,7 @@ case simCode as SIMCODE(__) then
   <<
   <%simulationFileHeader(simCode)%>
   <%externalFunctionIncludes(externalFunctionIncludes)%>
+  #include "<%fileNamePrefix%>.h"
   #include "<%fileNamePrefix%>_functions.c"
   #define _OMC_SEED_HACK char* _omc_hack
   #define _OMC_SEED_HACK_2  NULL
@@ -215,8 +217,6 @@ case SIMCODE(modelInfo=MODELINFO(__), extObjInfo=EXTOBJINFO(__)) then
 
   #include "<%fileNamePrefix%>_functions.h"
 
-  #include "<%fileNamePrefix%>.h"
-  
   >>
 end simulationFileHeader;
 
@@ -2049,7 +2049,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
   CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) <%makefileParams.cflags%> <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags /* From the simulate() command */%>
   CPPFLAGS=-I"<%makefileParams.omhome%>/include/omc2" -I. <%dirExtra%> <%makefileParams.includes ; separator=" "%>
-  LDFLAGS=-L"<%makefileParams.omhome%>/lib/omc2" -lSimulationRuntimeC <%makefileParams.ldflags%>
+  LDFLAGS=-L"<%makefileParams.omhome%>/lib/omc2" -lSimulationRuntimeC <%makefileParams.ldflags%> -ldl
   SENDDATALIBS=<%makefileParams.senddatalibs%>
   PERL=perl
   MAINFILE=<%fileNamePrefix%><% if acceptMetaModelicaGrammar() then ".conv"%>.c
@@ -5145,7 +5145,8 @@ template daeExpCall(Exp call, Context context, Text &preExp /*BUFP*/,
     error(sourceInfo(), 'Code generation does not support der(<%printExpStr(exp)%>)') 
   case CALL(path=IDENT(name="pre"), expLst={arg}) then
     daeExpCallPre(arg, context, preExp, varDecls)
-  case CALL(path=IDENT(name="start"), expLst={arg}) then
+// a $_start is used to get get start value of a variable
+  case CALL(path=IDENT(name="$_start"), expLst={arg}) then
     daeExpCallStart(arg, context, preExp, varDecls)    
   case CALL(path=IDENT(name="edge"), expLst={arg as CREF(__)}) then
     '(<%cref(arg.componentRef)%> && !$P$PRE<%cref(arg.componentRef)%>)'