Skip to content

Fix JET.jl/MTK v11 compat issues #45

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

Open
langestefan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix JET.jl/MTK v11 compat issues #45

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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Aqua = "0.8"
Dates = "1"
DocStringExtensions = "0.8, 0.9"
Makie = "0.24"
ModelingToolkit = "10.3.0"
ModelingToolkit = "10.3, 11"
OhMyThreads = "0.8"
StructArrays = "0.7"
Symbolics = "6,7"
Expand Down
6 changes: 3 additions & 3 deletions ext/SolarPositionModelingToolkitExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function SolarPositionBlock(;
refraction = NoRefraction(),
)
@parameters t0::DateTime = t0 [tunable = false]
@parameters observer::Observer = observer [tunable = false]
@parameters observer::typeof(observer) = observer [tunable = false]
@parameters algorithm::SolarAlgorithm = algorithm [tunable = false]
@parameters refraction::RefractionAlgorithm = refraction [tunable = false]

Expand All @@ -69,8 +69,8 @@ function SolarPositionBlock(;
eqs,
t,
[azimuth, elevation, zenith],
#=vars=#[t0, observer, algorithm, refraction];
#=params=#name = name,
[t0, observer, algorithm, refraction];
#=vars=#name = name,#=params=#
)
end

Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"

[sources]
SolarPosition = {path = ".."}
SolarPosition = { path = ".." }

[compat]
Aqua = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions test/linting.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ using SolarPosition
using Test

using Aqua: Aqua
using JET: JET

@testset "Aqua tests" begin
@info "...with Aqua.jl"
Aqua.test_all(SolarPosition)
end

if VERSION > v"1.11" # JET v0.10 requires Julia v1.12
if VERSION > v"1.11" # JET v0.11 requires Julia v1.11+ and PrecompileTools 1.3.2+
using JET: JET
@testset "JET tests" begin
@info "...with JET.jl"
JET.test_package(SolarPosition; target_modules = (SolarPosition,))
Expand Down
1 change: 1 addition & 0 deletions test/test-mtk.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using SolarPosition: HUGHES, BENNETT, ARCHER, MICHALSKY, SG2
using ModelingToolkit: @named, @variables, @parameters, unknowns, System, mtkcompile
using ModelingToolkit: t_nounits as t, D_nounits as D
using Dates: DateTime
using TimeZones: @tz_str, astimezone
using OrdinaryDiffEq
using CairoMakie

Expand Down
Loading