diff --git a/buildNumber.properties b/buildNumber.properties index dffcdd54..e26fdb94 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Sat Nov 30 20:54:45 EST 2024 -buildNumber=443 +#Sat Nov 30 21:00:16 EST 2024 +buildNumber=444 diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 924121f8..dbab0e66 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1199,6 +1199,7 @@ Convert server side fluid storage to using buffers Move cellular automata simulator package Update fluid chunk dimensions to correspond with C code Update release build system to include shared libraries +Break out solver consts diff --git a/src/fluid/includes/solver_consts.h b/src/fluid/includes/solver_consts.h new file mode 100644 index 00000000..646baf90 --- /dev/null +++ b/src/fluid/includes/solver_consts.h @@ -0,0 +1,6 @@ +#ifndef SOLVER_CONSTS_H +#define SOLVER_CONSTS_H + +#define LINEARSOLVERTIMES 5 + +#endif \ No newline at end of file diff --git a/src/fluid/src/fluidsim.c b/src/fluid/src/fluidsim.c index a4fbfa40..69e64bf7 100644 --- a/src/fluid/src/fluidsim.c +++ b/src/fluid/src/fluidsim.c @@ -9,6 +9,7 @@ #include "./chunkmask.c" #include "./velocitystep.c" #include "./densitystep.c" +#include "../includes/solver_consts.h" #ifndef SAVE_STEPS #define SAVE_STEPS 0 @@ -16,7 +17,6 @@ #define DIM 18 -#define LINEARSOLVERTIMES 20 #define REALLY_SMALL_VALUE 0.00001 #define DIFFUSION_CONSTANT 0.00001 diff --git a/src/fluid/src/velocitystep.c b/src/fluid/src/velocitystep.c index cc93df15..f5ea0ee3 100644 --- a/src/fluid/src/velocitystep.c +++ b/src/fluid/src/velocitystep.c @@ -5,6 +5,7 @@ #include "../includes/utilities.h" #include "../includes/chunkmask.h" #include "../includes/chunk.h" +#include "../includes/solver_consts.h" #define BOUND_NO_DIR 0 @@ -15,8 +16,6 @@ #define SET_BOUND_IGNORE 0 #define SET_BOUND_USE_NEIGHBOR 1 -#define LINEARSOLVERTIMES 20 - static inline void add_source(int N, float * x, float * s, float dt); static inline void advect(uint32_t chunk_mask, int N, int b, float ** jrd, float ** jrd0, float * u, float * v, float * w, float dt);