Skip to content

Commit cc0632f

Browse files
use full gga, gga+u, r2scan hull as default thermo type
1 parent a08a927 commit cc0632f

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

mp_api/client/mprester.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
from mp_api.client.core.client import _DictLikeAccess
6060

61-
DEFAULT_THERMOTYPE_CRITERIA = {"thermo_types": ["GGA_GGA+U"]}
61+
DEFAULT_THERMOTYPE_CRITERIA = {"thermo_types": ["GGA_GGA+U_R2SCAN"]}
6262

6363
RESTER_LAYOUT = {
6464
"molecules/core": LazyImport(
@@ -1032,7 +1032,7 @@ def get_entries_in_chemsys(
10321032
compatible_only: bool = True,
10331033
property_data: list[str] | None = None,
10341034
conventional_unit_cell: bool = False,
1035-
additional_criteria: dict = DEFAULT_THERMOTYPE_CRITERIA,
1035+
additional_criteria: dict | None = None,
10361036
**kwargs,
10371037
) -> list[ComputedStructureEntry] | list[GibbsComputedStructureEntry]:
10381038
"""Helper method to get a list of ComputedEntries in a chemical system.
@@ -1091,6 +1091,17 @@ def get_entries_in_chemsys(
10911091
for els in itertools.combinations(elements_set, i + 1)
10921092
]
10931093

1094+
if additional_criteria is None:
1095+
warnings.warn(
1096+
"The default thermo type in retrieving entries has been changed from "
1097+
"the mixed/corrected PBE GGA and GGA+U hull (`thermo_type = GGA_GGA+U`) "
1098+
"to the joint PBE GGA / GGA+U / r2SCAN hull (`thermo_type = GGA_GGA+U_R2SCAN`). "
1099+
"To use the older behavior, call `get_entries_in_chemsys` with "
1100+
'`additional_criteria = {"thermo_types": ["GGA_GGA+U"]}`',
1101+
category=MPRestWarning,
1102+
stacklevel=2,
1103+
)
1104+
10941105
entries = self.get_entries(
10951106
all_chemsyses,
10961107
compatible_only=compatible_only,

0 commit comments

Comments
 (0)