Merge branch 'papeleux' into 'master'

Intel One Api 2024

See merge request am-dept/linuxbin!44

cfg/clifton/comp.cfg

 self.pars['CMAKELIST'].val='clifton.cmake'
-self.pars['NB_TASKS'].val='12'
+self.pars['NB_TASKS'].val='6'
 self.pars['NB_THREADS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
 self.pars['RUNMETHOD'].val='batch'

cfg/clifton/launch.cfg

-self.pars['NB_THREADS'].val='12'
+self.pars['NB_THREADS'].val='6'
 self.pars['NB_TASKS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch']
 self.pars['RUNMETHOD'].val='batch'

cfg/clifton/oneApi.bashrc

@@ -8,8 +8,4 @@ if [ -d /opt/intel ] ; then
      . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
      . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
      . /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/2021.6.0/env/vars.sh intel64     
-     #. /opt/intel/oneapi/mkl/2022.1.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh intel64
-
 fi

cfg/clifton/oneApi.profile

@@ -7,5 +7,4 @@ if [ -d /opt/intel ] ; then
      . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
      . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
      . /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
-
 fi

cfg/gaston/oneApi.bashrc

@@ -3,8 +3,8 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
-     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64
+     #. /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi

cfg/gaston/oneApi.profile

@@ -3,8 +3,8 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-     . /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
-     . /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
-     #. /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
-     #. /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/tbb/2021.10.0/env/vars.sh intel64     
+     #. /opt/intel/oneapi/mkl/2023.2.0/env/vars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
 fi

cfg/spring/lam3.profile

+add2env PATH "/opt/lam3/bin" front
+add2env LD_LIBRARY_PATH "/opt/lam3/lib"
+#add2env PYTHONPATH "/opt/gmsh/lib"

cfg/warson/intel2023/intel.bashrc

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

cfg/warson/intel2023/intel.profile

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

cfg/warson/intel2023/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"

comp.py

@@ -175,12 +175,12 @@ class CompJob(ParametricJob):
         ext = os.path.splitext(file)[1]
         if ext==".zip":
             # unzip the source and try to convert text files
-            cmd = 'unzip -a %s -x "*/.svn/*" >/dev/null' % file
+            cmd = 'unzip -a %s -x "*/.git/*" >/dev/null' % file
             sysOutput = os.system(cmd)
             if (sysOutput != 0):
                 self.error("unable to unzip archive %s !" % file)
-            # no conversion for ".svn" database
-            cmd = 'unzip %s "*/.svn/*" >/dev/null' % file
+            # no conversion for ".git" database
+            cmd = 'unzip %s "*/.git/*" >/dev/null' % file
             sysOutput = os.system(cmd)
             if (sysOutput != 0):
                 self.error("unable to unzip archive %s !" % file)

externalProgramPath.py

@@ -46,6 +46,11 @@ class ExtProgs(PRMSet):
             TextPRM(self.pars,  'LATEX',       'Latex',          'latex')
             TextPRM(self.pars,  'GHOSTSCRIPT', 'GhostScript',    'gs')
             TextPRM(self.pars,  'IMAGEMAGICK', 'Image Magick',   'convert')
+            # Arcelor
+            TextPRM(self.pars,  'LAM3',       'Lam3',          'lam3')
+            TextPRM(self.pars,  'TEC3',       'Tec3',          'tec3')
+            TextPRM(self.pars,  'XDONNEE',    'X-Donnee',      'xd')
+            
         else: # windows
             # Mesh generation
             TextPRM(self.pars,  'SAMCEF',      'Samcef',        'samcef.cmd')
@@ -62,6 +67,11 @@ class ExtProgs(PRMSet):
             TextPRM(self.pars,  'GHOSTSCRIPT', 'GhostScript',   'gswin32c.exe')
             TextPRM(self.pars,  'IMAGEMAGICK', 'Image Magick',  'convert.exe')
 
+            # Arcelor
+            TextPRM(self.pars,  'LAM3',       'Lam3',          'lam3.exe')
+            TextPRM(self.pars,  'TEC3',       'Tec3',          'tec3.exe')
+            TextPRM(self.pars,  'XDONNEE',    'X-Donnee',      'xd.exe')
+
     def checkValidity(self, key):
         if key not in self.pars :
             print("%s is not a valid external program key from externalProgramPath... "%key)
@@ -96,6 +106,10 @@ class ExtProgs(PRMSet):
         PRMAction(self.actions, 'i', self.pars['GHOSTSCRIPT'])
         PRMAction(self.actions, 'j', self.pars['IMAGEMAGICK'])
         NoAction(self.actions)
+        PRMAction(self.actions, 'k', self.pars['LAM3'])
+        PRMAction(self.actions, 'l', self.pars['TEC3'])
+        PRMAction(self.actions, 'm', self.pars['XDONNEE'])
+        NoAction(self.actions)
         SaveAction(self.actions , 'S')
         QuitAction(self.actions , 'Q')
 

externalProgramPathGui.pyw

@@ -111,6 +111,16 @@ class ExtProgsConfGui(QWidget):
         self.sf['GHOSTSCRIPT']       = ExeFileLine(self, grplay3, self.extProgPath.pars['GHOSTSCRIPT'],    exeFileType, 1, 0, 4)
         self.sf['IMAGEMAGICK']       = ExeFileLine(self, grplay3, self.extProgPath.pars['IMAGEMAGICK'],    exeFileType, 2, 0, 4)
         
+        # Outils Arcelor
+        self.arcelorGrpBox  = QGroupBox("Arcelor Tools")
+        box.addWidget(self.arcelorGrpBox)
+        grplay4 = QGridLayout()
+        grplay4.setColumnStretch(2,1)
+        self.arcelorGrpBox.setLayout(grplay4)
+        self.sf['LAM3']             = ExeFileLine(self, grplay4, self.extProgPath.pars['LAM3'],          exeFileType, 0, 0, 4)
+        self.sf['TEC3']             = ExeFileLine(self, grplay4, self.extProgPath.pars['TEC3'],          exeFileType, 1, 0, 4)
+        self.sf['XDONNEE']          = ExeFileLine(self, grplay4, self.extProgPath.pars['XDONNEE'],       exeFileType, 2, 0, 4)
+        
     def buildButtonFrame(self, box):      
         # == Buttons Frame ==
         butframe = QFrame()

mtfLicense/spring.lic

+646574612B0A060C031B13305B736D657470666F722024372D0F021B1900102D0F0C1703161160666F72CD657461506F726DD9746166C6726D65EA61666F7D6D6574D96E6F72