From: Jean-Philippe ARGAUD Date: Tue, 24 Apr 2018 08:29:34 +0000 (+0200) Subject: Minor variable checking and version uniqueness corrections X-Git-Tag: V8_5_0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=458b8a3f4d3caa92f176e8dc95743e108ddde461;p=modules%2Fadao.git Minor variable checking and version uniqueness corrections --- diff --git a/bin/AdaoCatalogGenerator.py b/bin/AdaoCatalogGenerator.py index d162eeb..488d35a 100644 --- a/bin/AdaoCatalogGenerator.py +++ b/bin/AdaoCatalogGenerator.py @@ -111,7 +111,7 @@ def AdjointOperatorInNS(filename): if cr.match(ln): return 1 return 0 AdjointOperatorInNS.info = u"The Python file has to contain explicitly an \\"AdjointOperator\\" function definition with only one pair of vectors as argument." -"""%(module_version.name,module_version.version) +"""%(module_version.name,module_version.cata) # Important : validators=[...] pour que les conditions soient traitees simultanement, en "ET", et pas en "OU" (choisi dans le cas du tuple a la place de la liste) # validators=[OnlyStr(), FileExtVal('py'), FunctionVal(fv)] diff --git a/bin/module_version.py b/bin/module_version.py index 2ce6e67..d8f08ba 100644 --- a/bin/module_version.py +++ b/bin/module_version.py @@ -22,7 +22,16 @@ # # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D -name = "ADAO" -version = "V8_5_0" # Version pour catalogue, avec des "_" entre les numeros -date = "" -year = "2018" # Annee de copyright +""" + Version +""" +__author__ = "Jean-Philippe ARGAUD" +__all__ = [] + +name = "ADAO" +version = "8.5.0" +year = "2018" +date = "mardi 27 mars 2018, 12:12:12 (UTC+0100)" + +longname = name + ", a module for Data Assimilation and Optimization" +cata = "V" + version.replace(".","_") diff --git a/doc/en/conf.py b/doc/en/conf.py index 593b22a..8311b27 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -40,8 +40,18 @@ import sys, os # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. #sys.path.append(os.path.abspath('.')) -sys.path.append(os.path.abspath("../../bin")) -import module_version +try: + sys.path.append(os.path.abspath("../../bin")) + import module_version + print("Import du module_version de bin...") +except: + pass +try: + sys.path.append(os.path.abspath("../../adao/adao/daCore")) + import version as module_version + print("Import du module_version de daCore...") +except: + pass # -- General configuration ----------------------------------------------------- @@ -71,10 +81,10 @@ copyright = u'2008-%s, Jean-Philippe ARGAUD'%module_version.year # # The short X.Y version. # version = '7\_main' -version = '%s'%module_version.version.replace('_','.') +version = '%s'%module_version.version # The full version, including alpha/beta/rc tags. # release = '7\_main' -release = '%s'%module_version.version.replace('_','.') +release = '%s'%module_version.version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -130,7 +140,7 @@ html_theme = 'default' # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = "Documentation %s %s"%(module_version.name,module_version.version.replace('_','.')) +html_title = "Documentation %s %s"%(module_version.name,module_version.version) # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None @@ -191,7 +201,7 @@ htmlhelp_basename = 'ADAOdoc' # -- Options for LaTeX output -------------------------------------------------- # The paper size ('letter' or 'a4'). -latex_paper_size = 'a4' +latex_paper_size = 'letter' # The font size ('10pt', '11pt' or '12pt'). latex_font_size = '10pt' diff --git a/doc/fr/conf.py b/doc/fr/conf.py index e421ce8..da12953 100644 --- a/doc/fr/conf.py +++ b/doc/fr/conf.py @@ -40,8 +40,18 @@ import sys, os # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. #sys.path.append(os.path.abspath('.')) -sys.path.append(os.path.abspath("../../bin")) -import module_version +try: + sys.path.append(os.path.abspath("../../bin")) + import module_version + print("Import du module_version de bin...") +except: + pass +try: + sys.path.append(os.path.abspath("../../adao/adao/daCore")) + import version as module_version + print("Import du module_version de daCore...") +except: + pass # -- General configuration ----------------------------------------------------- @@ -71,10 +81,10 @@ copyright = u'2008-%s, Jean-Philippe ARGAUD'%module_version.year # # The short X.Y version. # version = '7\_main' -version = '%s'%module_version.version.replace('_','.') +version = '%s'%module_version.version # The full version, including alpha/beta/rc tags. # release = '7\_main' -release = '%s'%module_version.version.replace('_','.') +release = '%s'%module_version.version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -130,7 +140,7 @@ html_theme = 'default' # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = "Documentation %s %s"%(module_version.name,module_version.version.replace('_','.')) +html_title = "Documentation %s %s"%(module_version.name,module_version.version) # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None diff --git a/src/daComposant/daCore/version.py b/src/daComposant/daCore/version.py index eda5111..15e5965 100644 --- a/src/daComposant/daCore/version.py +++ b/src/daComposant/daCore/version.py @@ -26,6 +26,10 @@ __author__ = "Jean-Philippe ARGAUD" __all__ = [] -name = "ADAO, a module for Data Assimilation and Optimization" -version = "8.5.0" -date = "mardi 27 mars 2018, 12:12:12 (UTC+0100)" +name = "ADAO" +version = "8.5.0" +year = "2018" +date = "mardi 27 mars 2018, 12:12:12 (UTC+0100)" + +longname = name + ", a module for Data Assimilation and Optimization" +cata = "V" + version.replace(".","_") diff --git a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py index 9dd9ec9..6a18350 100644 --- a/src/daSalome/daYacsSchemaCreator/infos_daComposant.py +++ b/src/daSalome/daYacsSchemaCreator/infos_daComposant.py @@ -69,6 +69,7 @@ AssimAlgos = [ "EnsembleBlue", "KalmanFilter", "ExtendedKalmanFilter", + "EnsembleKalmanFilter", "UnscentedKalmanFilter", "LinearLeastSquares", "NonLinearLeastSquares", @@ -119,12 +120,18 @@ AlgoDataRequirements["EnsembleBlue"] = [ AlgoDataRequirements["KalmanFilter"] = [ "Background", "BackgroundError", "Observation", "ObservationError", + "ObservationOperator", ] AlgoDataRequirements["ExtendedKalmanFilter"] = [ "Background", "BackgroundError", "Observation", "ObservationError", "ObservationOperator", ] +AlgoDataRequirements["EnsembleKalmanFilter"] = [ + "Background", "BackgroundError", + "Observation", "ObservationError", + "ObservationOperator", + ] AlgoDataRequirements["UnscentedKalmanFilter"] = [ "Background", "BackgroundError", "Observation", "ObservationError", @@ -188,6 +195,7 @@ AlgoType["ExtendedBlue"] = "Optim" AlgoType["EnsembleBlue"] = "Optim" AlgoType["KalmanFilter"] = "Optim" AlgoType["ExtendedKalmanFilter"] = "Optim" +AlgoType["EnsembleKalmanFilter"] = "Optim" AlgoType["UnscentedKalmanFilter"] = "Optim" AlgoType["LinearLeastSquares"] = "Optim" AlgoType["NonLinearLeastSquares"] = "Optim"