easy-iso

commit 0a03d44d05e123755cf7de1a7a87897aa3db7d89
parent 60ef5a437e46b1644978d01760283f109a39a98f
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Mon, 28 Nov 2016 15:23:41 +0100

added CubismZ submodule for wavelet dump support

Diffstat:
A
.gitmodules
 | 
3
+++
A
third_party/CubismZ
 | 
1
+
A
third_party/Makefile
 | 
13
+++++++++++++
A
third_party/Makefile.cubismz
 | 
28
++++++++++++++++++++++++++++

4 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "third_party/CubismZ"]
+	path = third_party/CubismZ
+	url = fabianw@scratch-petros.ethz.ch:/export/home/gitroot/CubismZ.git
diff --git a/third_party/CubismZ b/third_party/CubismZ
@@ -0,0 +1 @@
+Subproject commit 1ba9086aefb1d60b59190d07ad917031c787dd88
diff --git a/third_party/Makefile b/third_party/Makefile
@@ -0,0 +1,13 @@
+include ../Makefile.config
+
+.PHONY: cleanCubismZ cleanall
+
+all: libCubismZ.a
+
+libCubismZ.a:
+	$(MAKE) -e -f Makefile.cubismz CC=$(CC) config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1
+
+cleanCubismZ:
+	$(MAKE) -f Makefile.cubismz clean
+
+cleanall: cleanCubismZ
diff --git a/third_party/Makefile.cubismz b/third_party/Makefile.cubismz
@@ -0,0 +1,28 @@
+include CubismZ/CubismApps/Makefile.config
+
+ifneq "$(findstring mira,$(shell hostname))" ""
+       CPPFLAGS += -I${HOME}/usr/zlib/include
+       LIBS += -L${HOME}/usr/zlib/lib
+       CPPFLAGS += -I/soft/libraries/hdf5/current/cnk-xl/current/include
+       LIBS += -L/soft/libraries/hdf5/current/cnk-xl/current/lib
+endif
+
+ifneq "$(findstring cetus,$(shell hostname))" ""
+       CPPFLAGS += -I${HOME}/usr/zlib/include
+       LIBS += -L${HOME}/usr/zlib/lib
+       CPPFLAGS += -I/soft/libraries/hdf5/current/cnk-xl/current/include
+       LIBS += -L/soft/libraries/hdf5/current/cnk-xl/current/lib
+endif
+
+CubismZ_SRC = CubismZ/CubismApps/Compressor/source/WaveletCompressor.cpp
+OBJLib1 = ${CubismZ_SRC:.cpp=.o}
+
+all: $(OBJLib1)
+	ar rcs ../lib/libCubismZ.a $(OBJLib1)
+	ranlib ../lib/libCubismZ.a
+
+.cpp.o:
+	$(CC) -c $(CPPFLAGS) $(INC) -o $@ $<
+
+clean:
+	rm -f $(OBJLib1) ../lib/libCubismZ.a