Skip to content

Commit

Permalink
Merge branch 'SciML:master' into get_docs_compiling
Browse files Browse the repository at this point in the history
  • Loading branch information
cmhyett authored Jan 26, 2024
2 parents aa105b8 + 0c6b918 commit 22f8ce4
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MethodOfLines"
uuid = "94925ecb-adb7-4558-8ed8-f975c56a0bf4"
authors = ["Alex Jones, <[email protected]>"]
version = "0.10.5"
version = "0.10.6"

[deps]
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
Expand Down
2 changes: 1 addition & 1 deletion test/pde_systems/MOL_1D_HigherOrder.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using ModelingToolkit: Differential

@named pdesys = PDESystem(eq,bcs,domains,[t,x],[u(t,x)])
discretization = MOLFiniteDifference([x=>dx],t, approx_order=4)
@test_throws ArgumentError discretize(pdesys,discretization)
@test_broken discretize(pdesys,discretization) isa ODEProblem

# prob = discretize(pdesys,discretization)
# sol = solve(prob, FBDF())
Expand Down
8 changes: 4 additions & 4 deletions test/pde_systems/MOL_1D_Integration.jl
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ end

disc = MOLFiniteDifference([x => 120], t)

@test_throws AssertionError (prob = discretize(pde_system, disc))

@test_broken (discretize(pde_system, disc) isa ODEProblem)
# prob = discretize(pde_system, disc)
# sol = solve(prob, Tsit5())

# xdisc = sol[x]
Expand Down Expand Up @@ -145,8 +145,8 @@ end

disc = MOLFiniteDifference([x => 120], t)

@test_throws ArgumentError (prob = discretize(pde_system, disc))

@test_broken (discretize(pde_system, disc) isa ODEProblem)
# prob = discretize(pde_system, disc)
# sol = solve(prob, Tsit5(), saveat=0.1)

# xdisc = sol[x]
Expand Down
3 changes: 2 additions & 1 deletion test/pde_systems/MOL_1D_Linear_Convection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,9 @@ end
discretization = MOLFiniteDifference([x => dx], t)

# Convert the PDE problem into an ODE problem
@test_throws "InterfaceBoundary has no field order" (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)

# prob = discretize(pdesys, discretization)
# Solve ODE problem
# using OrdinaryDiffEq
# sol = solve(prob, FBDF(), saveat=0.1)
Expand Down
3 changes: 2 additions & 1 deletion test/pde_systems/MOL_Mixed_Deriv.jl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ using ModelingToolkit: Differential
dx = (xmax-xmin)/20
discretization = MOLFiniteDifference([x => dx], t, advection_scheme = WENOScheme())

@test_throws "ExtraVariables" (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
# prob = discretize(pdesys, discretization)
# sol = solve(prob, FBDF())

# xdisc = sol[x]
Expand Down
10 changes: 5 additions & 5 deletions test/pde_systems/MOLtest2.jl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ using Test
diff_eq = ∂t(c(x, t)) ~ ∂x(D * ∂x(c(x, t)))
@named pdesys = PDESystem(diff_eq, bcs, domains, [x, t], [c(x, t)])
discretization = MOLFiniteDifference([x => Δx], t)
@test_throws ArgumentError (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
end

@testset "Test 02: ∂t(c(x, t)) ~ ∂x(D * ∂x(c(x, t)))" begin
Expand All @@ -65,7 +65,7 @@ using Test
diff_eq = ∂t(c(x, t)) ~ ∂x(D₀ / (1.0 + exp* (c(x, t) - χ))) * ∂x(c(x, t)))
@named pdesys = PDESystem(diff_eq, bcs, domains, [x, t], [c(x, t)])
discretization = MOLFiniteDifference([x => Δx], t)
@test_throws ArgumentError (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
end

@testset "Test 05: ∂t(c(x, t)) ~ ∂x(1/x * ∂x(c(x, t)))" begin
Expand Down Expand Up @@ -93,21 +93,21 @@ using Test
diff_eq = ∂t(c(x, t)) ~ c(x, t) * ∂x(c(x, t) * ∂x(c(x, t)))
@named pdesys = PDESystem(diff_eq, bcs, domains, [x, t], [c(x, t)])
discretization = MOLFiniteDifference([x => Δx], t)
@test_throws "ExtraVariables" (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
end

@testset "Test 09: ∂t(c(x, t)) ~ c(x, t) * ∂x(c(x,t) * ∂x(c(x, t)))/(1+c(x,t))" begin
diff_eq = c(x, t) * ∂x(c(x, t) * ∂x(c(x, t))) / (1 + c(x, t)) ~ 0
@named pdesys = PDESystem(diff_eq, bcs, domains, [x, t], [c(x, t)])
discretization = MOLFiniteDifference([x => Δx], t)
@test_throws "ExtraVariables" (prob = discretize(pdesys, discretization))
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
end

@testset "Test 10: ∂t(c(x, t)) ~ c(x, t) * ∂x(c(x,t) * ∂x(c(x, t)))/(1+c(x,t))" begin
diff_eq = c(x, t) * ∂x(c(x, t)^(-1) * ∂x(c(x, t))) ~ 0
@named pdesys = PDESystem(diff_eq, bcs, domains, [x, t], [c(x, t)])
discretization = MOLFiniteDifference([x => Δx], t)
@test_throws "ExtraVariables" prob = discretize(pdesys, discretization)
@test_broken (discretize(pdesys, discretization) isa ODEProblem)
end

@testset "Test 11: ∂t(c(x, t)) ~ ∂x(1/(1+c(x,t)^2) ∂x(c(x, t)))" begin
Expand Down

0 comments on commit 22f8ce4

Please sign in to comment.