Incorporate forwardable and reversible in rate calculations

Author: hwpang

src/PhaseState.jl

@@ -217,27 +217,25 @@ Maintains diffusion limitations if the phase has diffusionlimited=true
             end
         end
     end
-    if rxn.reversible
-        return (kf,krev)
-    else 
-        return (kf,0.0)
-    end
+    kf *= rxn.forwardable
+    krev *= rxn.reversible
+    return (kf,krev)
 end
 export getkfkrev
 
 @inline function getkfkrevs(phase::U,T::W1,P::W2,C::W3,N::W4,ns::Q1,Gs::Q2,diffs::Q3,V::W5,phi::W7;kfs::W6=nothing) where {U,W7,W6,W5<:Real,W1<:Real,W2<:Real,W3,W4,Q1<:AbstractArray,Q2,Q3<:AbstractArray}
     if !phase.diffusionlimited && kfs === nothing
         kfs = getkfs(phase,T,P,C,ns,V,phi)
         if phi == 0.0
-            krev = @fastmath kfs./getKcs(phase,T,Gs).*phase.reversibility
+            krev = @fastmath kfs./getKcs(phase,T,Gs)
         else 
-            krev = @fastmath kfs./getKcs(phase,T,Gs,phi).*phase.reversibility
+            krev = @fastmath kfs./getKcs(phase,T,Gs,phi)
         end
     elseif !phase.diffusionlimited && !(kfs === nothing)
         if phi == 0.0
-            krev = @fastmath kfs./getKcs(phase,T,Gs).*phase.reversibility
+            krev = @fastmath kfs./getKcs(phase,T,Gs)
         else 
-            krev = @fastmath kfs./getKcs(phase,T,Gs,phi).*phase.reversibility
+            krev = @fastmath kfs./getKcs(phase,T,Gs,phi)
         end
     elseif phase.diffusionlimited && !(kfs === nothing)
         len = length(phase.reactions)
@@ -253,6 +251,8 @@ export getkfkrev
            @fastmath @inbounds kfs[i],krev[i] = getkfkrev(phase.reactions[i],phase,T,P,C,N,ns,Gs,diffs,V,phi)
         end
     end
+    kfs .*= phase.forwardability
+    krev .*= phase.reversibility
     return kfs,krev
 end
 
@@ -317,6 +317,8 @@ end
            @fastmath @inbounds kfs[i],krev[i] = getkfkrev(phase.reactions[i],phase,T,P,C,N,ns,Gs,diffs,V,phi)
         end
     end
+    kfs .*= phase.forwardability
+    krev .*= phase.reversibility
     return kfs,krev
 end