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

Compare commits

base: studiorailgun:1389b47ce1d8ff65edc095f0b8c9112abf2a2f0d
Branches Tags
studiorailgun:master
studiorailgun:jenkinsAutoTesting
studiorailgun:migrate-multichunk-to-c
studiorailgun:migration-successful
studiorailgun:multichunking-success
studiorailgun:c-single-thread
..
compare: studiorailgun:6867733a0f963b3c9b86925ca155dd06886e4d2b
Branches Tags
studiorailgun:master
studiorailgun:jenkinsAutoTesting
studiorailgun:migrate-multichunk-to-c
studiorailgun:migration-successful
studiorailgun:multichunking-success
studiorailgun:c-single-thread

No commits in common. "1389b47ce1d8ff65edc095f0b8c9112abf2a2f0d" and "6867733a0f963b3c9b86925ca155dd06886e4d2b" have entirely different histories.
1389b47ce1 ... 6867733a0f

1 changed files with 30 additions and 43 deletions
Show Stats Expand all files Collapse all files

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

@ -677,17 +677,16 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
//add density //add density
{ {
for(int i = 0; i < numChunks; i++){ for(int i = 0; i < numChunks; i++){
Chunk * currentChunk = chunks[i]; chunkJRaw = getChunk(i);
chunkJRaw = currentChunk->jchunk; chunkMask = (*env)->GetIntField(env,chunkJRaw,chunkmaskJId);
chunkMask = currentChunk->chunkMask; d = getBuffArr(dJId);
d = currentChunk->jd; d0 = getBuffArr(d0JId);
d0 = currentChunk->jd0; u = getBuffArr(uJId);
u = currentChunk->ju; v = getBuffArr(vJId);
v = currentChunk->jv; w = getBuffArr(wJId);
w = currentChunk->jw; u0 = getBuffArr(u0JId);
u0 = currentChunk->ju0; v0 = getBuffArr(v0JId);
v0 = currentChunk->jv0; w0 = getBuffArr(w0JId);
w0 = currentChunk->jw0;
Java_electrosphere_FluidSim_addDensity(env,chunkJRaw,DIM,chunkMask,d,d0,timestep); Java_electrosphere_FluidSim_addDensity(env,chunkJRaw,DIM,chunkMask,d,d0,timestep);
} }
} }
@ -695,24 +694,18 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
{ {
//swap vector fields //swap vector fields
for(int i = 0; i < numChunks; i++){ for(int i = 0; i < numChunks; i++){
Chunk * currentChunk = chunks[i]; chunkJRaw = getChunk(i);
chunkJRaw = currentChunk->jchunk; chunkMask = (*env)->GetIntField(env,chunkJRaw,chunkmaskJId);
chunkMask = currentChunk->chunkMask; d = getBuffArr(dJId);
d = currentChunk->jd; d0 = getBuffArr(d0JId);
d0 = currentChunk->jd0; u = getBuffArr(uJId);
u = currentChunk->ju; v = getBuffArr(vJId);
v = currentChunk->jv; w = getBuffArr(wJId);
w = currentChunk->jw; u0 = getBuffArr(u0JId);
u0 = currentChunk->ju0; v0 = getBuffArr(v0JId);
v0 = currentChunk->jv0; w0 = getBuffArr(w0JId);
w0 = currentChunk->jw0;
setBuffArr(dJId,d0); setBuffArr(dJId,d0);
setBuffArr(d0JId,d); setBuffArr(d0JId,d);
jobject tmpObj;
tmpObj = currentChunk->jd;
currentChunk->jd = currentChunk->jd0;
currentChunk->jd0 = d;
} }
for(int i = 0; i < numChunks; i++){ for(int i = 0; i < numChunks; i++){
chunkJRaw = getChunk(i); chunkJRaw = getChunk(i);
@ -764,24 +757,18 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate(
{ {
//swap vector fields //swap vector fields
for(int i = 0; i < numChunks; i++){ for(int i = 0; i < numChunks; i++){
Chunk * currentChunk = chunks[i]; chunkJRaw = getChunk(i);
chunkJRaw = currentChunk->jchunk; chunkMask = (*env)->GetIntField(env,chunkJRaw,chunkmaskJId);
chunkMask = currentChunk->chunkMask; d = getBuffArr(dJId);
d = currentChunk->jd; d0 = getBuffArr(d0JId);
d0 = currentChunk->jd0; u = getBuffArr(uJId);
u = currentChunk->ju; v = getBuffArr(vJId);
v = currentChunk->jv; w = getBuffArr(wJId);
w = currentChunk->jw; u0 = getBuffArr(u0JId);
u0 = currentChunk->ju0; v0 = getBuffArr(v0JId);
v0 = currentChunk->jv0; w0 = getBuffArr(w0JId);
w0 = currentChunk->jw0;
setBuffArr(dJId,d0); setBuffArr(dJId,d0);
setBuffArr(d0JId,d); setBuffArr(d0JId,d);
jobject tmpObj;
tmpObj = currentChunk->jd;
currentChunk->jd = currentChunk->jd0;
currentChunk->jd0 = d;
} }
for(int i = 0; i < numChunks; i++){ for(int i = 0; i < numChunks; i++){
chunkJRaw = getChunk(i); chunkJRaw = getChunk(i);