Adapted DEVIATION to new parametric types

diff --git a/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py
index bb5414a4b67fa5f48bdc5750dc873dadf467b165..6ab9fc4c649947b989c747eb95324963d86a0a7e 100644 (file)
--- a/src/GENERICSOLVER/DEVIATION.py
+++ b/src/GENERICSOLVER/DEVIATION.py
@@ -161,12 +161,13 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
             logger.debug("inputVarList: %s" % paramInput.inputVarList)
             logger.debug("outputVarList: %s" % paramInput.outputVarList)
             logger.debug("inputValues: %s" % paramInput.inputValues)
-            if len(paramInput.inputValues) != len(paramInput.inputVarList):
+            inputPoint = paramInput.inputValues[0][0] # No time series, single observation
+            if len(inputPoint) != len(paramInput.inputVarList):
                 raise Exception("Size mismatch between inputVarList and point to evaluate")
 
             evalPoint = self.deterministicValues
-            for i in range(len(paramInput.inputVarList)):
-                evalPoint[paramInput.inputVarList[i]] = paramInput.inputValues[i][0][0]
+            for i in range(len(inputPoint)):
+                evalPoint[paramInput.inputVarList[i]] = inputPoint[i][0]
             logger.debug("evalPoint = %s" % evalPoint)
             
             # Test for an invalid parameter and return an error in this case
@@ -180,9 +181,9 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
             resDict = {}
             resDict["dev"] = self.BeamModel(**evalPoint)
 
-            outputValues = []
+            outputValues = [[[]]]
             for outputVar in paramInput.outputVarList:
-                outputValues.append([[resDict[outputVar]]])
+                outputValues[0][0].append([resDict[outputVar]])
             logger.debug("paramOutput: %s" % outputValues)
             return SALOME_TYPES.ParametricOutput(outputValues,
                                                  specificOutputInfos = [],