Back to PQ for water for humid air visc and conductivity

Closes #470
Closes #498
This commit is contained in:
Ian Bell
2015-02-28 16:00:04 -07:00
parent 2e413d3de4
commit 09f8976605

View File

@@ -656,8 +656,8 @@ double Viscosity(double T, double p, double psi_w)
// Viscosity of dry air at dry-bulb temp and total pressure
Air->update(CoolProp::PT_INPUTS,p,T);
mu_a=Air->keyed_output(CoolProp::iviscosity);
// Viscosity of pure water at dry-bulb temp and total pressure
Water->update(CoolProp::PT_INPUTS,p,T);
// Saturated water vapor of pure water at total pressure
Water->update(CoolProp::PQ_INPUTS, p, 1);
mu_w=Water->keyed_output(CoolProp::iviscosity);
Phi_av=sqrt(2.0)/4.0*pow(1+Ma/Mw,-0.5)*pow(1+sqrt(mu_a/mu_w)*pow(Mw/Ma,0.25),2); //[-]
Phi_va=sqrt(2.0)/4.0*pow(1+Mw/Ma,-0.5)*pow(1+sqrt(mu_w/mu_a)*pow(Ma/Mw,0.25),2); //[-]
@@ -680,8 +680,8 @@ double Conductivity(double T, double p, double psi_w)
Air->update(CoolProp::PT_INPUTS,p,T);
mu_a=Air->keyed_output(CoolProp::iviscosity);
k_a=Air->keyed_output(CoolProp::iconductivity);
// Viscosity of pure water at dry-bulb temp and total pressure
Water->update(CoolProp::PT_INPUTS,p,T);
// Conductivity of saturated pure water at total pressure
Water->update(CoolProp::PQ_INPUTS, p, 1);
mu_w=Water->keyed_output(CoolProp::iviscosity);
k_w=Water->keyed_output(CoolProp::iconductivity);
Phi_av=sqrt(2.0)/4.0*pow(1+Ma/Mw,-0.5)*pow(1+sqrt(mu_a/mu_w)*pow(Mw/Ma,0.25),2); //[-]