From 7604411c338cf66fb2d93ddadc4d169ea0141345 Mon Sep 17 00:00:00 2001
From: dave <dave@dtu.dk>
Date: Mon, 10 Oct 2016 13:14:12 +0200
Subject: [PATCH] prepost.Simulations: use prelude instead of winefix attribute
with prepost.PBSScript
---
wetb/prepost/Simulations.py | 7 ++++---
.../tests/data/demo_dlc/ref/pbs_in_turb/turb_s100_10ms.p | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index 0bbc62c1..7c282ecd 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -5292,7 +5292,7 @@ class MannTurb64(prepost.PBSScript):
def __init__(self, silent=False):
super(MannTurb64, self).__init__()
self.exe = 'time wine mann_turb_x64.exe'
- self.winefix = 'wine winefix\n'
+ self.prelude += 'wine winefix\n'
# PBS configuration
self.umask = '0003'
self.walltime = '00:59:59'
@@ -5334,9 +5334,9 @@ class MannTurb64(prepost.PBSScript):
self.path_pbs_i = os.path.join(self.pbs_in_dir, base_name + '.p')
if case['[turb_db_dir]'] is not None:
- self.prelude = 'cd %s' % case['[turb_db_dir]']
+ self.prelude += 'cd %s' % case['[turb_db_dir]']
else:
- self.prelude = 'cd %s' % case['[turb_dir]']
+ self.prelude += 'cd %s' % case['[turb_dir]']
# alfaeps, L, gamma, seed, nr_u, nr_v, nr_w, du, dv, dw high_freq_comp
rpl = (float(case['[MannAlfaEpsilon]']),
@@ -5441,5 +5441,6 @@ def eigenstructure(cases, debug=False):
return cases
+
if __name__ == '__main__':
pass
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 d16fe92e..289577b9 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
@@ -26,6 +26,7 @@ echo "------------------------------------------------------------------------"
echo "PRELUDE"
echo "------------------------------------------------------------------------"
+wine winefix
cd ../turb/
echo ""
--
GitLab