From: Eric Fayolle <eric.fayolle@edf.fr>
Date: Mon, 10 Oct 2022 15:47:22 +0000 (+0200)
Subject: Correction pour le multijob
X-Git-Tag: merge_uncertainty_odysee_1210~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b85a5bb071547d8feb08cf4038ff0619894ec4a8;p=tools%2Feficas.git

Correction pour le multijob
---

diff --git a/generator/generator_UQ.py b/generator/generator_UQ.py
index 506bae17..05903c23 100644
--- a/generator/generator_UQ.py
+++ b/generator/generator_UQ.py
@@ -518,7 +518,7 @@ class UQGenerator(PythonGenerator):
             inFiles = repr(inFiles)
         )
         txtYacsJobParameters+=txtYacsJobClusterParameters
-        if ( self.MultiJobStudy != None):
+        if ( self.MultiJobStudy != None and self.MultiJobStudy == True):
             txtYacsJobParameters+= yacsJobClusterMultiJob
        
         self.txtScriptPersalys += mainPersalys.format(
diff --git a/generator/textePersalys.py b/generator/textePersalys.py
index 928d53ca..a1e4d63f 100644
--- a/generator/textePersalys.py
+++ b/generator/textePersalys.py
@@ -414,9 +414,9 @@ yacsJobClusterParameters="""
 # Ici <nb_branches> jobs seront crées dynamiquement pour lancer chaque évaluation
 #  chaque job demandera la réservation de nprocs processus.
 yacsJobClusterMultiJob="""
-import pydefx
-multiJobModel = pydefx.MultiJobStudy() # mode un job par évaluation
-yacsPhysicalModel.setJobModel(multiJobModel)
+    import pydefx
+    multiJobModel = pydefx.MultiJobStudy() # mode un job par évaluation
+    yacsPhysicalModel.setJobModel(multiJobModel)
 """
 
 # yacsJobParametersRef="""