From cfebbe67d04595b2534d1fab3a7b527694b26959 Mon Sep 17 00:00:00 2001
From: dave <dave@dtu.dk>
Date: Wed, 27 Apr 2016 15:41:46 +0200
Subject: [PATCH] prepost: 3 small fixes
---
wetb/prepost/dlcdefs.py | 1 +
wetb/prepost/dlcplots.py | 4 +---
wetb/prepost/dlctemplate.py | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py
index 78a96854..e7ef0a6a 100644
--- a/wetb/prepost/dlcdefs.py
+++ b/wetb/prepost/dlcdefs.py
@@ -208,6 +208,7 @@ def tags_defaults(master):
master.tags['[log_dir]'] = 'logfiles/'
master.tags['[meander_dir]'] = False
master.tags['[opt_dir]'] = False
+ master.tags['[pbs_in_dir]'] = 'pbs_in/'
master.tags['[pbs_out_dir]'] = 'pbs_out/'
master.tags['[res_dir]'] = 'res/'
master.tags['[iter_dir]'] = 'iter/'
diff --git a/wetb/prepost/dlcplots.py b/wetb/prepost/dlcplots.py
index 1d5b3e12..8594b90e 100644
--- a/wetb/prepost/dlcplots.py
+++ b/wetb/prepost/dlcplots.py
@@ -12,8 +12,6 @@ from builtins import str
from future import standard_library
standard_library.install_aliases()
-
-
#print(*objects, sep=' ', end='\n', file=sys.stdout)
import os
@@ -47,7 +45,7 @@ plt.rc('xtick', labelsize=10)
plt.rc('ytick', labelsize=10)
plt.rc('axes', labelsize=12)
# do not use tex on Gorm
-if not socket.gethostname()[:2] == 'g-':
+if not socket.gethostname()[:2] in ['g-', 'je']:
plt.rc('text', usetex=True)
plt.rc('legend', fontsize=11)
plt.rc('legend', numpoints=1)
diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py
index e96f57e1..da93eaee 100755
--- a/wetb/prepost/dlctemplate.py
+++ b/wetb/prepost/dlctemplate.py
@@ -243,6 +243,11 @@ def launch_dlcs_excel(sim_id, silent=False, verbose=False, pbs_turb=True,
silent=silent, verbose=verbose)
if pbs_turb:
+ # to avoid confusion and launching HAWC2 simulations and turbulence
+ # generator Mann64 at the same time, place PBS launch scripts in a
+ # different folder
+ for cname, case in cases.items():
+ case['[pbs_in_dir]'] = 'pbs_turb/'
mann64 = sim.ManTurb64(silent=silent)
mann64.gen_pbs(cases)
--
GitLab