- added support of embedded Python scripts (must be activated in CMake)

- added possibility to animate rigid bodies in Python
- added Implicit Compressible SPH pressure solver by Gissler et al. 2020
- fixed bug in AnimationField (thanks to Lukas Westhofen)
- improved stability of volume maps

Author: janbender

Changelog.txt

@@ -1,3 +1,10 @@
+2.10.0
+	- added support of embedded Python scripts (must be activated in CMake)
+	- added possibility to animate rigid bodies in Python
+	- added Implicit Compressible SPH pressure solver by Gissler et al. 2020
+	- fixed bug in AnimationField (thanks to Lukas Westhofen)
+	- improved stability of volume maps
+
 2.9.2
 	- added ParaView partio plugin
 	- extended tooltips by json key

GUI/OpenGL/Selection.h

@@ -111,9 +111,9 @@ namespace SPH
 				}
 				index++;
 
-				posIter++;
 				if (posIter == posEnd)
 					break;
+				posIter++;
 			}
 		}
 	};

GUI/imgui/imguiParameters.cpp

@@ -188,7 +188,7 @@ void imguiParameters::createSubgroupParameters(const std::vector<std::pair<std::
 				std::string helpText = param->description;
 				if (param->readOnly)
 					helpText += " (read-only)";
-				else if (param->name != "")
+				else if ((param->name != "") && (dynamic_cast<imguiParameters::imguiFunctionParameter*>(param) == nullptr))		// no key help text for function parameters
 					helpText += "\n\nkey in scene file:\n" + param->name;
 
 				ImGuiInputTextFlags flags = 0;
@@ -287,7 +287,8 @@ void imguiParameters::createParameterObjectGUI(ParameterObject* paramObj)
 		std::string group = paramBase->getGroup();
 		std::string subgroup = "";
 		if ((group == "WCSPH") || (group == "PCISPH") || (group == "PBF") || 
-			(group == "IISPH") || (group == "DFSPH") || (group == "PF") || 
+			(group == "IISPH") || (group == "DFSPH") || (group == "PF") ||
+			(group == "ICSPH") ||
 			(group == "CFL") || (group == "Kernel"))
 		{
 			subgroup = group;

README.md

@@ -59,6 +59,7 @@ SPlisHSPlasH implements:
 * neighborhood search on CPU or GPU
 * supports vectorization using AVX
 * Python binding (thanks to Stefan Jeske)
+* supports embedded Python scripts
 * several implicit pressure solvers (WCSPH, PCISPH, PBF, IISPH, DFSPH, PF)
 * explicit and implicit viscosity methods
 * current surface tension approaches
@@ -88,6 +89,7 @@ The SPlisHSPlasH library implements the following pressure solvers:
 * Implicit incompressible SPH (IISPH)
 * Divergence-free smoothed particle hydrodynamics (DFSPH)
 * Projective Fluids (PF)
+* Implicit compressible SPH (ICSPH)
 
 ## Boundary Handling 
 
@@ -192,6 +194,7 @@ The following videos were generated using the SPlisHSPlasH library:
 * Jan Bender, Matthias Müller, Miguel A. Otaduy, Matthias Teschner, and Miles Macklin. A survey on position-based simulation methods in computer graphics. Computer Graphics Forum, 33(6):228–251, 2014.
 * Jan Bender, Matthias Müller, and Miles Macklin. Position-based simulation methods in computer graphics. In EUROGRAPHICS 2015 Tutorials. Eurographics Association, 2015.
 * Christoph Gissler, Stefan Band, Andreas Peer, Markus Ihmsen and Matthias Teschner. Approximate Air-Fluid Interactions for SPH. In Proceedings of Virtual Reality Interactions and Physical Simulations, 2017
+* C. Gissler, A. Henne, S. Band, A. Peer and M. Teschner. An Implicit Compressible SPH Solver for Snow Simulation, ACM Transactions on Graphics 39(4), 2020. 
 * Xiaowei He, Huamin Wang, Fengjun Zhang, Hongan Wang, Guoping Wang, and Kun Zhou. Robust simulation of sparsely sampled thin features in SPH-based free surface flows. ACM Trans. Graph., 34(1):7:1–7:9, December 2014. 
 * Markus Ihmsen, Jens Cornelis, Barbara Solenthaler, Christopher Horvath, and Matthias Teschner. Implicit incompressible SPH. IEEE Transactions on Visualization and Computer Graphics, 20(3):426–435, March 2014.
 * Markus Ihmsen, Jens Orthmann, Barbara Solenthaler, Andreas Kolb, and Matthias Teschner. SPH Fluids in Computer Graphics. In Eurographics 2014 - State of the Art Reports. The Eurographics Association, 2014. 

SPlisHSPlasH/AnimationField.cpp

@@ -75,13 +75,22 @@ void AnimationField::step()
 			{
 				const Vector3r &xi = fm->getPosition(i);
 				const Vector3r &vi = fm->getVelocity(i);
+
+				const Eigen::Vector3d xi_double = xi.cast<double>();
+				const Eigen::Vector3d vi_double = vi.cast<double>();
+
 				if (inShape(m_type, xi, m_x, m_rotation, m_scale))
 				{
 					Eigen::Map<Vector3r> value((Real*) particleField->getFct(i));
- 					te_variable vars[] = { {"t", &t}, {"dt", &dt}, 
-										   {"x", &xi[0]}, {"y", &xi[1]}, {"z", &xi[2]},
-										   {"vx", &vi[0]}, {"vy", &vi[1]}, {"vz", &vi[2]},
-										   {"valuex", &value[0]}, {"valuey", &value[1]}, {"valuez", &value[2]},
+					const Eigen::Vector3d value_double = Vector3r(value).cast<double>();
+
+					const double t_double = static_cast<double>(t);
+					const double dt_double = static_cast<double>(dt);
+
+ 					te_variable vars[] = { {"t", &t_double}, {"dt", &dt_double}, 
+										   {"x", &xi_double[0]}, {"y", &xi_double[1]}, {"z", &xi_double[2]},
+										   {"vx", &vi_double[0]}, {"vy", &vi_double[1]}, {"vz", &vi_double[2]},
+										   {"valuex", &value_double[0]}, {"valuey", &value_double[1]}, {"valuez", &value_double[2]},
 										 };
  					const int numVars = 11;
  					int err;

SPlisHSPlasH/BoundaryModel.h

@@ -77,7 +77,7 @@ namespace SPH
 
 			FORCE_INLINE void getPointVelocity(const Vector3r &x, Vector3r &res)
 			{
-				if (m_rigidBody->isDynamic())
+				if (m_rigidBody->isDynamic() || m_rigidBody->isAnimated())
 					res = m_rigidBody->getAngularVelocity().cross(x - m_rigidBody->getPosition()) + m_rigidBody->getVelocity();
 				else
 					res.setZero();

SPlisHSPlasH/BoundaryModel_Akinci2012.cpp

@@ -34,7 +34,7 @@ void BoundaryModel_Akinci2012::reset()
 
 	// Note:
 	// positions and velocities are already updated by updateBoundaryParticles
-	if (!m_rigidBody->isDynamic())
+	if (!m_rigidBody->isDynamic() && !m_rigidBody->isAnimated())
 	{
 		// reset velocities and accelerations
 		for (int j = 0; j < (int)numberOfParticles(); j++)
@@ -106,15 +106,15 @@ void BoundaryModel_Akinci2012::initModel(RigidBodyObject *rbo, const unsigned in
 	m_rigidBody = rbo;
 
 	NeighborhoodSearch *neighborhoodSearch = Simulation::getCurrent()->getNeighborhoodSearch();
-	m_pointSetIndex = neighborhoodSearch->add_point_set(&m_x[0][0], m_x.size(), m_rigidBody->isDynamic(), false, true, this);
+	m_pointSetIndex = neighborhoodSearch->add_point_set(&m_x[0][0], m_x.size(), m_rigidBody->isDynamic() || m_rigidBody->isAnimated(), false, true, this);
 }
 
 void BoundaryModel_Akinci2012::performNeighborhoodSearchSort()
 {
 	const unsigned int numPart = numberOfParticles();
 
 	// sort static boundaries only once
-	if ((numPart == 0) || (!m_rigidBody->isDynamic() && m_sorted))
+	if ((numPart == 0) || (!m_rigidBody->isDynamic() && !m_rigidBody->isAnimated() && m_sorted))
 		return;
 
 	NeighborhoodSearch *neighborhoodSearch = Simulation::getCurrent()->getNeighborhoodSearch();

SPlisHSPlasH/CMakeLists.txt

@@ -60,6 +60,16 @@ set(PF_SOURCE_FILES
 	PF/TimeStepPF.cpp
 	)
 
+set(ICSPH_HEADER_FILES
+	ICSPH/SimulationDataICSPH.h
+	ICSPH/TimeStepICSPH.h
+	)
+	
+set(ICSPH_SOURCE_FILES
+	ICSPH/SimulationDataICSPH.cpp
+	ICSPH/TimeStepICSPH.cpp
+	)	
+	
 set(SURFACETENSION_HEADER_FILES
 	SurfaceTension/SurfaceTensionBase.h
 	SurfaceTension/SurfaceTension_Becker2007.h
@@ -231,6 +241,9 @@ add_library(SPlisHSPlasH
 	${PF_HEADER_FILES}
 	${PF_SOURCE_FILES}
 
+	${ICSPH_HEADER_FILES}
+	${ICSPH_SOURCE_FILES}
+	
 	${VISCOSITY_HEADER_FILES}
 	${VISCOSITY_SOURCE_FILES}
 
@@ -284,6 +297,8 @@ source_group("Header Files\\DFSPH" FILES ${DFSPH_HEADER_FILES})
 source_group("Source Files\\DFSPH" FILES ${DFSPH_SOURCE_FILES})
 source_group("Header Files\\PF" FILES ${PF_HEADER_FILES})
 source_group("Source Files\\PF" FILES ${PF_SOURCE_FILES})
+source_group("Header Files\\ICSPH" FILES ${ICSPH_HEADER_FILES})
+source_group("Source Files\\ICSPH" FILES ${ICSPH_SOURCE_FILES})
 source_group("Header Files\\Viscosity" FILES ${VISCOSITY_HEADER_FILES})
 source_group("Source Files\\Viscosity" FILES ${VISCOSITY_SOURCE_FILES})
 source_group("Header Files\\SurfaceTension" FILES ${SURFACETENSION_HEADER_FILES})

SPlisHSPlasH/DFSPH/SimulationDataDFSPH.cpp

@@ -83,10 +83,10 @@ void SimulationDataDFSPH::performNeighborhoodSearchSort()
 		if (numPart != 0)
 		{
 			auto const& d = sim->getNeighborhoodSearch()->point_set(fm->getPointSetIndex());
-			d.sort_field(&m_factor[i][0]);
+			//d.sort_field(&m_factor[i][0]);
 			d.sort_field(&m_kappa[i][0]);
 			d.sort_field(&m_kappaV[i][0]);
-			d.sort_field(&m_density_adv[i][0]);
+			//d.sort_field(&m_density_adv[i][0]);
 		}
 	}
 }

SPlisHSPlasH/FluidModel.h

@@ -70,7 +70,7 @@ namespace SPH
 			name(n), type(t), getFct(fct), storeData(s) { }
 	};
 
-	enum class ParticleState { Active = 0, AnimatedByEmitter, AnimatedByVM };
+	enum class ParticleState { Active = 0, AnimatedByEmitter };
 
 	/** \brief The fluid model stores the particle and simulation information 
 	*/