Adding checking algorithms environment

[modules/adao.git] / resources / ADAOSchemaCatalog.xml

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
index c3b6987f70f5c7b726287ddfbc2e66e946d9bcf4..10a9073db53222967e9c346a921f3dbafa8cc3b7 100644 (file)
--- a/resources/ADAOSchemaCatalog.xml
+++ b/resources/ADAOSchemaCatalog.xml
@@ -57,11 +57,12 @@
     <script><code>
 
 <![CDATA[
-import numpy
-print "Entering in CreateAssimilationStudy"
-print "Name is", Name
-print "Algorithm is", Algorithm
-print "Debug is set to", Debug
+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 *
@@ -76,26 +77,38 @@ else:
   assim_study.setAlgorithmParameters(AlgorithmParameters)
 
 # Data
-print "Data entered are:"
+# print "Data entered are:"
+
 # Background
 try:
   Background
 except NameError:
   pass
 else:
-  #print "Background is", Background
-  #print "BackgroundType is", BackgroundType
+  logging.debug("CREATE Background is %s"%Background)
+  logging.debug("CREATE BackgroundType is %s"%BackgroundType)
   assim_study.setBackgroundType(BackgroundType)
   assim_study.setBackground(Background)
 
+# CheckingPoint
+try:
+  CheckingPoint
+except NameError:
+  pass
+else:
+  logging.debug("CREATE CheckingPoint is %s"%CheckingPoint)
+  logging.debug("CREATE CheckingPointType is %s"%CheckingPointType)
+  assim_study.setCheckingPointType(CheckingPointType)
+  assim_study.setCheckingPoint(CheckingPoint)
+
 # BackgroundError
 try:
   BackgroundError
 except NameError:
   pass
 else:
-  #print "BackgroundError is", BackgroundError
-  #print "BackgroundErrorType is", BackgroundErrorType
+  logging.debug("CREATE BackgroundError is %s"%BackgroundError)
+  logging.debug("CREATE BackgroundErrorType is %s"%BackgroundErrorType)
   assim_study.setBackgroundError(BackgroundError)
 
 # Observation
@@ -104,8 +117,8 @@ try:
 except NameError:
   pass
 else:
-  #print "Observation is", Observation
-  #print "ObservationType is", ObservationType
+  logging.debug("CREATE Observation is %s"%Observation)
+  logging.debug("CREATE ObservationType is %s"%ObservationType)
   assim_study.setObservationType(ObservationType)
   assim_study.setObservation(Observation)
 
@@ -115,8 +128,8 @@ try:
 except NameError:
   pass
 else:
-  #print "ObservationError is", ObservationError
-  #print "ObservationErrorType is", ObservationErrorType
+  logging.debug("CREATE ObservationError is %s"%ObservationError)
+  logging.debug("CREATE ObservationErrorType is %s"%ObservationErrorType)
   assim_study.setObservationError(ObservationError)
 
 # ObservationOperator
@@ -126,8 +139,8 @@ try:
 except NameError:
   pass
 else:
-  #print "ObservationOperator is", ObservationOperator
-  #print "ObservationOperatorType is", ObservationOperatorType
+  logging.debug("CREATE ObservationOperator is %s"%ObservationOperator)
+  logging.debug("CREATE ObservationOperatorType is %s"%ObservationOperatorType)
   assim_study.setObservationOperatorType("Matrix", ObservationOperatorType)
   assim_study.setObservationOperator("Matrix", ObservationOperator)
   ObservationOperatorOk = 1
@@ -138,7 +151,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 +159,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,7 +167,7 @@ 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)
 
@@ -165,15 +178,17 @@ for name, size in zip(OutputVariablesNames, OutputVariablesSizes):
   assim_study.setOutputVariable(name, size)
 
 if has_observers:
+  logging.debug("CREATE Observers is %s"%observers.keys())
   # Adding observers to the study
   for observer_name in observers.keys():
     scheduler = ""
     info = ""
+    number = str(observers[observer_name]["number"])
     if "scheduler" in observers[observer_name].keys():
       scheduler = observers[observer_name]["scheduler"]
     if "info" in observers[observer_name].keys():
-      scheduler = observers[observer_name]["info"]
-    assim_study.addObserver(observer_name, scheduler, info)
+      info = observers[observer_name]["info"]
+    assim_study.addObserver(observer_name, scheduler, info, number)
 Study = assim_study
 ]]>
 
@@ -192,11 +207,11 @@ 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"/>
@@ -205,7 +220,8 @@ print "Matrix is", matrix
 
   <inline name="CreateNumpyMatrixFromScript">
     <script><code><![CDATA[
-print "Entering in CreateNumpyMatrixFromScript"
+import logging
+logging.debug("CREATE Entering in CreateNumpyMatrixFromScript")
 type = "Matrix"
 
 # Get file path and filename
@@ -228,11 +244,11 @@ user_script_module = sys.modules[module_name]
 
   <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"/>
@@ -241,7 +257,8 @@ print "Vector is", vector
 
   <inline name="CreateNumpyVectorFromScript">
     <script><code><![CDATA[
-print "Entering in CreateNumpyVectorFromScript"
+import logging
+logging.debug("CREATE Entering in CreateNumpyVectorFromScript")
 type = "Vector"
 
 # Get file path and filename
@@ -264,7 +281,8 @@ user_script_module = sys.modules[module_name]
 
   <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()
@@ -276,7 +294,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
@@ -287,7 +306,8 @@ 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"/>
@@ -296,7 +316,8 @@ result = None
 
   <inline name="CreateDictFromScript">
     <script><code><![CDATA[
-print "Entering in CreateDictFromScript"
+import logging
+logging.debug("CREATE Entering in CreateDictFromScript")
 
 # Get file path and filename
 import sys
@@ -317,7 +338,8 @@ user_script_module = sys.modules[module_name]
 
   <inline name="UserDataInitFromScript">
     <script><code><![CDATA[
-print "Entering in UserDataInitFromScript"
+import logging
+logging.debug("CREATE Entering in UserDataInitFromScript")
 
 # Get file path and filename
 import sys
@@ -339,7 +361,8 @@ 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")
 switch_value = -1
 for param in data["specificParameters"]:
   if param["name"] == "switch_value":
@@ -352,15 +375,17 @@ for param in data["specificParameters"]:
 
   <inline name="ExtractDataNode">
     <script><code><![CDATA[
+import logging
+logging.debug("TERMINATE Entering in ExtractDataNode")
 import pickle
-print "Entering in ExtractData"
+from daCore.AssimilationStudy import AssimilationStudy
 var = None
 info = None
 for param in data["specificParameters"]:
   if param["name"] == "var":
     var = pickle.loads(param["value"])
   if param["name"] == "info":
-    info = pickle.loads(param["value"])
+    info = param["value"]
 ]]></code></script>
     <inport name="data" type="SALOME_TYPES/ParametricInput"/>
     <outport name="var" type="pyobj"/>
@@ -369,7 +394,7 @@ for param in data["specificParameters"]:
 
   <inline name="ObservationNodeString">
     <script><code><![CDATA[
-print "Entering in Observation"
+#print "Entering in Observation"
 
 ]]></code></script>
     <inport name="var" type="pyobj"/>
@@ -378,16 +403,8 @@ print "Entering in Observation"
 
   <inline name="ObservationNodeFile">
     <script><code><![CDATA[
-print "Entering in Observation"
-# Get file path and filename
-import sys
-import os
-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)
+#print "Entering in Observation"
+execfile(script)
 
 ]]></code></script>
     <inport name="var"    type="pyobj"/>
@@ -410,7 +427,7 @@ output["errorMessage"]        = ""
 
   <inline name="SetObserversNode">
     <script><code><![CDATA[
-print "Setting observers"
+#print "Setting observers"
 ]]></code></script>
     <outport name="has_observers" type="bool"/>
     <outport name="observers" type="pyobj"/>