From d837afdd379ff7743eba70fc06dd7e0df45cbfb1 Mon Sep 17 00:00:00 2001 From: dave <dave@dtu.dk> Date: Tue, 16 Aug 2016 14:07:19 +0200 Subject: [PATCH] prepost: change default tag names for Mann turbulence box generator --- wetb/prepost/Simulations.py | 6 +++--- wetb/prepost/dlctemplate.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py index 86a4afdb..9f80d335 100755 --- a/wetb/prepost/Simulations.py +++ b/wetb/prepost/Simulations.py @@ -5316,9 +5316,9 @@ class MannTurb64(prepost.PBSScript): 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['[AlfaEpsilon]']), - float(case['[L_mann]']), - float(case['[Gamma]']), + rpl = (float(case['[MannAlfaEpsilon]']), + float(case['[MannL]']), + float(case['[MannGamma]']), int(case['[tu_seed]']), int(case['[turb_nr_u]']), int(case['[turb_nr_v]']), diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py index 42d9a6cd..f604afef 100755 --- a/wetb/prepost/dlctemplate.py +++ b/wetb/prepost/dlctemplate.py @@ -118,9 +118,9 @@ def master_tags(sim_id, runmethod='local', silent=False, verbose=False): # master file with the HAWC2Wrapper !! # default tags turbulence generator (required for 64-bit Mann generator) # alfaeps, L, gamma, seed, nr_u, nr_v, nr_w, du, dv, dw high_freq_comp - master.tags['[AlfaEpsilon]'] = 1.0 - master.tags['[L_mann]'] = 29.4 - master.tags['[Gamma]'] = 3.0 + master.tags['[MannAlfaEpsilon]'] = 1.0 + master.tags['[MannL]'] = 29.4 + master.tags['[MannGamma]'] = 3.0 master.tags['[tu_seed]'] = 0 master.tags['[turb_nr_u]'] = 8192 master.tags['[turb_nr_v]'] = 32 -- GitLab