Skip to content

Commit

Permalink
Merge branch 'main' into validation_hydrostatic_water_column
Browse files Browse the repository at this point in the history
  • Loading branch information
svchb authored Feb 21, 2025
2 parents 151ef4b + 6d04215 commit e192cc0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/SpellCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
- name: Checkout Actions Repository
uses: actions/checkout@v4
- name: Check spelling
uses: crate-ci/typos@v1.29.0
uses: crate-ci/typos@v1.29.5
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ jobs:
os:
- ubuntu-latest
include:
# Also run tests on Windows and macOS-ARM, but only with the latest Julia release and minimum supported version
- version: 'min'
# Also run tests on Windows and macOS-ARM, but only with the latest Julia release and minimum supported version.
# Don't use 'min' version, which will ignore hotfixes, i.e. 1.10.0 will be used instead of e.g. 1.10.8.
- version: '1.10'
os: windows-latest
- version: 'min'
- version: '1.10'
os: macos-14
- version: '1'
os: windows-latest
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "TrixiParticles"
uuid = "66699cd8-9c01-4e9d-a059-b96c86d16b3a"
authors = ["erik.faulhaber <44124897+efaulhaber@users.noreply.github.com>"]
version = "0.2.6"
version = "0.2.7-dev"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
2 changes: 1 addition & 1 deletion src/schemes/fluid/entropically_damped_sph/system.jl
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ See [Entropically Damped Artificial Compressibility for SPH](@ref edac) for more
gravity-like source terms.
- `surface_tension`: Surface tension model used for this SPH system. (default: no surface tension)
- `surface_normal_method`: The surface normal method to be used for this SPH system.
(default: no surface normal method or ColorfieldSurfaceNormal() if a surface_tension model is used)
(default: no surface normal method or `ColorfieldSurfaceNormal()` if a surface_tension model is used)
- `reference_particle_spacing`: The reference particle spacing used for weighting values at the boundary,
which currently is only needed when using surface tension.
Expand Down
2 changes: 1 addition & 1 deletion src/schemes/fluid/weakly_compressible_sph/system.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ See [Weakly Compressible SPH](@ref wcsph) for more details on the method.
gravity-like source terms.
- `surface_tension`: Surface tension model used for this SPH system. (default: no surface tension)
- `surface_normal_method`: The surface normal method to be used for this SPH system.
(default: no surface normal method or ColorfieldSurfaceNormal() if a surface_tension model is used)
(default: no surface normal method or `ColorfieldSurfaceNormal()` if a surface_tension model is used)
- `reference_particle_spacing`: The reference particle spacing used for weighting values at the boundary,
which currently is only needed when using surface tension.
Expand Down

0 comments on commit e192cc0

Please sign in to comment.