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

feat/SOF-6973: use a single global template per executable #91

Open
wants to merge 37 commits into
base: epic/SOF-6011
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1f4712d
feat: prototype template for pw_scf
seankwarren Sep 22, 2023
8e2e25e
feat: espresso executables template migrated to global template approach
seankwarren Sep 25, 2023
5ae78ab
fix: hubbard DFT+U+V case covered
seankwarren Sep 26, 2023
4252638
chore: hubbard formatting
seankwarren Sep 26, 2023
3a05ad1
chore: formatting
seankwarren Sep 26, 2023
51d4569
chore: specify target dirs for yamllint
azech-hqs Sep 25, 2023
a8ab7e6
Merge branch 'dev' into feat/SOF-6973
seankwarren Sep 26, 2023
68490d9
chore: update template file extensions
seankwarren Oct 4, 2023
9c857a7
chore: context variables unified syntax
seankwarren Oct 4, 2023
ba4c53e
feat: contextProviders moved to flavor level and staticContext define…
seankwarren Oct 4, 2023
aa2e6a9
cleanup: espresso cleanup
seankwarren Oct 5, 2023
18bb060
chore: projwfc template
seankwarren Oct 5, 2023
eb7c102
chore: q2r executable updated
seankwarren Oct 5, 2023
a42e33b
feat: jupyter template/exec updated
seankwarren Oct 5, 2023
fe97c5b
feat: nwchem updated
seankwarren Oct 5, 2023
6d8febc
fix: nwchem executable updated
seankwarren Oct 5, 2023
e6d8ce9
chore: cleanup
seankwarren Oct 6, 2023
4bd9b33
chore: cleanup
seankwarren Oct 6, 2023
640ffc8
fix: update pw.x template file names
seankwarren Oct 6, 2023
79536b9
chore: nwchem and jupyter filenames aligned
seankwarren Oct 6, 2023
26cbb47
chore: update variable naming convention
seankwarren Oct 6, 2023
00a65e5
chore: template files renamed
seankwarren Oct 9, 2023
c915fa1
chore: lint fix
seankwarren Oct 9, 2023
b2004db
chore: fix lint
seankwarren Oct 9, 2023
275620f
chore: files named
seankwarren Oct 13, 2023
38de3b2
chore: names updated
seankwarren Oct 13, 2023
575a678
feat: pw.x requiredKeys updated based on prior per flavor input file …
seankwarren Oct 13, 2023
7ad99a0
feat: q2r requiredKeys updated
seankwarren Oct 13, 2023
3801b32
feat: projwfc requiredKeys updated
seankwarren Oct 13, 2023
561fb97
feat: pp required keys added
seankwarren Oct 13, 2023
3c8d849
feat: ph.x required keys added
seankwarren Oct 13, 2023
83449af
feat: neb required keys added
seankwarren Oct 13, 2023
690c052
feat: matdyn required keys added
seankwarren Oct 13, 2023
684cff8
feat: hp required keys added
seankwarren Oct 13, 2023
c6af22c
feat: gw requiredKeys added
seankwarren Oct 13, 2023
f76ef81
feat: epsilon requiredKeys added
seankwarren Oct 13, 2023
08d9936
feat: average, bands, and dos requiredKeys added
seankwarren Oct 13, 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
1 change: 1 addition & 0 deletions .github/workflows/cicd.yml
seankwarren marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
uses: ./actions/yaml/lint
with:
python-version: 3.8
targets: ./applications ./assets ./executables ./methods ./models ./templates

run-py-tests:
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions assets/espresso/bands.in
seankwarren marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
&BANDS
{%- for key, value in &BANDS %}
seankwarren marked this conversation as resolved.
Show resolved Hide resolved
{{ typeCast(key, value) }}
{%- endfor %}
/
7 changes: 0 additions & 7 deletions assets/espresso/bands.j2.in

This file was deleted.

5 changes: 5 additions & 0 deletions assets/espresso/dos.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
&DOS
{%- for key, value in &DOS %}
{{ typeCast(key, value) }}
{%- endfor %}
/
6 changes: 0 additions & 6 deletions assets/espresso/dos.j2.in

This file was deleted.

16 changes: 0 additions & 16 deletions assets/espresso/epsilon.j2.in

This file was deleted.

11 changes: 11 additions & 0 deletions assets/espresso/epsilon_x.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
&inputpp
seankwarren marked this conversation as resolved.
Show resolved Hide resolved
{%- for key, value in &inputpp %}
{{ typeCast(key, value) }}
{%- endfor %}
/

&energy_grid
{%- for key, value in &energy_grid %}
{{ typeCast(key, value) }}
{%- endfor %}
/
25 changes: 25 additions & 0 deletions assets/espresso/gw_bands.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
&gw_input
{%- for key, value in &gw_input %}
{{ typeCast(key, value) }}
{%- endfor %}
/

&gw_output
{%- for key, value in &gw_output %}
{{ typeCast(key, value) }}
{%- endfor %}
/

FREQUENCIES
{{ FREQUENCIES.length }}
{%- for arr in FREQUENCIES %}
{{arr[0] arr[1]}}
{%- endfor %}
/

K_points
{{ explicitKPath2PIBA.length }}
{% for point in explicitKPath2PIBA -%}
{% for coordinate in point.coordinates %}{{ coordinate }}{% endfor %}
{% endfor %}
/
75 changes: 0 additions & 75 deletions assets/espresso/gw_bands_full_frequency.j2.in

This file was deleted.

61 changes: 0 additions & 61 deletions assets/espresso/gw_bands_plasmon_pole.j2.in

This file was deleted.

5 changes: 5 additions & 0 deletions assets/espresso/hp.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
&inputhp
{%- for key, value in &inputhp %}
{{ typeCast(key, value) }}
{%- endfor %}
/
7 changes: 0 additions & 7 deletions assets/espresso/hp.j2.in

This file was deleted.

9 changes: 9 additions & 0 deletions assets/espresso/matdyn.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
&INPUT
{%- for key, value in &INPUT %}
{{ typeCast(key, value) }}
{%- endfor %}
/
{{ipath.length}}
{% for point in ipath -%}
{% for d in point.coordinates %}{{d}} {% endfor -%}{{point.steps}}
{% endfor %}
11 changes: 0 additions & 11 deletions assets/espresso/matdyn_grid.j2.in

This file was deleted.

11 changes: 0 additions & 11 deletions assets/espresso/matdyn_path.j2.in

This file was deleted.

60 changes: 60 additions & 0 deletions assets/espresso/neb.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
BEGIN
BEGIN_PATH_INPUT
&PATH
{%- for key, value in &PATH %}
{{ typeCast(key, value) }}
{%- endfor %}
/
END_PATH_INPUT
BEGIN_ENGINE_INPUT
&CONTROL
{%- for key, value in &CONTROL %}
{{ typeCast(key, value) }}
{%- endfor %}
/
&SYSTEM
{%- for key, value in &SYSTEM %}
{{ typeCast(key, value) }}
{%- endfor %}
/
&ELECTRONS
{%- for key, value in &ELECTRONS %}
{{ typeCast(key, value) }}
{%- endfor %}
/
ATOMIC_SPECIES
{% for species in ATOMIC_SPECIES -%}
{{species.X}} {{species.Mass_x}} {{species.PseudoPot_x}}
{% endfor -%}
BEGIN_POSITIONS
FIRST_IMAGE
ATOMIC_POSITIONS {{ATOMIC_POSITIONS.first.card_option}}
{% for position in ATOMIC_POSITIONS.first -%}
{{position.X}} {{position.x}} {{position.y}} {{position.z}} {% if 'if_pos(1)' in position -%} {{position["if_pos(1)"]}} {% endif -%} {% if 'if_pos(2)' in position -%} {{position["if_pos(2)"]}} {% endif -%} {% if 'if_pos(3)' in position -%} {{position["if_pos(3)"]}} {% endif %}
{% endfor -%}
INTERMEDIATE_IMAGE
ATOMIC_POSITIONS {{ATOMIC_POSITIONS.intermediate.card_option}}
{% for position in ATOMIC_POSITIONS.intermediate -%}
{{position.X}} {{position.x}} {{position.y}} {{position.z}} {% if 'if_pos(1)' in position -%} {{position["if_pos(1)"]}} {% endif -%} {% if 'if_pos(2)' in position -%} {{position["if_pos(2)"]}} {% endif -%} {% if 'if_pos(3)' in position -%} {{position["if_pos(3)"]}} {% endif %}
{% endfor -%}
LAST_IMAGE
ATOMIC_POSITIONS {{ATOMIC_POSITIONS.last.card_option}}
{% for position in ATOMIC_POSITIONS.last -%}
{{position.X}} {{position.x}} {{position.y}} {{position.z}} {% if 'if_pos(1)' in position -%} {{position["if_pos(1)"]}} {% endif -%} {% if 'if_pos(2)' in position -%} {{position["if_pos(2)"]}} {% endif -%} {% if 'if_pos(3)' in position -%} {{position["if_pos(3)"]}} {% endif %}
{% endfor -%}
END_POSITIONS
CELL_PARAMETERS {{CELL_PARAMETERS.card_option}}
{{CELL_PARAMETERS.v1[0]}} {{CELL_PARAMETERS.v1[1]}} {{CELL_PARAMETERS.v1[2]}}
{{CELL_PARAMETERS.v2[0]}} {{CELL_PARAMETERS.v2[1]}} {{CELL_PARAMETERS.v2[2]}}
{{CELL_PARAMETERS.v3[0]}} {{CELL_PARAMETERS.v3[1]}} {{CELL_PARAMETERS.v3[2]}}
K_POINTS automatic {{CELL_PARAMETERS.card_option}}
{% if K_POINTS.card_option == "automatic" %}{% for d in K_POINTS.kgrid.dimensions %}{{ d }} {% endfor %}{% for s in K_POINTS.kgrid.shifts %}{{ s }} {% endfor %}
{% elif K_POINTS.card_option in ["tpiba", "crystal", "tpiba_b", "crystal_b", "tpiba_c", "crystal_c"] %}
nks
{% for point in K_POINTS.points %}
{{ point.xk_x }} {{ point.xk_y }} {{ point.xk_z }} {{ point.wk }}
{% endfor %}
{% elif K_POINTS.card_option == "gamma" %}
{% endif %}
END_ENGINE_INPUT
END
57 changes: 0 additions & 57 deletions assets/espresso/neb.j2.in

This file was deleted.

Loading