From eac79e0afc4f8411358d2e3167afec7796be1229 Mon Sep 17 00:00:00 2001 From: unknown <> Date: Sun, 10 Mar 2024 18:11:32 -0400 Subject: [PATCH] swapping arrays is raw arrays only --- src/main/c/fluidsim.c | 63 +------------------------------------------ 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/src/main/c/fluidsim.c b/src/main/c/fluidsim.c index 6bf90fb..31861d8 100644 --- a/src/main/c/fluidsim.c +++ b/src/main/c/fluidsim.c @@ -201,36 +201,7 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( Chunk * currentChunk = chunks[i]; chunkJRaw = currentChunk->jchunk; 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; for(int j = 0; j < 27; j++){ tmpArr = currentChunk->u[j]; @@ -456,35 +427,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( Chunk * currentChunk = chunks[i]; chunkJRaw = currentChunk->jchunk; 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; for(int j = 0; j < 27; j++){ @@ -819,9 +761,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( Chunk * currentChunk = chunks[i]; chunkJRaw = currentChunk->jchunk; 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); } }