Ajout information manquante ordre

diff --git a/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py
index 6146f62c9b18e0def5c9f72663ce7be3771f1334..91b63ec4f05c53ecf4afb6348ffd8036605fac59 100644 (file)
--- a/src/daEficas/generator_adao.py
+++ b/src/daEficas/generator_adao.py
@@ -206,6 +206,7 @@ class AdaoGenerator(PythonGenerator):
         sizes = self.dictMCVal["__ASSIMILATION_STUDY__InputVariables__SIZES"]
 
       self.text_da += "inputvariables_config = {} \n"
+      self.text_da += "inputvariables_config[\"Order\"] = %s \n" % list(names)
       for name, size in zip(names, sizes):
         self.text_da += "inputvariables_config[\"%s\"] = %s \n" % (name,size)
       self.text_da += "study_config[\"InputVariables\"] = inputvariables_config \n"
@@ -228,6 +229,7 @@ class AdaoGenerator(PythonGenerator):
         sizes = self.dictMCVal["__ASSIMILATION_STUDY__OutputVariables__SIZES"]
 
       self.text_da += "outputvariables_config = {} \n"
+      self.text_da += "outputvariables_config[\"Order\"] = %s \n" % list(names)
       for name, size in zip(names, sizes):
         self.text_da += "outputvariables_config[\"%s\"] = %s \n" % (name,size)
       self.text_da += "study_config[\"OutputVariables\"] = outputvariables_config \n"

diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
index 602ec91a446b7dde394a8b8ceedd6fd3f477caaf..8ad01a563bb065d440f0344331c2809314d30088 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py
+++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py
@@ -66,15 +66,13 @@ class AdaoCase:
     if (self.filename == ""):
       return "You need to save your case to export it"
 
+    self.eficas_editor.modified = True
+    self.eficas_editor.saveFile()
     filename = self.filename[:self.filename.rfind(".")] + '.py'
     if not os.path.exists(filename):
-      # On essaye de le créer une fois
-      self.eficas_editor.modified = True
-      self.eficas_editor.saveFile()
-      if not os.path.exists(filename):
-        msg =  "Cannot find the py file for YACS generation \n"
-        msg += "Is your case correct ? \n"
-        return msg
+      msg =  "Cannot find the py file for YACS generation \n"
+      msg += "Is your case correct ? \n"
+      return msg
 
     if not os.environ.has_key("ADAO_ROOT_DIR"):
       return "Please add ADAO_ROOT_DIR to your environnement"