Getting ready for next release, fixed incomressible docs and tried to handle #456 ...

This commit is contained in:
Jorrit Wronski
2015-02-11 15:39:01 +01:00
parent 49a609ebcc
commit 0cb981606d
3 changed files with 63 additions and 45 deletions

View File

@@ -29,7 +29,7 @@ project(${project_name})
# Project version
set (COOLPROP_VERSION_MAJOR 5)
set (COOLPROP_VERSION_MINOR 0)
set (COOLPROP_VERSION_PATCH 7dev)
set (COOLPROP_VERSION_PATCH 7)
set (COOLPROP_VERSION ${COOLPROP_VERSION_MAJOR}.${COOLPROP_VERSION_MINOR}.${COOLPROP_VERSION_PATCH})
#######################################

View File

@@ -59,8 +59,8 @@ Pure Fluid Examples
-------------------
Incompressible fluids only allow for a limited subset of input variables. The
following input pairs are supported: :math:`f(p,T)`, :math:`f(p,h)`, :math:`f(p,\rho)`,
:math:`f(p,u)` and :math:`f(p,s)`. Some fluids also provide saturation state
following input pairs are supported: :math:`f(p,T)`, :math:`f(p,h)`, :math:`f(p,\rho)`
and :math:`f(p,s)`. Some fluids also provide saturation state
information as :math:`f(Q,T)` with :math:`Q=0`. All functions iterate on :math:`f(p,T)` calls
internally, which makes this combination by far the fastest. However, also the
other inputs should be fast compared to the full Helmholtz-based EOS implemented
@@ -74,14 +74,30 @@ thermal conductivity. Hence, the available output keys are: ``T``, ``P``, ``D``,
.. ipython::
In [1]: from CoolProp.CoolProp import PropsSI
#Density of Downtherm Q at 500 K and 1 atm.
In [1]: PropsSI('D','T',500,'P',101325,'INCOMP::DowQ')
#Specific heat capacity of Downtherm Q at 500 K and 1 atm
In [1]: PropsSI('C','T',500,'P',101325,'INCOMP::DowQ')
In [1]: PropsSI('C','D',809.0659,'P',101325,'INCOMP::DowQ')
#Density of Downtherm Q at 500 K and 1 atm.
In [1]: PropsSI('D','T',500,'P',101325,'INCOMP::DowQ')
#Heat capacity from density and pressure
In [1]: PropsSI('C','D',D,'P',101325,'INCOMP::DowQ')
#Round trip in thermodynamic properties
In [1]: T_init = 500.0
In [2]: P_init = 101325
In [3]: D_init = PropsSI('D','T',T_init,'P',P_init,'INCOMP::DowQ')
In [4]: S_init = PropsSI('S','D',D_init,'P',P_init,'INCOMP::DowQ')
In [5]: H_init = PropsSI('H','S',S_init,'P',P_init,'INCOMP::DowQ')
In [6]: T_init = PropsSI('T','H',H_init,'P',P_init,'INCOMP::DowQ')
In [7]: T_init
#Saturation pressure of Downtherm Q at 500 K
In [1]: PropsSI('P','T',500,'Q',0,'INCOMP::DowQ')

View File

@@ -8,6 +8,45 @@
# a shorter alias to save typing.
c = BuildmasterConfig = {}
####### STATUS TARGETS
# 'status' is a list of Status Targets. The results of each build will be
# pushed to these targets. buildbot/status/*.py has a variety to choose from,
# including web pages, email senders, and IRC bots.
c['status'] = []
from buildbot.status import html
from buildbot.status.web import authz, auth
from buildbot_private import web_auth
authz_cfg=authz.Authz(
# change any of these to True to enable; see the manual for more
# options
auth=auth.BasicAuth([(web_auth['user'], web_auth['pass'])]),
gracefulShutdown = False,
forceBuild = 'auth', # use this to test your slave once it is set up
forceAllBuilds = 'auth',
pingBuilder = False,
stopBuild = 'auth',
stopAllBuilds = 'auth',
cancelPendingBuild = 'auth',
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
from buildbot.status import mail
from buildbot_private import email_auth
mn = mail.MailNotifier(fromaddr="buildbot@coolprop.dreamhosters.com",
sendToInterestedUsers=False,
mode=('problem'),
extraRecipients=["coolprop@jorrit.org", "ian.h.bell@gmail.com"],
#useTls=True,
relayhost="homie.mail.dreamhost.com",
smtpPort=587, smtpUser=email_auth['user'],
smtpPassword=email_auth['pass'])
c['status'].append(mn)
####### BUILDSLAVES
# The 'slaves' list defines the set of recognized buildslaves. Each element is
@@ -1206,44 +1245,7 @@ c['schedulers'].append(Nightly(name='nightly',
#~ builderNames=["MATLAB32-windows"])
#~ )
####### STATUS TARGETS
# 'status' is a list of Status Targets. The results of each build will be
# pushed to these targets. buildbot/status/*.py has a variety to choose from,
# including web pages, email senders, and IRC bots.
c['status'] = []
from buildbot.status import html
from buildbot.status.web import authz, auth
from buildbot_private import web_auth
authz_cfg=authz.Authz(
# change any of these to True to enable; see the manual for more
# options
auth=auth.BasicAuth([(web_auth['user'], web_auth['pass'])]),
gracefulShutdown = False,
forceBuild = 'auth', # use this to test your slave once it is set up
forceAllBuilds = 'auth',
pingBuilder = False,
stopBuild = 'auth',
stopAllBuilds = 'auth',
cancelPendingBuild = 'auth',
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
from buildbot.status import mail
from buildbot_private import email_auth
mn = mail.MailNotifier(fromaddr="buildbot@coolprop.dreamhosters.com",
sendToInterestedUsers=False,
mode=('problem'),
extraRecipients=["coolprop@jorrit.org", "ian.h.bell@gmail.com"],
#useTls=True,
relayhost="homie.mail.dreamhost.com",
smtpPort=587, smtpUser=email_auth['user'],
smtpPassword=email_auth['pass'])
c['status'].append(mn)
####### PROJECT IDENTITY