Skip to content

Commit 8dc80c0

Browse files
committed
- updated changelog and version
1 parent 58e600d commit 8dc80c0

7 files changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/build-linux-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
python-version: ["cp38-manylinux_x86_64", "cp39-manylinux_x86_64", "cp310-manylinux_x86_64", "cp311-manylinux_x86_64", "cp312-manylinux_x86_64", "cp313-manylinux_x86_64"]
13+
python-version: ["cp39-manylinux_x86_64", "cp310-manylinux_x86_64", "cp311-manylinux_x86_64", "cp312-manylinux_x86_64", "cp313-manylinux_x86_64"]
1414

1515
steps:
1616
- uses: actions/checkout@v4

.github/workflows/build-windows-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
# python-version: [3.7]
15-
python-version: ['cp38-win_amd64', 'cp39-win_amd64', 'cp310-win_amd64', 'cp311-win_amd64', 'cp312-win_amd64', 'cp313-win_amd64']
15+
python-version: ['cp39-win_amd64', 'cp310-win_amd64', 'cp311-win_amd64', 'cp312-win_amd64', 'cp313-win_amd64']
1616

1717
steps:
1818
# Checkout repo

Changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2.17.0
2+
- added implementation of turbulence method: Kee et al., "Turbulent Details Simulation for SPH Fluids via Vorticity Refinement", Computer Graphics Forum, 2023 (thanks to Min Hyung Kee)
3+
14
2.16.1
25
- bugfix in Projective Fluids solver (thanks to Lukas Hof)
36

SPlisHSPlasH/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,12 @@ set(ELASTICITY_HEADER_FILES
128128
Elasticity/Elasticity_Becker2009.h
129129
Elasticity/Elasticity_Peer2018.h
130130
Elasticity/Elasticity_Kugelstadt2021.h
131-
Elasticity/Elasticity_Kee2023.h
132131
)
133132

134133
set(ELASTICITY_SOURCE_FILES
135134
Elasticity/Elasticity_Becker2009.cpp
136135
Elasticity/Elasticity_Peer2018.cpp
137136
Elasticity/Elasticity_Kugelstadt2021.cpp
138-
Elasticity/Elasticity_Kee2023.cpp
139137
)
140138

141139
set(UTILS_HEADER_FILES
@@ -186,6 +184,14 @@ if (USE_THIRD_PARTY_METHODS)
186184
list(APPEND SURFACETENSION_SOURCE_FILES
187185
SurfaceTension/SurfaceTension_ZorillaRitter2020.cpp
188186
)
187+
188+
list(APPEND ELASTICITY_HEADER_FILES
189+
Elasticity/Elasticity_Kee2023.h
190+
)
191+
192+
list(APPEND ELASTICITY_SOURCE_FILES
193+
Elasticity/Elasticity_Kee2023.cpp
194+
)
189195
endif()
190196

191197
add_library(SPlisHSPlasH

SPlisHSPlasH/Elasticity/Elasticity_Kee2023.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ namespace SPH
1616
* by Kee et al. [K23].
1717
*
1818
* References:
19-
* - [K23] Kee et al..
20-
* Kee 2023.
19+
* - [K23] Min Hyung Kee, Kiwon Um, HyunMo Kang, JungHyun Han.
20+
* An Optimization-based SPH Solver for Simulation of Hyperelastic Solids.
21+
* Computer Graphics Forum, 42: 225-233, 2023.
22+
* https://doi.org/10.1111/cgf.14756
2123
*
2224
*/
2325
class Elasticity_Kee2023 : public NonPressureForceBase

SPlisHSPlasH/NonPressureForceRegistration.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
#include "Elasticity/Elasticity_Becker2009.h"
1818
#include "Elasticity/Elasticity_Peer2018.h"
1919
#include "Elasticity/Elasticity_Kugelstadt2021.h"
20+
#ifdef USE_THIRD_PARTY_METHODS
2021
#include "Elasticity/Elasticity_Kee2023.h"
22+
#endif
2123

2224
#include "SurfaceTension/SurfaceTension_Becker2007.h"
2325
#include "SurfaceTension/SurfaceTension_Akinci2013.h"
@@ -40,7 +42,9 @@ void Simulation::registerNonpressureForces()
4042
addElasticityMethod(Elasticity_Becker2009::METHOD_NAME, Elasticity_Becker2009::creator);
4143
addElasticityMethod(Elasticity_Peer2018::METHOD_NAME, Elasticity_Peer2018::creator);
4244
addElasticityMethod(Elasticity_Kugelstadt2021::METHOD_NAME, Elasticity_Kugelstadt2021::creator);
45+
#ifdef USE_THIRD_PARTY_METHODS
4346
addElasticityMethod(Elasticity_Kee2023::METHOD_NAME, Elasticity_Kee2023::creator);
47+
#endif
4448

4549
addSurfaceTensionMethod("None", [](FluidModel*) -> NonPressureForceBase* { return nullptr; });
4650
addSurfaceTensionMethod(SurfaceTension_Becker2007::METHOD_NAME, SurfaceTension_Becker2007::creator);

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.16.1
1+
2.17.0

0 commit comments

Comments
 (0)