Regression 2 : ObservationOperator par fonction

diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
index 6ee5ad21c534951526cfb1b1278555e97c65486e..e21c6536919d5ffc44e2a5b0009b30b8950a0edd 100644 (file)
--- 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 253af8adc62f90b690c1b1bfed38ee97ea234cb8..90a75fd3145e21208c81d6af31f53e0ca39f13a8 100644 (file)
--- 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 = {}