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

Wetting model for CSF Surface Tension Models #666

Draft
wants to merge 658 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
658 commits
Select commit Hold shift + click to select a range
8faa548
Merge branch 'main' into add_ideal_gas
svchb Nov 19, 2024
2ba1902
Merge branch 'add_ideal_gas' into morris_surface_tension
svchb Nov 19, 2024
503bc8b
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 19, 2024
801b274
format
svchb Nov 19, 2024
d09b163
Update NEWS.md
svchb Nov 19, 2024
593c746
forgot some renames
svchb Nov 19, 2024
3180897
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 19, 2024
ba69a80
fix doc tests
svchb Nov 19, 2024
73b5749
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 19, 2024
67d5b87
fix docs
svchb Nov 19, 2024
f276a7b
fix tests
svchb Nov 19, 2024
b17a629
format
svchb Nov 19, 2024
ad7a11f
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 19, 2024
bdf80c6
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 19, 2024
7b076e6
cleanup
svchb Nov 20, 2024
23cbd38
format
svchb Nov 20, 2024
d413695
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 20, 2024
537df19
Merge branch 'main' into generalize_surface_normal_calc
svchb Nov 20, 2024
cb227d5
Merge branch 'main' into morris_surface_tension
svchb Nov 20, 2024
20b77d7
Update NEWS.md
svchb Nov 20, 2024
d7b6af1
fix tests
svchb Nov 20, 2024
01bddb0
Merge branch 'generalize_surface_normal_calc' of https://github.com/s…
svchb Nov 20, 2024
dc6fa70
Update NEWS.md
svchb Nov 20, 2024
28b28b8
Merge branch 'generalize_surface_normal_calc'
svchb Nov 20, 2024
ffc83d3
Merge branch 'main'
svchb Nov 20, 2024
96d1a17
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 20, 2024
e424cfa
Merge branch 'main' into generalize_surface_normal_calc
svchb Nov 20, 2024
d126774
fixes
svchb Nov 20, 2024
ec407ad
fixers
svchb Nov 20, 2024
041861e
fix
svchb Nov 20, 2024
21f08b2
fix
svchb Nov 21, 2024
93067f3
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 21, 2024
53a8a12
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 21, 2024
0b63bca
fix
svchb Nov 21, 2024
4501847
Merge branch 'generalize_surface_normal_calc'
svchb Nov 21, 2024
239a001
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 21, 2024
b7f448c
fix
svchb Nov 21, 2024
a2cda84
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Nov 21, 2024
7d730fc
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 21, 2024
c8ecaaf
add missing files
svchb Nov 21, 2024
ccf94c6
improve documentation
svchb Nov 21, 2024
8851385
fixes
svchb Nov 21, 2024
57ab0a6
format
svchb Nov 21, 2024
a690b52
adding this again
svchb Nov 21, 2024
0499be2
fixes
svchb Nov 21, 2024
6773c7f
Merge branch 'morris_surface_tension' into wetting_model
svchb Nov 21, 2024
bf48b69
update
svchb Nov 21, 2024
2c92628
add support for normals at boundaries
svchb Nov 22, 2024
cc2c497
add wall tangential and documentation
svchb Nov 22, 2024
dd52597
format
svchb Nov 22, 2024
1d8f124
improve docs
svchb Nov 22, 2024
3f32ce2
update
svchb Nov 22, 2024
f0ce393
update
svchb Nov 22, 2024
f61c380
Merge branch 'main' into wetting_model
svchb Nov 22, 2024
dc540ba
add support for corrections to EDAC
svchb Nov 22, 2024
e58d2da
working
svchb Nov 22, 2024
4a23780
format
svchb Nov 22, 2024
864c070
finished impl
svchb Nov 25, 2024
cff68b5
update
svchb Nov 25, 2024
d4319d8
update
svchb Nov 28, 2024
e8cd696
more fixes
svchb Nov 29, 2024
fd59129
update
svchb Nov 29, 2024
de3c9d8
cleanup
svchb Dec 2, 2024
f4fbbb3
Merge branch 'main' into generalize_surface_normal_calc
svchb Dec 2, 2024
589d416
review fixes
svchb Dec 2, 2024
1263e1a
Merge branch 'generalize_surface_normal_calc' of https://github.com/s…
svchb Dec 2, 2024
39a8f79
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 2, 2024
2893f5b
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 2, 2024
cc3a349
update
svchb Dec 2, 2024
9374398
update
svchb Dec 4, 2024
dd56f47
review comments
svchb Dec 4, 2024
306f96d
Merge branch 'generalize_surface_normal_calc' of https://github.com/s…
svchb Dec 4, 2024
eab49a1
Merge remote-tracking branch 'refs/remotes/origin/generalize_surface_…
svchb Dec 4, 2024
ab9f486
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 4, 2024
7c7a1f0
fix test
svchb Dec 4, 2024
2223ee8
update
svchb Dec 4, 2024
9ad0526
format
svchb Dec 4, 2024
93630aa
fix test
svchb Dec 4, 2024
64396ef
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 4, 2024
2cc151c
merge
svchb Dec 4, 2024
9f758be
typo
svchb Dec 4, 2024
f74ac4e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 4, 2024
a05adfb
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 4, 2024
170e314
merge error
svchb Dec 4, 2024
3618010
typo
svchb Dec 4, 2024
ec75fab
update
svchb Dec 5, 2024
d9325ad
update
svchb Dec 12, 2024
1dfd1fe
Merge branch 'main' into morris_surface_tension
svchb Dec 12, 2024
7d625d9
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 12, 2024
cd26885
Merge branch 'main' into generalize_surface_normal_calc
svchb Dec 12, 2024
80e51ba
review updates
svchb Dec 12, 2024
1141a12
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 12, 2024
1bcf2f7
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 12, 2024
4721aec
review update
svchb Dec 12, 2024
3a0413e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 12, 2024
aa37cb7
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 12, 2024
98a5f6c
add boundary system
svchb Dec 13, 2024
e05edea
update
svchb Dec 13, 2024
36741d7
update
svchb Dec 13, 2024
ba8765f
format
svchb Dec 13, 2024
c83c95e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Dec 13, 2024
9936e5d
format
svchb Dec 13, 2024
4dc0cf8
fix merge
svchb Dec 13, 2024
5e83f0c
format
svchb Dec 13, 2024
55e6557
another merge error
svchb Dec 13, 2024
ee5c2da
format
svchb Dec 13, 2024
f1660dc
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 13, 2024
cfe7626
reset to original version
svchb Dec 13, 2024
2dedd8a
Merge branch 'morris_surface_tension' into wetting_model
svchb Dec 13, 2024
523045b
fix this again???
svchb Dec 13, 2024
0009cef
missing colorfield reset
svchb Dec 18, 2024
b928e91
update
svchb Dec 19, 2024
721224f
update
svchb Dec 20, 2024
e174b1c
Merge branch 'main' into generalize_surface_normal_calc
svchb Jan 17, 2025
3398e91
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 20, 2025
816a7b5
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 20, 2025
fa6274d
Merge branch 'main' into generalize_surface_normal_calc
svchb Jan 20, 2025
2c9b033
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 20, 2025
0eb941a
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 20, 2025
8a413d6
remove color since it is unused in this PR
svchb Jan 21, 2025
43f2c56
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
fb70487
readd color since it is used here
svchb Jan 21, 2025
e1dcacc
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
c737197
review comment
svchb Jan 21, 2025
a411d1e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
0af1ece
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
5f3c7ed
format
svchb Jan 21, 2025
1c5afca
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
ca3fb2c
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
62b3eb4
format
svchb Jan 21, 2025
dafb7df
merge error
svchb Jan 21, 2025
40d1e0a
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
04af1ed
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
1ce2af5
review comment
svchb Jan 21, 2025
34c60ed
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
71d609f
format
svchb Jan 21, 2025
e5d96c9
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
acab209
format
svchb Jan 21, 2025
73cfc8f
fix
svchb Jan 21, 2025
f90c5d3
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
7439e53
format
svchb Jan 21, 2025
7da18f8
fix
svchb Jan 21, 2025
0dbcf13
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
4b5a1ab
remove surface_normal_method()
svchb Jan 21, 2025
8b3f91b
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
2466eaa
readd surface_normal_method()
svchb Jan 21, 2025
d934e43
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
a7764d2
merge error
svchb Jan 21, 2025
f4b3c6f
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
b33b50e
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
ca0de6a
function was renamed in PN
svchb Jan 21, 2025
dd30511
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
ac93895
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
32f12de
format
svchb Jan 21, 2025
d64343a
fix test
svchb Jan 21, 2025
4db3601
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 21, 2025
5614a1a
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 21, 2025
f7f8620
fix error
svchb Jan 22, 2025
9924bac
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 22, 2025
da21bc8
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 22, 2025
bda6380
format
svchb Jan 22, 2025
e783541
fix
svchb Jan 22, 2025
6fd934e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 27, 2025
2482e7a
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 27, 2025
5b2c988
review comments
svchb Jan 27, 2025
9d92605
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 27, 2025
0fa2047
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 27, 2025
1ec50c8
review comments
svchb Jan 28, 2025
41f69e4
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
02a95a7
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
9408a42
review comments
svchb Jan 28, 2025
2defd31
format
svchb Jan 28, 2025
aee3349
Merge branch 'main' into generalize_surface_normal_calc
svchb Jan 28, 2025
d438237
merge
svchb Jan 28, 2025
9681e08
format
svchb Jan 28, 2025
21b92f8
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
2851d21
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
face89a
add comment
svchb Jan 28, 2025
540ee3f
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
a97e700
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
1832335
remove ideal_neighbor()
svchb Jan 28, 2025
6f1e8a9
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
97f3b06
format
svchb Jan 28, 2025
a317e22
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
3d1006a
format
svchb Jan 28, 2025
0796b3f
typo
svchb Jan 28, 2025
bba3bd8
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
da4aa16
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
d4d4067
fix tests
svchb Jan 28, 2025
523c5e2
format
svchb Jan 28, 2025
abcd3ac
add missing docs
svchb Jan 28, 2025
9d7af19
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
1771434
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 28, 2025
2101d53
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 28, 2025
d37e99b
revert change
svchb Jan 29, 2025
f4088c0
cleanup
svchb Jan 29, 2025
65101db
only initialize necessary values
svchb Jan 29, 2025
a878534
Merge branch 'generalize_surface_normal_calc' of github.com:svchb/Tri…
svchb Jan 29, 2025
4791d41
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 29, 2025
c2f675e
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 29, 2025
494f009
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 29, 2025
648744e
fix test
svchb Jan 29, 2025
e31e843
fix examples
svchb Jan 29, 2025
4a9e333
Merge branch 'main' into generalize_surface_normal_calc
svchb Jan 29, 2025
42b24ba
Merge branch 'generalize_surface_normal_calc' into morris_surface_ten…
svchb Jan 29, 2025
73a5151
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 29, 2025
767eb9b
Merge branch 'main' into morris_surface_tension
svchb Jan 30, 2025
27b5089
format
svchb Jan 30, 2025
fc73ebf
fix tests
svchb Jan 30, 2025
fddf47a
typo
svchb Jan 30, 2025
646fbfc
remove validation case
svchb Jan 30, 2025
42a3497
Merge branch 'morris_surface_tension' into wetting_model
svchb Jan 30, 2025
870ae4c
rectangular test
svchb Jan 30, 2025
6f30a9a
update
svchb Jan 31, 2025
b94742e
format
svchb Jan 31, 2025
c9bd0bd
typo
svchb Jan 31, 2025
43c9670
move stress calculation
svchb Jan 31, 2025
d64982c
fix test
svchb Jan 31, 2025
19f2e88
format
svchb Jan 31, 2025
e229687
update
svchb Feb 10, 2025
0982834
format
svchb Feb 10, 2025
c1dfa83
update
svchb Feb 12, 2025
c3b4474
update
svchb Feb 12, 2025
657b530
more line breaks
svchb Feb 12, 2025
43de9be
remove fluff
svchb Feb 12, 2025
d992e67
doc fixes
svchb Feb 12, 2025
aa0b985
define sigma
svchb Feb 12, 2025
133a515
improve docs
svchb Feb 12, 2025
ccd58bf
more doc improvements
svchb Feb 12, 2025
0e1efb5
fix docs
svchb Feb 12, 2025
0776aa7
Merge branch 'main' into morris_surface_tension
svchb Feb 12, 2025
1887aed
remove unnecessary example
svchb Feb 13, 2025
3eab67f
fix allocations
svchb Feb 14, 2025
7c9ebb0
Merge branch 'main' into morris_surface_tension
svchb Feb 14, 2025
ecb9719
add descriptions
svchb Feb 14, 2025
7fdc925
reduce example runtime
svchb Feb 14, 2025
9cae162
move fluid examples to separate file
svchb Feb 14, 2025
ca322f1
format
svchb Feb 14, 2025
081d2fb
add missing comment
svchb Feb 14, 2025
50110be
fix stress_tensor()
svchb Feb 14, 2025
dbf36c9
fix docs
svchb Feb 14, 2025
47cb6f5
improve coverage
svchb Feb 14, 2025
0edf873
reduce example run time
svchb Feb 14, 2025
355d23e
further reduce runtime
svchb Feb 14, 2025
ac1ce31
format
svchb Feb 14, 2025
1d875ba
fix merge error
svchb Feb 14, 2025
0de653d
now for real
svchb Feb 14, 2025
9f568b0
fix
svchb Feb 14, 2025
cc14ce5
fix test
svchb Feb 14, 2025
3401a54
Merge branch 'morris_surface_tension' into wetting_model
svchb Feb 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ on:
workflow_dispatch:

concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

Expand Down
12 changes: 12 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
TrixiParticles.jl follows the interpretation of [semantic versioning (semver)](https://julialang.github.io/Pkg.jl/dev/compatibility/#Version-specifier-format-1)
used in the Julia ecosystem. Notable changes will be documented in this file for human readability.

## Version 0.2.7

### Features

- Adds the classic **Continuum Surface Force (CSF)** model based on Morris 2000 (#584), which computes
surface tension as a **body force** proportional to curvature and directed along the interface normal.
This method is efficient and accurate for capillary effects but does not explicitly conserve momentum.

- Added the classic **Continuum Surface Stress (CSS)** model based on Morris 2000 (#584), which is
a **momentum-conserving** approach that formulates surface tension as the **divergence of a stress tensor**.
However, it requires additional computation and stabilization to handle **high-density interfaces** and reduce numerical instabilities.

## Version 0.2.6

### Features
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.7-dev"
version = "0.2.7"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
26 changes: 26 additions & 0 deletions docs/src/refs.bib
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,19 @@ @Article{Hormann2001
publisher = {Elsevier BV},
}

@Article{Huber2016,
title = {On the physically based modeling of surface tension and moving contact lines with dynamic contact angles on the continuum scale},
journal = {Journal of Computational Physics},
volume = {310},
pages = {459-477},
year = {2016},
issn = {0021-9991},
doi = {https://doi.org/10.1016/j.jcp.2016.01.030},
url = {https://www.sciencedirect.com/science/article/pii/S0021999116000383},
author = {M. Huber and F. Keller and W. Säckel and M. Hirschler and P. Kunz and S.M. Hassanizadeh and U. Nieken},
keywords = {SPH, Two-phase flow, Surface tension, Moving contact line, Dynamic contact angle, CSF, CLF}
}


@Article{Jacobson2013,
author = {Jacobson, Alec and Kavan, Ladislav and Sorkine-Hornung, Olga},
Expand Down Expand Up @@ -491,6 +504,19 @@ @Article{Morris1997
publisher = {Elsevier BV},
}

@article{Morris2000,
author = {Morris, Joseph P.},
title = {Simulating surface tension with smoothed particle hydrodynamics},
journal = {International Journal for Numerical Methods in Fluids},
volume = {33},
number = {3},
pages = {333-353},
keywords = {interfacial flow, meshless methods, surface tension},
doi = {https://doi.org/10.1002/1097-0363(20000615)33:3<333::AID-FLD11>3.0.CO;2-7},
year = {2000}
}


@InProceedings{Mueller2003,
author = {M{\"u}ller, Matthias and Charypar, David and Gross, Markus},
booktitle = {Proceedings of the 2003 ACM SIGGRAPH/Eurographics Symposium on Computer Animation},
Expand Down
Loading
Loading