Salome/Yacs compatibility corrections

diff --git a/src/daSalome/daGUI/ADAO.py b/src/daSalome/daGUI/ADAO.py
index 093e7eb4a625fb1258b2beb0c5c0b436b0300b70..4483754f992f432f0c8ff153b1f21f2a374e767d 100644 (file)
--- a/src/daSalome/daGUI/ADAO.py
+++ b/src/daSalome/daGUI/ADAO.py
@@ -42,7 +42,7 @@ class ADAO(ADAO_COMPONENT__POA.ADAO_ENGINE,
       interfaceName ):
     debug("Creating ADAO component instance", "ENGINE")
     SALOME_ComponentPy.SALOME_ComponentPy_i.__init__(self, orb, poa,
-        contID, containerName, instanceName, interfaceName, 0)
+        contID, containerName, instanceName, interfaceName)
     SALOME_DriverPy.SALOME_DriverPy_i.__init__(self, interfaceName)
 
     # On stocke dans l'attribut _naming_service, une ref sur le Naming Service

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index 11cb0f5c126358ca9e98e065b4677477803c4fa3..8c209630eec51ab9f80e8e87067955555b3b9f9d 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -107,7 +107,8 @@ class AdaoCase:
     try:
       import libYACS_Swig
       yacs_swig = libYACS_Swig.YACS_Swig()
-      yacs_swig.loadSchema(self.yacs_filename, 1, 1)
+      #~ yacs_swig.loadSchema(self.yacs_filename, 1, 1)
+      yacs_swig.loadSchema(self.yacs_filename, True, True)
     except:
       msg =  "Please install YACS module, error was: \n"
       msg += traceback.format_exc()

diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py
index 32a9f3ca11492b38542caecd258b41e9196b8bb6..806ebb95f9ed0b688baf51874425b1f471346999 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/methods.py
+++ b/src/daSalome/daYacsSchemaCreator/methods.py
@@ -393,7 +393,8 @@ def create_yacs_proc(study_config):
   name = "Execute" + study_config["Algorithm"]
   algLib = "daYacsIntegration.py"
   factoryName = "AssimilationAlgorithm_asynch"
-  optimizer_node = runtime.createOptimizerLoop(name, algLib, factoryName, "")
+  #~ optimizer_node = runtime.createOptimizerLoop(name, algLib, factoryName, "")
+  optimizer_node = runtime.createOptimizerLoop(name, algLib, factoryName, True)
   compute_bloc.edAddChild(optimizer_node)
   ADAO_Case.edAddDFLink(CAS_node.getOutputPort("Study"), optimizer_node.edGetAlgoInitPort())