From 00be8be8a969ef01c864065ab40151c168ae59e8 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Mon, 22 May 2017 14:01:08 +0200
Subject: [PATCH] radius_ac renamed to radius_curved_ac in at_time_file.py
---
wetb/hawc2/at_time_file.py | 2 +-
wetb/hawc2/bladeinfo.py | 2 +-
wetb/hawc2/mainbody.py | 2 +-
wetb/hawc2/tests/test_AtTimeFile.py | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/wetb/hawc2/at_time_file.py b/wetb/hawc2/at_time_file.py
index c84c75e..25de3b4 100644
--- a/wetb/hawc2/at_time_file.py
+++ b/wetb/hawc2/at_time_file.py
@@ -66,7 +66,7 @@ class AtTimeFile(object):
for column, att_name in enumerate(self.attribute_names):
setattr(self, att_name, func_factory(column))
- def radius_ac(self, radius=None):
+ def radius_curved_ac(self, radius=None):
"""Radius (curved distance) of aerodynamic calculation point(s)
Parameters
diff --git a/wetb/hawc2/bladeinfo.py b/wetb/hawc2/bladeinfo.py
index 43c97c5..0729243 100644
--- a/wetb/hawc2/bladeinfo.py
+++ b/wetb/hawc2/bladeinfo.py
@@ -76,7 +76,7 @@ class H2BladeInfo(BladeInfo, PCFile, AtTimeFile):
From at_time_filename
- attribute_names
- xxx(radius=None, curved_length=None) # xxx for each attribute name
- - radius_ac(radius=None) # Curved length of nearest/all aerodynamic calculation points
+ - radius_curved_ac(radius=None) # Curved length of nearest/all aerodynamic calculation points
From ST file
- radius_st(radius=None, mset=1, set=1)
diff --git a/wetb/hawc2/mainbody.py b/wetb/hawc2/mainbody.py
index 02f8979..0744294 100644
--- a/wetb/hawc2/mainbody.py
+++ b/wetb/hawc2/mainbody.py
@@ -126,7 +126,7 @@ class BladeData(object):
class Blade(MainBody, BladeData):
- def __init__(self, htc_filename, modelpath, blade_number=1):
+ def __init__(self, htc_filename, modelpath=None, blade_number=1):
self.htcfile = htcfile = HTCFile(htc_filename, modelpath)
diff --git a/wetb/hawc2/tests/test_AtTimeFile.py b/wetb/hawc2/tests/test_AtTimeFile.py
index 09573fd..e45e176 100644
--- a/wetb/hawc2/tests/test_AtTimeFile.py
+++ b/wetb/hawc2/tests/test_AtTimeFile.py
@@ -56,9 +56,9 @@ class TestAtTimeFile(unittest.TestCase):
def test_at_time_file_radius(self):
atfile = AtTimeFile(self.testfilepath + "at_time.dat")
- self.assertEqual(atfile.radius_ac()[12], 10.2505)
- self.assertEqual(atfile.radius_ac(10), 10.2505)
- self.assertEqual(atfile.radius_ac(10.5), 10.2505)
+ self.assertEqual(atfile.radius_curved_ac()[12], 10.2505)
+ self.assertEqual(atfile.radius_curved_ac(10), 10.2505)
+ self.assertEqual(atfile.radius_curved_ac(10.5), 10.2505)
if __name__ == "__main__":
#import sys;sys.argv = ['', 'Test.testName']
--
GitLab