From: Jean-Philippe ARGAUD Date: Wed, 9 Jul 2014 19:27:41 +0000 (+0200) Subject: Improving user interface default values for output X-Git-Tag: V7_5_0rc1~17 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=09b05aedba711bbbaa1d6c224adc351f4751b357;p=modules%2Fadao.git Improving user interface default values for output --- diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index 7186aa0..09c0094 100644 --- a/bin/AdaoCatalogGenerator.py +++ b/bin/AdaoCatalogGenerator.py @@ -211,6 +211,7 @@ CHECKING_STUDY = PROC(nom="CHECKING_STUDY", Debug = SIMP(statut="f", typ = "I", into=(0, 1), defaut=0), Algorithm = SIMP(statut="o", typ = "TXM", into=(${check_names})), CheckingPoint = F_CheckingPoint("o"), + Observation = F_Observation("f"), ObservationOperator = F_ObservationOperator("o"), AlgorithmParameters = F_AlgorithmParameters("f"), UserDataInit = F_Init("f"), diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py index 64431a0..53f33f5 100644 --- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py +++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py @@ -35,7 +35,7 @@ AssimData = ["Background", "BackgroundError", ] AssimType = {} -AssimType["Background"] = ["Vector"] +AssimType["Background"] = ["Vector", "VectorSerie"] AssimType["BackgroundError"] = ["Matrix", "ScalarSparseMatrix", "DiagonalSparseMatrix"] AssimType["Observation"] = ["Vector", "VectorSerie"] AssimType["ObservationError"] = ["Matrix", "ScalarSparseMatrix", "DiagonalSparseMatrix"] @@ -198,7 +198,7 @@ DataTypeDefaultDict["Dict"] = "Script" # Assimilation data input AssimDataDict = {} -AssimDataDict["Background"] = ["Vector"] +AssimDataDict["Background"] = ["Vector", "VectorSerie"] AssimDataDict["BackgroundError"] = ["Matrix", "ScalarSparseMatrix", "DiagonalSparseMatrix"] AssimDataDict["Observation"] = ["Vector", "VectorSerie"] AssimDataDict["ObservationError"] = ["Matrix", "ScalarSparseMatrix", "DiagonalSparseMatrix"]