From 980d41c5eca4ee64b0d99711ac6615b8e95fd7e7 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 22 Mar 2016 08:11:23 -0600 Subject: [PATCH 1/4] Fix configuration sample in docs --- Web/coolprop/Configuration.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Web/coolprop/Configuration.rst b/Web/coolprop/Configuration.rst index 22d027af..83c8b4b6 100644 --- a/Web/coolprop/Configuration.rst +++ b/Web/coolprop/Configuration.rst @@ -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 `_ formatted string. For instance, in python, you can get the default configuration state from From 7a81674ae02470aeba78fb1d115311d9f83d5717 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 22 Mar 2016 23:04:17 -0600 Subject: [PATCH 2/4] Fix constant in Chung method for estimation of e/k and sigma --- src/Backends/Helmholtz/Fluids/FluidLibrary.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index 25ee83fd..48e7ba6a 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -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(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) From 0815e1a10605127a25b7620b0f2ecce4e221cf6c Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 23 Mar 2016 14:19:53 +0100 Subject: [PATCH 3/4] Added the Python 3.5 docs for #1002 --- Web/develop/buildbot.rst | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/Web/develop/buildbot.rst b/Web/develop/buildbot.rst index f54b010a..5f0f6ba3 100644 --- a/Web/develop/buildbot.rst +++ b/Web/develop/buildbot.rst @@ -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 From f5098d98f8758d103af2edcb0d1551ab8d976a36 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Wed, 23 Mar 2016 15:47:33 +0100 Subject: [PATCH 4/4] Added Python 3.5 to the Linux slaves, this won't work until CoolProp/Dockerfiles#1 is resolved --- dev/buildbot/master/master.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 0299cc11..8eb87ede 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -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]