Changeset 3e9baabb in OpenModelica

Timestamp:

2011-03-04T18:56:41+01:00 (13 years ago)

Author:

Jens Frenkel <jens.frenkel@…>

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:

c0d0d6d3

Parents:

c4b7b4c

Message:

• improve fmiSetExternalFunction

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

Files:

• CMakeLists.txt (modified) (1 diff)
• Compiler/susan_codegen/SimCode/SimCodeFMU.tpl (modified) (5 diffs)
• c_runtime/fmu_model_interface.c (modified) (1 diff)

CMakeLists.txt

@@ -36 +36 @@
 #BUILDMODEL(Simple ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test +d=bltdump)
 #BUILDMODEL(WheelLoader_der_state ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test +d=bltdump "")
-BUILDMODELFMU(Test ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test/FMU +d=bltdump "")
+#BUILDMODELFMU(Test ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test/FMU +d=bltdump "")
 #BUILDMODEL(Test1 ${CMAKE_CURRENT_SOURCE_DIR}/build/bin/Test/FMU +d=bltdump "")
+BUILDMODELFMUMOS(WheelLoader D:/Programming/Models/Radlader/radlader-cnh/WheelLoader.mos +d=bltdump "")

Compiler/susan_codegen/SimCode/SimCodeFMU.tpl

@@ -337 +337 @@
   #include "fmiModelFunctions.h"
   #include "fmu_model_interface.h"
+  #include "<%fileNamePrefix%>_functions.h"
 
   void setStartValues(ModelInstance *comp);
@@ -349 +350 @@
   fmiString getString(ModelInstance* comp, const fmiValueReference vr);  
   fmiStatus setString(ModelInstance* comp, const fmiValueReference vr, const fmiString value);  
-
+  fmiStatus setExternalFunction(ModelInstance* c, const fmiValueReference vr, const void* value);
+  
   <%ModelDefineData(modelInfo)%>
   
@@ -366 +368 @@
   <%getStringFunction(modelInfo)%>
   <%setStringFunction(modelInfo)%>
-  
+  <%setExternalFunction(modelInfo)%>  
   
   >>
@@ -388 +390 @@
   #define NUMBER_OF_STRINGS <%numberOfStrings%>
   #define NUMBER_OF_BOOLEANS <%numberOfBooleans%>
+  #define NUMBER_OF_EXTERNALFUNCTIONS 0
   
   // define variable data for model
@@ -705 +708 @@
 end setStringFunction;
 
+template setExternalFunction(ModelInfo modelInfo)
+ "Generates setString function for c file."
+::=
+match modelInfo
+case MODELINFO(vars=SIMVARS(__)) then
+  <<
+  fmiStatus setExternalFunction(ModelInstance* c, const fmiValueReference vr, const void* value){
+    switch (vr) {
+        default: 
+          return fmiError;
+    }
+    return fmiOK;
+  }
+  
+  >>
+end setExternalFunction;
+
 template SwitchVars(SimVar simVar, String arrayName)
  "Generates code for defining variables in c file for FMU target. "

c_runtime/fmu_model_interface.c

@@ -589 +589 @@
 fmiStatus fmiSetExternalFunction(fmiComponent c, fmiValueReference vr[], size_t nvr, const void* value[])
 {
+  int i;
   ModelInstance* comp = (ModelInstance *)c;
   if (invalidState(comp, "fmiTerminate", modelInitialized))
     return fmiError;
+  if (nvr>0 && nullPointer(comp, "fmiSetReal", "vr[]", vr))
+    return fmiError;
+  if (nvr>0 && nullPointer(comp, "fmiSetReal", "value[]", value))
+    return fmiError;
   if (comp->loggingOn) comp->functions.logger(c, comp->instanceName, fmiOK, "log",
     "fmiSetExternalFunction");
+  // no check wether setting the value is allowed in the current state
+  for (i=0; i<nvr; i++) {
+    if (vrOutOfRange(comp, "fmiSetExternalFunction", vr[i], NUMBER_OF_EXTERNALFUNCTIONS))
+      return fmiError;
+    if (setExternalFunction(comp, vr[i],value[i]) != fmiOK) // to be implemented by the includer of this file
+      return fmiError; 
+  }
   return fmiOK;
 };