From 5c09da16bb00d2504ec5f51423dcec6daaf4bb0e Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Wed, 21 Oct 2020 17:47:56 +0200 Subject: [PATCH] Fixing examples --- example/Grid/1_stencil/main.cpp | 2 +- .../example_sussman_circle/main.cpp | 22 ++----------------- .../example_sussman_images_2D/main.cpp | 18 --------------- .../example_sussman_images_3D/main.cpp | 18 --------------- .../example_sussman_sphere/main.cpp | 18 --------------- 5 files changed, 3 insertions(+), 75 deletions(-) diff --git a/example/Grid/1_stencil/main.cpp b/example/Grid/1_stencil/main.cpp index 551e0dccd..932ac0e26 100644 --- a/example/Grid/1_stencil/main.cpp +++ b/example/Grid/1_stencil/main.cpp @@ -30,7 +30,7 @@ constexpr size_t y = 1; constexpr size_t z = 2; constexpr size_t A = 0; -constexpr size_t B = 0; +constexpr size_t B = 1; //! \cond [useful constant] \endcond diff --git a/example/Numerics/Sussman_redistancing/example_sussman_circle/main.cpp b/example/Numerics/Sussman_redistancing/example_sussman_circle/main.cpp index ecdf8377e..5ae634296 100644 --- a/example/Numerics/Sussman_redistancing/example_sussman_circle/main.cpp +++ b/example/Numerics/Sussman_redistancing/example_sussman_circle/main.cpp @@ -103,24 +103,6 @@ * */ //! @cond [Include] @endcond -// Include standard library header files -#include <iostream> -#include <typeinfo> -#include <cmath> -#include <cstdio> - -// Include header files from other libraries -#include <boost/log/core.hpp> -#include <boost/log/trivial.hpp> -#include <boost/log/expressions.hpp> -#include <boost/log/utility/setup/file.hpp> -#include <boost/log/utility/setup/common_attributes.hpp> - -// Include OpenFPM header files -#include "Vector/vector_dist.hpp" -#include "Grid/grid_dist_id.hpp" -#include "data_type/aggregate.hpp" -#include "Decomposition/CartDecomposition.hpp" // Include Redistancing header files #include "util/PathsAndFiles.hpp" @@ -282,10 +264,10 @@ int main(int argc, char* argv[]) redist_options.min_iter = 100; redist_options.max_iter = 10000; - redist_options.convTolChange.value = 1e-12; + redist_options.convTolChange.value = 1e-6; redist_options.convTolChange.check = true; redist_options.convTolResidual.value = 1e-6; - redist_options.convTolResidual.check = true; + redist_options.convTolResidual.check = false; redist_options.interval_check_convergence = 1; redist_options.width_NB_in_grid_points = 6; diff --git a/example/Numerics/Sussman_redistancing/example_sussman_images_2D/main.cpp b/example/Numerics/Sussman_redistancing/example_sussman_images_2D/main.cpp index b034f6790..18574a4b3 100644 --- a/example/Numerics/Sussman_redistancing/example_sussman_images_2D/main.cpp +++ b/example/Numerics/Sussman_redistancing/example_sussman_images_2D/main.cpp @@ -37,24 +37,6 @@ * */ //! @cond [Include] @endcond -// Include standard library header files -#include <iostream> -#include <typeinfo> -#include <cmath> -#include <cstdio> - -// Include header files from other libraries -#include <boost/log/core.hpp> -#include <boost/log/trivial.hpp> -#include <boost/log/expressions.hpp> -#include <boost/log/utility/setup/file.hpp> -#include <boost/log/utility/setup/common_attributes.hpp> - -// Include OpenFPM header files -#include "Vector/vector_dist.hpp" -#include "Grid/grid_dist_id.hpp" -#include "data_type/aggregate.hpp" -#include "Decomposition/CartDecomposition.hpp" // Include redistancing header files #include "util/PathsAndFiles.hpp" diff --git a/example/Numerics/Sussman_redistancing/example_sussman_images_3D/main.cpp b/example/Numerics/Sussman_redistancing/example_sussman_images_3D/main.cpp index 245699256..7e229fb95 100644 --- a/example/Numerics/Sussman_redistancing/example_sussman_images_3D/main.cpp +++ b/example/Numerics/Sussman_redistancing/example_sussman_images_3D/main.cpp @@ -43,24 +43,6 @@ * */ //! @cond [Include] @endcond -// Include standard library header files -#include <iostream> -#include <typeinfo> -#include <cmath> -#include <cstdio> - -// Include header files from other libraries -#include <boost/log/core.hpp> -#include <boost/log/trivial.hpp> -#include <boost/log/expressions.hpp> -#include <boost/log/utility/setup/file.hpp> -#include <boost/log/utility/setup/common_attributes.hpp> - -// Include OpenFPM header files -#include "Vector/vector_dist.hpp" -#include "Grid/grid_dist_id.hpp" -#include "data_type/aggregate.hpp" -#include "Decomposition/CartDecomposition.hpp" // Include redistancing header files #include "util/PathsAndFiles.hpp" diff --git a/example/Numerics/Sussman_redistancing/example_sussman_sphere/main.cpp b/example/Numerics/Sussman_redistancing/example_sussman_sphere/main.cpp index afcc9b7e4..c3286722a 100644 --- a/example/Numerics/Sussman_redistancing/example_sussman_sphere/main.cpp +++ b/example/Numerics/Sussman_redistancing/example_sussman_sphere/main.cpp @@ -63,24 +63,6 @@ * */ //! @cond [Include] @endcond -// Include standard library header files -#include <iostream> -#include <typeinfo> -#include <cmath> -#include <cstdio> - -// Include header files from other libraries -#include <boost/log/core.hpp> -#include <boost/log/trivial.hpp> -#include <boost/log/expressions.hpp> -#include <boost/log/utility/setup/file.hpp> -#include <boost/log/utility/setup/common_attributes.hpp> - -// Include OpenFPM header files -#include "Vector/vector_dist.hpp" -#include "Grid/grid_dist_id.hpp" -#include "data_type/aggregate.hpp" -#include "Decomposition/CartDecomposition.hpp" // Include level-set-method related header files #include "util/PathsAndFiles.hpp" -- GitLab