Skip to content

Merge dev to main for 0.5 release#1164

Merged
efaulhaber merged 17 commits intomainfrom
dev2
Apr 29, 2026
Merged

Merge dev to main for 0.5 release#1164
efaulhaber merged 17 commits intomainfrom
dev2

Conversation

@efaulhaber
Copy link
Copy Markdown
Member

Supersedes #1146 to get rid of the individual non-PR commits before (non-squash) merging to main.

marcelschurer and others added 16 commits March 19, 2026 10:09
…nitialCondition` (#959)

* Update vtk2trixi function to return `NamedTuple` instead of `InitialCondition`

* Refactor vtk2trixi function to accept custom fields

* Enhance vtk2trixi function to support scalar and vector custom quantities and update tests

* Fix typo in documentation for vtk2trixi function

* Fix capitalization in comments

* Fix formatting in documentation

* Corrected failing doctest output

* Corrected failing doctest output

* add NEWS entry

* revise

* fix doc test

* fix NEWS entry

* fix merge bug

* load `custom_quantities` automatically

* implement suggestions

* fix jldoctest

* Add `create_initial_condition` parameter

---------

Co-authored-by: Niklas Neher <73897120+LasNikas@users.noreply.github.com>
Co-authored-by: Sven Berger <berger.sven@gmail.com>
Co-authored-by: LasNikas <niklas.nehe@web.de>
Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>
* add automatic reordering

* fix typo

* revise docs

* indentation

* add tests

* add vector variant

* force unique indices

* add depwarning

* drop `n_particles_clamped`

* fix regex

* rm regex

* fix again

* implement suggestions

* apply formatter

* fix examples

* fix

* implement suggestions

* rm datatype restriction

* implement suggestions

* adapt example files

* fix merge conflict

* fix again

* fix unit tests

* fix tests

* fix tests

* add docs

* remove unnecessary info

---------

Co-authored-by: LasNikas <niklas.nehe@web.de>
* Make pressure clipping in `BoundaryModelDummyParticles` optional

* Reformat

* Disable pressure clipping by default

* Add NEWS.md entry

* Make free surface examples use boundary pressure clipping

* Fix tests

* Fix smoothing length in example tests

* Fix

* Fix

* Update docstring

* Update docstrings

* Unify example tests

* Reformat
* Switch to sub-packages of OrdinaryDiffEq.jl

* Update NEWS.md

* Fix

* Fix allocations?

* Fix imported packages in IISPH examples

* Fix typo

* Simplify tests

* Fix remaining allocations

* Unify example tests

* Revert "Unify example tests"

This reverts commit 9af09e6.

* Add comments

* Fix NEWS.md

* Update installation instructions

* Fix missing NEWS entry
* Refactor SPH system initialization to use keyword arguments

- Updated the initialization of `WeaklyCompressibleSPHSystem` and `EntropicallyDampedSPHSystem` across multiple examples to utilize keyword arguments for better readability and maintainability.
- Adjusted the documentation for both systems to reflect the new argument structure.
- Ensured consistency in the usage of density calculators and state equations in the examples.
- Modified tests to validate the new keyword argument structure for both SPH systems.

* fix test

* Update docs/literate/src/tut_setup.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* remove unneeded named arguments

* more fixes

* Refactor constructors to use keyword arguments for DEM and SPH systems

* Refactor constructors in DEM, SPH, and TotalLagrangian systems to use keyword arguments for improved clarity and consistency

* fix tests

* better fix for included parameters

* another pass to reduce unreqed named args

* even more unreq named keyword use

* format

* typo

* fix tests

* fix tests

* fix tests

* fix tests

* format

* format

* fix

* format

* Apply suggestion from @efaulhaber

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fluid/dam_break_oil_film_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fluid/falling_water_spheres_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fluid/falling_water_spheres_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/systems/tlsph_system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/systems/tlsph_system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/systems/edac_system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/schemes/structure/total_lagrangian_sph/rhs.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fluid/poiseuille_flow_3d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fsi/dam_break_gate_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fsi/dam_break_plate_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/fsi/hydrostatic_water_column_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update examples/structure/oscillating_beam_2d.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update src/schemes/boundary/dem_boundary/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update src/schemes/fluid/entropically_damped_sph/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update src/schemes/fluid/implicit_incompressible_sph/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update src/schemes/fluid/weakly_compressible_sph/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update src/schemes/structure/discrete_element_method/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/general/custom_quantities.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/general/interpolation.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/general/interpolation.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/schemes/boundary/dummy_particles/rhs.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/schemes/fluid/rhs.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/schemes/boundary/dummy_particles/dummy_particles.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update test/schemes/boundary/dummy_particles/dummy_particles.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* fix doc strings

* review

* format

* fix test

* fix NEWS.md

* add news section

* Update src/schemes/fluid/implicit_incompressible_sph/system.jl

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* review comments

Co-authored-by: Copilot <copilot@github.com>

* Update NEWS.md

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

* Update NEWS.md

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>

---------

Co-authored-by: Erik Faulhaber <44124897+efaulhaber@users.noreply.github.com>
Co-authored-by: Copilot <copilot@github.com>
* Update NEWS.md and prepare release

* Fix typo
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@efaulhaber efaulhaber mentioned this pull request Apr 29, 2026
7 tasks
* Apply Copilot suggestion

* Apply Copilot suggestion

* Fix unit tests

* Fix dam break GPU example

* Refactor dam break simulation parameters for clarity

* Fix syntax error in dam_break_2d_gpu.jl

* fix

* fix allocations

* pin static.jl to 1.3.1

* Fix 2adeecd

---------

Co-authored-by: Sven Berger <berger.sven@gmail.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 29, 2026

Codecov Report

❌ Patch coverage is 92.85714% with 15 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.05%. Comparing base (81711ed) to head (bd9e86e).
⚠️ Report is 19 commits behind head on main.

Files with missing lines Patch % Lines
test/io/read_vtk.jl 93.06% 7 Missing ⚠️
.../schemes/boundary/wall_boundary/dummy_particles.jl 87.50% 2 Missing ⚠️
src/callbacks/solution_saving.jl 0.00% 1 Missing ⚠️
src/general/time_integration.jl 0.00% 1 Missing ⚠️
src/io/read_vtk.jl 96.29% 1 Missing ⚠️
src/preprocessing/geometries/io.jl 0.00% 1 Missing ⚠️
.../preprocessing/particle_packing/signed_distance.jl 0.00% 1 Missing ⚠️
src/setups/complex_shape.jl 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1164      +/-   ##
==========================================
+ Coverage   88.97%   89.05%   +0.07%     
==========================================
  Files         129      128       -1     
  Lines        9980    10039      +59     
==========================================
+ Hits         8880     8940      +60     
+ Misses       1100     1099       -1     
Flag Coverage Δ
total 89.05% <92.85%> (+0.07%) ⬆️
unit 68.11% <84.76%> (+0.45%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@efaulhaber efaulhaber marked this pull request as ready for review April 29, 2026 11:51
@efaulhaber efaulhaber merged commit d205497 into main Apr 29, 2026
12 of 14 checks passed
@efaulhaber efaulhaber deleted the dev2 branch April 29, 2026 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants