Add unit information to mat files

Belonging to [master]:
  - #1952

Author: lochel

SimulationRuntime/c/simulation/results/simulation_result_mat4.cpp

@@ -112,9 +112,12 @@ void mat4_init4(simulation_result *self, DATA *data, threadData_t *threadData)
 
   for (int i=0; i < mData->nVariablesReal; i++)
     if (!mData->realVarsData[i].filterOutput) {
+      const char *unitStr = MMC_STRINGDATA(mData->realVarsData[i].attribute.unit);
+      size_t unitLength = unitStr ? strlen(unitStr) + 3 : 0;
+
       len = strlen(mData->realVarsData[i].info.name) + 1;
       if (len > maxLengthName) maxLengthName = len;
-      len = strlen(mData->realVarsData[i].info.comment) + 1;
+      len = strlen(mData->realVarsData[i].info.comment) + 1 + unitLength;
       if (len > maxLengthDesc) maxLengthDesc = len;
       matData->nSignals++;
     }
@@ -222,8 +225,19 @@ void mat4_init4(simulation_result *self, DATA *data, threadData_t *threadData)
 
   for (int i=0; i < mData->nVariablesReal; i++)
     if (!mData->realVarsData[i].filterOutput) {
+      const char *unitStr = MMC_STRINGDATA(mData->realVarsData[i].attribute.unit);
+      size_t unitLength = unitStr ? strlen(unitStr) : 0;
+
       memcpy((uint8_t*)name + maxLengthName * cur, mData->realVarsData[i].info.name, strlen(mData->realVarsData[i].info.name));
       memcpy((uint8_t*)description + maxLengthDesc * cur, mData->realVarsData[i].info.comment, strlen(mData->realVarsData[i].info.comment));
+      // unit information
+      if (unitLength > 0)
+      {
+        memcpy((uint8_t*)description + maxLengthDesc * cur + strlen(mData->realVarsData[i].info.comment) + 2, unitStr, unitLength);
+        ((uint8_t*)description)[maxLengthDesc * cur + strlen(mData->realVarsData[i].info.comment) + 0] = ' ';
+        ((uint8_t*)description)[maxLengthDesc * cur + strlen(mData->realVarsData[i].info.comment) + 1] = '[';
+        ((uint8_t*)description)[maxLengthDesc * cur + strlen(mData->realVarsData[i].info.comment) + 2 + unitLength] = ']';
+      }
       cur++;
     }
 

SimulationRuntime/c/simulation/simulation_input_xml.c

@@ -374,12 +374,15 @@ static void read_var_info(omc_ScalarVariable *v, VAR_INFO *info)
 
 static void read_var_attribute_real(omc_ScalarVariable *v, REAL_ATTRIBUTE *attribute)
 {
+  const char *unit = NULL;
   read_value_real(findHashStringStringEmpty(v,"start"), &(attribute->start), 0.0);
   read_value_bool(findHashStringString(v,"fixed"), (modelica_boolean*)&(attribute->fixed));
   read_value_bool(findHashStringString(v,"useNominal"), (modelica_boolean*)&(attribute->useNominal));
   read_value_real(findHashStringStringEmpty(v,"nominal"), &(attribute->nominal), 1.0);
   read_value_real(findHashStringStringEmpty(v,"min"), &(attribute->min), REAL_MIN);
   read_value_real(findHashStringStringEmpty(v,"max"), &(attribute->max), REAL_MAX);
+  read_value_string(findHashStringStringEmpty(v,"unit"), &unit);
+  attribute->unit = mmc_mk_scon_persist(unit);
 
   infoStreamPrint(LOG_DEBUG, 0, "Real %s(start=%g, fixed=%s, %snominal=%g%s, min=%g, max=%g)", findHashStringString(v,"name"), attribute->start, (attribute->fixed)?"true":"false", (attribute->useNominal)?"":"{", attribute->nominal, attribute->useNominal?"":"}", attribute->min, attribute->max);
 }