diff --git a/form.yml b/form.yml
index 997fe6f..538fec8 100644
--- a/form.yml
+++ b/form.yml
@@ -1,6 +1,7 @@
---
cluster:
- "owens"
+ - "cardinal"
form:
- auto_modules_abaqus
- auto_accounts
@@ -38,16 +39,21 @@ attributes:
options:
- [
'any', 'any',
- data-max-num-cores: 28,
- data-min-num-cores: 1,
+ data-max-num-cores-for-cluster-owens: 28,
+ data-min-num-cores-for-cluster-owens: 1,
+ data-max-num-cores-for-cluster-cardinal: 48,
+ data-min-num-cores-for-cluster-cardinal: 1,
]
- [
'vis', 'vis',
- data-max-num-cores: 28,
- data-min-num-cores: 1,
+ data-max-num-cores-for-cluster-owens: 28,
+ data-min-num-cores-for-cluster-owens: 1,
+ data-max-num-cores-for-cluster-cardinal: 48,
+ data-min-num-cores-for-cluster-cardinal: 1,
]
- [
'hugemem', 'hugemem',
- data-max-num-cores: 48,
- data-min-num-cores: 4,
+ data-max-num-cores-for-cluster-owens: 48,
+ data-min-num-cores-for-cluster-owens: 4,
+ data-option-for-cluster-cardinal: false,
]
diff --git a/template/config/menus/xfce-applications.menu b/template/config/menus/xfce-applications.menu
new file mode 100644
index 0000000..2bbf6bd
--- /dev/null
+++ b/template/config/menus/xfce-applications.menu
@@ -0,0 +1,20 @@
+
+
+
diff --git a/template/config/xfce4/terminal/terminalrc b/template/config/xfce4/terminal/terminalrc
new file mode 100644
index 0000000..b705be2
--- /dev/null
+++ b/template/config/xfce4/terminal/terminalrc
@@ -0,0 +1,3 @@
+[Configuration]
+CommandLoginShell=TRUE
+FontName=DejaVu Sans Mono 11
diff --git a/template/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/template/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644
index 0000000..7ab1d6b
--- /dev/null
+++ b/template/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/template/fluxbox.rc.erb b/template/fluxbox.rc.erb
deleted file mode 100644
index 26ee0b3..0000000
--- a/template/fluxbox.rc.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-session.configVersion: 13
-session.screen0.toolbar.widthPercent: 60
-session.screen0.toolbar.tools: prevworkspace, workspacename, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
-session.menuFile: <%= session.staged_root.join("fluxbox", "menu") %>
-session.keyFile: <%= session.staged_root.join("fluxbox", "keys") %>
-session.styleOverlay: <%= session.staged_root.join("fluxbox", "overlay") %>
diff --git a/template/fluxbox/keys b/template/fluxbox/keys
deleted file mode 100644
index bf555cc..0000000
--- a/template/fluxbox/keys
+++ /dev/null
@@ -1,18 +0,0 @@
-# click on the desktop to get menus
-OnDesktop Mouse1 :HideMenus
-OnDesktop Mouse2 :WorkspaceMenu
-OnDesktop Mouse3 :RootMenu
-
-# left click on the titlebar to move the window
-OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab}
-OnTitlebar Move1 :StartMoving
-
-# right click on the titlebar for a menu of options
-OnTitlebar Mouse3 :WindowMenu
-
-# double click on the titlebar to maximize
-OnTitlebar Double Mouse1 :Maximize
-
-# resize from bottom left or right corners
-OnLeftGrip Move1 :StartResizing bottomleft
-OnRightGrip Move1 :StartResizing bottomright
diff --git a/template/fluxbox/menu b/template/fluxbox/menu
deleted file mode 100644
index 3d79c78..0000000
--- a/template/fluxbox/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-[begin] (OnDemand)
- [encoding] {UTF-8}
- [exec] (xterm) {xterm -fa 'Monospace' -fs 10}
- [exec] (top) {xterm -fa 'Monospace' -fs 10 -e top}
- [endencoding]
-[end]
diff --git a/template/fluxbox/overlay b/template/fluxbox/overlay
deleted file mode 100644
index bd4eb90..0000000
--- a/template/fluxbox/overlay
+++ /dev/null
@@ -1,8 +0,0 @@
-toolbar.height: 40
-toolbar.iconbar.focused.font: sans-12:bold
-toolbar.iconbar.unfocused.font: sans-12
-toolbar.clock.font: sans-12
-toolbar.workspace.font: sans-12:bold
-window.font: sans-12
-menu.title.font: sans-12
-menu.frame.font: sans-11
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 529c842..ed42c46 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -9,30 +9,41 @@ module purge
cd "${HOME}"
#
-# Launch Fluxbox
+# Launch Xfce Window Manager and Panel
#
+export SEND_256_COLORS_TO_REMOTE=1
+export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
+export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
+export XDG_CACHE_HOME="$(mktemp -d)"
+export $(dbus-launch)
-# Create Fluxbox root or it will override the below init file
-(
- umask 077
- mkdir -p "${HOME}/.fluxbox"
-)
-
-# Start the Fluxbox window manager (it likes to crash on occassion, make it
-# persistent)
-(
-until fluxbox -display "${DISPLAY}.0" -rc "<%= session.staged_root.join("fluxbox.rc") %>"; do
- echo "Fluxbox crashed with exit code $?. Respawning..." >&2
- sleep 1
- done
-) &
+module restore
+set -x
+
+source /etc/os-release
+
+if [[ "$VERSION_ID" < "9" ]]; then
+ xfwm4 --compositor=off --daemon --sm-client-disable
+ xsetroot -solid "#D3D3D3"
+ xfsettingsd --sm-client-disable
+ xfce4-panel --sm-client-disable &
+else
+ xfwm4 --compositor=off --sm-client-disable &
+ xsetroot -solid "#D3D3D3"
+ xfsettingsd --sm-client-disable &
+ xfce4-panel --sm-client-disable &
+fi
#
# Start Abaqus
#
# Load the required environment
+<%- if context.cluster == 'cardinal' -%>
+module load xalt/latest <%= context.auto_modules_abaqus %>
+<%- else -%>
module load xalt/latest intel/18.0.3 <%= context.auto_modules_abaqus %>
+<%- end -%>
# Output debug information
module list