Skip to content

Commit

Permalink
Auto modules (#24)
Browse files Browse the repository at this point in the history
use auto modules and auto accounts instead of having to specify everything.
  • Loading branch information
johrstrom authored Aug 4, 2023
1 parent 1b3fb9b commit dd73ba1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 28 deletions.
28 changes: 2 additions & 26 deletions form.yml.erb → form.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<%-
groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups|
groups.unshift(groups.delete(OodSupport::Process.group))
}.map(&:name).grep(/^P./)
-%>
---
cluster:
- "owens"
form:
- version
- account
- auto_modules_abaqus
- auto_accounts
- bc_num_hours
- num_cores
- bc_num_slots
Expand All @@ -27,13 +22,6 @@ attributes:
bc_num_slots: 1
bc_vnc_resolution:
required: true
account:
label: "Project"
widget: select
options:
<%- groups.each do |group| -%>
- "<%= group %>"
<%- end -%>
node_type:
widget: select
label: "Node type"
Expand Down Expand Up @@ -63,15 +51,3 @@ attributes:
data-max-num-cores: 48,
data-min-num-cores: 4,
]
version:
widget: select
label: "Abaqus/CAE version"
help: "This defines the version of Abaqus you want to load."
options:
- ["2022", "abaqus/2022"]
- ["2021", "abaqus/2021"]
- ["2020", "abaqus/2020"]
- ["2018", "abaqus/2018"]
- ["2017", "abaqus/2017"]
- ["2016", "abaqus/2016"]
- ["6.14", "abaqus/6.14"]
1 change: 0 additions & 1 deletion submit.yml.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
batch_connect:
template: "vnc"
script:
accounting_id: "<%= account %>"
native:
<%- slurm_args.each do |arg| %>
- "<%= arg %>"
Expand Down
2 changes: 1 addition & 1 deletion template/script.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ until fluxbox -display "${DISPLAY}.0" -rc "<%= session.staged_root.join("fluxbox
#

# Load the required environment
module load xalt/latest intel/18.0.3 <%= context.version %>
module load xalt/latest intel/18.0.3 <%= context.auto_modules_abaqus %>

# Output debug information
module list
Expand Down

0 comments on commit dd73ba1

Please sign in to comment.