SOF-7435: merge main and resove conflicts

Exabyte-io · Sep 8, 2024 · 1c65272 · 1c65272
2 parents 7f72e1e + dd5d6f7
commit 1c65272
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 2 deletions.
diff --git a/assets/espresso/bands_spin_dn.j2.in b/assets/espresso/bands_spin_dn.j2.in
@@ -0,0 +1,8 @@
+&BANDS
+    prefix = '__prefix__'
+    outdir = {% raw %}'{{ JOB_WORK_DIR }}/outdir'{% endraw %}
+    filband = {% raw %}'{{ JOB_WORK_DIR }}/bands_dn.dat'{% endraw %}
+    spin_component = 2
+    no_overlap = .true.
+/
+
diff --git a/assets/espresso/bands_spin_up.j2.in b/assets/espresso/bands_spin_up.j2.in
@@ -0,0 +1,8 @@
+&BANDS
+    prefix = '__prefix__'
+    outdir = {% raw %}'{{ JOB_WORK_DIR }}/outdir'{% endraw %}
+    filband = {% raw %}'{{ JOB_WORK_DIR }}/bands_up.dat'{% endraw %}
+    spin_component = 1
+    no_overlap = .true.
+/
+
diff --git a/executables/espresso/bands.x.yml b/executables/espresso/bands.x.yml
@@ -10,3 +10,19 @@ flavors:
       - standard_output
     applicationName: espresso
     executableName: bands.x
+
+  bands_spin_up:
+    input:
+      - name: bands_spin_up.in
+    monitors:
+      - standard_output
+    applicationName: espresso
+    executableName: bands.x
+
+  bands_spin_dn:
+    input:
+      - name: bands_spin_dn.in
+    monitors:
+      - standard_output
+    applicationName: espresso
+    executableName: bands.x
diff --git a/src/js/data/templates.js b/src/js/data/templates.js
diff --git a/src/js/data/tree.js b/src/js/data/tree.js
diff --git a/templates/espresso/bands.x.yml b/templates/espresso/bands.x.yml
@@ -3,3 +3,15 @@
   contextProviders: []
   applicationName: espresso
   executableName: bands.x
+
+- content: !readFile 'assets/espresso/bands_spin_up.j2.in'
+  name: bands_spin_up.in
+  contextProviders: []
+  applicationName: espresso
+  executableName: bands.x
+
+- content: !readFile 'assets/espresso/bands_spin_dn.j2.in'
+  name: bands_spin_dn.in
+  contextProviders: []
+  applicationName: espresso
+  executableName: bands.x