From: André Ribes <andre.ribes@edf.fr>
Date: Fri, 9 Jul 2010 09:46:36 +0000 (+0200)
Subject: Regression 2 : ObservationOperator par fonction
X-Git-Tag: V6_4_0rc3~117
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4090aca1c53804997a1360f19c30f4d4a9567c1f;p=modules%2Fadao.git

Regression 2 : ObservationOperator par fonction
---

diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
index 6ee5ad2..e21c653 100644
--- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
+++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
@@ -40,7 +40,7 @@ AssimType["Background"] = ["Vector"]
 AssimType["BackgroundError"] = ["Matrix"]
 AssimType["Observation"] = ["Vector"]
 AssimType["ObservationError"] = ["Matrix"]
-AssimType["ObservationOperator"] = ["Matrix", "FunctionDict"]
+AssimType["ObservationOperator"] = ["Matrix", "Function"]
 AssimType["AlgorithmParameters"] = ["Dict"]
 #AssimType["ObservationOperatorAppliedToX"] = ["List"]
 
diff --git a/src/tests/daSalome/test017_3DVAR_par_fonction.py.in b/src/tests/daSalome/test017_3DVAR_par_fonction.py.in
index 253af8a..90a75fd 100644
--- a/src/tests/daSalome/test017_3DVAR_par_fonction.py.in
+++ b/src/tests/daSalome/test017_3DVAR_par_fonction.py.in
@@ -36,7 +36,7 @@ FunctionDict["Script"]["Adjoint"] = "@prefix@/tests/daSalome/test017_3DVAR_funct
 ObservationOperator_config = {}
 ObservationOperator_config["Data"] = FunctionDict
 ObservationOperator_config["Type"] = "Function"
-ObservationOperator_config["From"] = "Dict"
+ObservationOperator_config["From"] = "FunctionDict"
 study_config["ObservationOperator"] = ObservationOperator_config
 
 Analysis_config = {}