From 256891824c038c750970cac6b79f2008df7e776d Mon Sep 17 00:00:00 2001 From: arun3688 Date: Wed, 16 Aug 2023 22:36:13 +0200 Subject: [PATCH] use readSimulationResultVars for getSolutions --- OMPython/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OMPython/__init__.py b/OMPython/__init__.py index 0243449ca..624c56065 100755 --- a/OMPython/__init__.py +++ b/OMPython/__init__.py @@ -1316,13 +1316,12 @@ def getSolutions(self, varList=None, resultfile=None): # 12 return #exit() else: + resultVars = self.getconn.sendExpression("readSimulationResultVars(\"" + resFile + "\")") + self.getconn.sendExpression("closeSimulationResultFile()") if (varList == None): - # validSolution = ['time'] + self.__getInputNames() + self.__getContinuousNames() + self.__getParameterNames() - validSolution = self.getconn.sendExpression("readSimulationResultVars(\"" + resFile + "\")") - self.getconn.sendExpression("closeSimulationResultFile()") - return validSolution + return resultVars elif (isinstance(varList,str)): - if (varList not in [l["name"] for l in self.quantitiesList] and varList!="time"): + if (varList not in resultVars and varList!="time"): print('!!! ', varList, ' does not exist\n') return exp = "readSimulationResult(\"" + resFile + '",{' + varList + "})" @@ -1336,7 +1335,7 @@ def getSolutions(self, varList=None, resultfile=None): # 12 for v in varList: if v == "time": continue - if v not in [l["name"] for l in self.quantitiesList]: + if v not in resultVars: print('!!! ', v, ' does not exist\n') return variables = ",".join(varList)