Skip to content

Commit b3be975

Browse files
committed
- updated pybind11
- added avx implementation of the paper Peer et al., "An implicit SPH formulation for incompressible linearly elastic solids", Computer Graphics Forum, 2018 - bugfixes
1 parent 08f9fc8 commit b3be975

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+5440
-1863
lines changed

CMake/GetGitRevisionDescription.cmake

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,34 @@ function(git_local_changes _var)
166166
set(${_var} "DIRTY" PARENT_SCOPE)
167167
endif()
168168
endfunction()
169+
170+
function(git_local_diff _var)
171+
if(NOT GIT_FOUND)
172+
find_package(Git QUIET)
173+
endif()
174+
get_git_head_revision(refspec hash)
175+
if(NOT GIT_FOUND)
176+
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
177+
return()
178+
endif()
179+
if(NOT hash)
180+
set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
181+
return()
182+
endif()
183+
184+
execute_process(COMMAND
185+
"${GIT_EXECUTABLE}"
186+
diff HEAD --
187+
WORKING_DIRECTORY
188+
"${CMAKE_CURRENT_SOURCE_DIR}"
189+
RESULT_VARIABLE
190+
res
191+
OUTPUT_VARIABLE
192+
out
193+
ERROR_QUIET
194+
OUTPUT_STRIP_TRAILING_WHITESPACE)
195+
string(REPLACE "\\" "\\\\" out "${out}")
196+
string(REPLACE "\"" "\\\"" out "${out}")
197+
string(REPLACE "\n" " \\n\\\n" out "${out}")
198+
set(${_var} "${out}" PARENT_SCOPE)
199+
endfunction()

Changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2.13.2
2+
- updated pybind11
3+
- added avx implementation of the paper Peer et al., "An implicit SPH formulation for incompressible linearly elastic solids", Computer Graphics Forum, 2018
4+
- bugfixes
5+
16
2.13.1
27
- fixed z-sort
38
- added parameter stepsPerZSort

SPlisHSPlasH/Elasticity/ElasticityBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void ElasticityBase::determineFixedParticles()
7777
{
7878
for (int i = 0; i < (int)numParticles; i++)
7979
{
80-
const Vector3r& x = m_model->getPosition(i);
80+
const Vector3r& x = m_model->getPosition0(i);
8181
if ((x[0] > m_fixedBoxMin[0]) && (x[1] > m_fixedBoxMin[1]) && (x[2] > m_fixedBoxMin[2]) &&
8282
(x[0] < m_fixedBoxMax[0]) && (x[1] < m_fixedBoxMax[1]) && (x[2] < m_fixedBoxMax[2]))
8383
{

0 commit comments

Comments
 (0)