Merge branch 'master' into myb/lin

Author: YingboMa

.github/workflows/ci.yml

@@ -3,9 +3,13 @@ on:
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - 'docs/**'
   push:
     branches:
       - master
+    paths-ignore:
+      - 'docs/**'
 jobs:
   test:
     runs-on: ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
-version = "8.69.0"
+version = "8.69.1"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

docs/Project.toml

@@ -21,7 +21,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 BenchmarkTools = "1.3"
 DifferentialEquations = "7.6"
 Distributions = "0.25"
-Documenter = "0.27, 1"
+Documenter = "1"
 ModelingToolkit = "8.33"
 NonlinearSolve = "0.3, 1"
 Optim = "1.7"

docs/make.jl

@@ -23,15 +23,8 @@ makedocs(sitename = "ModelingToolkit.jl",
     authors = "Chris Rackauckas",
     modules = [ModelingToolkit],
     clean = true, doctest = false, linkcheck = true,
+    warnonly = [:docs_block, :missing_docs, :cross_references],
     linkcheck_ignore = ["https://epubs.siam.org/doi/10.1137/0903023"],
-    strict = [
-        :doctest,
-        :linkcheck,
-        :parse_error,
-        :example_block,
-        # Other available options are
-        # :autodocs_block, :cross_references, :docs_block, :eval_block, :example_block, :footnote, :meta_block, :missing_docs, :setup_block
-    ],
     format = Documenter.HTML(; analytics = "UA-90474609-3",
         assets = ["assets/favicon.ico"],
         mathengine,

docs/src/index.md

@@ -230,10 +230,11 @@ You can also download the
 
 ```@eval
 using TOML
+using Markdown
 version = TOML.parse(read("../../Project.toml", String))["version"]
 name = TOML.parse(read("../../Project.toml", String))["name"]
-link = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
-       "/assets/Manifest.toml"
+link = Markdown.MD("https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
+                   "/assets/Manifest.toml")
 ```
 
 ```@raw html
@@ -243,10 +244,11 @@ link = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
 
 ```@eval
 using TOML
+using Markdown
 version = TOML.parse(read("../../Project.toml", String))["version"]
 name = TOML.parse(read("../../Project.toml", String))["name"]
-link = "https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
-       "/assets/Project.toml"
+link = Markdown.MD("https://github.com/SciML/" * name * ".jl/tree/gh-pages/v" * version *
+                   "/assets/Project.toml")
 ```
 
 ```@raw html

src/systems/connectors.jl

@@ -299,14 +299,10 @@ function generate_connection_set!(connectionsets, domain_csets,
         else
             if lhs isa Number || lhs isa Symbolic
                 push!(eqs, eq) # split connections and equations
-            elseif lhs isa Connection
-                if get_systems(lhs) === :domain
-                    connection2set!(domain_csets, namespace, get_systems(rhs), isouter)
-                else
-                    push!(cts, get_systems(rhs))
-                end
+            elseif lhs isa Connection && get_systems(lhs) === :domain
+                connection2set!(domain_csets, namespace, get_systems(rhs), isouter)
             else
-                error("$eq is not a legal equation!")
+                push!(cts, get_systems(rhs))
             end
         end
     end

src/systems/diffeqs/abstractodesystem.jl

@@ -84,14 +84,37 @@ function generate_tgrad(sys::AbstractODESystem, dvs = states(sys), ps = paramete
     simplify = false, kwargs...)
     tgrad = calculate_tgrad(sys, simplify = simplify)
     pre = get_preprocess_constants(tgrad)
-    return build_function(tgrad, dvs, ps, get_iv(sys); postprocess_fbody = pre, kwargs...)
+    if ps isa Tuple
+        return build_function(tgrad,
+            dvs,
+            ps...,
+            get_iv(sys);
+            postprocess_fbody = pre,
+            kwargs...)
+    else
+        return build_function(tgrad,
+            dvs,
+            ps,
+            get_iv(sys);
+            postprocess_fbody = pre,
+            kwargs...)
+    end
 end
 
 function generate_jacobian(sys::AbstractODESystem, dvs = states(sys), ps = parameters(sys);
     simplify = false, sparse = false, kwargs...)
     jac = calculate_jacobian(sys; simplify = simplify, sparse = sparse)
     pre = get_preprocess_constants(jac)
-    return build_function(jac, dvs, ps, get_iv(sys); postprocess_fbody = pre, kwargs...)
+    if ps isa Tuple
+        return build_function(jac,
+            dvs,
+            ps...,
+            get_iv(sys);
+            postprocess_fbody = pre,
+            kwargs...)
+    else
+        return build_function(jac, dvs, ps, get_iv(sys); postprocess_fbody = pre, kwargs...)
+    end
 end
 
 function generate_control_jacobian(sys::AbstractODESystem, dvs = states(sys),
@@ -364,8 +387,15 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem, dvs = s
         tgrad_oop, tgrad_iip = eval_expression ?
                                (drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in tgrad_gen) :
                                tgrad_gen
-        _tgrad(u, p, t) = tgrad_oop(u, p, t)
-        _tgrad(J, u, p, t) = tgrad_iip(J, u, p, t)
+        if p isa Tuple
+            __tgrad(u, p, t) = tgrad_oop(u, p..., t)
+            __tgrad(J, u, p, t) = tgrad_iip(J, u, p..., t)
+            _tgrad = __tgrad
+        else
+            ___tgrad(u, p, t) = tgrad_oop(u, p, t)
+            ___tgrad(J, u, p, t) = tgrad_iip(J, u, p, t)
+            _tgrad = ___tgrad
+        end
     else
         _tgrad = nothing
     end
@@ -379,8 +409,15 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem, dvs = s
         jac_oop, jac_iip = eval_expression ?
                            (drop_expr(@RuntimeGeneratedFunction(eval_module, ex)) for ex in jac_gen) :
                            jac_gen
-        _jac(u, p, t) = jac_oop(u, p, t)
-        _jac(J, u, p, t) = jac_iip(J, u, p, t)
+        if p isa Tuple
+            __jac(u, p, t) = jac_oop(u, p..., t)
+            __jac(J, u, p, t) = jac_iip(J, u, p..., t)
+            _jac = __jac
+        else
+            ___jac(u, p, t) = jac_oop(u, p, t)
+            ___jac(J, u, p, t) = jac_iip(J, u, p, t)
+            _jac = ___jac
+        end
     else
         _jac = nothing
     end