diff --git a/EnhancedSolver/2D-seq/src/grid.h b/EnhancedSolver/2D-seq/src/grid.h index 218ffa9..14c4f44 100644 --- a/EnhancedSolver/2D-seq/src/grid.h +++ b/EnhancedSolver/2D-seq/src/grid.h @@ -33,6 +33,6 @@ typedef struct { static inline int gridIsFluid(Grid* g, int i, int j) { - return g->s[j * (g->imax + 2) + i]; + return g->s[j * (g->imax + 2) + i] == FLUID; } #endif // __GRID_H_ diff --git a/EnhancedSolver/2D-seq/src/particletracing.c b/EnhancedSolver/2D-seq/src/particletracing.c index 5750b0c..07d575d 100644 --- a/EnhancedSolver/2D-seq/src/particletracing.c +++ b/EnhancedSolver/2D-seq/src/particletracing.c @@ -110,6 +110,8 @@ static void compress(ParticleTracer* p) Particle tempPool[p->totalParticles]; int totalParticles = 0; + printf("Performing compression ..."); + for (int i = 0; i < p->totalParticles; i++) { if (memPool[i].flag == 1) { tempPool[totalParticles].x = memPool[i].x; @@ -119,6 +121,7 @@ static void compress(ParticleTracer* p) } } + printf(" remove %d particles\n", p->totalParticles - totalParticles); p->totalParticles = totalParticles; p->removedParticles = 0; p->pointer = totalParticles + 1;