Set Float32 inputs in FMI3GetInitial*()

Author: t-sommer

FMI/FMI3/Functions/FMI3GetInitialFloat32.mo

@@ -9,6 +9,9 @@ impure function FMI3GetInitialFloat32
 
   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);
 
@@ -24,6 +27,7 @@ impure function FMI3GetInitialFloat32
 
 algorithm
 
+  FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
   FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
   FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
   FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);

FMI/FMI3/Functions/FMI3GetInitialFloat64.mo

@@ -9,6 +9,9 @@ impure function FMI3GetInitialFloat64
 
   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);
 
@@ -24,6 +27,7 @@ impure function FMI3GetInitialFloat64
 
 algorithm
 
+  FMI3SetFloat32(instance, float32InputValueReferences, float32InputValues);
   FMI3SetFloat64(instance, float64InputValueReferences, float64InputValues);
   FMI3SetInt32(instance, int32InputValueReferences, int32InputValues);
   FMI3SetBoolean(instance, booleanInputValueReferences, booleanInputValues);

modelica_fmi/src/modelica_fmi/import_fmu_to_modelica.py

@@ -1,3 +1,6 @@
+from typing import Literal
+
+
 def import_fmu_to_modelica(fmu_path, model_path, interface_type='CoSimulation', variables=None):
 
     from os import makedirs
@@ -6,6 +9,7 @@ def import_fmu_to_modelica(fmu_path, model_path, interface_type='CoSimulation',
 
     import jinja2
     from fmpy import extract, read_model_description
+    from fmpy.model_description import ScalarVariable
     from fmpy.util import sha256_checksum
 
     fmu_path = Path(fmu_path)
@@ -273,40 +277,44 @@ def shape(variable):
             s.append(int(dimension.start if dimension.start else variables[dimension.valueReference].start))
         return tuple(s)
 
-    def dependencies3(variable, type):
+    def dependencies3(variable: ScalarVariable, types: list[str]):
 
-        unknowns = list(filter(lambda u: u.variable.name == variable.name, model_description.initialUnknowns))
+        arguments = []
 
-        if not unknowns:
-            return ''
+        for type in types:
 
-        unknown = unknowns[0]
+            unknowns = list(filter(lambda u: u.variable.name == variable.name, model_description.initialUnknowns))
 
-        vrs = []
-        values = []
+            if not unknowns:
+                continue
 
-        for dependency in unknown.dependencies:
+            unknown = unknowns[0]
 
-            if dependency.type != type or dependency.causality != 'input':
-                continue
+            vrs = []
+            values = []
 
-            vrs.append(str(dependency.valueReference))
-            s = shape(dependency)
+            for dependency in unknown.dependencies:
 
-            if not s:
-                values.append(name(dependency))
-            elif len(s) == 1:
-                for i in range(1, numel(dependency) + 1):
-                    values.append(f'{name(dependency)}[{i}]')
-            elif len(s) == 2:
-                for i in range(1, s[0] + 1):
-                    for j in range(1, s[1] + 1):
-                        values.append(f'{name(dependency)}[{i},{j}]')
+                if dependency.type != type or dependency.causality != 'input':
+                    continue
 
-        if not vrs:
-            return ''
+                vrs.append(str(dependency.valueReference))
+                s = shape(dependency)
+
+                if not s:
+                    values.append(name(dependency))
+                elif len(s) == 1:
+                    for i in range(1, numel(dependency) + 1):
+                        values.append(f'{name(dependency)}[{i}]')
+                elif len(s) == 2:
+                    for i in range(1, s[0] + 1):
+                        for j in range(1, s[1] + 1):
+                            values.append(f'{name(dependency)}[{i},{j}]')
+
+            if vrs:
+                arguments.append(f'{type.lower()}InputValueReferences' + '={' + ', '.join(vrs) + '}, ' + f'{type.lower()}InputValues=' + '{' + ', '.join(values) + '}, ')
 
-        return f'{type.lower()}InputValueReferences' + '={' + ', '.join(vrs) + '}, ' + f'{type.lower()}InputValues=' + '{' + ', '.join(values) + '}, '
+        return ''.join(arguments)
 
     template.globals.update({
         'as_array': as_array,

modelica_fmi/src/modelica_fmi/templates/FMI2_CS.mo

@@ -93,7 +93,7 @@ equation
 @@ for variable in continuousOutputs @@
 
   if initial() then
-    @=name(variable)=@ = FMI2GetInitialReal(instance, startTime, @=dependencies3(variable, 'Real')=@@=dependencies3(variable, 'Integer')=@@=dependencies3(variable, 'Boolean')=@valueReference=@=variable.valueReference=@);
+    @=name(variable)=@ = FMI2GetInitialReal(instance, startTime, @=dependencies3(variable, ['Real', 'Integer', 'Boolean'])=@valueReference=@=variable.valueReference=@);
   else
     @=name(variable)=@ = outputVariables.@=name(variable)=@;
   end if;

modelica_fmi/src/modelica_fmi/templates/FMI3_CS.mo

@@ -116,11 +116,11 @@ equation
 
   if initial() then
 @@ if not variable.dimensions @@
-    @=name(variable)=@ = scalar(FMI3GetInitial@=fmi_type(variable)=@(instance, startTime, @=dependencies3(variable, 'Float64')=@@=dependencies3(variable, 'Int32')=@@=dependencies3(variable, 'Boolean')=@valueReference=@=variable.valueReference=@, nValues=1));
+    @=name(variable)=@ = scalar(FMI3GetInitial@=fmi_type(variable)=@(instance, startTime, @=dependencies3(variable, ['Float32', 'Float64', 'Int32', 'Boolean'])=@valueReference=@=variable.valueReference=@, nValues=1));
 @@ elif variable.dimensions|length == 1 @@
-    @=name(variable)=@ = FMI3GetInitial@=fmi_type(variable)=@(instance, startTime, @=dependencies3(variable, 'Float64')=@@=dependencies3(variable, 'Int32')=@@=dependencies3(variable, 'Boolean')=@valueReference=@=variable.valueReference=@, nValues=size(@=name(variable)=@, 1));
+    @=name(variable)=@ = FMI3GetInitial@=fmi_type(variable)=@(instance, startTime, @=dependencies3(variable, ['Float32', 'Float64', 'Int32', 'Boolean'])=@valueReference=@=variable.valueReference=@, nValues=size(@=name(variable)=@, 1));
 @@ else @@
-    @=name(variable)=@ = FMI3GetInitial@=fmi_type(variable)=@Matrix(instance, startTime, @=dependencies3(variable, 'Float64')=@@=dependencies3(variable, 'Int32')=@@=dependencies3(variable, 'Boolean')=@valueReference=@=variable.valueReference=@, m=size(@=name(variable)=@, 1), n=size(@=name(variable)=@, 2), nValues=product(size(@=name(variable)=@)));
+    @=name(variable)=@ = FMI3GetInitial@=fmi_type(variable)=@Matrix(instance, startTime, @=dependencies3(variable, ['Float32', 'Float64', 'Int32', 'Boolean'])=@valueReference=@=variable.valueReference=@, m=size(@=name(variable)=@, 1), n=size(@=name(variable)=@, 2), nValues=product(size(@=name(variable)=@)));
 @@ endif @@
   else
     @=name(variable)=@ = outputVariables.@=name(variable)=@;