Merge pull request #1224 from lamorton/bypass

Bypass checks for conversion/transformation functions.

Author: ChrisRackauckas

src/systems/abstractsystem.jl

@@ -574,9 +574,9 @@ function toexpr(sys::AbstractSystem)
         iv = get_iv(sys)
         ivname = gensym(:iv)
         push!(stmt, :($ivname = (@variables $(getname(iv)))[1]))
-        push!(stmt, :($ODESystem($eqs_name, $ivname, $stsname, $psname; defaults = $defs_name, name=$name)))
+        push!(stmt, :($ODESystem($eqs_name, $ivname, $stsname, $psname; defaults = $defs_name, name = $name, checks = false)))
     elseif sys isa NonlinearSystem
-        push!(stmt, :($NonlinearSystem($eqs_name, $stsname, $psname; defaults = $defs_name, name=$name)))
+        push!(stmt, :($NonlinearSystem($eqs_name, $stsname, $psname; defaults = $defs_name, name = $name, checks = false)))
     end
 
     striplines(expr) # keeping the line numbers is never helpful

src/systems/diffeqs/basic_transformations.jl

@@ -52,5 +52,5 @@ function liouville_transform(sys::AbstractODESystem)
       neweq = D(trJ) ~ trJ*-tr(calculate_jacobian(sys))
       neweqs = [equations(sys);neweq]
       vars = [states(sys);trJ]
-      ODESystem(neweqs,t,vars,parameters(sys))
+      ODESystem(neweqs,t,vars,parameters(sys),checks=false)
 end

src/systems/diffeqs/odesystem.jl

@@ -210,6 +210,7 @@ function flatten(sys::ODESystem)
                          observed=observed(sys),
                          defaults=defaults(sys),
                          name=nameof(sys),
+                         checks = false,
                         )
     end
 end
@@ -311,5 +312,5 @@ function convert_system(::Type{<:ODESystem}, sys, t; name=nameof(sys))
     sub = Base.Fix2(substitute, varmap)
     neweqs = map(sub, equations(sys))
     defs = Dict(sub(k) => sub(v) for (k, v) in defaults(sys))
-    return ODESystem(neweqs, t, newsts, parameters(sys); defaults=defs, name=name)
+    return ODESystem(neweqs, t, newsts, parameters(sys); defaults=defs, name=name,checks=false)
 end

src/systems/diffeqs/sdesystem.jl

@@ -156,7 +156,7 @@ function stochastic_integral_transform(sys::SDESystem, correction_factor)
     # use the general interface
     if typeof(get_noiseeqs(sys)) <: Vector
         eqs = vcat([equations(sys)[i].lhs ~ get_noiseeqs(sys)[i] for i in eachindex(states(sys))]...)
-        de = ODESystem(eqs,get_iv(sys),states(sys),parameters(sys),name=name)
+        de = ODESystem(eqs, get_iv(sys), states(sys), parameters(sys), name = name, checks = false)
 
         jac = calculate_jacobian(de, sparse=false, simplify=false)
         ∇σσ′ = simplify.(jac*get_noiseeqs(sys))
@@ -165,13 +165,13 @@ function stochastic_integral_transform(sys::SDESystem, correction_factor)
     else
         dimstate, m = size(get_noiseeqs(sys))
         eqs = vcat([equations(sys)[i].lhs ~ get_noiseeqs(sys)[i] for i in eachindex(states(sys))]...)
-        de = ODESystem(eqs,get_iv(sys),states(sys),parameters(sys),name=name)
+        de = ODESystem(eqs, get_iv(sys), states(sys), parameters(sys), name = name, checks = false)
 
         jac = calculate_jacobian(de, sparse=false, simplify=false)
         ∇σσ′ = simplify.(jac*get_noiseeqs(sys)[:,1])
         for k = 2:m
             eqs = vcat([equations(sys)[i].lhs ~ get_noiseeqs(sys)[Int(i+(k-1)*dimstate)] for i in eachindex(states(sys))]...)
-            de = ODESystem(eqs,get_iv(sys),states(sys),parameters(sys),name=name)
+            de = ODESystem(eqs, get_iv(sys), states(sys), parameters(sys), name = name, checks = false)
 
             jac = calculate_jacobian(de, sparse=false, simplify=false)
             ∇σσ′ = ∇σσ′ + simplify.(jac*get_noiseeqs(sys)[:,k])
@@ -181,7 +181,7 @@ function stochastic_integral_transform(sys::SDESystem, correction_factor)
     end
 
 
-    SDESystem(deqs,get_noiseeqs(sys),get_iv(sys),states(sys),parameters(sys),name=name)
+    SDESystem(deqs, get_noiseeqs(sys), get_iv(sys), states(sys), parameters(sys), name = name, checks = false)
 end
 
 """
@@ -335,7 +335,7 @@ function SDEFunctionExpr(sys::SDESystem, args...; kwargs...)
 end
 
 function rename(sys::SDESystem,name)
-    SDESystem(sys.eqs, sys.noiseeqs, sys.iv, sys.states, sys.ps, sys.tgrad, sys.jac, sys.Wfact, sys.Wfact_t, name, sys.systems)
+    SDESystem(sys.eqs, sys.noiseeqs, sys.iv, sys.states, sys.ps, sys.tgrad, sys.jac, sys.Wfact, sys.Wfact_t, name, sys.systems, checks = false)
 end
 
 """

src/systems/nonlinear/nonlinearsystem.jl

@@ -334,6 +334,7 @@ function flatten(sys::NonlinearSystem)
                                observed=observed(sys),
                                defaults=defaults(sys),
                                name=nameof(sys),
+                               checks = false,
                               )
     end
 end

src/systems/validation.jl

@@ -111,7 +111,7 @@ function _validate(terms::Vector, labels::Vector{String}; info::String = "")
                 first_label = label
             elseif !equivalent(first_unit, equnit)
                 valid = false
-                @warn("$info: units [$(equnit)] for $(first_label) and [$(equnit)] for $(label) do not match.")
+                @warn("$info: units [$(first_unit)] for $(first_label) and [$(equnit)] for $(label) do not match.")
             end
         end
     end