Skip to content

Commit a65f8dc

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

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
@@ -495,15 +495,18 @@ def getWorkDirectory(self) -> OMCPath:
495495
return self._work_dir
496496

497497
def buildModel(self, variableFilter: Optional[str] = None):
498+
filter_def: Optional[str] = None
498499
if variableFilter is not None:
499-
self._variable_filter = variableFilter
500+
filter_def = variableFilter
501+
elif self._variable_filter is not None:
502+
filter_def = self._variable_filter
500503

501-
if self._variable_filter is not None:
502-
varFilter = f'variableFilter="{self._variable_filter}"'
504+
if filter_def is not None:
505+
var_filter = f'variableFilter="{filter_def}"'
503506
else:
504-
varFilter = 'variableFilter=".*"'
507+
var_filter = 'variableFilter=".*"'
505508

506-
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=varFilter)
509+
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=var_filter)
507510
logger.debug("OM model build result: %s", buildModelResult)
508511

509512
# check if the executable exists ...

0 commit comments

Comments
 (0)