Skip to content

Commit 4f9312d

Browse files
committed
Fix
1 parent 561aa84 commit 4f9312d

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Blocks/sources.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,9 @@ Base.isless(y::Number, x::Parameter) = Base.isless(y, x.ref)
511511

512512
Base.copy(x::Parameter{T}) where {T} = Parameter{T}(copy(x.data), x.ref)
513513

514+
Base.ifelse(c::Bool, x::Parameter, y::Parameter) = ifelse(c, x.ref, y.ref)
515+
Base.ifelse(c::Bool, x::Parameter, y::Number) = ifelse(c, x.ref, y)
516+
Base.ifelse(c::Bool, x::Number, y::Parameter) = ifelse(c, x, y.ref)
514517
Base.max(x::Number, y::Parameter) = max(x, y.ref)
515518
Base.max(x::Parameter, y::Number) = max(x.ref, y)
516519
Base.max(x::Parameter, y::Parameter) = max(x.ref, y.ref)
@@ -627,6 +630,9 @@ function SampledData(data::Vector{T}, dt::T, circular_buffer = true; name) where
627630
end
628631

629632
Base.convert(::Type{T}, x::Parameter{T}) where {T <: Real} = x.ref
633+
function Base.convert(::Type{<:Parameter{T}}, x::Number) where {T <: Real}
634+
Parameter{T}(T[], x, true)
635+
end
630636

631637
# Beta Code for potential AE Hack ----------------------
632638
function set_sampled_data!(memory::Parameter{T}, t, x, Δt::Parameter{T}) where {T}

src/Hydraulic/IsothermalCompressible/utils.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ end
118118
@register_symbolic friction_factor(dm, area, d_h, viscosity, shape_factor)
119119
Symbolics.derivative(::typeof(friction_factor), args, ::Val{1}) = 0
120120
Symbolics.derivative(::typeof(friction_factor), args, ::Val{4}) = 0
121-
ChainRulesCore.frule(_, ::typeof(friction_factor), _...) = 0
121+
function ChainRulesCore.frule(_, ::typeof(friction_factor), args...)
122+
(friction_factor(args...), ChainRulesCore.ZeroTangent)
123+
end
122124

123125
function transition(x1, x2, y1, y2, x)
124126
u = (x - x1) / (x2 - x1)

0 commit comments

Comments
 (0)