Correction generateur UQ pour Taylor & core_elements_vs_dklib optionel

diff --git a/ReacteurNumerique/cata_RN_EDG.py b/ReacteurNumerique/cata_RN_EDG.py
index 3e5ddc3a9482e95a48e949a9ec8046e83cfda639..a151ae30beba7e84ffe6d05fbe671b3a16448786 100644 (file)
--- a/ReacteurNumerique/cata_RN_EDG.py
+++ b/ReacteurNumerique/cata_RN_EDG.py
@@ -607,7 +607,7 @@ Model_data = OPER(
                         "sous la forme (assemblage combustible, DKLib)"),
                     ang=("Association between the core elements and the neutronic libraries "
                         "in the form (fuel assembly, DKLib)"),
-                    statut="o",
+                    statut="f",
                     typ=Tuple(2),
                     # TODO: Check if the attribute assembly_type of the
                     #       Assembly object is 'REF' then the type of the

diff --git a/generator/generator_UQ.py b/generator/generator_UQ.py
index 5e1f747627ab85f3e1388bc2519ad2eb41269e66..d030c4607ff77d106c3c6c80c0f3d86284faaed4 100644 (file)
--- a/generator/generator_UQ.py
+++ b/generator/generator_UQ.py
@@ -157,17 +157,18 @@ class UQGenerator(PythonGenerator):
         sectionPropagation = etapeIncertitude.getChildOrChildInBloc('Propagation')[0]
         self.Methode = sectionPropagation.getChildOrChildInBloc('Methode').valeur
         self.Result = sectionPropagation.getChildOrChildInBloc('Result')[0]
-        self.critereArret = sectionPropagation.getChildOrChildInBloc('CritereArret')[0]
-        # self.SimulationsNumber  = self.critereArret.getChildOrChildInBloc('SimulationsNumber')[0]
-        # self.MaximumElapsedTime  = self.critereArret.getChildOrChildInBloc('MaximumElapsedTime')[0]
-        # self.Accuracy  = self.critereArret.getChildOrChildInBloc('Accuracy')[0]
-        sectionEvaluationParameter = sectionPropagation.getChildOrChildInBloc('EvaluationParameter')[0]
-        self.Blocksize = sectionEvaluationParameter.getChildOrChildInBloc('BlockSize').valeur
-        self.advancedParameter = sectionPropagation.getChildOrChildInBloc('AdvancedParameter')
-        if self.advancedParameter != None:
-            self.advancedParameter = self.advancedParameter[0]
-        # self.ComputeConfidenceIntervalAt  = self.advancedParameter.getChildOrChildInBloc('ComputeConfidenceIntervalAt')[0]
-        # self.Seed  = self.advancedParameter.getChildOrChildInBloc('Seed')[0]
+        if (self.Methode == 'MonteCarlo'):
+            self.critereArret = sectionPropagation.getChildOrChildInBloc('CritereArret')[0]
+            # self.SimulationsNumber  = self.critereArret.getChildOrChildInBloc('SimulationsNumber')[0]
+            # self.MaximumElapsedTime  = self.critereArret.getChildOrChildInBloc('MaximumElapsedTime')[0]
+            # self.Accuracy  = self.critereArret.getChildOrChildInBloc('Accuracy')[0]
+            sectionEvaluationParameter = sectionPropagation.getChildOrChildInBloc('EvaluationParameter')[0]
+            self.Blocksize = sectionEvaluationParameter.getChildOrChildInBloc('BlockSize').valeur
+            self.advancedParameter = sectionPropagation.getChildOrChildInBloc('AdvancedParameter')
+            if self.advancedParameter != None:
+                self.advancedParameter = self.advancedParameter[0]
+            # self.ComputeConfidenceIntervalAt  = self.advancedParameter.getChildOrChildInBloc('ComputeConfidenceIntervalAt')[0]
+            # self.Seed  = self.advancedParameter.getChildOrChildInBloc('Seed')[0]
 
         self.lesVariablesOutput = sectionOutput.getChildOrChildInBloc('VariableDeSortie')
         self.variablesOutput = {}