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
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "weekly"
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ FROM jupyter/julia-notebook:latest

# Add packages & precompile
RUN julia -e 'import Pkg; Pkg.update(); \
Pkg.add(["MagNav","CSV","DataFrames","Plots"]); \
Pkg.add(["LinearAlgebra","Random","Statistics"]); \
Pkg.add(["CSV","DataFrames","MagNav","Plots"]); \
Pkg.precompile();'

# Download examples
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "MagNav"
uuid = "f91b31a4-be4d-40e3-b767-4b8c09c10076"
version = "1.3.2"
version = "1.3.3"

[deps]
ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
Expand Down Expand Up @@ -75,7 +75,7 @@ Plots = "1"
Pluto = "0.20"
Random = "1"
Revise = "3"
SatelliteToolboxGeomagneticField = "1"
SatelliteToolboxGeomagneticField = "~1.0"
ShapML = "0.3"
SpecialFunctions = "2"
Statistics = "1"
Expand Down
6 changes: 3 additions & 3 deletions examples/pluto_fi.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -164,8 +164,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down
8 changes: 5 additions & 3 deletions examples/pluto_linear.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -254,6 +254,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MagNav = "f91b31a4-be4d-40e3-b767-4b8c09c10076"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Expand All @@ -262,8 +263,9 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
LinearAlgebra = "~1.11.0"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down
38 changes: 19 additions & 19 deletions examples/pluto_maps.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -122,6 +122,22 @@ begin
p2
end

# ╔═╡ 39bdbe6a-52ae-44d2-8e80-2e7d2a75e322
begin
using MagNav: get_step
(map_map,px,py) = map_expand(e_mapS_395.map,200)
px_end = size(map_map,2) - length(e_mapS_395.xx) - px
py_end = size(map_map,1) - length(e_mapS_395.yy) - py
dx = get_step(e_mapS_395.xx)
dy = get_step(e_mapS_395.yy)
xx = [(e_mapS_395.xx[1]-dx*px):dx:(e_mapS_395.xx[end]+dx*px_end);]
yy = [(e_mapS_395.yy[1]-dy*py):dy:(e_mapS_395.yy[end]+dy*py_end);]
(lat,lon) = map_border(e_mapS_395;sort_border=true) # get map border
p5 = plot_map(map_map,xx,yy;dpi=dpi)
plot_path!(p5,lat,lon;path_color=:black)
p5
end

# ╔═╡ 2d18bbeb-ad4e-4c5b-80a3-25bd99f45c73
md"## Plot Eastern Ontario altitude map CDF

Expand Down Expand Up @@ -161,22 +177,6 @@ md"## Plot expanded Eastern Ontario map
The original map area is show with a black outline. During upward (or downward) continuation, the map is temporarily expanded with \"wrapped\" edges for a more accurate result.
"

# ╔═╡ 39bdbe6a-52ae-44d2-8e80-2e7d2a75e322
begin
using MagNav: get_step
(map_map,px,py) = map_expand(e_mapS_395.map,200)
px_end = size(map_map,2) - length(e_mapS_395.xx) - px
py_end = size(map_map,1) - length(e_mapS_395.yy) - py
dx = get_step(e_mapS_395.xx)
dy = get_step(e_mapS_395.yy)
xx = [(e_mapS_395.xx[1]-dx*px):dx:(e_mapS_395.xx[end]+dx*px_end);]
yy = [(e_mapS_395.yy[1]-dy*py):dy:(e_mapS_395.yy[end]+dy*py_end);]
(lat,lon) = map_border(e_mapS_395;sort_border=true) # get map border
p5 = plot_map(map_map,xx,yy;dpi=dpi)
plot_path!(p5,lat,lon;path_color=:black)
p5
end

# ╔═╡ 8b5c030a-e0b9-4a7a-a901-a6967edbe70b
md"## Plot combined Eastern Ontario and NAMAD maps together

Expand Down Expand Up @@ -273,8 +273,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down
6 changes: 3 additions & 3 deletions examples/pluto_model3.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -317,8 +317,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down
8 changes: 4 additions & 4 deletions examples/pluto_sgl.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -359,7 +359,7 @@ begin
plot!(p7,tt,mag_4_uc,lab="mag_4_uc")
plot!(p7,tt,mag_5_uc,lab="mag_5_uc")
plot_events!(p7,flight,df_event;t0=t0,t_units=:min)
display(p7)
p7
end

# ╔═╡ 00000000-0000-0000-0000-000000000001
Expand All @@ -375,8 +375,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down
6 changes: 3 additions & 3 deletions examples/pluto_sim.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### A Pluto.jl notebook ###
# v0.20.8
# v0.20.13

using Markdown
using InteractiveUtils
Expand Down Expand Up @@ -165,8 +165,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
[compat]
CSV = "~0.10.15"
DataFrames = "~1.7.0"
MagNav = "~1.3.1"
Plots = "~1.40.13"
MagNav = "~1.3.3"
Plots = "~1.40.14"
Random = "~1.11.0"
Statistics = "~1.11.1"
"""
Expand Down