Skip to content

Commit 5eabc3a

Browse files
committed
Merge branch 'master' into myb/ss
2 parents ff5348c + 16ee995 commit 5eabc3a

24 files changed

+624
-527
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
*.jl.*.cov
33
*.jl.mem
44
Manifest.toml
5+
.vscode
6+
.vscode/*

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name = "ModelingToolkit"
22
uuid = "961ee093-0014-501f-94e3-6117800e7a78"
33
authors = ["Chris Rackauckas <[email protected]>"]
4-
version = "5.13.4"
4+
version = "5.13.6"
55

66
[deps]
7+
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
78
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
89
ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
910
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -35,11 +36,11 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
3536
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
3637
SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
3738
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
38-
TreeViews = "a2a6695c-b41b-5b7d-aed9-dbfdeacea5d7"
3939
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
4040
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
4141

4242
[compat]
43+
AbstractTrees = "0.3"
4344
ArrayInterface = "2.8, 3.0"
4445
ConstructionBase = "1"
4546
DataStructures = "0.17, 0.18"
@@ -66,7 +67,6 @@ SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0"
6667
StaticArrays = "0.10, 0.11, 0.12, 1.0"
6768
SymbolicUtils = "0.8.3, 0.9"
6869
Symbolics = "0.1.8"
69-
TreeViews = "0.3"
7070
UnPack = "0.1, 1.0"
7171
Unitful = "1.1"
7272
julia = "1.2"

docs/src/basics/FAQ.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,3 @@ lowered array? You can use the internal function `varmap_to_vars`. For example:
2121
```julia
2222
pnew = varmap_to_vars([β=>3.0, c=>10.0, γ=>2.0],parameters(sys))
2323
```
24-
25-
## Embedding data into a symbolic model
26-
27-
Let's say for example you want to embed data for the timeseries of some
28-
forcing equations into the right-hand side of and ODE, or data into a PDE. What
29-
you would do in these cases is use the `@register` function over an interpolator.
30-
For example, [DataInterpolations.jl](https://github.com/PumasAI/DataInterpolations.jl)
31-
is a good library for interpolating the data. Then you can do:
32-
33-
```julia
34-
spline = CubicSpline(data,datat)
35-
f(t) = spline(t)
36-
@register f(t)
37-
```
38-
39-
This will make `f(t)` be a function that Symbolics.jl will not attempt to trace.
40-
One should also consider defining the derivative to the function, if available.

docs/src/index.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,21 @@ Because ModelingToolkit.jl is the core foundation of a equation-based modeling
9797
ecosystem, there is a large set of libraries adding features to this system.
9898
Below is an incomplete list of extension libraries one may want to be aware of:
9999

100-
- [Catalyst.jl](https://github.com/SciML/Catalyst.jl): Symbolic representations of chemical reactions
100+
- [Catalyst.jl](https://github.com/SciML/Catalyst.jl): Symbolic representations
101+
of chemical reactions
101102
- Symbolically build and represent large systems of chemical reactions
102103
- Generate code for ODEs, SDEs, continuous-time Markov Chains, and more
103104
- Simulate the models using the SciML ecosystem with O(1) Gillespie methods
104-
- [DataDrivenDiffEq.jl](https://github.com/SciML/DataDrivenDiffEq.jl): Automatic identification of equations from data
105+
- [DataDrivenDiffEq.jl](https://github.com/SciML/DataDrivenDiffEq.jl): Automatic
106+
identification of equations from data
105107
- Automated construction of ODEs and DAEs from data
106108
- Representations of Koopman operators and Dynamic Mode Decomposition (DMD)
107-
- [MomentClosure.jl](https://github.com/augustinas1/MomentClosure.jl): Automatic transformation of ReactionSystems into deterministic systems
109+
- [MomentClosure.jl](https://github.com/augustinas1/MomentClosure.jl): Automatic
110+
transformation of ReactionSystems into deterministic systems
108111
- Generates ODESystems for the moment closures
109112
- Allows for geometrically-distributed random reaction rates
110-
- [ReactionMechanismSimulator.jl](https://github.com/ReactionMechanismGenerator/ReactionMechanismSimulator.jl): simulating and analyzing large chemical reaction mechanisms
113+
- [ReactionMechanismSimulator.jl](https://github.com/ReactionMechanismGenerator/ReactionMechanismSimulator.jl):
114+
simulating and analyzing large chemical reaction mechanisms
111115
- Ideal gas and dilute liquid phases.
112116
- Constant T and P and constant V adiabatic ideal gas reactors.
113117
- Constant T and V dilute liquid reactors.
@@ -124,7 +128,8 @@ the solver libraries which are the numerical targets of the ModelingToolkit
124128
system:
125129

126130
- [DifferentialEquations.jl](https://diffeq.sciml.ai/stable/)
127-
- Multi-package interface of high performance numerical solvers for `ODESystem`, `SDESystem`, and `JumpSystem`
131+
- Multi-package interface of high performance numerical solvers for `ODESystem`,
132+
`SDESystem`, and `JumpSystem`
128133
- [NonlinearSolve.jl](https://github.com/JuliaComputing/NonlinearSolve.jl)
129134
- High performance numerical solving of `NonlinearSystem`
130135
- [GalacticOptim.jl](https://github.com/SciML/GalacticOptim.jl)
@@ -136,7 +141,9 @@ system:
136141

137142
## Contributing
138143

139-
- Please refer to the [SciML ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://github.com/SciML/ColPrac/blob/master/README.md) for guidance on PRs, issues, and other matters relating to contributing to ModelingToolkit.
144+
- Please refer to the
145+
[SciML ColPrac: Contributor's Guide on Collaborative Practices for Community Packages](https://github.com/SciML/ColPrac/blob/master/README.md)
146+
for guidance on PRs, issues, and other matters relating to contributing to ModelingToolkit.
140147
- There are a few community forums:
141148
- The #diffeq-bridged channel in the [Julia Slack](https://julialang.org/slack/)
142149
- [JuliaDiffEq](https://gitter.im/JuliaDiffEq/Lobby) on Gitter

0 commit comments

Comments
 (0)