diff --git a/build_linux64/default.inp b/build_linux64/default.inp index 38da61e..42a9dcf 100644 --- a/build_linux64/default.inp +++ b/build_linux64/default.inp @@ -6,7 +6,7 @@ avariable = bla anothervar = 1.2,1.3, 1.5 //this is a comment -operatingmode = 3 +operatingmode = 1 //1 - STL output //2 - count triangles //3 - count area @@ -14,11 +14,11 @@ operatingmode = 3 verbosity = 2 //domain -xyz_min = -2.0,-2.0,-2.0 -xyz_max = 2.0,2.0,2.0 -Nx = 128 -Ny = 128 -Nz = 128 +xyz_min = -1.3,-1.3,-1.3 +xyz_max = 1.3,1.3,1.3 +Nx = 150 +Ny = 150 +Nz = 150 //execution parallelism pars nblockdiv = 64 @@ -28,11 +28,11 @@ nthreads = 256 //not all pars apply to all functions isjulia = 1 -juliac = 0.0,0.0,0.0 +juliac = 0.490,0.640,-0.510 exponent = 4.0 -fractaliter = 100 +fractaliter = 5 freezethresh = 10.0 -threshold = 0.2 +threshold = 2.5 scale = 0.5 diff --git a/build_linux64/libamscudafractallevelset.linux64.a b/build_linux64/libamscudafractallevelset.linux64.a index aada216..bba3414 100644 Binary files a/build_linux64/libamscudafractallevelset.linux64.a and b/build_linux64/libamscudafractallevelset.linux64.a differ diff --git a/build_linux64/objstore/amscufracls_bagoftriangles.o b/build_linux64/objstore/amscufracls_bagoftriangles.o index ecfb81b..e75c5de 100644 Binary files a/build_linux64/objstore/amscufracls_bagoftriangles.o and b/build_linux64/objstore/amscufracls_bagoftriangles.o differ diff --git a/build_linux64/objstore/amscufracls_function.o b/build_linux64/objstore/amscufracls_function.o index 5c8a55a..b18bdeb 100644 Binary files a/build_linux64/objstore/amscufracls_function.o and b/build_linux64/objstore/amscufracls_function.o differ diff --git a/build_linux64/objstore/amscufracls_marchingtets.o b/build_linux64/objstore/amscufracls_marchingtets.o index a1b7abf..2645b14 100644 Binary files a/build_linux64/objstore/amscufracls_marchingtets.o and b/build_linux64/objstore/amscufracls_marchingtets.o differ diff --git a/build_linux64/objstore/amscufracls_misc.o b/build_linux64/objstore/amscufracls_misc.o index af664b7..8c0fc7e 100644 Binary files a/build_linux64/objstore/amscufracls_misc.o and b/build_linux64/objstore/amscufracls_misc.o differ diff --git a/build_linux64/objstore/amscufracls_mtcube.o b/build_linux64/objstore/amscufracls_mtcube.o index fec80a1..fd55904 100644 Binary files a/build_linux64/objstore/amscufracls_mtcube.o and b/build_linux64/objstore/amscufracls_mtcube.o differ diff --git a/build_linux64/objstore/amscufracls_parseinputfile.o b/build_linux64/objstore/amscufracls_parseinputfile.o index d405259..b40010c 100644 Binary files a/build_linux64/objstore/amscufracls_parseinputfile.o and b/build_linux64/objstore/amscufracls_parseinputfile.o differ diff --git a/build_linux64/objstore/amscufracls_template.o b/build_linux64/objstore/amscufracls_template.o index 182e159..ccd728d 100644 Binary files a/build_linux64/objstore/amscufracls_template.o and b/build_linux64/objstore/amscufracls_template.o differ diff --git a/build_linux64/objstore/amscufracls_tetrahedron.o b/build_linux64/objstore/amscufracls_tetrahedron.o index bcee4de..19bf0db 100644 Binary files a/build_linux64/objstore/amscufracls_tetrahedron.o and b/build_linux64/objstore/amscufracls_tetrahedron.o differ diff --git a/build_linux64/test b/build_linux64/test index 06ea39d..b7d6338 100644 Binary files a/build_linux64/test and b/build_linux64/test differ diff --git a/include/amscudafractallevelset/amscudafractallevelset.cuh b/include/amscudafractallevelset/amscudafractallevelset.cuh index 451daa8..133fb0a 100644 --- a/include/amscudafractallevelset/amscudafractallevelset.cuh +++ b/include/amscudafractallevelset/amscudafractallevelset.cuh @@ -38,8 +38,8 @@ class cuvec4f; // #define AMSCU_CONST // #endif -//#define AMSCLS_MANDELBROT -#define AMSCLS_PPKFRACTAL +#define AMSCLS_MANDELBROT +//#define AMSCLS_PPKFRACTAL namespace amscuda