github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added treatment of Olchowy-Sengers critical region term

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-05-24 13:30:49 +02:00
parent 5999c9d4f7
commit ba8afe5e7f
4 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/CoolPropFluid.h
View File

@@ -74,9 +74,19 @@ struct ConductivityResidualVariables
ConductivityResidualVariables(){type = CONDUCTIVITY_RESIDUAL_NOT_SET;}
};
struct ConductivityCriticalSimplifiedOlchowySengers{
long double T_reducing, p_reducing;
std::vector<long double> B, t, d;
struct ConductivityCriticalSimplifiedOlchowySengersData{
long double T_reducing, p_reducing, k, R0, gamma, nu, qD, zeta0, GAMMA;
ConductivityCriticalSimplifiedOlchowySengersData(){
// Universal constants - can still be adjusted if need be
k = 1.3806488e-23; //[J/K]
R0 = 1.03; //[-]
gamma = 1.239; //[-]
nu = 0.63; //[-]
// Suggested default values - can be over-written
GAMMA = 0.0496; //[-]
zeta0 = 1.94e-10; //[m]
qD = 1e9; //[m]
}
};
struct ConductivityCriticalVariables
{
@@ -84,9 +94,9 @@ struct ConductivityCriticalVariables
CONDUCTIVITY_CRITICAL_NOT_SET
};
int type;
ConductivityCriticalSimplifiedOlchowySengers Olchowy_Sengers;
ConductivityCriticalSimplifiedOlchowySengersData Olchowy_Sengers;
ConductivityCriticalVariables(){type = CONDUCTIVITY_CRITICAL_NOT_SET;}
ConductivityCriticalVariables(){type = CONDUCTIVITY_CRITICAL_NOT_SET; }
};
/// Variables for the dilute gas part