From 3f6dddf8701ee4259357107cef53492f47653df8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 26 Sep 2012 18:01:45 +0200 Subject: [PATCH] Updating copyright notices --- bin/AdaoCatalogGenerator.py | 33 ++++--- bin/AdaoYacsSchemaCreator.py | 7 +- bin/Makefile.am | 2 +- bin/qtEficas_adao_study.py.in | 7 +- doc/conf.py | 4 +- .../daSalome/test003_ADAO_scripts_for_JDC.py | 4 +- .../test003_bis_ADAO_scripts_for_JDC.py | 4 +- .../test003_bis_ADAO_user_data_init.py | 4 +- .../daSalome/test004_ADAO_scripts_for_JDC.py | 4 +- .../daSalome/test005_ADAO_scripts_for_JDC.py | 4 +- .../test006_Observers_Observation_Operator.py | 4 +- examples/daSalome/test006_Observers_init.py | 4 +- examples/daSalome/test006_Observers_var.py | 4 +- .../ADAO_Case.comm.in | 15 ++-- .../Makefile.am | 2 +- .../Physical_data_and_covariance_matrices.py | 2 +- .../Physical_simulation_functions.py | 88 ++++++------------- .../Script_AlgorithmParameters.py | 2 +- .../Script_BackgroundError_B.py | 2 +- .../Script_Background_xb.py | 2 +- .../Script_ObservationError_R.py | 2 +- .../Script_ObservationOperator_H.py | 3 +- .../Script_Observation_yo.py | 2 +- .../Script_UserPostAnalysis.py | 2 +- resources/ADAOCatalog.xml | 4 +- resources/ADAOSchemaCatalog.xml | 4 +- resources/SalomeApp.xml | 6 +- src/daComposant/daCore/AssimilationStudy.py | 28 +++--- src/daComposant/daCore/BasicObjects.py | 28 +++--- src/daComposant/daCore/Logging.py | 28 +++--- src/daComposant/daCore/Persistence.py | 28 +++--- src/daComposant/daCore/PlatformInfo.py | 28 +++--- src/daComposant/daCore/__init__.py | 28 +++--- src/daComposant/daCore/version.py | 28 +++--- .../daYacsIntegration/daOptimizerLoop.py | 5 +- src/daSalome/daYacsIntegration/daStudy.py | 5 +- 36 files changed, 197 insertions(+), 230 deletions(-) diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index 5e9e23e..8ae595c 100644 --- a/bin/AdaoCatalogGenerator.py +++ b/bin/AdaoCatalogGenerator.py @@ -1,23 +1,22 @@ -#-*- coding:utf-8 -*- -# Copyright (C) 2008-2011 EDF R&D +#-*-coding:iso-8859-1-*- # -# 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. +# Copyright (C) 2008-2012 EDF R&D # -# 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 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. # -# 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 +# 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. # -# -- -# Author : André RIBES (EDF R&D) -# -- +# 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: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import logging import traceback @@ -52,7 +51,7 @@ def F_${data_name}(statut) : return FACT(statut = statut, ), STRING_DATA = BLOC ( condition = " FROM in ( 'String', ) ", - STRING = SIMP(statut = "o", typ = "TXM", fr="En attente d'une chaine de caractères entre guillements, qui soit valide pour construire un vecteur : une suite de nombres, utilisant un espace ou une virgule pour séparer deux éléments et un point-virgule pour séparer deux lignes", ang="Waiting for a string in quotes, valid to build a vector: a floats serie, using a space or comma to separate two elements in a line, a semi-colon to separate rows"), + STRING = SIMP(statut = "o", typ = "TXM", fr="En attente d'une chaine de caractères entre guillements. Pour construire un vecteur, ce doit être une suite de nombres, utilisant un espace ou une virgule pour séparer deux éléments et un point-virgule pour séparer deux lignes", ang="Waiting for a string in quotes. To build a vector, it has to be a float serie, using a space or comma to separate two elements in a line, a semi-colon to separate rows"), ), SCRIPTWITHFUNCTIONS_DATA = BLOC ( condition = " FROM in ( 'ScriptWithFunctions', ) ", diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py index 0f57140..4f4122b 100644 --- a/bin/AdaoYacsSchemaCreator.py +++ b/bin/AdaoYacsSchemaCreator.py @@ -1,5 +1,6 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2008-2011 EDF R&D +# +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public @@ -15,9 +16,7 @@ # 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) -# -- +# Author: André Ribes, andre.ribes@edf.fr, EDF R&D import sys import os diff --git a/bin/Makefile.am b/bin/Makefile.am index 8cde7f7..65b321c 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/bin/qtEficas_adao_study.py.in b/bin/qtEficas_adao_study.py.in index c9018cc..3aaf574 100644 --- a/bin/qtEficas_adao_study.py.in +++ b/bin/qtEficas_adao_study.py.in @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,11 +18,10 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D - +# Author: André Ribes, andre.ribes@edf.fr, EDF R&D """ - Ce module sert à lancer EFICAS pour Adao + Ce module sert à lancer EFICAS pour Adao """ import sys diff --git a/doc/conf.py b/doc/conf.py index bf40291..aa1efa2 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -65,9 +65,9 @@ copyright = u'2008-2012, Jean-Philippe ARGAUD' # built documents. # # The short X.Y version. -version = '6.5.0' +version = '6.6.0' # The full version, including alpha/beta/rc tags. -release = '6.5.0' +release = '6.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/examples/daSalome/test003_ADAO_scripts_for_JDC.py b/examples/daSalome/test003_ADAO_scripts_for_JDC.py index 364e782..35fdbde 100644 --- a/examples/daSalome/test003_ADAO_scripts_for_JDC.py +++ b/examples/daSalome/test003_ADAO_scripts_for_JDC.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy # diff --git a/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py b/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py index 7bb3fc7..ed61a2b 100644 --- a/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py +++ b/examples/daSalome/test003_bis_ADAO_scripts_for_JDC.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy # diff --git a/examples/daSalome/test003_bis_ADAO_user_data_init.py b/examples/daSalome/test003_bis_ADAO_user_data_init.py index e133d01..98762cd 100644 --- a/examples/daSalome/test003_bis_ADAO_user_data_init.py +++ b/examples/daSalome/test003_bis_ADAO_user_data_init.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy # diff --git a/examples/daSalome/test004_ADAO_scripts_for_JDC.py b/examples/daSalome/test004_ADAO_scripts_for_JDC.py index a7b2db1..f9a2593 100644 --- a/examples/daSalome/test004_ADAO_scripts_for_JDC.py +++ b/examples/daSalome/test004_ADAO_scripts_for_JDC.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy # diff --git a/examples/daSalome/test005_ADAO_scripts_for_JDC.py b/examples/daSalome/test005_ADAO_scripts_for_JDC.py index 6452bf0..0099574 100644 --- a/examples/daSalome/test005_ADAO_scripts_for_JDC.py +++ b/examples/daSalome/test005_ADAO_scripts_for_JDC.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy import logging diff --git a/examples/daSalome/test006_Observers_Observation_Operator.py b/examples/daSalome/test006_Observers_Observation_Operator.py index 409119b..0dab0c3 100644 --- a/examples/daSalome/test006_Observers_Observation_Operator.py +++ b/examples/daSalome/test006_Observers_Observation_Operator.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy import time diff --git a/examples/daSalome/test006_Observers_init.py b/examples/daSalome/test006_Observers_init.py index 197af38..14f99b8 100644 --- a/examples/daSalome/test006_Observers_init.py +++ b/examples/daSalome/test006_Observers_init.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy numpy.random.seed(1000) diff --git a/examples/daSalome/test006_Observers_var.py b/examples/daSalome/test006_Observers_var.py index 0e32232..3bc63e7 100644 --- a/examples/daSalome/test006_Observers_var.py +++ b/examples/daSalome/test006_Observers_var.py @@ -1,5 +1,5 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import numpy # diff --git a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in index a6ca3e1..9752c17 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in +++ b/examples/daSkeletons/External_data_definition_by_scripts/ADAO_Case.comm.in @@ -3,19 +3,24 @@ ASSIMILATION_STUDY(Study_name='ADAO skeleton case', Study_repertory='@prefix@/share/salome/adao_examples/daSkeletons/External_data_definition_by_scripts', Debug=0, Algorithm='3DVAR', - Background=_F(INPUT_TYPE='Vector', + Background=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='Script_Background_xb.py',),), - BackgroundError=_F(INPUT_TYPE='Matrix', + BackgroundError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='Script_BackgroundError_B.py',),), - Observation=_F(INPUT_TYPE='Vector', + Observation=_F(Stored=0, + INPUT_TYPE='Vector', data=_F(FROM='Script', SCRIPT_FILE='Script_Observation_yo.py',),), - ObservationError=_F(INPUT_TYPE='Matrix', + ObservationError=_F(Stored=0, + INPUT_TYPE='Matrix', data=_F(FROM='Script', SCRIPT_FILE='Script_ObservationError_R.py',),), - ObservationOperator=_F(INPUT_TYPE='Function', + ObservationOperator=_F(Stored=0, + INPUT_TYPE='Function', data=_F(FROM='FunctionDict', FUNCTIONDICT_FILE='Script_ObservationOperator_H.py',),), AlgorithmParameters=_F(INPUT_TYPE='Dict', diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am b/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am index 2956aad..c828b30 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am +++ b/examples/daSkeletons/External_data_definition_by_scripts/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py b/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py index 31fc590..b6a0c99 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Physical_data_and_covariance_matrices.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py b/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py index 0aa4010..c0c920d 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Physical_simulation_functions.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -30,17 +30,13 @@ __doc__ = """ """ __author__ = "Jean-Philippe ARGAUD" # -# ============================================================================== -# import os, numpy, time # +# ============================================================================== +# def FunctionH( XX ): """ Direct non-linear simulation operator """ # - # NEED TO BE COMPLETED - # NEED TO BE COMPLETED - # NEED TO BE COMPLETED - # # --------------------------------------> EXAMPLE TO BE REMOVED if type(XX) is type(numpy.matrix([])): # EXAMPLE TO BE REMOVED HX = XX.A1.tolist() # EXAMPLE TO BE REMOVED @@ -51,43 +47,15 @@ def FunctionH( XX ): # --------------------------------------> EXAMPLE TO BE REMOVED # return numpy.array( HX ) - -# ============================================================================== -def TangentH( X, increment = 0.01, centeredDF = False ): - """ - Calcul de l'opérateur tangent comme la Jacobienne par différences finies, - c'est-à-dire le gradient de H en X. On utilise des différences finies - directionnelles autour du point X. - - Différences finies centrées : - 1/ Pour chaque composante i de X, on ajoute et on enlève la perturbation - dX[i] à la composante X[i], pour composer X_plus_dXi et X_moins_dXi, et - on calcule les réponses HX_plus_dXi = H( X_plus_dXi ) et HX_moins_dXi = - H( X_moins_dXi ) - 2/ On effectue les différences (HX_plus_dXi-HX_moins_dXi) et on divise par - le pas 2*dXi - 3/ Chaque résultat, par composante, devient une colonne de la Jacobienne - - Différences finies non centrées : - 1/ Pour chaque composante i de X, on ajoute la perturbation dX[i] à la - composante X[i] pour composer X_plus_dXi, et on calcule la réponse - HX_plus_dXi = H( X_plus_dXi ) - 2/ On calcule la valeur centrale HX = H(X) - 3/ On effectue les différences (HX_plus_dXi-HX) et on divise par - le pas dXi - 4/ Chaque résultat, par composante, devient une colonne de la Jacobienne - - """ - print - print " == Calcul de la Jacobienne avec un incrément de %s*X"%increment +# +def TangentHMatrix( X, increment = 0.01, centeredDF = False ): + """ Tangent operator (Jacobian) calculated by finite differences """ # dX = increment * X.A1 # if centeredDF: - # - # Boucle de calcul des colonnes de la Jacobienne - # ---------------------------------------------- - Jacobienne = [] + # + Jacobian = [] for i in range( len(dX) ): X_plus_dXi = numpy.array( X.A1 ) X_plus_dXi[i] = X[i] + dX[i] @@ -99,12 +67,10 @@ def TangentH( X, increment = 0.01, centeredDF = False ): # HX_Diff = ( HX_plus_dXi - HX_moins_dXi ) / (2.*dX[i]) # - Jacobienne.append( HX_Diff ) + Jacobian.append( HX_Diff ) # else: # - # Boucle de calcul des colonnes de la Jacobienne - # ---------------------------------------------- HX_plus_dX = [] for i in range( len(dX) ): X_plus_dXi = numpy.array( X.A1 ) @@ -114,35 +80,31 @@ def TangentH( X, increment = 0.01, centeredDF = False ): # HX_plus_dX.append( HX_plus_dXi ) # - # Calcul de la valeur centrale - # ---------------------------- HX = FunctionH( X ) # - # Calcul effectif de la Jacobienne par différences finies - # ------------------------------------------------------- - Jacobienne = [] + Jacobian = [] for i in range( len(dX) ): - Jacobienne.append( ( HX_plus_dX[i] - HX ) / dX[i] ) + Jacobian.append( ( HX_plus_dX[i] - HX ) / dX[i] ) # - Jacobienne = numpy.matrix( Jacobienne ) - print - print " == Fin du calcul de la Jacobienne" + Jacobian = numpy.matrix( Jacobian ) # - return Jacobienne - -# ============================================================================== + return Jacobian +# +def TangentH( X ): + """ Tangent operator """ + _X = numpy.asmatrix(X).flatten().T + HtX = self.TangentHMatrix( _X ) * _X + return HtX.A1 +# def AdjointH( (X, Y) ): - """ - Calcul de l'adjoint à l'aide de la Jacobienne. - """ - Jacobienne = TangentH( X, centeredDF = False ) + """ Ajoint operator """ + # + Jacobian = TangentHMatrix( X, centeredDF = False ) # - # Calcul de la valeur de l'adjoint en X appliqué à Y - # -------------------------------------------------- Y = numpy.asmatrix(Y).flatten().T - HtY = numpy.dot(Jacobienne, Y) + HaY = numpy.dot(Jacobian, Y) # - return HtY.A1 + return HaY.A1 # ============================================================================== if __name__ == "__main__": diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py index 653b10c..ff7f11b 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_AlgorithmParameters.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py index 1cbc5ee..160b662 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_BackgroundError_B.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py index 0c7b603..f7e19a2 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_Background_xb.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py index d57675c..bf590b6 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationError_R.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py index da41747..4dec8ee 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_ObservationOperator_H.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -54,6 +54,7 @@ logging.info("ComputationFunctionNode: Found method is \'%s\'"%method) # ---------------------------------------------------------- logging.info("ComputationFunctionNode: Loading operator functions") FunctionH = Physical_simulation_functions.FunctionH +TangentH = Physical_simulation_functions.TangentH AdjointH = Physical_simulation_functions.AdjointH # # Executing the possible computations diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py index 2d7e8df..c00cae7 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_Observation_yo.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py b/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py index 8e3a0a1..a5bf58c 100644 --- a/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py +++ b/examples/daSkeletons/External_data_definition_by_scripts/Script_UserPostAnalysis.py @@ -1,6 +1,6 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2011 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/resources/ADAOCatalog.xml b/resources/ADAOCatalog.xml index 10f2383..8d8e0e7 100644 --- a/resources/ADAOCatalog.xml +++ b/resources/ADAOCatalog.xml @@ -1,6 +1,6 @@ diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml index 273ef16..063743e 100644 --- a/resources/ADAOSchemaCatalog.xml +++ b/resources/ADAOSchemaCatalog.xml @@ -1,6 +1,6 @@ diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index f2697ec..c6aa039 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -1,5 +1,5 @@
@@ -26,7 +26,7 @@ - +
diff --git a/src/daComposant/daCore/AssimilationStudy.py b/src/daComposant/daCore/AssimilationStudy.py index 83302b8..0df9ff1 100644 --- a/src/daComposant/daCore/AssimilationStudy.py +++ b/src/daComposant/daCore/AssimilationStudy.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ Définit les outils généraux élémentaires. diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py index 274482a..d2cd22c 100644 --- a/src/daComposant/daCore/BasicObjects.py +++ b/src/daComposant/daCore/BasicObjects.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ Définit les outils généraux élémentaires. diff --git a/src/daComposant/daCore/Logging.py b/src/daComposant/daCore/Logging.py index b613ff9..84ac561 100644 --- a/src/daComposant/daCore/Logging.py +++ b/src/daComposant/daCore/Logging.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ Ce module permet de mettre en place un logging utilisable partout dans diff --git a/src/daComposant/daCore/Persistence.py b/src/daComposant/daCore/Persistence.py index 1e83433..0a877c9 100644 --- a/src/daComposant/daCore/Persistence.py +++ b/src/daComposant/daCore/Persistence.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ Définit des outils de persistence et d'enregistrement de séries de valeurs diff --git a/src/daComposant/daCore/PlatformInfo.py b/src/daComposant/daCore/PlatformInfo.py index 8441766..3b3061c 100644 --- a/src/daComposant/daCore/PlatformInfo.py +++ b/src/daComposant/daCore/PlatformInfo.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D __doc__ = """ Informations sur le code et la plateforme, et mise à jour des chemins diff --git a/src/daComposant/daCore/__init__.py b/src/daComposant/daCore/__init__.py index 0384387..25c58d2 100644 --- a/src/daComposant/daCore/__init__.py +++ b/src/daComposant/daCore/__init__.py @@ -1,21 +1,21 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py index 16e95e2..560377d 100644 --- a/src/daComposant/daCore/version.py +++ b/src/daComposant/daCore/version.py @@ -1,24 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2012 EDF R&D +# Copyright (C) 2008-2012 EDF R&D # -# 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 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 # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D name = "Data Assimilation Package" version = "0.6.0" diff --git a/src/daSalome/daYacsIntegration/daOptimizerLoop.py b/src/daSalome/daYacsIntegration/daOptimizerLoop.py index 3c75dbf..9d39829 100644 --- a/src/daSalome/daYacsIntegration/daOptimizerLoop.py +++ b/src/daSalome/daYacsIntegration/daOptimizerLoop.py @@ -1,4 +1,5 @@ -#-*- coding: utf-8 -*- +#-*-coding:iso-8859-1-*- +# # Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or @@ -17,7 +18,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D import SALOMERuntime import pilot diff --git a/src/daSalome/daYacsIntegration/daStudy.py b/src/daSalome/daYacsIntegration/daStudy.py index fab87a8..7ab617d 100644 --- a/src/daSalome/daYacsIntegration/daStudy.py +++ b/src/daSalome/daYacsIntegration/daStudy.py @@ -1,4 +1,5 @@ -#-*- coding: utf-8 -*- +#-*-coding:iso-8859-1-*- +# # Copyright (C) 2010-2012 EDF R&D # # This library is free software; you can redistribute it and/or @@ -17,7 +18,7 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# Author: André Ribes, andre.ribes@edf.fr, EDF R&D +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D from daCore.AssimilationStudy import AssimilationStudy from daCore import Logging -- 2.39.2