radius_ac renamed to radius_curved_ac in at_time_file.py

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

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)

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)
         

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']