Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remap CoolPropDbl to double #953

Merged
merged 2 commits into from Feb 2, 2016
Merged

Remap CoolPropDbl to double #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
154bafe
Try to remap CoolProp to always be a double
ibell Feb 1, 2016
a76d2dd
As temporary solution, add ctypedef in python land
ibell Feb 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/CoolPropTools.h
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@
#endif
#endif

//#define COOLPROPDBL_MAPS_TO_DOUBLE
#define COOLPROPDBL_MAPS_TO_DOUBLE
#ifdef COOLPROPDBL_MAPS_TO_DOUBLE
typedef double CoolPropDbl;
#else
Expand Down
4 changes: 2 additions & 2 deletions src/Backends/Helmholtz/TransportRoutines.cpp
View file
Open in desktop
Expand Up @@ -362,7 +362,7 @@ CoolPropDbl TransportRoutines::viscosity_heptane_higher_order_hardcoded(Helmholt

// Output is in Pa-s
double c[] = {0, 22.15000/1e6, -15.00870/1e6, 3.71791/1e6, 77.72818/1e6, 9.73449, 9.51900, -6.34076, -2.51909};
return pow(rhor,2.0L/3.0L)*sqrt(Tr)*(c[1]*rhor+c[2]*pow(rhor,2)+c[3]*pow(rhor,3)+c[4]*rhor/(c[5]+c[6]*Tr+c[7]*rhor+rhor*rhor+c[8]*rhor*Tr));
return pow(rhor,static_cast<CoolPropDbl>(2.0L/3.0L))*sqrt(Tr)*(c[1]*rhor+c[2]*pow(rhor,2)+c[3]*pow(rhor,3)+c[4]*rhor/(c[5]+c[6]*Tr+c[7]*rhor+rhor*rhor+c[8]*rhor*Tr));
}

CoolPropDbl TransportRoutines::viscosity_higher_order_friction_theory(HelmholtzEOSMixtureBackend &HEOS)
Expand Down Expand Up @@ -1230,7 +1230,7 @@ CoolPropDbl TransportRoutines::viscosity_ECS(HelmholtzEOSMixtureBackend &HEOS, H
CoolPropDbl eta_resid = HEOS_Reference.calc_viscosity_background();

// The F factor
CoolPropDbl F_eta = sqrt(f)*pow(h, -2.0L/3.0L)*sqrt(M/M0);
CoolPropDbl F_eta = sqrt(f)*pow(h, -static_cast<CoolPropDbl>(2.0L/3.0L))*sqrt(M/M0);

// The total viscosity considering the contributions of the fluid of interest and the reference fluid [Pa-s]
CoolPropDbl eta = eta_dilute + eta_resid*F_eta;
Expand Down
8 changes: 4 additions & 4 deletions src/Helmholtz.cpp
View file
Open in desktop
Expand Up @@ -483,10 +483,10 @@ void ResidualHelmholtzSRK::all(const CoolPropDbl &tau, const CoolPropDbl &delta,
CoolPropDbl amix = a*pow(kappa_times_Trbracket, 2);

// Derivatives of amix with respect to tau
CoolPropDbl damix_dTau = a*kappa/pow(tau, 3.0L/2.0)*kappa_times_Trbracket;
CoolPropDbl d2amix_dTau2 = a*kappa/2.0*(kappa/pow(tau,3)-3/pow(tau, 5.0L/2.0)*kappa_times_Trbracket);
CoolPropDbl d3amix_dTau3 = 3.0*a*kappa/4.0*(-3.0*kappa/pow(tau, 4)+5/pow(tau, 7.0L/2.0)*kappa_times_Trbracket);
CoolPropDbl d4amix_dTau4 = 3.0*a*kappa/8.0*(29.0*kappa/pow(tau, 5)-35/pow(tau, 9.0L/2.0)*kappa_times_Trbracket);
CoolPropDbl damix_dTau = a*kappa/pow(tau, static_cast<CoolPropDbl>(3.0L/2.0))*kappa_times_Trbracket;
CoolPropDbl d2amix_dTau2 = a*kappa/2.0*(kappa/pow(tau,3)-3/pow(tau, static_cast<CoolPropDbl>(5.0L/2.0))*kappa_times_Trbracket);
CoolPropDbl d3amix_dTau3 = 3.0*a*kappa/4.0*(-3.0*kappa/pow(tau, 4)+5/pow(tau, static_cast<CoolPropDbl>(7.0L/2.0))*kappa_times_Trbracket);
CoolPropDbl d4amix_dTau4 = 3.0*a*kappa/8.0*(29.0*kappa/pow(tau, 5)-35/pow(tau, static_cast<CoolPropDbl>(9.0L/2.0))*kappa_times_Trbracket);

derivs.alphar += -log(1-b*delta*rhor)-tau*amix/(R*Treducing*b)*log(b*delta*rhor + 1);

Expand Down
51 changes: 26 additions & 25 deletions wrappers/Python/CoolProp/AbstractState.pxd
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ from libcpp.string cimport string
# A header defining the AbstractState class
cimport cAbstractState

from typedefs cimport *
cimport constants_header

cdef class PyPhaseEnvelopeData:
Expand Down Expand Up @@ -89,7 +90,7 @@ cdef class AbstractState:
cpdef double delta(self) except *
cpdef double viscosity(self) except *
cpdef double conductivity(self) except *
cpdef dict conformal_state(self, string, long double, long double)
cpdef dict conformal_state(self, string, CoolPropDbl, CoolPropDbl)
cpdef dict conductivity_contributions(self)
cpdef dict viscosity_contributions(self)
cpdef double surface_tension(self) except *
Expand All @@ -116,10 +117,10 @@ cdef class AbstractState:
## Derivatives
## ----------------------------------------

cpdef long double first_partial_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *
cpdef long double second_partial_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *
cpdef long double first_saturation_deriv(self, constants_header.parameters, constants_header.parameters) except *
cpdef long double second_saturation_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *
cpdef CoolPropDbl first_partial_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *
cpdef CoolPropDbl second_partial_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *
cpdef CoolPropDbl first_saturation_deriv(self, constants_header.parameters, constants_header.parameters) except *
cpdef CoolPropDbl second_saturation_deriv(self, constants_header.parameters, constants_header.parameters, constants_header.parameters) except *

cpdef double first_two_phase_deriv(self, constants_header.parameters Of, constants_header.parameters Wrt, constants_header.parameters Constant) except *
cpdef double second_two_phase_deriv(self, constants_header.parameters Of, constants_header.parameters Wrt1, constants_header.parameters Constant1, constants_header.parameters Wrt2, constants_header.parameters Constant2) except *
Expand All @@ -137,24 +138,24 @@ cdef class AbstractState:
cpdef get_mass_fractions(self)
cpdef get_mole_fractions(self)

cpdef long double alpha0(self) except *
cpdef long double dalpha0_dDelta(self) except *
cpdef long double dalpha0_dTau(v) except *
cpdef long double d2alpha0_dDelta2(self) except *
cpdef long double d2alpha0_dDelta_dTau(self) except *
cpdef long double d2alpha0_dTau2(self) except *
cpdef long double d3alpha0_dTau3(self) except *
cpdef long double d3alpha0_dDelta_dTau2(self) except *
cpdef long double d3alpha0_dDelta2_dTau(self) except *
cpdef long double d3alpha0_dDelta3(self) except *
cpdef CoolPropDbl alpha0(self) except *
cpdef CoolPropDbl dalpha0_dDelta(self) except *
cpdef CoolPropDbl dalpha0_dTau(v) except *
cpdef CoolPropDbl d2alpha0_dDelta2(self) except *
cpdef CoolPropDbl d2alpha0_dDelta_dTau(self) except *
cpdef CoolPropDbl d2alpha0_dTau2(self) except *
cpdef CoolPropDbl d3alpha0_dTau3(self) except *
cpdef CoolPropDbl d3alpha0_dDelta_dTau2(self) except *
cpdef CoolPropDbl d3alpha0_dDelta2_dTau(self) except *
cpdef CoolPropDbl d3alpha0_dDelta3(self) except *

cpdef long double alphar(self) except *
cpdef long double dalphar_dDelta(self) except *
cpdef long double dalphar_dTau(self) except *
cpdef long double d2alphar_dDelta2(self) except *
cpdef long double d2alphar_dDelta_dTau(self) except *
cpdef long double d2alphar_dTau2(self) except *
cpdef long double d3alphar_dDelta3(self) except *
cpdef long double d3alphar_dDelta2_dTau(self) except *
cpdef long double d3alphar_dDelta_dTau2(self) except *
cpdef long double d3alphar_dTau3(self) except *
cpdef CoolPropDbl alphar(self) except *
cpdef CoolPropDbl dalphar_dDelta(self) except *
cpdef CoolPropDbl dalphar_dTau(self) except *
cpdef CoolPropDbl d2alphar_dDelta2(self) except *
cpdef CoolPropDbl d2alphar_dDelta_dTau(self) except *
cpdef CoolPropDbl d2alphar_dTau2(self) except *
cpdef CoolPropDbl d3alphar_dDelta3(self) except *
cpdef CoolPropDbl d3alphar_dDelta2_dTau(self) except *
cpdef CoolPropDbl d3alphar_dDelta_dTau2(self) except *
cpdef CoolPropDbl d3alphar_dTau3(self) except *
56 changes: 28 additions & 28 deletions wrappers/Python/CoolProp/AbstractState.pyx
View file
Open in desktop
Expand Up @@ -293,36 +293,36 @@ cdef class AbstractState:
cdef double T = 1e99, rho = 1e99
self.thisptr.true_critical_point(T, rho)
return T, rho
cpdef dict conformal_state(self, string reference_fluid, long double T, long double rho):
cpdef dict conformal_state(self, string reference_fluid, CoolPropDbl T, CoolPropDbl rho):
""" Solve for conformal state used in extended corresponding states - wrapper of c++ function :cpapi:`CoolProp::AbstractState::conformal_state` """
cdef long double T0 = T, rho0 = rho
cdef CoolPropDbl T0 = T, rho0 = rho
self.thisptr.conformal_state(reference_fluid, T0, rho0)
return dict(T = T0, rhomolar = rho0)
cpdef dict conductivity_contributions(self):
""" Retrieve each of the contributions to the conductivity, each in W/m/K - wrapper of c++ function :cpapi:`CoolProp::AbstractState::conductivity_contributions` """
cdef long double dilute = 0, initial_density = 0, residual = 0, critical = 0
cdef CoolPropDbl dilute = 0, initial_density = 0, residual = 0, critical = 0
self.thisptr.conductivity_contributions(dilute, initial_density, residual, critical)
return dict(dilute = dilute, initial_density = initial_density, residual = residual, critical = critical)
cpdef dict viscosity_contributions(self):
""" Retrieve each of the contributions to the viscosity, each in Pa-s - wrapper of c++ function :cpapi:`CoolProp::AbstractState::viscosity_contributions` """
cdef long double dilute = 0, initial_density = 0, residual = 0, critical = 0
cdef CoolPropDbl dilute = 0, initial_density = 0, residual = 0, critical = 0
self.thisptr.viscosity_contributions(dilute, initial_density, residual, critical)
return dict(dilute = dilute, initial_density = initial_density, residual = residual, critical = critical)

## ----------------------------------------
## Derivatives
## ----------------------------------------

cpdef long double first_partial_deriv(self, constants_header.parameters OF , constants_header.parameters WRT, constants_header.parameters CONSTANT) except *:
cpdef CoolPropDbl first_partial_deriv(self, constants_header.parameters OF , constants_header.parameters WRT, constants_header.parameters CONSTANT) except *:
""" Get the first partial derivative - wrapper of c++ function :cpapi:`CoolProp::AbstractState::first_partial_deriv` """
return self.thisptr.first_partial_deriv(OF, WRT, CONSTANT)
cpdef long double second_partial_deriv(self, constants_header.parameters OF , constants_header.parameters WRT1, constants_header.parameters CONSTANT1, constants_header.parameters WRT2, constants_header.parameters CONSTANT2) except *:
cpdef CoolPropDbl second_partial_deriv(self, constants_header.parameters OF , constants_header.parameters WRT1, constants_header.parameters CONSTANT1, constants_header.parameters WRT2, constants_header.parameters CONSTANT2) except *:
""" Get the second partial derivative - wrapper of c++ function :cpapi:`CoolProp::AbstractState::second_partial_deriv` """
return self.thisptr.second_partial_deriv(OF, WRT1, CONSTANT1, WRT2, CONSTANT2)
cpdef long double first_saturation_deriv(self, constants_header.parameters OF , constants_header.parameters WRT) except *:
cpdef CoolPropDbl first_saturation_deriv(self, constants_header.parameters OF , constants_header.parameters WRT) except *:
""" Get the first derivative along the saturation curve - wrapper of c++ function :cpapi:`CoolProp::AbstractState::first_saturation_deriv` """
return self.thisptr.first_saturation_deriv(OF, WRT)
cpdef long double second_saturation_deriv(self, constants_header.parameters OF1 , constants_header.parameters WRT1, constants_header.parameters WRT2) except *:
cpdef CoolPropDbl second_saturation_deriv(self, constants_header.parameters OF1 , constants_header.parameters WRT1, constants_header.parameters WRT2) except *:
""" Get the second derivative along the saturation curve - wrapper of c++ function :cpapi:`CoolProp::AbstractState::second_saturation_deriv` """
return self.thisptr.second_saturation_deriv(OF1, WRT1, WRT2)
cpdef double first_two_phase_deriv(self, constants_header.parameters Of, constants_header.parameters Wrt, constants_header.parameters Constant) except *:
Expand Down Expand Up @@ -388,64 +388,64 @@ cdef class AbstractState:
## Helmholtz energy derivatives
## -----------------------------------------

cpdef long double alpha0(self) except *:
cpdef CoolPropDbl alpha0(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::alpha0` """
return self.thisptr.alpha0()
cpdef long double dalpha0_dDelta(self) except *:
cpdef CoolPropDbl dalpha0_dDelta(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::dalpha0_dDelta` """
return self.thisptr.dalpha0_dDelta()
cpdef long double dalpha0_dTau(self) except *:
cpdef CoolPropDbl dalpha0_dTau(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::dalpha0_dTau` """
return self.thisptr.dalpha0_dTau()
cpdef long double d2alpha0_dDelta2(self) except *:
cpdef CoolPropDbl d2alpha0_dDelta2(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alpha0_dDelta2` """
return self.thisptr.d2alpha0_dDelta2()
cpdef long double d2alpha0_dDelta_dTau(self) except *:
cpdef CoolPropDbl d2alpha0_dDelta_dTau(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alpha0_dDelta_dTau` """
return self.thisptr.d2alpha0_dDelta_dTau()
cpdef long double d2alpha0_dTau2(self) except *:
cpdef CoolPropDbl d2alpha0_dTau2(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alpha0_dTau2` """
return self.thisptr.d2alpha0_dTau2()
cpdef long double d3alpha0_dTau3(self) except *:
cpdef CoolPropDbl d3alpha0_dTau3(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alpha0_dTau3` """
return self.thisptr.d3alpha0_dTau3()
cpdef long double d3alpha0_dDelta_dTau2(self) except *:
cpdef CoolPropDbl d3alpha0_dDelta_dTau2(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alpha0_dDelta_dTau2` """
return self.thisptr.d3alpha0_dDelta_dTau2()
cpdef long double d3alpha0_dDelta2_dTau(self) except *:
cpdef CoolPropDbl d3alpha0_dDelta2_dTau(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alpha0_dDelta2_dTau` """
return self.thisptr.d3alpha0_dDelta2_dTau()
cpdef long double d3alpha0_dDelta3(self) except *:
cpdef CoolPropDbl d3alpha0_dDelta3(self) except *:
""" Get the ideal-gas reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alpha0_dDelta3` """
return self.thisptr.d3alpha0_dDelta3()

cpdef long double alphar(self) except *:
cpdef CoolPropDbl alphar(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::alphar` """
return self.thisptr.alphar()
cpdef long double dalphar_dDelta(self) except *:
cpdef CoolPropDbl dalphar_dDelta(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::dalphar_dDelta` """
return self.thisptr.dalphar_dDelta()
cpdef long double dalphar_dTau(self) except *:
cpdef CoolPropDbl dalphar_dTau(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::dalphar_dTau` """
return self.thisptr.dalphar_dTau()
cpdef long double d2alphar_dDelta2(self) except *:
cpdef CoolPropDbl d2alphar_dDelta2(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alphar_dDelta2` """
return self.thisptr.d2alphar_dDelta2()
cpdef long double d2alphar_dDelta_dTau(self) except *:
cpdef CoolPropDbl d2alphar_dDelta_dTau(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alphar_dDelta_dTau` """
return self.thisptr.d2alphar_dDelta_dTau()
cpdef long double d2alphar_dTau2(self) except *:
cpdef CoolPropDbl d2alphar_dTau2(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d2alphar_dTau2` """
return self.thisptr.d2alphar_dTau2()
cpdef long double d3alphar_dTau3(self) except *:
cpdef CoolPropDbl d3alphar_dTau3(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alphar_dTau3` """
return self.thisptr.d3alphar_dTau3()
cpdef long double d3alphar_dDelta_dTau2(self) except *:
cpdef CoolPropDbl d3alphar_dDelta_dTau2(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alphar_dDelta_dTau2` """
return self.thisptr.d3alphar_dDelta_dTau2()
cpdef long double d3alphar_dDelta2_dTau(self) except *:
cpdef CoolPropDbl d3alphar_dDelta2_dTau(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alphar_dDelta2_dTau` """
return self.thisptr.d3alphar_dDelta2_dTau()
cpdef long double d3alphar_dDelta3(self) except *:
cpdef CoolPropDbl d3alphar_dDelta3(self) except *:
""" Get the residual reduced Helmholtz energy - wrapper of c++ function :cpapi:`CoolProp::AbstractState::d3alphar_dDelta3` """
return self.thisptr.d3alphar_dDelta3()
2 changes: 2 additions & 0 deletions wrappers/Python/CoolProp/CoolProp.pxd
View file
Open in desktop
Expand Up @@ -4,6 +4,8 @@ cimport cython

from libcpp.vector cimport vector

from typedefs cimport *

include "AbstractState.pxd"

cdef class State:
Expand Down
2 changes: 2 additions & 0 deletions wrappers/Python/CoolProp/CoolProp.pyx
View file
Open in desktop
Expand Up @@ -12,6 +12,8 @@ cimport cython
import math
import warnings

from typedefs cimport CoolPropDbl

try:
import numpy as np
_numpy_supported = True
Expand Down