Skip to content

Commit bb14830

Browse files
committed
update
1 parent bb04d75 commit bb14830

File tree

1 file changed

+41
-26
lines changed

1 file changed

+41
-26
lines changed

src/ReactionMechanismSimulator.jl

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,51 @@ import Logging
33
Logging.disable_logging(Logging.Warn)
44
using PythonCall
55
pyimport("sys").path.append("")
6+
const Chem = Ref{Py}()
7+
const Desc = Ref{Py}()
8+
const molecule = Ref{Py}()
9+
const chemkin = Ref{Py}()
10+
const species = Ref{Py}()
11+
const reaction = Ref{Py}()
12+
const nasa = Ref{Py}()
13+
const wilhoit = Ref{Py}()
14+
const arrhenius = Ref{Py}()
15+
const falloff = Ref{Py}()
16+
const chebyshev = Ref{Py}()
17+
const solvation = Ref{Py}()
18+
const fragment = Ref{Py}()
19+
const pydot = Ref{Py}()
20+
const os = Ref{Py}()
621
function __init__()
7-
Chem = @pyconst(pyimport("rdkit.Chem"))
8-
Desc = @pyconst(pyimport("rdkit.Chem.Descriptors"))
22+
Chem[] = pyimport("rdkit.Chem")
23+
Desc[] = pyimport("rdkit.Chem.Descriptors")
924
try
10-
molecule = @pyconst(pyimport("rmgpy.molecule"))
11-
chemkin = @pyconst(pyimport("rmgpy.chemkin"))
12-
species = @pyconst(pyimport("rmgpy.species"))
13-
reaction = @pyconst(pyimport("rmgpy.reaction"))
14-
nasa = @pyconst(pyimport("rmgpy.thermo.nasa"))
15-
wilhoit = @pyconst(pyimport("rmgpy.thermo.wilhoit"))
16-
arrhenius = @pyconst(pyimport("rmgpy.kinetics.arrhenius"))
17-
falloff = @pyconst(pyimport("rmgpy.kinetics.falloff"))
18-
chebyshev = @pyconst(pyimport("rmgpy.kinetics.chebyshev"))
19-
solvation = @pyconst(pyimport("rmgpy.data.solvation"))
20-
fragment = @pyconst(pyimport("rmgpy.molecule.fragment"))
25+
molecule[] = pyimport("rmgpy.molecule")
26+
chemkin[] = pyimport("rmgpy.chemkin")
27+
species[] = pyimport("rmgpy.species")
28+
reaction[] = pyimport("rmgpy.reaction")
29+
nasa[] = pyimport("rmgpy.thermo.nasa")
30+
wilhoit[] = pyimport("rmgpy.thermo.wilhoit")
31+
arrhenius[] = pyimport("rmgpy.kinetics.arrhenius")
32+
falloff[] = pyimport("rmgpy.kinetics.falloff")
33+
chebyshev[] = pyimport("rmgpy.kinetics.chebyshev")
34+
solvation[] = pyimport("rmgpy.data.solvation")
35+
fragment[] = pyimport("rmgpy.molecule.fragment")
2136
catch e
22-
molecule = @pyconst(pyimport("molecule.molecule"))
23-
chemkin = @pyconst(pyimport("molecule.chemkin"))
24-
species = @pyconst(pyimport("molecule.species"))
25-
reaction = @pyconst(pyimport("molecule.reaction"))
26-
nasa = @pyconst(pyimport("molecule.thermo.nasa"))
27-
wilhoit = @pyconst(pyimport("molecule.thermo.wilhoit"))
28-
arrhenius = @pyconst(pyimport("molecule.kinetics.arrhenius"))
29-
falloff = @pyconst(pyimport("molecule.kinetics.falloff"))
30-
chebyshev = @pyconst(pyimport("molecule.kinetics.chebyshev"))
31-
solvation = @pyconst(pyimport("molecule.data.solvation"))
32-
fragment = @pyconst(pyimport("molecule.molecule.fragment"))
37+
molecule[] = pyimport("molecule.molecule")
38+
chemkin[] = pyimport("molecule.chemkin")
39+
species[] = pyimport("molecule.species")
40+
reaction[] = pyimport("molecule.reaction")
41+
nasa[] = pyimport("molecule.thermo.nasa")
42+
wilhoit[] = pyimport("molecule.thermo.wilhoit")
43+
arrhenius[] = pyimport("molecule.kinetics.arrhenius")
44+
falloff[] = pyimport("molecule.kinetics.falloff")
45+
chebyshev[] = pyimport("molecule.kinetics.chebyshev")
46+
solvation[] = pyimport("molecule.data.solvation")
47+
fragment[] = pyimport("molecule.molecule.fragment")
3348
end
34-
pydot = @pyconst(pyimport("pydot"))
35-
os = @pyconst(pyimport("os"))
49+
pydot[] = pyimport("pydot")
50+
os[] = pyimport("os")
3651
end
3752
include("Constants.jl")
3853
include("Tools.jl")

0 commit comments

Comments
 (0)