Skip to content

Commit

Permalink
SPH
Browse files Browse the repository at this point in the history
  • Loading branch information
@i-saint
i-saint committed Apr 19, 2012
1 parent bb43263 commit 7810f40
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 77 deletions.
5 changes: 3 additions & 2 deletions SPH_const.h
View file
@@ -1,11 +1,12 @@
#ifndef _SPH_const_h_
#define _SPH_const_h_

#define SPH_PARTICLE_SIZE 0.04f
#define SPH_PARTICLE_SIZE 0.08f

//#define SPH_MAX_PARTICLE_NUM 131072
#define SPH_MAX_PARTICLE_NUM 100000
//#define SPH_MAX_PARTICLE_NUM 100000
//#define SPH_MAX_PARTICLE_NUM 65536
#define SPH_MAX_PARTICLE_NUM 50000
//#define SPH_MAX_PARTICLE_NUM 32768
//#define SPH_MAX_PARTICLE_NUM 16384
//#define SPH_MAX_PARTICLE_NUM 1024
Expand Down
70 changes: 37 additions & 33 deletions SPH_core.ispc
View file
Expand Up @@ -9,10 +9,9 @@
#include "SPH_const.h"
typedef unsigned int32 uint32;

#define SPH_FLUID_BLOCK_SIZE 128

#define SPH_PRESSURE_STIFFNESS 50.0f
#define SPH_REST_DENSITY 500.0f
#define SPH_PRESSURE_STIFFNESS 200.0f
#define SPH_REST_DENSITY 1000.0f
#define SPH_WALL_STIFFNESS 3000.0f
#define SPH_PARTICLE_MASS 0.002f
#define SPH_PARTICLE_VISCOSITY 0.1f
Expand All @@ -33,7 +32,7 @@ export void sphInitializeConstants()
}

struct Vec3 { float x,y,z; };
static soa<8> Vec3 g_accel[SPH_MAX_PARTICLE_NUM/8 + SPH_GRID_CELL_NUM];
static soa<8> Vec3 g_accel[SPH_MAX_PARTICLE_NUM];

struct Particle
{
Expand Down Expand Up @@ -86,8 +85,8 @@ export void sphUpdateDensity(
for(uniform int32 i=0; i<particle_num; ++i) {
uniform vec3 pos1 = {particles[i].posx, particles[i].posy, particles[i].posz};
float density = 0.0f;
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
uniform const GridData &ngd = grid[nyi*SPH_GRID_DIV + nxi];
uniform const int32 neighbor_num = ngd.y - ngd.x;
soa<8> Particle * uniform neighbors = &all_particles[ngd.soai*8];
Expand Down Expand Up @@ -152,14 +151,13 @@ static inline vec3 sphComputeAccel(
vec3 vel1,
vec3 vel2,
float pressure1,
float density2,
int32 id1, int32 id2)
float density2 )
{
static uniform const float h_sq = SPH_PARTICLE_SIZE * SPH_PARTICLE_SIZE;
vec3 accel = {0.0f, 0.0f, 0.0f};
vec3 diff = pos2 - pos1;
float r_sq = dot3(diff, diff);
if(r_sq < h_sq && id1!=id2) {
if(r_sq < h_sq && r_sq > 0.0f) {
float pressure2 = sphCalculatePressure(density2);
float r = sqrt(r_sq);

Expand Down Expand Up @@ -188,24 +186,22 @@ export void sphUpdateForce(
uniform const int32 ny_end = min(yi+1, SPH_GRID_DIV-1);

for(uniform int32 i=0; i<particle_num; ++i) {
uniform int32 id1 = gd.soai*8+i;
uniform vec3 pos1 = {particles[i].posx, particles[i].posy, particles[i].posz};
uniform vec3 vel1 = {particles[i].velx, particles[i].vely, particles[i].velz};
uniform float density1 = particles[i].density;
uniform float pressure1 = sphCalculatePressure(density1);

vec3 accel = {0.0f, 0.0f, 0.0f};
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
uniform const GridData &ngd = grid[nyi*SPH_GRID_DIV + nxi];
uniform const int32 neighbor_num = ngd.y - ngd.x;
soa<8> Particle * uniform neighbors = &all_particles[ngd.soai*8];
foreach(t=0 ... neighbor_num) {
int32 id2 = ngd.soai*8+t;
vec3 pos2 = {neighbors[t].posx, neighbors[t].posy, neighbors[t].posz};
vec3 vel2 = {neighbors[t].velx, neighbors[t].vely, neighbors[t].velz};
float density2 = neighbors[t].density;
accel += sphComputeAccel(pos1, pos2, vel1, vel2, pressure1, density2, id1, id2);
accel += sphComputeAccel(pos1, pos2, vel1, vel2, pressure1, density2);
}
}
}
Expand All @@ -221,26 +217,33 @@ static inline void sphComputeGravity(
vec3 pos1,
vec3 &vel1 )
{
uniform const float<4> planes[6] = {
{ 0.0f, 1.0f, 0.0f,-0},
{ 0.0f,-1.0f, 0.0f, SPH_GRID_SIZE},
{ 1.0f, 0.0f, 0.0f,-SPH_GRID_SIZE},
{-1.0f, 0.0f, 0.0f, SPH_GRID_SIZE},
{ 0.0f, 0.0f, 1.0f,-SPH_GRID_SIZE},
{ 0.0f, 0.0f,-1.0f, SPH_GRID_SIZE},
};
for(int i=0; i<1; ++i) {
vec3 n = planes[i].xyz;
float d = dot3(n, pos1) + planes[i].w;
vel1 += n * (-min(0.0f, d) * SPH_WALL_STIFFNESS);
}
const uniform float CENTER_SPHERE_RADIUS = 1.75f;
const uniform float GRAVITY = 5.0f;

// �d�͉���
{
const uniform float GRAVITY = 3.5f;
vec3 dir = { 0.0f, -1.0f, 0.0f};
// ���S�̋��Ƃ̏Փ˔���
vec3 diff = -pos1;
float d = length3(diff);
vec3 dir = diff / d;
vel1 += dir * (min(0.0f, d-CENTER_SPHERE_RADIUS) * SPH_WALL_STIFFNESS);

// �d�͉���
vel1 += dir * GRAVITY;
}

//uniform const float<4> planes[6] = {
// { 0.0f, 1.0f, 0.0f,-0},
// { 0.0f,-1.0f, 0.0f, SPH_GRID_SIZE},
// { 1.0f, 0.0f, 0.0f,-SPH_GRID_SIZE},
// {-1.0f, 0.0f, 0.0f, SPH_GRID_SIZE},
// { 0.0f, 0.0f, 1.0f,-SPH_GRID_SIZE},
// { 0.0f, 0.0f,-1.0f, SPH_GRID_SIZE},
//};
//for(int i=0; i<1; ++i) {
// vec3 n = planes[i].xyz;
// float d = dot3(n, pos1) + planes[i].w;
// vel1 += n * (-min(0.0f, d) * SPH_WALL_STIFFNESS);
//}
}


Expand All @@ -260,9 +263,10 @@ export void sphIntegrate(
foreach(i=0 ... particle_num) {
vec3 vel = {particles[i].velx, particles[i].vely, particles[i].velz};
vec3 accel = {accels[i].x, accels[i].y, accels[i].z};
//vec3 accel = {0.0f, 0.0f, 0.0f};
vec3 pos = {particles[i].posx, particles[i].posy, particles[i].posz};

const uniform float DECELERATE = 0.995;
const uniform float DECELERATE = 0.999;
sphComputeGravity(pos, accel);
vel += accel * timestep;
// ���R����
Expand Down Expand Up @@ -350,8 +354,8 @@ export void impUpdateVelocity(
uniform vec3 pos1 = {particles[i].posx, particles[i].posy, particles[i].posz};
uniform vec3 vel1 = {particles[i].velx, particles[i].vely, particles[i].velz};
vec3 accel = {0.0f, 0.0f, 0.0f};
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nyi=ny_beg; nyi<=ny_end; ++nyi) {
for(uniform int32 nxi=nx_beg; nxi<=nx_end; ++nxi) {
uniform const GridData &ngd = grid[nyi*SPH_GRID_DIV + nxi];
soa<8> Particle * uniform neighbors = &all_particles[ngd.soai*8];
uniform const int32 neighbor_num = ngd.y - ngd.x;
Expand Down
76 changes: 38 additions & 38 deletions SPH_types.cpp
View file
Expand Up @@ -177,50 +177,15 @@ void sphGrid::update()
}
});

//// SPH
//tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
// [ce, so](const tbb::blocked_range<int> &r) {
// for(int i=r.begin(); i!=r.end(); ++i) {
// int32 n = ce[i].y - ce[i].x;
// if(n > 0) {
// int xi, yi;
// GenIndex(i, xi, yi);
// ispc::sphUpdateDensity(so, ce, xi, yi);
// }
// }
//});
//tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
// [ce, so](const tbb::blocked_range<int> &r) {
// for(int i=r.begin(); i!=r.end(); ++i) {
// int32 n = ce[i].y - ce[i].x;
// if(n > 0) {
// int xi, yi;
// GenIndex(i, xi, yi);
// ispc::sphUpdateForce(so, ce, xi, yi);
// }
// }
//});
//tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
// [ce, so](const tbb::blocked_range<int> &r) {
// for(int i=r.begin(); i!=r.end(); ++i) {
// int32 n = ce[i].y - ce[i].x;
// if(n > 0) {
// int xi, yi;
// GenIndex(i, xi, yi);
// ispc::sphIntegrate(so, ce, xi, yi);
// }
// }
//});

// impulse
// SPH
tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
[ce, so](const tbb::blocked_range<int> &r) {
for(int i=r.begin(); i!=r.end(); ++i) {
int32 n = ce[i].y - ce[i].x;
if(n > 0) {
int xi, yi;
GenIndex(i, xi, yi);
ispc::impUpdateVelocity(so, ce, xi, yi);
ispc::sphUpdateDensity(so, ce, xi, yi);
}
}
});
Expand All @@ -231,10 +196,45 @@ void sphGrid::update()
if(n > 0) {
int xi, yi;
GenIndex(i, xi, yi);
ispc::impIntegrate(so, ce, xi, yi);
ispc::sphUpdateForce(so, ce, xi, yi);
}
}
});
tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
[ce, so](const tbb::blocked_range<int> &r) {
for(int i=r.begin(); i!=r.end(); ++i) {
int32 n = ce[i].y - ce[i].x;
if(n > 0) {
int xi, yi;
GenIndex(i, xi, yi);
ispc::sphIntegrate(so, ce, xi, yi);
}
}
});

//// impulse
//tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
// [ce, so](const tbb::blocked_range<int> &r) {
// for(int i=r.begin(); i!=r.end(); ++i) {
// int32 n = ce[i].y - ce[i].x;
// if(n > 0) {
// int xi, yi;
// GenIndex(i, xi, yi);
// ispc::impUpdateVelocity(so, ce, xi, yi);
// }
// }
//});
//tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
// [ce, so](const tbb::blocked_range<int> &r) {
// for(int i=r.begin(); i!=r.end(); ++i) {
// int32 n = ce[i].y - ce[i].x;
// if(n > 0) {
// int xi, yi;
// GenIndex(i, xi, yi);
// ispc::impIntegrate(so, ce, xi, yi);
// }
// }
//});

tbb::parallel_for(tbb::blocked_range<int>(0, SPH_GRID_CELL_NUM, 128),
[ps, ce, so](const tbb::blocked_range<int> &r) {
Expand Down
7 changes: 3 additions & 4 deletions SPH_types.h
View file
Expand Up @@ -16,7 +16,7 @@ using ist::soavec44;

typedef ispc::Particle_SOA8 sphParticleSOA8;
typedef ispc::GridData sphGridData;
typedef sphGridData (sphGridDataArray2D)[SPH_GRID_DIV][SPH_GRID_DIV];


__declspec(align(16))
struct sphParticle
Expand All @@ -25,10 +25,9 @@ struct sphParticle
simdvec4 velocity;
union {
struct {
float32 energy;
float32 density;
uint32 hash;
uint32 dummy[1];
uint32 dummy[2];
} params;
simdvec4 paramsv;
};
Expand All @@ -38,7 +37,7 @@ __declspec(align(16))
struct sphGrid
{
sphParticle particles[SPH_MAX_PARTICLE_NUM];
sphParticleSOA8 particles_soa[SPH_MAX_PARTICLE_NUM/8 + SPH_GRID_CELL_NUM];
sphParticleSOA8 particles_soa[SPH_MAX_PARTICLE_NUM];
sphGridData cell[SPH_GRID_DIV][SPH_GRID_DIV];

sphGrid();
Expand Down

0 comments on commit 7810f40

Please sign in to comment.