Skip to content

Commit f1e6d25

Browse files
authored
[ModelicaSystem] improve handling of variable filter in buildModel() (#343)
* do NOT overwrite class definition
1 parent 0d5d002 commit f1e6d25

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

OMPython/ModelicaSystem.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -529,15 +529,18 @@ def getWorkDirectory(self) -> pathlib.Path:
529529
return self._work_dir
530530

531531
def buildModel(self, variableFilter: Optional[str] = None):
532+
filter_def: Optional[str] = None
532533
if variableFilter is not None:
533-
self._variable_filter = variableFilter
534+
filter_def = variableFilter
535+
elif self._variable_filter is not None:
536+
filter_def = self._variable_filter
534537

535-
if self._variable_filter is not None:
536-
varFilter = f'variableFilter="{self._variable_filter}"'
538+
if filter_def is not None:
539+
var_filter = f'variableFilter="{filter_def}"'
537540
else:
538-
varFilter = 'variableFilter=".*"'
541+
var_filter = 'variableFilter=".*"'
539542

540-
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=varFilter)
543+
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=var_filter)
541544
logger.debug("OM model build result: %s", buildModelResult)
542545

543546
xml_file = pathlib.Path(buildModelResult[0]).parent / buildModelResult[1]

0 commit comments

Comments
 (0)