From: Jean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Date: Mon, 15 Apr 2013 12:51:49 +0000 (+0200)
Subject: Improving internal information coherency
X-Git-Tag: V7_2_0~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c6f9e3d1cb926a07c12bed599043922d2610b160;p=modules%2Fadao.git

Improving internal information coherency
---

diff --git a/doc/using.rst b/doc/using.rst
index f63e06b..1fdbfab 100644
--- a/doc/using.rst
+++ b/doc/using.rst
@@ -199,7 +199,6 @@ menu). As an example, the output of the above simple case is the following::
    Entering in the assimilation study
    Name is set to........: Test
    Algorithm is set to...: Blue
-   Debug is set to.......: False
    Launching the analyse
 
    Optimal state: [0.5, 0.5, 0.5]
diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py
index 0086831..432ae3b 100644
--- a/src/daSalome/daYacsSchemaCreator/methods.py
+++ b/src/daSalome/daYacsSchemaCreator/methods.py
@@ -429,6 +429,7 @@ def create_yacs_proc(study_config):
     node_script  = "#-*-coding:iso-8859-1-*-\n"
     node_script += "import sys, os \n"
     node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+    node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
     node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
     node_script += "  sys.path.insert(0,filepath)\n"
     node_script += script_str.read()
@@ -455,6 +456,7 @@ def create_yacs_proc(study_config):
     node_script  = "#-*-coding:iso-8859-1-*-\n"
     node_script += "import sys, os \n"
     node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+    node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
     node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
     node_script += "  sys.path.insert(0,filepath)\n"
     node_script += script_str.read()
@@ -482,6 +484,7 @@ def create_yacs_proc(study_config):
     node_script  = "#-*-coding:iso-8859-1-*-\n"
     node_script += "import sys, os, numpy, logging\n"
     node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+    node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
     node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
     node_script += "  sys.path.insert(0,filepath)\n"
     node_script += """# ==============================================\n"""
@@ -561,6 +564,7 @@ def create_yacs_proc(study_config):
     node_script  = "#-*-coding:iso-8859-1-*-\n"
     node_script += "import sys, os, numpy, logging\n"
     node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+    node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
     node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
     node_script += "  sys.path.insert(0,filepath)\n"
     node_script += """# ==============================================\n"""
@@ -645,6 +649,7 @@ def create_yacs_proc(study_config):
       node_script  = "#-*-coding:iso-8859-1-*-\n"
       node_script += "import sys, os \n"
       node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+      node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
       node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
       node_script += "  sys.path.insert(0,filepath)\n"
       node_script += script_str.read()
@@ -672,6 +677,7 @@ def create_yacs_proc(study_config):
       node_script  = "#-*-coding:iso-8859-1-*-\n"
       node_script += "import sys, os \n"
       node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+      node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
       node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
       node_script += "  sys.path.insert(0,filepath)\n"
       node_script += script_str.read()
@@ -698,6 +704,7 @@ def create_yacs_proc(study_config):
       node_script  = "#-*-coding:iso-8859-1-*-\n"
       node_script += "import sys, os, numpy, logging\n"
       node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+      node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
       node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
       node_script += "  sys.path.insert(0,filepath)\n"
       node_script += script_str.read()
@@ -779,6 +786,7 @@ def create_yacs_proc(study_config):
       node_script  = "#-*-coding:iso-8859-1-*-\n"
       node_script += "import sys, os, numpy, logging\n"
       node_script += "filepath = \"" + os.path.dirname(script_filename) + "\"\n"
+      node_script += "filename = \"" + os.path.basename(script_filename) + "\"\n"
       node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
       node_script += "  sys.path.insert(0,filepath)\n"
       node_script += script_str.read()
@@ -1001,6 +1009,7 @@ def create_yacs_proc(study_config):
       node_script  = "#-*-coding:iso-8859-1-*-\n"
       node_script += "import sys, os \n"
       node_script += "filepath = \"" + os.path.dirname(analysis_file_name) + "\"\n"
+      node_script += "filename = \"" + os.path.basename(analysis_file_name) + "\"\n"
       node_script += "if sys.path.count(filepath)==0 or (sys.path.count(filepath)>0 and sys.path.index(filepath)>0):\n"
       node_script += "  sys.path.insert(0,filepath)\n"
       node_script += default_script