Skip to content

Commit 3bb7614

Browse files
committed
[ModelicaSystem] split __init__() - mypy fix in convertMo2Fmu()
1 parent 8595297 commit 3bb7614

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

OMPython/ModelicaSystem.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,9 +1574,13 @@ def _createCSVData(self, csvfile: Optional[OMCPath] = None) -> OMCPath:
15741574

15751575
return csvfile
15761576

1577-
def convertMo2Fmu(self, version: str = "2.0", fmuType: str = "me_cs",
1578-
fileNamePrefix: str = "<default>",
1579-
includeResources: bool = True) -> str:
1577+
def convertMo2Fmu(
1578+
self,
1579+
version: str = "2.0",
1580+
fmuType: str = "me_cs",
1581+
fileNamePrefix: Optional[str] = None,
1582+
includeResources: bool = True,
1583+
) -> str:
15801584
"""Translate the model into a Functional Mockup Unit.
15811585
15821586
Args:
@@ -1592,12 +1596,12 @@ def convertMo2Fmu(self, version: str = "2.0", fmuType: str = "me_cs",
15921596
'/tmp/tmpmhfx9umo/CauerLowPassAnalog.fmu'
15931597
"""
15941598

1595-
if fileNamePrefix == "<default>":
1599+
if fileNamePrefix is None:
1600+
if self._model_name is None:
1601+
raise ModelicaSystemError("Missing model name!")
15961602
fileNamePrefix = self._model_name
1597-
if includeResources:
1598-
includeResourcesStr = "true"
1599-
else:
1600-
includeResourcesStr = "false"
1603+
includeResourcesStr = "true" if includeResources else "false"
1604+
16011605
properties = (f'version="{version}", fmuType="{fmuType}", '
16021606
f'fileNamePrefix="{fileNamePrefix}", includeResources={includeResourcesStr}')
16031607
fmu = self._requestApi(apiName='buildModelFMU', entity=self._model_name, properties=properties)

0 commit comments

Comments
 (0)