From 6afbbd7e2a2e03269d968745aba154cd7abf9bf5 Mon Sep 17 00:00:00 2001 From: unknown <> Date: Sun, 10 Mar 2024 17:45:51 -0400 Subject: [PATCH] clean up density calls --- src/main/c/fluidsim.c | 83 ------------------------------------------- 1 file changed, 83 deletions(-) diff --git a/src/main/c/fluidsim.c b/src/main/c/fluidsim.c index 0f888c5..85444a1 100644 --- a/src/main/c/fluidsim.c +++ b/src/main/c/fluidsim.c @@ -700,14 +700,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; Java_electrosphere_FluidSim_addDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,timestep); } } @@ -716,23 +708,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( //swap vector fields for(int i = 0; i < numChunks; i++){ 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(dJId,jd0); - setBuffArr(d0JId,jd); - - jobject tmpObj; - tmpObj = currentChunk->jd; - currentChunk->jd = currentChunk->jd0; - currentChunk->jd0 = tmpObj; float * tmpArr; for(int j = 0; j < 27; j++){ @@ -747,12 +722,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( 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; copyNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,0,currentChunk->d); copyNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,0,currentChunk->d0); } @@ -764,28 +733,15 @@ 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; Java_electrosphere_FluidSim_solveDiffuseDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,u,v,w,DIFFUSION_CONSTANT,VISCOSITY_CONSTANT,timestep); } for(int i = 0; i < numChunks; i++){ 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; setBoundsToNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,currentChunk->d); } } @@ -795,24 +751,6 @@ JNIEXPORT void JNICALL Java_electrosphere_FluidSim_simulate( //swap vector fields for(int i = 0; i < numChunks; i++){ 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(dJId,jd0); - setBuffArr(d0JId,jd); - - jobject tmpObj; - tmpObj = currentChunk->jd; - currentChunk->jd = currentChunk->jd0; - currentChunk->jd0 = tmpObj; - float * tmpArr; for(int j = 0; j < 27; j++){ tmpArr = currentChunk->d[j]; @@ -824,14 +762,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; copyNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,0,currentChunk->d); copyNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,0,currentChunk->d0); } @@ -842,14 +772,9 @@ 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; Java_electrosphere_FluidSim_advectDensity(env,chunkJRaw,DIM,chunkMask,currentChunk->d,currentChunk->d0,u,v,w,DIFFUSION_CONSTANT,VISCOSITY_CONSTANT,timestep); } } @@ -859,14 +784,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; setBoundsToNeighborsRaw(env,chunkJRaw,DIM,chunkMask,0,currentChunk->d); } }