[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...

[modules/smesh.git] / src / Tools / padder / meshjob / impl / MeshJobManager_i.cxx

diff --git a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
index 9f951022550af9bbb8ccde20c22220fdde98d656..64204c7aa7874816b173c4fde53121f61636f9de 100644 (file)
--- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
+++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2016  EDF R&D
+// Copyright (C) 2011-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -83,6 +83,10 @@ static bool fexists(const char *filename)
   return false;
 }
 
+//Engines::EngineComponent_var RetrievePadderMeshJobManagerInstance()
+//{
+//}
+
 //
 // ====================================================================
 // Constructor/Destructor
@@ -92,8 +96,9 @@ MeshJobManager_i::MeshJobManager_i(CORBA::ORB_ptr orb,
                                    PortableServer::POA_ptr poa,
                                    PortableServer::ObjectId * contId,
                                    const char *instanceName,
-                                   const char *interfaceName)
-  : Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+                                   const char *interfaceName,
+                                   bool checkNS, bool regist)
+  : Engines_Component_i(orb, poa, contId, instanceName, interfaceName, checkNS, regist)
 {
   LOG("Activating MESHJOB::MeshJobManager object");
   _thisObj = this ;
@@ -429,7 +434,7 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
   //jobParameters->maximum_duration = CORBA::string_dup("01:00");
   jobParameters->queue = CORBA::string_dup("");
 
-  // Setting resource and additionnal properties (if needed)
+  // Setting resource and additional properties (if needed)
   // The resource parameters can be initiated from scratch, for
   // example by specifying the values in hard coding:
   // >>>
@@ -451,7 +456,7 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
     resourceDefinition = _resourcesManager->GetResourceDefinition(resourceName);
   }
   catch (const CORBA::SystemException& ex) {
-    _lastErrorMessage = std::string("We can not access to the ressource ") + std::string(resourceName);
+    _lastErrorMessage = std::string("We can not access the resource ") + std::string(resourceName);
     _lastErrorMessage+= std::string("(check the file CatalogResource.xml)");
     LOG(_lastErrorMessage);
     return JOBID_UNDEFINED;
@@ -462,7 +467,7 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
   // Then, the values can be used to initiate the resource parameters
   // of the job:
   jobParameters->resource_required.name     = CORBA::string_dup(resourceDefinition->name.in());
-  // CAUTION: the additionnal two following parameters MUST be
+  // CAUTION: the additional two following parameters MUST be
   // specified explicitly, because they are not provided by the
   // resource definition:
   jobParameters->resource_required.mem_mb   = resourceDefinition->mem_mb;
@@ -673,6 +678,7 @@ std::vector<std::string> * MeshJobManager_i::_getResourceNames() {
       LOG("resource["<<i<<"] = "<<aResourceName);
       resourceDefinition = _resourcesManager->GetResourceDefinition(aResourceName);
       LOG("protocol["<<i<<"] = "<<resourceDefinition->protocol);
+      (void)resourceDefinition; // unused in release mode
     }
   }
 
@@ -682,7 +688,7 @@ std::vector<std::string> * MeshJobManager_i::_getResourceNames() {
   // SALOME application.
   // In the code instructions, you just have to choose a resource
   // configuration by its name and then define the ResourceParameters
-  // that specify additionnal properties for a specific job submission
+  // that specify additional properties for a specific job submission
   // (use the attribute resource_required of the JobParameters).
 
   return resourceNames;
@@ -709,7 +715,13 @@ extern "C"
                                                            const char *interfaceName)
   {
     LOG("PortableServer::ObjectId * MeshJobManagerEngine_factory()");
-    MeshJobManager_i * myEngine = new MeshJobManager_i(orb, poa, contId, instanceName, interfaceName);
+    MeshJobManager_i * myEngine = nullptr;
+    CORBA::Object_var o = poa->id_to_reference(*contId);
+    Engines::Container_var cont = Engines::Container::_narrow(o);
+    if(cont->is_SSL_mode())
+      myEngine = new MeshJobManager_i(orb, poa, contId, instanceName, interfaceName, false, false);
+    else
+      myEngine = new MeshJobManager_i(orb, poa, contId, instanceName, interfaceName, true, true);
     return myEngine->getId() ;
   }
 }