Change dimension variables in LinearTransform to Int32 (#41)

fixes #5
modelica · May 31, 2020 · 70ed792 · 70ed792
1 parent facfce7
commit 70ed792
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/LinearTransform/FMI3.xml b/LinearTransform/FMI3.xml
@@ -13,8 +13,8 @@
   <DefaultExperiment startTime="0" stopTime="10"/>
 
   <ModelVariables>
-    <Float64 name="m" valueReference="0" description="" causality="parameter" variability="constant" start="2"/>
-    <Float64 name="n" valueReference="1" description="" causality="parameter" variability="constant" start="3"/>
+    <Int32 name="m" valueReference="0" description="" causality="parameter" variability="constant" start="2"/>
+    <Int32 name="n" valueReference="1" description="" causality="parameter" variability="constant" start="3"/>
     <Float64 name="u" valueReference="2" description="" causality="input" start="1">
       <Dimension start="3"/>
     </Float64>

diff --git a/LinearTransform/config.h b/LinearTransform/config.h
@@ -14,6 +14,7 @@
 
 #define GET_FLOAT64
 #define SET_FLOAT64
+#define GET_INT32
 #define EVENT_UPDATE
 
 #define FIXED_SOLVER_STEP 1

diff --git a/LinearTransform/model.c b/LinearTransform/model.c
@@ -31,12 +31,6 @@ Status getFloat64(ModelInstance* comp, ValueReference vr, double *value, size_t
     calculateValues(comp);
 
     switch (vr) {
-        case vr_m:
-            value[(*index)++] = M(m);
-            return OK;
-        case vr_n:
-            value[(*index)++] = M(n);
-            return OK;
         case vr_u:
             value[(*index)++] = M(u)[0];
             value[(*index)++] = M(u)[1];
@@ -72,6 +66,20 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double *value, s
     }
 }
 
+Status getInt32(ModelInstance* comp, ValueReference vr, int *value, size_t *index) {
+    calculateValues(comp);
+    switch (vr) {
+        case vr_m:
+            value[(*index)++] = M(m);
+            return OK;
+        case vr_n:
+            value[(*index)++] = M(n);
+            return OK;
+        default:
+            return Error;
+    }
+}
+
 void eventUpdate(ModelInstance *comp) {
     comp->valuesOfContinuousStatesChanged   = false;
     comp->nominalsOfContinuousStatesChanged = false;