Correction pour le multijob

diff --git a/generator/generator_UQ.py b/generator/generator_UQ.py
index 506bae17d637c215a2f707aef90bbc94322ae824..05903c230cf0a1056da355758caedecca079c207 100644 (file)
--- 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 928d53cad366d75c6a7161821a223baaed3f849a..a1e4d63fdb7e094d3a010733825355a8cdcc81de 100644 (file)
--- 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="""