summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlukelabrie2024-05-02 15:51:55 +0200
committerlukelabrie2024-05-02 15:51:55 +0200
commit5af3e24a410967a45cb01b8af85b57385b28adf6 (patch)
treeb158e7250d026c5d496da7599cb93c52971eb083
parent9b55e2a9d7dcec76640e3cb754b42376496b4e56 (diff)
downloadaur-5af3e24a410967a45cb01b8af85b57385b28adf6.tar.gz
accomodate python version that moab was build with
-rw-r--r--.SRCINFO2
-rwxr-xr-xPKGBUILD2
-rw-r--r--openmc.sh5
3 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6c0f4a4f510..a3e62f52dc89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openmc-git
pkgdesc = The OpenMC project aims to provide a fully-featured Monte Carlo particle transport code based on modern methods.
pkgver = v0.14.0.r5.g9830efaf2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/openmc-dev/openmc
install = post.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 6b04e66291af..bd8d7bffa13c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luke Labrie-Cleary <luke dot cleary at copenhagenatomics dot com>
pkgname=openmc-git
pkgver=v0.14.0.r5.g9830efaf2
-pkgrel=1
+pkgrel=2
pkgdesc="The OpenMC project aims to provide a fully-featured Monte Carlo particle
transport code based on modern methods."
arch=('x86_64')
diff --git a/openmc.sh b/openmc.sh
index 08de28ca7409..3844e92f79b3 100644
--- a/openmc.sh
+++ b/openmc.sh
@@ -1,11 +1,12 @@
# get variables
arch=$(uname -m)
-python_version=$(python -V 2>&1 | cut -d' ' -f2 | cut -d'.' -f1-2)
+moab_base_path="/opt/MOAB/lib/python"
+moab_python_version=$(ls /opt/MOAB/lib | grep -oP 'python\K\d+\.\d+' | head -n 1)
var=`echo /opt/nuclear-data/*hdf5 | head -n1`
# Define the paths
export_path="export PATH=\$PATH:/opt/openmc/bin"
-export_pythonpath="export PYTHONPATH=\$PYTHONPATH:/opt/MOAB/lib/python$python_version/site-packages"
+export_pythonpath="export PYTHONPATH=\$PYTHONPATH:/opt/MOAB/lib/python$moab_python_version/site-packages"
export_ld_library_path="export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/MOAB/lib"
export_openmc_cross_sections="export OPENMC_CROSS_SECTIONS=$var/cross_sections.xml"