-#-*- coding:utf-8 -*-
-# Copyright (C) 2008-2011 EDF R&D
+#-*-coding:iso-8859-1-*-
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# --
-# Author : André RIBES (EDF R&D)
-# --
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import logging
import traceback
),
STRING_DATA = BLOC ( condition = " FROM in ( 'String', ) ",
- STRING = SIMP(statut = "o", typ = "TXM", fr="En attente d'une chaine de caractères entre guillements, qui soit valide pour construire un vecteur : une suite de nombres, utilisant un espace ou une virgule pour séparer deux éléments et un point-virgule pour séparer deux lignes", ang="Waiting for a string in quotes, valid to build a vector: a floats serie, using a space or comma to separate two elements in a line, a semi-colon to separate rows"),
+ STRING = SIMP(statut = "o", typ = "TXM", fr="En attente d'une chaine de caractères entre guillements. Pour construire un vecteur, ce doit être une suite de nombres, utilisant un espace ou une virgule pour séparer deux éléments et un point-virgule pour séparer deux lignes", ang="Waiting for a string in quotes. To build a vector, it has to be a float serie, using a space or comma to separate two elements in a line, a semi-colon to separate rows"),
),
SCRIPTWITHFUNCTIONS_DATA = BLOC ( condition = " FROM in ( 'ScriptWithFunctions', ) ",
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2008-2011 EDF R&D
+#
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# --
-# Author : André RIBES (EDF R&D)
-# --
+# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
import sys
import os
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
-
+# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
"""
- Ce module sert à lancer EFICAS pour Adao
+ Ce module sert à lancer EFICAS pour Adao
"""
import sys
# built documents.
#
# The short X.Y version.
-version = '6.5.0'
+version = '6.6.0'
# The full version, including alpha/beta/rc tags.
-release = '6.5.0'
+release = '6.6.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
#
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
#
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
#
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
#
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
import logging
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
import time
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
numpy.random.seed(1000)
#-*-coding:iso-8859-1-*-
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import numpy
#
Study_repertory='@prefix@/share/salome/adao_examples/daSkeletons/External_data_definition_by_scripts',
Debug=0,
Algorithm='3DVAR',
- Background=_F(INPUT_TYPE='Vector',
+ Background=_F(Stored=0,
+ INPUT_TYPE='Vector',
data=_F(FROM='Script',
SCRIPT_FILE='Script_Background_xb.py',),),
- BackgroundError=_F(INPUT_TYPE='Matrix',
+ BackgroundError=_F(Stored=0,
+ INPUT_TYPE='Matrix',
data=_F(FROM='Script',
SCRIPT_FILE='Script_BackgroundError_B.py',),),
- Observation=_F(INPUT_TYPE='Vector',
+ Observation=_F(Stored=0,
+ INPUT_TYPE='Vector',
data=_F(FROM='Script',
SCRIPT_FILE='Script_Observation_yo.py',),),
- ObservationError=_F(INPUT_TYPE='Matrix',
+ ObservationError=_F(Stored=0,
+ INPUT_TYPE='Matrix',
data=_F(FROM='Script',
SCRIPT_FILE='Script_ObservationError_R.py',),),
- ObservationOperator=_F(INPUT_TYPE='Function',
+ ObservationOperator=_F(Stored=0,
+ INPUT_TYPE='Function',
data=_F(FROM='FunctionDict',
FUNCTIONDICT_FILE='Script_ObservationOperator_H.py',),),
AlgorithmParameters=_F(INPUT_TYPE='Dict',
-# Copyright (C) 2010-2011 EDF R&D
+# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
"""
__author__ = "Jean-Philippe ARGAUD"
#
-# ==============================================================================
-#
import os, numpy, time
#
+# ==============================================================================
+#
def FunctionH( XX ):
""" Direct non-linear simulation operator """
#
- # NEED TO BE COMPLETED
- # NEED TO BE COMPLETED
- # NEED TO BE COMPLETED
- #
# --------------------------------------> EXAMPLE TO BE REMOVED
if type(XX) is type(numpy.matrix([])): # EXAMPLE TO BE REMOVED
HX = XX.A1.tolist() # EXAMPLE TO BE REMOVED
# --------------------------------------> EXAMPLE TO BE REMOVED
#
return numpy.array( HX )
-
-# ==============================================================================
-def TangentH( X, increment = 0.01, centeredDF = False ):
- """
- Calcul de l'opérateur tangent comme la Jacobienne par différences finies,
- c'est-à-dire le gradient de H en X. On utilise des différences finies
- directionnelles autour du point X.
-
- Différences finies centrées :
- 1/ Pour chaque composante i de X, on ajoute et on enlève la perturbation
- dX[i] à la composante X[i], pour composer X_plus_dXi et X_moins_dXi, et
- on calcule les réponses HX_plus_dXi = H( X_plus_dXi ) et HX_moins_dXi =
- H( X_moins_dXi )
- 2/ On effectue les différences (HX_plus_dXi-HX_moins_dXi) et on divise par
- le pas 2*dXi
- 3/ Chaque résultat, par composante, devient une colonne de la Jacobienne
-
- Différences finies non centrées :
- 1/ Pour chaque composante i de X, on ajoute la perturbation dX[i] à la
- composante X[i] pour composer X_plus_dXi, et on calcule la réponse
- HX_plus_dXi = H( X_plus_dXi )
- 2/ On calcule la valeur centrale HX = H(X)
- 3/ On effectue les différences (HX_plus_dXi-HX) et on divise par
- le pas dXi
- 4/ Chaque résultat, par composante, devient une colonne de la Jacobienne
-
- """
- print
- print " == Calcul de la Jacobienne avec un incrément de %s*X"%increment
+#
+def TangentHMatrix( X, increment = 0.01, centeredDF = False ):
+ """ Tangent operator (Jacobian) calculated by finite differences """
#
dX = increment * X.A1
#
if centeredDF:
- #
- # Boucle de calcul des colonnes de la Jacobienne
- # ----------------------------------------------
- Jacobienne = []
+ #
+ Jacobian = []
for i in range( len(dX) ):
X_plus_dXi = numpy.array( X.A1 )
X_plus_dXi[i] = X[i] + dX[i]
#
HX_Diff = ( HX_plus_dXi - HX_moins_dXi ) / (2.*dX[i])
#
- Jacobienne.append( HX_Diff )
+ Jacobian.append( HX_Diff )
#
else:
#
- # Boucle de calcul des colonnes de la Jacobienne
- # ----------------------------------------------
HX_plus_dX = []
for i in range( len(dX) ):
X_plus_dXi = numpy.array( X.A1 )
#
HX_plus_dX.append( HX_plus_dXi )
#
- # Calcul de la valeur centrale
- # ----------------------------
HX = FunctionH( X )
#
- # Calcul effectif de la Jacobienne par différences finies
- # -------------------------------------------------------
- Jacobienne = []
+ Jacobian = []
for i in range( len(dX) ):
- Jacobienne.append( ( HX_plus_dX[i] - HX ) / dX[i] )
+ Jacobian.append( ( HX_plus_dX[i] - HX ) / dX[i] )
#
- Jacobienne = numpy.matrix( Jacobienne )
- print
- print " == Fin du calcul de la Jacobienne"
+ Jacobian = numpy.matrix( Jacobian )
#
- return Jacobienne
-
-# ==============================================================================
+ return Jacobian
+#
+def TangentH( X ):
+ """ Tangent operator """
+ _X = numpy.asmatrix(X).flatten().T
+ HtX = self.TangentHMatrix( _X ) * _X
+ return HtX.A1
+#
def AdjointH( (X, Y) ):
- """
- Calcul de l'adjoint à l'aide de la Jacobienne.
- """
- Jacobienne = TangentH( X, centeredDF = False )
+ """ Ajoint operator """
+ #
+ Jacobian = TangentHMatrix( X, centeredDF = False )
#
- # Calcul de la valeur de l'adjoint en X appliqué à Y
- # --------------------------------------------------
Y = numpy.asmatrix(Y).flatten().T
- HtY = numpy.dot(Jacobienne, Y)
+ HaY = numpy.dot(Jacobian, Y)
#
- return HtY.A1
+ return HaY.A1
# ==============================================================================
if __name__ == "__main__":
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# ----------------------------------------------------------
logging.info("ComputationFunctionNode: Loading operator functions")
FunctionH = Physical_simulation_functions.FunctionH
+TangentH = Physical_simulation_functions.TangentH
AdjointH = Physical_simulation_functions.AdjointH
#
# Executing the possible computations
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2011 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
<?xml version='1.0' encoding='us-ascii' ?>
<!--
- Copyright (C) 2010-2011 EDF R&D
+ Copyright (C) 2010-2012 EDF R&D
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
- Author: Andre Ribes, andre.ribes@edf.fr, EDF R&D
+ Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
-->
<!-- XML component catalog -->
<?xml version='1.0' encoding='iso-8859-1' ?>
<!--
- Copyright (C) 2010-2011 EDF R&D
+ Copyright (C) 2010-2012 EDF R&D
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
- Author: Andre Ribes, andre.ribes@edf.fr, EDF R&D
+ Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
-->
<proc>
<!--
- Copyright (C) 2010-2011 EDF R&D
+ Copyright (C) 2010-2012 EDF R&D
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
- Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+ Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
-->
<document>
<section name="ADAO">
<parameter name="icon" value="ADAO.png"/>
<parameter name="library" value="SalomePyQtGUI"/>
<parameter name="documentation" value="adao_help"/>
- <parameter name="version" value="6.5.0"/>
+ <parameter name="version" value="6.6.0"/>
</section>
<section name="resources">
<!-- Module resources -->
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
__doc__ = """
Définit les outils généraux élémentaires.
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
__doc__ = """
Définit les outils généraux élémentaires.
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
__doc__ = """
Ce module permet de mettre en place un logging utilisable partout dans
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
__doc__ = """
Définit des outils de persistence et d'enregistrement de séries de valeurs
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
__doc__ = """
Informations sur le code et la plateforme, et mise à jour des chemins
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
#-*-coding:iso-8859-1-*-
#
-# Copyright (C) 2008-2012 EDF R&D
+# Copyright (C) 2008-2012 EDF R&D
#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
name = "Data Assimilation Package"
version = "0.6.0"
-#-*- coding: utf-8 -*-
+#-*-coding:iso-8859-1-*-
+#
# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
import SALOMERuntime
import pilot
-#-*- coding: utf-8 -*-
+#-*-coding:iso-8859-1-*-
+#
# Copyright (C) 2010-2012 EDF R&D
#
# This library is free software; you can redistribute it and/or
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# Author: André Ribes, andre.ribes@edf.fr, EDF R&D
+# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
from daCore.AssimilationStudy import AssimilationStudy
from daCore import Logging
