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

IIR HS references set for real this time

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-06-02 13:21:06 +02:00
parent 409e2a2d1f
commit 5accf645d9
32 changed files with 71 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -791,10 +791,6 @@ public:
fluid.name = fluid_json["NAME"].GetString(); name_vector.push_back(fluid.name);
// CAS number
fluid.CAS = fluid_json["CAS"].GetString();
if (!fluid_json.HasMember("REFPROP_NAME"))
{
std::cout << fluid.name << std::endl;
}
// REFPROP alias
fluid.REFPROPname = fluid_json["REFPROP_NAME"].GetString();
// Critical state

8
src/CoolProp.cpp
View File

@@ -639,7 +639,7 @@ double Props1SI(std::string FluidName,std::string Output)
// }
//}
//
int set_reference_stateS(std::string Ref, std::string reference_state)
void set_reference_stateS(std::string Ref, std::string reference_state)
{
std::tr1::shared_ptr<CoolProp::HelmholtzEOSMixtureBackend> HEOS;
HEOS.reset(new CoolProp::HelmholtzEOSMixtureBackend(std::vector<std::string>(1, Ref)));
@@ -654,7 +654,6 @@ int set_reference_stateS(std::string Ref, std::string reference_state)
double delta_a1 = deltas/(8.314472/HEOS->molar_mass());
double delta_a2 = -deltah/(8.314472/HEOS->molar_mass()*HEOS->get_reducing().T);
HEOS->get_components()[0]->pEOS->alpha0.EnthalpyEntropyOffset.set(delta_a1, delta_a2, "IIR");
return 0;
}
else if (!reference_state.compare("ASHRAE"))
{
@@ -666,7 +665,6 @@ int set_reference_stateS(std::string Ref, std::string reference_state)
double delta_a1 = deltas/(8.314472/HEOS->molar_mass());
double delta_a2 = -deltah/(8.314472/HEOS->molar_mass()*HEOS->get_reducing().T);
HEOS->get_components()[0]->pEOS->alpha0.EnthalpyEntropyOffset.set(delta_a1, delta_a2, "ASHRAE");
return 0;
}
else if (!reference_state.compare("NBP"))
{
@@ -678,8 +676,6 @@ int set_reference_stateS(std::string Ref, std::string reference_state)
double delta_a1 = deltas/(8.314472/HEOS->molar_mass());
double delta_a2 = -deltah/(8.314472/HEOS->molar_mass()*HEOS->get_reducing().T);
HEOS->get_components()[0]->pEOS->alpha0.EnthalpyEntropyOffset.set(delta_a1, delta_a2, "NBP");
return 0;
}
else if (!reference_state.compare("DEF"))
{
@@ -692,7 +688,7 @@ int set_reference_stateS(std::string Ref, std::string reference_state)
}
else
{
return -1;
throw ValueError(format("reference state string is invalid: [%s]",reference_state.c_str()));
}
}
//int set_reference_stateD(std::string Ref, double T, double rho, double h0, double s0)

19
src/main.cxx
View File

@@ -64,25 +64,27 @@ int main()
std::string IIR_refs[] = {"SES36","R143a","CycloPropane","Propylene","R227EA","R365MFC","R161","HFE143m","SulfurHexafluoride","CarbonDioxide","R1234ze(E)","R22","R124","Propyne","R507A","R152A","R123","R11","n-Butane","IsoButane","RC318","R21","R114","R13","R12","R113","R1233zd(E)","R41"};
for (std::size_t i = 0; i < sizeof(NBP_refs)/sizeof(NBP_refs[0]); ++i)
{
/*try{*/
try{
//set_reference_stateS(NBP_refs[i],"RESET");
HelmholtzEOSMixtureBackend HEOS(std::vector<std::string>(1,NBP_refs[i]));
HEOS.update(PQ_INPUTS, 101325, 0);
double delta_a1 = HEOS.smass()/(8.314472/HEOS.molar_mass());
double delta_a2 = -HEOS.hmass()/(8.314472/HEOS.molar_mass()*HEOS.get_reducing().T);
double delta_a1 = HEOS.smass()/(HEOS.gas_constant()/HEOS.molar_mass());
double delta_a2 = -HEOS.hmass()/(HEOS.gas_constant()/HEOS.molar_mass()*HEOS.get_reducing().T);
std::cout << format("%s,%s,%16.15g,%16.15g\n",NBP_refs[i].c_str(),"NBP",delta_a1, delta_a2);
/*}
}
catch(const std::exception &e)
{
std::cout << "ERROR FOR " << NBP_refs[i] << std::endl;
}*/
}
}
for (std::size_t i = 0; i < sizeof(IIR_refs)/sizeof(IIR_refs[0]); ++i)
{
try{
//set_reference_stateS(IIR_refs[i],"RESET");
HelmholtzEOSMixtureBackend HEOS(std::vector<std::string>(1,IIR_refs[i]));
HEOS.update(QT_INPUTS, 0, 273.15);
double delta_a1 = HEOS.smass()/(8.314472/HEOS.molar_mass());
double delta_a2 = -HEOS.hmass()/(8.314472/HEOS.molar_mass()*HEOS.get_reducing().T);
double delta_a1 = (HEOS.smass()-1000)/(HEOS.gas_constant()/HEOS.molar_mass());
double delta_a2 = -(HEOS.hmass()-200000)/(HEOS.gas_constant()/HEOS.molar_mass()*HEOS.get_reducing().T);
std::cout << format("%s,%s,%16.15g,%16.15g\n",IIR_refs[i].c_str(),"IIR",delta_a1, delta_a2);
}
catch(const std::exception &e)
@@ -90,6 +92,7 @@ int main()
std::cout << "ERROR FOR " << IIR_refs[i] << std::endl;
}
}
double rr = 0;
}
if (0)
{
@@ -168,7 +171,7 @@ int main()
}
if (1)
{
double h1 = PropsSI("H","P",101325,"Q",0,"n-Propane");
double h1 = PropsSI("H","T",273.15,"Q",0,"CO2");
set_reference_stateS("n-Propane","NBP");
double h2 = PropsSI("H","P",101325,"Q",0,"n-Propane");