Remove temporary KalmanFilter before introducing EvolutionModel in OptLoop for ADAO

[modules/adao.git] / src / daSalome / daYacsSchemaCreator / infos_daComposant.py

diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
index 04096757c4964c141de84ca712b6e60224ecd3d8..16b8625e2d7724bc03f61a54c74c64d4067e7855 100644 (file)
--- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
+++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py
@@ -1,23 +1,23 @@
 #-*- coding: utf-8 -*-
-#  Copyright (C) 2010 EDF R&D
+# Copyright (C) 2010-2011 EDF R&D
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# --
-# Author : André RIBES (EDF R&D)
-# --
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# Author: Andre Ribes, andre.ribes@edf.fr, EDF R&D
 
 
 # -- Infos pour le parser --
@@ -26,14 +26,11 @@ AnalysisData = {}
 AnalysisFromList = ["String", "Script"]
 
 # -- Infos from daCore --
-#AssimData = ["Background", "BackgroundError",
-#             "Observation", "ObservationError", "ObservationOperator", "ObservationOperatorAppliedToX",
-#             "EvolutionModel", "EvolutionError", "AlgorithmParameters"]
-
 AssimData = ["Background", "BackgroundError",
-             "Observation", "ObservationError", "ObservationOperator",
-             "EvolutionModel", "EvolutionError", "AlgorithmParameters"]
-
+             "Observation", "ObservationError",
+             "ObservationOperator",
+             "EvolutionModel", "EvolutionError",
+             "AlgorithmParameters"]
 
 AssimType = {}
 AssimType["Background"] = ["Vector"]
@@ -41,35 +38,67 @@ AssimType["BackgroundError"] = ["Matrix"]
 AssimType["Observation"] = ["Vector"]
 AssimType["ObservationError"] = ["Matrix"]
 AssimType["ObservationOperator"] = ["Matrix", "Function"]
+AssimType["EvolutionModel"] = ["Matrix", "Function"]
+AssimType["EvolutionError"] = ["Matrix"]
 AssimType["AlgorithmParameters"] = ["Dict"]
 AssimType["UserDataInit"] = ["Dict"]
-#AssimType["ObservationOperatorAppliedToX"] = ["List"]
 
 FromNumpyList = {}
-FromNumpyList["Vector"] = ["String", "Script"]
-FromNumpyList["Matrix"] = ["String", "Script"]
+FromNumpyList["Vector"]   = ["String", "Script"]
+FromNumpyList["Matrix"]   = ["String", "Script"]
 FromNumpyList["Function"] = ["FunctionDict"]
-FromNumpyList["Dict"] = ["Script"]
+FromNumpyList["Dict"]     = ["Script"]
 
 # -- Infos from daAlgorithms --
-AssimAlgos = ["Blue", "EnsembleBlue", "Kalman", "LinearLeastSquares", "3DVAR"]
+AssimAlgos = [
+    "3DVAR",
+    "Blue",
+    "EnsembleBlue",
+#     "KalmanFilter", # Removed because EvolutionModel must be available in OptLoop
+    "LinearLeastSquares",
+    "NonLinearLeastSquares",
+    ]
 
 AlgoDataRequirements = {}
-AlgoDataRequirements["Blue"] = ["Background", "BackgroundError",
-                                "Observation", "ObservationOperator", "ObservationError"]
+AlgoDataRequirements["3DVAR"] = [
+    "Background", "BackgroundError",
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
+AlgoDataRequirements["Blue"] = [
+    "Background", "BackgroundError",
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
+AlgoDataRequirements["EnsembleBlue"] = [
+    "Background", "BackgroundError",
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
+# AlgoDataRequirements["KalmanFilter"] = [
+#     "Background", "BackgroundError",
+#     "Observation", "ObservationError",
+#     "EvolutionModel", "EvolutionError",
+#     "ObservationOperator",
+#     ]
+AlgoDataRequirements["LinearLeastSquares"] = [
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
+AlgoDataRequirements["NonLinearLeastSquares"] = [
+    "Observation", "ObservationError",
+    "ObservationOperator",
+    ]
 
-AlgoDataRequirements["3DVAR"] = ["Background", "BackgroundError",
-                                 "Observation", "ObservationOperator", "ObservationError"]
 AlgoType = {}
-AlgoType["Blue"] = "Optim"
 AlgoType["3DVAR"] = "Optim"
+AlgoType["Blue"] = "Optim"
 AlgoType["EnsembleBlue"] = "Optim"
-AlgoType["Kalman"] = "Optim"
+# AlgoType["KalmanFilter"] = "Optim"
 AlgoType["LinearLeastSquares"] = "Optim"
-#AlgoType["Blue"] = "Direct"
-
+AlgoType["NonLinearLeastSquares"] = "Optim"
 
-# Variables qui sont partagés avec le générateur de
+# Variables qui sont partages avec le generateur de
 # catalogue Eficas
 
 # Basic data types
@@ -95,6 +124,8 @@ AssimDataDict["BackgroundError"] = ["Matrix"]
 AssimDataDict["Observation"] = ["Vector"]
 AssimDataDict["ObservationError"] = ["Matrix"]
 AssimDataDict["ObservationOperator"] = ["Matrix", "Function"]
+AssimDataDict["EvolutionModel"] = ["Matrix", "Function"]
+AssimDataDict["EvolutionError"] = ["Matrix"]
 AssimDataDict["AlgorithmParameters"] = ["Dict"]
 AssimDataDict["UserDataInit"] = ["Dict"]
 
@@ -104,6 +135,8 @@ AssimDataDefaultDict["BackgroundError"]     = "Matrix"
 AssimDataDefaultDict["Observation"]         = "Vector"
 AssimDataDefaultDict["ObservationError"]    = "Matrix"
 AssimDataDefaultDict["ObservationOperator"] = "Function"
+AssimDataDefaultDict["EvolutionModel"]      = "Function"
+AssimDataDefaultDict["EvolutionError"]      = "Matrix"
 AssimDataDefaultDict["AlgorithmParameters"] = "Dict"
 AssimDataDefaultDict["UserDataInit"]        = "Dict"
 
@@ -112,3 +145,22 @@ OptDict = {}
 OptDict["UserPostAnalysis"]   = ["String", "Script"]
 OptDefaultDict = {}
 OptDefaultDict["UserPostAnalysis"]   = "Script"
+
+# Observers
+ObserversList = [
+    "Analysis",
+    "CurrentState",
+    "Innovation",
+    "OMA",
+    "OMB",
+    "BMA",
+    "CostFunctionJ",
+    "CostFunctionJb",
+    "CostFunctionJo",
+    "GradientOfCostFunctionJ",
+    "GradientOfCostFunctionJb",
+    "GradientOfCostFunctionJo",
+    "SigmaObs2",
+    "SigmaBck2",
+    "APosterioriCovariance",
+    ]