From 3e8f38be547b50ad8fd7e65ce1efaaf7a5c372fb Mon Sep 17 00:00:00 2001 From: Incardona Pietro <incardon@mpi-cbg.de> Date: Wed, 24 Mar 2021 20:06:49 +0100 Subject: [PATCH] Fixing Sparse grid surface --- example/SparseGrid/5_gray_scott_3d_surface_cs_opt/Makefile | 2 +- example/SparseGrid/5_gray_scott_3d_surface_cs_opt/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/Makefile b/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/Makefile index d6018ae5d..177415809 100644 --- a/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/Makefile +++ b/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/Makefile @@ -16,7 +16,7 @@ gray_scott_sparse_surface_cs: $(OBJ) all: gray_scott_sparse_surface_cs -run: gray_scott_sparse_cs_surface_test +run: gray_scott_sparse_surface_cs_test mpirun -np 4 ./gray_scott_sparse_surface_cs .PHONY: clean all run diff --git a/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/main.cpp b/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/main.cpp index 53e1c15f7..7c77eb62e 100644 --- a/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/main.cpp +++ b/example/SparseGrid/5_gray_scott_3d_surface_cs_opt/main.cpp @@ -90,7 +90,7 @@ void extend(sgrid_type & grid, size_t (& sz)[3],double (& spacing)[3]) double delta = 1e-10; double max = 0.0; - auto func_extend = [&grid,delta,&spacing](auto & grid, auto & ids, + auto func_extend = [delta,&spacing](auto & grid, auto & ids, unsigned char * mask_sum) { Vc::double_v phi_c; @@ -238,7 +238,7 @@ int main(int argc, char* argv[]) for (size_t i = 0; i < timeSteps ; ++i) { - auto func_grad = [&grid,&spacing](auto & grid, auto & ids, + auto func_grad = [&spacing](auto & grid, auto & ids, unsigned char * mask_sum){ Vc::double_v n[3]; @@ -302,7 +302,7 @@ int main(int argc, char* argv[]) grid.template conv_cross_ids<1,double>({0,0,0},{sz[0]-1,sz[1] - 1,sz[2] - 1},func_grad); - auto func_lap = [&grid,&spacing,uFactor,vFactor,deltaT,K,F](auto & grid, auto & ids, + auto func_lap = [&spacing,uFactor,vFactor,deltaT,K,F](auto & grid, auto & ids, unsigned char * mask_sum){ Vc::double_v gradU_px; -- GitLab