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
allow users to provide library version
  • Loading branch information
arun3688 committed Aug 12, 2021
commit 348de98f1f7a9a602dd9a491610837ea74aea096
20 changes: 15 additions & 5 deletions OMPython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -897,12 +897,22 @@ def __loadingModel(self):
for element in self.lmodel:
if element is not None:
loadmodelError = ''
if element.endswith(".mo"):
loadModelResult = self.requestApi("loadFile", element)
loadmodelError = self.requestApi('getErrorString')
if isinstance(element, str):
if element.endswith(".mo"):
loadModelResult = self.requestApi("loadFile", element)
loadmodelError = self.requestApi('getErrorString')
else:
loadModelResult = self.requestApi("loadModel", element)
loadmodelError = self.requestApi('getErrorString')
elif isinstance(element, tuple):
if not element[1]:
libname = "".join(["loadModel(", element[0], ")"])
else:
libname = "".join(["loadModel(", element[0], ", ", "{", "\"", element[1], "\"", "}", ")"])
loadmodelError = self.sendExpression(libname)
loadmodelError = self.sendExpression("getErrorString()")
else:
loadModelResult = self.requestApi("loadModel", element)
loadmodelError = self.requestApi('getErrorString')
print("| info | loadLibrary() failed, Unknown type detected: ", element , " is of type ", type(element), ", The following patterns are supported\n1)[\"Modelica\"]\n2)[(\"Modelica\",\"3.2.3\"), \"PowerSystems\"]\n")
if loadmodelError:
print(loadmodelError)
self.buildModel()
Expand Down