-
Notifications
You must be signed in to change notification settings - Fork 14
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
Add Feature: XAS Plugin #580
Merged
Merged
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9b965f8
XAS: Add XAS Plugin
PNOGillespie 1d1f3e7
XAS: Refactor CH Pseudo System
PNOGillespie bc38545
XAS: Migrate CLS Pseudos Directory
PNOGillespie cc9785a
Merge remote-tracking branch 'origin/main' into xas_plugin
PNOGillespie a980dcf
XAS Plugin: Various Improvements
PNOGillespie ed59020
XAS: Fix for Pre-Commit Checks
PNOGillespie 3f6acbc
XAS: Fix Typo in `variable_broad_select_help`
PNOGillespie 9a9f162
`XAS`: Enable `supercell_min_parameter` and Clean Code
PNOGillespie 1b24462
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 57ceb0d
`XAS`: Move Pseudo Load to `setting.py` and clean code
PNOGillespie 3ac8b6e
Merge branch 'main' into xas_plugin
superstar54 cc963d4
fix set_panel_value
superstar54 b0a80ac
add test for xas app's setting panel
superstar54 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 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
This file contains 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,31 @@ | ||
from importlib import resources | ||
|
||
import yaml | ||
from aiidalab_widgets_base import ComputationalResourcesWidget | ||
|
||
from aiidalab_qe.common.panel import OutlinePanel | ||
from aiidalab_qe.plugins import xas as xas_folder | ||
|
||
from .result import Result | ||
from .setting import Setting | ||
from .workchain import workchain_and_builder | ||
|
||
PSEUDO_TOC = yaml.safe_load(resources.read_text(xas_folder, "pseudo_toc.yaml")) | ||
|
||
|
||
class XasOutline(OutlinePanel): | ||
title = "X-ray absorption spectroscopy (XAS)" | ||
help = """""" | ||
|
||
|
||
xs_code = ComputationalResourcesWidget( | ||
description="xspectra.x", default_calc_job_plugin="quantumespresso.xspectra" | ||
) | ||
|
||
xas = { | ||
"outline": XasOutline, | ||
"code": {"xspectra": xs_code}, | ||
"setting": Setting, | ||
"result": Result, | ||
"workchain": workchain_and_builder, | ||
} |
This file contains 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,26 @@ | ||
--- | ||
xas_xch_elements: [C, Li] | ||
pseudos: | ||
pbe: | ||
gipaw_pseudos: | ||
C: C.pbe-n-kjgipaw_psl.1.0.0.UPF | ||
Cu: Cu.pbe-n-van_gipaw.UPF | ||
F: F.pbe-gipaw_kj_no_hole.UPF | ||
Li: Li.pbe-s-rrkjus-gipaw.UPF | ||
O: O.pbe-n-kjpaw_gipaw.UPF | ||
Si: Si.pbe-van_gipaw.UPF | ||
core_wavefunction_data: | ||
C: C.pbe-n-kjgipaw_psl.1.0.0.dat | ||
Cu: Cu.pbe-n-van_gipaw.dat | ||
F: F.pbe-gipaw_kj_no_hole.dat | ||
Li: Li.pbe-s-rrkjus-gipaw.dat | ||
O: O.pbe-n-kjpaw_gipaw.dat | ||
Si: Si.pbe-van_gipaw.dat | ||
core_hole_pseudos: | ||
1s: | ||
C: C.star1s.pbe-n-kjgipaw_psl.1.0.0.UPF | ||
Cu: Cu.star1s-pbe-n-van_gipaw.UPF | ||
F: F.star1s-pbe-gipaw_kj.UPF | ||
Li: Li.star1s-pbe-s-rrkjus-gipaw-test_2.UPF | ||
O: O.star1s.pbe-n-kjpaw_gipaw.UPF | ||
Si: Si.star1s-pbe-van_gipaw.UPF |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to slow down the progress, is that possible to integrate this to
aiida-pseudo
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, I will say for this that the solution being used here is not necessarily intended as a permanent solution to providing pseudopotentials for these types of calculations. In principle, integrating some sort of family in
aiida-pseudo
for core-hole pseudopotentials is the ideal long-term objective here - since then the procedure for assigning pseudos obviously follows that of other plugins.The two issues I see with integrating the current library with
aiida-pseudo
are:Class
or other new feature will need to be made foraiida-pseudo
in order to work with these types of pseudopotentials: for instance to ensure the correct core wavefunction data file is matched to the correct GIPAW pseudo, also that the core-hole and GIPAW pseudos are matched correctly.I would be interested in your thoughts on this in any case @unkcpz.