SKA-815: Fixed FMI 2.0 FMUs which had no unit in Real typedefs

Author: Jean-ThomasMasse

FmuImporter/FmiBridge/FmiModel/Internal/ModelDescription.cs

@@ -13,6 +13,7 @@ public enum VariableNamingConventions
     Flat,
     Structured
   }
+
   public enum GenerationTools
   {
     Vector_vVIRTUALtarget,
@@ -63,10 +64,10 @@ public ModelDescription(Fmi3.fmiModelDescription input, Action<LogSeverity, stri
     Description = input.description;
     InstantiationToken = input.instantiationToken.Normalize();
     GenerationTool = string.IsNullOrEmpty(input.generationTool)
-      ? GenerationTools.Unset
-      : input.generationTool.Normalize().Contains("Vector vVIRTUALtarget")
-        ? GenerationTools.Vector_vVIRTUALtarget
-        : GenerationTools.Other;
+                       ? GenerationTools.Unset
+                       : input.generationTool.Normalize().Contains("Vector vVIRTUALtarget")
+                         ? GenerationTools.Vector_vVIRTUALtarget
+                         : GenerationTools.Other;
     FmiVersion = input.fmiVersion;
     Version = input.version;
     VariableNamingConvention =
@@ -155,7 +156,8 @@ private void InitTypeDefMap(Fmi3.fmiModelDescriptionTypeDefinitions input)
       {
         if (!IsUnitInMap(typeDefFloat64.unit))
         {
-          throw new ModelDescriptionException($"The type definition 'Float64' in the model description has a unit " +
+          throw new ModelDescriptionException(
+            $"The type definition 'Float64' in the model description has a unit " +
             $"'{typeDefFloat64.unit}' that does not match.");
         }
 
@@ -170,7 +172,8 @@ private void InitTypeDefMap(Fmi3.fmiModelDescriptionTypeDefinitions input)
       {
         if (!IsUnitInMap(typeDefFloat32.unit))
         {
-          throw new ModelDescriptionException($"The type definition 'Float32' in the model description has a unit " +
+          throw new ModelDescriptionException(
+            $"The type definition 'Float32' in the model description has a unit " +
             $"'{typeDefFloat32.unit}' that does not match.");
         }
 
@@ -211,9 +214,21 @@ private void InitTypeDefMap(Fmi2.fmiModelDescriptionTypeDefinitions input)
 
       if (fmi2SimpleType.Item is Fmi2.fmi2SimpleTypeReal typeDefReal)
       {
+        if (typeDefReal.unit is null)
+        {
+          TypeDefinitions.Add(
+            fmi2SimpleType.name,
+            new TypeDefinition
+            {
+              Name = fmi2SimpleType.name
+            });
+          continue;
+        }
+
         if (!IsUnitInMap(typeDefReal.unit))
         {
-          throw new ModelDescriptionException($"The type definition 'Real' in the model description has a unit " +
+          throw new ModelDescriptionException(
+            $"The type definition 'Real' in the model description has a unit " +
             $"'{typeDefReal.unit}' that does not match.");
         }