github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolprop/coolprop

Browse Source
This commit is contained in:
Ian Bell
2016-03-24 09:06:46 -07:00
parent f19f79fe40 f5098d98f8
commit 6582e71880
4 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Web/coolprop/Configuration.rst
View File

@@ -14,7 +14,9 @@ From C++ and the SWIG wrappers, the values can be directly set/changed by using
In [0]: import CoolProp.CoolProp as CP
In [1]: CP.get_config_bool(CP.CRITICAL_WITHIN_1UK, True)
In [1]: current_val = CP.get_config_bool(CP.CRITICAL_WITHIN_1UK)
In [1]: CP.set_config_bool(CP.CRITICAL_WITHIN_1UK, current_val)
From all languages, the configuration state can obtained by retrieving the configuration state in the form of a `JSON <http://json.org/>`_ formatted string. For instance, in python, you can get the default configuration state from

39
Web/develop/buildbot.rst
View File

@@ -82,40 +82,19 @@ Based on the miniconda Python ecosystem, you can create your own virtual
environments for building the Python wheels. This requires the following
steps on a Windows machine::
conda create -n CoolProp27 python=2.7
conda create -n CoolProp33 python=3.3
conda create -n CoolProp34 python=3.4
conda install -n CoolProp27 cython pip pywin32 unxutils jinja2 pyyaml pycrypto ndg-httpsclient
conda install -n CoolProp33 cython pip pywin32 unxutils jinja2 pyyaml pycrypto
conda install -n CoolProp34 cython pip pywin32 unxutils jinja2 pyyaml pycrypto
conda create -n CoolProp27 python=2.7 cython pip pywin32 unxutils jinja2 pyyaml pycrypto wheel ndg-httpsclient
conda create -n CoolProp33 python=3.3 cython pip pywin32 unxutils jinja2 pyyaml pycrypto wheel
conda create -n CoolProp34 python=3.4 cython pip pywin32 unxutils jinja2 pyyaml pycrypto wheel
conda create -n CoolProp35 python=3.5 cython pip pywin32 unxutils jinja2 pyyaml pycrypto wheel
activate CoolProp27
pip install wheel
deactivate
activate CoolProp34
pip install wheel
deactivate
Please repeat the steps above for both 32bit and 64bit Python environments.
Please repeat the steps above for **both 32bit and 64bit** Python environments.
On a Linux system, things only change a little bit::
conda create -n CoolProp27 python=2.7
conda create -n CoolProp33 python=3.3
conda create -n CoolProp34 python=3.4
conda install -n CoolProp27 cython pip jinja2 pyyaml pycrypto
conda install -n CoolProp33 cython pip jinja2 pyyaml pycrypto
conda install -n CoolProp34 cython pip jinja2 pyyaml pycrypto
source activate CoolProp27
pip install wheel
source deactivate
source activate CoolProp33
pip install wheel
source deactivate
source activate CoolProp34
pip install wheel
source deactivate
conda create -n CoolProp27 python=2.7 cython pip jinja2 pyyaml pycrypto wheel
conda create -n CoolProp33 python=3.3 cython pip jinja2 pyyaml pycrypto wheel
conda create -n CoolProp34 python=3.4 cython pip jinja2 pyyaml pycrypto wheel
conda create -n CoolProp35 python=3.5 cython pip jinja2 pyyaml pycrypto wheel
Please make sure that the standard shell ``/bin/sh`` used by the builbot is
bash or zsh. We make use of the ``source`` command, which is not part of the

2
dev/buildbot/master/master.cfg
View File

@@ -1097,6 +1097,7 @@ l64IPUslave.pyact[getIDstr( "linux" , "64bit", 0 )] = "source activate"
l64IPUslave.pyenv[getIDstr( "linux" , "64bit", "py27")] = "CoolProp27"
l64IPUslave.pyenv[getIDstr( "linux" , "64bit", "py33")] = "CoolProp33"
l64IPUslave.pyenv[getIDstr( "linux" , "64bit", "py34")] = "CoolProp34"
l64IPUslave.pyenv[getIDstr( "linux" , "64bit", "py35")] = "CoolProp35"
l64IPUslave.pyins[getIDstr( "linux" , 0 , 0 )] = baseins
l32IPUslave = PythonSlaveConfig("Linux32-IPU-slave")
@@ -1104,6 +1105,7 @@ l32IPUslave.pyact[getIDstr( "linux" , "32bit", 0 )] = "source activate"
l32IPUslave.pyenv[getIDstr( "linux" , "32bit", "py27")] = "CoolProp27"
l32IPUslave.pyenv[getIDstr( "linux" , "32bit", "py33")] = "CoolProp33"
l32IPUslave.pyenv[getIDstr( "linux" , "32bit", "py34")] = "CoolProp34"
l32IPUslave.pyenv[getIDstr( "linux" , "32bit", "py35")] = "CoolProp35"
l32IPUslave.pyins[getIDstr( "linux" , 0 , 0 )] = baseins
pythonSlaves = [windowsDTUslave, osxIPUslave, l64IPUslave, l32IPUslave]

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

@@ -922,7 +922,7 @@ protected:
CoolPropDbl rho_crit_molar = fluid.EOS().reduce.rhomolar/1000.0;// [mol/m3 to mol/L]
CoolPropDbl Tc = fluid.EOS().reduce.T;
fluid.transport.sigma_eta = 0.809/pow(rho_crit_molar, static_cast<CoolPropDbl>(1.0/3.0))/1e9; // 1e9 is to convert from nm to m
fluid.transport.epsilon_over_k = Tc/1.3593; // [K]
fluid.transport.epsilon_over_k = Tc/1.2593; // [K]
}
void parse_melting_line(rapidjson::Value &melting_line, CoolPropFluid & fluid)