Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions OMPython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1592,19 +1592,21 @@ def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default
>>> convertMo2Fmu()
>>> convertMo2Fmu(version="2.0", fmuType="me|cs|me_cs", fileNamePrefix="<default>", includeResources=true)
"""
convertMo2FmuError = ''

if fileNamePrefix == "<default>":
fileNamePrefix = self.modelName
if includeResources:
includeResourcesStr = "true"
else:
includeResourcesStr = "false"
properties = 'version="{}", fmuType="{}", fileNamePrefix="{}", includeResources={}'.format(version, fmuType, fileNamePrefix,includeResourcesStr)
translateModelFMUResult = self.requestApi('translateModelFMU', self.modelName, properties)
if convertMo2FmuError:
print(convertMo2FmuError)
fmu = self.requestApi('buildModelFMU', self.modelName, properties)

## report proper error message
if not os.path.exists(fmu):
return print(self.getconn.sendExpression("getErrorString()"))

return translateModelFMUResult
return fmu

# to convert FMU to Modelica model
def convertFmu2Mo(self, fmuName): # 20
Expand All @@ -1614,13 +1616,14 @@ def convertFmu2Mo(self, fmuName): # 20
usage
>>> convertFmu2Mo("c:/BouncingBall.Fmu")
"""
convertFmu2MoError = ''
importResult = self.requestApi('importFMU', fmuName)
convertFmu2MoError = self.requestApi('getErrorString')
if convertFmu2MoError:
print(convertFmu2MoError)

return importResult
fileName = self.requestApi('importFMU', fmuName)

## report proper error message
if not os.path.exists(fileName):
return print(self.getconn.sendExpression("getErrorString()"))

return fileName

# to optimize model
def optimize(self): # 21
Expand Down