Examples corrections and improvements

diff --git a/examples/daSalome/test001_ADAO_JDC_using_strings.comm b/examples/daSalome/test001_ADAO_JDC_using_strings.comm
index c6f73375b79aa0bb3d6099a7929e5007f3448649..d8771a43db5ef133a3835f011347c18e3720420e 100644 (file)
--- a/examples/daSalome/test001_ADAO_JDC_using_strings.comm
+++ b/examples/daSalome/test001_ADAO_JDC_using_strings.comm
@@ -1,25 +1,19 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   Debug=0,
                    AlgorithmParameters=_F(Algorithm='Blue',),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='String',
                                          STRING='0 0 0',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='String',
                                               STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='String',
                                           STRING='1 1 1',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='String',
                                                STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Matrix',
+                   ObservationOperator=_F(INPUT_TYPE='Matrix',
                                           data=_F(FROM='String',
                                                   STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
                    UserPostAnalysis=_F(FROM='Template',
@@ -28,5 +22,4 @@ ASSIMILATION_STUDY(StudyName='Test',
                                                   """import numpy
 xa=numpy.ravel(ADD.get('Analysis')[-1])
 print 'Analysis:',xa""",),);
-#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE
-#CHECKSUM:d0ae74c3d19e5dc06266e154bab77956  -:FIN CHECKSUM
\ No newline at end of file
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE
\ No newline at end of file

diff --git a/examples/daSalome/test001_ADAO_JDC_using_strings.py b/examples/daSalome/test001_ADAO_JDC_using_strings.py
index 2bd9acfd9d5865b79f3800ed17fabf1d04684c97..b5d405548175dd3ff38f66640d3fb22efd40a784 100644 (file)
--- a/examples/daSalome/test001_ADAO_JDC_using_strings.py
+++ b/examples/daSalome/test001_ADAO_JDC_using_strings.py
@@ -8,31 +8,26 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'String'
 Background_config['Data'] = '0 0 0'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'String'
 BackgroundError_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'String'
 Observation_config['Data'] = '1 1 1'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'String'
 ObservationError_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'String'
 ObservationOperator_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test002_ADAO_JDC_using_strings.comm b/examples/daSalome/test002_ADAO_JDC_using_strings.comm
index 8ded8cacc83925e880c9ec970c953ada3026b698..72bf03167f5a69d321ccaddb1224da72a2c32122 100644 (file)
--- a/examples/daSalome/test002_ADAO_JDC_using_strings.comm
+++ b/examples/daSalome/test002_ADAO_JDC_using_strings.comm
@@ -1,25 +1,19 @@
 
 ASSIMILATION_STUDY(StudyName='Test',
-                   Debug=0,
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='String',
                                          STRING='0 0 0',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='String',
                                               STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='String',
                                           STRING='1 1 1',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='String',
                                                STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Matrix',
+                   ObservationOperator=_F(INPUT_TYPE='Matrix',
                                           data=_F(FROM='String',
                                                   STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
                    UserPostAnalysis=_F(FROM='Template',
@@ -28,5 +22,4 @@ ASSIMILATION_STUDY(StudyName='Test',
                                                   """import numpy
 xa=numpy.ravel(ADD.get('Analysis')[-1])
 print 'Analysis:',xa""",),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
-
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test002_ADAO_JDC_using_strings.py b/examples/daSalome/test002_ADAO_JDC_using_strings.py
index 57d8adcb34f464569653fa7c1d2330cf9ea868d6..aaf0dd228bf7d235384c966ec9e53d64f5c61caf 100644 (file)
--- a/examples/daSalome/test002_ADAO_JDC_using_strings.py
+++ b/examples/daSalome/test002_ADAO_JDC_using_strings.py
@@ -8,31 +8,26 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'String'
 Background_config['Data'] = '0 0 0'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'String'
 BackgroundError_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'String'
 Observation_config['Data'] = '1 1 1'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'String'
 ObservationError_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'String'
 ObservationOperator_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
index 5f5bc0b9a5cc028818679d3ba8856eea9ff08a9f..929fc7712635a1b38ceac083cbb22e211620d349 100644 (file)
--- a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
+++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in
@@ -2,24 +2,19 @@
 ASSIMILATION_STUDY(StudyName='Test',
                    StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',
                                          SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='Script',
                                               SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='Script',
                                           SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='Script',
                                                SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Matrix',
+                   ObservationOperator=_F(INPUT_TYPE='Matrix',
                                           data=_F(FROM='Script',
                                                   SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),
                    UserPostAnalysis=_F(FROM='Template',
@@ -28,4 +23,4 @@ ASSIMILATION_STUDY(StudyName='Test',
                                                   """import numpy
 xa=numpy.ravel(ADD.get('Analysis')[-1])
 print 'Analysis:',xa""",),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
index 3e75605dbfe7a47c9aebbf6655402da5333b6025..161056fed43650567e4afdced77810398414ad59 100644 (file)
--- a/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.py.in
@@ -8,31 +8,26 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'Script'
 Background_config['Data'] = 'test003_ADAO_scripts_for_JDC.py'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'Script'
 BackgroundError_config['Data'] = 'test003_ADAO_scripts_for_JDC.py'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'Script'
 Observation_config['Data'] = 'test003_ADAO_scripts_for_JDC.py'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'Script'
 ObservationError_config['Data'] = 'test003_ADAO_scripts_for_JDC.py'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'Script'
 ObservationOperator_config['Data'] = 'test003_ADAO_scripts_for_JDC.py'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
index 2dc3ce7a5e5b0e0f1ffdd48afff3a73b0096a4ca..15263b5ecefda1936e53d228d7913a5f2c9c29f4 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
+++ b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.comm.in
@@ -2,24 +2,19 @@
 ASSIMILATION_STUDY(StudyName='Test',
                    StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='3DVAR',),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',
                                          SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='Script',
                                               SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='Script',
                                           SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='Script',
                                                SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Matrix',
+                   ObservationOperator=_F(INPUT_TYPE='Matrix',
                                           data=_F(FROM='Script',
                                                   SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),),
                    UserDataInit=_F(INIT_FILE='test003_bis_ADAO_user_data_init.py',
@@ -32,4 +27,4 @@ ASSIMILATION_STUDY(StudyName='Test',
                                                   """import numpy
 xa=numpy.ravel(ADD.get('Analysis')[-1])
 print 'Analysis:',xa""",),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
index cf4afcdeec1a8c4550e23190130ac1b85554509c..39baa1f8c4758ede6e4d5df775813a8d50a8a34f 100644 (file)
--- a/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
+++ b/examples/daSalome/test003_bis_ADAO_JDC_using_user_data_init.py.in
@@ -8,31 +8,26 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'Script'
 Background_config['Data'] = 'test003_bis_ADAO_scripts_for_JDC.py'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'Script'
 BackgroundError_config['Data'] = 'test003_bis_ADAO_scripts_for_JDC.py'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'Script'
 Observation_config['Data'] = 'test003_bis_ADAO_scripts_for_JDC.py'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'Script'
 ObservationError_config['Data'] = 'test003_bis_ADAO_scripts_for_JDC.py'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'Script'
 ObservationOperator_config['Data'] = 'test003_bis_ADAO_scripts_for_JDC.py'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
index d29e26ab613fa6a13985cd5c7f0560256631cb1b..0f5a50a29ffb1bd15ff4b9235deabba1e715a371 100644 (file)
--- a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
+++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in
@@ -2,24 +2,19 @@
 ASSIMILATION_STUDY(StudyName='Test',
                    StudyRepertory='@prefix@/share/salome/adao_examples/daSalome',
                    AlgorithmParameters=_F(Algorithm='Blue',),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',
                                          SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='Script',
                                               SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='Script',
                                           SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='Script',
                                                SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Matrix',
+                   ObservationOperator=_F(INPUT_TYPE='Matrix',
                                           data=_F(FROM='Script',
                                                   SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),),
                    UserPostAnalysis=_F(FROM='String',
@@ -31,4 +26,4 @@ print "Size of Analysis = %i"%len(Xa)
 print "Min, mean, max   = %8.3f, %8.3f, %8.3f"%(min(Xa),numpy.mean(Xa),max(Xa))
 print
 """,),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
index bd6f8a04843fc4d5830cc2ce76a068cb548e9bbd..49ad855ccb4283f1cbeb7237d233670736c2c7f5 100644 (file)
--- a/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
+++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.py.in
@@ -8,31 +8,26 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'Script'
 Background_config['Data'] = 'test004_ADAO_scripts_for_JDC.py'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'Script'
 BackgroundError_config['Data'] = 'test004_ADAO_scripts_for_JDC.py'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'Script'
 Observation_config['Data'] = 'test004_ADAO_scripts_for_JDC.py'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'Script'
 ObservationError_config['Data'] = 'test004_ADAO_scripts_for_JDC.py'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'Script'
 ObservationOperator_config['Data'] = 'test004_ADAO_scripts_for_JDC.py'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test005_ADAO_Operators.comm.in b/examples/daSalome/test005_ADAO_Operators.comm.in
index a2985ed9645d152aad2a822e44b36a9941b327d7..fc3dda6e62897ec4e5e98a522e29cb03812ae832 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.comm.in
+++ b/examples/daSalome/test005_ADAO_Operators.comm.in
@@ -20,8 +20,8 @@ ASSIMILATION_STUDY(StudyName='Test',
                                                STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),
                    ObservationOperator=_F(Stored=0,
                                           INPUT_TYPE='Function',
-                                          data=_F(FROM='FunctionDict',
-                                                  FUNCTIONDICT_FILE='test005_ADAO_scripts_for_JDC.py',),),
+                                          data=_F(FROM='ScriptWithSwitch',
+                                                  SCRIPTWITHSWITCH_FILE='test005_ADAO_scripts_for_JDC.py',),),
                    UserPostAnalysis=_F(FROM='String',
                                        STRING=
 """import numpy
@@ -33,4 +33,4 @@ print "Size of Analysis.............= %i"%len(Xa)
 print "Min, mean, max of Analysis...= %8.3f, %8.3f, %8.3f"%(min(Xa),numpy.mean(Xa),max(Xa))
 print
 """,),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test005_ADAO_Operators.py.in b/examples/daSalome/test005_ADAO_Operators.py.in
index 3005493c32d8e2b445e78f22570bd2cb3b1f9b32..f32d18a19f039eab6e22373c382519fd9a7771f6 100644 (file)
--- a/examples/daSalome/test005_ADAO_Operators.py.in
+++ b/examples/daSalome/test005_ADAO_Operators.py.in
@@ -28,16 +28,16 @@ ObservationError_config['From'] = 'String'
 ObservationError_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
 ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
-ObservationOperator_FunctionDict = {}
-ObservationOperator_FunctionDict['Function'] = ['Direct', 'Tangent', 'Adjoint']
-ObservationOperator_FunctionDict['Script'] = {}
-ObservationOperator_FunctionDict['Script']['Direct'] = 'test005_ADAO_scripts_for_JDC.py'
-ObservationOperator_FunctionDict['Script']['Tangent'] = 'test005_ADAO_scripts_for_JDC.py'
-ObservationOperator_FunctionDict['Script']['Adjoint'] = 'test005_ADAO_scripts_for_JDC.py'
+ObservationOperator_ScriptWithSwitch = {}
+ObservationOperator_ScriptWithSwitch['Function'] = ['Direct', 'Tangent', 'Adjoint']
+ObservationOperator_ScriptWithSwitch['Script'] = {}
+ObservationOperator_ScriptWithSwitch['Script']['Direct'] = 'test005_ADAO_scripts_for_JDC.py'
+ObservationOperator_ScriptWithSwitch['Script']['Tangent'] = 'test005_ADAO_scripts_for_JDC.py'
+ObservationOperator_ScriptWithSwitch['Script']['Adjoint'] = 'test005_ADAO_scripts_for_JDC.py'
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Function'
-ObservationOperator_config['From'] = 'FunctionDict'
-ObservationOperator_config['Data'] = ObservationOperator_FunctionDict
+ObservationOperator_config['From'] = 'ScriptWithSwitch'
+ObservationOperator_config['Data'] = ObservationOperator_ScriptWithSwitch
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test006_Observers.comm.in b/examples/daSalome/test006_Observers.comm.in
index 6b18f69d69db0a654d2ed93d91c71e2c615dcc51..253c5a1c4aa927760ebddde0b9fa8d24820d6371 100644 (file)
--- a/examples/daSalome/test006_Observers.comm.in
+++ b/examples/daSalome/test006_Observers.comm.in
@@ -5,24 +5,19 @@ ASSIMILATION_STUDY(StudyName='test_observers',
                                           Parameters='Dict',
                                           data=_F(FROM='Script',
                                                   SCRIPT_FILE='test006_Observers_var.py',),),
-                   Background=_F(Stored=0,
-                                 INPUT_TYPE='Vector',
+                   Background=_F(INPUT_TYPE='Vector',
                                  data=_F(FROM='Script',
                                          SCRIPT_FILE='test006_Observers_var.py',),),
-                   BackgroundError=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+                   BackgroundError=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='Script',
                                               SCRIPT_FILE='test006_Observers_var.py',),),
-                   Observation=_F(Stored=0,
-                                  INPUT_TYPE='Vector',
+                   Observation=_F(INPUT_TYPE='Vector',
                                   data=_F(FROM='Script',
                                           SCRIPT_FILE='test006_Observers_var.py',),),
-                   ObservationError=_F(Stored=0,
-                                       INPUT_TYPE='Matrix',
+                   ObservationError=_F(INPUT_TYPE='Matrix',
                                        data=_F(FROM='Script',
                                                SCRIPT_FILE='test006_Observers_var.py',),),
-                   ObservationOperator=_F(Stored=0,
-                                          INPUT_TYPE='Function',
+                   ObservationOperator=_F(INPUT_TYPE='Function',
                                           data=_F(FROM='ScriptWithSwitch',
                                                   SCRIPTWITHSWITCH_FILE='test006_Observers_Observation_Operator.py',),),
                    UserDataInit=_F(INIT_FILE='test006_Observers_init.py',
@@ -61,4 +56,4 @@ print "       imageCost %s"%filename
 gp.hardcopy(filename=filename, color=1)
 numero += 1
 """,),),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test006_Observers.py.in b/examples/daSalome/test006_Observers.py.in
index 6886326e45b33d5fade2113d2823bf769a3d0319..056b712b092cc27afc42df27a7cb5827d9beba6d 100644 (file)
--- a/examples/daSalome/test006_Observers.py.in
+++ b/examples/daSalome/test006_Observers.py.in
@@ -13,25 +13,21 @@ Background_config = {}
 Background_config['Type'] = 'Vector'
 Background_config['From'] = 'Script'
 Background_config['Data'] = 'test006_Observers_var.py'
-Background_config['Stored'] = '0'
 study_config['Background'] = Background_config
 BackgroundError_config = {}
 BackgroundError_config['Type'] = 'Matrix'
 BackgroundError_config['From'] = 'Script'
 BackgroundError_config['Data'] = 'test006_Observers_var.py'
-BackgroundError_config['Stored'] = '0'
 study_config['BackgroundError'] = BackgroundError_config
 Observation_config = {}
 Observation_config['Type'] = 'Vector'
 Observation_config['From'] = 'Script'
 Observation_config['Data'] = 'test006_Observers_var.py'
-Observation_config['Stored'] = '0'
 study_config['Observation'] = Observation_config
 ObservationError_config = {}
 ObservationError_config['Type'] = 'Matrix'
 ObservationError_config['From'] = 'Script'
 ObservationError_config['Data'] = 'test006_Observers_var.py'
-ObservationError_config['Stored'] = '0'
 study_config['ObservationError'] = ObservationError_config
 ObservationOperator_ScriptWithSwitch = {}
 ObservationOperator_ScriptWithSwitch['Function'] = ['Direct', 'Tangent', 'Adjoint']

diff --git a/examples/daSalome/test008_ADAO_Elementary_GradientTest.comm b/examples/daSalome/test008_ADAO_Elementary_GradientTest.comm
index 71142d86151506cb8187ac2a2aed45ac721977d8..754db3f0693016eeaa5b5d0ae96efc17cb160cfc 100644 (file)
--- a/examples/daSalome/test008_ADAO_Elementary_GradientTest.comm
+++ b/examples/daSalome/test008_ADAO_Elementary_GradientTest.comm
@@ -1,16 +1,13 @@
 
 CHECKING_STUDY(StudyName='Elementary gradient test',
                AlgorithmParameters=_F(Algorithm='GradientTest',
-                                   Parameters='Dict',
-                                   data=_F(FROM='String',
-                                           STRING='{ "SetSeed" : 1000 }',),),
-               CheckingPoint=_F(Stored=0,
-                                INPUT_TYPE='Vector',
+                                      Parameters='Dict',
+                                      data=_F(FROM='String',
+                                              STRING='{ "SetSeed" : 1000 }',),),
+               CheckingPoint=_F(INPUT_TYPE='Vector',
                                 data=_F(FROM='String',
                                         STRING='1 1 1',),),
-               ObservationOperator=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+               ObservationOperator=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='String',
                                               STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
-
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test008_ADAO_Elementary_GradientTest.py b/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
index 715d312592d3dcf6a1903d41886db5eadaf8c965..578408c321bbd73541ee9eb88357459c9aa5a357 100644 (file)
--- a/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
+++ b/examples/daSalome/test008_ADAO_Elementary_GradientTest.py
@@ -13,13 +13,11 @@ CheckingPoint_config = {}
 CheckingPoint_config['Type'] = 'Vector'
 CheckingPoint_config['From'] = 'String'
 CheckingPoint_config['Data'] = '1 1 1'
-CheckingPoint_config['Stored'] = '0'
 study_config['CheckingPoint'] = CheckingPoint_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'String'
 ObservationOperator_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test009_ADAO_Simple_GradientTest.comm b/examples/daSalome/test009_ADAO_Simple_GradientTest.comm
index eebe77c7635b0105d41ec415816ce659f5366dbd..f6da8b08f1f5db0035dd11d46fbcb457b7c9fab1 100644 (file)
--- a/examples/daSalome/test009_ADAO_Simple_GradientTest.comm
+++ b/examples/daSalome/test009_ADAO_Simple_GradientTest.comm
@@ -1,16 +1,13 @@
 
 CHECKING_STUDY(StudyName='Test',
                AlgorithmParameters=_F(Algorithm='GradientTest',
-                                   Parameters='Dict',
-                                   data=_F(FROM='String',
-                                           STRING='{ "SetSeed" : 1000 }',),),
-               CheckingPoint=_F(Stored=0,
-                                INPUT_TYPE='Vector',
+                                      Parameters='Dict',
+                                      data=_F(FROM='String',
+                                              STRING='{ "SetSeed" : 1000 }',),),
+               CheckingPoint=_F(INPUT_TYPE='Vector',
                                 data=_F(FROM='String',
                                         STRING='1 1 1',),),
-               ObservationOperator=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+               ObservationOperator=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='String',
                                               STRING='1 0 0 ; 0 1 0 ; 0 0 1 ; 1 0 0 ; 0 1 0 ; 0 0 1',),),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
-
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test009_ADAO_Simple_GradientTest.py b/examples/daSalome/test009_ADAO_Simple_GradientTest.py
index ddb46dc59aac4d3630e25e766621eb1e5b83426c..efaf389de6bf3432d2592010101683cd6c541854 100644 (file)
--- a/examples/daSalome/test009_ADAO_Simple_GradientTest.py
+++ b/examples/daSalome/test009_ADAO_Simple_GradientTest.py
@@ -13,13 +13,11 @@ CheckingPoint_config = {}
 CheckingPoint_config['Type'] = 'Vector'
 CheckingPoint_config['From'] = 'String'
 CheckingPoint_config['Data'] = '1 1 1'
-CheckingPoint_config['Stored'] = '0'
 study_config['CheckingPoint'] = CheckingPoint_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'String'
 ObservationOperator_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1 ; 1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']

diff --git a/examples/daSalome/test010_ADAO_Simple_AdjointTest.comm b/examples/daSalome/test010_ADAO_Simple_AdjointTest.comm
index c8eda9338cf9c421f677f74049f15436e0239b27..6a70e4c9238e14545c627bfd3043a957377e7764 100644 (file)
--- a/examples/daSalome/test010_ADAO_Simple_AdjointTest.comm
+++ b/examples/daSalome/test010_ADAO_Simple_AdjointTest.comm
@@ -1,16 +1,13 @@
 
 CHECKING_STUDY(StudyName='Test',
                AlgorithmParameters=_F(Algorithm='AdjointTest',
-                                   Parameters='Dict',
-                                   data=_F(FROM='String',
-                                           STRING='{ "SetSeed" : 1000 }',),),
-               CheckingPoint=_F(Stored=0,
-                                INPUT_TYPE='Vector',
+                                      Parameters='Dict',
+                                      data=_F(FROM='String',
+                                              STRING='{ "SetSeed" : 1000 }',),),
+               CheckingPoint=_F(INPUT_TYPE='Vector',
                                 data=_F(FROM='String',
                                         STRING='1 1 1',),),
-               ObservationOperator=_F(Stored=0,
-                                      INPUT_TYPE='Matrix',
+               ObservationOperator=_F(INPUT_TYPE='Matrix',
                                       data=_F(FROM='String',
                                               STRING='1 0 0 ; 0 1 0 ; 0 0 1 ; 1 0 0 ; 0 1 0 ; 0 0 1',),),);
-#VERSION_CATALOGUE:V7_6_0:FIN VERSION_CATALOGUE
-
+#VERSION_CATALOGUE:V8_3_0:FIN VERSION_CATALOGUE

diff --git a/examples/daSalome/test010_ADAO_Simple_AdjointTest.py b/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
index e141f6e38b0e34b138d74a0f3f94e10a5843e8da..d8adb65b56a64228e5ab35828a35eddec42ccaa5 100644 (file)
--- a/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
+++ b/examples/daSalome/test010_ADAO_Simple_AdjointTest.py
@@ -13,13 +13,11 @@ CheckingPoint_config = {}
 CheckingPoint_config['Type'] = 'Vector'
 CheckingPoint_config['From'] = 'String'
 CheckingPoint_config['Data'] = '1 1 1'
-CheckingPoint_config['Stored'] = '0'
 study_config['CheckingPoint'] = CheckingPoint_config
 ObservationOperator_config = {}
 ObservationOperator_config['Type'] = 'Matrix'
 ObservationOperator_config['From'] = 'String'
 ObservationOperator_config['Data'] = '1 0 0 ; 0 1 0 ; 0 0 1 ; 1 0 0 ; 0 1 0 ; 0 0 1'
-ObservationOperator_config['Stored'] = '0'
 study_config['ObservationOperator'] = ObservationOperator_config
 inputvariables_config = {}
 inputvariables_config['Order'] =['adao_default']