Skip to content

Commit 45cd443

Browse files
authored
Minor house-keeping: Define ARC_TESTING_PATH (#831)
Define `ARC_TESTING_PATH` to avoid clutter in testing Return success from `run_arkane()` Make the install_pyrdl script more flexible
2 parents ccf8d24 + 6b56904 commit 45cd443

32 files changed

+465
-445
lines changed

arc/checks/nmd_test.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import numpy as np
1313

1414
import arc.checks.nmd as nmd
15-
from arc.common import ARC_PATH, almost_equal_coords
15+
from arc.common import ARC_PATH, ARC_TESTING_PATH, almost_equal_coords
1616
from arc.job.factory import job_factory
1717
from arc.level import Level
1818
from arc.molecule import Molecule
@@ -110,7 +110,7 @@ def setUpClass(cls):
110110
H -0.004455 -0.848273 -0.183117
111111
H 1.142454 -0.914148 1.088425""")
112112
cls.rxn_2.ts_species = ARCSpecies(label='TS2', is_ts=True, xyz=cls.ts_2_xyz)
113-
cls.freq_log_path_2 = os.path.join(ARC_PATH, 'arc', 'testing', 'freq', 'HO2+N2H4_H2O2+N2H3_freq.out')
113+
cls.freq_log_path_2 = os.path.join(ARC_TESTING_PATH, 'freq', 'HO2+N2H4_H2O2+N2H3_freq.out')
114114

115115
cls.displaced_xyz_3 = ({'symbols': ('C', 'N', 'H', 'H', 'H', 'H'), 'isotopes': (13, 14, 1, 1, 1, 1),
116116
'coords': ((1.09466418610, 0.4027481525, -0.40679594165),
@@ -228,7 +228,7 @@ def setUpClass(cls):
228228
def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
229229
"""Test the analyze_ts_normal_mode_displacement() function with simple reactions."""
230230
# CH4 + OH <=> CH3 + H2O
231-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'freq', 'TS_CH4_OH.log')
231+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'freq', 'TS_CH4_OH.log')
232232
valid = nmd.analyze_ts_normal_mode_displacement(reaction=self.rxn_1,
233233
job=self.generic_job,
234234
amplitude=0.25,
@@ -246,7 +246,7 @@ def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
246246
self.assertTrue(valid)
247247

248248
# NH2 + N2H3 <=> NH + N2H4:
249-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'freq', 'TS_NH2+N2H3.out')
249+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'freq', 'TS_NH2+N2H3.out')
250250
rxn_3 = ARCReaction(r_species=[ARCSpecies(label='NH2', xyz="""N 0.00000000 -0.00000000 0.14115400
251251
H -0.80516800 0.00000000 -0.49355600
252252
H 0.80516800 -0.00000000 -0.49355600"""),
@@ -278,7 +278,7 @@ def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
278278
self.assertTrue(valid)
279279

280280
# [CH2]CC=C <=> CCC=[CH] butylene intra H migration:
281-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'composite',
281+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'composite',
282282
'TS_butylene_intra_H_migration.out')
283283
rxn_4 = ARCReaction(r_species=[
284284
ARCSpecies(label='butylene',
@@ -314,7 +314,7 @@ def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
314314
self.assertTrue(valid)
315315

316316
# NCC + H <=> CH3CHNH2 + H2:
317-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'TS0_composite_2044.out')
317+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'composite', 'TS0_composite_2044.out')
318318
ea_xyz = """N 1.27511929 -0.21413688 -0.09829069
319319
C 0.04568411 0.51479456 0.24529057
320320
C -1.17314611 -0.39875221 0.01838707
@@ -345,7 +345,7 @@ def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
345345
self.assertTrue(valid)
346346

347347
# NH3 + H <=> NH2 + H2
348-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'freq', 'TS_NH3+H=NH2+H2.out')
348+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'freq', 'TS_NH3+H=NH2+H2.out')
349349

350350
rxn_6 = ARCReaction(r_species=[ARCSpecies(label='NH3', smiles='N'), ARCSpecies(label='H', smiles='[H]')],
351351
p_species=[ARCSpecies(label='NH2', smiles='[NH2]'), ARCSpecies(label='H2', smiles='[H][H]')])
@@ -356,7 +356,7 @@ def test_analyze_ts_normal_mode_displacement_simple_rxns(self):
356356

357357
def test_analyze_ts_normal_mode_displacement_correct_and_incorrect_data(self):
358358
"""Test the analyze_ts_normal_mode_displacement() function with correct and incorrect TSs for iC3H7 <=> nC3H7."""
359-
base_path = os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'C3H7')
359+
base_path = os.path.join(ARC_TESTING_PATH, 'composite', 'C3H7')
360360
log_file_paths = {'iC3H7': os.path.join(base_path, 'iC3H7.gjf'),
361361
'nC3H7': os.path.join(base_path, 'nC3H7.gjf'),
362362
'TS1': os.path.join(base_path, 'TS1.log'), # an iC3H7-like saddle point
@@ -411,7 +411,7 @@ def test_analyze_ts_normal_mode_displacement_correct_and_incorrect_data(self):
411411
def test_analyze_ts_normal_mode_displacement_for_hypervalence_nitrogen(self):
412412
"""Test the analyze_ts_normal_mode_displacement() function for a hypervalence nitrogen."""
413413
# C2H5NO2 <=> C2H5ONO
414-
self.generic_job.local_path_to_output_file = os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'C2H5NO2__C2H5ONO.out')
414+
self.generic_job.local_path_to_output_file = os.path.join(ARC_TESTING_PATH, 'composite', 'C2H5NO2__C2H5ONO.out')
415415
valid = nmd.analyze_ts_normal_mode_displacement(reaction=self.rxn_3,
416416
job=self.generic_job,
417417
amplitude=0.25,
@@ -561,7 +561,7 @@ def test_get_bond_length_in_reaction(self):
561561

562562
def test_classic_intra_h_migration_through_all_major_functions(self):
563563
"""Test the intermediate stages the nmd module takes for processing the classic intra H migration reaction."""
564-
xyz_path = os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'C3H7', 'TS3.log')
564+
xyz_path = os.path.join(ARC_TESTING_PATH, 'composite', 'C3H7', 'TS3.log')
565565
standard_ts_orientation_xyz = check_xyz_dict(xyz_path)
566566
freqs, nmd_array = parse_normal_mode_displacement(xyz_path)
567567
self.assertAlmostEqual(float(freqs[0]), -1927.862, 2)
@@ -626,9 +626,9 @@ def test_classic_intra_h_migration_through_all_major_functions(self):
626626
self.assertAlmostEqual(reactive_bonds_diffs[1], 1.52941596, places=5)
627627

628628
rxn = ARCReaction(r_species=[ARCSpecies(label='iC3H7', smiles='C[CH]C',
629-
xyz=os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'C3H7', 'iC3H7.gjf'))],
629+
xyz=os.path.join(ARC_TESTING_PATH, 'composite', 'C3H7', 'iC3H7.gjf'))],
630630
p_species=[ARCSpecies(label='nC3H7', smiles='[CH2]CC',
631-
xyz=os.path.join(ARC_PATH, 'arc', 'testing', 'composite', 'C3H7', 'nC3H7.gjf'))])
631+
xyz=os.path.join(ARC_TESTING_PATH, 'composite', 'C3H7', 'nC3H7.gjf'))])
632632
rxn.ts_species = ARCSpecies(label='TS', is_ts=True, xyz=xyz_path)
633633
r_bonds, _ = rxn.get_bonds(r_bonds_only=True)
634634
non_reactive_bonds = list()

0 commit comments

Comments
 (0)