- fixed FMU-Export

- fixed FMI-Import - moved FMI-Import to SimulationRuntime git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11526 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 26, 2012 · 0f1d979 · 0f1d979
1 parent 64677d4
commit 0f1d979
Show file tree

Hide file tree

Showing 35 changed files with 1,930 additions and 9,963 deletions.
diff --git a/Compiler/susan_codegen/SimCode/CodegenFMU.tpl b/Compiler/susan_codegen/SimCode/CodegenFMU.tpl
@@ -555,18 +555,14 @@ template initVals(SimVar var, String arrayName, Integer offset) ::=
   match var
     case SIMVAR(__) then
     let str = 'comp->fmuData->modelData.<%arrayName%>Data[<%intAdd(index,offset)%>].attribute.start'
-    match initialValue 
-      case SOME(v) then 
-       '<%str%> = <%initVal(v)%>;'
+      '<%str%> =  comp->fmuData->localData[0]-><%arrayName%>[<%intAdd(index,offset)%>];'
 end initVals;
 
 template initParams(SimVar var, String arrayName) ::=
   match var
     case SIMVAR(__) then
     let str = 'comp->fmuData->modelData.<%arrayName%>Data[<%index%>].attribute.start'
-    match initialValue 
-      case SOME(v) then 
-       '<%str%> = <%initVal(v)%>;'
+      '<%str%> = comp->fmuData->simulationInfo.<%arrayName%>[<%index%>];'
 end initParams;
 
 template initVal(Exp initialValue) 

diff --git a/FMI/import/CHANGES.txt b/FMI/import/CHANGES.txt
diff --git a/FMI/import/source/Makefile.in b/FMI/import/source/Makefile.in
diff --git a/FMI/import/source/fmuModelica.tmp b/FMI/import/source/fmuModelica.tmp