From 7e8ed1b74070fe029c714cb25a56b46ea8f93e8a Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 16 Jul 2020 16:13:18 +0200
Subject: [PATCH] elegant/2020.2.0: module build

---
 MPI/elegant/build                  | 22 ++++++++++++++++++++++
 MPI/elegant/files/variants.merlin6 |  1 +
 MPI/elegant/files/variants.rhel6   |  4 ++++
 MPI/elegant/modulefile             | 14 +++++++++++---
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100755 MPI/elegant/build
 create mode 100644 MPI/elegant/files/variants.merlin6
 create mode 100644 MPI/elegant/files/variants.rhel6

diff --git a/MPI/elegant/build b/MPI/elegant/build
new file mode 100755
index 0000000..6cb8745
--- /dev/null
+++ b/MPI/elegant/build
@@ -0,0 +1,22 @@
+#!/usr/bin/env modbuild
+
+pbuild::add_to_group 'MPI'
+
+pbuild::prep() {
+	:
+}
+pbuild::configure() {
+	:
+}
+pbuild::compile() {
+	:
+}
+pbuild::install() {
+	:
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/MPI/elegant/files/variants.merlin6 b/MPI/elegant/files/variants.merlin6
new file mode 100644
index 0000000..f1ac524
--- /dev/null
+++ b/MPI/elegant/files/variants.merlin6
@@ -0,0 +1 @@
+elegant/2020.2.0_merlin6	unstable	gcc/8.4.0 openmpi/3.1.6_slurm gsl/2.6
diff --git a/MPI/elegant/files/variants.rhel6 b/MPI/elegant/files/variants.rhel6
new file mode 100644
index 0000000..1f30d1c
--- /dev/null
+++ b/MPI/elegant/files/variants.rhel6
@@ -0,0 +1,4 @@
+elegant/2020.2.0		unstable	gcc/8.4.0 openmpi/3.1.6 gsl/2.6
+elegant/32.0.0			deprecated	gcc/5.4.0 openmpi/1.10.4
+elegant/33.1.2			deprecated	gcc/5.4.0 openmpi/1.10.4
+elegant/34.2.0			deprecated	gcc/7.3.0 mpich/3.2.1
diff --git a/MPI/elegant/modulefile b/MPI/elegant/modulefile
index 8d5c272..040d321 100644
--- a/MPI/elegant/modulefile
+++ b/MPI/elegant/modulefile
@@ -18,6 +18,14 @@ and ramping machines. The code provides simulation of various collective
 effects, such as wakes and coherent synchrotron radiation.
 "
 
-setenv        RPN_DEFNS         $PREFIX/RPN-DEFNS
-setenv        HOST_ARCH         linux-x86_64
-setenv        EPICS_HOST_ARCH   linux-x86_64
+setenv		RPN_DEFNS		$PREFIX/RPN_DEFNS
+setenv		HOST_ARCH		linux-x86_64
+setenv		EPICS_HOST_ARCH		linux-x86_64
+
+append-path	PATH			$PREFIX/epics/extensions/bin/linux-x86_64
+append-path	PATH			$PREFIX/oag/apps/bin/linux-x86_64
+
+append-path	LIBRARY_PATH		$PREFIX/epics/extensions/lib/linux-x86_64
+append-path	C_INCLUDE_PATH		$PREFIX/epics/extensions/include
+append-path	CPLUS_INCLUDE_PATH	$PREFIX/epics/extensions/include
+append-path	PKG_CONFIG_PATH		$PREFIX/epics/base/lib