refactor: remove Unitful

Author: AayushSabharwal

docs/Project.toml

@@ -32,7 +32,6 @@ StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
-Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
 Attractors = "1.24"
@@ -65,4 +64,3 @@ StochasticDiffEq = "6"
 SymbolicIndexingInterface = "0.3.1"
 SymbolicUtils = "3, 4"
 Symbolics = "6"
-Unitful = "1.12"

docs/src/API/model_building.md

@@ -13,8 +13,6 @@ ModelingToolkit.t_nounits
 ModelingToolkit.D_nounits
 ModelingToolkit.t
 ModelingToolkit.D
-ModelingToolkit.t_unitful
-ModelingToolkit.D_unitful
 ```
 
 Users are recommended to use the appropriate common definition in their models. The required

docs/src/basics/Validation.md

@@ -155,7 +155,7 @@ future when `ModelingToolkit` is extended to support eliminating `DynamicQuantit
 
 ## Other Restrictions
 
-`Unitful` provides non-scalar units such as `dBm`, `°C`, etc. At this time, `ModelingToolkit` only supports scalar quantities. Additionally, angular degrees (`°`) are not supported because trigonometric functions will treat plain numerical values as radians, which would lead systems validated using degrees to behave erroneously when being solved.
+`DynamicQuantities` provides non-scalar units such as `°C`, etc. At this time, `ModelingToolkit` only supports scalar quantities. Additionally, angular degrees (`°`) are not supported because trigonometric functions will treat plain numerical values as radians, which would lead systems validated using degrees to behave erroneously when being solved.
 
 ## Troubleshooting & Gotchas
 
@@ -169,7 +169,7 @@ Parameter and initial condition values are supplied to problem constructors as p
 
 ```julia
 function remove_units(p::Dict)
-    Dict(k => Unitful.ustrip(ModelingToolkit.get_unit(k), v) for (k, v) in p)
+    Dict(k => DynamicQuantities.ustrip(ModelingToolkit.get_unit(k), v) for (k, v) in p)
 end
 add_units(p::Dict) = Dict(k => v * ModelingToolkit.get_unit(k) for (k, v) in p)
 ```

src/ModelingToolkit.jl

@@ -38,7 +38,7 @@ else
     const IntDisjointSet = IntDisjointSets
 end
 using Base.Threads
-using Latexify, Unitful, ArrayInterface
+using Latexify, ArrayInterface
 using Setfield, ConstructionBase
 import Libdl
 using DocStringExtensions
@@ -96,7 +96,7 @@ export independent_variables, unknowns, observables, parameters, full_parameters
 @reexport using UnPack
 RuntimeGeneratedFunctions.init(@__MODULE__)
 
-import DynamicQuantities, Unitful
+import DynamicQuantities
 const DQ = DynamicQuantities
 
 import DifferentiationInterface as DI
@@ -217,7 +217,6 @@ include("systems/pde/pdesystem.jl")
 include("systems/sparsematrixclil.jl")
 
 include("systems/unit_check.jl")
-include("systems/validation.jl")
 include("systems/dependency_graphs.jl")
 include("clock.jl")
 include("discretedomain.jl")
@@ -238,15 +237,11 @@ include("deprecations.jl")
 const t_nounits = let
     only(@independent_variables t)
 end
-const t_unitful = let
-    only(@independent_variables t [unit = Unitful.u"s"])
-end
 const t = let
     only(@independent_variables t [unit = DQ.u"s"])
 end
 
 const D_nounits = Differential(t_nounits)
-const D_unitful = Differential(t_unitful)
 const D = Differential(t)
 
 export ODEFunction, convert_system_indepvar,
@@ -349,7 +344,7 @@ const set_scalar_metadata = setmetadata
 @public similarity_transform, inputs, outputs, bound_inputs, unbound_inputs, bound_outputs
 @public unbound_outputs, is_bound
 @public AbstractSystem, CheckAll, CheckNone, CheckComponents, CheckUnits
-@public t, D, t_nounits, D_nounits, t_unitful, D_unitful
+@public t, D, t_nounits, D_nounits
 @public SymbolicContinuousCallback, SymbolicDiscreteCallback
 @public VariableType, MTKVariableTypeCtx, VariableBounds, VariableConnectType
 @public VariableDescription, VariableInput, VariableIrreducible, VariableMisc

src/systems/model_parsing.jl

@@ -573,7 +573,7 @@ function get_t(mod, t)
         get_var(mod, t)
     catch e
         if e isa UndefVarError
-            @warn("Could not find a predefined `t` in `$mod`; generating a new one within this model.\nConsider defining it or importing `t` (or `t_nounits`, `t_unitful` as `t`) from ModelingToolkit.")
+            @warn("Could not find a predefined `t` in `$mod`; generating a new one within this model.\nConsider defining it or importing `t` (or `t_nounits as t`) from ModelingToolkit.")
             variable(:t)
         else
             throw(e)
@@ -901,18 +901,6 @@ function convert_units(
         DynamicQuantities.SymbolicUnits.as_quantity(varunits), value))
 end
 
-function convert_units(varunits::Unitful.FreeUnits, value)
-    Unitful.ustrip(varunits, value)
-end
-
-convert_units(::Unitful.FreeUnits, value::NoValue) = NO_VALUE
-
-function convert_units(varunits::Unitful.FreeUnits, value::AbstractArray{T}) where {T}
-    Unitful.ustrip.(varunits, value)
-end
-
-convert_units(::Unitful.FreeUnits, value::Num) = value
-
 convert_units(::DynamicQuantities.Quantity, value::Num) = value
 
 function parse_variable_arg(dict, mod, arg, varclass, kwargs, where_types)
@@ -930,8 +918,7 @@ function parse_variable_arg(dict, mod, arg, varclass, kwargs, where_types)
                     try
                         $setdefault($vv, $convert_units($unit, $name))
                     catch e
-                        if isa(e, $(DynamicQuantities.DimensionError)) ||
-                           isa(e, $(Unitful.DimensionError))
+                        if isa(e, $(DynamicQuantities.DimensionError))
                             error("Unable to convert units for \'" * string(:($$vv)) * "\'")
                         elseif isa(e, MethodError)
                             error("No or invalid units provided for \'" * string(:($$vv)) *

src/systems/unit_check.jl

@@ -23,8 +23,6 @@ function __get_scalar_unit_type(v)
     u = __get_literal_unit(v)
     if u isa DQ.AbstractQuantity
         return Val(:DynamicQuantities)
-    elseif u isa Unitful.Unitlike
-        return Val(:Unitful)
     end
     return nothing
 end