X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGENERICSOLVER%2FDEVIATION.py;h=1899cb55c971e39b371f9d18828f2590b1140356;hb=aa79441714a71e926717c36e7ee03202f1798dca;hp=369cabb06ab204623207bb4fdbdd956f0a3c7c5c;hpb=c3e08942f0996fcd79339b2be486acc0a1dd43c3;p=samples%2Fgenericsolver.git

diff --git a/src/GENERICSOLVER/DEVIATION.py b/src/GENERICSOLVER/DEVIATION.py
index 369cabb..1899cb5 100644
--- a/src/GENERICSOLVER/DEVIATION.py
+++ b/src/GENERICSOLVER/DEVIATION.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2009-2010 EDF R&D
+#  Copyright (C) 2009-2011 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,23 +19,28 @@
 #  $Id$
 #
 
+import os
 import logging
 import threading
 import inspect
 import traceback
+import platform
+import thread
 
 import salome
 import GENERICSOLVER_ORB__POA
 import SALOME_ComponentPy
 import SALOME_DriverPy
 import SALOME
-import SALOME_Parametric
 
 from salome.kernel.logger import Logger
 from salome.kernel import termcolor
 logger = Logger("DEVIATION", color = termcolor.RED_FG)
 logger.setLevel(logging.INFO)
 
+from salome.kernel.parametric.compo_utils import \
+    create_input_dict, create_normal_parametric_output, create_error_parametric_output
+
 VARIABLE_ID = 1030
 
 ###
@@ -126,6 +131,11 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
         exc = SALOME.ExceptionStruct(SALOME.INTERNAL_ERROR, message,
                                      inspect.stack()[1][1], inspect.stack()[1][2])
         raise SALOME.SALOME_Exception(exc)
+    
+    def _getIdMessage(self):
+        return "%s in container %s running on %s, process %d, thread %d" % \
+               (self._instanceName, self._containerName,
+                platform.node(), os.getpid(), thread.get_ident())
 
     def Init(self, studyId, detCaseEntry):
         """
@@ -133,7 +143,7 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
         use with OpenTURNS in SALOME 5.1.5 and later (for YACS integration)
         """
         try:
-            logger.info("Init: " + self._containerName + ' ; ' + self._instanceName)
+            logger.info("Init: " + self._getIdMessage())
             DEVIATION.lock.acquire()
             salome.salome_init()
             DEVIATION.lock.release()
@@ -149,29 +159,24 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
         use with OpenTURNS in SALOME 5.1.5 and later (for YACS integration)
         """
         try:
-            logger.info("Exec: " + self._containerName + ' ; ' + self._instanceName)
+            logger.info("Exec: " + self._getIdMessage())
             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):
-                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]
-            logger.debug("evalPoint = %s" % evalPoint)
-
-            resDict = {}
-            resDict["dev"] = self.BeamModel(**evalPoint)
-
-            outputValues = []
-            for outputVar in paramInput.outputVarList:
-                outputValues.append([[resDict[outputVar]]])
-            logger.debug("paramOutput: %s" % outputValues)
-            return SALOME_Parametric.ParametricOutput(outputValues,
-                                                      specificOutputInfos = [],
-                                                      returnCode = 0,
-                                                      errorMessage = "")
+
+            inputDict = create_input_dict(self.deterministicValues, paramInput)
+            logger.debug("inputDict = %s" % inputDict)
+            
+            # Test for an invalid parameter and return an error in this case
+            if inputDict["L"] <= 0:
+                return create_error_parametric_output("Invalid value: L must be positive")
+
+            outputDict = {}
+            outputDict["dev"] = self.BeamModel(**inputDict)
+
+            paramOutput = create_normal_parametric_output(outputDict, paramInput)
+            logger.debug("outputValues: %s" % paramOutput.outputValues)
+            return paramOutput
         except:
             self._raiseSalomeError()
 
@@ -181,10 +186,24 @@ class DEVIATION(GENERICSOLVER_ORB__POA.DEVIATION_Gen,
         It cleans everything set so far.
         """
         try:
-            logger.info("Finalize: " + self._containerName + ' ; ' + self._instanceName)
+            logger.info("Finalize: " + self._getIdMessage())
+        except:
+            self._raiseSalomeError()
+
+    def GetFilesToTransfer(self, studyId, detCaseEntry):
+        """
+        This method can be used to specify files to transfer to the
+        computation resource. It is not useful for DEVIATION since it only
+        uses values from Salome study.
+        """
+        try:
+            logger.info("GetFilesToTransfer: " + self._getIdMessage())
+            inputFiles = []
+            outputFiles = []
+            return (inputFiles, outputFiles)
         except:
             self._raiseSalomeError()
-        
+
 ######################################################################
 # This is the computation part of the GENERICSOLVER module, ie
 # the following method realizes what the solver is intended to do.