- bugfix: in emitter scenes now all particles are reset correctly

Author: janbender

Changelog.txt

@@ -1,3 +1,5 @@
+2.12.5
+	- bugfix: in emitter scenes now all particles are reset correctly
 	- updated PositionBasedDynamics
 	- updated GenericParameters
 

SPlisHSPlasH/DFSPH/SimulationDataDFSPH.cpp

@@ -69,7 +69,7 @@ void SimulationDataDFSPH::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_density_adv[i][j] = 0.0;
 			m_pressure_rho2[i][j] = 0.0;

SPlisHSPlasH/FluidModel.cpp

@@ -202,17 +202,8 @@ void FluidModel::reset()
 	setNumActiveParticles(m_numActiveParticles0);
 	const unsigned int nPoints = numActiveParticles();
 
-	struct Comparator {
-		Comparator(FluidModel* _this) : m_this(_this) {};
-		bool operator()(unsigned int a, unsigned int b)
-		{
-			return m_this->getParticleId(a) < m_this->getParticleId(b);
-		}
-		FluidModel* m_this;
-	};
-
-	// Fluid
-	for (unsigned int i = 0; i < nPoints; i++)
+	// use numParticles since numActiveParticles is already reset
+	for (unsigned int i = 0; i < numParticles(); i++)		
 	{
 		const Vector3r& x0 = getPosition0(i);
 		getPosition(i) = x0;
@@ -223,11 +214,6 @@ void FluidModel::reset()
 		m_particleId[i] = i;
 		m_particleState[i] = ParticleState::Active;
 	}
-	// emitted particles
-	for (unsigned int i = nPoints; i < (unsigned int)m_particleId.size(); i++)
-	{
-		m_particleId[i] = i;
-	}
 
 	NeighborhoodSearch *neighborhoodSearch = Simulation::getCurrent()->getNeighborhoodSearch();
 	if (neighborhoodSearch->point_set(m_pointSetIndex).n_points() != nPoints)

SPlisHSPlasH/ICSPH/SimulationDataICSPH.cpp

@@ -62,7 +62,7 @@ void SimulationDataICSPH::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_pressure[i][j] = 0.0;
 		}

SPlisHSPlasH/IISPH/SimulationDataIISPH.cpp

@@ -70,7 +70,7 @@ void SimulationDataIISPH::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_lastPressure[i][j] = 0.0;
 		}

SPlisHSPlasH/PBF/SimulationDataPBF.cpp

@@ -63,7 +63,7 @@ void SimulationDataPBF::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_deltaX[i][j].setZero();
 			m_lambda[i][j] = 0.0;

SPlisHSPlasH/PF/SimulationDataPF.cpp

@@ -66,7 +66,7 @@ void SimulationDataPF::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_num_fluid_neighbors[i][j] = 0;
 			m_old_position[i][j].setZero();

SPlisHSPlasH/Utilities/DebugTools.cpp

@@ -185,7 +185,7 @@ void DebugTools::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel* fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_threadIds[i][j] = 0;
 			m_numNeighbors[i][j] = 0;

SPlisHSPlasH/Vorticity/MicropolarModel_Bender2017.cpp

@@ -236,7 +236,7 @@ void MicropolarModel_Bender2017::step()
 
 void MicropolarModel_Bender2017::reset()
 {
-	for (unsigned int i = 0; i < m_model->numActiveParticles(); i++)
+	for (unsigned int i = 0; i < m_model->numParticles(); i++)
 		m_omega[i].setZero();
 }
 

SPlisHSPlasH/WCSPH/SimulationDataWCSPH.cpp

@@ -52,7 +52,7 @@ void SimulationDataWCSPH::reset()
 	for (unsigned int i = 0; i < nModels; i++)
 	{
 		FluidModel *fm = sim->getFluidModel(i);
-		for (unsigned int j = 0; j < fm->numActiveParticles(); j++)
+		for (unsigned int j = 0; j < fm->numParticles(); j++)
 		{
 			m_pressure[i][j] = 0.0;
 			m_pressureAccel[i][j].setZero();