From 87a4d910ee9894004c30ee49e6252c42de6e4e67 Mon Sep 17 00:00:00 2001
From: David Robert Verelst <dave@dtu.dk>
Date: Mon, 3 Apr 2017 18:37:22 +0200
Subject: [PATCH] prepost.Simulations: force wine win64 mode for MannTurb64 PBS
scripts
---
wetb/prepost/Simulations.py | 2 +-
.../tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p | 2 +-
.../tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index f17905e0..a7edd8a1 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -5389,7 +5389,7 @@ class MannTurb64(prepost.PBSScript):
def __init__(self, silent=False):
super(MannTurb64, self).__init__()
- self.exe = 'time wine mann_turb_x64.exe'
+ self.exe = 'time WINEARCH=win64 WINEPREFIX=~/.wine wine mann_turb_x64.exe'
self.winefix = 'winefix\n'
# PBS configuration
self.umask = '0003'
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p
index 79b15e56..995b9af1 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p
@@ -35,7 +35,7 @@ echo "------------------------------------------------------------------------"
echo "EXECUTION"
echo "------------------------------------------------------------------------"
-time wine mann_turb_x64.exe turb_s100_10ms 1.000000 29.400000 3.000000 100 8192 32 32 0.7812 6.5000 6.5000 1
+time WINEARCH=win64 WINEPREFIX=~/.wine wine mann_turb_x64.exe turb_s100_10ms 1.000000 29.400000 3.000000 100 8192 32 32 0.7812 6.5000 6.5000 1
### wait for jobs to finish
wait
diff --git a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p
index 7997dc29..6372504d 100644
--- a/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p
+++ b/wetb/prepost/tests/data/demo_dlc/ref/pbs_in_turb/turb_s101_11ms.p
@@ -35,7 +35,7 @@ echo "------------------------------------------------------------------------"
echo "EXECUTION"
echo "------------------------------------------------------------------------"
-time wine mann_turb_x64.exe turb_s101_11ms 1.000000 29.400000 3.000000 100 8192 32 32 0.8594 6.5000 6.5000 1
+time WINEARCH=win64 WINEPREFIX=~/.wine wine mann_turb_x64.exe turb_s101_11ms 1.000000 29.400000 3.000000 100 8192 32 32 0.8594 6.5000 6.5000 1
### wait for jobs to finish
wait
--
GitLab