Add min, max, and nominal to FMIModelVariable (#522)

modelica · Jun 24, 2024 · f7200c1 · f7200c1
1 parent 517ee9f
commit f7200c1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/fmusim/FMIModelDescription.c b/fmusim/FMIModelDescription.c
@@ -123,9 +123,15 @@ static FMIModelDescription* readModelDescriptionFMI1(xmlNodePtr root) {
         FMIModelVariable* variable = &modelDescription->modelVariables[i];
 
         variable->line = variableNode->line;
-        variable->name = (char*)xmlGetProp(variableNode, (xmlChar*)"name");
+
+        variable->name        = (char*)xmlGetProp(variableNode, (xmlChar*)"name");
         variable->description = (char*)xmlGetProp(variableNode, (xmlChar*)"description");
 
+        variable->min     = (char*)xmlGetProp(typeNode, (xmlChar*)"min");
+        variable->max     = (char*)xmlGetProp(typeNode, (xmlChar*)"max");
+        variable->nominal = (char*)xmlGetProp(typeNode, (xmlChar*)"nominal");
+        variable->start   = (char*)xmlGetProp(typeNode, (xmlChar*)"start");
+
         const char* typeName = (char*)typeNode->name;
 
         const char* causality = (char*)xmlGetProp(variableNode, (xmlChar*)"causality");
@@ -322,8 +328,8 @@ static FMIModelDescription* readModelDescriptionFMI2(xmlNodePtr root) {
         CALL(FMICalloc((void**)&modelDescription->defaultExperiment, 1, sizeof(FMIDefaultExperiment)));
         const xmlNodePtr node = xpathObj->nodesetval->nodeTab[0];
         modelDescription->defaultExperiment->startTime = (char*)xmlGetProp(node, (xmlChar*)"startTime");
-        modelDescription->defaultExperiment->stopTime = (char*)xmlGetProp(node, (xmlChar*)"stopTime");
-        modelDescription->defaultExperiment->stepSize = (char*)xmlGetProp(node, (xmlChar*)"stepSize");
+        modelDescription->defaultExperiment->stopTime  = (char*)xmlGetProp(node, (xmlChar*)"stopTime");
+        modelDescription->defaultExperiment->stepSize  = (char*)xmlGetProp(node, (xmlChar*)"stepSize");
     }
     xmlXPathFreeObject(xpathObj);
 
@@ -334,15 +340,21 @@ static FMIModelDescription* readModelDescriptionFMI2(xmlNodePtr root) {
 
     for (size_t i = 0; i < xpathObj->nodesetval->nodeNr; i++) {
 
-        xmlNodePtr typeNode = xpathObj->nodesetval->nodeTab[i];
-        xmlNodePtr variableNode = typeNode->parent;
+        const xmlNodePtr typeNode = xpathObj->nodesetval->nodeTab[i];
+        const xmlNodePtr variableNode = typeNode->parent;
 
         FMIModelVariable* variable = &modelDescription->modelVariables[i];
 
-        variable->line = variableNode->line;
-        variable->name = (char*)xmlGetProp(variableNode, (xmlChar*)"name");
+        variable->name        = (char*)xmlGetProp(variableNode, (xmlChar*)"name");        
         variable->description = (char*)xmlGetProp(variableNode, (xmlChar*)"description");
 
+        variable->min     = (char*)xmlGetProp(typeNode, (xmlChar*)"min");
+        variable->max     = (char*)xmlGetProp(typeNode, (xmlChar*)"max");
+        variable->nominal = (char*)xmlGetProp(typeNode, (xmlChar*)"nominal");
+        variable->start   = (char*)xmlGetProp(typeNode, (xmlChar*)"start");
+
+        variable->line = variableNode->line;
+
         variable->derivative = (FMIModelVariable*)xmlGetProp(typeNode, (xmlChar*)"derivative");
 
         const char* typeName = (char*)typeNode->name;
@@ -523,9 +535,12 @@ static FMIModelDescription* readModelDescriptionFMI3(xmlNodePtr root) {
 
         xmlNodePtr variableNode = xpathObj->nodesetval->nodeTab[i];
 
-        variable->line = variableNode->line;
-        variable->name = (char*)xmlGetProp(variableNode, (xmlChar*)"name");
-        variable->start = (char*)xmlGetProp(variableNode, (xmlChar*)"start");
+        variable->line        = variableNode->line;
+        variable->name        = (char*)xmlGetProp(variableNode, (xmlChar*)"name");
+        variable->min         = (char*)xmlGetProp(variableNode, (xmlChar*)"min");
+        variable->max         = (char*)xmlGetProp(variableNode, (xmlChar*)"max");
+        variable->nominal     = (char*)xmlGetProp(variableNode, (xmlChar*)"nominal");
+        variable->start       = (char*)xmlGetProp(variableNode, (xmlChar*)"start");
         variable->description = (char*)xmlGetProp(variableNode, (xmlChar*)"description");
 
         FMIVariableType type;
@@ -875,6 +890,9 @@ void FMIFreeModelDescription(FMIModelDescription* modelDescription) {
     for (size_t i = 0; i < modelDescription->nModelVariables; i++) {
         FMIModelVariable* variable = &modelDescription->modelVariables[i];
         xmlFree((void*)variable->name);
+        xmlFree((void*)variable->min);
+        xmlFree((void*)variable->max);
+        xmlFree((void*)variable->nominal);
         xmlFree((void*)variable->start);
         xmlFree((void*)variable->description);
     }

diff --git a/fmusim/FMIModelDescription.h b/fmusim/FMIModelDescription.h
@@ -52,6 +52,9 @@ struct FMIModelVariable {
 
     FMIVariableType type;
     const char* name;
+    const char* min;
+    const char* max;
+    const char* nominal;
     const char* start;
     const char* description;
     unsigned int valueReference;