Merge branch 'solverlab'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 47de43a15bd0d0815ddc3fc6dc8aad49287a554f..e163b408b824a531cf28f6c6ecdbdd264ea65812 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -72,6 +72,7 @@ APPLICATION :
         ospray : '1.8.4'
         packaging : '17.1'
         ParaView : '5.8.0'
+        petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
         pockets : '0.6.2'
@@ -129,6 +130,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'

diff --git a/applications/SOLVERLAB-9.4.0.pyconf b/applications/SOLVERLAB-9.4.0.pyconf
new file mode 100644 (file)
index 0000000..974e71f
--- /dev/null
+++ b/applications/SOLVERLAB-9.4.0.pyconf
@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+APPLICATION :
+{
+    name : 'SOLVERLAB-9.4.0'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : 'V9_4_0'
+    dev : 'no'
+    verbose :'no'
+    debug : 'no'
+    base : 'no'
+    python3 : 'yes'
+    environ :
+    {
+        build : 
+        {
+           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+        }
+        launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:""}
+        SALOME_trace : "local" # local/file:.../with_logger
+        SALOME_MODULES : ""  # specify the first modules to display in gui
+    }
+    products :
+    {
+        # PREREQUISITES :
+        alabaster : '0.7.6'
+        Babel : '2.6.0'
+        boost : '1.58.0'
+        certifi : '2018.8.24'
+        cgns : '3.3.1'
+        chardet : '3.0.4'
+        click : '6.7'
+        cmake : '3.12.1'
+        cycler : '0.10.0'
+        Cython : '0.25.2'
+        cppunit : '1.13.2'
+        dateutil : '2.4.2'
+        docutils : '0.12'
+        doxygen : '1.8.14'
+        freetype : '2.9.1'
+        gl2ps : '1.4.0_4037312'
+        graphviz : '2.38.0'
+        hdf5 : '1.10.3'
+        idna : '2.7'
+        imagesize : '1.0.0'
+        Jinja2 : '2.7.3'
+        kiwisolver : '1.0.1'
+        lapack : '3.8.0'
+        libxml2 : '2.9.1'
+        markupsafe : '0.23'
+        matplotlib : '2.2.2'
+        medfile : '4.0.0'
+        metis : '5.1.0'
+        numpy : '1.15.1'
+        packaging : '17.1'
+        ParaView : '5.6.0_bfaf7b8'
+        petsc : '3.13.5'
+        Pygments : '2.0.2'
+        pyparsing : '2.0.3'
+        PyQt : '5.9'
+        Python : '3.6.5'
+        pytz : '2015.4'
+        qt : '5.9.1'
+        requests : '2.19.1'
+        scipy : '0.19.1'
+        scotch : '6.0.4'
+        setuptools : '38.4.0'
+        sip : '4.19.3'
+        six : '1.10.0'
+        snowballstemmer : '1.2.1'
+        Sphinx : '1.7.6'
+        sphinxcontrib_websupport : '1.1.0'
+        sphinxintl: '0.9.10'
+        swig : '3.0.12'
+        urllib3 : '1.23'
+
+        # SALOME MODULES :
+        'CONFIGURATION'
+        'MEDCOUPLING'
+        'SOLVERLAB'
+    }
+    profile :
+    {
+        launcher_name : "salome"
+    }
+    virtual_app:
+    {
+        name : "salome"
+        application_name : "APPLI"
+    }
+    test_base : 
+    {
+        name : "SALOME"
+        tag : "SalomeV9"
+    }
+    properties :
+    {
+        mesa_launcher_in_package : "yes"
+        repo_dev : "yes"
+        pip : 'yes'
+        pip_install_dir : 'python'
+        single_install_dir : "no"
+    }
+}
+__overwrite__ :
+[
+  {
+    #
+    __condition__ : "VARS.dist in ['UB20.04']"
+    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
+  }
+]

diff --git a/applications/SOLVERLAB-master.pyconf b/applications/SOLVERLAB-master.pyconf
new file mode 100644 (file)
index 0000000..b0cbcec
--- /dev/null
+++ b/applications/SOLVERLAB-master.pyconf
@@ -0,0 +1,113 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+APPLICATION :
+{
+    name : 'SOLVERLAB-master'
+    workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
+    tag : 'master'
+    dev : 'no'
+    verbose :'no'
+    debug : 'no'
+    base : 'no'
+    python3 : 'yes'
+    environ :
+    {
+        build : 
+        {
+           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+        }
+        launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:""}
+        SALOME_trace : "local" # local/file:.../with_logger
+        SALOME_MODULES : ""  # specify the first modules to display in gui
+    }
+    products :
+    {
+        # PREREQUISITES :
+        alabaster : '0.7.6'
+        Babel : '2.6.0'
+        boost : '1.58.0'
+        certifi : '2018.8.24'
+        cgns : '3.3.1'
+        chardet : '3.0.4'
+        click : '6.7'
+        cmake : '3.12.1'
+        cycler : '0.10.0'
+        Cython : '0.25.2'
+        cppunit : '1.13.2'
+        dateutil : '2.4.2'
+        docutils : '0.12'
+        doxygen : '1.8.14'
+        freetype : '2.9.1'
+        graphviz : '2.38.0'
+        hdf5 : '1.10.3'
+        idna : '2.7'
+        imagesize : '1.0.0'
+        Jinja2 : '2.7.3'
+        kiwisolver : '1.0.1'
+        lapack : '3.8.0'
+        libxml2 : '2.9.1'
+        markupsafe : '0.23'
+        matplotlib : '2.2.2'
+        medfile : '4.1.0'
+        metis : '5.1.0'
+        numpy : '1.15.1'
+        packaging : '17.1'
+        ParaView : '5.8.0'
+        petsc : '3.14.0'
+        Pygments : '2.0.2'
+        pyparsing : '2.0.3'
+        PyQt : '5.9'
+        Python : '3.6.5'
+        pytz : '2015.4'
+        qt : '5.9.1'
+        requests : '2.19.1'
+        scipy : '0.19.1'
+        scotch : '6.0.4'
+        setuptools : '38.4.0'
+        sip : '4.19.3'
+        six : '1.10.0'
+        snowballstemmer : '1.2.1'
+        Sphinx : '1.7.6'
+        sphinxcontrib_websupport : '1.1.0'
+        sphinxintl: '0.9.10'
+        swig : '3.0.12'
+        urllib3 : '1.23'
+
+        # SALOME MODULES :
+        'CONFIGURATION'
+        'MEDCOUPLING'
+        'SOLVERLAB'
+    }
+    profile :
+    {
+        launcher_name : "salome"
+    }
+    virtual_app:
+    {
+        name : "salome"
+        application_name : "APPLI"
+    }
+    test_base : 
+    {
+        name : "SALOME"
+        tag : "SalomeV9"
+    }
+    properties :
+    {
+        mesa_launcher_in_package : "yes"
+        repo_dev : "yes"
+        pip : 'yes'
+        pip_install_dir : 'python'
+        single_install_dir : "yes"
+    }
+}
+__overwrite__ :
+[
+  {
+    #
+    __condition__ : "VARS.dist in ['UB20.04']"
+    'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
+  }
+]

diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf
index 700f1a643125792557b9c3b2c9275bb408a38f64..b4d62f0ab5c8ad3dee753f26fdc99e87060bcb8f 100644 (file)
--- a/products/SOLVERLAB.pyconf
+++ b/products/SOLVERLAB.pyconf
@@ -6,7 +6,8 @@ default :
     get_source : "git"
     git_info:
     {
-        repo : "https://codev-tuleap.cea.fr/plugins/git/spns/SolverLab.git"
+        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/solverlab.git"
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "solverlab.git"
     }
     environ :
     {

diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index 1689cfcd2d0b9c9104136f480d89ec5d757b4d93..e297f233ddd5f71d8748641582ad75813809b1cc 100755 (executable)
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -5,16 +5,18 @@ echo "SOLVERLAB" $VERSION
 echo "##########################################################################"
 
 
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_ROOT_DIR=${PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DHDF5_ROOT=${HDF5_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDFILE_ROOT_DIR=${MEDFILE_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_ROOT_DIR=${PARAVIEW_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPETSC_DIR=${PETSC_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_VERSION=5.8"
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCDMATH_WITH_PYTHON=OFF"
 
 echo
 echo "*** cmake "$CMAKE_OPTIONS

diff --git a/products/compil_scripts/petsc.sh b/products/compil_scripts/petsc.sh
index ccf99feeb6c92b27538f9c1f5025e4ed54684528..5eb0db1a449476c6b9ce9f78d3ec8d87c095fb86 100755 (executable)
--- a/products/compil_scripts/petsc.sh
+++ b/products/compil_scripts/petsc.sh
@@ -10,7 +10,7 @@ cp -r $SOURCE_DIR/* .
 
 echo
 echo "*** configure"
-./configure --prefix=$PRODUCT_INSTALL --with-mpi=0 --download-f2cblaslapack=https://www.mcs.anl.gov/petsc/mirror/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz --download-slepc=https://slepc.upv.es/download/distrib/slepc-3.13.4.tar.gz
+./configure --prefix=$PRODUCT_INSTALL --with-mpi=0 --download-f2cblaslapack=https://www.mcs.anl.gov/petsc/mirror/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz --download-slepc=https://slepc.upv.es/download/distrib/slepc-3.14.0.tar.gz
 
 if [ $? -ne 0 ]
 then

diff --git a/products/env_scripts/SOLVERLAB.py b/products/env_scripts/SOLVERLAB.py
index caf817a396d158bfb88c07cfb49baa2d1d47414a..54d2840f4575bcc8808849b3b78520c2b0e361ea 100644 (file)
--- a/products/env_scripts/SOLVERLAB.py
+++ b/products/env_scripts/SOLVERLAB.py
@@ -15,8 +15,8 @@ def set_env(env, product_dir, version):
     env.set('CoreFlows_PYTHON', 'ON')
     env.set('CoreFlows_DOC', 'ON')
     env.set('CoreFlows_GUI', 'ON')
-    env.set('CoreFlows', os.path.join(install_rep,'bin','Executable','CoreFlowsMainExe'))
-    env.set('CoreFlowsGUI', os.path.join(install_rep,'bin','salome','CoreFlows_Standalone.py'))
+    env.set('CoreFlows', os.path.join(install_rep,'bin','CoreFlowsMainExe'))
+    env.set('CoreFlowsGUI', os.path.join(install_rep,'bin','CoreFlows_Standalone.py'))
     env.set('COREFLOWS_ROOT_DIR', root_module_rep)
 
     root = env.get('CoreFlows_ROOT_DIR')
@@ -24,9 +24,11 @@ def set_env(env, product_dir, version):
     env.prepend('PATH', os.path.join(root, 'include'))
     env.prepend('LD_LIBRARY_PATH', os.path.join(root, 'lib'))
     env.prepend('PYTHONPATH', os.path.join(root, 'lib'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'CoreFlows_Python'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'CoreFlows_Python'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'lib','python2.7','site-packages','salome'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'coreflows'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'coreflows'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'cdmath'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'cdmath'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'cdmath','postprocessing'))
  
 def set_nativ_env(env):
     pass