From 2e5db44b44e74048468b291a4b880b64e32bff29 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Fri, 24 Feb 2017 01:40:16 +0100 Subject: [PATCH] Fixing Example 7 to run in test mode --- CHANGELOG.md | 26 +++++++++++++++----------- example/Vector/7_SPH_dlb/Makefile | 8 ++++++-- example/Vector/7_SPH_dlb/main.cpp | 4 ++++ example/Vector/7_SPH_dlb_opt/Makefile | 8 ++++++-- example/Vector/7_SPH_dlb_opt/main.cpp | 4 ++++ 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80330b4b4..fa176d72c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,29 @@ # Change Log All notable changes to this project will be documented in this file. -## [0.8.0] February +## [0.8.0] 28 February 2016 ### Added - Dynamic Load balancing - Added SPH Dam break with Dynamic load balancing (7_sph_dlb)(7_sph_dlb_opt) -- Added procedure for update ./install --update - (From 0.8.0 version will be supported for bug fixing, version 0.X.0 will be supported untill - 0.X+2.0 will be out) +- Added automatic procedure for update ./install --update and --upgrade + (From 0.8.0 version will have a long term support for bug fixing. End-of-life of 0.8.0 is not decided yet, it should be still supported for bug fixing after release 0.9.0) - Added video lessons for Dynamic load balancing (openfpm.mpi-cbg.de) -- Added for debugging the options PRINT_STACKTRACE, CHECKFOR_POSNAN, CHECKFOR_POSINF, CHECKFOR_PROPINF, CHECKFOR_PROPNAN, SE_CLASS3 for debugging. Additional example added (7_sph_dlb_safe) -- Added the possibility to write binary VTK files using VTK_WRITER_BINARY 0_simple_vector - example - + (website officially open) +- Added for debugging the options PRINT_STACKTRACE, CHECKFOR_POSNAN, CHECKFOR_POSINF, CHECKFOR_PROPINF, CHECKFOR_PROPNAN, SE_CLASS3. +- Added the possibility to write binary VTK files using VTK_WRITER and FORMAT_BINARY see 0_simple_vector for an example + +### Fixed +- Installation of PETSC with MUMPS ### Changed - BOOST updated to 1.63 - Eigen updated to 3.3.7 -- Option CSV_WRITER changed to CSV_WRITER_ASCII + +## [0.7.1] 28 January 2016 + +### Fixed +- Multiphase verlet single to all case generate overflow ## [0.7.0] 15 December 2016 @@ -29,8 +34,7 @@ All notable changes to this project will be documented in this file. ### Fixed - CRITICAL BUG: OpenFPM has a bug handling decomposition when a processor has a disconnected domains - (By experience this case has been seen on big number of processors). Please update to - 0.7.0 or apply the patch to upgrade to 0.6.1 + (By experience this case has been seen on big number of processors). - Found and fixed a memory leak when using complex properties -### Changed diff --git a/example/Vector/7_SPH_dlb/Makefile b/example/Vector/7_SPH_dlb/Makefile index e3e868124..85872d2a3 100644 --- a/example/Vector/7_SPH_dlb/Makefile +++ b/example/Vector/7_SPH_dlb/Makefile @@ -3,18 +3,22 @@ include ../../example.mk CC=mpic++ LDIR = +OPT= OBJ = main.o +sph_dlb_test: OPT += -DTEST_RUN +sph_dlb_test: sph_dlb + %.o: %.cpp - $(CC) -O3 -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) + $(CC) -O3 $(OPT) -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) sph_dlb: $(OBJ) $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) all: sph_dlb -run: sph_dlb +run: sph_dlb_test mpirun -np 2 ./sph_dlb .PHONY: clean all run diff --git a/example/Vector/7_SPH_dlb/main.cpp b/example/Vector/7_SPH_dlb/main.cpp index 4d5f51c0b..e5049ce33 100644 --- a/example/Vector/7_SPH_dlb/main.cpp +++ b/example/Vector/7_SPH_dlb/main.cpp @@ -135,7 +135,11 @@ const double MassFluid = 0.000614125; const double MassBound = 0.000614125; // End simulation time +#ifdef TEST_RUN +const double t_end = 0.001; +#else const double t_end = 1.5; +#endif // Gravity acceleration const double gravity = 9.81; diff --git a/example/Vector/7_SPH_dlb_opt/Makefile b/example/Vector/7_SPH_dlb_opt/Makefile index e3e868124..85872d2a3 100644 --- a/example/Vector/7_SPH_dlb_opt/Makefile +++ b/example/Vector/7_SPH_dlb_opt/Makefile @@ -3,18 +3,22 @@ include ../../example.mk CC=mpic++ LDIR = +OPT= OBJ = main.o +sph_dlb_test: OPT += -DTEST_RUN +sph_dlb_test: sph_dlb + %.o: %.cpp - $(CC) -O3 -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) + $(CC) -O3 $(OPT) -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) sph_dlb: $(OBJ) $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) all: sph_dlb -run: sph_dlb +run: sph_dlb_test mpirun -np 2 ./sph_dlb .PHONY: clean all run diff --git a/example/Vector/7_SPH_dlb_opt/main.cpp b/example/Vector/7_SPH_dlb_opt/main.cpp index 59bdb00ac..f1cf83fde 100644 --- a/example/Vector/7_SPH_dlb_opt/main.cpp +++ b/example/Vector/7_SPH_dlb_opt/main.cpp @@ -245,7 +245,11 @@ const double MassFluid = 0.000614125; const double MassBound = 0.000614125; // End simulation time +#ifndef TEST_RUN const double t_end = 1.5; +#else +const double t_end = 0.001; +#endif // Gravity acceleration const double gravity = 9.81; -- GitLab