Skip to content

Commit 7730a26

Browse files
committed
Merge branch 'main' into crest_adapter
2 parents 49234f3 + 5e8a8e7 commit 7730a26

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

arc/job/adapters/ts/autotst_ts.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
from arc.species.converter import xyz_from_data
2020
from arc.species.species import ARCSpecies, TSGuess, colliding_atoms
2121

22-
HAS_AUTOTST = True
23-
2422
if TYPE_CHECKING:
2523
from arc.level import Level
2624

@@ -216,14 +214,10 @@ def execute_incore(self):
216214
"""
217215
Execute a job incore.
218216
"""
219-
# 1) Check that ARC knows *which* Python to use for AutoTST
220-
if not AUTOTST_PYTHON:
221-
raise ModuleNotFoundError(
222-
"settings['AUTOTST_PYTHON'] is not set. "
223-
"ARC cannot run AutoTST as a subprocess without this. "
224-
"Set AUTOTST_PYTHON in your ARC settings to the Python executable of your tst_env."
225-
)
226-
217+
if not AUTOTST_PYTHON or not os.path.isfile(AUTOTST_PYTHON):
218+
raise FileNotFoundError('AutoTST python executable was not found. '
219+
'Make sure the tst_env exists and AUTOTST_PYTHON is configured. '
220+
f'See {self.url} for more information, or use the Makefile provided with ARC.')
227221
self._log_job_execution()
228222
self.initial_time = self.initial_time if self.initial_time else datetime.datetime.now()
229223

arc/species/converter_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4203,7 +4203,7 @@ def test_modify_coords(self):
42034203
new_xyz = converter.modify_coords(coords=xyz3, indices=indices, new_value=new_val,
42044204
modification_type=modification_type, mol=mol3)
42054205
self.assertTrue(almost_equal_coords_lists(new_xyz, expected_xyz))
4206-
self.assertAlmostEqual(converter.get_zmat_param_value(coords=new_xyz, indices=indices, mol=mol3), new_val, 4)
4206+
self.assertAlmostEqual(converter.get_zmat_param_value(coords=new_xyz, indices=indices, mol=mol3), new_val, 3)
42074207

42084208
indices, new_val = [5, 2, 1], 160
42094209
expected_xyz = {'symbols': ('O', 'C', 'C', 'S', 'O', 'C', 'C', 'H', 'H', 'H', 'H', 'H', 'H', 'H', 'H', 'H'),

0 commit comments

Comments
 (0)