-
Notifications
You must be signed in to change notification settings - Fork 4
SCI-505: Rework of van-der-Waals interaction models in DFT #160
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
Open
azech-hqs
wants to merge
9
commits into
dev
Choose a base branch
from
feature/SCI-505
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
42c1268
Merge branch 'dev' into epic/SCI-470
timurbazhirov 11d98b2
Merge branch 'dev' into epic/SCI-470
timurbazhirov e918d62
Merge branch 'feature/SOF-4119-TB' into epic/SCI-470
timurbazhirov 0b0189b
Merge branch 'dev' into epic/SCI-470
timurbazhirov 7a90385
Add empirical dispersion to atomistic category
azech-hqs c4f2591
Add list of DFT dispersion models with literature references
azech-hqs de1c455
Add explanation for model name abbreviations
azech-hqs e217018
Add XDM dispersion model + tests
azech-hqs 4f8702a
re-classify XDM into QM category
azech-hqs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"tier1": { | ||
"name": "physics-based", | ||
"slug": "pb" | ||
}, | ||
"tier2": { | ||
"name": "atomistic", | ||
"slug": "at" | ||
}, | ||
"tier3": { | ||
"name": "atomistic dispersion model", | ||
"slug": "disp" | ||
}, | ||
"type": { | ||
"name": "Empirical dispersion DFT-D", | ||
"slug": "empirical-dft-d" | ||
}, | ||
"subtype": { | ||
"name": "DFT-D3(0)", | ||
"slug": "dft-d3-0" | ||
}, | ||
"modifier": [ | ||
], | ||
"tags": [ | ||
], | ||
"method": { | ||
"...": "include(../../../../method.json)" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"tier1": { | ||
"name": "physics-based", | ||
"slug": "pb" | ||
}, | ||
"tier2": { | ||
"name": "quantum-mechanical", | ||
"slug": "qm" | ||
}, | ||
"tier3": { | ||
"name": "quantum-mechanical dispersion model", | ||
"slug": "disp" | ||
}, | ||
"type": { | ||
"name": "Exchange-Dipole Model", | ||
"slug": "exchange-dipole-model" | ||
}, | ||
"subtype": { | ||
"name": "XDM6", | ||
"slug": "xdm6" | ||
}, | ||
"modifier": [ | ||
], | ||
"tags": [ | ||
], | ||
"method": { | ||
"...": "include(../../../../method.json)" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
# | ||
# This file contains a collection of DFT dispersion corrections | ||
# (also known as "DFT methods for van-der-Waals interactions") | ||
# | ||
|
||
# --------------------------------------- | ||
# Non-local correlation functionals | ||
# (see also dft_unit_functionals section) | ||
# --------------------------------------- | ||
nlc_functionals: | ||
usage: intra-SCF | ||
- name: vdW-DF-04 by Langreth, Lundqvist, et al. | ||
slug: vdw-df-04 | ||
doi: | ||
- 10.1103/PhysRevLett.92.246401 | ||
- 10.1103/PhysRevLett.95.109902 | ||
- name: vdW-DF-10 by Lee, et al. (reparametrization of vdW-DF-04) | ||
slug: vdw-df-10 | ||
doi: 10.1103/PhysRevB.82.081101 | ||
- name: VV09 by Vydrov and Van Voorhis | ||
slug: vv09 | ||
doi: | ||
- 10.1103/PhysRevLett.103.063004 | ||
- 10.1063/1.3398840 | ||
- name: VV10 by Vydrov and Van Voorhis | ||
slug: vv10 | ||
doi: 10.1063/1.3521275 | ||
- name: rVV10 by Sabatini, et al. | ||
slug: rvv10 | ||
doi: 10.1103/PhysRevB.87.041108 | ||
# --------------------------------------- | ||
# Empirical dispersion models | ||
# --------------------------------------- | ||
empirical_dispersion: | ||
usage: post-SCF | ||
- name: DFT-D2 by Grimme | ||
slug: dft-d2 | ||
doi: 10.1002/jcc.20495 | ||
- name: DFT-CHG by Chai and Head-Gordon | ||
slug: dft-chg | ||
doi: 10.1039/b810189b | ||
- name: DFT-D3(0) by Grimme | ||
slug: dft-d3-0 | ||
doi: 10.1063/1.3382344 | ||
- name: DFT-D3(BJ) by Becke and Johnson | ||
slug: dft-d3-bj | ||
doi: 10.1002/jcc.21759 | ||
- name: DFT-D3(CSO) by Schröder et al. | ||
slug: dft-d3-cso | ||
doi: 10.1021/acs.jctc.5b00400 | ||
- name: DFT-D3M(BJ) reparametrized DFT-D3(BJ) by Smith et al. | ||
slug: dft-d3-bj-m | ||
doi: 10.1021/acs.jpclett.6b00780 | ||
- name: DFT-D3(op) optimized power approach by Witte et al. | ||
slug: dft-d3-op | ||
doi: 10.1021/acs.jctc.7b00176 | ||
# ------------------------------------------- | ||
# Exchange-Dipole Model (XDM) of Dispersion | ||
# ------------------------------------------- | ||
exchange_dipole: | ||
usage: post-SCF | ||
- name: XDM6 by Becke and Johnson | ||
slug: xdm6 | ||
doi: | ||
- 10.1063/1.1884601 | ||
- 10.1063/1.1949201 | ||
- name: XDM10 | ||
slug: xdm10 | ||
doi: 10.1063/1.1949201 | ||
# ---------------------------------------------------- | ||
# Tkatchenko-Scheffler van der Waals Model (TS-vdW) | ||
# ---------------------------------------------------- | ||
tkatchenko_scheffler: | ||
usage: post-SCF | ||
- name: Tkatchenko-Scheffler vdW model | ||
slug: ts_vdw | ||
doi: 10.1103/PhysRevLett.102.073005 | ||
# ----------------------------------------- | ||
# Many-Body Dispersion (MBD) Method | ||
# ----------------------------------------- | ||
many_body_dispersion: | ||
usage: post-SCF | ||
- name: MBD with range-separated self-consistent screening (MBD@rsSCS) | ||
slug: mbd-rsscs | ||
doi: 10.1063/1.4865104 | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"allOf": [ | ||
{ | ||
"$ref": "../pb.json" | ||
} | ||
], | ||
"properties": { | ||
"tier2": { | ||
"enum": [ | ||
{ | ||
"name": "atomistic", | ||
"slug": "at" | ||
} | ||
] | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"allOf": [ | ||
{ | ||
"$ref": "../at.json" | ||
} | ||
], | ||
"properties": { | ||
"tier3": { | ||
"enum": [ | ||
{ | ||
"name": "atomistic dispersion model", | ||
"slug": "disp" | ||
} | ||
] | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
{ | ||
"schemaId": "models-directory-at-disp-dft-d", | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"title": "Grimme-type empirical dispersion model for DFT (DFT-D)", | ||
"description": "Abbreviations taken from manifest/dft_dispersion.yaml", | ||
"allOf": [ | ||
{ | ||
"$ref": "../disp.json" | ||
} | ||
], | ||
"properties": { | ||
"type": { | ||
"enum": [ | ||
{ | ||
"name": "Empirical dispersion DFT-D", | ||
"slug": "empirical-dft-d" | ||
} | ||
] | ||
}, | ||
"subtype": { | ||
"enum": [ | ||
{ | ||
"name": "DFT-D2", | ||
"slug": "dft-d2" | ||
}, | ||
{ | ||
"name": "DFT-CHG", | ||
"slug": "dft-chg" | ||
}, | ||
{ | ||
"name": "DFT-D3(0)", | ||
"slug": "dft-d3-0" | ||
}, | ||
{ | ||
"name": "DFT-D3(BJ)", | ||
"slug": "dft-d3-bj" | ||
}, | ||
{ | ||
"name": "DFT-D3(CSO)", | ||
"slug": "dft-d3-cso" | ||
}, | ||
{ | ||
"name": "DFT-D3M(BJ)", | ||
"slug": "dft-d3-bj-m" | ||
}, | ||
{ | ||
"name": "DFT-D3(op)", | ||
"slug": "dft-d3-op" | ||
} | ||
] | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"allOf": [ | ||
{ | ||
"$ref": "../qm.json" | ||
} | ||
], | ||
"properties": { | ||
"tier3": { | ||
"enum": [ | ||
{ | ||
"name": "quantum-mechanical dispersion model", | ||
"slug": "disp" | ||
} | ||
] | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"schemaId": "models-directory-qm-disp-xdm", | ||
"$schema": "http://json-schema.org/draft-04/schema#", | ||
"title": "Exchange-Dipole Model (XDM)", | ||
"description": "See work by Becke and Johnson (doi: 10.1063/1.1884601)", | ||
"allOf": [ | ||
{ | ||
"$ref": "../disp.json" | ||
} | ||
], | ||
"properties": { | ||
"type": { | ||
"enum": [ | ||
{ | ||
"name": "Exchange-Dipole Model", | ||
"slug": "exchange-dipole-model" | ||
} | ||
] | ||
}, | ||
"subtype": { | ||
"description": "Whether C6 dispersion coefficient (XDM6) or higher-order coefficients are used", | ||
"enum": [ | ||
{ | ||
"name": "XDM6", | ||
"slug": "xdm6" | ||
}, | ||
{ | ||
"name": "XDM10", | ||
"slug": "xdm10" | ||
} | ||
] | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.