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

Add numerical support of other real types (linearized_euler) #2002

Merged
merged 7 commits into from
Aug 15, 2024
Merged

Add numerical support of other real types (linearized_euler) #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c727e1a
start
huiyuxie Jul 5, 2024
f4835b7
Merge branch 'main' into main-euler
huiyuxie Jul 17, 2024
8bf66df
Merge branch 'trixi-framework:main' into main-euler
huiyuxie Aug 14, 2024
e88a396
complete equations
huiyuxie Aug 14, 2024
5818d51
unit test 1D
huiyuxie Aug 14, 2024
b8079ee
unit test 2D
huiyuxie Aug 14, 2024
fc39274
unit test 3D
huiyuxie Aug 15, 2024
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
24 changes: 12 additions & 12 deletions src/equations/linearized_euler_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ The diagonalization of the flux matrix can be found in
lambda1_p = positive_part(lambda1)
lambda2_p = positive_part(lambda2)
lambda3_p = positive_part(lambda3)
lambda2p3_half_p = 0.5 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5 * (lambda3_p - lambda2_p)
lambda2p3_half_p = 0.5f0 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5f0 * (lambda3_p - lambda2_p)

lambda1_m = negative_part(lambda1)
lambda2_m = negative_part(lambda2)
lambda3_m = negative_part(lambda3)
lambda2p3_half_m = 0.5 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5 * (lambda3_m - lambda2_m)
lambda2p3_half_m = 0.5f0 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5f0 * (lambda3_m - lambda2_m)

f1p = (lambda1_p * rho_prime_ll +
lambda3m2_half_p / c_mean_global * rho_mean_global * v1_prime_ll +
Expand Down Expand Up @@ -244,14 +244,14 @@ The diagonalization of the flux matrix can be found in
lambda1_p = positive_part(lambda1)
lambda2_p = positive_part(lambda2)
lambda3_p = positive_part(lambda3)
lambda2p3_half_p = 0.5 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5 * (lambda3_p - lambda2_p)
lambda2p3_half_p = 0.5f0 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5f0 * (lambda3_p - lambda2_p)

lambda1_m = negative_part(lambda1)
lambda2_m = negative_part(lambda2)
lambda3_m = negative_part(lambda3)
lambda2p3_half_m = 0.5 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5 * (lambda3_m - lambda2_m)
lambda2p3_half_m = 0.5f0 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5f0 * (lambda3_m - lambda2_m)

f1p = (lambda1_p * rho_prime_ll +
lambda3m2_half_p / c_mean_global * rho_mean_global * v2_prime_ll +
Expand Down Expand Up @@ -304,14 +304,14 @@ end
lambda1_p = positive_part(lambda1)
lambda2_p = positive_part(lambda2)
lambda3_p = positive_part(lambda3)
lambda2p3_half_p = 0.5 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5 * (lambda3_p - lambda2_p)
lambda2p3_half_p = 0.5f0 * (lambda2_p + lambda3_p)
lambda3m2_half_p = 0.5f0 * (lambda3_p - lambda2_p)

lambda1_m = negative_part(lambda1)
lambda2_m = negative_part(lambda2)
lambda3_m = negative_part(lambda3)
lambda2p3_half_m = 0.5 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5 * (lambda3_m - lambda2_m)
lambda2p3_half_m = 0.5f0 * (lambda2_m + lambda3_m)
lambda3m2_half_m = 0.5f0 * (lambda3_m - lambda2_m)

f1p = (lambda1_p * rho_prime_ll +
lambda3m2_half_p / c_mean_global * rho_mean_global * v_prime_normal_ll +
Expand Down
156 changes: 155 additions & 1 deletion test/test_type.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ isdir(outdir) && rm(outdir, recursive = true)

@timed_testset "Compressible Euler 2D" begin
for RealT in (Float32, Float64)
# set gamma = 2 for the coupling convergence test\
# set gamma = 2 for the coupling convergence test
equations = @inferred CompressibleEulerEquations2D(RealT(2))

x = SVector(zero(RealT), zero(RealT))
Expand Down Expand Up @@ -1772,6 +1772,160 @@ isdir(outdir) && rm(outdir, recursive = true)
end
end

@timed_testset "Linearized Euler 1D" begin
for RealT in (Float32, Float64)
equations = @inferred LinearizedEulerEquations1D(v_mean_global = RealT(0),
c_mean_global = RealT(1),
rho_mean_global = RealT(1))

x = SVector(zero(RealT))
t = zero(RealT)
u = u_ll = u_rr = u_inner = SVector(one(RealT), one(RealT), one(RealT))
orientation = 1
directions = [1, 2]

surface_flux_function = flux_hll

@test eltype(@inferred initial_condition_convergence_test(x, t, equations)) ==
RealT

for direction in directions
@test eltype(@inferred boundary_condition_wall(u_inner, orientation,
direction, x, t,
surface_flux_function,
equations)) == RealT
end

@test eltype(@inferred flux(u, orientation, equations)) == RealT

@test typeof(@inferred Trixi.max_abs_speeds(equations)) ==
RealT
@test typeof(@inferred max_abs_speed_naive(u_ll, u_rr, orientation, equations)) ==
RealT
@test eltype(@inferred min_max_speed_naive(u_ll, u_rr, orientation, equations)) ==
RealT
@test eltype(@inferred min_max_speed_davis(u_ll, u_rr, orientation, equations)) ==
RealT

@test eltype(@inferred cons2prim(u, equations)) == RealT
@test eltype(@inferred cons2entropy(u, equations)) == RealT
end
end

@timed_testset "Linearized Euler 2D" begin
for RealT in (Float32, Float64)
equations = @inferred LinearizedEulerEquations2D(v_mean_global = (RealT(0),
RealT(0)),
c_mean_global = RealT(1),
rho_mean_global = RealT(1))

x = SVector(zero(RealT), zero(RealT))
t = zero(RealT)
u = u_ll = u_rr = u_inner = SVector(one(RealT), one(RealT), one(RealT),
one(RealT))
orientations = [1, 2]
directions = [1, 2, 3, 4]
normal_direction = SVector(one(RealT), zero(RealT))

surface_flux_function = flux_hll

@test eltype(@inferred initial_condition_convergence_test(x, t, equations)) ==
RealT

for orientation in orientations
for direction in directions
@test eltype(@inferred boundary_condition_wall(u_inner, orientation,
direction, x, t,
surface_flux_function,
equations)) == RealT
end

@test eltype(@inferred flux(u, orientation, equations)) == RealT
@test eltype(@inferred flux_godunov(u_ll, u_rr, orientation, equations)) ==
RealT

@test typeof(@inferred max_abs_speed_naive(u_ll, u_rr, orientation,
equations)) ==
RealT
@test eltype(@inferred min_max_speed_naive(u_ll, u_rr, orientation,
equations)) ==
RealT
@test eltype(@inferred min_max_speed_davis(u_ll, u_rr, orientation,
equations)) ==
RealT
end

@test eltype(@inferred flux(u, normal_direction, equations)) == RealT
@test eltype(@inferred flux_godunov(u_ll, u_rr, normal_direction, equations)) ==
RealT

@test eltype(@inferred Trixi.max_abs_speeds(equations)) == RealT
@test typeof(@inferred max_abs_speed_naive(u_ll, u_rr, normal_direction,
equations)) == RealT
@test eltype(@inferred min_max_speed_naive(u_ll, u_rr, normal_direction,
equations)) == RealT
@test eltype(@inferred min_max_speed_davis(u_ll, u_rr, normal_direction,
equations)) == RealT

@test eltype(@inferred cons2prim(u, equations)) == RealT
@test eltype(@inferred cons2entropy(u, equations)) == RealT
end
end

@timed_testset "Linearized Euler 3D" begin
for RealT in (Float32, Float64)
equations = @inferred LinearizedEulerEquations3D(v_mean_global = (RealT(0),
RealT(0),
RealT(0)),
c_mean_global = RealT(1),
rho_mean_global = RealT(1))

x = SVector(zero(RealT), zero(RealT), zero(RealT))
t = zero(RealT)
u = u_ll = u_rr = u_inner = SVector(one(RealT), one(RealT), one(RealT),
one(RealT), one(RealT))
orientations = [1, 2, 3]
directions = [1, 2, 3, 4, 5, 6]
normal_direction = SVector(one(RealT), zero(RealT), zero(RealT))

surface_flux_function = flux_hll

@test eltype(@inferred initial_condition_convergence_test(x, t, equations)) ==
RealT

for orientation in orientations
for direction in directions
@test eltype(@inferred boundary_condition_wall(u_inner, orientation,
direction, x, t,
surface_flux_function,
equations)) == RealT
end

@test eltype(@inferred flux(u, orientation, equations)) == RealT

@test typeof(@inferred max_abs_speed_naive(u_ll, u_rr, orientation,
equations)) == RealT
@test eltype(@inferred min_max_speed_naive(u_ll, u_rr, orientation,
equations)) == RealT
@test eltype(@inferred min_max_speed_davis(u_ll, u_rr, orientation,
equations)) == RealT
end

@test eltype(@inferred flux(u, normal_direction, equations)) == RealT

@test eltype(@inferred Trixi.max_abs_speeds(equations)) == RealT
@test typeof(@inferred max_abs_speed_naive(u_ll, u_rr, normal_direction,
equations)) == RealT
@test eltype(@inferred min_max_speed_naive(u_ll, u_rr, normal_direction,
equations)) == RealT
@test eltype(@inferred min_max_speed_davis(u_ll, u_rr, normal_direction,
equations)) == RealT

@test eltype(@inferred cons2prim(u, equations)) == RealT
@test eltype(@inferred cons2entropy(u, equations)) == RealT
end
end

@timed_testset "Shallow Water 1D" begin
for RealT in (Float32, Float64)
equations = @inferred ShallowWaterEquations1D(gravity_constant = RealT(9.81))
Expand Down
Loading