diff --git a/example/Numerics/Closest_point/Makefile b/example/Numerics/Closest_point/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..b7f56b266b574a2acd50ea95869feffa11d50f13 --- /dev/null +++ b/example/Numerics/Closest_point/Makefile @@ -0,0 +1,9 @@ +SUBDIRS := $(wildcard */.) + +all clean run: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $@ $(MAKECMDGOALS) + +.PHONY: all clean $(SUBDIRS) + diff --git a/example/Numerics/Surface_DCPSE/Bump/Makefile b/example/Numerics/Surface_DCPSE/Bump/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..324ee323a3c4c906bc8591e8d8326cb574bd8805 --- /dev/null +++ b/example/Numerics/Surface_DCPSE/Bump/Makefile @@ -0,0 +1,21 @@ +include example.mk + +CC=mpic++ + +LDIR = + +OBJ = Bump.o + +%.o: %.cpp + $(CC) -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH) + +Bump: $(OBJ) + $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) +all: Bump +run: all + mpirun -np 4 /Bump + +.PHONY: clean all run + +clean: + rm -f *.o *~ core Bump diff --git a/example/Numerics/Surface_DCPSE/Makefile b/example/Numerics/Surface_DCPSE/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..b7f56b266b574a2acd50ea95869feffa11d50f13 --- /dev/null +++ b/example/Numerics/Surface_DCPSE/Makefile @@ -0,0 +1,9 @@ +SUBDIRS := $(wildcard */.) + +all clean run: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $@ $(MAKECMDGOALS) + +.PHONY: all clean $(SUBDIRS) + diff --git a/install b/install index 05f76c1e6546a697163c268c4bef4ac88c308569..1f3d022bf86dae381f1de2e12545f4da2a6bf2c2 100755 --- a/install +++ b/install @@ -1,4 +1,8 @@ -#! /bin/bash +#!/bin/bash + +short_date=$(/bin/date +%m%d%y) +exec 2>>"install$short_date.log" +set -x source script/help source script/discover_os diff --git a/openfpm_data b/openfpm_data index 94125e792a7edc2d3927453d6563a66342ed5ebc..c1c3e0c4e8586bf5061dbabbfa48dd0c2dc86960 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit 94125e792a7edc2d3927453d6563a66342ed5ebc +Subproject commit c1c3e0c4e8586bf5061dbabbfa48dd0c2dc86960 diff --git a/script/install_HDF5.sh b/script/install_HDF5.sh index ffe608134b6bb901dba49e3ab571140191510663..7f81868dd0f3eb0aa74b619e4377f4fbee30436e 100755 --- a/script/install_HDF5.sh +++ b/script/install_HDF5.sh @@ -11,30 +11,30 @@ if [ -d "$1/HDF5" -a -f "$1/HDF5/include/hdf5.h" ]; then exit 0 fi -#if [ ! -d "$1/ZLIB" -a x"$platform" != x"cygwin" ]; then -# rm zlib-1.2.12.tar.gz -# rm -rf zlib-1.2.12 -# wget http://zlib.net/zlib-1.2.12.tar.gz -# if [ $? -ne 0 ]; then -# echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" -# exit 1 -# fi -# tar -xf zlib-1.2.12.tar.gz -# cd zlib-1.2.12 - -# CC=mpicc CFLAGS=-fPIC ./configure --prefix=$1/ZLIB -# make -j $2 -# if [ $? -eq 0 ]; then -# make check install -# else -# echo -e "\033[91;5;1m ZLIB Installation FAILED \033[0m" -# exit 1 -# fi -# cd .. - -#else -# echo "ZLIB is already installed" -#fi +if [ ! -d "$1/ZLIB" -a x"$platform" != x"cygwin" ]; then + rm zlib-1.2.11.tar.gz + rm -rf zlib-1.2.11 + wget https://zlib.net/fossils/zlib-1.2.11.tar.gz + if [ $? -ne 0 ]; then + echo -e "\033[91;5;1m FAILED! Installation requires an Internet connection \033[0m" + exit 1 + fi + tar -xf zlib-1.2.11.tar.gz + cd zlib-1.2.11 + + CC=mpicc CFLAGS=-fPIC ./configure --prefix=$1/ZLIB + make -j $2 + if [ $? -eq 0 ]; then + make check install + else + echo -e "\033[91;5;1m ZLIB Installation FAILED \033[0m" + exit 1 + fi + cd .. + +else + echo "ZLIB is already installed" +fi ### 1.8.19 does not compile on CYGWIN @@ -44,7 +44,7 @@ cd hdf5-1.10.8 # Disable zlib is completly unstable if [ x"$platform" != x"cygwin" ]; then - CC=mpicc ./configure --enable-parallel --prefix=$1/HDF5 + CC=mpicc ./configure --with-zlib=$1/ZLIB --enable-parallel --prefix=$1/HDF5 make -j $2 else CC=mpicc ./configure --enable-parallel --prefix=$1/HDF5 diff --git a/script/install_PETSC.sh b/script/install_PETSC.sh index 15f1acee97df4f2aa2c66f1f08f9796f95260659..35be00e4bf0e191d6f697cf9f882151cbfc335de 100755 --- a/script/install_PETSC.sh +++ b/script/install_PETSC.sh @@ -33,7 +33,7 @@ function haveProg() { if haveProg python2; then python_command=python2 else - python_command=python + python_command=python3 fi