Changeset 0833cd1 in OpenModelica

Timestamp:

2012-11-16T14:27:01+01:00 (11 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

a395c34

Parents:

945b9890

Message:

• fixing FMI.

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

Location:

Compiler

Files:

• Template/CodegenFMU.tpl (modified) (5 diffs)
• runtime/FMIWrapper.c (modified) (3 diffs)

Compiler/Template/CodegenFMU.tpl

@@ -1142 +1142 @@
     Real fmi_z[numberOfEventIndicators] "Events Indicators";
     Boolean fmi_z_positive[numberOfEventIndicators];
-    Real flowTimeNext;
-    parameter Real flowInit(fixed=false);
-    parameter Real flowInitInputs(fixed=false);
+    parameter Real flowInstantiate(fixed=false);
+    Real flowTime;
     parameter Real flowParamsStart(fixed=false);
-    Real flowTime;
-    Real flowStatesInputs = flowStates;
-    Real flowStates;
+    Integer flowInitStatus;
+    Real flowStatesInputs;
     Boolean callEventUpdate;
     Boolean newStatesAvailable;
     Integer fmi_status;
   initial algorithm
+    flowInstantiate := fmiFunctions.fmiInstantiateModel(fmi, "<%fmiInfo.fmiModelIdentifier%>", debugLogging);
+    flowTime := fmiFunctions.fmiSetTime(fmi, time, flowInstantiate);
     <%if not boolAnd(stringEq(realStartVariablesValueReferences, ""), stringEq(realStartVariablesNames, "")) then "flowParamsStart := fmiFunctions.fmiSetReal(fmi, {"+realStartVariablesValueReferences+"}, {"+realStartVariablesNames+"});"%>
     <%if not boolAnd(stringEq(integerStartVariablesValueReferences, ""), stringEq(integerStartVariablesNames, "")) then "flowParamsStart := fmiFunctions.fmiSetInteger(fmi, {"+integerStartVariablesValueReferences+"}, {"+integerStartVariablesNames+"});"%>
     <%if not boolAnd(stringEq(booleanStartVariablesValueReferences, ""), stringEq(booleanStartVariablesNames, "")) then "flowParamsStart := fmiFunctions.fmiSetBoolean(fmi, {"+booleanStartVariablesValueReferences+"}, {"+booleanStartVariablesNames+"});"%>
     <%if not boolAnd(stringEq(stringStartVariablesValueReferences, ""), stringEq(stringStartVariablesNames, "")) then "flowParamsStart := fmiFunctions.fmiSetString(fmi, {"+stringStartVariablesValueReferences+"}, {"+stringStartVariablesNames+"});"%>
-  initial equation
-    (flowTimeNext,flowInit,eventInfo) = fmiFunctions.fmiInitialize(fmi, "<%fmiInfo.fmiModelIdentifier%>", debugLogging, time, eventInfo, flowParamsStart+flowInitInputs);
+    (flowInitStatus, eventInfo) := fmiFunctions.fmiInitialize(fmi, eventInfo, flowParamsStart);
   <%if intGt(listLength(fmiInfo.fmiNumberOfContinuousStates), 0) then
-  <<
-    fmi_x = fmiFunctions.fmiGetContinuousStates(fmi, numberOfContinuousStates, flowParamsStart+flowInit);
-  >>
+    <<
+      fmi_x := fmiFunctions.fmiGetContinuousStates(fmi, numberOfContinuousStates, flowStatesInputs);
+    >>
   %>
+  algorithm
+    flowInitStatus := 1;
   equation
-    flowTime = fmiFunctions.fmiSetTime(fmi, time, 1);
-    flowStates = fmiFunctions.fmiSetContinuousStates(fmi, fmi_x, flowParamsStart + flowTime);
+    flowTime = fmiFunctions.fmiSetTime(fmi, time, flowInstantiate);
+    flowStatesInputs = fmiFunctions.fmiSetContinuousStates(fmi, fmi_x, flowParamsStart + flowTime);
     der(fmi_x) = fmiFunctions.fmiGetDerivatives(fmi, numberOfContinuousStates, flowStatesInputs);
     fmi_z  = fmiFunctions.fmiGetEventIndicators(fmi, numberOfEventIndicators, flowStatesInputs);
@@ -1187 +1188 @@
   >>
   %>
-      (flowTimeNext, newStatesAvailable) := fmiFunctions.fmiEventUpdate(fmi, false, eventInfo, flowStatesInputs);
+      (newStatesAvailable) := fmiFunctions.fmiEventUpdate(fmi, false, eventInfo, flowStatesInputs);
   <%if intGt(listLength(fmiInfo.fmiNumberOfContinuousStates), 0) then
   <<
@@ -1216 +1217 @@
     
     package fmiFunctions
-      function fmiInitialize
+      function fmiInstantiateModel
         input fmiImportInstance fmi;
         input String instanceName;
         input Boolean debugLogging;
-        input Real in_Time;
-        input fmiEventInfo in_EventInfo;
-        input Real in_Flow_Init_Inputs;
-        output Real out_Flow_Time;
-        output Real out_Flow_Init;
-        output fmiEventInfo out_eventInfo;
-        external "C" out_eventInfo = fmiInitialize_OMC(fmi, instanceName, debugLogging, in_Time, in_EventInfo, in_Flow_Init_Inputs, out_Flow_Time, out_Flow_Init) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
+        output Real outFlowInstantiate;
+        external "C" outFlowInstantiate = fmiInstantiateModel_OMC(fmi, instanceName, debugLogging) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
+      end fmiInstantiateModel;
+      
+      function fmiInitialize
+        input fmiImportInstance fmi;
+        input fmiEventInfo inEventInfo;
+        input Real inFlowInit;
+        output Integer outFlowInitStatus;
+        output fmiEventInfo outEventInfo;
+        external "C" outEventInfo = fmiInitialize_OMC(fmi, inEventInfo, inFlowInit, outFlowInitStatus) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
       end fmiInitialize;
       
@@ -1240 +1245 @@
         input fmiImportInstance fmi;
         input Integer numberOfContinuousStates;
-        input Real in_Flow_Init;
+        input Real inFlowInit;
         output Real fmi_x[numberOfContinuousStates];
-        external "C" fmiGetContinuousStates_OMC(fmi, numberOfContinuousStates, in_Flow_Init, fmi_x) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
+        external "C" fmiGetContinuousStates_OMC(fmi, numberOfContinuousStates, inFlowInit, fmi_x) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
       end fmiGetContinuousStates;
       
@@ -1274 +1279 @@
         input fmiImportInstance fmi;
         input Boolean intermediateResults;
-        input fmiEventInfo in_eventInfo;
-        input Real in_Flow_States;
-        output Real out_Flow_Time;
-        output Boolean out_NewStates;
-        external "C" out_NewStates = fmiEventUpdate_OMC(fmi, intermediateResults, in_eventInfo, in_Flow_States, out_Flow_Time) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
+        input fmiEventInfo inEventInfo;
+        input Real inFlowStates;
+        output Boolean outNewStatesAvailable;
+        external "C" outNewStatesAvailable = fmiEventUpdate_OMC(fmi, intermediateResults, inEventInfo, inFlowStates) annotation(Library = {"omcruntime", "fmilib"<%if stringEq(platform, "win32") then ", \"shlwapi\""%>});
       end fmiEventUpdate;
       

Compiler/runtime/FMIWrapper.c

@@ -146 +146 @@
  * Wrapper for the FMI function fmiInstantiateModel.
  */
-void fmiInstantiateModel_OMC(void* fmi, char* instanceName)
-{
-  fmi1_import_instantiate_model((fmi1_import_t*)fmi, instanceName);
-}
-
-/*
- * Wrapper for the FMI function fmiSetTime.
- * Returns status.
- */
-double fmiSetTime_OMC(void* fmi, double time, double flowTime)
-{
-  fmi1_import_set_time((fmi1_import_t*)fmi, time);
-  return flowTime;
-}
-
-/*
- * Wrapper for the FMI function fmiSetDebugLogging.
- * Returns status.
- */
-int fmiSetDebugLogging_OMC(void* fmi, int debugLogging)
-{
-  return fmi1_import_set_debug_logging((fmi1_import_t*)fmi, debugLogging);
-}
-
-/*
- * Wrapper for the FMI function fmiInitialize.
- * Returns FMI Event Info i.e fmi1_event_info_t.
- */
-void* fmiInitialize_OMC(void* fmi, char* instanceName, int debugLogging, double time, void* in_eventInfo, double flowInit, double* fmi_TNext, double* fmi_Initialized)
+double fmiInstantiateModel_OMC(void* fmi, char* instanceName, int debugLogging)
 {
   static int init = 0;
   if (!init) {
     init = 1;
-    fmiInstantiateModel_OMC(fmi, instanceName);
-    fmiSetDebugLogging_OMC(fmi, debugLogging);
-    fmiSetTime_OMC(fmi, time, 1);
-
+    fmi1_import_instantiate_model((fmi1_import_t*)fmi, instanceName);
+    fmi1_import_set_debug_logging((fmi1_import_t*)fmi, debugLogging);
+  }
+  return 1;
+}
+
+/*
+ * Wrapper for the FMI function fmiSetTime.
+ * Returns status.
+ */
+double fmiSetTime_OMC(void* fmi, double time, double flowInstantiate)
+{
+  fmi1_import_set_time((fmi1_import_t*)fmi, time);
+  return flowInstantiate;
+}
+
+/*
+ * Wrapper for the FMI function fmiSetDebugLogging.
+ * Returns status.
+ */
+int fmiSetDebugLogging_OMC(void* fmi, int debugLogging)
+{
+  return fmi1_import_set_debug_logging((fmi1_import_t*)fmi, debugLogging);
+}
+
+/*
+ * Wrapper for the FMI function fmiInitialize.
+ * Returns FMI Event Info i.e fmi1_event_info_t.
+ */
+void* fmiInitialize_OMC(void* fmi, void* inEventInfo, double flowInit, int* status)
+{
+  static int init = 0;
+  if (!init) {
+    init = 1;
     fmi1_boolean_t toleranceControlled = fmi1_true;
     fmi1_real_t relativeTolerance = 0.001;
     fmi1_event_info_t* eventInfo = malloc(sizeof(fmi1_event_info_t));
     fmi1_status_t fmistatus = fmi1_import_initialize((fmi1_import_t*)fmi, toleranceControlled, relativeTolerance, eventInfo);
-    *fmi_TNext = (double)fmistatus;
+    *status = fmistatus;
     return eventInfo;
   }
-  return in_eventInfo;
+  return inEventInfo;
 }
 
@@ -199 +201 @@
 void fmiGetContinuousStates_OMC(void* fmi, int numberOfContinuousStates, double flowInit, double* states)
 {
+  int i;
+  for (i = 0 ; i < numberOfContinuousStates ; i++)
+    fprintf(stderr, "State before %d = %f\n", i, states[i]);fflush(NULL);
   fmi1_import_get_continuous_states((fmi1_import_t*)fmi, (fmi1_real_t*)states, numberOfContinuousStates);
+  for (i = 0 ; i < numberOfContinuousStates ; i++)
+      fprintf(stderr, "State after %d = %f\n", i, states[i]);fflush(NULL);
 }
 
@@ -331 +338 @@
  * Returns FMI Event Info i.e fmi1_event_info_t
  */
-int fmiEventUpdate_OMC(void* fmi, int intermediateResults, void* eventInfo, double flowStates, double* flowTime)
+int fmiEventUpdate_OMC(void* fmi, int intermediateResults, void* eventInfo, double flowStates)
 {
   fmi1_event_info_t* e = (fmi1_event_info_t*)eventInfo;