new h! with 0 allocation

Author: franckgaga

src/model/nonlinmodel.jl

@@ -121,10 +121,10 @@ function validate_fcts(NT, f!, h!)
               "f!(x::Vector{$(NT)}, u::Vector{$(NT)}, d::Vector{$(NT)}) or "*
               "f!(ẋ::Vector{$(NT)}, x::Vector{$(NT)}, u::Vector{$(NT)}, d::Vector{$(NT)})")
     end
-    hargsvalid = hasmethod(h!,Tuple{Vector{NT}, Vector{NT}})
+    hargsvalid = hasmethod(h!, Tuple{Vector{NT}, Vector{NT}, Vector{NT}})
     if !hargsvalid
         error("output function has no method with type signature "*
-              "h(x::Vector{$(NT)}, d::Vector{$(NT)})")
+              "h!(y::Vector{$(NT)}, x::Vector{$(NT)}, d::Vector{$(NT)})")
     end
     return iscontinuous
 end
@@ -136,7 +136,7 @@ steadystate!(::SimModel, _ , _ ) = nothing
 "Call ``\\mathbf{f!(x, u, d)}`` with `model.f!` function for [`NonLinModel`](@ref)."
 f!(x, model::NonLinModel, u, d) = model.f!(x, u, d)
 
-"Call ``\\mathbf{h(x, d)}`` with `model.h` function for [`NonLinModel`](@ref)."
-h(model::NonLinModel, x, d) = model.h!(x, d)
+"Call ``\\mathbf{h!(y, x, d)}`` with `model.h` function for [`NonLinModel`](@ref)."
+h!(y, model::NonLinModel, x, d) = model.h!(y, x, d)
 
 typestr(model::NonLinModel) = "nonlinear"

src/sim_model.jl

@@ -144,7 +144,7 @@ julia> x = updatestate!(model, [1])
 """
 function updatestate!(model::SimModel, u, d=empty(model.x))
     validate_args(model::SimModel, u, d)
-    model.x .= f!(model.x, model, u - model.uop, d - model.dop)
+    f!(model.x, model, u - model.uop, d - model.dop)
     return model.x
 end
 
@@ -164,7 +164,11 @@ julia> y = evaloutput(model)
  20.0
 ```
 """
-evaloutput(model::SimModel, d=empty(model.x)) = h(model, model.x, d - model.dop) + model.yop
+function evaloutput(model::SimModel{NT}, d=empty(model.x)) where NT <: Real
+    y = Vector{NT}(undef, model.ny)
+    h!(y, model, model.x, d - model.dop) + model.yop
+    return y
+end
 
 """
     validate_args(model::SimModel, u, d)