From 397b41e95e0f9a124aedbf68ba5cb3c9480d0b6a Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Mon, 22 Oct 2012 17:27:58 +0200 Subject: [PATCH] Correcting potentially incorrect shapes for vectors --- src/daComposant/daAlgorithms/3DVAR.py | 4 ++-- src/daComposant/daAlgorithms/Blue.py | 2 +- src/daComposant/daCore/AssimilationStudy.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/daComposant/daAlgorithms/3DVAR.py b/src/daComposant/daAlgorithms/3DVAR.py index 50a104c..0cc504e 100644 --- a/src/daComposant/daAlgorithms/3DVAR.py +++ b/src/daComposant/daAlgorithms/3DVAR.py @@ -283,9 +283,9 @@ class ElementaryAlgorithm(BasicObjects.Algorithm): if "Innovation" in self._parameters["StoreSupplementaryCalculations"]: self.StoredVariables["Innovation"].store( numpy.ravel(d) ) if "BMA" in self._parameters["StoreSupplementaryCalculations"]: - self.StoredVariables["BMA"].store( numpy.ravel(Xb - Xa) ) + self.StoredVariables["BMA"].store( numpy.ravel(Xb) - numpy.ravel(Xa) ) if "OMA" in self._parameters["StoreSupplementaryCalculations"]: - self.StoredVariables["OMA"].store( numpy.ravel(Y - Hm(Xa)) ) + self.StoredVariables["OMA"].store( numpy.ravel(Y) - numpy.ravel(Hm(Xa)) ) if "OMB" in self._parameters["StoreSupplementaryCalculations"]: self.StoredVariables["OMB"].store( numpy.ravel(d) ) if "SigmaObs2" in self._parameters["StoreSupplementaryCalculations"]: diff --git a/src/daComposant/daAlgorithms/Blue.py b/src/daComposant/daAlgorithms/Blue.py index 6e68214..7c43874 100644 --- a/src/daComposant/daAlgorithms/Blue.py +++ b/src/daComposant/daAlgorithms/Blue.py @@ -123,7 +123,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm): if "Innovation" in self._parameters["StoreSupplementaryCalculations"]: self.StoredVariables["Innovation"].store( numpy.ravel(d) ) if "BMA" in self._parameters["StoreSupplementaryCalculations"]: - self.StoredVariables["BMA"].store( numpy.ravel(Xb - Xa) ) + self.StoredVariables["BMA"].store( numpy.ravel(Xb) - numpy.ravel(Xa) ) if "OMA" in self._parameters["StoreSupplementaryCalculations"]: self.StoredVariables["OMA"].store( numpy.ravel(oma) ) if "OMB" in self._parameters["StoreSupplementaryCalculations"]: diff --git a/src/daComposant/daCore/AssimilationStudy.py b/src/daComposant/daCore/AssimilationStudy.py index 0658b94..c6bde4e 100644 --- a/src/daComposant/daCore/AssimilationStudy.py +++ b/src/daComposant/daCore/AssimilationStudy.py @@ -21,9 +21,10 @@ # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ - Définit les outils généraux élémentaires. + Classe principale pour la préparation, la réalisation et la restitution de + calculs d'assimilation de données. - Ce module est destiné à etre appelée par AssimilationStudy pour constituer + Ce module est destiné à être appelé par AssimilationStudy pour constituer les objets élémentaires de l'étude. """ __author__ = "Jean-Philippe ARGAUD" -- 2.39.2