Skip to content

Commit 55c1395

Browse files
committed
[ModelicaSystem] improve handling of variable filter in buildModell()
* do NOT overwrite class definition
1 parent c42660a commit 55c1395

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
@@ -497,15 +497,18 @@ def getWorkDirectory(self) -> OMCPath:
497497
return self._work_dir
498498

499499
def buildModel(self, variableFilter: Optional[str] = None):
500+
filter_def: Optional[str] = None
500501
if variableFilter is not None:
501-
self._variable_filter = variableFilter
502+
filter_def = variableFilter
503+
elif self._variable_filter is not None:
504+
filter_def = self._variable_filter
502505

503-
if self._variable_filter is not None:
504-
varFilter = f'variableFilter="{self._variable_filter}"'
506+
if filter_def is not None:
507+
var_filter = f'variableFilter="{filter_def}"'
505508
else:
506-
varFilter = 'variableFilter=".*"'
509+
var_filter = 'variableFilter=".*"'
507510

508-
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=varFilter)
511+
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=var_filter)
509512
logger.debug("OM model build result: %s", buildModelResult)
510513

511514
# check if the executable exists ...

0 commit comments

Comments
 (0)