Skip to content

Commit 53aed2e

Browse files
committed
Remove the NO_JULIA flag
1 parent d1e6552 commit 53aed2e

3 files changed

Lines changed: 2 additions & 10 deletions

File tree

rmgpy/rmg/input.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
from rmgpy.quantity import Energy, Quantity, RateCoefficient, SurfaceConcentration
4848
from rmgpy.rmg.model import CoreEdgeReactionModel
4949
from rmgpy.rmg.reactionmechanismsimulator_reactors import (
50-
NO_JULIA,
5150
ConstantTLiquidSurfaceReactor,
5251
ConstantTPIdealGasReactor,
5352
ConstantTVLiquidReactor,
@@ -1593,11 +1592,6 @@ def read_input_file(path, rmg0):
15931592
exec(f.read(), global_context, local_context)
15941593
except (NameError, TypeError, SyntaxError) as e:
15951594
logging.error('The input file "{0}" was invalid:'.format(full_path))
1596-
if NO_JULIA:
1597-
logging.error(
1598-
"During runtime, import of Julia dependencies failed. To use phase systems and RMS reactors, install RMG-Py with RMS."
1599-
" (https://reactionmechanismgenerator.github.io/RMG-Py/users/rmg/installation/anacondaDeveloper.html)"
1600-
)
16011595
logging.exception(e)
16021596
raise
16031597
finally:

rmgpy/rmg/main.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
from rmgpy.rmg.model import CoreEdgeReactionModel, Species
7676
from rmgpy.rmg.output import OutputHTMLWriter
7777
from rmgpy.rmg.pdep import PDepNetwork, PDepReaction
78-
from rmgpy.rmg.reactionmechanismsimulator_reactors import NO_JULIA
7978
from rmgpy.rmg.reactionmechanismsimulator_reactors import Reactor as RMSReactor
8079
from rmgpy.rmg.settings import ModelSettings
8180
from rmgpy.solver.base import TerminationConversion, TerminationTime

rmgpy/rmg/model.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
from rmgpy.rmg.pdep import PDepNetwork, PDepReaction
5858
from rmgpy.rmg.react import react_all
5959
from rmgpy.rmg.reactionmechanismsimulator_reactors import (
60-
NO_JULIA,
6160
Interface,
6261
Phase,
6362
PhaseSystem,
@@ -81,7 +80,7 @@ def __init__(self, species=None, reactions=None, phases=None, interfaces={}):
8180
if phases is None:
8281
phases = {"Default": Phase(), "Surface": Phase()}
8382
interfaces = {frozenset({"Default", "Surface"}): Interface(list(phases.values()))}
84-
self.phase_system = None if NO_JULIA else PhaseSystem(phases, interfaces)
83+
self.phase_system = PhaseSystem(phases, interfaces)
8584

8685
def __reduce__(self):
8786
"""
@@ -355,7 +354,7 @@ def make_new_species(self, object, label="", reactive=True, check_existing=True,
355354
orilabel = spec.label
356355
label = orilabel
357356
i = 2
358-
if self.edge.phase_system: # None when RMS not installed
357+
if self.edge.phase_system: # !!! Not maintained when operating with require_rms=False?
359358
while any([label in phase.names for phase in self.edge.phase_system.phases.values()]):
360359
label = orilabel + "-" + str(i)
361360
i += 1

0 commit comments

Comments
 (0)