Skip to content

Commit 3d7170d

Browse files
committed
fix kinetics type extraction
the correct method to extract the type name seems to have changed this commit solves this using multiple dispatch by adding a extracttypename function that dispatches depending on what it gets as it picks apart the type
1 parent ba1a4fb commit 3d7170d

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/Calculators/Rate.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,22 +210,25 @@ end
210210
export Chebyshev
211211

212212
@inline function getkineticstype(kin::B) where {B<:AbstractRate}
213-
return string(typeof(kin).name)
213+
return extracttypename(typeof(kin).name)
214214
end
215215

216216
@inline function getkineticstype(kin::PdepArrhenius)
217217
if occursin("AbstractRate", string(typeof(kin).parameters[3])) || occursin("MultiArrhenius", string(typeof(kin).parameters[3])) #no optimized function so don't put kinetics name first
218-
return ("AbstRate",string(typeof(kin).name),trunc.(kin.Ps,digits=3))
218+
return ("AbstRate",extracttypename(typeof(kin).name),trunc.(kin.Ps,digits=3))
219219
else #optimized function available so put kinetics name first
220-
return (string(typeof(kin).name),trunc.(kin.Ps,digits=3))
220+
return (extracttypename(typeof(kin).name),trunc.(kin.Ps,digits=3))
221221
end
222222
end
223223

224224
@inline function getkineticstype(kin::Chebyshev)
225-
return (string(typeof(kin).name),kin.Tmin,kin.Tmax,kin.Pmin,kin.Pmax,size(kin.coefs)) #different opt functions, but always can do
225+
return (extracttypename(typeof(kin).name),kin.Tmin,kin.Tmax,kin.Pmin,kin.Pmax,size(kin.coefs)) #different opt functions, but always can do
226226
end
227227
export getkineticstype
228228

229+
@inline extracttypename(typ::Symbol) = string(typ)
230+
@inline extracttypename(typ) = string(typ.name)
231+
229232
@inline function _calcdkdCeff(tbarr::ThirdBody,T::Float64,Ceff::Float64)
230233
return @fastmath tbarr.arr(T)
231234
end

0 commit comments

Comments
 (0)