Skip to content

Commit

Permalink
Merge branch 'main' into sc/converters_coupling
Browse files Browse the repository at this point in the history
  • Loading branch information
sloede authored Jul 11, 2023
2 parents 98bf2cf + 766e3f9 commit 79da4e9
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 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@v3
- name: Check spelling
uses: crate-ci/typos@v1.15.1
uses: crate-ci/typos@v1.16.0
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Trixi"
uuid = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
authors = ["Michael Schlottke-Lakemper <[email protected]>", "Gregor Gassner <[email protected]>", "Hendrik Ranocha <[email protected]>", "Andrew R. Winters <[email protected]>", "Jesse Chan <[email protected]>"]
version = "0.5.31-pre"
version = "0.5.32-pre"

[deps]
CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
Expand Down
2 changes: 1 addition & 1 deletion docs/literate/src/files/shock_capturing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# with the total energy $\mathbb{E}=\max\big(\frac{m_N^2}{\sum_{j=0}^N m_j^2}, \frac{m_{N-1}^2}{\sum_{j=0}^{N-1} m_j^2}\big)$,
# threshold $\mathbb{T}= 0.5 * 10^{-1.8*(N+1)^{1/4}}$ and parameter $s=ln\big(\frac{1-0.0001}{0.0001}\big)\approx 9.21024$.

# For computational efficiency, $\alpha_{min}$ is introduced und used for
# For computational efficiency, $\alpha_{min}$ is introduced and used for
# ```math
# \tilde{\alpha} = \begin{cases}
# 0, & \text{if } \alpha<\alpha_{min}\\
Expand Down
6 changes: 3 additions & 3 deletions src/equations/compressible_euler_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ Splitting of the compressible Euler flux of Steger and Warming.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down Expand Up @@ -462,7 +462,7 @@ it proved the most robust in practice.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down Expand Up @@ -555,7 +555,7 @@ are to handle flows at the low Mach number limit.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down
6 changes: 3 additions & 3 deletions src/equations/compressible_euler_2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ Splitting of the compressible Euler flux of Steger and Warming.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down Expand Up @@ -826,7 +826,7 @@ it proved the most robust in practice.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down Expand Up @@ -924,7 +924,7 @@ to Burgers' equation.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down
2 changes: 1 addition & 1 deletion src/equations/compressible_euler_3d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ Splitting of the compressible Euler flux of Steger and Warming.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down
2 changes: 1 addition & 1 deletion src/equations/inviscid_burgers_1d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ and `f⁻ = 0.5 (f - λ u)` where `λ = abs(u)`.
Returns a tuple of the fluxes "minus" (associated with waves going into the
negative axis direction) and "plus" (associated with waves going into the
positive axis direction). If only one of the fluxes is required, use the
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}`.
function signature with argument `which` set to `Val{:minus}()` or `Val{:plus}()`.
!!! warning "Experimental implementation (upwind SBP)"
This is an experimental feature and may change in future releases.
Expand Down

0 comments on commit 79da4e9

Please sign in to comment.