Skip to content

Commit c928c57

Browse files
committed
[ModelicaSystem] improve handling of variable filter in buildModel()
* do NOT overwrite class definition
1 parent abcae09 commit c928c57

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
@@ -469,15 +469,18 @@ def getWorkDirectory(self) -> pathlib.Path:
469469
return self._tempdir
470470

471471
def buildModel(self, variableFilter: Optional[str] = None):
472+
filter_def: Optional[str] = None
472473
if variableFilter is not None:
473-
self._variable_filter = variableFilter
474+
filter_def = variableFilter
475+
elif self._variable_filter is not None:
476+
filter_def = self._variable_filter
474477

475-
if self._variable_filter is not None:
476-
varFilter = f'variableFilter="{self._variable_filter}"'
478+
if filter_def is not None:
479+
var_filter = f'variableFilter="{filter_def}"'
477480
else:
478-
varFilter = 'variableFilter=".*"'
481+
var_filter = 'variableFilter=".*"'
479482

480-
buildModelResult = self._requestApi("buildModel", self._model_name, properties=varFilter)
483+
buildModelResult = self._requestApi("buildModel", self._model_name, properties=var_filter)
481484
logger.debug("OM model build result: %s", buildModelResult)
482485

483486
self._xml_file = pathlib.Path(buildModelResult[0]).parent / buildModelResult[1]

0 commit comments

Comments
 (0)