Merge pull request #150 from ReactionMechanismGenerator/fix_rate_tracker_broadcasts

Fix rate tracker broadcasts

Author: hwpang

Project.toml

@@ -50,7 +50,6 @@ Parameters = "0.12"
 PyCall = "1"
 PyPlot = "2"
 QuartzImageIO = "0.7"
-ReverseDiff = "1.4"
 SmoothingSplines = "0.2.1"
 SpecialFunctions = "0.10"
 StaticArrays = "0.12"

src/Calculators/Rate.jl

@@ -210,22 +210,25 @@ end
 export Chebyshev
 
 @inline function getkineticstype(kin::B) where {B<:AbstractRate}
-    return string(typeof(kin).name)
+    return extracttypename(typeof(kin).name)
 end
 
 @inline function getkineticstype(kin::PdepArrhenius)
     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
-        return ("AbstRate",string(typeof(kin).name),trunc.(kin.Ps,digits=3))
+        return ("AbstRate",extracttypename(typeof(kin).name),trunc.(kin.Ps,digits=3))
     else #optimized function available so put kinetics name first
-        return (string(typeof(kin).name),trunc.(kin.Ps,digits=3))
+        return (extracttypename(typeof(kin).name),trunc.(kin.Ps,digits=3))
     end
 end
 
 @inline function getkineticstype(kin::Chebyshev)
-    return (string(typeof(kin).name),kin.Tmin,kin.Tmax,kin.Pmin,kin.Pmax,size(kin.coefs)) #different opt functions, but always can do
+    return (extracttypename(typeof(kin).name),kin.Tmin,kin.Tmax,kin.Pmin,kin.Pmax,size(kin.coefs)) #different opt functions, but always can do
 end
 export getkineticstype
 
+@inline extracttypename(typ::Symbol) = string(typ)
+@inline extracttypename(typ) = string(typ.name)
+    
 @inline function _calcdkdCeff(tbarr::ThirdBody,T::Float64,Ceff::Float64)
     return @fastmath tbarr.arr(T)
 end

src/PhaseState.jl

@@ -2,6 +2,7 @@ using Parameters
 using SpecialFunctions
 using LinearAlgebra
 using Tracker
+using ReverseDiff
 using RecursiveArrayTools
 
 @inline function calcgibbs(ph::U,T::W) where {U<:IdealPhase,W<:Real}
@@ -56,7 +57,7 @@ end
 export getkf
 
 @inline function getkfs(ph::U,T::W1,P::W2,C::W3,ns::Q,V::W4,phi) where {U,W1,W2,W3,W4<:Real,Q<:AbstractArray}
-    kfs = zeros(Q.parameters[1],length(ph.reactions))
+    kfs = similar(ns,length(ph.reactions))
     i = 1
     oldind = 1
     ind = 0
@@ -71,6 +72,7 @@ export getkf
     end
     return kfs
 end
+
 export getkfs
 
 """