race condition in future state calculation fixed

chrxh · Dec 29, 2024 · 4e9f5d0 · 4e9f5d0
1 parent 05b13ed
commit 4e9f5d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/EngineGpuKernels/CellProcessor.cuh b/source/EngineGpuKernels/CellProcessor.cuh
@@ -34,7 +34,7 @@ public:
     __inline__ __device__ static void verletVelocityUpdate(SimulationData& data);
 
     __inline__ __device__ static void aging(SimulationData& data);
-    __inline__ __device__ static void livingStateTransition_calcNextState(SimulationData& data);
+    __inline__ __device__ static void livingStateTransition_calcFutureState(SimulationData& data);
     __inline__ __device__ static void livingStateTransition_applyNextState(SimulationData& data);
 
     __inline__ __device__ static void applyInnerFriction(SimulationData& data);
@@ -593,7 +593,7 @@ __inline__ __device__ void CellProcessor::aging(SimulationData& data)
 }
 
 
-__inline__ __device__ void CellProcessor::livingStateTransition_calcNextState(SimulationData& data)
+__inline__ __device__ void CellProcessor::livingStateTransition_calcFutureState(SimulationData& data)
 {
     auto& cells = data.objects.cellPointers;
     auto partition = calcAllThreadsPartition(cells.getNumEntries());

diff --git a/source/EngineGpuKernels/SimulationKernels.cu b/source/EngineGpuKernels/SimulationKernels.cu
@@ -80,11 +80,11 @@ __global__ void cudaNextTimestep_cellFunction_prepare_substep1(SimulationData da
 {
     CellProcessor::aging(data);
     MutationProcessor::applyRandomMutations(data);
+    CellProcessor::livingStateTransition_calcFutureState(data);
 }
 
 __global__ void cudaNextTimestep_cellFunction_prepare_substep2(SimulationData data)
 {
-    CellProcessor::livingStateTransition_calcNextState(data);
     CellProcessor::livingStateTransition_applyNextState(data);
     CellFunctionProcessor::collectCellFunctionOperations(data);
     CellFunctionProcessor::updateRenderingData(data);