Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quasi-RRHO Thermochemistry Analysis Module #2028

Merged
merged 40 commits into from
Aug 21, 2023
Merged
Changes from 4 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
1762e15
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Jun 10, 2021
dda14db
Linear molecules + units
Jun 11, 2021
0c1eed3
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Jun 14, 2021
5217e93
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Aug 4, 2021
2ff2dd1
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Mar 4, 2022
9bf5f12
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2022
ed81ba2
pylint debugging
Mar 4, 2022
83d6c41
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Mar 4, 2022
ba4edbe
Pylint fixing
Mar 5, 2022
793897a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 5, 2022
023ba48
black
Mar 7, 2022
76503f1
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Mar 7, 2022
80f2cc2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 7, 2022
8e6e005
black 22.1.0
Mar 7, 2022
d08a1ca
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Mar 7, 2022
e8a6a81
QuasiRRHO: edits
rkingsbury Mar 5, 2023
dcb07ef
QuasiRRHO: update tests
rkingsbury Mar 5, 2023
3437932
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Aug 1, 2023
61c0e73
Merge pull request #1 from rkingsbury/qrrho
Aug 1, 2023
e8aeecd
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Aug 1, 2023
8e8e256
pre-commit auto-fixes
pre-commit-ci[bot] Aug 1, 2023
aef77b1
Incorporating comments
Aug 1, 2023
b0dcb5c
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Aug 1, 2023
626ce1e
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Aug 1, 2023
b783de2
pre-commit
Aug 1, 2023
e6df7d9
Typos and doi
Aug 2, 2023
9420e6f
docs
Aug 2, 2023
54ed557
duecredit
Aug 2, 2023
0122859
pre-commit auto-fixes
pre-commit-ci[bot] Aug 2, 2023
b6fa300
Remove Concentration Correction
Aug 11, 2023
3e2a0cd
pre-commit auto-fixes
pre-commit-ci[bot] Aug 11, 2023
5963413
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Aug 21, 2023
e4cf61c
Changes to testing
Aug 21, 2023
f9ede66
pre-commit auto-fixes
pre-commit-ci[bot] Aug 21, 2023
e7cf9bf
Merge remote-tracking branch 'materialsproject/master' into readytoPR
Aug 21, 2023
06ad8e4
Merge remote-tracking branch 'origin/readytoPR' into readytoPR
Aug 21, 2023
9d2bcc9
add type hints and snake_case QuasiRRHO method names
janosh Aug 21, 2023
9232e5d
rename single-letter module-scoped vars
janosh Aug 21, 2023
02ac2c7
fix tests following method renaming
janosh Aug 21, 2023
f7d3fa7
add test_extreme_temperature_and_pressure() and test_get_avg_mom_iner…
janosh Aug 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pymatgen/analysis/quasirrho.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@
import scipy.constants as const

from pymatgen.core.units import kb as kb_ev
from pymatgen.util.due import Doi, due

if TYPE_CHECKING:
from pymatgen.core import Molecule
from pymatgen.io.gaussian import GaussianOutput
from pymatgen.io.qchem.outputs import QCOutput

# Define useful constants
kb = kb_ev * const.eV # Pymatgen kb [J/k]
kb = kb_ev * const.eV # Pymatgen kb [J/K]
c = const.speed_of_light * 100 # [cm/s]
h = const.h # Planck's constant [J.s]
R = const.R / const.calorie # Ideal gas constant [cal/mol/K]
Expand Down Expand Up @@ -83,7 +84,7 @@ class QuasiRRHO:
Attributes:
temp (float): Temperature [K]
press (float): Pressure [Pa]
conc (float): Solvent concentration [M]
conc (float): Solvent concentration. Assumes 1M unless specified [M]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add "Concentration correction is reference to a 1 M standard state."

v0 (float): Cutoff frequency for Quasi-RRHO method [1/cm]
entropy_quasiRRHO (float): Quasi-RRHO entropy [Ha/K]
entropy_ho (float): Total entropy calculated with a harmonic
Expand Down Expand Up @@ -177,6 +178,10 @@ def from_QCOutput(cls, output: QCOutput, **kwargs):

return cls(mol=mol, frequencies=frequencies, energy=elec_e, mult=mult, **kwargs)

@due.dcite(
Doi("10.1002/chem.201200497"),
description="Supramolecular Binding Thermodynamics by Dispersion-Corrected Density Functional Theory",
)
def _get_quasirrho_thermo(self, mol, mult, sigma_r, frequencies, elec_energy):
"""
Calculate Quasi-RRHO thermochemistry
Expand Down