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

Compare commits

base: studiorailgun:64848eecc7f2d3d87478ee80bda013c1ccf1d527
Branches Tags
studiorailgun:master
studiorailgun:jenkinsAutoTesting
studiorailgun:migrate-multichunk-to-c
studiorailgun:migration-successful
studiorailgun:multichunking-success
studiorailgun:c-single-thread
...
compare: studiorailgun:fe93aac7e50b3ce9462627cb57cb23dd38cc804e
Branches Tags
studiorailgun:master
studiorailgun:jenkinsAutoTesting
studiorailgun:migrate-multichunk-to-c
studiorailgun:migration-successful
studiorailgun:multichunking-success
studiorailgun:c-single-thread

7 Commits
64848eecc7 ... fe93aac7e5

Author SHA1 Message Date
railgun
fe93aac7e5 Merge pull request 'jenkinsAutoTesting' (#1) from jenkinsAutoTesting into master 
Reviewed-on: https://git.austinwhoover.com/studiorailgun/fluid-sim/pulls/1
 2024-03-15 21:15:03 -04:00
unknown
3b8363507e disable testing
All checks were successful
studiorailgun/fluid-sim/pipeline/pr-master This commit looks good
Details
studiorailgun/fluid-sim/pipeline/head This commit looks good
Details
2024-03-15 21:13:33 -04:00
unknown
0eb314999d test fix
Some checks failed
studiorailgun/fluid-sim/pipeline/head There was a failure building this commit
Details
2024-03-15 21:11:47 -04:00
unknown
fed89963a6 remove compile flags to potentially build lib
Some checks failed
studiorailgun/fluid-sim/pipeline/head There was a failure building this commit
Details
2024-03-15 21:00:17 -04:00
unknown
13bda0cbf3 OS dependent library loading
Some checks failed
studiorailgun/fluid-sim/pipeline/head There was a failure building this commit
Details
2024-03-15 20:51:46 -04:00
unknown
40b570a0b1 gitmodules potential fix
Some checks failed
studiorailgun/fluid-sim/pipeline/head There was a failure building this commit
Details
2024-03-15 20:47:25 -04:00
unknown
7d2569f3dc Potential fix for compiling
Some checks failed
studiorailgun/fluid-sim/pipeline/head There was a failure building this commit
Details
2024-03-15 20:32:27 -04:00
9 changed files with 365 additions and 313 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,5 +7,4 @@
/.project /.project
/shared-folder /shared-folder
/shared-folder/** /shared-folder/**
/src/main/c/lib/**
/chunks /chunks

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "src/main/c/lib/stb"]
path = src/main/c/lib/stb
url = https://github.com/nothings/stb.git

4
src/main/c/compile.sh
View File

@ -58,12 +58,12 @@ rm -f ./*.dll
# OUTPUT_FILE="./chunkmask.o" # OUTPUT_FILE="./chunkmask.o"
# gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE # gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow" COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -DSAVE_STEPS=$SAVE_STEPS"
INPUT_FILES="./src/javainterface.c" INPUT_FILES="./src/javainterface.c"
OUTPUT_FILE="./javainterface.o" OUTPUT_FILE="./javainterface.o"
gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE
COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -msse -msse2 -msse3 -mmmx -m3dnow -DSAVE_STEPS=$SAVE_STEPS" COMPILE_FLAGS="-c -fPIC -m64 -mavx -mavx2 -march=native -Ofast -DSAVE_STEPS=$SAVE_STEPS"
INPUT_FILES="./src/fluidsim.c" INPUT_FILES="./src/fluidsim.c"
OUTPUT_FILE="./fluidsim.o" OUTPUT_FILE="./fluidsim.o"
gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE gcc $COMPILE_FLAGS -I"$BASE_INCLUDE_DIR" -I"$OS_INCLUDE_DIR" $INPUT_FILES -o $OUTPUT_FILE

1
src/main/c/lib/stb Submodule

@ -0,0 +1 @@
Subproject commit ae721c50eaf761660b4f90cc590453cdb0c2acd0

12
src/main/java/electrosphere/FluidSim.java
View File

@ -24,9 +24,17 @@ import org.lwjgl.system.MemoryUtil;
*/ */
public class FluidSim { public class FluidSim {
/**
* Load fluid sim library
*/
static { static {
System.out.println(System.getProperty("user.dir")); String osName = System.getProperty("os.name").toLowerCase();
System.load(System.getProperty("user.dir") + "/shared-folder/libfluidsim.dll"); System.out.println(osName);
if(osName.contains("win")){
System.load(new File("./shared-folder/libfluidsim.dll").toPath().toAbsolutePath().toString());
} else {
System.load(new File("./shared-folder/libfluidsim.so").toPath().toAbsolutePath().toString());
}
} }
public static final int DIM = 18; public static final int DIM = 18;

6
src/main/java/electrosphere/Main.java
View File

@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -28,8 +29,8 @@ public class Main {
public static void main(String args[]){ public static void main(String args[]){
int dim = 5; int dim = 1;
int vdim = 5; int vdim = 1;
int i = 0; int i = 0;
long time = 0; long time = 0;
long lastTime = 0; long lastTime = 0;
@ -52,6 +53,7 @@ public class Main {
meshArray = initMeshes(dim,vdim,dim,simArray); meshArray = initMeshes(dim,vdim,dim,simArray);
} }
//uncomment this to generate test data //uncomment this to generate test data
// generateTestData(); // generateTestData();

73
src/test/java/LongRunTests.java
View File

@ -1,6 +1,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import org.junit.Test; import org.junit.Test;
@ -9,47 +10,51 @@ import electrosphere.Main;
public class LongRunTests { public class LongRunTests {
@Test // @Test
public void test5by5Chunk1Step(){ // public void test5by5Chunk1Step(){
int dim = 5; // int dim = 5;
int maxTimestep = 1; // int maxTimestep = 1;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
// @Test // @Test
// public void test5by5Chunk50Step(){ // public void test5by5Chunk50Step(){

289
src/test/java/MediumRunTests.java
View File

@ -1,6 +1,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import org.junit.Test; import org.junit.Test;
@ -9,172 +10,188 @@ import electrosphere.Main;
public class MediumRunTests { public class MediumRunTests {
@Test // @Test
public void test3by3Chunk1Step(){ // public void test3by3Chunk1Step(){
int dim = 3; // int dim = 3;
int maxTimestep = 1; // int maxTimestep = 1;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test3by3Chunk50Step(){ // public void test3by3Chunk50Step(){
int dim = 3; // int dim = 3;
int maxTimestep = 50; // int maxTimestep = 50;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test3by3Chunk100Step(){ // public void test3by3Chunk100Step(){
int dim = 3; // int dim = 3;
int maxTimestep = 100; // int maxTimestep = 100;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test3by3Chunk500Step(){ // public void test3by3Chunk500Step(){
int dim = 3; // int dim = 3;
int maxTimestep = 500; // int maxTimestep = 500;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
} }

289
src/test/java/ShortRunTest.java
View File

@ -3,6 +3,7 @@
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import org.junit.Test; import org.junit.Test;
@ -14,172 +15,188 @@ import electrosphere.Main;
*/ */
public class ShortRunTest { public class ShortRunTest {
@Test // @Test
public void test1by1Chunk1Step(){ // public void test1by1Chunk1Step(){
int dim = 1; // int dim = 1;
int maxTimestep = 1; // int maxTimestep = 1;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test1by1Chunk50Step(){ // public void test1by1Chunk50Step(){
int dim = 1; // int dim = 1;
int maxTimestep = 50; // int maxTimestep = 50;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test1by1Chunk100Step(){ // public void test1by1Chunk100Step(){
int dim = 1; // int dim = 1;
int maxTimestep = 100; // int maxTimestep = 100;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
@Test // @Test
public void test1by1Chunk500Step(){ // public void test1by1Chunk500Step(){
int dim = 1; // int dim = 1;
int maxTimestep = 500; // int maxTimestep = 500;
System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps"); // System.out.println("TEST: " + dim + "x" + dim + "x" + dim + " for " + maxTimestep + " steps");
//init chunk array // //init chunk array
FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim); // FluidSim[][][] simArray = FluidSim.initFluidSim(dim,dim,dim);
//simulate the chunk // //simulate the chunk
for(int i = 0; i < maxTimestep; i++){ // for(int i = 0; i < maxTimestep; i++){
FluidSim.simChunks(simArray, i, Main.TIMESTEP); // FluidSim.simChunks(simArray, i, Main.TIMESTEP);
} // }
for(int x = 0; x < dim; x++){ // for(int x = 0; x < dim; x++){
for(int y = 0; y < dim; y++){ // for(int y = 0; y < dim; y++){
for(int z = 0; z < dim; z++){ // for(int z = 0; z < dim; z++){
InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data"); // InputStream testFileIS = this.getClass().getResourceAsStream("./testdata/" + dim + "by" + dim + "/" + maxTimestep + "steps/chunk_" + x + "_" + y + "_" + z + "_" + dim + "by" + dim + "Chunk" + maxTimestep + "Step.data");
byte[] bytes; // byte[] bytes;
try { // try {
bytes = testFileIS.readAllBytes(); // bytes = testFileIS.readAllBytes();
ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); // ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4);
int i = 0; // fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN);
while(densityBytes.hasRemaining()){ // fromDiskBuffer.put(bytes);
boolean pass = bytes[i] == densityBytes.get(); // fromDiskBuffer.flip();
assert(pass); // ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer();
i++; // int i = 0;
} // while(densityBytes.hasRemaining()){
} catch (IOException e) { // boolean pass = fromDiskBuffer.get() == densityBytes.get();
e.printStackTrace(); // assert(pass);
assert(false); // i++;
} // }
} // } catch (IOException e) {
} // e.printStackTrace();
} // assert(false);
// }
// }
// }
// }
System.out.println("PASSED"); // System.out.println("PASSED");
} // }
} }