Set Float32 in FMIGetInitialFloat*() and skip empty arrays

Author: t-sommer

FMI/FMI2/Functions/FMI2GetInitialReal.mo

@@ -1,23 +1,39 @@
 within FMI.FMI2.Functions;
 impure function FMI2GetInitialReal
   extends Modelica.Icons.Function;
+
   input Internal.ExternalFMU instance;
+
   input Real _time;
+
   input Integer realInputValueReferences[:] = fill(0, 0);
   input Real realInputValues[:] = fill(0.0, 0);
+
   input Integer integerInputValueReferences[:] = fill(0, 0);
   input Integer integerInputValues[:] = fill(0, 0);
+
   input Integer booleanInputValueReferences[:] = fill(0, 0);
   input Boolean booleanInputValues[:] = fill(false, 0);
+
   input Integer valueReference;
+
   output Real value;
+
 algorithm
-  FMI2SetReal(instance, realInputValueReferences, size(realInputValueReferences, 1), realInputValues);
-  FMI.Internal.Logging.logMessages(instance);
-  FMI2SetInteger(instance, integerInputValueReferences, size(integerInputValueReferences, 1), integerInputValues);
-  FMI.Internal.Logging.logMessages(instance);
-  FMI2SetBoolean(instance, booleanInputValueReferences, size(booleanInputValueReferences, 1), booleanInputValues);
-  FMI.Internal.Logging.logMessages(instance);
+
+  if size(realInputValueReferences, 1) > 0 then
+    FMI2SetReal(instance, realInputValueReferences, size(realInputValueReferences, 1), realInputValues);
+  end if;
+
+  if size(integerInputValueReferences, 1) > 0 then
+    FMI2SetInteger(instance, integerInputValueReferences, size(integerInputValueReferences, 1), integerInputValues);
+  end if;
+
+  if size(booleanInputValueReferences, 1) > 0 then
+    FMI2SetBoolean(instance, booleanInputValueReferences, size(booleanInputValueReferences, 1), booleanInputValues);
+  end if;
+
   value := FMI2GetReal(instance, valueReference);
   FMI.Internal.Logging.logMessages(instance);
+
 end FMI2GetInitialReal;

FMI/FMI3/Functions/FMI3GetInitialFloat32.mo

@@ -27,10 +27,21 @@ impure function FMI3GetInitialFloat32
 
 algorithm
 
-  FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
-  FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
-  FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
-  FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  if size(float32InputValueReferences, 1) > 0 then
+    FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
+  end if;
+
+  if size(float64InputValueReferences, 1) > 0 then
+    FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
+  end if;
+
+  if size(int32InputValueReferences, 1) > 0 then
+    FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
+  end if;
+
+  if size(booleanInputValueReferences, 1) > 0 then
+    FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  end if;
 
   values := FMI3GetFloat32(instance, valueReference, nValues);
 

FMI/FMI3/Functions/FMI3GetInitialFloat32Matrix.mo

@@ -8,6 +8,9 @@ impure function FMI3GetInitialFloat32Matrix
   input Internal.ExternalFMU instance;
   input Real _time;
 
+  input FMI3ValueReference float32InputValueReferences[:] = fill(0, 0);
+  input FMI3Float32 float32InputValues[:] = fill(0.0, 0);
+
   input FMI3ValueReference float64InputValueReferences[:] = fill(0, 0);
   input FMI3Float64 float64InputValues[:] = fill(0.0, 0);
 
@@ -25,9 +28,21 @@ impure function FMI3GetInitialFloat32Matrix
 
 algorithm
 
-  FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
-  FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
-  FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  if size(float32InputValueReferences, 1) > 0 then
+    FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
+  end if;
+
+  if size(float64InputValueReferences, 1) > 0 then
+    FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
+  end if;
+
+  if size(int32InputValueReferences, 1) > 0 then
+    FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
+  end if;
+
+  if size(booleanInputValueReferences, 1) > 0 then
+    FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  end if;
 
   values := FMI3.Functions.FMI3GetFloat32Matrix(instance, valueReference, m, n, nValues);
 

FMI/FMI3/Functions/FMI3GetInitialFloat64.mo

@@ -27,10 +27,21 @@ impure function FMI3GetInitialFloat64
 
 algorithm
 
-  FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
-  FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
-  FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
-  FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  if size(float32InputValueReferences, 1) > 0 then
+    FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
+  end if;
+
+  if size(float64InputValueReferences, 1) > 0 then
+    FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
+  end if;
+
+  if size(int32InputValueReferences, 1) > 0 then
+    FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
+  end if;
+
+  if size(booleanInputValueReferences, 1) > 0 then
+    FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  end if;
 
   values := FMI3GetFloat64(instance, valueReference, nValues);
 

FMI/FMI3/Functions/FMI3GetInitialFloat64Matrix.mo

@@ -8,6 +8,9 @@ impure function FMI3GetInitialFloat64Matrix
   input Internal.ExternalFMU instance;
   input Real _time;
 
+  input FMI3ValueReference float32InputValueReferences[:] = fill(0, 0);
+  input FMI3Float32 float32InputValues[:] = fill(0.0, 0);
+
   input FMI3ValueReference float64InputValueReferences[:] = fill(0, 0);
   input FMI3Float64 float64InputValues[:] = fill(0.0, 0);
 
@@ -25,9 +28,21 @@ impure function FMI3GetInitialFloat64Matrix
 
 algorithm
 
-  FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
-  FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
-  FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  if size(float32InputValueReferences, 1) > 0 then
+    FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
+  end if;
+
+  if size(float64InputValueReferences, 1) > 0 then
+    FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
+  end if;
+
+  if size(int32InputValueReferences, 1) > 0 then
+    FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
+  end if;
+
+  if size(booleanInputValueReferences, 1) > 0 then
+    FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);
+  end if;
 
   values := FMI3.Functions.FMI3GetFloat64Matrix(instance, valueReference, m, n, nValues);