From 073d1bed3ad9ee279cffd3e30d2e5ccd2cf6738b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Sat, 7 Oct 2017 11:48:05 +0200
Subject: [PATCH] 	modified:   i/imkl/imkl-2018.0.128-iimpi-2018.00.eb 
 new file:   n/Netgen/Netgen-6.3.eb 	deleted:   
 n/Netgen/Netgen-4.9.11-test.eb

---
 i/imkl/imkl-2018.0.128-iimpi-2018.00.eb |  2 --
 n/Netgen/Netgen-4.9.11-test.eb          | 40 -------------------------
 n/Netgen/Netgen-6.3.eb                  | 35 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 42 deletions(-)
 delete mode 100644 n/Netgen/Netgen-4.9.11-test.eb
 create mode 100644 n/Netgen/Netgen-6.3.eb

diff --git a/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb b/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
index 648037d2..1313f305 100644
--- a/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
+++ b/i/imkl/imkl-2018.0.128-iimpi-2018.00.eb
@@ -25,8 +25,6 @@ postinstallcmds = [
     'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
     'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
     'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
-    'tar xvzf %(installdir)s/mkl/examples/examples_mic_c.tgz -C %(installdir)s/mkl/examples/',
-    'tar xvzf %(installdir)s/mkl/examples/examples_mic_f.tgz -C %(installdir)s/mkl/examples/'
 ]
 
 modextravars = {
diff --git a/n/Netgen/Netgen-4.9.11-test.eb b/n/Netgen/Netgen-4.9.11-test.eb
deleted file mode 100644
index 3973d256..00000000
--- a/n/Netgen/Netgen-4.9.11-test.eb
+++ /dev/null
@@ -1,40 +0,0 @@
-easyblock = 'ConfigureMake'
-
-name = 'Netgen'
-version = "4.9.11"
-versionsuffix = '-test'
-
-homepage = 'https://ngsolve.org/'
-description = """Netgen/NGSolve is a high performance multiphysics finite element software. It is widely used to
-analyze models from solid mechanics, fluid dynamics and electromagnetics. Due to its flexible Python interface
-new physical equations and solution algorithms can be implemented easily."""
-
-toolchain = {'name': 'intel', 'version': '2017a'}
-
-source_urls = ['https://ayera.dl.sourceforge.net/project/netgen-mesher/netgen-mesher/Old%20Releases/%(version)s/']
-sources = ['netgen-%(version)s.tar.gz']
-
-dependencies = [
-    ('Togl', '1.7', '', True),
-    ('Tk', '8.6.5', '', True),
-    ('Tcl','8.6.5', '', True),
-#    ('METIS', '5.1.0'),
-]
-
-preconfigopts = "wget https://raw.githubusercontent.com/velizarefremov/parallel-netgen/master/NG/nglib.h && "
-preconfigopts += "wget https://raw.githubusercontent.com/velizarefremov/parallel-netgen/master/NG/nglib.cpp && "
-preconfigopts += "mv nglib.h nglib.cpp ng/ && "
-
-configopts = '--with-tcl=$EBROOTTCL/lib --with-tk=$EBROOTTK/lib --with-togl=$EBROOTTOGL CXX=mpicxx CC=mpicc'
-
-postinstallcmds = [
-    'mkdir %(installdir)s/build',
-    'cp * %(installdir)s/build -R',
-]
-
-sanity_check_paths = {
-    'files': [],
-    'dirs': ['bin', 'include', 'share', 'lib'],
-}
-
-moduleclass = 'phys'
diff --git a/n/Netgen/Netgen-6.3.eb b/n/Netgen/Netgen-6.3.eb
new file mode 100644
index 00000000..59778e3d
--- /dev/null
+++ b/n/Netgen/Netgen-6.3.eb
@@ -0,0 +1,35 @@
+easyblock = 'CMakeMake'
+
+name = 'Netgen'
+version = "6.3"
+
+homepage = 'https://ngsolve.org/'
+description = """Netgen/NGSolve is a high performance multiphysics finite element software. It is widely used to
+analyze models from solid mechanics, fluid dynamics and electromagnetics. Due to its flexible Python interface
+new physical equations and solution algorithms can be implemented easily."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = ['https://github.com/trelau/netgen/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [
+    ('CMake', '3.9.0', '', True),
+]
+
+dependencies = [
+#    ('Togl', '1.7', '', True),
+    ('Tk', '8.6.6', '', True),
+    ('Tcl','8.6.6', '', True),
+    ('zlib', '1.2.11', '', True),
+]
+
+#configopts = '--with-tcl=$EBROOTTCL/lib --with-tk=$EBROOTTK/lib --with-togl=$EBROOTTOGL CXX=mpicxx CC=mpicc'
+#configopts = '--with-tcl=$EBROOTTCL/lib --with-tk=$EBROOTTK/lib CXX=mpicxx CC=mpicc'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin'],
+}
+
+moduleclass = 'phys'