From 2a758935863b11faa0c0cb09548732a38a61e488 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Wed, 12 Jul 2017 09:01:52 +0200
Subject: [PATCH] test fixes

---
 .../at_time/test_rotor_name_null.dat           | Bin 0 -> 1663 bytes
 wetb/hawc2/tests/test_htc_file.py              |  17 ++++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 wetb/hawc2/tests/test_files/at_time/test_rotor_name_null.dat

diff --git a/wetb/hawc2/tests/test_files/at_time/test_rotor_name_null.dat b/wetb/hawc2/tests/test_files/at_time/test_rotor_name_null.dat
new file mode 100644
index 0000000000000000000000000000000000000000..778834e44e09c58137cbe825905a028add1013c5
GIT binary patch
literal 1663
zcmc&#J#Q2-5T%Zk|6u7#w3cT)<FV-=M1q2b0!nmJPU29KL%BWi_j&%<-GD@shP`U#
z=l5pbo7r<a_vP?(KAs-k$M^1y+nx_^zuxetcaGSrn}1yHUAn$<JNJ2icii8*(`Ej7
zncaSN^YP)(E^6@M`O~=iozr}Ja*z9m!ygi_Ui5(RMfd)F>Ay2xUv*zE=Wl1YwsZ5Z
z<9Y5`?A*=w)6-plL8WfEeET|tzh2l2BY=8Rf#gYI;oB*Yo5ZUGllI~&FeX`mI7@+I
z2a>l;fjd2bQIr-S`M`nu*%ZBzBwc~ZVjIv(&h4I?)W?vlmF23m8Mj-tMuwVlKLfC!
z-ncNTQppQr^d*@#0XHR|Qlzo~6Utbdfm)<Eq|Hkf>bI(vYFwq0&zfT=nX;Fl)YNKG
zsJ)-m8nf4!2FX+^a9H3X{GhNh!k#FhGQx1Ykmbrq4nPt~O{*uvteiTqcuE5ITb=-F
z*z6$$C3!F=Ulf!b$nYbVN-?rdFu8UOY4w~+S(C8@jt!V4gsRqtg3RJ(xJbX%lL;DH
zyZ}ZY6A$-cPn67SGYqv5s>cArV_33EQ!3i%J0o(k(G0^8{AyX%@Ibj$-<n~>tL+So
z<Wn#VZUYjM(WW(kS(6S%jJt6j&0vZxq_t}V6)p5IYSx6&>Z<_yM1AIJjnQ+E<}swz
z!w=B~sEW{P9UU0eY#0uDG6@S%L^mHJNMftMHN%h_TSy**x=l~?DCC)saHsArw?#IM
z&zdo+t2_)3Dp->SEa+O;Y8|~s4B%2Db_QwmuYtoT88X~}S#%i+gn`8#5sEL_kj%=M
nEw`maGXk}gw`8!%wT>a33l^%^m^}LI-zDd)|49JI*H^y*=_?9o

literal 0
HcmV?d00001

diff --git a/wetb/hawc2/tests/test_htc_file.py b/wetb/hawc2/tests/test_htc_file.py
index e96d3d16..0326807e 100644
--- a/wetb/hawc2/tests/test_htc_file.py
+++ b/wetb/hawc2/tests/test_htc_file.py
@@ -148,13 +148,12 @@ 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.10_g3.3_h0_4096x32x32_1.465x3.12x3.12_s0102u.turb;
-    filename_v\t./turb/mann_l30.1_ae1.10_g3.3_h0_4096x32x32_1.465x3.12x3.12_s0102v.turb;
-    filename_w\t./turb/mann_l30.1_ae1.10_g3.3_h0_4096x32x32_1.465x3.12x3.12_s0102w.turb;
-    box_dim_u\t4096 1.4652;
+    filename_u\t./turb/mann_l30.1_ae1.10_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102u.turb;
+    filename_v\t./turb/mann_l30.1_ae1.10_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102v.turb;
+    filename_w\t./turb/mann_l30.1_ae1.10_g3.3_h0_16384x32x32_0.366x3.12x3.12_s0102w.turb;
+    box_dim_u\t16384 0.3662;
     box_dim_v\t32 3.2258;
-    box_dim_w\t32 3.2258;
-    std_scaling\t1 0.8 0.5;"""
+    box_dim_w\t32 3.2258;"""
         for a, b in zip(s.split("\n"), str(htcfile.wind.mann).split("\n")):
             self.assertEqual(a.strip(), b.strip())
         self.assertEqual(htcfile.wind.turb_format[0], 1)
@@ -163,15 +162,15 @@ class TestHtcFile(unittest.TestCase):
     def test_add_turb_export(self):
         htc = HTCFile()
         htc.add_mann_turbulence(30.1, 1.1, 3.3, 102, False)
-        htc.set_time(100,700,0.02)
+        htc.set_time(100,700,0.01)
         htc.add_turb_export()
         s = """begin turb_export;
   filename_u\texport_u.turb;
   filename_v\texport_v.turb;
   filename_w\texport_w.turb;
-  samplefrq\t7;
+  samplefrq\t3;
   time_start\t100;
-  nsteps\t30000.0;
+  nsteps\t60000.0;
   box_dim_v\t32 3.2258;
   box_dim_w\t32 3.2258;
 end turb_export;"""
-- 
GitLab