Skip to content

Commit f6bed87

Browse files
committed
Use rmgmolecule instead of rmgpy
1 parent ebe0d9f commit f6bed87

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

deps/build.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if PyCall.pyversion.major != 3 || PyCall.pyversion.minor != 7
99
end
1010
Conda.add("nomkl")
1111
Conda.add("numpy")
12-
Conda.add_channel("rmg")
13-
Conda.add("rmg")
12+
Conda.add_channel("hwpang")
13+
Conda.add("rmgmolecule")
1414
Pkg.build("PyCall")
1515
end

environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
name: rms_env
22
channels:
33
- defaults
4+
- hwpang
45
- rmg
56
dependencies:
67
- rdkit
7-
- rmg
8+
- hwpang::rmgmolecule
89
- pydot
910
- yaml

src/ReactionMechanismSimulator.jl

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@ module ReactionMechanismSimulator
1919
function __init__()
2020
copy!(Chem,pyimport_conda("rdkit.Chem","rdkit","rmg"))
2121
copy!(Desc,pyimport_conda("rdkit.Chem.Descriptors","rdkit","rmg"))
22-
copy!(molecule,pyimport_conda("rmgpy.molecule","rmg","rmg"))
22+
copy!(molecule,pyimport_conda("molecule.molecule","rmgmolecule","hwpang"))
2323
copy!(pydot,pyimport_conda("pydot","pydot"))
24-
copy!(chemkin,pyimport_conda("rmgpy.chemkin","rmg","rmg"))
25-
copy!(species,pyimport_conda("rmgpy.species","rmg","rmg"))
26-
copy!(reaction,pyimport_conda("rmgpy.reaction","rmg","rmg"))
27-
copy!(nasa,pyimport_conda("rmgpy.thermo.nasa","rmg","rmg"))
28-
copy!(wilhoit,pyimport_conda("rmgpy.thermo.wilhoit","rmg","rmg"))
29-
copy!(arrhenius,pyimport_conda("rmgpy.kinetics.arrhenius","rmg","rmg"))
30-
copy!(falloff,pyimport_conda("rmgpy.kinetics.falloff","rmg","rmg"))
31-
copy!(chebyshev,pyimport_conda("rmgpy.kinetics.chebyshev","rmg","rmg"))
32-
copy!(solvation,pyimport_conda("rmgpy.data.solvation","rmg","rmg"))
33-
copy!(yaml,pyimport_conda("yaml","yaml"))
24+
copy!(chemkin,pyimport_conda("molecule.chemkin","rmgmolecule","hwpang"))
25+
copy!(species,pyimport_conda("molecule.species","rmgmolecule","hwpang"))
26+
copy!(reaction,pyimport_conda("molecule.reaction","rmgmolecule","hwpang"))
27+
copy!(nasa,pyimport_conda("molecule.thermo.nasa","rmgmolecule","hwpang"))
28+
copy!(wilhoit,pyimport_conda("molecule.thermo.wilhoit","rmgmolecule","hwpang"))
29+
copy!(arrhenius,pyimport_conda("molecule.kinetics.arrhenius","rmgmolecule","hwpang"))
30+
copy!(falloff,pyimport_conda("molecule.kinetics.falloff","rmgmolecule","hwpang"))
31+
copy!(chebyshev,pyimport_conda("molecule.kinetics.chebyshev","rmgmolecule","hwpang"))
32+
copy!(solvation,pyimport_conda("molecule.data.solvation","rmgmolecule","hwpang"))
3433
copy!(os,pyimport_conda("os","os"))
3534
end
3635
include("Constants.jl")

src/rmstest.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const Chem = PyNULL()
33
const molecule = PyNULL()
44
const pydot = PyNULL()
55
copy!(Chem,pyimport_conda("rdkit.Chem","rdkit","rmg"))
6-
copy!(molecule,pyimport_conda("rmgpy.molecule","rmgpy","rmg"))
6+
copy!(molecule, pyimport_conda("molecule.molecule", "rmgmolecule", "hwpang"))
77
copy!(pydot,pyimport_conda("pydot","pydot","rmg"))
88

99

0 commit comments

Comments
 (0)