Update variable variability defaults for 3.0.1

Reflect clarifications in 3.0.1 in the way variability defaults are determined for parameters. Fixes #590.
modelica · Sep 20, 2024 · bfd46c2 · bfd46c2
1 parent 9904675
commit bfd46c2
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/fmusim/FMIModelDescription.c b/fmusim/FMIModelDescription.c
@@ -1038,18 +1038,6 @@ static FMIModelDescription* readModelDescriptionFMI3(xmlNodePtr root) {
 
         variable->type = type;
 
-        if (variable->variability == -1) {
-            switch (variable->type) {
-            case FMIFloat32Type:
-            case FMIFloat64Type:
-                variable->variability = FMIContinuous;
-                break;
-            default:
-                variable->variability = FMIDiscrete;
-                break;
-            }
-        }
-
         const char* vr = (char*)xmlGetProp(variableNode, (xmlChar*)"valueReference");
 
         variable->valueReference = FMIValueReferenceForLiteral(vr);
@@ -1078,6 +1066,27 @@ static FMIModelDescription* readModelDescriptionFMI3(xmlNodePtr root) {
 
         xmlFree((void*)causality);
 
+        if (variable->variability == -1) {
+            switch (variable->causality) {
+            case FMIParameter:
+            case FMICalculatedParameter:
+            case FMIStructuralParameter:
+                variable->variability = FMIFixed;
+                break;
+            default:
+                switch (variable->type) {
+                case FMIFloat32Type:
+                case FMIFloat64Type:
+                    variable->variability = FMIContinuous;
+                    break;
+                default:
+                    variable->variability = FMIDiscrete;
+                    break;
+                }
+                break;
+            }
+        }
+
         variable->derivative = (FMIModelVariable*)xmlGetProp(variableNode, (xmlChar*)"derivative");
 
         xmlXPathObjectPtr xpathObj2 = xmlXPathNodeEval(variableNode, (xmlChar*)".//Dimension", xpathCtx);