refactor: replace Unitful with FlexUnits

Author: henry2004y

Project.toml

@@ -18,7 +18,7 @@ RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
-Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+FlexUnits = "76e01b6b-c995-4ce6-8559-91e72a3d4e95"
 
 [weakdeps]
 GaussianMixtures = "cc18c42c-b769-54ff-9e2a-b28141a64aae"
@@ -60,7 +60,7 @@ Reexport = "1.2"
 StaticArrays = "1.2"
 Suppressor = "0.2.8"
 UniformStreamlines = "0.2"
-Unitful = "1.7"
+FlexUnits = "0.5"
 WriteVTK = "1.9"
 julia = "1.10"
 

docs/make.jl

@@ -9,7 +9,7 @@ assets = String[]
 isnothing(demo_assets) || (push!(assets, demo_assets))
 
 makedocs(;
-    modules = [Batsrus, Batsrus.UnitfulBatsrus],
+    modules = [Batsrus, Batsrus.FlexUnitsBatsrus],
     authors = "Hongyang Zhou <hyzhou@umich.edu>",
     sitename = "Batsrus.jl",
     format = Documenter.HTML(;

docs/src/man/internal.md

@@ -10,14 +10,14 @@ CurrentModule = Batsrus
 Modules = [Batsrus]
 ```
 
-## UnitfulBatsrus
+## FlexUnitsBatsrus
 
 ```@meta
-CurrentModule = Batsrus.UnitfulBatsrus
+CurrentModule = Batsrus.FlexUnitsBatsrus
 ```
 
 ```@autodocs
-Modules = [UnitfulBatsrus]
+Modules = [FlexUnitsBatsrus]
 ```
 
 ## HDF5 Extension

examples/vdf.jl

@@ -11,7 +11,7 @@ inset_locator = pyimport("mpl_toolkits.axes_grid1.inset_locator")
 inset_axes = inset_locator.inset_axes
 
 ## Parameters
-using Batsrus.UnitfulBatsrus: me, mp
+using Batsrus.FlexUnitsBatsrus: me, mp
 const cAlfven = 253       # average Alfven speed in G8, [km/s]
 const mi = 14             # average ion mass [amu]
 

ext/BatsrusMakieExt/BatsrusMakieExt.jl

@@ -3,11 +3,11 @@ module BatsrusMakieExt
 using Batsrus, Printf
 import Batsrus: findindex, hasunit, getunit, interp2d, plot_phase, plot_phase!,
     _resolve_alias
-import Batsrus.UnitfulBatsrus
+import Batsrus.FlexUnitsBatsrus
 import Makie
 using Makie: @L_str, heatmap!, poly!, Circle, Point2f, Figure, Axis, Colorbar,
     colgap!, DataAspect, save, delete!, Observable
-using Unitful: ustrip
+using FlexUnits: ustrip
 using DimensionalData: dims, val, X, Y, Z, lookup, rebuild
 using PrecompileTools: @setup_workload, @compile_workload
 

ext/BatsrusMakieExt/typerecipe.jl

@@ -12,10 +12,10 @@ function Makie.convert_arguments(
     if use_units && hasunit(bd)
         unitx = getunit(bd, bd.head.coord[1])
         unitw = getunit(bd, var)
-        if unitx isa UnitfulBatsrus.Unitlike
+        if !isnothing(unitx)
             da = rebuild(da, dims = (rebuild(dims(da, 1), lookup(da, 1) .* unitx),))
         end
-        if unitw isa UnitfulBatsrus.Unitlike
+        if !isnothing(unitw)
             da = da .* unitw
         end
     end
@@ -39,13 +39,13 @@ function Makie.convert_arguments(
         unity = getunit(bd, bd.head.coord[2])
         unitw = getunit(bd, var)
 
-        if unitx isa UnitfulBatsrus.Unitlike
+        if !isnothing(unitx)
             x *= unitx
         end
-        if unity isa UnitfulBatsrus.Unitlike
+        if !isnothing(unity)
             y *= unity
         end
-        if unitw isa UnitfulBatsrus.Unitlike
+        if !isnothing(unitw)
             w *= unitw
         end
     end

ext/BatsrusMakieUniformStreamlinesExt/BatsrusMakieUniformStreamlinesExt.jl

@@ -2,7 +2,7 @@ module BatsrusMakieUniformStreamlinesExt
 
 using Batsrus, Printf
 import Batsrus: hasunit, getunit, interp2d, animate, (..)
-import Batsrus.UnitfulBatsrus
+import Batsrus.FlexUnitsBatsrus
 import Makie
 using Makie: @L_str, heatmap!, poly!, Circle, Point2f, Figure, Axis, Colorbar,
     colgap!, DataAspect, save, delete!, Observable

ext/BatsrusMakieUniformStreamlinesExt/animate.jl

@@ -131,13 +131,13 @@ function Batsrus.animate(
             unitx = getunit(bd, bd.head.coord[1])
             unity = getunit(bd, bd.head.coord[2])
             unitw = getunit(bd, var)
-            if unitx isa UnitfulBatsrus.Unitlike
+            if !isnothing(unitx)
                 x_coords = x_coords .* unitx
             end
-            if unity isa UnitfulBatsrus.Unitlike
+            if !isnothing(unity)
                 y_coords = y_coords .* unity
             end
-            if unitw isa UnitfulBatsrus.Unitlike
+            if !isnothing(unitw)
                 data = data .* unitw
             end
         end

ext/BatsrusPyPlotExt/animate.jl

@@ -124,13 +124,13 @@ function Batsrus.animate(
             unitx = getunit(bd, bd.head.coord[1])
             unity = getunit(bd, bd.head.coord[2])
             unitw = getunit(bd, var)
-            if unitx isa UnitfulBatsrus.Unitlike
+            if !isnothing(unitx)
                 x_coords = x_coords .* unitx
             end
-            if unity isa UnitfulBatsrus.Unitlike
+            if !isnothing(unity)
                 y_coords = y_coords .* unity
             end
-            if unitw isa UnitfulBatsrus.Unitlike
+            if !isnothing(unitw)
                 data = data .* unitw
             end
         end

src/Batsrus.jl

@@ -27,8 +27,8 @@ export BATS, BatsrusIDL, BatsrusIDLStructured, BatsrusIDLUnstructured,
     BatsrusHDF5File, BatsrusHDF5Uniform, extract_var # hdf5
 
 include("type.jl")
-include("unit/UnitfulBatsrus.jl")
-using .UnitfulBatsrus
+include("unit/FlexUnitsBatsrus.jl")
+using .FlexUnitsBatsrus
 
 include("io.jl")
 include("select.jl")