From 299f2998dfc5e9ee800c40afcb8c12eee94958bf Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Sun, 11 Jan 2015 11:21:55 +0100 Subject: [PATCH] Updating copyright date information and version --- bin/AdaoCatalogGenerator.py | 4 ++- bin/AdaoYacsSchemaCreator.py | 28 +++++++++-------- bin/Makefile.am | 4 ++- bin/module_version.py | 4 ++- bin/qtEficas_adao_study.py.in | 4 ++- configure.ac | 4 ++- doc/Makefile.am | 4 ++- doc/en/Makefile.am | 4 ++- doc/en/advanced.rst | 2 +- doc/en/bibliography.rst | 2 +- doc/en/conf.py | 2 ++ doc/en/examples.rst | 2 +- doc/en/glossary.rst | 2 +- doc/en/index.rst | 2 +- doc/en/intro.rst | 2 +- doc/en/license.rst | 4 +-- doc/en/ref_algorithm_3DVAR.rst | 2 +- doc/en/ref_algorithm_AdjointTest.rst | 2 +- doc/en/ref_algorithm_Blue.rst | 2 +- doc/en/ref_algorithm_EnsembleBlue.rst | 2 +- doc/en/ref_algorithm_ExtendedBlue.rst | 2 +- doc/en/ref_algorithm_ExtendedKalmanFilter.rst | 2 +- doc/en/ref_algorithm_FunctionTest.rst | 2 +- doc/en/ref_algorithm_GradientTest.rst | 2 +- doc/en/ref_algorithm_KalmanFilter.rst | 2 +- doc/en/ref_algorithm_LinearLeastSquares.rst | 2 +- doc/en/ref_algorithm_LinearityTest.rst | 2 +- .../ref_algorithm_NonLinearLeastSquares.rst | 2 +- doc/en/ref_algorithm_ObserverTest.rst | 2 +- ...ef_algorithm_ParticleSwarmOptimization.rst | 2 +- doc/en/ref_algorithm_QuantileRegression.rst | 2 +- doc/en/ref_algorithm_SamplingTest.rst | 2 +- doc/en/ref_algorithm_TangentTest.rst | 2 +- .../ref_algorithm_UnscentedKalmanFilter.rst | 2 +- doc/en/ref_assimilation_keywords.rst | 2 +- doc/en/ref_checking_keywords.rst | 2 +- doc/en/ref_covariance_requirements.rst | 2 +- doc/en/ref_entry_types.rst | 2 +- doc/en/ref_operator_requirements.rst | 8 ++--- doc/en/ref_options_AlgorithmParameters.rst | 2 +- doc/en/ref_output_variables.rst | 28 +++++++++++++++++ doc/en/reference.rst | 12 ++++---- doc/en/theory.rst | 2 +- doc/en/using.rst | 2 +- doc/fr/Makefile.am | 4 ++- doc/fr/advanced.rst | 2 +- doc/fr/bibliography.rst | 2 +- doc/fr/conf.py | 2 ++ doc/fr/examples.rst | 2 +- doc/fr/glossary.rst | 2 +- doc/fr/index.rst | 2 +- doc/fr/intro.rst | 2 +- doc/fr/license.rst | 4 +-- doc/fr/ref_algorithm_3DVAR.rst | 2 +- doc/fr/ref_algorithm_AdjointTest.rst | 2 +- doc/fr/ref_algorithm_Blue.rst | 2 +- doc/fr/ref_algorithm_EnsembleBlue.rst | 2 +- doc/fr/ref_algorithm_ExtendedBlue.rst | 2 +- doc/fr/ref_algorithm_ExtendedKalmanFilter.rst | 2 +- doc/fr/ref_algorithm_FunctionTest.rst | 2 +- doc/fr/ref_algorithm_GradientTest.rst | 2 +- doc/fr/ref_algorithm_KalmanFilter.rst | 2 +- doc/fr/ref_algorithm_LinearLeastSquares.rst | 2 +- doc/fr/ref_algorithm_LinearityTest.rst | 2 +- .../ref_algorithm_NonLinearLeastSquares.rst | 2 +- doc/fr/ref_algorithm_ObserverTest.rst | 2 +- ...ef_algorithm_ParticleSwarmOptimization.rst | 2 +- doc/fr/ref_algorithm_QuantileRegression.rst | 2 +- doc/fr/ref_algorithm_SamplingTest.rst | 2 +- doc/fr/ref_algorithm_TangentTest.rst | 2 +- .../ref_algorithm_UnscentedKalmanFilter.rst | 2 +- doc/fr/ref_assimilation_keywords.rst | 2 +- doc/fr/ref_checking_keywords.rst | 2 +- doc/fr/ref_covariance_requirements.rst | 2 +- doc/fr/ref_entry_types.rst | 2 +- doc/fr/ref_operator_requirements.rst | 12 ++++---- doc/fr/ref_options_AlgorithmParameters.rst | 2 +- doc/fr/ref_output_variables.rst | 28 +++++++++++++++++ doc/fr/reference.rst | 13 ++++---- doc/fr/theory.rst | 2 +- doc/fr/using.rst | 2 +- resources/ADAOCatalog.xml | 4 ++- resources/ADAOSchemaCatalog.xml | 8 +++-- resources/Makefile.am | 4 ++- resources/SalomeApp.xml | 6 ++-- src/Makefile.am | 4 ++- src/daComposant/Makefile.am | 4 ++- src/daEficas/Makefile.am | 4 ++- src/daEficas/__init__.py | 4 ++- src/daEficas/configuration_ADAO.py | 4 ++- src/daEficas/convert_adao.py | 4 ++- src/daEficas/generator_adao.py | 4 ++- src/daEficas/prefs.py | 4 ++- src/daEficas/prefs_ADAO.py.in | 4 ++- src/daSalome/Makefile.am | 4 ++- src/daSalome/daGUI/ADAO.py | 4 ++- src/daSalome/daGUI/ADAOGUI.py | 4 ++- src/daSalome/daGUI/Makefile.am | 4 ++- .../daGUI/daEficasWrapper/Makefile.am | 4 ++- .../daGUI/daEficasWrapper/__init__.py | 4 ++- .../daEficasWrapper/adaoEficasWrapper.py | 28 +++++++++-------- src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py | 28 +++++++++-------- src/daSalome/daGUI/daGuiImpl/Makefile.am | 4 ++- src/daSalome/daGUI/daGuiImpl/__init__.py | 4 ++- src/daSalome/daGUI/daGuiImpl/adaoCase.py | 28 +++++++++-------- src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py | 28 +++++++++-------- .../daGUI/daGuiImpl/adaoGuiManager.py | 28 +++++++++-------- .../daGUI/daGuiImpl/adaoModuleHelper.py | 30 +++++++++---------- .../daGUI/daGuiImpl/adaoStudyEditor.py | 28 +++++++++-------- src/daSalome/daGUI/daUtils/Makefile.am | 4 ++- src/daSalome/daGUI/daUtils/__init__.py | 4 ++- src/daSalome/daGUI/daUtils/adaoEficasEvent.py | 28 +++++++++-------- src/daSalome/daGUI/daUtils/adaoLogger.py | 28 +++++++++-------- src/daSalome/daYacsIntegration/__init__.py | 4 ++- .../daYacsIntegration/daOptimizerLoop.py | 6 ++-- src/daSalome/daYacsIntegration/daStudy.py | 11 ++++++- src/daSalome/daYacsSchemaCreator/__init__.py | 4 ++- .../daYacsSchemaCreator/help_methods.py | 4 ++- .../daYacsSchemaCreator/infos_daComposant.py | 4 ++- src/daSalome/daYacsSchemaCreator/methods.py | 4 ++- src/daSalome/daYacsSchemaCreator/run.py | 4 ++- 121 files changed, 428 insertions(+), 262 deletions(-) create mode 100644 doc/en/ref_output_variables.rst create mode 100644 doc/fr/ref_output_variables.rst diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index fd6fd45..10cc3ab 100644 --- a/bin/AdaoCatalogGenerator.py +++ b/bin/AdaoCatalogGenerator.py @@ -1,6 +1,8 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public diff --git a/bin/AdaoYacsSchemaCreator.py b/bin/AdaoYacsSchemaCreator.py index 372dc06..9ebc5b0 100644 --- a/bin/AdaoYacsSchemaCreator.py +++ b/bin/AdaoYacsSchemaCreator.py @@ -1,22 +1,24 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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, andre.ribes@edf.fr, 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: André Ribes, andre.ribes@edf.fr, EDF R&D import sys import os diff --git a/bin/Makefile.am b/bin/Makefile.am index ffe04d1..493f05d 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/module_version.py b/bin/module_version.py index 3dd2f64..00c041f 100644 --- a/bin/module_version.py +++ b/bin/module_version.py @@ -1,6 +1,8 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2008-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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 922eaf7..617306c 100644 --- a/bin/qtEficas_adao_study.py.in +++ b/bin/qtEficas_adao_study.py.in @@ -1,6 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/configure.ac b/configure.ac index 622ef26..42dacf3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,6 @@ -dnl Copyright (C) 2010-2011 EDF R&D +dnl Copyright (C) 2008-2015 EDF R&D +dnl +dnl This file is part of SALOME ADAO module dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/doc/Makefile.am b/doc/Makefile.am index c659b7f..a377045 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/doc/en/Makefile.am b/doc/en/Makefile.am index d374278..2ca4b2a 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/doc/en/advanced.rst b/doc/en/advanced.rst index 1a5983d..f492e47 100644 --- a/doc/en/advanced.rst +++ b/doc/en/advanced.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/bibliography.rst b/doc/en/bibliography.rst index 8ca8c7e..f6b2ed6 100644 --- a/doc/en/bibliography.rst +++ b/doc/en/bibliography.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/conf.py b/doc/en/conf.py index 2f03a03..fdb5859 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # Copyright (C) 2008-2015 EDF R&D # +# This file is part of SALOME ADAO module +# # 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 diff --git a/doc/en/examples.rst b/doc/en/examples.rst index f962a90..4b4c8b0 100644 --- a/doc/en/examples.rst +++ b/doc/en/examples.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/glossary.rst b/doc/en/glossary.rst index 9de73bf..e91d0a4 100644 --- a/doc/en/glossary.rst +++ b/doc/en/glossary.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/index.rst b/doc/en/index.rst index 5bafebc..4e739cd 100644 --- a/doc/en/index.rst +++ b/doc/en/index.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/intro.rst b/doc/en/intro.rst index 191670f..97c105c 100644 --- a/doc/en/intro.rst +++ b/doc/en/intro.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/license.rst b/doc/en/license.rst index c95f64c..2aa91be 100644 --- a/doc/en/license.rst +++ b/doc/en/license.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -36,7 +36,7 @@ GPL), as stated here and in the source files:: - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 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/doc/en/ref_algorithm_3DVAR.rst b/doc/en/ref_algorithm_3DVAR.rst index b4ac08e..7703fb2 100644 --- a/doc/en/ref_algorithm_3DVAR.rst +++ b/doc/en/ref_algorithm_3DVAR.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_AdjointTest.rst b/doc/en/ref_algorithm_AdjointTest.rst index e7916e8..be09ba9 100644 --- a/doc/en/ref_algorithm_AdjointTest.rst +++ b/doc/en/ref_algorithm_AdjointTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_Blue.rst b/doc/en/ref_algorithm_Blue.rst index 25275a4..3e9baf2 100644 --- a/doc/en/ref_algorithm_Blue.rst +++ b/doc/en/ref_algorithm_Blue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_EnsembleBlue.rst b/doc/en/ref_algorithm_EnsembleBlue.rst index 9ec4bbf..51e9dbb 100644 --- a/doc/en/ref_algorithm_EnsembleBlue.rst +++ b/doc/en/ref_algorithm_EnsembleBlue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_ExtendedBlue.rst b/doc/en/ref_algorithm_ExtendedBlue.rst index 5c3c3c4..ad5bf76 100644 --- a/doc/en/ref_algorithm_ExtendedBlue.rst +++ b/doc/en/ref_algorithm_ExtendedBlue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_ExtendedKalmanFilter.rst b/doc/en/ref_algorithm_ExtendedKalmanFilter.rst index 60586e5..98a1705 100644 --- a/doc/en/ref_algorithm_ExtendedKalmanFilter.rst +++ b/doc/en/ref_algorithm_ExtendedKalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_FunctionTest.rst b/doc/en/ref_algorithm_FunctionTest.rst index 7411e49..1b74e3b 100644 --- a/doc/en/ref_algorithm_FunctionTest.rst +++ b/doc/en/ref_algorithm_FunctionTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_GradientTest.rst b/doc/en/ref_algorithm_GradientTest.rst index 99fe344..e588a06 100644 --- a/doc/en/ref_algorithm_GradientTest.rst +++ b/doc/en/ref_algorithm_GradientTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_KalmanFilter.rst b/doc/en/ref_algorithm_KalmanFilter.rst index ee5e0df..a936a96 100644 --- a/doc/en/ref_algorithm_KalmanFilter.rst +++ b/doc/en/ref_algorithm_KalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_LinearLeastSquares.rst b/doc/en/ref_algorithm_LinearLeastSquares.rst index a0863ec..27be406 100644 --- a/doc/en/ref_algorithm_LinearLeastSquares.rst +++ b/doc/en/ref_algorithm_LinearLeastSquares.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_LinearityTest.rst b/doc/en/ref_algorithm_LinearityTest.rst index 91323e7..ab7657e 100644 --- a/doc/en/ref_algorithm_LinearityTest.rst +++ b/doc/en/ref_algorithm_LinearityTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_NonLinearLeastSquares.rst b/doc/en/ref_algorithm_NonLinearLeastSquares.rst index 5130425..8b89cc0 100644 --- a/doc/en/ref_algorithm_NonLinearLeastSquares.rst +++ b/doc/en/ref_algorithm_NonLinearLeastSquares.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_ObserverTest.rst b/doc/en/ref_algorithm_ObserverTest.rst index a75d907..b840a97 100644 --- a/doc/en/ref_algorithm_ObserverTest.rst +++ b/doc/en/ref_algorithm_ObserverTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_ParticleSwarmOptimization.rst b/doc/en/ref_algorithm_ParticleSwarmOptimization.rst index e1c48da..bfb6389 100644 --- a/doc/en/ref_algorithm_ParticleSwarmOptimization.rst +++ b/doc/en/ref_algorithm_ParticleSwarmOptimization.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_QuantileRegression.rst b/doc/en/ref_algorithm_QuantileRegression.rst index 93d3b6f..8876d57 100644 --- a/doc/en/ref_algorithm_QuantileRegression.rst +++ b/doc/en/ref_algorithm_QuantileRegression.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_SamplingTest.rst b/doc/en/ref_algorithm_SamplingTest.rst index 31c2e36..48f51f3 100644 --- a/doc/en/ref_algorithm_SamplingTest.rst +++ b/doc/en/ref_algorithm_SamplingTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_TangentTest.rst b/doc/en/ref_algorithm_TangentTest.rst index a1daea7..db6f79f 100644 --- a/doc/en/ref_algorithm_TangentTest.rst +++ b/doc/en/ref_algorithm_TangentTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_algorithm_UnscentedKalmanFilter.rst b/doc/en/ref_algorithm_UnscentedKalmanFilter.rst index 1b782c9..d032968 100644 --- a/doc/en/ref_algorithm_UnscentedKalmanFilter.rst +++ b/doc/en/ref_algorithm_UnscentedKalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_assimilation_keywords.rst b/doc/en/ref_assimilation_keywords.rst index d1322cd..f0a8c70 100644 --- a/doc/en/ref_assimilation_keywords.rst +++ b/doc/en/ref_assimilation_keywords.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_checking_keywords.rst b/doc/en/ref_checking_keywords.rst index fa53367..4eabc70 100644 --- a/doc/en/ref_checking_keywords.rst +++ b/doc/en/ref_checking_keywords.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_covariance_requirements.rst b/doc/en/ref_covariance_requirements.rst index 30c7464..a6b33bc 100644 --- a/doc/en/ref_covariance_requirements.rst +++ b/doc/en/ref_covariance_requirements.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_entry_types.rst b/doc/en/ref_entry_types.rst index 683b354..55d898e 100644 --- a/doc/en/ref_entry_types.rst +++ b/doc/en/ref_entry_types.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_operator_requirements.rst b/doc/en/ref_operator_requirements.rst index 120edcb..e48c3ce 100644 --- a/doc/en/ref_operator_requirements.rst +++ b/doc/en/ref_operator_requirements.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -109,7 +109,7 @@ operator implementation. **Important warning:** the name "*DirectOperator*" is mandatory, and the type of the ``X`` argument can be either a list, a numpy array or a numpy 1D-matrix. The -user has to treat these cases in his function. +user function has to accept and treat all these cases. Second functional form: using "*ScriptWithFunctions*" +++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -250,8 +250,8 @@ generic form of the incremental model is slightly modified as follows: .. math:: \mathbf{y} = O( \mathbf{x}, \mathbf{u}) -where :math:`\mathbf{u}` is the control over one state increment. In this case, -the direct operator has to be applied to a pair of variables :math:`(X,U)`. +where :math:`\mathbf{u}` is the control over one state increment. In fact, the +direct operator has to be applied to a pair of variables :math:`(X,U)`. Schematically, the operator has to be set as:: def DirectOperator( (X, U) ): diff --git a/doc/en/ref_options_AlgorithmParameters.rst b/doc/en/ref_options_AlgorithmParameters.rst index bfbc922..58ea894 100644 --- a/doc/en/ref_options_AlgorithmParameters.rst +++ b/doc/en/ref_options_AlgorithmParameters.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/ref_output_variables.rst b/doc/en/ref_output_variables.rst new file mode 100644 index 0000000..2f42cbf --- /dev/null +++ b/doc/en/ref_output_variables.rst @@ -0,0 +1,28 @@ +.. + Copyright (C) 2008-2015 EDF R&D + + This file is part of SALOME ADAO module. + + 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, or (at your option) any later version. + + 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 + + See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + + Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +.. _section_ref_output_variables: + +Variables and informations available in output +---------------------------------------------- + diff --git a/doc/en/reference.rst b/doc/en/reference.rst index c9285a0..845f14b 100644 --- a/doc/en/reference.rst +++ b/doc/en/reference.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -44,12 +44,13 @@ are automatically correct. .. _section_reference_entry: ======================================================================================== -**[DocR]** General entries, functions and matrices +**[DocR]** General entries and outputs, functions and matrices ======================================================================================== -This section describes in general the different possible entry types, and the -functional or matrix forms that can be used. The mathematical notations used -afterwards are explained in the section :ref:`section_theory`. +This section describes in general the different possibilities of entry types and +output variables, and the functional or matrix forms that can be used. The +mathematical notations used afterwards are explained in the section +:ref:`section_theory`. .. toctree:: :maxdepth: 1 @@ -58,6 +59,7 @@ afterwards are explained in the section :ref:`section_theory`. ref_options_AlgorithmParameters ref_operator_requirements ref_covariance_requirements + ref_output_variables .. _section_reference_assimilation: diff --git a/doc/en/theory.rst b/doc/en/theory.rst index 819626f..03f2222 100644 --- a/doc/en/theory.rst +++ b/doc/en/theory.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/en/using.rst b/doc/en/using.rst index 9ea6fe6..629b860 100644 --- a/doc/en/using.rst +++ b/doc/en/using.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 4e18530..323ad7e 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/doc/fr/advanced.rst b/doc/fr/advanced.rst index 7e14374..c57762d 100644 --- a/doc/fr/advanced.rst +++ b/doc/fr/advanced.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/bibliography.rst b/doc/fr/bibliography.rst index 9740a92..f3b2a44 100644 --- a/doc/fr/bibliography.rst +++ b/doc/fr/bibliography.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/conf.py b/doc/fr/conf.py index cd37f3a..7bd55ff 100644 --- a/doc/fr/conf.py +++ b/doc/fr/conf.py @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # Copyright (C) 2008-2015 EDF R&D # +# This file is part of SALOME ADAO module +# # 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 diff --git a/doc/fr/examples.rst b/doc/fr/examples.rst index 38bde56..64f0a44 100644 --- a/doc/fr/examples.rst +++ b/doc/fr/examples.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/glossary.rst b/doc/fr/glossary.rst index caaaf32..d10ee19 100644 --- a/doc/fr/glossary.rst +++ b/doc/fr/glossary.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/index.rst b/doc/fr/index.rst index 45b5913..887eea5 100644 --- a/doc/fr/index.rst +++ b/doc/fr/index.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/intro.rst b/doc/fr/intro.rst index 955bed2..02ead27 100644 --- a/doc/fr/intro.rst +++ b/doc/fr/intro.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/license.rst b/doc/fr/license.rst index d48a55b..640f824 100644 --- a/doc/fr/license.rst +++ b/doc/fr/license.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -36,7 +36,7 @@ tel qu'il est d - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 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/doc/fr/ref_algorithm_3DVAR.rst b/doc/fr/ref_algorithm_3DVAR.rst index 66e2861..0f56081 100644 --- a/doc/fr/ref_algorithm_3DVAR.rst +++ b/doc/fr/ref_algorithm_3DVAR.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_AdjointTest.rst b/doc/fr/ref_algorithm_AdjointTest.rst index 5bee55f..6abff76 100644 --- a/doc/fr/ref_algorithm_AdjointTest.rst +++ b/doc/fr/ref_algorithm_AdjointTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_Blue.rst b/doc/fr/ref_algorithm_Blue.rst index 2729882..6a7b0d3 100644 --- a/doc/fr/ref_algorithm_Blue.rst +++ b/doc/fr/ref_algorithm_Blue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_EnsembleBlue.rst b/doc/fr/ref_algorithm_EnsembleBlue.rst index 8e8246d..c1130ce 100644 --- a/doc/fr/ref_algorithm_EnsembleBlue.rst +++ b/doc/fr/ref_algorithm_EnsembleBlue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_ExtendedBlue.rst b/doc/fr/ref_algorithm_ExtendedBlue.rst index 65d730e..33a4109 100644 --- a/doc/fr/ref_algorithm_ExtendedBlue.rst +++ b/doc/fr/ref_algorithm_ExtendedBlue.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst b/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst index 61233c5..aac32ed 100644 --- a/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst +++ b/doc/fr/ref_algorithm_ExtendedKalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_FunctionTest.rst b/doc/fr/ref_algorithm_FunctionTest.rst index 7827476..7e42b2b 100644 --- a/doc/fr/ref_algorithm_FunctionTest.rst +++ b/doc/fr/ref_algorithm_FunctionTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_GradientTest.rst b/doc/fr/ref_algorithm_GradientTest.rst index 747f9b3..5a555ec 100644 --- a/doc/fr/ref_algorithm_GradientTest.rst +++ b/doc/fr/ref_algorithm_GradientTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_KalmanFilter.rst b/doc/fr/ref_algorithm_KalmanFilter.rst index aa427f5..c124450 100644 --- a/doc/fr/ref_algorithm_KalmanFilter.rst +++ b/doc/fr/ref_algorithm_KalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_LinearLeastSquares.rst b/doc/fr/ref_algorithm_LinearLeastSquares.rst index 36e36fc..ee2183b 100644 --- a/doc/fr/ref_algorithm_LinearLeastSquares.rst +++ b/doc/fr/ref_algorithm_LinearLeastSquares.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_LinearityTest.rst b/doc/fr/ref_algorithm_LinearityTest.rst index f3b3c4b..e399dce 100644 --- a/doc/fr/ref_algorithm_LinearityTest.rst +++ b/doc/fr/ref_algorithm_LinearityTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_NonLinearLeastSquares.rst b/doc/fr/ref_algorithm_NonLinearLeastSquares.rst index 8723db7..81f8561 100644 --- a/doc/fr/ref_algorithm_NonLinearLeastSquares.rst +++ b/doc/fr/ref_algorithm_NonLinearLeastSquares.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_ObserverTest.rst b/doc/fr/ref_algorithm_ObserverTest.rst index 5ff94cf..83242c8 100644 --- a/doc/fr/ref_algorithm_ObserverTest.rst +++ b/doc/fr/ref_algorithm_ObserverTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst b/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst index d02eada..ba7901c 100644 --- a/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst +++ b/doc/fr/ref_algorithm_ParticleSwarmOptimization.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_QuantileRegression.rst b/doc/fr/ref_algorithm_QuantileRegression.rst index 25027cc..39b1199 100644 --- a/doc/fr/ref_algorithm_QuantileRegression.rst +++ b/doc/fr/ref_algorithm_QuantileRegression.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_SamplingTest.rst b/doc/fr/ref_algorithm_SamplingTest.rst index d3ed4fa..1046e21 100644 --- a/doc/fr/ref_algorithm_SamplingTest.rst +++ b/doc/fr/ref_algorithm_SamplingTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_TangentTest.rst b/doc/fr/ref_algorithm_TangentTest.rst index d665d1f..f421120 100644 --- a/doc/fr/ref_algorithm_TangentTest.rst +++ b/doc/fr/ref_algorithm_TangentTest.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst b/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst index b9b08ac..f3ab792 100644 --- a/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst +++ b/doc/fr/ref_algorithm_UnscentedKalmanFilter.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_assimilation_keywords.rst b/doc/fr/ref_assimilation_keywords.rst index 3589e52..fb237dd 100644 --- a/doc/fr/ref_assimilation_keywords.rst +++ b/doc/fr/ref_assimilation_keywords.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_checking_keywords.rst b/doc/fr/ref_checking_keywords.rst index faa3444..7ef59f9 100644 --- a/doc/fr/ref_checking_keywords.rst +++ b/doc/fr/ref_checking_keywords.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_covariance_requirements.rst b/doc/fr/ref_covariance_requirements.rst index 81538ca..639c061 100644 --- a/doc/fr/ref_covariance_requirements.rst +++ b/doc/fr/ref_covariance_requirements.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_entry_types.rst b/doc/fr/ref_entry_types.rst index 20affed..df60337 100644 --- a/doc/fr/ref_entry_types.rst +++ b/doc/fr/ref_entry_types.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_operator_requirements.rst b/doc/fr/ref_operator_requirements.rst index 6934e42..5f1698f 100644 --- a/doc/fr/ref_operator_requirements.rst +++ b/doc/fr/ref_operator_requirements.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -113,8 +113,8 @@ forme fonctionnelle avant son usage dans un cas ADAO, r complexité de l'implémentation de l'opérateur. **Avertissement important :** le nom "*DirectOperator*" est obligatoire, et le -type de l'argument X peut être une liste, un vecteur ou une matrice Numpy. -L'utilisateur doit traiter ces cas dans sa fonction. +type de l'argument ``X`` peut être une liste, un vecteur ou une matrice Numpy. +La fonction utilisateur doit accepter et traiter tous ces cas. Seconde forme fonctionnelle : utiliser "*ScriptWithFunctions*" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -170,7 +170,7 @@ doit renvoyer la matrice associ **Avertissement important :** les noms "*DirectOperator*", "*TangentOperator*" et "*AdjointOperator*" sont obligatoires, et le type des arguments ``X``, ``Y``, ``dX`` peut être une liste, un vecteur ou une matrice Numpy. -L'utilisateur doit traiter ces cas dans ses fonctions. +La fonction utilisateur doit accepter et traiter tous ces cas. Troisième forme fonctionnelle : utiliser "*ScriptWithSwitch*" +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -260,9 +260,9 @@ forme g .. math:: \mathbf{y} = O( \mathbf{x}, \mathbf{u}) -où :math:`\mathbf{u}` est le contrôle sur l'incrément d'état. Dans ce cas, +où :math:`\mathbf{u}` est le contrôle sur l'incrément d'état. En effet, l'opérateur direct doit être appliqué à une paire de variables :math:`(X,U)`. -Schématiquement, l'opérateur doit être constuit comme suit:: +Schématiquement, l'opérateur doit être construit comme suit:: def DirectOperator( (X, U) ): """ Opérateur direct de simulation non-linéaire """ diff --git a/doc/fr/ref_options_AlgorithmParameters.rst b/doc/fr/ref_options_AlgorithmParameters.rst index 87173eb..919fd28 100644 --- a/doc/fr/ref_options_AlgorithmParameters.rst +++ b/doc/fr/ref_options_AlgorithmParameters.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/ref_output_variables.rst b/doc/fr/ref_output_variables.rst new file mode 100644 index 0000000..2e58182 --- /dev/null +++ b/doc/fr/ref_output_variables.rst @@ -0,0 +1,28 @@ +.. + Copyright (C) 2008-2015 EDF R&D + + This file is part of SALOME ADAO module. + + 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, or (at your option) any later version. + + 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 + + See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + + Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +.. _section_ref_output_variables: + +Variables et informations disponibles en sortie +----------------------------------------------- + diff --git a/doc/fr/reference.rst b/doc/fr/reference.rst index 8818eb3..2ff6066 100644 --- a/doc/fr/reference.rst +++ b/doc/fr/reference.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. @@ -45,13 +45,13 @@ l'aide de l'interface graphique sont automatiquement correctes. .. _section_reference_entry: ======================================================================================== -**[DocR]** Entrées générales, fonctions et matrices +**[DocR]** Entrées et sorties générales, fonctions et matrices ======================================================================================== -Cette section décrit de manière générale les différents types d'entrées -possibles, et les formes fonctionnelles ou matricielles que l'on peut utiliser. -Les notations mathématiques utilisées sont expliquées dans la section -:ref:`section_theory`. +Cette section décrit de manière générale les différentes possibilités de types +d'entrées et de variables de sortie, et les formes fonctionnelles ou +matricielles que l'on peut utiliser. Les notations mathématiques utilisées sont +expliquées dans la section :ref:`section_theory`. .. toctree:: :maxdepth: 1 @@ -60,6 +60,7 @@ Les notations math ref_options_AlgorithmParameters ref_operator_requirements ref_covariance_requirements + ref_output_variables .. _section_reference_assimilation: diff --git a/doc/fr/theory.rst b/doc/fr/theory.rst index 66197a0..cc947bd 100644 --- a/doc/fr/theory.rst +++ b/doc/fr/theory.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/doc/fr/using.rst b/doc/fr/using.rst index a0319da..78153c6 100644 --- a/doc/fr/using.rst +++ b/doc/fr/using.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2008-2014 EDF R&D + Copyright (C) 2008-2015 EDF R&D This file is part of SALOME ADAO module. diff --git a/resources/ADAOCatalog.xml b/resources/ADAOCatalog.xml index 76a523c..876d74d 100644 --- a/resources/ADAOCatalog.xml +++ b/resources/ADAOCatalog.xml @@ -1,6 +1,8 @@ diff --git a/src/Makefile.am b/src/Makefile.am index aedf418..d7491ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daComposant/Makefile.am b/src/daComposant/Makefile.am index d7a9eb5..57f88ae 100644 --- a/src/daComposant/Makefile.am +++ b/src/daComposant/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2011 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/Makefile.am b/src/daEficas/Makefile.am index 59472a6..c0181fe 100644 --- a/src/daEficas/Makefile.am +++ b/src/daEficas/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/__init__.py b/src/daEficas/__init__.py index 287088f..4723adf 100644 --- a/src/daEficas/__init__.py +++ b/src/daEficas/__init__.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/configuration_ADAO.py b/src/daEficas/configuration_ADAO.py index 53684bc..58cef68 100644 --- a/src/daEficas/configuration_ADAO.py +++ b/src/daEficas/configuration_ADAO.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/convert_adao.py b/src/daEficas/convert_adao.py index e184aa0..877b2ed 100644 --- a/src/daEficas/convert_adao.py +++ b/src/daEficas/convert_adao.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/generator_adao.py b/src/daEficas/generator_adao.py index 713c3fe..3a24399 100644 --- a/src/daEficas/generator_adao.py +++ b/src/daEficas/generator_adao.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/prefs.py b/src/daEficas/prefs.py index 8a6e67c..b948797 100644 --- a/src/daEficas/prefs.py +++ b/src/daEficas/prefs.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2010-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daEficas/prefs_ADAO.py.in b/src/daEficas/prefs_ADAO.py.in index 0ec19ec..9920c74 100644 --- a/src/daEficas/prefs_ADAO.py.in +++ b/src/daEficas/prefs_ADAO.py.in @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/Makefile.am b/src/daSalome/Makefile.am index fc6edc1..cf53cac 100644 --- a/src/daSalome/Makefile.am +++ b/src/daSalome/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/ADAO.py b/src/daSalome/daGUI/ADAO.py index 3deb3e1..1cfb6d6 100644 --- a/src/daSalome/daGUI/ADAO.py +++ b/src/daSalome/daGUI/ADAO.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/ADAOGUI.py b/src/daSalome/daGUI/ADAOGUI.py index 11cf8a1..921999c 100644 --- a/src/daSalome/daGUI/ADAOGUI.py +++ b/src/daSalome/daGUI/ADAOGUI.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/Makefile.am b/src/daSalome/daGUI/Makefile.am index c3c2cd5..7fcb63e 100644 --- a/src/daSalome/daGUI/Makefile.am +++ b/src/daSalome/daGUI/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daEficasWrapper/Makefile.am b/src/daSalome/daGUI/daEficasWrapper/Makefile.am index f0b3881..47db366 100644 --- a/src/daSalome/daGUI/daEficasWrapper/Makefile.am +++ b/src/daSalome/daGUI/daEficasWrapper/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daEficasWrapper/__init__.py b/src/daSalome/daGUI/daEficasWrapper/__init__.py index 3607937..e8c431a 100644 --- a/src/daSalome/daGUI/daEficasWrapper/__init__.py +++ b/src/daSalome/daGUI/daEficasWrapper/__init__.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py index 2440876..39780da 100644 --- a/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py +++ b/src/daSalome/daGUI/daEficasWrapper/adaoEficasWrapper.py @@ -1,21 +1,23 @@ #-*-coding:iso-8859-1-*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # import sys diff --git a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py index ded156a..90f9141 100644 --- a/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py +++ b/src/daSalome/daGUI/daGuiImpl/ADAOGUI_impl.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # __author__="aribes/gboulant" diff --git a/src/daSalome/daGUI/daGuiImpl/Makefile.am b/src/daSalome/daGUI/daGuiImpl/Makefile.am index b892a38..ec6fe4f 100644 --- a/src/daSalome/daGUI/daGuiImpl/Makefile.am +++ b/src/daSalome/daGUI/daGuiImpl/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daGuiImpl/__init__.py b/src/daSalome/daGUI/daGuiImpl/__init__.py index 3607937..e8c431a 100644 --- a/src/daSalome/daGUI/daGuiImpl/__init__.py +++ b/src/daSalome/daGUI/daGuiImpl/__init__.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py index b98b13e..5a2c9b9 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # import os diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py index a322cf9..0b45b48 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiHelper.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # __author__="aribes/gboulant" diff --git a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py index 5c9bb58..1f43347 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoGuiManager.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # """ diff --git a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py index 958a1ba..508902f 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoModuleHelper.py @@ -1,24 +1,24 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # -# 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 # __all__ = [ diff --git a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py index 3730ee8..d2340d0 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoStudyEditor.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # __author__="aribes/gboulant" diff --git a/src/daSalome/daGUI/daUtils/Makefile.am b/src/daSalome/daGUI/daUtils/Makefile.am index 311e4bd..11055b2 100644 --- a/src/daSalome/daGUI/daUtils/Makefile.am +++ b/src/daSalome/daGUI/daUtils/Makefile.am @@ -1,4 +1,6 @@ -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daUtils/__init__.py b/src/daSalome/daGUI/daUtils/__init__.py index 3607937..e8c431a 100644 --- a/src/daSalome/daGUI/daUtils/__init__.py +++ b/src/daSalome/daGUI/daUtils/__init__.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daGUI/daUtils/adaoEficasEvent.py b/src/daSalome/daGUI/daUtils/adaoEficasEvent.py index 229342e..f025475 100644 --- a/src/daSalome/daGUI/daUtils/adaoEficasEvent.py +++ b/src/daSalome/daGUI/daUtils/adaoEficasEvent.py @@ -1,21 +1,23 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # __author__="André Ribes - EDF R&D" diff --git a/src/daSalome/daGUI/daUtils/adaoLogger.py b/src/daSalome/daGUI/daUtils/adaoLogger.py index cdabea8..5dcf951 100644 --- a/src/daSalome/daGUI/daUtils/adaoLogger.py +++ b/src/daSalome/daGUI/daUtils/adaoLogger.py @@ -1,21 +1,23 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 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 file is part of SALOME ADAO module # -# 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 Lesser 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. # -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# 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 # from salome.kernel.logger import Logger diff --git a/src/daSalome/daYacsIntegration/__init__.py b/src/daSalome/daYacsIntegration/__init__.py index e8c825b..2ff489b 100644 --- a/src/daSalome/daYacsIntegration/__init__.py +++ b/src/daSalome/daYacsIntegration/__init__.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daYacsIntegration/daOptimizerLoop.py b/src/daSalome/daYacsIntegration/daOptimizerLoop.py index 9b91b29..ef1ddee 100644 --- a/src/daSalome/daYacsIntegration/daOptimizerLoop.py +++ b/src/daSalome/daYacsIntegration/daOptimizerLoop.py @@ -1,6 +1,8 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -289,7 +291,7 @@ class AssimilationAlgorithm_asynch(SALOMERuntime.OptimizerAlgASync): raise ValueError("\n\n Handling internal error in study exchange (message: \"%s\").\n The case is probably too big (bigger than the physical plus the virtual memory available).\n Try if possible to store the covariance matrices in sparse format.\n"%(str(e),)) #print "[Debug] da_study is ", self.da_study self.da_study.initAlgorithm() - self.ADD = self.da_study.getAssimilationStudy() + self.ADD = self.da_study.getResults() def startToTakeDecision(self): # print "Algorithme startToTakeDecision" diff --git a/src/daSalome/daYacsIntegration/daStudy.py b/src/daSalome/daYacsIntegration/daStudy.py index 755bf94..c25b454 100644 --- a/src/daSalome/daYacsIntegration/daStudy.py +++ b/src/daSalome/daYacsIntegration/daStudy.py @@ -1,6 +1,8 @@ #-*-coding:iso-8859-1-*- # -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -85,7 +87,14 @@ class daStudy: #-------------------------------------- + def __dir__(self): + return ['getResults', '__doc__', '__init__', '__module__'] + def getAssimilationStudy(self): + # Ancien appel a resorber + return self.ADD + + def getResults(self): return self.ADD #-------------------------------------- diff --git a/src/daSalome/daYacsSchemaCreator/__init__.py b/src/daSalome/daYacsSchemaCreator/__init__.py index c4bd166..a88cb1b 100644 --- a/src/daSalome/daYacsSchemaCreator/__init__.py +++ b/src/daSalome/daYacsSchemaCreator/__init__.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daYacsSchemaCreator/help_methods.py b/src/daSalome/daYacsSchemaCreator/help_methods.py index 2e029dd..09d7726 100644 --- a/src/daSalome/daYacsSchemaCreator/help_methods.py +++ b/src/daSalome/daYacsSchemaCreator/help_methods.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py index b892573..012e9cd 100644 --- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py +++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py index 6aa2a2a..98b568d 100644 --- a/src/daSalome/daYacsSchemaCreator/methods.py +++ b/src/daSalome/daYacsSchemaCreator/methods.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # 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/src/daSalome/daYacsSchemaCreator/run.py b/src/daSalome/daYacsSchemaCreator/run.py index f14cf9c..6316dc4 100644 --- a/src/daSalome/daYacsSchemaCreator/run.py +++ b/src/daSalome/daYacsSchemaCreator/run.py @@ -1,5 +1,7 @@ #-*- coding: utf-8 -*- -# Copyright (C) 2010-2014 EDF R&D +# Copyright (C) 2008-2015 EDF R&D +# +# This file is part of SALOME ADAO module # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -- 2.39.2