Skip to content

Commit 7981c3d

Browse files
committed
allow users to provide library version
1 parent 1179b9b commit 7981c3d

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

OMPython/__init__.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -897,12 +897,22 @@ def __loadingModel(self):
897897
for element in self.lmodel:
898898
if element is not None:
899899
loadmodelError = ''
900-
if element.endswith(".mo"):
901-
loadModelResult = self.requestApi("loadFile", element)
902-
loadmodelError = self.requestApi('getErrorString')
900+
if isinstance(element, str):
901+
if element.endswith(".mo"):
902+
loadModelResult = self.requestApi("loadFile", element)
903+
loadmodelError = self.requestApi('getErrorString')
904+
else:
905+
loadModelResult = self.requestApi("loadModel", element)
906+
loadmodelError = self.requestApi('getErrorString')
907+
elif isinstance(element, tuple):
908+
if not element[1]:
909+
libname = "".join(["loadModel(", element[0], ")"])
910+
else:
911+
libname = "".join(["loadModel(", element[0], ", ", "{", "\"", element[1], "\"", "}", ")"])
912+
loadmodelError = self.sendExpression(libname)
913+
loadmodelError = self.sendExpression("getErrorString()")
903914
else:
904-
loadModelResult = self.requestApi("loadModel", element)
905-
loadmodelError = self.requestApi('getErrorString')
915+
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")
906916
if loadmodelError:
907917
print(loadmodelError)
908918
self.buildModel()

0 commit comments

Comments
 (0)