Skip to content

Commit a45ee14

Browse files
authored
report proper error messages to users (#179)
1 parent 9ead3c1 commit a45ee14

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

OMPython/__init__.py

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,19 +1592,21 @@ def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default
15921592
>>> convertMo2Fmu()
15931593
>>> convertMo2Fmu(version="2.0", fmuType="me|cs|me_cs", fileNamePrefix="<default>", includeResources=true)
15941594
"""
1595-
convertMo2FmuError = ''
1595+
15961596
if fileNamePrefix == "<default>":
15971597
fileNamePrefix = self.modelName
15981598
if includeResources:
15991599
includeResourcesStr = "true"
16001600
else:
16011601
includeResourcesStr = "false"
16021602
properties = 'version="{}", fmuType="{}", fileNamePrefix="{}", includeResources={}'.format(version, fmuType, fileNamePrefix,includeResourcesStr)
1603-
translateModelFMUResult = self.requestApi('translateModelFMU', self.modelName, properties)
1604-
if convertMo2FmuError:
1605-
print(convertMo2FmuError)
1603+
fmu = self.requestApi('buildModelFMU', self.modelName, properties)
1604+
1605+
## report proper error message
1606+
if not os.path.exists(fmu):
1607+
return print(self.getconn.sendExpression("getErrorString()"))
16061608

1607-
return translateModelFMUResult
1609+
return fmu
16081610

16091611
# to convert FMU to Modelica model
16101612
def convertFmu2Mo(self, fmuName): # 20
@@ -1614,13 +1616,14 @@ def convertFmu2Mo(self, fmuName): # 20
16141616
usage
16151617
>>> convertFmu2Mo("c:/BouncingBall.Fmu")
16161618
"""
1617-
convertFmu2MoError = ''
1618-
importResult = self.requestApi('importFMU', fmuName)
1619-
convertFmu2MoError = self.requestApi('getErrorString')
1620-
if convertFmu2MoError:
1621-
print(convertFmu2MoError)
16221619

1623-
return importResult
1620+
fileName = self.requestApi('importFMU', fmuName)
1621+
1622+
## report proper error message
1623+
if not os.path.exists(fileName):
1624+
return print(self.getconn.sendExpression("getErrorString()"))
1625+
1626+
return fileName
16241627

16251628
# to optimize model
16261629
def optimize(self): # 21

0 commit comments

Comments
 (0)