forked from ahmadia/homebrew-science
-
Notifications
You must be signed in to change notification settings - Fork 0
/
cantera.rb
118 lines (103 loc) · 4.04 KB
/
cantera.rb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
require 'formula'
class Cantera < Formula
homepage 'http://code.google.com/p/cantera/'
head 'https://github.com/cantera/cantera.git', :branch => 'master'
stable do
url "https://downloads.sourceforge.net/project/cantera/cantera/2.1.2/cantera-2.1.2.tar.gz"
sha1 "57c3ddf112d5b27cb423f064fc84dcaa6ba14a1f"
# Patches to checkFinite.cpp and SConstruct should be removed for
# Cantera 2.2.x (fixed upstream)
patch :DATA
end
devel do
url 'https://github.com/cantera/cantera.git', :branch => '2.1-svn'
version '2.1.x'
# Patches to checkFinite.cpp and SConstruct should be removed for
# Cantera 2.2.x (fixed upstream)
patch :DATA
end
option "with-matlab=", "Path to Matlab root directory"
option "without-check", "Disable build-time checking (not recommended)"
depends_on :python if MacOS.version <= :snow_leopard
depends_on "scons" => :build
depends_on "numpy" => :python
depends_on "cython" => :python
depends_on "sundials" => :recommended
depends_on :python3 => :optional
depends_on "graphviz" => :optional
def install
# Make sure to use Homebrew Python to do CTI to CTML conversions
inreplace "src/base/ct2ctml.cpp", 's = "python";', 's = "/usr/local/bin/python";'
build_args = ["prefix=#{prefix}",
"python_package=new",
"CC=#{ENV.cc}",
"CXX=#{ENV.cxx}",
"f90_interface=n"]
matlab_path = ARGV.value("with-matlab")
build_args << "matlab_path=" + matlab_path if matlab_path
build_args << "python3_package=y" if build.with? :python3
# This is needed to make sure both the main code and the Python module use
# the same C++ standard library. Can be removed for Cantera 2.2.x
if MacOS.version >= :mavericks and not build.head?
ENV.libcxx
build_args << "python_compiler=#{ENV.cxx}"
end
scons "build", *build_args
scons "test" if build.with? "check"
scons "install"
prefix.install Dir["License.*"]
end
test do
# Run those portions of the test suite that do not depend of data
# that's only available in the source tree.
system("python", "-m", "unittest", "-v",
"cantera.test.test_thermo",
"cantera.test.test_kinetics",
"cantera.test.test_transport",
"cantera.test.test_purefluid",
"cantera.test.test_mixture")
end
def caveats; <<-EOS.undent
The license, demos, tutorials, data, etc. can be found in:
#{opt_prefix}
Try the following in python to find the equilibrium composition of a
stoichiometric methane/air mixture at 1000 K and 1 atm:
>>> import cantera as ct
>>> g = ct.Solution('gri30.cti')
>>> g.TPX = 1000, ct.one_atm, 'CH4:1, O2:2, N2:8'
>>> g.equilibrate('TP')
>>> g()
EOS
end
end
__END__
diff --git a/src/base/checkFinite.cpp b/src/base/checkFinite.cpp
index 41384ca..7ac6785 100644
--- a/src/base/checkFinite.cpp
+++ b/src/base/checkFinite.cpp
@@ -55,10 +55,10 @@ void checkFinite(const double tmp)
throw std::range_error("checkFinite()");
}
#else
- if (!::finite(tmp)) {
- if (::isnan(tmp)) {
+ if (!std::isfinite(tmp)) {
+ if (std::isnan(tmp)) {
printf("checkFinite() ERROR: we have encountered a nan!\n");
- } else if (::isinf(tmp) == 1) {
+ } else if (std::isinf(tmp) == 1) {
printf("checkFinite() ERROR: we have encountered a pos inf!\n");
} else {
printf("checkFinite() ERROR: we have encountered a neg inf!\n");
diff --git a/SConstruct b/SConstruct
index 13b8600..bca9e8a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1126,7 +1126,7 @@ else:
env['inst_datadir'] = pjoin(instRoot, 'share', 'cantera', 'data')
env['inst_sampledir'] = pjoin(instRoot, 'share', 'cantera', 'samples')
env['inst_docdir'] = pjoin(instRoot, 'share', 'cantera', 'doc')
- env['inst_mandir'] = pjoin(instRoot, 'man', 'man1')
+ env['inst_mandir'] = pjoin(instRoot, 'share', 'man', 'man1')
# **************************************
# *** Set options needed in config.h ***