add solverlab yacine M30-S97 compile ok

diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf
index 63397a2072cde41c620c9f7a4101ca2c7e551cf4..619d9fda328c65a6826dfb416b37f441a1cc6b0d 100644 (file)
--- a/products/SOLVERLAB.pyconf
+++ b/products/SOLVERLAB.pyconf
@@ -40,6 +40,51 @@ default :
     }
 }
 
+default_github : # from github ndjinga
+{
+    name : "SOLVERLAB"
+    build_source : "script"
+    compil_script :  $name + ".sh"
+    get_source : "git"
+    git_info:
+    {
+        repo : "https://github.com/ndjinga/SOLVERLAB.git"
+        repo_dev : "https://github.com/ndjinga/SOLVERLAB.git"
+    }
+    environ :
+    {
+       SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "solverlab"
+       env_script : $name + ".py"
+    }
+    depend :
+    [
+        'hdf5',
+        'matplotlib',
+        'medfile',
+        'numpy',
+        'ParaView',
+        'petsc',
+        'Python',
+        'KERNEL',
+        'GUI',
+        'MEDCOUPLING',
+        'openmpi'
+    ]
+    opt_depend : ['mpi4py']
+    build_depend : ["cmake", "swig", "doxygen", "graphviz","cppunit", "openmpi"]   
+    # mscgen
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : $APPLICATION.workdir + $VARS.sep + 'INSTALL' + $VARS.sep + $name
+    nb_proc : 1
+    properties:
+    {
+        is_SALOME_module : "yes"
+        incremental : "yes"
+        has_salome_gui : "yes"
+    }
+}
+
 default_MPI :
 {
     depend :

diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index df0e932b3c03cfff40816313ae5619a15e7ab95f..02306cb54782232b1955a15a2e30b644cdc33455 100755 (executable)
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -9,6 +9,11 @@ CMAKE_OPTIONS+=" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
 CMAKE_OPTIONS+=" -DPython_EXECUTABLE=${PYTHONBIN}"
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 
+
+CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+
+
 if [ $VERSION == "V9_6_0" ]; then
     # GUI was ported after 9.6.0
     CMAKE_OPTIONS+=" -DCOREFLOWS_WITH_GUI=OFF"
@@ -37,11 +42,11 @@ if [ -n "$SAT_HPC" ]; then
     CMAKE_OPTIONS+=" -DMPI_ROOT_DIR=${MPI_ROOT_DIR}"
     CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_MPI=ON"
     if [ -n "$MPI_ROOT_DIR" ]; then
-       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
-       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+        CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+        CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     fi
     if [ -n "$MPI4PY_ROOT_DIR" ]; then
-       CMAKE_OPTIONS+=" -DMPI4PY_ROOT_DIR:PATH=${MPI4PY_ROOT_DIR}"
+        CMAKE_OPTIONS+=" -DMPI4PY_ROOT_DIR:PATH=${MPI4PY_ROOT_DIR}"
     else
         echo "WARNING: mpi4py environment variable not detected"
     fi

diff --git a/products/env_scripts/SOLVERLAB.py b/products/env_scripts/SOLVERLAB.py
index 54d2840f4575bcc8808849b3b78520c2b0e361ea..fc8bd3e3f4879bf200ed8fa93dbabb96ca2e8d57 100644 (file)
--- a/products/env_scripts/SOLVERLAB.py
+++ b/products/env_scripts/SOLVERLAB.py
@@ -15,14 +15,17 @@ 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','CoreFlowsMainExe'))
-    env.set('CoreFlowsGUI', os.path.join(install_rep,'bin','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')
-    
+
     env.prepend('PATH', os.path.join(root, 'include'))
     env.prepend('LD_LIBRARY_PATH', os.path.join(root, 'lib'))
+    
+    # export PYTHONPATH=.../INSTALL/SOLVERLAB/bin:${PYTHONPATH} # TODO miss 2206 fixed now
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin'))
     env.prepend('PYTHONPATH', os.path.join(root, 'lib'))
     env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'coreflows'))
     env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'coreflows'))