Skip to content

Commit b8cf4a5

Browse files
committed
???
1 parent 7fc93ec commit b8cf4a5

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

OMPython/ModelicaSystem.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -511,19 +511,18 @@ def getWorkDirectory(self) -> OMCPath:
511511
"""
512512
return self._work_dir
513513

514-
def buildModel(self, variableFilter: Optional[str] = None):
515-
variable_filter: Optional[str] = None
516-
if variableFilter is not None:
517-
variable_filter = variableFilter
514+
def buildModel(self, filter_def: Optional[str] = None):
515+
if filter_def is not None:
516+
filter_def = filter_def
518517
elif self._variable_filter is not None:
519-
variable_filter = self._variable_filter
518+
filter_def = self._variable_filter
520519

521-
if variable_filter is not None:
522-
varFilter = f'variableFilter="{variable_filter}"'
520+
if filter_def is not None:
521+
var_filter = f'variableFilter="{filter_def}"'
523522
else:
524-
varFilter = 'variableFilter=".*"'
523+
var_filter = 'variableFilter=".*"'
525524

526-
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=varFilter)
525+
buildModelResult = self._requestApi(apiName="buildModel", entity=self._model_name, properties=var_filter)
527526
logger.debug("OM model build result: %s", buildModelResult)
528527

529528
# check if the executable exists ...
@@ -533,12 +532,12 @@ def buildModel(self, variableFilter: Optional[str] = None):
533532
modelname=self._model_name,
534533
timeout=5.0,
535534
)
536-
# ... and outputs help for command help
535+
# ... by running it - output help for command help
537536
om_cmd.arg_set(key="help", val="help")
538537
cmd_definition = om_cmd.definition()
539538
returncode = self._getconn.run_model_executable(cmd_run_data=cmd_definition)
540539
if returncode != 0:
541-
raise ModelicaSystemError("Error on model executable test!")
540+
raise ModelicaSystemError("Model executable not working!")
542541

543542
xml_file = self._getconn.omcpath(buildModelResult[0]).parent / buildModelResult[1]
544543
self._xmlparse(xml_file=xml_file)

0 commit comments

Comments
 (0)