Skip to content

Commit aabfa14

Browse files
committed
[ModelicaSystem] split __init__() - mypy fix in convertMo2Fmu()
1 parent 2034fc0 commit aabfa14

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
@@ -1537,9 +1537,13 @@ def _createCSVData(self, csvfile: Optional[pathlib.Path] = None) -> pathlib.Path
15371537

15381538
return csvfile
15391539

1540-
def convertMo2Fmu(self, version: str = "2.0", fmuType: str = "me_cs",
1541-
fileNamePrefix: str = "<default>",
1542-
includeResources: bool = True) -> str:
1540+
def convertMo2Fmu(
1541+
self,
1542+
version: str = "2.0",
1543+
fmuType: str = "me_cs",
1544+
fileNamePrefix: Optional[str] = None,
1545+
includeResources: bool = True,
1546+
) -> str:
15431547
"""Translate the model into a Functional Mockup Unit.
15441548
15451549
Args:
@@ -1555,12 +1559,12 @@ def convertMo2Fmu(self, version: str = "2.0", fmuType: str = "me_cs",
15551559
'/tmp/tmpmhfx9umo/CauerLowPassAnalog.fmu'
15561560
"""
15571561

1558-
if fileNamePrefix == "<default>":
1562+
if fileNamePrefix is None:
1563+
if self._model_name is None:
1564+
raise ModelicaSystemError("Missing model name!")
15591565
fileNamePrefix = self._model_name
1560-
if includeResources:
1561-
includeResourcesStr = "true"
1562-
else:
1563-
includeResourcesStr = "false"
1566+
includeResourcesStr = "true" if includeResources else "false"
1567+
15641568
properties = (f'version="{version}", fmuType="{fmuType}", '
15651569
f'fileNamePrefix="{fileNamePrefix}", includeResources={includeResourcesStr}')
15661570
fmu = self._requestApi(apiName='buildModelFMU', entity=self._model_name, properties=properties)

0 commit comments

Comments
 (0)