diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py index 78a968547c910f712d245ef27a1bfc30bc4211ec..e7ef0a6a43b75347d75473d136007016c6f3032c 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 1d5b3e12fd6703793139c665d6b62281b9cb694e..8594b90e0ab00a14f5d7ffe280178f0c00e4970c 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 e96f57e1ccf45253bf6ffacd434db0e69dceeb3b..da93eaee28179fbd7c572f1c3a2bed4e875aa0e3 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)