Skip to content

Commit 4c8e3a8

Browse files
mjohnson541mjohnson541
authored
Merge pull request #48 from ReactionMechanismGenerator/Domain_mu
BugFix: Change mu in calcthermo for different domains
2 parents 4ea5501 + e181d0d commit 4c8e3a8

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/Domain.jl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ end
749749
@fastmath Cvave *= R/N
750750
@fastmath Cvave -= R
751751
if d.phase.diffusionlimited
752-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
752+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
753753
else
754754
diffs = Array{Float64,1}()
755755
end
@@ -779,7 +779,7 @@ end
779779
@fastmath Cvave *= R/N
780780
@fastmath Cvave -= R
781781
if d.phase.diffusionlimited
782-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
782+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
783783
else
784784
diffs = Array{Float64,1}()
785785
end
@@ -809,7 +809,7 @@ end
809809
@fastmath Cvave *= R/N
810810
@fastmath Cvave -= R
811811
if d.phase.diffusionlimited
812-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
812+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
813813
else
814814
diffs = Array{Float64,1}()
815815
end
@@ -837,7 +837,7 @@ end
837837
@fastmath Cvave *= R/N
838838
@fastmath Cvave -= R
839839
if d.phase.diffusionlimited
840-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=d.P)::Array{typeof(T),1}
840+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=d.P)::Array{typeof(T),1}
841841
else
842842
diffs = Array{Float64,1}()
843843
end
@@ -866,7 +866,7 @@ end
866866
@fastmath Cvave *= R/N
867867
@fastmath Cvave -= R
868868
if d.phase.diffusionlimited
869-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=d.P)::Array{typeof(T),1}
869+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=d.P)::Array{typeof(T),1}
870870
else
871871
diffs = Array{Float64,1}()
872872
end
@@ -899,7 +899,7 @@ end
899899
@fastmath Cvave *= R/N
900900
@fastmath Cvave -= R
901901
if d.phase.diffusionlimited
902-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=d.P)::Array{typeof(T),1}
902+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=d.P)::Array{typeof(T),1}
903903
else
904904
diffs = Array{Float64,1}()
905905
end
@@ -928,7 +928,7 @@ end
928928
@fastmath Cvave *= R/N
929929
@fastmath Cvave -= R
930930
if d.phase.diffusionlimited
931-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
931+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
932932
else
933933
diffs = Array{Float64,1}()
934934
end
@@ -958,7 +958,7 @@ end
958958
@fastmath Cvave *= R/N
959959
@fastmath Cvave -= R
960960
if d.phase.diffusionlimited
961-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
961+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
962962
else
963963
diffs = Array{Float64,1}()
964964
end
@@ -988,7 +988,7 @@ end
988988
@fastmath Cvave *= R/N
989989
@fastmath Cvave -= R
990990
if d.phase.diffusionlimited
991-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
991+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
992992
else
993993
diffs = Array{Float64,1}()
994994
end
@@ -1017,7 +1017,7 @@ end
10171017
@fastmath Cvave *= R/N
10181018
@fastmath Cvave -= R
10191019
if d.phase.diffusionlimited
1020-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1020+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
10211021
else
10221022
diffs = Array{Float64,1}()
10231023
end
@@ -1047,7 +1047,7 @@ end
10471047
@fastmath Cvave *= R/N
10481048
@fastmath Cvave -= R
10491049
if d.phase.diffusionlimited
1050-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1050+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
10511051
else
10521052
diffs = Array{Float64,1}()
10531053
end
@@ -1076,7 +1076,7 @@ end
10761076
@fastmath Cvave *= R/N
10771077
@fastmath Cvave -= R
10781078
if d.phase.diffusionlimited
1079-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1079+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
10801080
else
10811081
diffs = Array{Float64,1}()
10821082
end
@@ -1106,7 +1106,7 @@ end
11061106
diffs = Array{Float64,1}()
11071107
end
11081108
kfs,krevs = getkfkrevs(phase=d.phase,T=T,P=P,C=C,N=N,ns=ns,Gs=Gs,diffs=diffs,V=V)
1109-
return ns,cs,T,P,V,C,N,0.0,kfs,krevs,Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
1109+
return ns,cs,T,P,V,C,N,mu,kfs,krevs,Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
11101110
end
11111111

11121112
@inline function calcthermo(d::ParametrizedTConstantVDomain{W,Y},y::J,t::Q,p::W2=DiffEqBase.NullParameters()) where {W2<:Array{Float64,1},W<:IdealDiluteSolution,Y<:Integer,J<:AbstractArray,Q<:Real}
@@ -1132,7 +1132,7 @@ end
11321132
diffs = Array{Float64,1}()
11331133
end
11341134
kfs,krevs = getkfkrevs(phase=d.phase,T=T,P=P,C=C,N=N,ns=ns,Gs=Gs,diffs=diffs,V=V)
1135-
return @views @fastmath ns,cs,T,P,V,C,N,0.0,kfs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],krevs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
1135+
return @views @fastmath ns,cs,T,P,V,C,N,mu,kfs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],krevs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
11361136
end
11371137

11381138
@inline function calcthermo(d::ParametrizedTConstantVDomain{W,Y},y::J,t::Q,p::W2=DiffEqBase.NullParameters()) where {W2,W<:IdealDiluteSolution,Y<:Integer,J<:AbstractArray,Q<:Real}
@@ -1158,7 +1158,7 @@ end
11581158
diffs = Array{Float64,1}()
11591159
end
11601160
kfs,krevs = getkfkrevs(phase=d.phase,T=T,P=P,C=C,N=N,ns=ns,Gs=Gs,diffs=diffs,V=V)
1161-
return @views @fastmath ns,cs,T,P,V,C,N,0.0,kfs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],krevs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
1161+
return @views @fastmath ns,cs,T,P,V,C,N,mu,kfs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],krevs.*p[length(d.phase.species)+1:length(d.phase.species)+length(kfs)],Array{Float64,1}(),Array{Float64,1}(),Gs,diffs,0.0
11621162
end
11631163

11641164
@inline function calcthermo(d::ParametrizedTPDomain{W,Y},y::J,t::Q,p::W2=DiffEqBase.NullParameters()) where {W2<:DiffEqBase.NullParameters,W<:IdealGas,Y<:Integer,J<:AbstractArray,Q<:Real}
@@ -1183,7 +1183,7 @@ end
11831183
@fastmath Cvave *= R/N
11841184
@fastmath Cvave -= R
11851185
if d.phase.diffusionlimited
1186-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1186+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
11871187
else
11881188
diffs = Array{Float64,1}()
11891189
end
@@ -1214,7 +1214,7 @@ end
12141214
@fastmath Cvave *= R/N
12151215
@fastmath Cvave -= R
12161216
if d.phase.diffusionlimited
1217-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1217+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
12181218
else
12191219
diffs = Array{Float64,1}()
12201220
end
@@ -1245,7 +1245,7 @@ end
12451245
@fastmath Cvave *= R/N
12461246
@fastmath Cvave -= R
12471247
if d.phase.diffusionlimited
1248-
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=mu,P=P)::Array{typeof(T),1}
1248+
diffs = getfield.(d.phase.species,:diffusion)(T=T,mu=0.0,P=P)::Array{typeof(T),1}
12491249
else
12501250
diffs = Array{Float64,1}()
12511251
end

0 commit comments

Comments
 (0)