Merge branch 'portChinook' into 'master'

Port chinook

See merge request am-dept/linuxbin!45

cfg/chinook/comp.cfg

+self.pars['CMAKELIST'].val='chinook.cmake'
+self.pars['NB_TASKS'].val='24'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/chinook/gmsh.profile

+add2env PATH            "/opt/gmsh/bin" front
+add2env INCLUDE         "/opt/gmsh/include" front
+add2env LIB             "/opt/gmsh/lib" front
+add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
+add2env PYTHONPATH      "/opt/gmsh/lib"

cfg/chinook/intel.bashrc

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+fi

cfg/chinook/intel.profile

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+fi

cfg/chinook/intel2019/intel.bashrc

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+    . /opt/intel2019/mkl/bin/mklvars.sh intel64
+    . /opt/intel2019/tbb/bin/tbbvars.sh intel64
+fi
+export MKL_DEBUG_CPU_TYPE=5

cfg/chinook/intel2019/intel.profile

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -n "$BASH_VERSION" ]; then
+    if [ -d /opt/intel ] ; then
+        . /opt/intel2019/mkl/bin/mklvars.sh intel64
+        . /opt/intel2019/tbb/bin/tbbvars.sh intel64
+    fi
+fi
+export MKL_DEBUG_CPU_TYPE=5

cfg/chinook/intel2019/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0-intel2019/lib"
+add2env LIB "/opt/mumps-4.10.0-intel2019/lib"
+add2env INCLUDE "/opt/mumps-4.10.0-intel2019/include"

cfg/chinook/intelOneApi/intel.bashrc

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+fi

cfg/chinook/intelOneApi/intel.profile

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+fi

cfg/chinook/intelOneApi/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
+add2env LIB "/opt/mumps-4.10.0/lib"
+add2env INCLUDE "/opt/mumps-4.10.0/include"

cfg/chinook/lagamine.profile

+add2env LD_LIBRARY_PATH "/opt/lagamine/lib"
+add2env INCLUDE "/opt/lagamine/include"
+add2env LIB "/opt/lagamine/lib"

cfg/chinook/lam3.profile

+add2env PATH            "/opt/lam3/bin" front
+add2env LD_LIBRARY_PATH "/opt/lam3/lib"

cfg/chinook/leanVTK.profile

+#add2env PATH "/i/opt/lean-vtk/lib/LeanVTK-1.0"
+add2env LIB "/opt/lean-vtk/lib/LeanVtk-1.0" front
+add2env CMAKE_PREFIX_PATH "/opt/lean-vtk/" front

cfg/chinook/matlab.profile

+add2env PATH "/opt/matlab/bin"

cfg/chinook/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
+add2env LIB "/opt/mumps-4.10.0/lib"
+add2env INCLUDE "/opt/mumps-4.10.0/include"

cfg/chinook/parasolid.profile

+add2env PATH "/opt/parasolid/shared_object"
+add2env INCLUDE "/opt/parasolid"
+export P_SCHEMA=/opt/parasolid/schema

cfg/chinook/samcef.profile

+export SAM_ZONE=200000000
+add2env PATH "/opt/samcef"

cfg/chinook/sol2.profile

+#add2env PATH "/opt/sol2/bin" 
+#add2env LIB "/opt/sol2/lib" front
+#add2env LD_LIBRARY_PATH "/opt/sol2/lib" front
+add2env INCLUDE "/opt/sol2/include" front

externalProgramPath.py

@@ -2,6 +2,9 @@
 # -*- coding: utf-8 -*-
 #
 # Define external program paths according to local configuration
+#
+# under linux, call config_ld_library_path(key) to extend LD_LIBRARY_PATH to be able to find .so
+# 
 
 from prmClasses import *
 import os, os.path, shutil #, distutils.spawn
@@ -91,7 +94,7 @@ class ExtProgs(PRMSet):
             print("\t Use 'externalProgramPathGui' to define the full program path (recommanded)")
             print("\t or add %s in your user path (not recommanded)"%key)
             return False
-
+    
     def configAction(self):
         PRMAction(self.actions, 'a', self.pars['SAMCEF'])
         PRMAction(self.actions, 'b', self.pars['GMSH'])
@@ -113,6 +116,14 @@ class ExtProgs(PRMSet):
         SaveAction(self.actions , 'S')
         QuitAction(self.actions , 'Q')
 
+    def config_ld_library_path(self, key): # add progPath/bin/../lib to LD_LIBRARY_PATH (else may not found .so)
+        progLibPath = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(self.pars[key].val)),'..','lib'))
+        if os.path.exists(progLibPath):      
+            for p in os.environ['LD_LIBRARY_PATH'].split(':'):
+                if os.path.exists(p) and os.path.samefile(progLibPath, p): # deja dans le LD_LIBRARY_PATH => on skippe l'ajout
+                    break    
+            else : # pas trouvé dans le LD_LIBRARY_PATH => on ajoute dans le LD_LIBRARY_PATH
+                os.environ['LD_LIBRARY_PATH'] = progLibPath + ':' + os.environ['LD_LIBRARY_PATH']                           
 #=================================================================================
 def main():
     progsConf = ExtProgs() #verb=True)

mtfLicense/chinook.lic

+646574612B0A060C031B13305B736D657470666F722024372D0F021B1900102D0F0C1703161163666F727D6574611A6F726D047461660C726D65E161666FE26D657471666F7211657461076F726D06746166FA726D65E561666FCE676574