Correcting date copyright and version name information

diff --git a/doc/conf.py b/doc/conf.py
index aa1efa24c03347c0aea0c50160b26faa250b3184..304be3f98359b066a18fdb7c6ffbe41991941d75 100644 (file)
--- 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.6.0'
+version = '7.main'
 # The full version, including alpha/beta/rc tags.
-release = '6.6.0'
+release = '7.main'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index c6aa0395fdf96671cb72055bdb83b05912c1f0ff..df8cad1f65783caed4c23a71efe128fa1f004ffd 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -26,7 +26,7 @@
     <parameter name="icon"          value="ADAO.png"/>
     <parameter name="library"       value="SalomePyQtGUI"/>
     <parameter name="documentation" value="adao_help"/>
-    <parameter name="version"       value="6.6.0"/>
+    <parameter name="version"       value="7.main"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/daComposant/daAlgorithms/3DVAR.py b/src/daComposant/daAlgorithms/3DVAR.py
index 7650d80082c8ca8c2ef416f47bca2ee37c233f6b..78ca36e5d8f989a3ab53a4207abb1ce2e939f113 100644 (file)
--- a/src/daComposant/daAlgorithms/3DVAR.py
+++ b/src/daComposant/daAlgorithms/3DVAR.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/AdjointTest.py b/src/daComposant/daAlgorithms/AdjointTest.py
index 3a69c974ec56896578a686a031ad78fb753215b5..77849fdcbb0aa840928e8ce95700a47e0f56be77 100644 (file)
--- a/src/daComposant/daAlgorithms/AdjointTest.py
+++ b/src/daComposant/daAlgorithms/AdjointTest.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/Blue.py b/src/daComposant/daAlgorithms/Blue.py
index 79f4d65df55920861f17258ce61227e65c59f7b3..1a5278f9a2fdf90cc16d9c71f040e39b0ec0689a 100644 (file)
--- a/src/daComposant/daAlgorithms/Blue.py
+++ b/src/daComposant/daAlgorithms/Blue.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/EnsembleBlue.py b/src/daComposant/daAlgorithms/EnsembleBlue.py
index 9fc1281f3eba2ebbff542b9dd0c8205098299426..c50f2e19d7dee075eba9a5a0cb2ed21c93cdd9bb 100644 (file)
--- a/src/daComposant/daAlgorithms/EnsembleBlue.py
+++ b/src/daComposant/daAlgorithms/EnsembleBlue.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/GradientTest.py b/src/daComposant/daAlgorithms/GradientTest.py
index b969e3373162f91df89278ecbda1cea3687b14f3..1e574cb8487a29687955e7498f21daf8f9f4a960 100644 (file)
--- a/src/daComposant/daAlgorithms/GradientTest.py
+++ b/src/daComposant/daAlgorithms/GradientTest.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/KalmanFilter.py b/src/daComposant/daAlgorithms/KalmanFilter.py
index f52106652dd247431766c6a296a8cdace9a69839..3cfd1f05d8466a356bc3d6de47904e4aca03191f 100644 (file)
--- a/src/daComposant/daAlgorithms/KalmanFilter.py
+++ b/src/daComposant/daAlgorithms/KalmanFilter.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/LinearLeastSquares.py b/src/daComposant/daAlgorithms/LinearLeastSquares.py
index fa5fccc545036473cc7a3f73d46c63405ee99928..3d59e9e4734dc3eda4b0836688adfc1a95aad0fc 100644 (file)
--- a/src/daComposant/daAlgorithms/LinearLeastSquares.py
+++ b/src/daComposant/daAlgorithms/LinearLeastSquares.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/NonLinearLeastSquares.py b/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
index cfa552c1163185c9e6bd12ceeb4feb87d6fab19b..c325988a5aa6283b208748cb540ebea5eb894919 100644 (file)
--- a/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
+++ b/src/daComposant/daAlgorithms/NonLinearLeastSquares.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
index 56280051cc29a992c01e7449b35b139f981512a7..1c9b86934ec0eba5e52596e3c888c489daeffcc9 100644 (file)
--- a/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
+++ b/src/daComposant/daAlgorithms/ParticleSwarmOptimization.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/QuantileRegression.py b/src/daComposant/daAlgorithms/QuantileRegression.py
index 965c7bcd727c22c140132cb7dbec01d8a4f42577..76743ec3372016c8c2b1129f97e99c39780b05ba 100644 (file)
--- a/src/daComposant/daAlgorithms/QuantileRegression.py
+++ b/src/daComposant/daAlgorithms/QuantileRegression.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daAlgorithms/__init__.py b/src/daComposant/daAlgorithms/__init__.py
index 0384387b8b6098b939d36fdcb1ae51142d5a91e0..246f8b1f1ebbe40d539c9a343ef4fb75cd13527b 100644 (file)
--- a/src/daComposant/daAlgorithms/__init__.py
+++ b/src/daComposant/daAlgorithms/__init__.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daCore/AssimilationStudy.py b/src/daComposant/daCore/AssimilationStudy.py
index c6bde4e438b51d68c9e20d36971a7edd4ce98c82..b415835bf1d1d1704b872e10cc79bdc0363313c7 100644 (file)
--- a/src/daComposant/daCore/AssimilationStudy.py
+++ b/src/daComposant/daCore/AssimilationStudy.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py
index b6c9e68be66530033d19d7ce8bfe5b1fb5a9aeae..bb26ee2251b7cf24d28e4a8d299c8d806fb12205 100644 (file)
--- a/src/daComposant/daCore/BasicObjects.py
+++ b/src/daComposant/daCore/BasicObjects.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/Logging.py b/src/daComposant/daCore/Logging.py
index da4c1c8c6648db2b5aca9f8a88b03c795b6c3e83..d96eea0761d8434414e01f0637c359dd30ce27ee 100644 (file)
--- a/src/daComposant/daCore/Logging.py
+++ b/src/daComposant/daCore/Logging.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/Persistence.py b/src/daComposant/daCore/Persistence.py
index c1b62118916d361e15057ccce781dc5d349a542e..a2a36c2d87b63ed8acd48faddfe0c968d4aecaa0 100644 (file)
--- a/src/daComposant/daCore/Persistence.py
+++ b/src/daComposant/daCore/Persistence.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/PlatformInfo.py b/src/daComposant/daCore/PlatformInfo.py
index 91dfb5f249d62d11556b47ae684a6dc8320b1913..8c030224c892476628332d05dfe1c7339b7d0f39 100644 (file)
--- a/src/daComposant/daCore/PlatformInfo.py
+++ b/src/daComposant/daCore/PlatformInfo.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/__init__.py b/src/daComposant/daCore/__init__.py
index 25c58d2ce0e42cd5195204ecf7eb50858dc44d57..4c3e8ef5f02dd72013207665b4a5b815bd9ac6d4 100644 (file)
--- a/src/daComposant/daCore/__init__.py
+++ b/src/daComposant/daCore/__init__.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py
index 560377d9490d4c162de2f23d08a32e553c13a22e..5f92c1b93d36157e31e491de5f5aebaadadd3d19 100644 (file)
--- a/src/daComposant/daCore/version.py
+++ b/src/daComposant/daCore/version.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2013 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
@@ -21,5 +21,5 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 name    = "Data Assimilation Package"
-version = "0.6.0"
-date    = "jeudi 08 juin 2012, 11:11:11 (UTC+0200)"
+version = "0.7.0"
+date    = "mercredi 12 décembre 2012, 12:12:12 (UTC+0100)"

diff --git a/src/daComposant/daDiagnostics/PlotVector.py b/src/daComposant/daDiagnostics/PlotVector.py
index e6d667d427606c27536a6e977ca924ce1f8a228f..939d268711367b7856b5eb4e450ec62864b1c4db 100644 (file)
--- a/src/daComposant/daDiagnostics/PlotVector.py
+++ b/src/daComposant/daDiagnostics/PlotVector.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daDiagnostics/PlotVectors.py b/src/daComposant/daDiagnostics/PlotVectors.py
index 8cca6f1513f047ca69c8402a48d422b4bb6eb385..d029289216eda59f3a4cd465d691dfabbc89154d 100644 (file)
--- a/src/daComposant/daDiagnostics/PlotVectors.py
+++ b/src/daComposant/daDiagnostics/PlotVectors.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daDiagnostics/RMS.py b/src/daComposant/daDiagnostics/RMS.py
index 6a27f30b447eb7da268a86b292221150220a242e..bba69346ffdfd0ae87964b38292161db59c7cf2b 100644 (file)
--- a/src/daComposant/daDiagnostics/RMS.py
+++ b/src/daComposant/daDiagnostics/RMS.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daDiagnostics/ReduceVariance.py b/src/daComposant/daDiagnostics/ReduceVariance.py
index a0ceacacab6a0ae3f3dc452a0d0b5d6b2e3a51ed..ccd287a76b0be30527131c37a6b95eb94a240ce3 100644 (file)
--- a/src/daComposant/daDiagnostics/ReduceVariance.py
+++ b/src/daComposant/daDiagnostics/ReduceVariance.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daDiagnostics/__init__.py b/src/daComposant/daDiagnostics/__init__.py
index 0384387b8b6098b939d36fdcb1ae51142d5a91e0..246f8b1f1ebbe40d539c9a343ef4fb75cd13527b 100644 (file)
--- a/src/daComposant/daDiagnostics/__init__.py
+++ b/src/daComposant/daDiagnostics/__init__.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daMatrices/__init__.py b/src/daComposant/daMatrices/__init__.py
index 0384387b8b6098b939d36fdcb1ae51142d5a91e0..246f8b1f1ebbe40d539c9a343ef4fb75cd13527b 100644 (file)
--- a/src/daComposant/daMatrices/__init__.py
+++ b/src/daComposant/daMatrices/__init__.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daNumerics/ApproximatedDerivatives.py b/src/daComposant/daNumerics/ApproximatedDerivatives.py
index e53ef3577800895cd471feada2b358d6a9c121bf..9089cb55485592f9b296212e331a7c6e5b829d9e 100644 (file)
--- a/src/daComposant/daNumerics/ApproximatedDerivatives.py
+++ b/src/daComposant/daNumerics/ApproximatedDerivatives.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daNumerics/__init__.py b/src/daComposant/daNumerics/__init__.py
index 0384387b8b6098b939d36fdcb1ae51142d5a91e0..246f8b1f1ebbe40d539c9a343ef4fb75cd13527b 100644 (file)
--- a/src/daComposant/daNumerics/__init__.py
+++ b/src/daComposant/daNumerics/__init__.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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/src/daComposant/daNumerics/mmqr.py b/src/daComposant/daNumerics/mmqr.py
index 551d059e758400f8b58f11cffcdb826dd4750787..1395fcbf5591e70c62a6b239f3bf0b6d1c07204e 100644 (file)
--- a/src/daComposant/daNumerics/mmqr.py
+++ b/src/daComposant/daNumerics/mmqr.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-#  Copyright (C) 2008-2012 EDF R&D
+#  Copyright (C) 2008-2013 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