From: Jean-Philippe ARGAUD Date: Mon, 6 Feb 2017 14:45:18 +0000 (+0100) Subject: Examples corrections and improvements X-Git-Tag: V8_3_0rc1~24 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=972191397fac472ae3ff6d52c077c851b92d1cfc;p=modules%2Fadao.git 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 c6f7337..d8771a4 100644 --- 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 2bd9acf..b5d4055 100644 --- 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 8ded8ca..72bf031 100644 --- 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 57d8adc..aaf0dd2 100644 --- 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 5f5bc0b..929fc77 100644 --- 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 3e75605..161056f 100644 --- 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 2dc3ce7..15263b5 100644 --- 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 cf4afcd..39baa1f 100644 --- 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 d29e26a..0f5a50a 100644 --- 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 bd6f8a0..49ad855 100644 --- 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 a2985ed..fc3dda6 100644 --- 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 3005493..f32d18a 100644 --- 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 6b18f69..253c5a1 100644 --- 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 6886326..056b712 100644 --- 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 71142d8..754db3f 100644 --- 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 715d312..578408c 100644 --- 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 eebe77c..f6da8b0 100644 --- 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 ddb46dc..efaf389 100644 --- 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 c8eda93..6a70e4c 100644 --- 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 e141f6e..d8adb65 100644 --- 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']