Skip to content

Commit 8ae2803

Browse files
committed
merge master
2 parents 2ae79ae + 35c8f4c commit 8ae2803

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2560
-700
lines changed

.github/workflows/Downstream.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
- {user: SciML, repo: MethodOfLines.jl, group: Interface}
3838
- {user: SciML, repo: MethodOfLines.jl, group: 2D_Diffusion}
3939
- {user: SciML, repo: MethodOfLines.jl, group: DAE}
40-
- {user: ai4energy, repo: Ai4EComponentLib.jl, group: Downstream}
4140
steps:
4241
- uses: actions/checkout@v4
4342
- uses: julia-actions/setup-julia@v1

.github/workflows/Tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
- Extensions
3939
- Downstream
4040
- RegressionI
41+
- FMI
4142
uses: "SciML/.github/.github/workflows/tests.yml@v1"
4243
with:
4344
julia-version: "${{ matrix.version }}"

Project.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ModelingToolkit"
22
uuid = "961ee093-0014-501f-94e3-6117800e7a78"
33
authors = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
4-
version = "9.61.0"
4+
version = "9.62.0"
55

66
[deps]
77
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -64,6 +64,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
6464
BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665"
6565
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
6666
DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6"
67+
FMI = "14a09403-18e3-468f-ad8a-74f8dda2d9ac"
6768
HomotopyContinuation = "f213a82b-91d6-5c5d-acf7-10f1c761b327"
6869
InfiniteOpt = "20393b10-9daf-11e9-18c9-8db751c92c57"
6970
LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
@@ -72,6 +73,7 @@ LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800"
7273
MTKBifurcationKitExt = "BifurcationKit"
7374
MTKChainRulesCoreExt = "ChainRulesCore"
7475
MTKDeepDiffsExt = "DeepDiffs"
76+
MTKFMIExt = "FMI"
7577
MTKHomotopyContinuationExt = "HomotopyContinuation"
7678
MTKInfiniteOptExt = "InfiniteOpt"
7779
MTKLabelledArraysExt = "LabelledArrays"
@@ -108,6 +110,7 @@ FindFirstFunctions = "1"
108110
ForwardDiff = "0.10.3"
109111
FunctionWrappers = "1.1"
110112
FunctionWrappersWrappers = "0.1"
113+
FMI = "0.14"
111114
Graphs = "1.5.2"
112115
HomotopyContinuation = "2.11"
113116
InfiniteOpt = "0.5"
@@ -134,7 +137,7 @@ RecursiveArrayTools = "3.26"
134137
Reexport = "0.2, 1"
135138
RuntimeGeneratedFunctions = "0.5.9"
136139
SCCNonlinearSolve = "1.0.0"
137-
SciMLBase = "2.71.1"
140+
SciMLBase = "2.72.1"
138141
SciMLStructures = "1.0"
139142
Serialization = "1"
140143
Setfield = "0.7, 0.8, 1"
@@ -143,9 +146,9 @@ SparseArrays = "1"
143146
SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
144147
StaticArrays = "0.10, 0.11, 0.12, 1.0"
145148
StochasticDelayDiffEq = "1.8.1"
146-
SymbolicIndexingInterface = "0.3.36"
147-
SymbolicUtils = "3.10"
148-
Symbolics = "6.22.1"
149+
SymbolicIndexingInterface = "0.3.37"
150+
SymbolicUtils = "3.10.1"
151+
Symbolics = "6.27"
149152
URIs = "1"
150153
UnPack = "0.1, 1.0"
151154
Unitful = "1.1"

docs/src/basics/MTKLanguage.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ equations.
2323

2424
`@mtkmodel` definition contains begin blocks of
2525

26+
- `@description`: for describing the whole system with a human-readable string
2627
- `@components`: for listing sub-components of the system
2728
- `@constants`: for declaring constants
2829
- `@defaults`: for passing `defaults` to ODESystem
@@ -42,20 +43,23 @@ using ModelingToolkit
4243
using ModelingToolkit: t
4344
4445
@mtkmodel ModelA begin
46+
@description "A component with parameters `k` and `k_array`."
4547
@parameters begin
4648
k
4749
k_array[1:2]
4850
end
4951
end
5052
5153
@mtkmodel ModelB begin
54+
@description "A component with parameters `p1` and `p2`."
5255
@parameters begin
5356
p1 = 1.0, [description = "Parameter of ModelB"]
5457
p2 = 1.0, [description = "Parameter of ModelB"]
5558
end
5659
end
5760
5861
@mtkmodel ModelC begin
62+
@description "A bigger system that contains many more things."
5963
@icon "https://github.com/SciML/SciMLDocs/blob/main/docs/src/assets/logo.png"
6064
@constants begin
6165
c::Int = 1, [description = "Example constant."]
@@ -91,6 +95,10 @@ end
9195
end
9296
```
9397

98+
#### `@description`
99+
100+
A documenting `String` that summarizes and explains what the model is.
101+
94102
#### `@icon`
95103

96104
An icon can be embedded in 3 ways:

docs/src/tutorials/acausal_components.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ end
8484
end
8585
8686
@mtkmodel RCModel begin
87+
@description "A circuit with a constant voltage source, resistor and capacitor connected in series."
8788
@components begin
8889
resistor = Resistor(R = 1.0)
8990
capacitor = Capacitor(C = 1.0)
@@ -251,6 +252,7 @@ make all of our parameter values 1.0. As `resistor`, `capacitor`, `source` lists
251252

252253
```@example acausal
253254
@mtkmodel RCModel begin
255+
@description "A circuit with a constant voltage source, resistor and capacitor connected in series."
254256
@components begin
255257
resistor = Resistor(R = 1.0)
256258
capacitor = Capacitor(C = 1.0)

0 commit comments

Comments
 (0)