By default: do not output protected variables to result-file

- To override: Add simflags="-emit_protected" - The library testing now adds -emit_protected if the compareVars is non-empty (and adds a variableFilter to only output these variables) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19318 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 26, 2014 · 0a61f6b · 0a61f6b
1 parent b84a109
commit 0a61f6b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -10652,6 +10652,7 @@ template ScalarVariableAttribute(SimVar simVar, Integer classIndex, String class
       causality = "<%caus%>" isValueChangeable = "<%isValueChangeable%>"
       alias = <%alias%>
       classIndex = "<%classIndex%>" classType = "<%classType%>"
+      isProtected = "<%isProtected%>"
       <%getInfoArgs(info)%>
       >>
 end ScalarVariableAttribute;

diff --git a/SimulationRuntime/c/simulation/simulation_input_xml.cpp b/SimulationRuntime/c/simulation/simulation_input_xml.cpp
@@ -456,7 +456,10 @@ void read_input_xml(MODEL_DATA* modelData,
     omc_ScalarVariable &v = in[i]; \
     read_var_info(v, info); \
     read_var_attribute(v, attribute); \
-    if (info.name[0] == '$') { /* filter internal variables */ \
+    if (info.name[0] == '$') { \
+      out[j].filterOutput = 1; \
+    } else if (!omc_flag[FLAG_EMIT_PROTECTED] && 0 == v["isProtected"].compare("true")) { \
+      infoStreamPrint(LOG_DEBUG, 0, "filtering protected variable %s", info.name); \
       out[j].filterOutput = 1; \
     } \
     mapAlias[info.name] = j; /* create a mapping for Alias variable to get the correct index */ \

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -321,7 +321,6 @@ int startInteractiveSimulation(int argc, char**argv, void* data)
 void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilter, int resultFormatHasCheapAliasesAndParameters)
 {
 #ifndef _MSC_VER
-  int cheap = resultFormatHasCheapAliasesAndParameters;
   regex_t myregex;
   int flags = REG_EXTENDED;
   int rc;
@@ -332,6 +331,7 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
     modelData->realVarsData[0].filterOutput = 1;
     modelData->realVarsData[modelData->nStates].filterOutput = 1;
   }
+
   if(0 == strcmp(filter, ".*")) { // This matches all variables, so we don't need to do anything
     return;
   }
@@ -347,7 +347,7 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
   for(long i=0; i<modelData->nVariablesReal; i++) if(!modelData->realVarsData[i].filterOutput) {
     modelData->realVarsData[i].filterOutput = regexec(&myregex, modelData->realVarsData[i].info.name, 0, NULL, 0) != 0;
   }
-  for(long i=0; i<modelData->nAliasReal; i++) {
+  for(long i=0; i<modelData->nAliasReal; i++) if(!modelData->realAlias[i].filterOutput) {
     if(modelData->realAlias[i].aliasType == 0)  /* variable */ {
       modelData->realAlias[i].filterOutput = regexec(&myregex, modelData->realAlias[i].info.name, 0, NULL, 0) != 0;
       if (0 == modelData->realAlias[i].filterOutput) {
@@ -363,7 +363,7 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
   for (long i=0; i<modelData->nVariablesInteger; i++) if(!modelData->integerVarsData[i].filterOutput) {
     modelData->integerVarsData[i].filterOutput = regexec(&myregex, modelData->integerVarsData[i].info.name, 0, NULL, 0) != 0;
   }
-  for (long i=0; i<modelData->nAliasInteger; i++) {
+  for (long i=0; i<modelData->nAliasInteger; i++) if(!modelData->integerAlias[i].filterOutput) {
     if(modelData->integerAlias[i].aliasType == 0)  /* variable */ {
       modelData->integerAlias[i].filterOutput = regexec(&myregex, modelData->integerAlias[i].info.name, 0, NULL, 0) != 0;
       if (0 == modelData->integerAlias[i].filterOutput) {
@@ -379,7 +379,7 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
   for (long i=0; i<modelData->nVariablesBoolean; i++) if(!modelData->booleanVarsData[i].filterOutput) {
     modelData->booleanVarsData[i].filterOutput = regexec(&myregex, modelData->booleanVarsData[i].info.name, 0, NULL, 0) != 0;
   }
-  for (long i=0; i<modelData->nAliasBoolean; i++) {
+  for (long i=0; i<modelData->nAliasBoolean; i++) if(!modelData->booleanAlias[i].filterOutput) {
     if(modelData->booleanAlias[i].aliasType == 0)  /* variable */ {
       modelData->booleanAlias[i].filterOutput = regexec(&myregex, modelData->booleanAlias[i].info.name, 0, NULL, 0) != 0;
       if (0 == modelData->booleanAlias[i].filterOutput) {
@@ -395,7 +395,7 @@ void initializeOutputFilter(MODEL_DATA *modelData, modelica_string variableFilte
   for (long i=0; i<modelData->nVariablesString; i++) if(!modelData->stringVarsData[i].filterOutput) {
     modelData->stringVarsData[i].filterOutput = regexec(&myregex, modelData->stringVarsData[i].info.name, 0, NULL, 0) != 0;
   }
-  for (long i=0; i<modelData->nAliasString; i++) {
+  for (long i=0; i<modelData->nAliasString; i++) if(!modelData->stringAlias[i].filterOutput) {
     if(modelData->stringAlias[i].aliasType == 0)  /* variable */ {
       modelData->stringAlias[i].filterOutput = regexec(&myregex, modelData->stringAlias[i].info.name, 0, NULL, 0) != 0;
       if (0 == modelData->stringAlias[i].filterOutput) {

diff --git a/SimulationRuntime/c/util/simulation_options.c b/SimulationRuntime/c/util/simulation_options.c
@@ -35,6 +35,7 @@ const char *FLAG_NAME[FLAG_MAX+1] = {
 
   /* FLAG_CLOCK */                 "clock",
   /* FLAG_CPU */                   "cpu",
+  /* FLAG_EMIT_PROTECTED */                    "emit_protected",
   /* FLAG_F */                     "f",
   /* FLAG_HELP */                  "help",
   /* FLAG_IIF */                   "iif",
@@ -71,6 +72,7 @@ const char *FLAG_DESC[FLAG_MAX+1] = {
 
   /* FLAG_CLOCK */                 "selects the type of clock to use -clock=RT, -clock=CYC or -clock=CPU",
   /* FLAG_CPU */                   "dumps the cpu-time into the results-file",
+  /* FLAG_EMIT_PROTECTED */                    "emits protected variables to the result-file",
   /* FLAG_F */                     "value specifies a new setup XML file to the generated simulation code",
   /* FLAG_HELP */                  "get detailed information that specifies the command-line flag",
   /* FLAG_IIF */                   "value specifies an external file for the initialization of the model",
@@ -107,6 +109,7 @@ const char *FLAG_DETAILED_DESC[FLAG_MAX+1] = {
 
   /* FLAG_CLOCK */                 "selects the type of clock to use -clock=RT, -clock=CYC or -clock=CPU\n  RT=monotonic real-time clock, CPU=process-based CPU-time, CYC=cpu cycles measured with RDTSC",
   /* FLAG_CPU */                   "  - dumps the cpu-time into the result-file\n  - $cpuTime is the variable name inside the result-file",
+  /* FLAG_EMIT_PROTECTED */                    "emits protected variables to the result-file",
   /* FLAG_F */                     "value specifies a new setup XML file to the generated simulation code",
   /* FLAG_HELP */                  "get detailed information that specifies the command-line flag\n  e.g. -help=f prints detailed information for command-line flag f",
   /* FLAG_IIF */                   "value specifies an external file for the initialization of the model",
@@ -143,6 +146,7 @@ const int FLAG_TYPE[FLAG_MAX] = {
 
   /* FLAG_CLOCK */                 FLAG_TYPE_OPTION,
   /* FLAG_CPU */                   FLAG_TYPE_FLAG,
+  /* FLAG_EMIT_PROTECTED */                    FLAG_TYPE_FLAG,
   /* FLAG_F */                     FLAG_TYPE_OPTION,
   /* FLAG_HELP */                  FLAG_TYPE_OPTION,
   /* FLAG_IIF */                   FLAG_TYPE_OPTION,

diff --git a/SimulationRuntime/c/util/simulation_options.h b/SimulationRuntime/c/util/simulation_options.h
@@ -42,6 +42,7 @@ enum _FLAG
 
   FLAG_CLOCK,
   FLAG_CPU,
+  FLAG_EMIT_PROTECTED,
   FLAG_F,
   FLAG_HELP,
   FLAG_IIF,