diff --git a/src/main/c/src/fluid/sim/grid2/density.c b/src/main/c/src/fluid/sim/grid2/density.c index c0562470..62f93659 100644 --- a/src/main/c/src/fluid/sim/grid2/density.c +++ b/src/main/c/src/fluid/sim/grid2/density.c @@ -52,14 +52,6 @@ void fluid_grid2_addDensity( ) ); } - // for(i=0; i MAX_FLUID_VALUE){ - // x[i] = MAX_FLUID_VALUE; - // } - // } } /* diff --git a/src/main/c/src/fluid/sim/grid2/velocity.c b/src/main/c/src/fluid/sim/grid2/velocity.c index 57ecaa1c..f97d1c64 100644 --- a/src/main/c/src/fluid/sim/grid2/velocity.c +++ b/src/main/c/src/fluid/sim/grid2/velocity.c @@ -73,32 +73,6 @@ LIBRARY_API void fluid_grid2_solveVectorDiffuse ( fluid_grid2_set_bounds(FLUID_GRID2_BOUND_DIR_V,v); fluid_grid2_set_bounds(FLUID_GRID2_BOUND_DIR_W,w); } - - // float residual; - // int iterations; - // residual = 1; - // iterations = 0; - // while(iterations < FLUID_GRID2_LINEARSOLVERTIMES && (residual > FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE || residual < -FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE)){ - // residual = solver_multigrid_parallel_iterate(u,u0,a,c); - // fluid_grid2_set_bounds(FLUID_GRID2_BOUND_DIR_U,u); - // iterations++; - // } - - // residual = 1; - // iterations = 0; - // while(iterations < FLUID_GRID2_LINEARSOLVERTIMES && (residual > FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE || residual < -FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE)){ - // residual = solver_multigrid_parallel_iterate(v,v0,a,c); - // fluid_grid2_set_bounds(FLUID_GRID2_BOUND_DIR_V,v); - // iterations++; - // } - - // residual = 1; - // iterations = 0; - // while(iterations < FLUID_GRID2_LINEARSOLVERTIMES && (residual > FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE || residual < -FLUID_GRID2_SOLVER_MULTIGRID_TOLERANCE)){ - // residual = solver_multigrid_parallel_iterate(w,w0,a,c); - // fluid_grid2_set_bounds(FLUID_GRID2_BOUND_DIR_W,w); - // iterations++; - // } } /** @@ -233,12 +207,6 @@ LIBRARY_API void fluid_grid2_solveProjection( if(chunk->projectionResidual > FLUID_GRID2_SOLVER_CG_TOLERANCE || chunk->projectionResidual < -FLUID_GRID2_SOLVER_CG_TOLERANCE){ printf("Projection residual didn't converge! %f \n",chunk->projectionResidual); } - - //finest grain iteration with conjugate gradient method - // int shouldSolve = solver_conjugate_gradient_init(p,div,a,c); - // if(shouldSolve < 1){ - // solver_conjugate_gradient_iterate(p,div,a,c); - // } } /**