Corrections

diff --git a/src/GENERICSOLVER/CMakeLists.txt b/src/GENERICSOLVER/CMakeLists.txt
index 7e763500f57aa7fe19b80fe79fb432dddd7787ef..9dd4c18e518f3e77cae04992bdd7948ca685fbc2 100644 (file)
--- a/src/GENERICSOLVER/CMakeLists.txt
+++ b/src/GENERICSOLVER/CMakeLists.txt
@@ -22,6 +22,7 @@
 # scripts / static
 SET(_bin_SCRIPTS
   DEVIATION.py
+  DEVIATION_SalomeSessionless.py
   GENERICSOLVER.py
 )
 

diff --git a/src/GENERICSOLVER/DEVIATION_SalomeSessionless.py b/src/GENERICSOLVER/DEVIATION_SalomeSessionless.py
new file mode 100644 (file)
index 0000000..56de752
--- /dev/null
+++ b/src/GENERICSOLVER/DEVIATION_SalomeSessionless.py
@@ -0,0 +1,42 @@
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2021  CEA/DEN, 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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+def buildInstance(orb):
+    import KernelBasis
+    KernelBasis.setSSLMode(True)
+    from DEVIATION import DEVIATION
+    from SALOME_ContainerPy import SALOME_ContainerPy_SSL_i
+    import PortableServer
+    import KernelServices
+    obj = orb.resolve_initial_references("RootPOA")
+    poa = obj._narrow(PortableServer.POA)
+    pman = poa._get_the_POAManager()
+    #
+    cont = SALOME_ContainerPy_SSL_i(orb,poa,"FactoryServer")
+    conId = poa.activate_object(cont)
+    conObj = poa.id_to_reference(conId)
+    #
+    pman.activate()
+    #
+    compoName = "DEVIATION"
+    servant = DEVIATION(orb,poa,conObj,"FactoryServer","DEVIATION_inst_1",compoName)
+    ret = servant.getCorbaRef()
+    KernelServices.RegisterCompo(compoName,ret)
+    return ret, orb

diff --git a/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
index 13038cf188e9d58ee67d02353327a9f4ac0a773c..dda81add22fecdc0a71dc15e746106673e63da57 100644 (file)
--- a/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
+++ b/src/GENERICSOLVERGUI/GENERICSOLVERGUI.py
@@ -400,20 +400,7 @@ def RunSOLVER():
     assert hasChildren(sobj)
 
     # Initialize and run the solver
-    import KernelBasis
-    if KernelBasis.getSSLMode():
-        import salome
-        import DEVIATION
-        from SALOME_ContainerPy import SALOME_ContainerPy_SSL_i
-        poa = salome.orb.resolve_initial_references("RootPOA")
-        poaManager = poa._get_the_POAManager()
-        poaManager.activate()
-        cpy_i = SALOME_ContainerPy_SSL_i(salome.orb, poa, "FactoryServer")
-        cpy_ref = cpy_i._this()
-        solver_engine = DEVIATION.DEVIATION(salome.orb,poa,cpy_ref,"FactoryServer", "GENERICSOLVER_inst_2" , SOLVER_ENGINE_NAME)
-    else:
-        solver_engine = salome.lcc.FindOrLoadComponent("FactoryServer", SOLVER_ENGINE_NAME)
-    #
+    solver_engine = salome.lcc.FindOrLoadComponent("FactoryServer", SOLVER_ENGINE_NAME)
     assert solver_engine
     solver_engine.Init(getStudyId(), entry)