From 239073194e08a81b75dafc6eec729bb798124ad3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Mon, 25 Jun 2012 09:17:56 +0200 Subject: [PATCH] Updating module tests --- .../daSalome/test001_ADAO_JDC_using_strings.comm | 15 ++++++++++----- .../daSalome/test002_ADAO_JDC_using_strings.comm | 15 ++++++++++----- .../test003_ADAO_JDC_using_scripts.comm.in | 15 ++++++++++----- ...t003_bis_ADAO_JDC_using_user_data_init.comm.in | 15 ++++++++++----- .../test004_ADAO_JDC_using_scripts.comm.in | 15 ++++++++++----- examples/daSalome/test005_ADAO_Operators.comm.in | 15 ++++++++++----- examples/daSalome/test006_Observers.comm.in | 15 ++++++++++----- 7 files changed, 70 insertions(+), 35 deletions(-) diff --git a/examples/daSalome/test001_ADAO_JDC_using_strings.comm b/examples/daSalome/test001_ADAO_JDC_using_strings.comm index 8455aa5..8caf22b 100644 --- a/examples/daSalome/test001_ADAO_JDC_using_strings.comm +++ b/examples/daSalome/test001_ADAO_JDC_using_strings.comm @@ -2,18 +2,23 @@ ASSIMILATION_STUDY(Study_name='Test', Debug=0, Algorithm='Blue', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='0 0 0',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='1 1 1',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - ObservationOperator=_F(INPUT_TYPE='Matrix', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),); diff --git a/examples/daSalome/test002_ADAO_JDC_using_strings.comm b/examples/daSalome/test002_ADAO_JDC_using_strings.comm index 752fbf4..afbde56 100644 --- a/examples/daSalome/test002_ADAO_JDC_using_strings.comm +++ b/examples/daSalome/test002_ADAO_JDC_using_strings.comm @@ -2,18 +2,23 @@ ASSIMILATION_STUDY(Study_name='Test', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='0 0 0',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='1 1 1',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - ObservationOperator=_F(INPUT_TYPE='Matrix', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),),); diff --git a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in index c9096ea..16513f1 100644 --- a/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in +++ b/examples/daSalome/test003_ADAO_JDC_using_scripts.comm.in @@ -3,18 +3,23 @@ ASSIMILATION_STUDY(Study_name='Test', Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),), - ObservationOperator=_F(INPUT_TYPE='Matrix', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test003_ADAO_scripts_for_JDC.py',),),); 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 1e14f8a..152277e 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 @@ -3,19 +3,24 @@ ASSIMILATION_STUDY(Study_name='Test', Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test003_bis_ADAO_scripts_for_JDC.py',),), - ObservationOperator=_F(INPUT_TYPE='Matrix', + ObservationOperator=_F(Stored=0, + 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', diff --git a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in index af7be9e..26b9341 100644 --- a/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in +++ b/examples/daSalome/test004_ADAO_JDC_using_scripts.comm.in @@ -3,19 +3,24 @@ ASSIMILATION_STUDY(Study_name='Test', Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='Blue', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),), - ObservationOperator=_F(INPUT_TYPE='Matrix', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test004_ADAO_scripts_for_JDC.py',),), UserPostAnalysis=_F(FROM='String', diff --git a/examples/daSalome/test005_ADAO_Operators.comm.in b/examples/daSalome/test005_ADAO_Operators.comm.in index 160a7fe..2c60c85 100644 --- a/examples/daSalome/test005_ADAO_Operators.comm.in +++ b/examples/daSalome/test005_ADAO_Operators.comm.in @@ -3,19 +3,24 @@ ASSIMILATION_STUDY(Study_name='Test', Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='0 0 0',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='String', STRING='1 1 1',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='String', STRING='1 0 0 ; 0 1 0 ; 0 0 1',),), - ObservationOperator=_F(INPUT_TYPE='Function', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Function', data=_F(FROM='FunctionDict', FUNCTIONDICT_FILE='test005_ADAO_scripts_for_JDC.py',),), UserPostAnalysis=_F(FROM='String', diff --git a/examples/daSalome/test006_Observers.comm.in b/examples/daSalome/test006_Observers.comm.in index 1efe8e4..365a064 100644 --- a/examples/daSalome/test006_Observers.comm.in +++ b/examples/daSalome/test006_Observers.comm.in @@ -3,19 +3,24 @@ ASSIMILATION_STUDY(Study_name='test_observers', Study_repertory='@prefix@/share/salome/adao_examples/daSalome', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test006_Observers_var.py',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test006_Observers_var.py',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='test006_Observers_var.py',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='test006_Observers_var.py',),), - ObservationOperator=_F(INPUT_TYPE='Function', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Function', data=_F(FROM='FunctionDict', FUNCTIONDICT_FILE='test006_Observers_Observation_Operator.py',),), AlgorithmParameters=_F(INPUT_TYPE='Dict', -- 2.39.2