Skip to content

Commit a57a62b

Browse files
committed
remove old periodic dependency in promolecule
1 parent d9f5982 commit a57a62b

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

atomdb/datasets/gaussian/h5file_creator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
from importlib_resources import files
44
import tables as pt
55
from dataclasses import asdict
6-
from atomdb.datasets.gaussian.run import NPOINTS
6+
# from atomdb.datasets.gaussian.run import NPOINTS
77
from atomdb.periodic_test import element_symbol_map, ElementAttr
88

99

1010
# Suppresses NaturalNameWarning warnings from PyTables.
1111
warnings.filterwarnings("ignore", category=pt.NaturalNameWarning)
1212

1313
max_norba = 41
14+
NPOINTS = 1000
1415

1516
GAUSSIAN_PROPERTY_CONFIGS = [
1617
{

atomdb/datasets/hci/h5file_creator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
from importlib_resources import files
44
import tables as pt
55
from dataclasses import asdict
6-
from atomdb.datasets.hci.run import NPOINTS
6+
# from atomdb.datasets.hci.run import NPOINTS
77
from atomdb.periodic_test import element_symbol_map, ElementAttr
88

99

1010
# Suppresses NaturalNameWarning warnings from PyTables.
1111
warnings.filterwarnings("ignore", category=pt.NaturalNameWarning)
1212

1313
max_norba = 56
14+
NPOINTS = 1000
1415

1516
HCI_PROPERTY_CONFIGS = [
1617
{

atomdb/datasets/slater/h5file_creator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
from importlib_resources import files
44
import tables as pt
55
from dataclasses import asdict
6-
from atomdb.datasets.slater.run import NPOINTS
6+
# from atomdb.datasets.slater.run import NPOINTS
77
from atomdb.periodic_test import element_symbol_map, ElementAttr
88

99

1010
# Suppresses NaturalNameWarning warnings from PyTables.
1111
warnings.filterwarnings("ignore", category=pt.NaturalNameWarning)
1212

1313
max_norba = 56
14+
NPOINTS = 1000
1415

1516
SLATER_PROPERTY_CONFIGS = [
1617
{

atomdb/datasets/uhf_augccpvdz/h5file_creator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
from importlib_resources import files
44
import tables as pt
55
from dataclasses import asdict
6-
from atomdb.datasets.uhf_augccpvdz.run import NPOINTS
6+
# from atomdb.datasets.uhf_augccpvdz.run import NPOINTS
77
from atomdb.periodic_test import element_symbol_map, ElementAttr
88

99

1010
# Suppresses NaturalNameWarning warnings from PyTables.
1111
warnings.filterwarnings("ignore", category=pt.NaturalNameWarning)
1212

1313
max_norba = 100 # needs to be calculated
14+
NPOINTS = 1000
1415

1516
UHF_AUGCCPVDZ_PROPERTY_CONFIGS = [
1617
{

atomdb/periodic_test.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"PROPERTY_NAME_MAP",
1010
"get_scalar_data",
1111
"element_symbol_map",
12+
"atnum_to_symbol",
1213
"ElementAttr",
1314
]
1415

@@ -106,3 +107,5 @@ def map_element_symbol():
106107

107108

108109
element_symbol_map = map_element_symbol()
110+
atnum_to_symbol = {atnum[0]: elem for elem, atnum in element_symbol_map.items()}
111+
print(atnum_to_symbol)

atomdb/promolecule.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import numpy as np
2525
from scipy.optimize import linprog
2626

27-
from atomdb.periodic import element_number, element_symbol
27+
# from atomdb.periodic import element_number, element_symbol
28+
from atomdb.periodic_test import element_symbol_map, atnum_to_symbol, ElementAttr
2829
from atomdb.species import load
2930
from atomdb.utils import DEFAULT_DATAPATH, DEFAULT_DATASET, DEFAULT_REMOTE, MULTIPLICITIES
3031

@@ -582,8 +583,8 @@ def make_promolecule(
582583
if isinstance(atnums, (Integral, str)):
583584
atnums = [atnums]
584585
# Get atomic symbols/numbers from inputs
585-
atnums = [element_number(atom) for atom in atnums]
586-
atoms = [element_symbol(atom) for atom in atnums]
586+
atnums = [element_symbol_map[atom][ElementAttr.atnum] if isinstance(atom, str) else atom for atom in atnums]
587+
atoms = [atnum_to_symbol[atom] if isinstance(atom, Integral) else atom for atom in atnums]
587588

588589
# Handle default charge parameters
589590
if charges is None:

0 commit comments

Comments
 (0)