pressure work

src/main/c/includes/fluid/sim/pressurecell/tracking.h

@@ -13,5 +13,10 @@
  */
 LIBRARY_API void pressurecell_update_tracking(Environment * environment, Chunk * chunk);
 
+/**
+ * Updates the inflow/outflow for this chunk
+ */
+LIBRARY_API void pressurecell_update_flows(Environment * environment, Chunk * chunk);
+
 
 #endif

src/main/c/src/fluid/sim/pressurecell/tracking.c

@@ -30,4 +30,17 @@ LIBRARY_API void pressurecell_update_tracking(Environment * environment, Chunk *
 }
 
 
+/**
+ * Updates the inflow/outflow for this chunk
+ */
+LIBRARY_API void pressurecell_update_flows(Environment * environment, Chunk * chunk){
+    int x, y;
+    for(x = 1; x < DIM-1; x++){
+        for(y = 1; y < DIM-1; y++){
+            
+        }
+    }
+}
+
+
 

src/main/java/electrosphere/client/ui/menu/debug/ImGuiFluidMonitor.java

@@ -48,7 +48,7 @@ public class ImGuiFluidMonitor {
                     ImGui.text("Mass: " + ServerFluidChunk.getMassCount());
 
 
-                    if(fluidManager.getChunk(0, 0, 0) != null){
+                    if(fluidManager.getChunk(0, 0, 1) != null){
                         ImGuiFluidMonitor.printChunkDebugData();
                     }
 
@@ -71,11 +71,11 @@ public class ImGuiFluidMonitor {
     }
 
     /**
-     * Prints debug data about the chunk at 0,0,0
+     * Prints debug data about the chunk at 0,0,1
      */
     private static void printChunkDebugData(){
         ServerFluidManager fluidManager = Globals.playerManager.getPlayerRealm(Globals.clientPlayer).getServerWorldData().getServerFluidManager();
-        ServerFluidChunk chunk = fluidManager.getChunk(0, 0, 0);
+        ServerFluidChunk chunk = fluidManager.getChunk(0, 0, 1);
         ImGui.text("Pressure: " + chunk.getTotalPressure());
         ImGui.text("Velocity magnitude: " + chunk.getTotalVelocityMag());
         if(ImGui.button("Capture lowest layers")){

src/test/c/fluid/sim/pressurecell/pressurecell_problemchunk_1_tests.c

@@ -30,7 +30,7 @@
  * Testing normalizing values
  */
 int fluid_sim_pressurecell_pressurecell_problemchunk_1_test1(){
-    printf("fluid_sim_pressurecell_border_transmission_test1\n");
+    printf("fluid_sim_pressurecell_pressurecell_problemchunk_1_test1\n");
     int rVal = 0;
     Environment * env = fluid_environment_create();
     Chunk ** queue = NULL;

src/test/c/fluid/sim/pressurecell/pressurecell_problemchunk_2_tests.c

@@ -0,0 +1,140 @@
+#include <math.h>
+
+#include "stb/stb_ds.h"
+
+#include "fluid/dispatch/dispatcher.h"
+#include "fluid/queue/boundsolver.h"
+#include "fluid/queue/chunkmask.h"
+#include "fluid/queue/chunk.h"
+#include "fluid/env/environment.h"
+#include "fluid/env/utilities.h"
+#include "fluid/sim/simulator.h"
+#include "fluid/sim/pressurecell/normalization.h"
+#include "fluid/sim/pressurecell/solver_consts.h"
+#include "fluid/tracking/tracking.h"
+#include "math/ode/multigrid.h"
+#include "../../../util/chunk_test_utils.h"
+#include "../../../util/test.h"
+
+/**
+ * Error margin for tests
+ */
+#define FLUID_PRESSURE_CELL_ERROR_MARGIN 0.01f
+
+/**
+ * Number of chunks
+ */
+#define CHUNK_DIM 2
+
+/**
+ * Testing normalizing values
+ */
+int fluid_sim_pressurecell_pressurecell_problemchunk_2_test1(){
+    printf("fluid_sim_pressurecell_pressurecell_problemchunk_2_test1\n");
+    int rVal = 0;
+    Environment * env = fluid_environment_create();
+    Chunk ** queue = NULL;
+    queue = createChunkGrid(env,CHUNK_DIM,CHUNK_DIM,CHUNK_DIM);
+    int chunkCount = arrlen(queue);
+
+
+
+    //setup chunk values
+    float deltaDensity = 0.01f;
+    Chunk * currentChunk = queue[0];
+
+    //should be chunk at 0,0,1
+    Chunk * furtherX = queue[1];
+    rVal += assertEquals(furtherX->x,0,"Chunk is not at 0,0,1  x: %d \n");
+    rVal += assertEquals(furtherX->y,0,"Chunk is not at 0,0,1  y: %d \n");
+    rVal += assertEquals(furtherX->z,1,"Chunk is not at 0,0,1  z: %d \n");
+
+    //setup the problem chunk
+    for(int x = 1; x < DIM-1; x++){
+        //setup the og chunk values
+        currentChunk->u[CENTER_LOC][IX(x,1,DIM-2)] = 0.5f;
+        currentChunk->v[CENTER_LOC][IX(x,1,DIM-2)] = -0.5f;
+        currentChunk->w[CENTER_LOC][IX(x,1,DIM-2)] = 0.5f;
+        currentChunk->d[CENTER_LOC][IX(x,1,DIM-2)] = 0.5f;
+        currentChunk->divergenceCache[CENTER_LOC][IX(x,1,DIM-2)] = 0.5f;
+        currentChunk->pressureCache[CENTER_LOC][IX(x,1,DIM-2)] = 0.5f;
+
+        //setup the problem chunk
+        for(int y = 1; y < DIM-1; y++){
+            furtherX->u[CENTER_LOC][IX(x,1,y)] = 0.00001f;
+            furtherX->v[CENTER_LOC][IX(x,1,y)] = -0.00001f;
+            furtherX->w[CENTER_LOC][IX(x,1,y)] = 0.00001f;
+        }
+        furtherX->u[CENTER_LOC][IX(x,1,0)] = 0.0f;
+        furtherX->v[CENTER_LOC][IX(x,1,0)] = 0.0f;
+        furtherX->w[CENTER_LOC][IX(x,1,0)] = 0.7f;
+        furtherX->d[CENTER_LOC][IX(x,1,0)] = 0.15f;
+        furtherX->divergenceCache[CENTER_LOC][IX(x,1,0)] = 0.5f;
+        furtherX->pressureCache[CENTER_LOC][IX(x,1,0)] = 0.5f;
+    }
+
+    //actually simulate
+    fluid_tracking_reset(env);
+    fluid_solve_bounds(chunkCount,queue,env);
+    fluid_dispatch(chunkCount,queue,env,FLUID_DISPATCHER_OVERRIDE_PRESSURECELL);
+    fluid_simulate(env);
+    fluid_solve_bounds(chunkCount,queue,env);
+
+    //test the result
+    float expected, actual;
+
+    //
+    // chunk in z direction should have density > 0 at 1,1,1
+    //
+
+    expected = MAX_FLUID_VALUE;
+    actual = furtherX->divergenceCache[CENTER_LOC][IX(5,1,1)];
+    if(actual < FLUID_PRESSURE_CELL_ERROR_MARGIN){
+        printf("Failed to gain divergence at (5,1,1)! actual: %f  \n", actual);
+        rVal++;
+    }
+
+    expected = MAX_FLUID_VALUE;
+    actual = furtherX->w[CENTER_LOC][IX(5,1,1)];
+    if(actual < FLUID_PRESSURE_CELL_ERROR_MARGIN){
+        printf("Failed to gain z velocity at (5,1,1)! actual: %f  \n", actual);
+        rVal++;
+    }
+
+    expected = MAX_FLUID_VALUE;
+    actual = furtherX->d[CENTER_LOC][IX(5,1,1)];
+    if(actual < FLUID_PRESSURE_CELL_ERROR_MARGIN){
+        printf("Failed to gain density at (5,1,1)! actual: %f  \n", actual);
+        rVal++;
+    }
+
+    expected = MAX_FLUID_VALUE;
+    actual = furtherX->d[CENTER_LOC][IX(5,1,0)];
+    if(actual < FLUID_PRESSURE_CELL_ERROR_MARGIN){
+        printf("Failed to gain density at (5,1,0)! actual: %f  \n", actual);
+        rVal++;
+    }
+
+    //
+    // origin chunk should have density > 0 at DIM-1,1,DIM-1
+    //
+    actual = currentChunk->d[CENTER_LOC][IX(DIM-2,1,DIM-2)];
+    if(actual < FLUID_PRESSURE_CELL_ERROR_MARGIN){
+        printf("Failed to retain density at (DIM-2,1,DIM-2)! actual: %f  \n", actual);
+        rVal++;
+    }
+
+    return rVal;
+}
+
+/**
+ * Testing transmitting density across borders
+ */
+int fluid_sim_pressurecell_pressurecell_problemchunk_2_tests(int argc, char **argv){
+    int rVal = 0;
+
+    rVal += fluid_sim_pressurecell_pressurecell_problemchunk_2_test1();
+
+    return rVal;
+}
+