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
6 changes: 2 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"

[compat]
ADTypes = "1"
Aqua = "0.8"
ChainRulesCore = "1"
ControlSystemsBase = "1.4"
DataFrames = "1.7"
DataInterpolations = "8"
DiffEqBase = "6.189.1, 7"
DiffEqBase = "6.190, 7"
ForwardDiff = "0.10, 1"
IfElse = "0.1"
LinearAlgebra = "1.10"
Expand All @@ -44,7 +43,6 @@ julia = "1.10"

[extras]
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
Expand All @@ -66,4 +64,4 @@ SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "SciMLTesting", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]
test = ["ADTypes", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqNonlinearSolve", "OrdinaryDiffEqRosenbrock", "OrdinaryDiffEqSDIRK", "SafeTestsets", "SciMLTesting", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLBase", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]
6 changes: 4 additions & 2 deletions src/Blocks/Blocks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
The module `Blocks` contains common input-output components, referred to as blocks.
"""
module Blocks
using ModelingToolkitBase, Symbolics
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, System, compose, connect, extend,
getdefault, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @register_symbolic, @variables, Differential, Equation
import IfElse: ifelse
import ..@symcheck
using ModelingToolkitBase: getdefault, t_nounits as t, D_nounits as D

export RealInput, RealInputArray, RealOutput, RealOutputArray, SISO
include("utils.jl")
Expand Down
4 changes: 2 additions & 2 deletions src/Blocks/sources.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using DiffEqBase
using DiffEqBase: DiffEqBase
import ChainRulesCore
using PreallocationTools
using PreallocationTools: DiffCache, GeneralLazyBufferCache, get_tmp

# Define and register smooth functions
# These are "smooth" aka differentiable and avoid Gibbs effect
Expand Down
9 changes: 6 additions & 3 deletions src/Electrical/Electrical.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ This library contains electrical components to build up analog circuits.
"""
module Electrical

using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @constants,
@named, @parameters, @unpack, Flow, System, connect, extend,
t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @register_symbolic, @variables, Equation
using ..Thermal: HeatPort
using ..Mechanical.Rotational: Flange, Support
using ..Blocks: RealInput, RealOutput
using ..Blocks: RealInput

export Pin, OnePort
include("utils.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/Hydraulic/Hydraulic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Library of hydraulic models.
"""
module Hydraulic

using ModelingToolkitBase
using ModelingToolkitBase: ModelingToolkitBase

include("IsothermalCompressible/IsothermalCompressible.jl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ Library to model iso-thermal compressible liquid fluid flow
"""
module IsothermalCompressible

using ModelingToolkitBase, Symbolics
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, Flow, ParentScope, System, connect, domain_connect,
t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @register_derivative, @register_symbolic, @variables, Equation

using ...Blocks: RealInput, RealOutput
using ...Blocks: RealInput
using ...Mechanical.Translational: MechanicalPort, Mass

using IfElse: ifelse
Expand Down
5 changes: 3 additions & 2 deletions src/Magnetic/FluxTubes/FluxTubes.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module FluxTubes
using ModelingToolkitBase
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, @variables, Equation, Flow, System, connect, extend,
t_nounits as t, D_nounits as D
using ...Electrical: Pin

export PositiveMagneticPort, NegativeMagneticPort, TwoPort
Expand Down
2 changes: 1 addition & 1 deletion src/Magnetic/Magnetic.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Magnetic

using ModelingToolkitBase
using ModelingToolkitBase: ModelingToolkitBase

# FluxTubes
include("FluxTubes/FluxTubes.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/Mechanical/Mechanical.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Library of mechanical models.
"""
module Mechanical

using ModelingToolkitBase
using ModelingToolkitBase: ModelingToolkitBase

include("Rotational/Rotational.jl")
include("Translational/Translational.jl")
Expand Down
6 changes: 4 additions & 2 deletions src/Mechanical/MultiBody2D/MultiBody2D.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
module MultiBody2D

using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @named, @parameters,
System, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation
using ..TranslationalPosition

export Link
Expand Down
6 changes: 4 additions & 2 deletions src/Mechanical/Rotational/Rotational.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ Library to model 1-dimensional, rotational mechanical systems
"""
module Rotational

using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, Flow, System, compose, extend, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation
using ...Blocks: RealInput, RealOutput
import ...@symcheck

Expand Down
6 changes: 3 additions & 3 deletions src/Mechanical/Translational/Translational.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Library to model 1-dimensional, translational mechanical systems
"""
module Translational

using ModelingToolkitBase, Symbolics
using ModelingToolkitBase: getdefault, t_nounits as t, D_nounits as D
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, Flow, System, compose, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation

using ModelingToolkitStandardLibrary.Blocks: RealInput, RealOutput
using IfElse: ifelse

export MechanicalPort
include("utils.jl")
Expand Down
8 changes: 5 additions & 3 deletions src/Mechanical/TranslationalModelica/TranslationalModelica.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ Library to model 1-dimensional, translational mechanical components.
"""
module TranslationalModelica

using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using ...Blocks: RealInput, RealOutput
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, Flow, System, compose, extend, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation
using ...Blocks: RealInput

export Flange
include("utils.jl")
Expand Down
6 changes: 4 additions & 2 deletions src/Mechanical/TranslationalPosition/TranslationalPosition.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ Library to model 1-dimensional, translational mechanical components.
"""
module TranslationalPosition

using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, Flow, System, compose, extend, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation
using ...Blocks: RealInput, RealOutput

export Flange
Expand Down
6 changes: 4 additions & 2 deletions src/Thermal/Thermal.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
Library of thermal system components to model heat transfer.
"""
module Thermal
using ModelingToolkitBase, Symbolics, IfElse
using ModelingToolkitBase: t_nounits as t, D_nounits as D
using IfElse: IfElse
using ModelingToolkitBase: ModelingToolkitBase, @component, @connector, @named,
@parameters, @unpack, Flow, System, extend, t_nounits as t, D_nounits as D
using Symbolics: Symbolics, @variables, Equation
using ...Blocks: RealInput, RealOutput

export HeatPort, Element1D
Expand Down
16 changes: 16 additions & 0 deletions test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
ModelingToolkitStandardLibrary = {path = "../.."}

[compat]
Aqua = "0.8"
SafeTestsets = "0.1"
SciMLTesting = "1.6"
Test = "1"
julia = "1.10"
11 changes: 0 additions & 11 deletions test/qa/aqua.jl

This file was deleted.

14 changes: 14 additions & 0 deletions test/qa/qa.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using SciMLTesting, ModelingToolkitStandardLibrary, Test

run_qa(
ModelingToolkitStandardLibrary;
explicit_imports = true,
aqua_kwargs = (; ambiguities = (; recursive = false)),
ei_kwargs = (;
# `ifelse` is IfElse's sole export but it is not declared public in IfElse.
all_explicit_imports_are_public = (; ignore = (:ifelse,)),
# Names accessed qualified but not declared public in their source package:
# ifelse -> IfElse, SConst -> Symbolics, isvariable -> ModelingToolkitBase
all_qualified_accesses_are_public = (; ignore = (:ifelse, :SConst, :isvariable)),
),
)
Loading