From de0442c64cb53affa9645936368694c0621cfa60 Mon Sep 17 00:00:00 2001 From: "Mads M. Pedersen" <mmpe@dtu.dk> Date: Fri, 21 Mar 2025 14:31:54 +0100 Subject: [PATCH] fix dxyz in filename of add_mann_turbulence --- wetb/hawc2/htc_extensions.py | 2 +- wetb/hawc2/tests/test_htc_file.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wetb/hawc2/htc_extensions.py b/wetb/hawc2/htc_extensions.py index b585503e..644ac8fb 100644 --- a/wetb/hawc2/htc_extensions.py +++ b/wetb/hawc2/htc_extensions.py @@ -55,7 +55,7 @@ class HTCDefaults(object): if filenames is None: import numpy as np - dxyz = tuple(np.array(box_dimension) / (np.array(no_grid_points) - 1)) + dxyz = tuple(np.array(box_dimension) / np.array(no_grid_points)) from wetb.wind.turbulence import mann_turbulence filenames = ["./turb/" + mann_turbulence.name_format % ((L, ae23, Gamma, high_frq_compensation) + no_grid_points + dxyz + (seed, uvw)) diff --git a/wetb/hawc2/tests/test_htc_file.py b/wetb/hawc2/tests/test_htc_file.py index d6b06e2a..f3fd1afb 100644 --- a/wetb/hawc2/tests/test_htc_file.py +++ b/wetb/hawc2/tests/test_htc_file.py @@ -159,9 +159,9 @@ class TestHtcFile(unittest.TestCase): htcfile.add_mann_turbulence(30.1, 1.1, 3.3, 102, False) s = """begin mann; create_turb_parameters\t30.1 1.1 3.3 102 0;\tL, alfaeps, gamma, seed, highfrq compensation - filename_u\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.23x3.23_s0102u.turb; - filename_v\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.23x3.23_s0102v.turb; - filename_w\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.23x3.23_s0102w.turb; + filename_u\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102u.turb; + filename_v\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102v.turb; + filename_w\t./turb/mann_l30.1_ae1.1000_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102w.turb; box_dim_u\t16384 0.3662; box_dim_v\t32 3.125; box_dim_w\t32 3.125;""" -- GitLab