Skip to content

Commit b094647

Browse files
author
fchen121
committed
Fix merge issue
1 parent a01857f commit b094647

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Project.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4141
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
4242
Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d"
4343
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
44+
ODEInterfaceDiffEq = "09606e27-ecf5-54fc-bb29-004bd9f985bf"
4445
OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
4546
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
47+
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
4648
OrdinaryDiffEqCore = "bbf590c4-e513-4bbe-9b18-05decba2e5d8"
47-
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
4849
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
4950
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
5051
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -136,6 +137,7 @@ ModelingToolkitStandardLibrary = "2.20"
136137
Moshi = "0.3"
137138
NaNMath = "0.3, 1"
138139
NonlinearSolve = "4.3"
140+
ODEInterfaceDiffEq = "3.13.4"
139141
OffsetArrays = "1"
140142
OrderedCollections = "1"
141143
OrdinaryDiffEq = "6.82.0"

src/ModelingToolkit.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,10 @@ export isinput, isoutput, getbounds, hasbounds, getguess, hasguess, isdisturbanc
265265
istunable, getdist, hasdist,
266266
tunable_parameters, isirreducible, getdescription, hasdescription,
267267
hasunit, getunit, hasconnect, getconnect,
268-
hasmisc, getmisc, state_priority
269-
export liouville_transform, change_independent_variable, substitute_component, add_accumulations,
270-
noise_to_brownians, Girsanov_transform, change_of_variables,
268+
hasmisc, getmisc, state_priority,
269+
subset_tunables
270+
export liouville_transform, change_independent_variable, substitute_component,
271+
add_accumulations, noise_to_brownians, Girsanov_transform, change_of_variables
271272
fractional_to_ordinary, linear_fractional_to_ordinary
272273
export PDESystem
273274
export Differential, expand_derivatives, @derivatives

0 commit comments

Comments
 (0)