From b2d9a77525f197ebec0337c57a9f2427b843c82d Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 3 Oct 2018 17:37:58 +0200 Subject: [PATCH] Salome/Yacs compatibility corrections --- src/daSalome/daGUI/ADAO.py | 2 +- src/daSalome/daGUI/daGuiImpl/adaoCase.py | 3 ++- src/daSalome/daYacsSchemaCreator/methods.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/daSalome/daGUI/ADAO.py b/src/daSalome/daGUI/ADAO.py index 093e7eb..4483754 100644 --- 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 11cb0f5..8c20963 100644 --- 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 32a9f3c..806ebb9 100644 --- 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()) -- 2.39.2