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 .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@v6
- name: Check spelling
uses: crate-ci/typos@v1.42.1
uses: crate-ci/typos@v1.43.3
14 changes: 2 additions & 12 deletions LibTrixi.jl/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,13 @@ authors = ["Michael Schlottke-Lakemper <michael@sloede.com>", "Benedict Geihe <b

[deps]
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"

[compat]
MPI = "0.20.13"
OrdinaryDiffEq = "6.53.2"
Pkg = "1.8"
SciMLBase = "2.33.0"
Trixi = "0.11.12, 0.12, 0.13, 0.14"
julia = "1.8"

[preferences.OrdinaryDiffEq]
PrecompileAutoSpecialize = false
PrecompileAutoSwitch = false
PrecompileDefaultSpecialize = true
PrecompileFunctionWrapperSpecialize = false
PrecompileLowStorage = true
PrecompileNoSpecialize = false
PrecompileNonStiff = true
PrecompileStiff = false
2 changes: 1 addition & 1 deletion LibTrixi.jl/examples/libelixir_p4est2d_euler_sedov.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using LibTrixi
using Trixi
using OrdinaryDiffEq
using OrdinaryDiffEqLowStorageRK

# The function to create the simulation state needs to be named `init_simstate`
function init_simstate()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using LibTrixi
using OrdinaryDiffEq
using OrdinaryDiffEqLowStorageRK
using Trixi

# The function to create the simulation state needs to be named `init_simstate`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# A proposed baroclinic wave test case for deep- and shallow-atmosphere dynamical cores
# https://doi.org/10.1002/qj.2241

using OrdinaryDiffEq
using OrdinaryDiffEqLowStorageRK
using Trixi
using LinearAlgebra
using LibTrixi
Expand Down
2 changes: 1 addition & 1 deletion LibTrixi.jl/examples/libelixir_t8code3d_euler_tracer.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Note that this libelixir is based on an elixir by Erik Faulhaber for Trixi.jl
# Source: https://github.com/trixi-framework/Trixi.jl/blob/main/examples/p4est_3d_dgsem/elixir_euler_circular_wind_nonconforming.jl

using OrdinaryDiffEq
using OrdinaryDiffEqLowStorageRK
using Trixi
using LinearAlgebra
using LibTrixi
Expand Down
2 changes: 1 addition & 1 deletion LibTrixi.jl/examples/libelixir_tree1d_advection_basic.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using LibTrixi
using Trixi
using OrdinaryDiffEq
using OrdinaryDiffEqLowStorageRK

# The function to create the simulation state needs to be named `init_simstate`
function init_simstate()
Expand Down
2 changes: 1 addition & 1 deletion LibTrixi.jl/src/LibTrixi.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module LibTrixi

using OrdinaryDiffEq: OrdinaryDiffEq, step!, check_error, DiscreteCallback
using SciMLBase: step!, check_error, successful_retcode, DiscreteCallback
using Trixi: Trixi, summary_callback, mesh_equations_solver_cache, ndims, nelements,
nelementsglobal, ndofs, ndofsglobal, nvariables, nnodes, wrap_array,
eachelement, cons2prim, get_node_vars, eachnode
Expand Down
2 changes: 1 addition & 1 deletion LibTrixi.jl/src/api_jl.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function trixi_step_jl(simstate)

ret = check_error(simstate.integrator)

if ret != :Success
if !successful_retcode(ret)
error("integrator failed to perform time step, return code: ", ret)
end

Expand Down
14 changes: 2 additions & 12 deletions LibTrixi.jl/test/Project.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
[deps]
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
OrdinaryDiffEqLowStorageRK = "b0944070-b475-4768-8dec-fb6eb410534d"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"

[compat]
OrdinaryDiffEq = "6.53.2"
OrdinaryDiffEqLowStorageRK = "1"
Trixi = "0.11.12, 0.12, 0.13, 0.14"

[preferences.OrdinaryDiffEq]
PrecompileAutoSpecialize = false
PrecompileAutoSwitch = false
PrecompileDefaultSpecialize = true
PrecompileFunctionWrapperSpecialize = false
PrecompileLowStorage = true
PrecompileNoSpecialize = false
PrecompileNonStiff = true
PrecompileStiff = false
4 changes: 2 additions & 2 deletions utils/libtrixi-init-julia
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,12 @@ echo
# Rationale: By first installing Trixi.jl, we ensure that we use its latest version,
# even if it does not play nicely with the latest version of OrdinaryDiffEq.jl.
# xref: https://github.com/trixi-framework/libtrixi/issues/190
echo "Install Trixi.jl and OrdinaryDiffEq.jl..."
echo "Install Trixi.jl and OrdinaryDiffEqLowStorageRK.jl..."
JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
$julia_exec --project=. \
-e "
using Pkg
Pkg.add([\"Trixi\", \"OrdinaryDiffEq\"])
Pkg.add([\"Trixi\", \"OrdinaryDiffEqLowStorageRK\"])
"
[ $? -eq 0 ] || die "could not install dependencies"
echo
Expand Down
Loading