Bibliography complement

diff --git a/doc/en/bibliography.rst b/doc/en/bibliography.rst
index 6b6c6e5278ef770427d16a22219af3c854e3fcfc..4cfe7cbef84bee3139acd58c1646198fcfe97ff4 100644 (file)
--- a/doc/en/bibliography.rst
+++ b/doc/en/bibliography.rst
@@ -16,6 +16,8 @@ Bibliography
 
 .. [Kalnay03] Kalnay E., *Atmospheric Modeling, Data Assimilation and Predictability*, Cambridge University Press, 2003
 
+.. [Morales11] Morales J.L., Nocedal J., *L-BFGS-B: Remark on Algorithm 778: L-BFGS-B, FORTRAN routines for large scale bound constrained optimization*, ACM Transactions on Mathematical Software, Vol 38(1), 2011
+
 .. [Salome] *SALOME The Open Source Integration Platform for Numerical Simulation*, http://www.salome-platform.org/
 
 .. [Tarantola87] Tarantola A., *Inverse Problem: Theory Methods for Data Fitting and Parameter Estimation*, Elsevier, 1987

diff --git a/doc/en/reference.rst b/doc/en/reference.rst
index eb64f0ffcf8affd0494a942eee4d08589f2244bc..42a8c9a99c2ae92a9d5ea54e750ea1d5297cae93 100644 (file)
--- a/doc/en/reference.rst
+++ b/doc/en/reference.rst
@@ -353,12 +353,12 @@ acronyms or particular names can be found in the :ref:`genindex` or the
     "ObservationOperator"*
 
   Minimizer
-    This key allows to choose the optimization minimizer. The default choice
-    is "LBFGSB", and the possible ones are "LBFGSB" (nonlinear constrained
-    minimizer, see [Byrd95]_ and [Zhu97]_), "TNC" (nonlinear constrained
-    minimizer), "CG" (nonlinear unconstrained minimizer), "BFGS" (nonlinear
-    unconstrained minimizer), "NCG" (Newton CG minimizer). It is recommended to
-    stay with the default.
+    This key allows to choose the optimization minimizer. The default choice is
+    "LBFGSB", and the possible ones are "LBFGSB" (nonlinear constrained
+    minimizer, see [Byrd95]_, [Morales11]_ and [Zhu97]_), "TNC" (nonlinear
+    constrained minimizer), "CG" (nonlinear unconstrained minimizer), "BFGS"
+    (nonlinear unconstrained minimizer), "NCG" (Newton CG minimizer). It is
+    recommended to stay with the default.
 
   Bounds
     This key allows to define upper and lower bounds for every state variable
@@ -418,10 +418,10 @@ acronyms or particular names can be found in the :ref:`genindex` or the
   Minimizer
     This key allows to choose the optimization minimizer. The default choice is
     "LBFGSB", and the possible ones are "LBFGSB" (nonlinear constrained
-    minimizer, see [Byrd95]_ and [Zhu97]_), "TNC" (nonlinear constrained
-    minimizer), "CG" (nonlinear unconstrained minimizer), "BFGS" (nonlinear
-    unconstrained minimizer), "NCG" (Newton CG minimizer). It is recommended to
-    stay with the default.
+    minimizer, see [Byrd95]_, [Morales11]_ and [Zhu97]_), "TNC" (nonlinear
+    constrained minimizer), "CG" (nonlinear unconstrained minimizer), "BFGS"
+    (nonlinear unconstrained minimizer), "NCG" (Newton CG minimizer). It is
+    recommended to stay with the default.
 
   Bounds
     This key allows to define upper and lower bounds for every state variable

diff --git a/doc/fr/bibliography.rst b/doc/fr/bibliography.rst
index 4cd051b21a270bd719e54343969b9aead31088e4..7accd3b1b72ca785406c98d0c21f4f6791d9f5a0 100644 (file)
--- a/doc/fr/bibliography.rst
+++ b/doc/fr/bibliography.rst
@@ -16,6 +16,8 @@ Bibliographie
 
 .. [Kalnay03] Kalnay E., *Atmospheric Modeling, Data Assimilation and Predictability*, Cambridge University Press, 2003
 
+.. [Morales11] Morales J.L., Nocedal J., *L-BFGS-B: Remark on Algorithm 778: L-BFGS-B, FORTRAN routines for large scale bound constrained optimization*, ACM Transactions on Mathematical Software, Vol 38(1), 2011
+
 .. [Salome] *SALOME The Open Source Integration Platform for Numerical Simulation*, http://www.salome-platform.org/
 
 .. [Tarantola87] Tarantola A., *Inverse Problem: Theory Methods for Data Fitting and Parameter Estimation*, Elsevier, 1987

diff --git a/doc/fr/reference.rst b/doc/fr/reference.rst
index 5c4701f2c97b9a7c868d3ec655e85553b5a7f7ee..ccc96fb11a2798ce5701e8a5435d99667bdd58ac 100644 (file)
--- a/doc/fr/reference.rst
+++ b/doc/fr/reference.rst
@@ -374,11 +374,11 @@ trouv
   Minimizer
     Cette clé permet de changer le minimiseur pour l'optimiseur. Le choix par
     défaut est "LBFGSB", et les choix possibles sont "LBFGSB" (minimisation non
-    linéaire sous contraintes, see [Byrd95]_ and [Zhu97]_), "TNC" (minimisation
-    non linéaire sous contraintes), "CG" (minimisation non linéaire sans
-    contraintes), "BFGS" (minimisation non linéaire sans contraintes), "NCG"
-    (minimisation de type gradient conjugué de Newton). On conseille de
-    conserver la valeur par défaut.
+    linéaire sous contraintes, voir [Byrd95]_, [Morales11]_ et [Zhu97]_), "TNC"
+    (minimisation non linéaire sous contraintes), "CG" (minimisation non
+    linéaire sans contraintes), "BFGS" (minimisation non linéaire sans
+    contraintes), "NCG" (minimisation de type gradient conjugué de Newton). On
+    conseille de conserver la valeur par défaut.
 
   Bounds
     Cette clé permet de définir des bornes supérieure et inférieure pour
@@ -440,11 +440,11 @@ trouv
   Minimizer
     Cette clé permet de changer le minimiseur pour l'optimiseur. Le choix par
     défaut est "LBFGSB", et les choix possibles sont "LBFGSB" (minimisation non
-    linéaire sous contraintes, voir [Byrd95]_ and [Zhu97]_), "TNC" (minimisation
-    non linéaire sous contraintes), "CG" (minimisation non linéaire sans
-    contraintes), "BFGS" (minimisation non linéaire sans contraintes), "NCG"
-    (minimisation de type gradient conjugué de Newton). On conseille de
-    conserver la valeur par défaut.
+    linéaire sous contraintes, voir [Byrd95]_, [Morales11]_ et [Zhu97]_), "TNC"
+    (minimisation non linéaire sous contraintes), "CG" (minimisation non
+    linéaire sans contraintes), "BFGS" (minimisation non linéaire sans
+    contraintes), "NCG" (minimisation de type gradient conjugué de Newton). On
+    conseille de conserver la valeur par défaut.
 
   Bounds
     Cette clé permet de définir des bornes supérieure et inférieure pour