From 8de6475ea0cde4d2d2990f19c8cfc4837fa700e5 Mon Sep 17 00:00:00 2001
From: Luc Papeleux <L.Papeleux@ULiege.be>
Date: Wed, 6 Jul 2022 17:08:12 +0200
Subject: [PATCH] port clifton

---
 cfg/clifton/cgal.profile           |  2 ++
 cfg/clifton/comp.cfg               |  4 ++--
 cfg/clifton/gmsh.profile           |  1 +
 cfg/clifton/intelCommunity.bashrc  |  8 --------
 cfg/clifton/intelCommunity.profile | 10 ----------
 cfg/clifton/launch.cfg             |  2 +-
 cfg/clifton/oneApi.bashrc          | 11 +++++++++++
 cfg/clifton/oneApi.profile         | 11 +++++++++++
 cfg/clifton/scilab.profile         |  1 -
 9 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 cfg/clifton/cgal.profile
 delete mode 100644 cfg/clifton/intelCommunity.bashrc
 delete mode 100644 cfg/clifton/intelCommunity.profile
 create mode 100644 cfg/clifton/oneApi.bashrc
 create mode 100644 cfg/clifton/oneApi.profile
 delete mode 100644 cfg/clifton/scilab.profile

diff --git a/cfg/clifton/cgal.profile b/cfg/clifton/cgal.profile
new file mode 100644
index 0000000..6674aec
--- /dev/null
+++ b/cfg/clifton/cgal.profile
@@ -0,0 +1,2 @@
+#add2env LIB "/opt/cgal"
+add2env INCLUDE "/opt/cgal"
diff --git a/cfg/clifton/comp.cfg b/cfg/clifton/comp.cfg
index 0d7cd49..9eb2870 100644
--- a/cfg/clifton/comp.cfg
+++ b/cfg/clifton/comp.cfg
@@ -1,5 +1,5 @@
-self.pars['CMAKELIST'].val='gaston.cmake'
-self.pars['NB_TASKS'].val='6'
+self.pars['CMAKELIST'].val='clifton.cmake'
+self.pars['NB_TASKS'].val='12'
 self.pars['NB_THREADS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
 self.pars['RUNMETHOD'].val='batch'
diff --git a/cfg/clifton/gmsh.profile b/cfg/clifton/gmsh.profile
index 412f3fc..5e99eac 100644
--- a/cfg/clifton/gmsh.profile
+++ b/cfg/clifton/gmsh.profile
@@ -1,3 +1,4 @@
+
 add2env PATH "/opt/gmsh/bin" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
 add2env PYTHONPATH "/opt/gmsh/lib"
diff --git a/cfg/clifton/intelCommunity.bashrc b/cfg/clifton/intelCommunity.bashrc
deleted file mode 100644
index 2d14ff9..0000000
--- a/cfg/clifton/intelCommunity.bashrc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -d /opt/intel ] ; then
-    . /opt/intel/mkl/bin/mklvars.sh intel64
-    . /opt/intel/tbb/bin/tbbvars.sh intel64
-fi
diff --git a/cfg/clifton/intelCommunity.profile b/cfg/clifton/intelCommunity.profile
deleted file mode 100644
index e5d1ff5..0000000
--- a/cfg/clifton/intelCommunity.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -n "$BASH_VERSION" ]; then
-    if [ -d /opt/intel ] ; then
-        . /opt/intel/mkl/bin/mklvars.sh intel64
-        . /opt/intel/tbb/bin/tbbvars.sh intel64
-    fi
-fi
diff --git a/cfg/clifton/launch.cfg b/cfg/clifton/launch.cfg
index 12256a8..4295453 100644
--- a/cfg/clifton/launch.cfg
+++ b/cfg/clifton/launch.cfg
@@ -1,4 +1,4 @@
-self.pars['NB_THREADS'].val='6'
+self.pars['NB_THREADS'].val='12'
 self.pars['NB_TASKS'].val='1'
 self.pars['RUNMETHOD'].vals=['interactive','at','batch']
 self.pars['RUNMETHOD'].val='batch'
diff --git a/cfg/clifton/oneApi.bashrc b/cfg/clifton/oneApi.bashrc
new file mode 100644
index 0000000..a3b3939
--- /dev/null
+++ b/cfg/clifton/oneApi.bashrc
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     #. /opt/intel/oneapi/setvars.sh intel64
+     . /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
diff --git a/cfg/clifton/oneApi.profile b/cfg/clifton/oneApi.profile
new file mode 100644
index 0000000..a3b3939
--- /dev/null
+++ b/cfg/clifton/oneApi.profile
@@ -0,0 +1,11 @@
+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     #. /opt/intel/oneapi/setvars.sh intel64
+     . /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
diff --git a/cfg/clifton/scilab.profile b/cfg/clifton/scilab.profile
deleted file mode 100644
index 4b11b33..0000000
--- a/cfg/clifton/scilab.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env PATH "/opt/scilab/bin"
-- 
GitLab