From cf221459e766eeb7130ef4804e2c9e80a9df27b8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Thu, 12 Apr 2018 22:20:18 +0200 Subject: [PATCH] Updating COPYING/LICENSE archiving --- LICENCE => COPYING | 0 README | 57 +++++++++++++++++++++++++++++++ doc/en/license.rst | 5 +-- doc/fr/license.rst | 5 +-- src/daComposant/daCore/version.py | 2 +- 5 files changed, 64 insertions(+), 5 deletions(-) rename LICENCE => COPYING (100%) diff --git a/LICENCE b/COPYING similarity index 100% rename from LICENCE rename to COPYING diff --git a/README b/README index e69de29..7e48f2e 100644 --- a/README +++ b/README @@ -0,0 +1,57 @@ +================================================================================ +ADAO, a module for Data Assimilation and Optimization +================================================================================ + +About +===== + +The ADAO module provides data assimilation and optimization features in SALOME +context or alone. Briefly stated, Data Assimilation is a methodological +framework to compute the optimal estimate of the inaccessible true value of a +system state over time. It uses information coming from experimental +measurements or observations, and from numerical *a priori* models, including +information about their errors. Parts of the framework are also known under the +names of *parameter estimation*, *inverse problems*, *Bayesian estimation*, +*optimal interpolation*, etc. + +License and requirements +======================== + +The license for this module is the GNU Lesser General Public License (Lesser +GPL), as stated here and in the source files:: + + + + Copyright (C) 2008-2018 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, 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 + +In addition, we require that all publication or presentation describing work +using this software, or all commercial or not products using it, quote at least +one of the references given below: + + * *ADAO, a module for Data Assimilation and Optimization*, + http://www.salome-platform.org/ + + * *ADAO, un module pour l'Assimilation de Données et l'Aide à + l'Optimisation*, http://www.salome-platform.org/ + + * *SALOME The Open Source Integration Platform for Numerical Simulation*, + http://www.salome-platform.org/ + +The documentation of the module is also covered by the license and the +requirement of quoting. diff --git a/doc/en/license.rst b/doc/en/license.rst index 3582fe9..670950c 100644 --- a/doc/en/license.rst +++ b/doc/en/license.rst @@ -24,9 +24,10 @@ .. _section_license: ================================================================================ -License and requirements for the module +License and requirements ================================================================================ +.. index:: single: COPYING .. index:: single: LICENSE .. index:: single: SALOME .. index:: single: ADAO @@ -34,7 +35,7 @@ License and requirements for the module The license for this module is the GNU Lesser General Public License (Lesser GPL), as stated here and in the source files:: - + Copyright (C) 2008-2018 EDF R&D diff --git a/doc/fr/license.rst b/doc/fr/license.rst index efce1fd..fc7451d 100644 --- a/doc/fr/license.rst +++ b/doc/fr/license.rst @@ -24,9 +24,10 @@ .. _section_license: ================================================================================ -Licence et conditions d'utilisation pour le module +Licence et conditions d'utilisation ================================================================================ +.. index:: single: COPYING .. index:: single: LICENCE .. index:: single: SALOME .. index:: single: ADAO @@ -34,7 +35,7 @@ Licence et conditions d'utilisation pour le module La licence pour ce module est la GNU Lesser General Public License (Lesser GPL), tel qu'il est déclaré ici et dans les fichiers sources:: - + Copyright (C) 2008-2018 EDF R&D diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py index 7e5bccf..eda5111 100644 --- a/src/daComposant/daCore/version.py +++ b/src/daComposant/daCore/version.py @@ -26,6 +26,6 @@ __author__ = "Jean-Philippe ARGAUD" __all__ = [] -name = "Data Assimilation Package" +name = "ADAO, a module for Data Assimilation and Optimization" version = "8.5.0" date = "mardi 27 mars 2018, 12:12:12 (UTC+0100)" -- 2.39.2