Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Big refactoring: extract schemes and get rid of container types #142

Merged
merged 14 commits into from
May 26, 2023
Merged

Conversation

efaulhaber
Copy link
Member

@efaulhaber efaulhaber commented May 11, 2023

Big refactoring according to #129.
Closes #129.

* change directory structure

Co-authored-by: Erik Faulhaber <[email protected]>

* adapt tests

* change include order

---------

Co-authored-by: Erik Faulhaber <[email protected]>
@codecov
Copy link

codecov bot commented May 11, 2023

Codecov Report

Merging #142 (918b323) into main (b25e2f7) will decrease coverage by 0.53%.
The diff coverage is 42.77%.

@@            Coverage Diff             @@
##             main     #142      +/-   ##
==========================================
- Coverage   50.29%   49.77%   -0.53%     
==========================================
  Files          38       38              
  Lines        2201     2224      +23     
==========================================
  Hits         1107     1107              
- Misses       1094     1117      +23     
Flag Coverage Δ
unit 49.77% <42.77%> (?)
unitandintegration ?

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

Impacted Files Coverage Δ
examples/fsi/bending_beam_2d.jl 0.00% <0.00%> (ø)
examples/fsi/dam_break_gate_2d.jl 0.00% <ø> (ø)
examples/n_body/n_body_benchmark_trixi.jl 0.00% <0.00%> (ø)
examples/n_body/n_body_system.jl 0.00% <0.00%> (ø)
src/TrixiParticles.jl 100.00% <ø> (ø)
src/callbacks/info.jl 35.43% <0.00%> (ø)
src/callbacks/solution_saving.jl 0.00% <0.00%> (ø)
src/general/density_calculators.jl 14.28% <0.00%> (ø)
src/general/smoothing_kernels.jl 19.44% <ø> (ø)
...chemes/boundary/dummy_particles/dummy_particles.jl 0.00% <0.00%> (ø)
... and 25 more

LasNikas and others added 11 commits May 15, 2023 12:17
* move containers into `schemes`

* move container into `general`

* rename containers
…` stuff from the boundary container (#148)

* Make dispatching more readable

* Implement suggestions

* Make things consistent
* Fix includes and unit tests

* Update src/schemes/solid/total_lagrangian_sph/penalty_force.jl

Co-authored-by: LasNikas <[email protected]>

---------

Co-authored-by: LasNikas <[email protected]>
* Merge test files to get coverage back up again

* Reformat code
* `FluidParticleContainer` to `WeaklyCompressibleSPHSystem`

* `SolidParticleContainer` to `TotalLagrangianSPHSystem`

* `BoundaryParticleContainer` to `BpundarySPHSystem`

* `ParticleContainer` to `SPHSystem`

* make examples consistent

* formatting

* rename variables

* undo file rename

* rename again

* apply formatter

* fix tests

* fix merge conflicts

* fix again

* apply formatter

* fix tests

* remove infiltrator

* implement suggestions
* Add `InitialCondition`

* Use `InitialCondition` in `Semidiscretization`

* Revert "Use `InitialCondition` in `Semidiscretization`"

This reverts commit 479719b.

* Store initial condition in systems

* Adapt shapes

* Remove `MergeShapes`

* Start adapting example files

* Fix undefined values

* Only set current and not initial coordinates of solids in `restart_with`

* Fix examples

* Fix tests

* Reformat code

* Implement suggestions

* Reformat code

* Move smoothing kernel check before acceleration check

The default acceleration depends on the smoothing kernel dimensionality,
so passing a wrong smoothing kernel yielded
"acceleration must be of length", which was confusing.
* formatting

* adapt include order

* extract boundary models

* mv function into corresponding files

* implement suggestions
@efaulhaber efaulhaber changed the title Extract schemes and get rid of container types Big refactoring: extract schemes and get rid of container types May 26, 2023
LasNikas and others added 2 commits May 26, 2023 14:06
* adapt docs

* fix typo

* implement suggestions
@efaulhaber efaulhaber marked this pull request as ready for review May 26, 2023 14:07
@efaulhaber efaulhaber enabled auto-merge May 26, 2023 14:07
@efaulhaber efaulhaber disabled auto-merge May 26, 2023 14:08
@efaulhaber efaulhaber enabled auto-merge May 26, 2023 14:08
@efaulhaber efaulhaber requested a review from LasNikas May 26, 2023 14:08
@efaulhaber efaulhaber merged commit 12d2d41 into main May 26, 2023
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.

Software design discussion with multiple schemes
2 participants