From 93f9ddc1607033e58cf4dfef65eb5008d43c6236 Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Mon, 19 Aug 2024 11:55:39 -0400
Subject: [PATCH] support cardinal (#48)

---
 form.yml               | 31 ++++++++++++++++++++++++++-----
 template/script.sh.erb | 29 +++++++++++++++++++++--------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/form.yml b/form.yml
index a9ec6ea..6c30a15 100644
--- a/form.yml
+++ b/form.yml
@@ -1,6 +1,7 @@
 ---
 cluster:
   - "owens"
+  - "cardinal"
 form:
   - version
   - auto_accounts
@@ -64,17 +65,37 @@ attributes:
         'hugemem', 'hugemem',
         data-max-num-cores: 48,
         data-min-num-cores: 4,
+        data-option-for-cluster-ascend: false
         ]
   version:
     widget: select
     label: "ANSYS Workbench version"
     help: "This defines the version of ANSYS you want to load."
     options:
-    - [ "2023 R2", "ansys/2023R2" ]
-    - [ "2022 R2", "ansys/2022R2" ]
-    - [ "2022 R1", "ansys/2022R1" ]
-    - [ "2021 R2", "ansys/2021R2" ]
-    - [ "2021 R1", "ansys/2021R1" ]
+    - [
+        "2024 R1", "ansys/2024R1",
+        data-option-for-cluster-owens: false,
+      ]
+    - [
+        "2023 R2", "ansys/2023R2",
+        data-option-for-cluster-cardinal: false,
+      ]
+    - [
+        "2022 R2", "ansys/2022R2",
+        data-option-for-cluster-cardinal: false,
+      ]
+    - [
+        "2022 R1", "ansys/2022R1",
+        data-option-for-cluster-cardinal: false,
+      ]
+    - [
+        "2021 R2", "ansys/2021R2",
+        data-option-for-cluster-cardinal: false,
+      ]
+    - [
+        "2021 R1", "ansys/2021R1",
+        data-option-for-cluster-cardinal: false,
+      ]
   user_license_provider:
     widget: select
     label: "License provider"
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 9d71abc..edb04f2 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -11,19 +11,28 @@ cd "${HOME}"
 #
 # 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)
 
-(
-  module restore
-  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)
+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
-) &
+  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 ANSYS Workbench
@@ -102,7 +111,11 @@ export -n I_MPI_HYDRA_BOOTSTRAP_EXEC_EXTRA_ARGS
 
 # Launch ANSYS Workbench
 <%- if gpu -%>
+<%- if context.cluster == 'owens' -%>
 module load intel/16.0.3 virtualgl/2.6.3
+<%- else -%>
+module load virtualgl
+<%- end -%>
 module list
 set -x
 vglrun runwb2