Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ Static = "0.8, 1"
StaticArrayInterface = "1.5.1"
StaticArrays = "1"
StrideArrays = "0.1.28"
Trixi = "0.16"
Trixi = "0.16.10"
Comment thread
JoshuaLampert marked this conversation as resolved.
julia = "1.10"
4 changes: 3 additions & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ DocumenterInterLinks = "d12716ef-a0f6-4df4-a9f1-a5a34e75c656"
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
OrdinaryDiffEqLowStorageRK = "b0944070-b475-4768-8dec-fb6eb410534d"
Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
TrixiAtmo = "c9ed1054-d170-44a9-8ee2-d5566f5d1389"

[compat]
Documenter = "1.3"
DocumenterInterLinks = "0.3.1, 1"
Literate = "2"
OrdinaryDiffEqLowStorageRK = "3"
Trixi = "0.16.10"
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ callbacks = CallbackSet(summary_callback,
stepsize_callback)

sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
dt = 1e-1, # solve needs some value here but it will be overwritten by the stepsize_callback
save_everystep = false, callback = callbacks, adaptive = false)
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ callbacks = CallbackSet(summary_callback,
stepsize_callback)

sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
dt = 1e-1, # solve needs some value here but it will be overwritten by the stepsize_callback
save_everystep = false, callback = callbacks, adaptive = false)
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ callbacks = CallbackSet(summary_callback,
stepsize_callback)

sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
dt = 1e-1, # solve needs some value here but it will be overwritten by the stepsize_callback
save_everystep = false, callback = callbacks, adaptive = false)
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ callbacks = CallbackSet(summary_callback,
alive_callback)

sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7, ode_default_options()..., callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,6 @@ callbacks = CallbackSet(summary_callback,
# Enable threading of the RK method for better performance on multiple threads
tol = 1e-6
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
abstol = tol, reltol = tol, ode_default_options()...,
callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,6 @@ callbacks = CallbackSet(summary_callback,
# Enable threading of the RK method for better performance on multiple threads
tol = 1e-6
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
abstol = tol, reltol = tol, ode_default_options()...,
callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,6 @@ callbacks = CallbackSet(summary_callback,
# Use a Runge-Kutta method with automatic (error based) time step size control
# Enable threading of the RK method for better performance on multiple threads
sol = solve(ode,
RDPK3SpFSAL49(thread = Trixi.True());
RDPK3SpFSAL49(; thread = Trixi.Threaded());
abstol = 1.0e-5, reltol = 1.0e-5, ode_default_options()...,
callback = callbacks);
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,5 @@ callbacks = CallbackSet(summary_callback,
###############################################################################
# run the simulation
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7, ode_default_options()..., callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ callbacks = CallbackSet(summary_callback,
###############################################################################
# run the simulation
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
ode_default_options()..., callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,6 @@ callbacks = CallbackSet(summary_callback,
###############################################################################
# run the simulation
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
ode_default_options()..., callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -154,5 +154,5 @@ callbacks = CallbackSet(summary_callback,
###############################################################################
# run the simulation
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7, ode_default_options()..., callback = callbacks)
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ callbacks = CallbackSet(summary_callback,
###############################################################################
# run the simulation
sol = solve(ode,
SSPRK43(thread = Trixi.True());
SSPRK43(thread = Trixi.Threaded());
maxiters = 1.0e7,
ode_default_options()..., callback = callbacks)
4 changes: 3 additions & 1 deletion examples/euler/moist_air/buoyancy/elixir_hoeck_bubble.jl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ stage_limiter! = NonlinearSolveDG(saturation_residual, saturation_residual_jacob

###############################################################################
# run the simulation
sol = solve(ode, CarpenterKennedy2N54(williamson_condition = false, stage_limiter!),
sol = solve(ode,
CarpenterKennedy2N54(; williamson_condition = false,
stage_limiter! = stage_limiter!),
maxiters = 1.0e7,
dt = 1.0,
save_everystep = false, callback = callbacks);
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ stage_limiter! = NonlinearSolveDG(saturation_residual, saturation_residual_jacob

###############################################################################
# run the simulation
sol = solve(ode, SSPRK43(stage_limiter!); ode_default_options()...,
sol = solve(ode, SSPRK43(; stage_limiter! = stage_limiter!); ode_default_options()...,
maxiters = 1.0e7, save_everystep = false, callback = callbacks);
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ stage_limiter! = NonlinearSolveDG(saturation_residual, saturation_residual_jacob

###############################################################################
# run the simulation
sol = solve(ode, SSPRK43(stage_limiter!); ode_default_options()...,
sol = solve(ode, SSPRK43(; stage_limiter! = stage_limiter!); ode_default_options()...,
maxiters = 1.0e7, save_everystep = false, callback = callbacks);
4 changes: 3 additions & 1 deletion examples/euler/precipitation/tests/convergence_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ stage_limiter! = NonlinearSolveDG(saturation_residual, saturation_residual_jacob
###############################################################################
# run the simulation

sol = solve(ode, CarpenterKennedy2N54(williamson_condition = false, stage_limiter!),
sol = solve(ode,
CarpenterKennedy2N54(; williamson_condition = false,
stage_limiter! = stage_limiter!),
dt = 1.0, # solve needs some value here but it will be overwritten by the stepsize_callback
save_everystep = false, callback = callbacks);

Expand Down
16 changes: 8 additions & 8 deletions src/callbacks_step/save_solution_covariant.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
function convert_variables(u, solution_variables, mesh::P4estMesh{2},
equations::AbstractCovariantEquations{2}, dg, cache)
(; aux_node_vars) = cache.auxiliary_variables
# Extract the number of solution variables to be output
# (may be different than the number of conservative variables)
# Extract the number of solution variables to be output
# (may be different than the number of conservative variables)
n_vars = length(Trixi.varnames(solution_variables, equations))

# Allocate storage for output
Expand Down Expand Up @@ -37,12 +37,12 @@ end
function convert_variables(u, solution_variables, mesh::DGMultiMesh,
equations::AbstractCovariantEquations, dg, cache)
(; aux_values) = cache.auxiliary_container
# Extract the number of solution variables to be output
# (may be different than the number of conservative variables)
# Extract the number of solution variables to be output
# (may be different than the number of conservative variables)
n_vars = length(Trixi.varnames(solution_variables, equations))

# Allocate storage for output, an Np x n_elements array of nvars arrays
data = map(_ -> SVector{n_vars, eltype(u)}(zeros(n_vars)), u)
data = map(_ -> SVector{n_vars, eltype(u)}(zeros(n_vars)), parent(u))

# Loop over all nodes and convert variables, passing in auxiliary variables
for i in Trixi.each_dof_global(mesh, dg)
Expand All @@ -58,8 +58,8 @@ function convert_variables(u, solution_variables, mesh::DGMultiMesh,
end

# Calculate the primitive variables and relative vorticity at a given node. The velocity
# components in the global coordinate system and the bottom topography are returned, such
# that the outputs for CovariantShallowWaterEquations2D and ShallowWaterEquations3D are the
# components in the global coordinate system and the bottom topography are returned, such
# that the outputs for CovariantShallowWaterEquations2D and ShallowWaterEquations3D are the
# same variables, provided that GlobalCartesianCoordinates are used in the former case.
@inline function cons2prim_and_vorticity(u, equations::AbstractCovariantEquations{2},
dg::DGSEM, cache, i, j, element)
Expand Down Expand Up @@ -117,7 +117,7 @@ end
return (dv2dxi1 - dv1dxi2) / area_element(aux_node, equations)
end

# Variable names for cons2prim_and_vorticity, chosen to match those from
# Variable names for cons2prim_and_vorticity, chosen to match those from
# ShallowWaterEquations3D
function Trixi.varnames(::typeof(cons2prim_and_vorticity),
equations::AbstractCovariantShallowWaterEquations2D)
Expand Down
6 changes: 3 additions & 3 deletions test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ TrixiTest = "0a316866-cbd0-4425-8bcb-08103b2c1f26"
LinearAlgebra = "1"
MPI = "0.20.6"
NLsolve = "4.5.1"
OrdinaryDiffEqLowStorageRK = "1.2"
OrdinaryDiffEqSSPRK = "1.2"
OrdinaryDiffEqLowStorageRK = "1.2, 2, 3"
OrdinaryDiffEqSSPRK = "1.2, 2, 3"
Test = "1"
Trixi = "0.16"
Trixi = "0.16.10"
TrixiTest = "0.1.3, 0.2"
8 changes: 4 additions & 4 deletions test/test_3d_potential_temperature.jl
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,16 @@ end
"elixir_potential_temperature_held_suarez.jl"),
l2=[
0.0031433373482917877,
0.00013227403214817446,
0.0001322740320211912,
0.00013227403432754568,
0.00013227403435669966,
0.00014259768410822775,
0.7578318727895532,
569.8247547308886
],
linf=[
0.023356419582470034,
0.001522627198332827,
0.0015226271932242787,
0.0015226272537349924,
0.0015226272475246977,
0.0005022230908559857,
4.88597072706591,
1703.946276059638
Expand Down
Loading