studiorailgun/fluid-sim
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swapping arrays is raw arrays only
All checks were successful
studiorailgun/fluid-sim/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
unknown 2024-03-10 18:11:32 -04:00
parent f93936a96e
commit eac79e0afc
1 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/c/fluidsim.c
View File

@ -201,36 +201,7 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
Chunk * currentChunk = chunks[i]; Chunk * currentChunk = chunks[i];
chunkJRaw = currentChunk->jchunk; chunkJRaw = currentChunk->jchunk;
chunkMask = currentChunk->chunkMask; chunkMask = currentChunk->chunkMask;
jd = currentChunk->jd;
jd0 = currentChunk->jd0;
u = currentChunk->ju;
v = currentChunk->jv;
w = currentChunk->jw;
u0 = currentChunk->ju0;
v0 = currentChunk->jv0;
w0 = currentChunk->jw0;
setBuffArr(uJId,u0);
setBuffArr(u0JId,u);
setBuffArr(vJId,v0);
setBuffArr(v0JId,v);
setBuffArr(wJId,w0);
setBuffArr(w0JId,w);
jobject tmpObj;
tmpObj = currentChunk->ju;
currentChunk->ju = currentChunk->ju0;
currentChunk->ju0 = u;
tmpObj = currentChunk->jv;
currentChunk->jv = currentChunk->jv0;
currentChunk->jv0 = v;
tmpObj = currentChunk->jw;
currentChunk->jw = currentChunk->jw0;
currentChunk->jw0 = w;
float * tmpArr; float * tmpArr;
for(int j = 0; j < 27; j++){ for(int j = 0; j < 27; j++){
tmpArr = currentChunk->u[j]; tmpArr = currentChunk->u[j];
@ -456,35 +427,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
Chunk * currentChunk = chunks[i]; Chunk * currentChunk = chunks[i];
chunkJRaw = currentChunk->jchunk; chunkJRaw = currentChunk->jchunk;
chunkMask = currentChunk->chunkMask; chunkMask = currentChunk->chunkMask;
jd = currentChunk->jd;
jd0 = currentChunk->jd0;
u = currentChunk->ju;
v = currentChunk->jv;
w = currentChunk->jw;
u0 = currentChunk->ju0;
v0 = currentChunk->jv0;
w0 = currentChunk->jw0;
setBuffArr(uJId,u0);
setBuffArr(u0JId,u);
setBuffArr(vJId,v0);
setBuffArr(v0JId,v);
setBuffArr(wJId,w0);
setBuffArr(w0JId,w);
jobject tmpObj;
tmpObj = currentChunk->ju;
currentChunk->ju = currentChunk->ju0;
currentChunk->ju0 = u;
tmpObj = currentChunk->jv;
currentChunk->jv = currentChunk->jv0;
currentChunk->jv0 = v;
tmpObj = currentChunk->jw;
currentChunk->jw = currentChunk->jw0;
currentChunk->jw0 = w;
float * tmpArr; float * tmpArr;
for(int j = 0; j < 27; j++){ for(int j = 0; j < 27; j++){
@ -819,9 +761,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
Chunk * currentChunk = chunks[i]; Chunk * currentChunk = chunks[i];
chunkJRaw = currentChunk->jchunk; chunkJRaw = currentChunk->jchunk;
chunkMask = currentChunk->chunkMask; chunkMask = currentChunk->chunkMask;
u = currentChunk->ju;
v = currentChunk->jv;
w = currentChunk->jw;
Java_electrosphere_FluidSim_advectDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,currentChunk->u,currentChunk->v,currentChunk->w,DIFFUSION_CONSTANT,VISCOSITY_CONSTANT,timestep); Java_electrosphere_FluidSim_advectDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,currentChunk->u,currentChunk->v,currentChunk->w,DIFFUSION_CONSTANT,VISCOSITY_CONSTANT,timestep);
} }
} }