fix remaining tests

Author: vyudu

Project.toml

@@ -115,6 +115,7 @@ ForwardDiff = "0.10.3"
 FunctionWrappers = "1.1"
 FunctionWrappersWrappers = "0.1"
 Graphs = "1.5.2"
+ImplicitDiscreteSolve = "0.1.2"
 InfiniteOpt = "0.5"
 InteractiveUtils = "1"
 JuliaFormatter = "1.0.47"

src/systems/model_parsing.jl

@@ -125,7 +125,7 @@ function _model_macro(mod, fullname::Union{Expr, Symbol}, expr, isconnector)
     @inline pop_structure_dict!.(
         Ref(dict), [:constants, :defaults, :kwargs, :structural_parameters])
 
-    sys = :($ODESystem($(flatten_equations)(equations), $iv, variables, parameters;
+    sys = :($type($(flatten_equations)(equations), $iv, variables, parameters;
         name, description = $description, systems, gui_metadata = $gui_metadata,
         continuous_events = [$(c_evts...)], discrete_events = [$(d_evts...)],
         defaults))

test/fmi/fmi.jl

@@ -158,7 +158,7 @@ end
         fmu = loadFMU(joinpath(FMU_DIR, "SimpleAdder.fmu"); type = :CS)
         @named adder = MTK.FMIComponent(
             Val(2); fmu, type = :CS, communication_step_size = 1e-6,
-            reinitializealg = BrownFullBasicInit())
+            reinitializealg = BrownFullBasicInit(abstol = 1e-7))
         @test MTK.isinput(adder.a)
         @test MTK.isinput(adder.b)
         @test MTK.isoutput(adder.out)
@@ -211,7 +211,7 @@ end
         fmu = loadFMU(joinpath(FMU_DIR, "StateSpace.fmu"); type = :CS)
         @named sspace = MTK.FMIComponent(
             Val(3); fmu, communication_step_size = 1e-6, type = :CS,
-            reinitializealg = BrownFullBasicInit())
+            reinitializealg = BrownFullBasicInit(abstol = 1e-7))
         @test MTK.isinput(sspace.u)
         @test MTK.isoutput(sspace.y)
         @test !MTK.isinput(sspace.x) && !MTK.isoutput(sspace.x)