Minor documentation and code review corrections (4)

Avoid some confusing conversions in messages or printing

diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py
index f2d306ac744095db3b343619de2254107b1a0eeb..a1641f173d3a6a3cbb40f5aff88054c0e6b1035f 100644 (file)
--- a/bin/AdaoCatalogGenerator.py
+++ b/bin/AdaoCatalogGenerator.py
@@ -136,7 +136,7 @@ def ColDataFileExtVal(filename):
 ColDataFileExtVal.info = u"The data file has to contain explicitly one or more number columns with separator, or one variable, that can fit in a unique continuous vector."
 """%(module_version.name,module_version.cata)
 
-# Important : validators=[...] pour que les conditions soient traitees simultanement, en "ET", et pas en "OU" (choisi dans le cas du tuple a la place de la liste)
+# Important : validators=[...] pour que les conditions soient traitées simultanément, en "ET", et pas en "OU" (choisi dans le cas du tuple a la place de la liste)
 # validators=[OnlyStr(), FileExtVal('py'), FunctionVal(fv)]
 data_method = """
 def F_{data_name}(statut, fv=NoCheckInNS) : return FACT(

diff --git a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
index e5161a1999361b6969d5c463daeae0213a99dddf..3ef6c63e13242e504b8077adaacd4640586ee9fe 100644 (file)
--- a/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
+++ b/src/daComposant/daAlgorithms/EnsembleKalmanFilter.py
@@ -40,7 +40,6 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "MLEF",
                 "IEnKF",
                 "EnKS",
-                "E3DVAR",
                 ],
             listadv  = [
                 "StochasticEnKF",
@@ -57,6 +56,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
                 "IEnKF-B",
                 "EnKS-KFF",
                 "IEKF",
+                "E3DVAR",
                 "E3DVAR-EnKF",
                 "E3DVAR-ETKF",
                 "E3DVAR-MLEF",

diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py
index 6d301aed426e3b1a121e040957ff3d3db1f50c25..f6acaf22b97a3d51800f1d816e3d2f485559b443 100644 (file)
--- a/src/daComposant/daCore/Interfaces.py
+++ b/src/daComposant/daCore/Interfaces.py
@@ -522,7 +522,7 @@ class _SCDViewer(GenericCaseViewer):
             self._addLine("Analysis_config = {}")
             self._addLine("Analysis_config['From'] = 'String'")
             self._addLine("Analysis_config['Data'] = \"\"\"import numpy")
-            self._addLine("xa=numpy.ravel(ADD.get('Analysis')[-1])")
+            self._addLine("xa=ADD.get('Analysis')[-1]")
             self._addLine("print('Analysis:',xa)\"\"\"")
             self._addLine("study_config['UserPostAnalysis'] = Analysis_config")
     def __loadVariablesByScript(self):

diff --git a/src/daComposant/daCore/Templates.py b/src/daComposant/daCore/Templates.py
index e06d714b78675a2e08a83b9075dad87741a642c2..294cfd3d35826e0fd2bea7190cbd1aab7dcfb4c6 100644 (file)
--- a/src/daComposant/daCore/Templates.py
+++ b/src/daComposant/daCore/Templates.py
@@ -230,25 +230,46 @@ UserPostAnalysisTemplates = TemplateStorage()
 
 UserPostAnalysisTemplates.store(
     name    = "AnalysisPrinter",
-    content = """print('# Post-analysis')\nimport numpy\nxa=numpy.ravel(ADD.get('Analysis')[-1])\nprint('Analysis',xa)""",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')[-1]\nprint('Analysis',xa)""",
     fr_FR   = "Imprime sur la sortie standard la valeur optimale",
     en_EN   = "Print on standard output the optimal value",
     order   = "next",
     )
 UserPostAnalysisTemplates.store(
     name    = "AnalysisSaver",
-    content = """print('# Post-analysis')\nimport numpy\nxa=numpy.ravel(ADD.get('Analysis')[-1])\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')[-1]\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
     fr_FR   = "Enregistre la valeur optimale dans un fichier du répertoire '/tmp' nommé 'analysis.txt'",
     en_EN   = "Save the optimal value in a file of the '/tmp' directory named 'analysis.txt'",
     order   = "next",
     )
 UserPostAnalysisTemplates.store(
     name    = "AnalysisPrinterAndSaver",
-    content = """print('# Post-analysis')\nimport numpy\nxa=numpy.ravel(ADD.get('Analysis')[-1])\nprint 'Analysis',xa\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')[-1]\nprint 'Analysis',xa\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
     fr_FR   = "Imprime sur la sortie standard et, en même temps enregistre dans un fichier du répertoire '/tmp', la valeur optimale",
     en_EN   = "Print on standard output and, in the same time save in a file of the '/tmp' directory, the optimal value",
     order   = "next",
     )
+UserPostAnalysisTemplates.store(
+    name    = "AnalysisSeriePrinter",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')\nprint('Analysis',xa)""",
+    fr_FR   = "Imprime sur la sortie standard la série des valeurs optimales",
+    en_EN   = "Print on standard output the optimal value series",
+    order   = "next",
+    )
+UserPostAnalysisTemplates.store(
+    name    = "AnalysisSerieSaver",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
+    fr_FR   = "Enregistre la série des valeurs optimales dans un fichier du répertoire '/tmp' nommé 'analysis.txt'",
+    en_EN   = "Save the optimal value series in a file of the '/tmp' directory named 'analysis.txt'",
+    order   = "next",
+    )
+UserPostAnalysisTemplates.store(
+    name    = "AnalysisSeriePrinterAndSaver",
+    content = """print('# Post-analysis')\nimport numpy\nxa=ADD.get('Analysis')\nprint 'Analysis',xa\nf='/tmp/analysis.txt'\nprint('Analysis saved in \"%s\"'%f)\nnumpy.savetxt(f,xa)""",
+    fr_FR   = "Imprime sur la sortie standard et, en même temps enregistre dans un fichier du répertoire '/tmp', la série des valeurs optimales",
+    en_EN   = "Print on standard output and, in the same time save in a file of the '/tmp' directory, the optimal value series",
+    order   = "next",
+    )
 
 # ==============================================================================
 if __name__ == "__main__":