github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-13 07:15:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Expose BibTeX all the way back to python wrapper

Browse Source 
Closes https://github.com/CoolProp/CoolProp/issues/164

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-10-02 14:21:15 +02:00
parent de78c46b65
commit 2f6b083aff
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Backends/Helmholtz/Fluids/FluidLibrary.h
View File

@@ -808,6 +808,9 @@ protected:
/// Parse the thermal conductivity data
void parse_thermal_conductivity(rapidjson::Value &conductivity, CoolPropFluid & fluid)
{
// Load the BibTeX key
fluid.transport.BibTeX_conductivity = cpjson::get_string(conductivity,"BibTeX");
// If it is using ECS, set ECS parameters and quit
if (conductivity.HasMember("type") && !cpjson::get_string(conductivity, "type").compare("ECS")){
parse_ECS_conductivity(conductivity, fluid);
@@ -830,9 +833,6 @@ protected:
}
}
// Load the BibTeX key
fluid.transport.BibTeX_conductivity = cpjson::get_string(conductivity,"BibTeX");
// Load dilute conductivity term
if (conductivity.HasMember("dilute")){
parse_dilute_conductivity(conductivity["dilute"], fluid);