use readSimulationResultVars for getSolutions (OpenModelica#171)

Author: arun3688

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)