github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04: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
2015-11-13 20:55:55 -05:00
parent 13f0692feb 057b57558a
commit b9874df1c4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ c['status'].append(mn)
# slave name and password must be configured on the slave.
from buildbot.buildslave import BuildSlave
from buildbot_private import pass_dict
slave_commons = dict(notify_on_missing=["ian.h.bell@gmail.com", "jowr@ipu.dk"], missing_timeout=600 , max_builds = 1)
slave_commons = dict(notify_on_missing=["ian.h.bell@gmail.com", "jowr@ipu.dk"], missing_timeout=900 , max_builds = 1)
c['slaves'] = [BuildSlave("linux-slave", pass_dict["linux-slave"], **slave_commons),
BuildSlave("OSX-slave", pass_dict["OSX-slave"], **slave_commons),
BuildSlave("windows-slave", pass_dict["windows-slave"], **slave_commons),
@@ -996,7 +996,7 @@ c['builders'].append(
c['builders'].append(
BuilderConfig(name="Javascript-linux",
slavenames=["linux-slave"],
slavenames=["linux-slave","LinuxWeb-IPU-slave"],
factory = javascript_slave(platform = 'linux')
)
)

4
src/Backends/Tabular/TabularBackends.cpp
View File

@@ -190,7 +190,7 @@ void CoolProp::PureFluidSaturationTableData::build(shared_ptr<CoolProp::Abstract
void CoolProp::SinglePhaseGriddedTableData::build(shared_ptr<CoolProp::AbstractState> &AS)
{
CoolPropDbl x, y;
const bool debug = get_debug_level() > 5 || true;
const bool debug = get_debug_level() > 5 || false;
resize(Nx, Ny);
@@ -1021,4 +1021,4 @@ TEST_CASE_METHOD(TabularFixture, "Tests for tabular backends with water", "[Tabu
}
#endif // ENABLE_CATCH
#endif // !defined(NO_TABULAR_BACKENDS)
#endif // !defined(NO_TABULAR_BACKENDS)