X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FADAOSchemaCatalog.xml;h=8793f0ba9b709bd97b0052d52a4ca75d6602b9e9;hb=19e343fd330c2d8087a7eb4b8a8eeb5c2009d346;hp=c6ed43de396ce775e2c0cdba634ae21b936e6526;hpb=7c48be0997755d7e230805736728415aade4a961;p=modules%2Fadao.git

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
index c6ed43d..8793f0b 100644
--- a/resources/ADAOSchemaCatalog.xml
+++ b/resources/ADAOSchemaCatalog.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
 <!--
-  Copyright (C) 2010-2011 EDF R&D
+  Copyright (C) 2010-2013 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
@@ -18,7 +18,7 @@
 
   See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
   
-  Author: Andre Ribes, andre.ribes@edf.fr, EDF R&D
+  Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 -->
 <proc>
 
@@ -57,46 +57,65 @@
     <script><code>
 
 <![CDATA[
-import numpy
+import numpy, logging
+logging.debug("CREATE Entering in CreateAssimilationStudy")
 print "Entering in the assimilation study"
 print "Name is set to........:", Name
 print "Algorithm is set to...:", Algorithm
-print "Debug is set to.......:", Debug
 
 # Create Assimilation study
 from daYacsIntegration.daStudy import *
 assim_study = daStudy(Name, Algorithm, Debug)
 
+logging.debug("CREATE Data entered are:")
+
 # Algorithm parameters
 try:
   AlgorithmParameters
 except NameError:
   pass
 else:
+  logging.debug("CREATE AlgorithmParameters is %s"%AlgorithmParameters)
   assim_study.setAlgorithmParameters(AlgorithmParameters)
 
-# Data
-# print "Data entered are:"
 # Background
 try:
   Background
 except NameError:
   pass
 else:
-  #print "Background is", Background
-  #print "BackgroundType is", BackgroundType
+  logging.debug("CREATE Background is set")
+  logging.debug("CREATE BackgroundType is %s"%BackgroundType)
+  logging.debug("CREATE BackgroundStored is %s"%BackgroundStored)
   assim_study.setBackgroundType(BackgroundType)
+  assim_study.setBackgroundStored(BackgroundStored)
   assim_study.setBackground(Background)
 
-# BackgroundError
+# CheckingPoint
 try:
-  BackgroundError
+  CheckingPoint
 except NameError:
   pass
 else:
-  #print "BackgroundError is", BackgroundError
-  #print "BackgroundErrorType is", BackgroundErrorType
-  assim_study.setBackgroundError(BackgroundError)
+  logging.debug("CREATE CheckingPoint is set")
+  logging.debug("CREATE CheckingPointType is %s"%CheckingPointType)
+  logging.debug("CREATE CheckingPointStored is %s"%CheckingPointStored)
+  assim_study.setCheckingPointType(CheckingPointType)
+  assim_study.setCheckingPointStored(CheckingPointStored)
+  assim_study.setCheckingPoint(CheckingPoint)
+
+# ControlInput
+try:
+  ControlInput
+except NameError:
+  pass
+else:
+  logging.debug("CREATE ControlInput is set")
+  logging.debug("CREATE ControlInputType is %s"%ControlInputType)
+  logging.debug("CREATE ControlInputStored is %s"%ControlInputStored)
+  assim_study.setControlInputType(ControlInputType)
+  assim_study.setControlInputStored(ControlInputStored)
+  assim_study.setControlInput(ControlInput)
 
 # Observation
 try:
@@ -104,21 +123,52 @@ try:
 except NameError:
   pass
 else:
-  #print "Observation is", Observation
-  #print "ObservationType is", ObservationType
+  logging.debug("CREATE Observation is set")
+  logging.debug("CREATE ObservationType is %s"%ObservationType)
+  logging.debug("CREATE ObservationStored is %s"%ObservationStored)
   assim_study.setObservationType(ObservationType)
+  assim_study.setObservationStored(ObservationStored)
   assim_study.setObservation(Observation)
 
+# BackgroundError
+try:
+  BackgroundError
+except NameError:
+  pass
+else:
+  logging.debug("CREATE BackgroundError is set")
+  logging.debug("CREATE BackgroundErrorType is %s"%BackgroundErrorType)
+  logging.debug("CREATE BackgroundErrorStored is %s"%BackgroundErrorStored)
+  assim_study.setBackgroundErrorType(BackgroundErrorType)
+  assim_study.setBackgroundErrorStored(BackgroundErrorStored)
+  assim_study.setBackgroundError(BackgroundError)
+
 # ObservationError
 try:
   ObservationError
 except NameError:
   pass
 else:
-  #print "ObservationError is", ObservationError
-  #print "ObservationErrorType is", ObservationErrorType
+  logging.debug("CREATE ObservationError is set")
+  logging.debug("CREATE ObservationErrorType is %s"%ObservationErrorType)
+  logging.debug("CREATE ObservationErrorStored is %s"%ObservationErrorStored)
+  assim_study.setObservationErrorType(ObservationErrorType)
+  assim_study.setObservationErrorStored(ObservationErrorStored)
   assim_study.setObservationError(ObservationError)
 
+# EvolutionError
+try:
+  EvolutionError
+except NameError:
+  pass
+else:
+  logging.debug("CREATE EvolutionError is set")
+  logging.debug("CREATE EvolutionErrorType is %s"%EvolutionErrorType)
+  logging.debug("CREATE EvolutionErrorStored is %s"%EvolutionErrorStored)
+  assim_study.setEvolutionErrorType(EvolutionErrorType)
+  assim_study.setEvolutionErrorStored(EvolutionErrorStored)
+  assim_study.setEvolutionError(EvolutionError)
+
 # ObservationOperator
 ObservationOperatorOk = 0
 try:
@@ -126,8 +176,8 @@ try:
 except NameError:
   pass
 else:
-  #print "ObservationOperator is", ObservationOperator
-  #print "ObservationOperatorType is", ObservationOperatorType
+  logging.debug("CREATE ObservationOperator is set")
+  logging.debug("CREATE ObservationOperatorType is %s"%ObservationOperatorType)
   assim_study.setObservationOperatorType("Matrix", ObservationOperatorType)
   assim_study.setObservationOperator("Matrix", ObservationOperator)
   ObservationOperatorOk = 1
@@ -138,7 +188,7 @@ if ObservationOperatorOk == 0:
   except NameError:
     pass
   else:
-    #print "ObservationOperatorDirect is", ObservationOperatorDirect
+    logging.debug("CREATE ObservationOperatorDirect is %s"%ObservationOperatorDirect)
     assim_study.setObservationOperatorType("Direct", "Function")
     assim_study.setObservationOperator("Direct", ObservationOperatorDirect)
   try:
@@ -146,7 +196,7 @@ if ObservationOperatorOk == 0:
   except NameError:
     pass
   else:
-    #print "ObservationOperatorTangent is", ObservationOperatorTangent
+    logging.debug("CREATE ObservationOperatorTangent is %s"%ObservationOperatorTangent)
     assim_study.setObservationOperatorType("Tangent", "Function")
     assim_study.setObservationOperator("Tangent", ObservationOperatorTangent)
   try:
@@ -154,10 +204,49 @@ if ObservationOperatorOk == 0:
   except NameError:
     pass
   else:
-    #print "ObservationOperatorAdjoint is", ObservationOperatorAdjoint
+    logging.debug("CREATE ObservationOperatorAdjoint is %s"%ObservationOperatorAdjoint)
     assim_study.setObservationOperatorType("Adjoint", "Function")
     assim_study.setObservationOperator("Adjoint", ObservationOperatorAdjoint)
 
+# EvolutionModel
+EvolutionModelOk = 0
+try:
+  EvolutionModel
+except NameError:
+  pass
+else:
+  logging.debug("CREATE EvolutionModel is set")
+  logging.debug("CREATE EvolutionModelType is %s"%EvolutionModelType)
+  assim_study.setEvolutionModelType("Matrix", EvolutionModelType)
+  assim_study.setEvolutionModel("Matrix", EvolutionModel)
+  EvolutionModelOk = 1
+
+if EvolutionModelOk == 0:
+  try:
+    EvolutionModelDirect
+  except NameError:
+    pass
+  else:
+    logging.debug("CREATE EvolutionModelDirect is %s"%EvolutionModelDirect)
+    assim_study.setEvolutionModelType("Direct", "Function")
+    assim_study.setEvolutionModel("Direct", EvolutionModelDirect)
+  try:
+    EvolutionModelTangent
+  except NameError:
+    pass
+  else:
+    logging.debug("CREATE EvolutionModelTangent is %s"%EvolutionModelTangent)
+    assim_study.setEvolutionModelType("Tangent", "Function")
+    assim_study.setEvolutionModel("Tangent", EvolutionModelTangent)
+  try:
+    EvolutionModelAdjoint
+  except NameError:
+    pass
+  else:
+    logging.debug("CREATE EvolutionModelAdjoint is %s"%EvolutionModelAdjoint)
+    assim_study.setEvolutionModelType("Adjoint", "Function")
+    assim_study.setEvolutionModel("Adjoint", EvolutionModelAdjoint)
+
 # Variables
 for name, size in zip(InputVariablesNames, InputVariablesSizes):
   assim_study.setInputVariable(name, size)
@@ -165,6 +254,7 @@ for name, size in zip(OutputVariablesNames, OutputVariablesSizes):
   assim_study.setOutputVariable(name, size)
 
 if has_observers:
+  logging.debug("CREATE Observers keys are %s"%observers.keys())
   # Adding observers to the study
   for observer_name in observers.keys():
     scheduler = ""
@@ -193,79 +283,199 @@ Study = assim_study
 
   <inline name="CreateNumpyMatrixFromString">
     <script><code><![CDATA[
-#print "Entering in CreateNumpyMatrixFromString"
-import numpy
+import numpy, logging
+logging.debug("CREATE Entering in CreateNumpyMatrixFromString")
 matrix = numpy.matrix(matrix_in_string)
 type = "Matrix"
-#print "Matrix is", matrix
+logging.debug("CREATE Matrix is %s"%matrix)
+]]></code></script>
+    <inport name="matrix_in_string" type="string"/>
+    <outport name="matrix" type="pyobj"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
+
+  <inline name="CreateNumpyScalarSparseMatrixFromString">
+    <script><code><![CDATA[
+import numpy, logging
+logging.debug("CREATE Entering in CreateNumpyScalarSparseMatrixFromString")
+matrix = numpy.matrix(matrix_in_string)
+type = "ScalarSparseMatrix"
+logging.debug("CREATE ScalarSparseMatrix is %s"%matrix)
 ]]></code></script>
     <inport name="matrix_in_string" type="string"/>
     <outport name="matrix" type="pyobj"/>
     <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
+
+  <inline name="CreateNumpyDiagonalSparseMatrixFromString">
+    <script><code><![CDATA[
+import numpy, logging
+logging.debug("CREATE Entering in CreateNumpyDiagonalSparseMatrixFromString")
+matrix = numpy.matrix(matrix_in_string)
+type = "DiagonalSparseMatrix"
+logging.debug("CREATE DiagonalSparseMatrix is %s"%matrix)
+]]></code></script>
+    <inport name="matrix_in_string" type="string"/>
+    <outport name="matrix" type="pyobj"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
   </inline>
 
   <inline name="CreateNumpyMatrixFromScript">
     <script><code><![CDATA[
-#print "Entering in CreateNumpyMatrixFromScript"
+import logging, sys, os
+logging.debug("CREATE Entering in CreateNumpyMatrixFromScript")
 type = "Matrix"
 
 # Get file path and filename
-import sys
-import os
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
+filepath = os.path.dirname(script)
+filename = os.path.basename(script)
+module_name = os.path.splitext(filename)[0]
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
+
+]]></code></script>
+    <inport name="script" type="string"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
+
+  <inline name="CreateNumpyScalarSparseMatrixFromScript">
+    <script><code><![CDATA[
+import logging, sys, os
+logging.debug("CREATE Entering in CreateNumpyScalarSparseMatrixFromScript")
+type = "ScalarSparseMatrix"
+
+# Get file path and filename
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
 filepath = os.path.dirname(script)
 filename = os.path.basename(script)
 module_name = os.path.splitext(filename)[0]
-sys.path.insert(0,filepath)
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
+
+]]></code></script>
+    <inport name="script" type="string"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
 
-# Import script
-__import__(module_name)
-user_script_module = sys.modules[module_name]
+  <inline name="CreateNumpyDiagonalSparseMatrixFromScript">
+    <script><code><![CDATA[
+import logging, sys, os
+logging.debug("CREATE Entering in CreateNumpyDiagonalSparseMatrixFromScript")
+type = "DiagonalSparseMatrix"
+
+# Get file path and filename
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
+filepath = os.path.dirname(script)
+filename = os.path.basename(script)
+module_name = os.path.splitext(filename)[0]
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
 
-# Get Data from script
 ]]></code></script>
     <inport name="script" type="string"/>
     <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
   </inline>
 
   <inline name="CreateNumpyVectorFromString">
     <script><code><![CDATA[
-#print "Entering in CreateNumpyVectorFromString"
-import numpy
+import numpy, logging
+logging.debug("CREATE Entering in CreateNumpyVectorFromString")
 vector = numpy.matrix(vector_in_string)
 type = "Vector"
-#print "Vector is", vector
+logging.debug("Vector is %s"%vector)
 ]]></code></script>
     <inport name="vector_in_string" type="string"/>
     <outport name="vector" type="pyobj"/>
     <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
   </inline>
 
   <inline name="CreateNumpyVectorFromScript">
     <script><code><![CDATA[
-#print "Entering in CreateNumpyVectorFromScript"
+import logging, sys, os
+logging.debug("CREATE Entering in CreateNumpyVectorFromScript")
 type = "Vector"
 
 # Get file path and filename
-import sys
-import os
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
 filepath = os.path.dirname(script)
 filename = os.path.basename(script)
 module_name = os.path.splitext(filename)[0]
-sys.path.insert(0,filepath)
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
 
-# Import script
-__import__(module_name)
-user_script_module = sys.modules[module_name]
+]]></code></script>
+    <inport name="script" type="string"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
+
+  <inline name="CreateNumpyVectorSerieFromString">
+    <script><code><![CDATA[
+import numpy, logging
+logging.debug("CREATE Entering in CreateNumpyVectorSerieFromString")
+vector_in_list = eval(str(vector_in_string),{},{})
+vector = numpy.matrix(vector_in_list)
+type = "VectorSerie"
+logging.debug("VectorSerie is %s"%vector)
+]]></code></script>
+    <inport name="vector_in_string" type="string"/>
+    <outport name="vector" type="pyobj"/>
+    <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
+  </inline>
+
+  <inline name="CreateNumpyVectorSerieFromScript">
+    <script><code><![CDATA[
+import logging, sys, os
+logging.debug("CREATE Entering in CreateNumpyVectorSerieFromScript")
+type = "VectorSerie"
+
+# Get file path and filename
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
+filepath = os.path.dirname(script)
+filename = os.path.basename(script)
+module_name = os.path.splitext(filename)[0]
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
 
-# Get Data from script
 ]]></code></script>
     <inport name="script" type="string"/>
     <outport name="type" type="string"/>
+    <outport name="stored" type="bool"/>
   </inline>
 
   <inline name="SimpleExecuteDirectAlgorithm">
     <script><code><![CDATA[
-#print "Entering in SimpleExecuteDirectAlgorithm"
+import logging
+logging.debug("EXECUTE Entering in SimpleExecuteDirectAlgorithm")
 from daYacsIntegration.daStudy import *
 ADD = Study.getAssimilationStudy()
 ADD.analyze()
@@ -277,7 +487,8 @@ ADD.analyze()
   <inline name="SimpleUserAnalysis">
     <script><code><![CDATA[
 #-*-coding:iso-8859-1-*-
-#print "Entering in SimpleUserAnalysis"
+import logging
+logging.debug("TERMINATE Entering in SimpleUserAnalysis")
 from daYacsIntegration.daStudy import *
 ADD = Study.getAssimilationStudy()
 # User code is below
@@ -288,51 +499,61 @@ ADD = Study.getAssimilationStudy()
 
   <inline name="FakeOptimizerLoopNode">
     <script><code><![CDATA[
-#print "Entering in FakeOptimizerLoopNode"
+import logging
+logging.debug("EXECUTE Entering in FakeOptimizerLoopNode")
 result = None
 ]]></code></script>
     <inport name="computation" type="SALOME_TYPES/ParametricInput"/>
     <outport name="result" type="SALOME_TYPES/ParametricOutput"/>
   </inline>
 
+  <inline name="CreateDictFromString">
+    <script><code><![CDATA[
+import logging, sys, os
+logging.debug("CREATE Entering in CreateDictFromString")
+dico = eval(dict_in_string)
+]]></code></script>
+    <inport name="dict_in_string" type="string"/>
+  </inline>
+
   <inline name="CreateDictFromScript">
     <script><code><![CDATA[
-#print "Entering in CreateDictFromScript"
+import logging, sys, os
+logging.debug("CREATE Entering in CreateDictFromScript")
 
 # Get file path and filename
-import sys
-import os
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
 filepath = os.path.dirname(script)
 filename = os.path.basename(script)
 module_name = os.path.splitext(filename)[0]
-sys.path.insert(0,filepath)
-
-# Import script
-__import__(module_name)
-user_script_module = sys.modules[module_name]
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
 
-# Get Data from script
 ]]></code></script>
     <inport name="script" type="string"/>
   </inline>
 
   <inline name="UserDataInitFromScript">
     <script><code><![CDATA[
-#print "Entering in UserDataInitFromScript"
+import logging, sys, os
+logging.debug("CREATE Entering in UserDataInitFromScript")
 
 # Get file path and filename
-import sys
-import os
+try:
+    if sys.path.count(studydir)==0 or (sys.path.count(studydir)>0 and sys.path.index(studydir)>0):
+        sys.path.insert(0,studydir)
+except:
+    pass
 filepath = os.path.dirname(script)
 filename = os.path.basename(script)
 module_name = os.path.splitext(filename)[0]
-sys.path.insert(0,filepath)
+if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):
+    sys.path.insert(0,filepath)
 
-# Import script
-__import__(module_name)
-user_script_module = sys.modules[module_name]
-
-# Get Data from script
 ]]></code></script>
     <inport name="script" type="string"/>
     <outport name="init_data" type="pyobj"/>
@@ -340,11 +561,14 @@ user_script_module = sys.modules[module_name]
 
   <inline name="ReadForSwitchNode">
     <script><code><![CDATA[
-#print "Entering in ReadForSwitch"
+import logging
+logging.debug("CREATE Entering in ReadForSwitchNode")
+logging.debug("       with input data : "+str(data["specificParameters"]))
 switch_value = -1
 for param in data["specificParameters"]:
   if param["name"] == "switch_value":
     switch_value = int(param["value"])
+logging.debug("       switching to value : "+str(switch_value))
 ]]></code></script>
     <inport name="data" type="SALOME_TYPES/ParametricInput"/>
     <outport name="data" type="SALOME_TYPES/ParametricInput"/>
@@ -353,14 +577,15 @@ for param in data["specificParameters"]:
 
   <inline name="ExtractDataNode">
     <script><code><![CDATA[
-import pickle
+import logging
+logging.debug("TERMINATE Entering in ExtractDataNode")
+import cPickle
 from daCore.AssimilationStudy import AssimilationStudy
-#print "Entering in ExtractData"
 var = None
 info = None
 for param in data["specificParameters"]:
   if param["name"] == "var":
-    var = pickle.loads(param["value"])
+    var = cPickle.loads(param["value"])
   if param["name"] == "info":
     info = param["value"]
 ]]></code></script>
@@ -370,20 +595,13 @@ for param in data["specificParameters"]:
   </inline>
 
   <inline name="ObservationNodeString">
-    <script><code><![CDATA[
-#print "Entering in Observation"
-
-]]></code></script>
+    <script><code><![CDATA[]]></code></script>
     <inport name="var" type="pyobj"/>
     <inport name="info" type="pyobj"/>
   </inline>
 
   <inline name="ObservationNodeFile">
-    <script><code><![CDATA[
-#print "Entering in Observation"
-execfile(script)
-
-]]></code></script>
+    <script><code><![CDATA[execfile(script)]]></code></script>
     <inport name="var"    type="pyobj"/>
     <inport name="info"   type="pyobj"/>
     <inport name="script" type="string"/>