Skip to content

Commit 63cf8e7

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

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -470,15 +470,18 @@ def getWorkDirectory(self) -> pathlib.Path:
470470
return self._tempdir
471471

472472
def buildModel(self, variableFilter: Optional[str] = None):
473+
filter_def: Optional[str] = None
473474
if variableFilter is not None:
474-
self._variable_filter = variableFilter
475+
filter_def = variableFilter
476+
elif self._variable_filter is not None:
477+
filter_def = self._variable_filter
475478

476-
if self._variable_filter is not None:
477-
varFilter = f'variableFilter="{self._variable_filter}"'
479+
if filter_def is not None:
480+
var_filter = f'variableFilter="{filter_def}"'
478481
else:
479-
varFilter = 'variableFilter=".*"'
482+
var_filter = 'variableFilter=".*"'
480483

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

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

0 commit comments

Comments
 (0)