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.

Sign up for GitHub

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

backports from v0.6-dev to main #1732

Merged
merged 1 commit into from
Nov 11, 2023
+13 −8
Merged

backports from v0.6-dev to main #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions examples/p4est_2d_dgsem/elixir_navierstokes_convergence.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ end
v1_yy * v1 * mu_ -
v2_xy * v1 * mu_ -
v1_y * v1_y * mu_ -
v2_x * v1_y * mu_ -
4.0 / 3.0 * v2_yy * v2 * mu_ +
2.0 / 3.0 * v1_xy * v2 * mu_ -
4.0 / 3.0 * v2_y * v2_y * mu_ +
Expand Down
11 changes: 6 additions & 5 deletions examples/tree_2d_dgsem/elixir_navierstokes_convergence.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,16 @@ end
# stress tensor and temperature gradient terms from y-direction
v1_yy * v1 * mu_ -
v2_xy * v1 * mu_ -
v1_y * v1_y * mu_ -
v2_x * v1_y * mu_ -
4.0 / 3.0 * v2_yy * v2 * mu_ +
2.0 / 3.0 * v1_xy -
2.0 / 3.0 * v1_xy * v2 * mu_ -
4.0 / 3.0 * v2_y * v2_y * mu_ +
2.0 / 3.0 * v1_x * v2_y * mu_
-
-
2.0 / 3.0 * v1_x * v2_y * mu_ -
T_const * inv_rho_cubed *
(p_yy * rho * rho -
2.0 * p_y * rho * rho_y + - -
2.0 * p_y * rho * rho_y +
2.0 * p * rho_y * rho_y -
p * rho * rho_yy) * mu_)

return SVector(du1, du2, du3, du4)
Expand Down
3 changes: 2 additions & 1 deletion test/test_parabolic_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ isdir(outdir) && rm(outdir, recursive = true)
dg = DGMulti(polydeg = 2, element_type = Quad(), approximation_type = Polynomial(),
surface_integral = SurfaceIntegralWeakForm(flux_central),
volume_integral = VolumeIntegralWeakForm())
mesh = DGMultiMesh(dg, cells_per_dimension = (2, 2))
cells_per_dimension = (2, 2)
mesh = DGMultiMesh(dg, cells_per_dimension)

# test with polynomial initial condition x^2 * y
# test if we recover the exact second derivative
Expand Down
6 changes: 4 additions & 2 deletions test/test_special_elixirs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ end
volume_integral = VolumeIntegralWeakForm())

# DGMultiMesh is on [-1, 1]^ndims by default
mesh = DGMultiMesh(solver, cells_per_dimension = (2, 2),
cells_per_dimension = (2, 2)
mesh = DGMultiMesh(solver, cells_per_dimension,
periodicity = (true, true))

semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition,
Expand All @@ -225,7 +226,8 @@ end
volume_integral = VolumeIntegralFluxDifferencing(flux_central))

# DGMultiMesh is on [-1, 1]^ndims by default
mesh = DGMultiMesh(solver, cells_per_dimension = (2, 2),
cells_per_dimension = (2, 2)
mesh = DGMultiMesh(solver, cells_per_dimension,
periodicity = (true, true))

semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition,
Expand Down