Skip to content

Commit

Permalink
Remove physical constants from aiida.common.constants (aiidateam#3278)
Browse files Browse the repository at this point in the history
These constants were added for the Quantum ESPRESSO specific code. The
only constant still used was `bohr_to_ang` which was only used in a
specific visualization method for the `TrajectoryData` class. This is
now inlined where it is used and the constants are deleted.
  • Loading branch information
sphuber authored and d-tomerini committed Sep 30, 2019
1 parent d37d03c commit 48f24ba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
16 changes: 2 additions & 14 deletions aiida/common/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,9 @@
# a migration.
AIIDA_FLOAT_PRECISION = 14

## PHYSICAL CONSTANTS BELOW HERE

bohr_to_ang = 0.52917720859 # pylint: disable=invalid-name
ang_to_m = 1.e-10 # pylint: disable=invalid-name
bohr_si = bohr_to_ang * ang_to_m # pylint: disable=invalid-name
ry_to_ev = 13.6056917253 # pylint: disable=invalid-name
ry_si = 4.35974394 / 2. * 10**(-18) # pylint: disable=invalid-name
hartree_to_ev = ry_to_ev * 2. # pylint: disable=invalid-name
timeau_to_sec = 2.418884326155573e-17 # pylint: disable=invalid-name
invcm_to_THz = 0.0299792458 # pylint: disable=invalid-name

# Element table, from NIST (http://www.nist.gov/pml/data/index.cfm)
# Retrieved in October 2014 for atomic numbers 1-103, and in May 2016
# for atomic numbers 104-112, 114 and 116. In addition, element X is
# added to support unknown elements.
# Retrieved in October 2014 for atomic numbers 1-103, and in May 2016 or atomic numbers 104-112, 114 and 116.
# In addition, element X is added to support unknown elements.
elements = { # pylint: disable=invalid-name
0: {
'mass': 1.00000,
Expand Down
2 changes: 1 addition & 1 deletion aiida/orm/nodes/data/array/trajectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ def collapse_into_unit_cell(point, cell):

try:
if self.get_attribute('units|positions') in ('bohr', 'atomic'):
from aiida.common.constants import bohr_to_ang
bohr_to_ang = 0.52917720859
positions *= bohr_to_ang
except KeyError:
pass
Expand Down

0 comments on commit 48f24ba

Please sign in to comment.