Corrections diverses

diff --git a/ReacteurNumerique/cata_UQ.py b/ReacteurNumerique/cata_UQ.py
index 613b8c9325566f9287743b3e55ede24f2f7fce5a..ffcec4e39520e9bfd1dab58d2fff87474f103401 100644 (file)
--- a/ReacteurNumerique/cata_UQ.py
+++ b/ReacteurNumerique/cata_UQ.py
@@ -1742,7 +1742,6 @@ def creeOperExpressionIncertitude(monDicoVarDeter, monDicoVarSortie):
         ), # fin Propagation
         Output=monOutput,
         Execution = FACT (max=1, statut ='o',
-             UncertaintyTool =  SIMP ( statut = "o", typ = "TXM", into = ['Uranie', 'OpenTurns'], defaut='OpenTurns'),
              bloc_OT = BLOC (condition = 'UncertaintyTool == "OpenTurns"',
                 ExecutionMode = SIMP ( statut = "o", typ = "TXM", into = ['desktop', 'cluster']),
                 NbOfProcs      = SIMP ( statut = 'o', typ ="I" ,  defaut = 1, val_min = 1),

diff --git a/generator/generator_UQ.py b/generator/generator_UQ.py
index 7764079e1ce9aa1dbd63e25c020fb62755c32d21..5e1f747627ab85f3e1388bc2519ad2eb41269e66 100644 (file)
--- a/generator/generator_UQ.py
+++ b/generator/generator_UQ.py
@@ -87,7 +87,7 @@ class UQGenerator(PythonGenerator):
 
     def creeNomsFichiers(self,fichier):
         if fichier.endswith('.comm'):
-            self.fichierSansSuffixe=fichier[:-5]
+            self.fichierSansSuffixe=os.path.basename(fichier[:-5])
             if self.fichierSansSuffixe.endswith('_UQ'):
                 self.fichierSansSuffixe = self.fichierSansSuffixe[:-3]
             self.fichierUQComm = self.fichierSansSuffixe+'_UQ.comm'
@@ -242,15 +242,12 @@ class UQGenerator(PythonGenerator):
         def getStrSelfVar(l):
             return getStrVarList( map(lambda x:'self.{}'.format(x),l), ',' )
         
-        wrapperDir  = os.path.abspath(os.path.dirname(__file__))
-        wrapperName = "eficas_wrapper"
+        generatorDir  = os.path.abspath(os.path.dirname(__file__))
         nomEtude    = "monEtude"
-        if debug : print ('nomEtude : ', nomEtude, 'wrapperDir :', wrapperDir, 'wrapperName : ', wrapperName)
+        if debug : print ('nomEtude : ', nomEtude, 'generatorDir :', generatorDir)
+        
+        self.txtScriptPersalys += headerScriptPersalys
         
-        self.txtScriptPersalys += headerScriptPersalys.format (
-            wrapperDir=wrapperDir,
-            wrapperName=wrapperName
-        )
         print('self.nomsDesVariablesInput :',self.nomsDesVariablesInput)
         self.txtScriptPersalys += etudeScript.format(
             chaineDesVariablesInput = self.chaineDesVariablesInput,
@@ -328,7 +325,7 @@ class UQGenerator(PythonGenerator):
         wckey = 'P11N0:SALOME'
         
         inFiles =[]
-        inFiles.append(os.path.join(wrapperDir,'incertainty_tools.py'))
+        inFiles.append(os.path.join(generatorDir,'incertainty_tools.py'))
         pyFile = self.fichierUQExe
         inFiles.append(os.path.join(os.getcwd(),pyFile))
         pyFile = self.fichierUQBalise

diff --git a/generator/textePersalys.py b/generator/textePersalys.py
index fe7f7c216f119ef10b736366ba592bf5251f259f..9e835fd870cd5dfb1ffe4b914b899e7adb6415ed 100644 (file)
--- a/generator/textePersalys.py
+++ b/generator/textePersalys.py
@@ -20,8 +20,6 @@ import os
 import openturns as ot 
 import persalys
 
-# from {wrapperDir} import {wrapperName}
-
 """
 
 # def run_case(self):