Merge remote-tracking branch 'origin' into implicit_discrete_system

Merge master

Author: vyudu

docs/Project.toml

@@ -33,6 +33,8 @@ DataInterpolations = "6.5"
 Distributions = "0.25"
 Documenter = "1"
 DynamicQuantities = "^0.11.2, 0.12, 1"
+FMI = "0.14"
+FMIZoo = "1"
 ModelingToolkit = "8.33, 9"
 ModelingToolkitStandardLibrary = "2.19"
 NonlinearSolve = "3, 4"

src/discretedomain.jl

@@ -98,7 +98,7 @@ $(TYPEDEF)
 Represents a sample operator. A discrete-time signal is created by sampling a continuous-time signal.
 
 # Constructors
-`Sample(clock::Union{TimeDomain, InferredTimeDomain} = InferredDiscrete)`
+`Sample(clock::Union{TimeDomain, InferredTimeDomain} = InferredDiscrete())`
 `Sample(dt::Real)`
 
 `Sample(x::Num)`, with a single argument, is shorthand for `Sample()(x)`.
@@ -119,7 +119,7 @@ julia> Δ = Sample(0.01)
 """
 struct Sample <: Operator
     clock::Any
-    Sample(clock::Union{TimeDomain, InferredTimeDomain} = InferredDiscrete) = new(clock)
+    Sample(clock::Union{TimeDomain, InferredTimeDomain} = InferredDiscrete()) = new(clock)
 end
 
 function Sample(arg::Real)
@@ -203,7 +203,7 @@ struct ShiftIndex
     clock::Union{InferredTimeDomain, TimeDomain, IntegerSequence}
     steps::Int
     function ShiftIndex(
-            clock::Union{TimeDomain, InferredTimeDomain, IntegerSequence} = Inferred, steps::Int = 0)
+            clock::Union{TimeDomain, InferredTimeDomain, IntegerSequence} = Inferred(), steps::Int = 0)
         new(clock, steps)
     end
     ShiftIndex(dt::Real, steps::Int = 0) = new(Clock(dt), steps)
@@ -267,7 +267,7 @@ function input_timedomain(h::Hold, arg = nothing)
     if has_time_domain(arg)
         return get_time_domain(arg)
     end
-    InferredDiscrete # the Hold accepts any discrete
+    InferredDiscrete() # the Hold accepts any discrete
 end
 output_timedomain(::Hold, _ = nothing) = ContinuousClock()
 

src/systems/nonlinear/nonlinearsystem.jl

@@ -219,6 +219,12 @@ function NonlinearSystem(eqs; kwargs...)
                 push!(new_ps, p)
             end
         else
+            if symbolic_type(p) == ArraySymbolic() &&
+               Symbolics.shape(unwrap(p)) != Symbolics.Unknown()
+                for i in eachindex(p)
+                    delete!(new_ps, p[i])
+                end
+            end
             push!(new_ps, p)
         end
     end

test/nonlinearsystem.jl

@@ -4,6 +4,7 @@ using DiffEqBase, SparseArrays
 using Test
 using NonlinearSolve
 using ForwardDiff
+using SymbolicIndexingInterface
 using ModelingToolkit: value
 using ModelingToolkit: get_default_or_guess, MTKParameters
 
@@ -380,3 +381,12 @@ end
     @test_throws ["single equation", "unknown"] IntervalNonlinearFunctionExpr(
         sys, (0.0, 1.0))
 end
+
+@testset "Vector parameter used unscalarized and partially scalarized" begin
+    @variables x y
+    @parameters p[1:2] (f::Function)(..)
+
+    @mtkbuild sys = NonlinearSystem([x^2 - p[1]^2 ~ 0, y^2 ~ f(p)])
+    @test !any(isequal(p[1]), parameters(sys))
+    @test is_parameter(sys, p)
+end

test/scc_nonlinear_problem.jl

@@ -282,3 +282,12 @@ end
     sccprob = SCCNonlinearProblem(fullsys, u0, p)
     @test isequal(parameters(fullsys), parameters(sccprob.f.sys))
 end
+
+@testset "Vector parameters in function arguments" begin
+    @variables x y
+    @parameters p[1:2] (f::Function)(..)
+
+    @mtkbuild sys = NonlinearSystem([x^2 - p[1]^2 ~ 0, y^2 ~ f(p)])
+    prob = SCCNonlinearProblem(sys, [x => 1.0, y => 1.0], [p => ones(2), f => sum])
+    @test_nowarn solve(prob, NewtonRaphson())
+end