diff --git a/docs/getting-started-with-dlbs.md b/docs/getting-started-with-dlbs.md
index 7bf3d227bec56c450b96d8cbbac556dbf5d73eef..1994566db53a433907ac188a98437a683984ce44 100644
--- a/docs/getting-started-with-dlbs.md
+++ b/docs/getting-started-with-dlbs.md
@@ -102,10 +102,7 @@ $ source deactivate
This will create a subfolders DLCs and fill that new subfolder with the created
subordinate Excel files.
-##### 6. Move your DLCs.xlsx file from the htc folder to the ```_master``` folder.
-It will cause errors in later scripts if left in the htc folder.
-
-##### 7. Create your htc files and PBS job scripts .
+##### 6. Create your htc files and PBS job scripts .
These files and scripts are generated from the subordinate Excel files from
Step 5. To do this, in the terminal, change up a level to your Set ID folder
(e.g., to folder "AB0001"). Then run this code
@@ -117,7 +114,7 @@ $ qsub-wrap.py -f /home/MET/repositories/toolbox/WindEnergyToolbox/wetb/prepost/
Your htc files should now be placed in subfolders in the htc folder, and PBS
job files should be in folder ```pbs_in```.
-##### 8. Launch the htc files to the cluster.
+##### 7. Launch the htc files to the cluster.
Use the ```launch.py``` function to launch the jobs on the cluster.
For example, the following code will launch the jobs in folder ```pbs_in``` on
100 nodes. You must be in the top-level Set ID folder for this to work (e.g.,
@@ -136,7 +133,7 @@ help function to print available launch options:
$ launch.py --help
```
-##### 9. Post-process results.
+##### 8. Post-process results.
The wetb function ```qsub-wrap.py``` can not only generate htc files but also
post-process results. For example, here is code to check the log files
diff --git a/wetb/dlc/high_level.py b/wetb/dlc/high_level.py
index 418de910337dafd4fb557fdb99e75e126d8b1f27..0edfa43b109cd4eba748e6ba881f2a663129a525 100644
--- a/wetb/dlc/high_level.py
+++ b/wetb/dlc/high_level.py
@@ -231,10 +231,11 @@ class DLCHighLevel(object):
fatigue_dlcs = self.dlc_df[['F' in str(l).upper() for l in self.dlc_df['load']]]['dlc']
if len(fatigue_dlcs) == 0:
return {}
+ ext = getattr(self, 'res_ext', ".sel")
if isinstance(files, list):
pass
elif not hasattr(self, "res_folder") or self.res_folder == "":
- files = glob.glob(os.path.join(self.res_path, "*.sel")) + glob.glob(os.path.join(self.res_path, "*/*.sel"))
+ files = glob.glob(os.path.join(self.res_path, "*"+ext)) + glob.glob(os.path.join(self.res_path, "*/*"+ext))
else:
files = []
@@ -244,7 +245,7 @@ class DLCHighLevel(object):
folder = self.res_folder % dlc_id
else:
folder = self.res_folder
- files.extend(glob.glob(os.path.join(self.res_path , folder, "*.sel")))
+ files.extend(glob.glob(os.path.join(self.res_path , folder, "*"+ext)))
keys = list(zip(*self.dist_value_keys))[1]
fmt = self.format_tag_value
tags = [[fmt(tag.replace(key, "")) for tag, key in zip(os.path.basename(f).split("_"), keys)] for f in files]
diff --git a/wetb/dlc/tests/test_files/DLC_test_flex.xlsx b/wetb/dlc/tests/test_files/DLC_test_flex.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..cebcdd2ae3eeff59369e4a1950700f0679e3883a
Binary files /dev/null and b/wetb/dlc/tests/test_files/DLC_test_flex.xlsx differ
diff --git a/wetb/dlc/tests/test_files/res/dlc12_iec61400-1ed3/dlc12_wsp04_wdir350_s3001.int b/wetb/dlc/tests/test_files/res/dlc12_iec61400-1ed3/dlc12_wsp04_wdir350_s3001.int
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/wetb/dlc/tests/test_high_level.py b/wetb/dlc/tests/test_high_level.py
index 473e81bd6d36eb1adc54304b2d75ede8b0413fdc..1af3b13499867dcfe30c204e0d3a7bdeb295222d 100644
--- a/wetb/dlc/tests/test_high_level.py
+++ b/wetb/dlc/tests/test_high_level.py
@@ -56,6 +56,12 @@ class TestDLCHighLevel(unittest.TestCase):
self.assertEqual(os.path.abspath(f), os.path.abspath(testfilepath + 'res/dlc31_iec61400-1ed3/dlc31_wsp25_wdir000_s0000.sel'))
self.assertAlmostEqual(h, 0.0087201928 * 1 * (50 / 1100) * 20 * 365 * 24)
+ def test_file_dict_flex(self):
+ dlc_hl = DLCHighLevel(testfilepath + 'DLC_test_flex.xlsx')
+ file_lst = dlc_hl.files_dict()[12][4][350]["files"]
+ self.assertEqual(len(file_lst),1)
+ self.assertTrue(file_lst[0].endswith(".int"))
+
def test_dlc_lst(self):
self.assertEqual(self.dlc_hl.dlc_lst(), ['12', '13', '14', '31'])
diff --git a/wetb/fatigue_tools/fatigue.py b/wetb/fatigue_tools/fatigue.py
index 27b4c2c60d78ec0dce431704b7e1ff179632abf4..0aa87132fd3e5474d2cfda7b60c38fd8378ce0dd 100644
--- a/wetb/fatigue_tools/fatigue.py
+++ b/wetb/fatigue_tools/fatigue.py
@@ -94,7 +94,7 @@ def eq_load_and_cycles(signals, no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=[10 ** 6
eq_loads : array-like
List of lists of equivalent loads for the corresponding equivalent number(s) and Wohler exponents
cycles : array_like
- 2d array with shape = (no_ampl_bins, no_mean_bins)
+ 2d array with shape = (no_ampl_bins, 1)
ampl_bin_mean : array_like
mean amplitude of the bins
ampl_bin_edges
@@ -103,8 +103,8 @@ def eq_load_and_cycles(signals, no_bins=46, m=[3, 4, 6, 8, 10, 12], neq=[10 ** 6
cycles, ampl_bin_mean, ampl_bin_edges, _, _ = cycle_matrix(signals, no_bins, 1, rainflow_func)
if 0: #to be similar to windap
ampl_bin_mean = (ampl_bin_edges[:-1] + ampl_bin_edges[1:]) / 2
- cycles, ampl_bin_mean = cycles.flatten(), ampl_bin_mean.flatten()
- eq_loads = [[((np.sum(cycles * ampl_bin_mean ** _m) / _neq) ** (1. / _m)) for _m in np.atleast_1d(m)] for _neq in np.atleast_1d(neq)]
+ cycles, ampl_bin_mean = cycles.flatten(), ampl_bin_mean.flatten()
+ eq_loads = [[((np.nansum(cycles * ampl_bin_mean ** _m) / _neq) ** (1. / _m)) for _m in np.atleast_1d(m)] for _neq in np.atleast_1d(neq)]
return eq_loads, cycles, ampl_bin_mean, ampl_bin_edges
@@ -158,12 +158,9 @@ def cycle_matrix(signals, ampl_bins=10, mean_bins=10, rainflow_func=rainflow_win
cycles, ampl_edges, mean_edges = np.histogram2d(ampls, means, [ampl_bins, mean_bins], weights=weights)
ampl_bin_sum = np.histogram2d(ampls, means, [ampl_bins, mean_bins], weights=weights * ampls)[0]
- ampl_bin_mean = np.zeros_like(cycles)
- mask = (cycles > 0)
- ampl_bin_mean[mask] = ampl_bin_sum[mask] / cycles[mask]
+ ampl_bin_mean = np.nanmean(ampl_bin_sum / np.where(cycles,cycles,np.nan),1)
mean_bin_sum = np.histogram2d(ampls, means, [ampl_bins, mean_bins], weights=weights * means)[0]
- mean_bin_mean = np.zeros_like(cycles)+np.nan
- mean_bin_mean[cycles > 0] = mean_bin_sum[cycles > 0] / cycles[cycles > 0]
+ mean_bin_mean = np.nanmean(mean_bin_sum / np.where(cycles, cycles, np.nan), 1)
cycles = cycles / 2 # to get full cycles
return cycles, ampl_bin_mean, ampl_edges, mean_bin_mean, mean_edges
diff --git a/wetb/hawc2/ae_file.py b/wetb/hawc2/ae_file.py
index d3628fee19eebc8bc152588b7c572a703e01c179..1372bfc1efce3e5afcf2bc1505ac7435b3969f90 100644
--- a/wetb/hawc2/ae_file.py
+++ b/wetb/hawc2/ae_file.py
@@ -45,10 +45,10 @@ class AEFile(object):
def _value(self, radius, column, set_nr=1):
ae_data = self.ae_sets[set_nr]
- if radius:
- return np.interp(radius, ae_data[:, 0], ae_data[:, column])
- else:
+ if radius is None:
return ae_data[:,column]
+ else:
+ return np.interp(radius, ae_data[:, 0], ae_data[:, column])
def chord(self, radius=None, set_nr=1):
return self._value(radius, 1, set_nr)
diff --git a/wetb/hawc2/at_time_file.py b/wetb/hawc2/at_time_file.py
index c84c75e6fdd38bb6646aac366556b261e40744fa..3819ec2b37d0bf55d3aa7ff6e65ca258b2537fa6 100644
--- a/wetb/hawc2/at_time_file.py
+++ b/wetb/hawc2/at_time_file.py
@@ -17,11 +17,11 @@ class AtTimeFile(object):
"""Loads an at time file generated by HAWC2
Functions are generated for each sensor in the file from the template:
- xxx(radius=None, curved_length=None)
+ xxx(l=None, curved_length=False)
E.g.
- twist(radius=36) # Twist at radius 36m (Straight line radius, blade_radius must be specified in constructor)
- twist(curved_length=36) # Twist 36m from the root along the (curved) center line
+ twist(36, curved_length=True) # Twist 36m from the root along the (curved) center line
+ twist(36) # Twist at radius 36m (Straight line radius, nondim. with bladetip_radius which must be specified in constructor)
twist() # Twist at all aerodynamic calculation points
@@ -32,9 +32,9 @@ class AtTimeFile(object):
[-14.5 -14.5002 -14.5007]
>>> at.twist()[:3]) # Twist first 3 twist rows
[-14.5 -14.5002 -14.5007]
- >>> at.twist(curved_length=36) # Twist at curved_length = 10 (interpolated)
+ >>> at.twist(36, curved_length=True) # Twist at curved_length = 36 (interpolated)
-5.172195702789108
- >>> at.twist(radius=36) # Twist at curved_length = 10 (interpolated)
+ >>> at.twist(36) # Twist at radius = 36 (interpolated)
-5.162084567646019
"""
def __init__(self, filename, bladetip_radius=None):
@@ -49,24 +49,27 @@ class AtTimeFile(object):
self.blade_radius = bladetip_radius
with open(filename, encoding='utf-8') as fid:
lines = fid.readlines()
- self.attribute_names = lines[2].lower().replace("#", "").split()
- data = np.array([[float(l) for l in lines[i].split() ] for i in range(3, len(lines))])
+ atttribute_name_line = [l.startswith("# Radius_s") for l in lines].index(True)
+ self.attribute_names = lines[atttribute_name_line].lower().replace("#", "").split()
+ data = np.array([[float(l) for l in lines[i].split() ] for i in range(atttribute_name_line+1, len(lines))])
self.data = data
def func_factory(column):
- def values(radius=None, curved_length=None):
- assert radius is None or curved_length is None, "Specify either radius or curved_length"
- if radius is None and curved_length is None:
+ def values(l=None, curved_length=False):
+ assert curved_length==True or curved_length==False, "Curved length must be boolean, but is %s"%curved_length
+ if l is None:
return self.data[:, column]
- elif radius is not None:
- assert self.blade_radius is not None, "bladetip_radius must be specified in __init__ when requesting value of radius (alternatively you can request for curved_length)"
- return np.interp(radius/self.blade_radius, self.data[:, 0]/self.data[-1, 0], self.data[:, column])
else:
- return np.interp(curved_length, self.data[:, 0], self.data[:, column])
+ if curved_length:
+ return np.interp(l, self.data[:, 0], self.data[:, column])
+ else:
+ assert self.blade_radius is not None, "bladetip_radius must be specified in __init__ when requesting value of radius (alternatively you can request for curved_length)"
+ return np.interp(l/self.blade_radius, self.data[:, 0]/self.data[-1, 0], self.data[:, column])
+
return values
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
@@ -94,17 +97,10 @@ class AtTimeFile(object):
if __name__ == "__main__":
at = AtTimeFile(r"tests/test_files/at.dat", 86.3655) # load file
- print (at.attribute_names) # Attribute names
- print (at[:3,1]) # first 3 twist rows
- print (at.twist()[:3]) # first 3 twist rows
- print (at.twist(curved_length=36)) # Twist at curved_length = 10 (interpolated)
- print (at.twist(radius=36)) # Twist at curved_length = 10 (interpolated)
-
-# at = AtTimeFile(r"tests/test_files/at.dat", 86.3655)
-# print (at.attribute_names)
-# print (at.radius_s())
-# print (at.twist(curved_length=36))
-# print (at.chord(curved_length=36))
-# print (at.twist(curved_length=36))
-# print (at.twist(radius=36))
+ at.attribute_names # Attribute names
+ at[:3,1] # first 3 twist rows
+ at.twist()[:3] # Twist first 3 twist rows
+ print (at.twist(36, curved_length=True)) # Twist at curved_length = 36 (interpolated)
+ print (at.twist(36)) # Twist at 36 (interpolated)
+
diff --git a/wetb/hawc2/bladeinfo.py b/wetb/hawc2/bladeinfo.py
index 745685f31f1550761127592954c20890b2f658dc..12c1d4aa556aa99c6facaabe0a2609d1711a98ce 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)
@@ -93,7 +93,7 @@ class H2BladeInfo(BladeInfo, PCFile, AtTimeFile):
blade_name = blade_name or htcfile.aero.link[2]
s = htcfile.new_htc_structure
- at_time_filename = at_time_filename or os.path.join(htcfile.modelpath, htcfile.output_at_time.filename[0] + ".dat")
+ at_time_filename = at_time_filename or ("output_at_time" in htcfile and os.path.join(htcfile.modelpath, htcfile.output_at_time.filename[0] + ".dat"))
pc_filename = pc_filename or os.path.join(htcfile.modelpath, htcfile.aero.pc_filename[0])
ae_filename = ae_filename or os.path.join(htcfile.modelpath, htcfile.aero.ae_filename[0])
@@ -171,14 +171,35 @@ class H2BladeInfo(BladeInfo, PCFile, AtTimeFile):
x, y, z, twist = [coef2spline(curve_z_nd, akima(curve_z_nd, self.c2def[:, i])) for i in range(4)]
return x, y, z, twist
- def c2def_twist(self, radius=None):
- if radius is None:
+ def xyztwist(self, l=None, curved_length=False):
+ """Return splined x,y,z and twist
+
+ Parameters
+ ----------
+ l : int, float, arraylike or None, optional
+ Position of interest, seee curved_length\n
+ If None (default) all x, y, z, and twist defined in c2def
+ curved_length : bool, optional
+ - If False: l is z coordinate of section
+ - If True: l is curved length
+
+ Returns
+ -------
+ x,y,z,twist
+ """
+ if l is None:
return self.c2def[:, 3]
else:
- return np.interp(radius, self.c2def[:, 2], self.c2def[:, 3])
-
-
-
+ r_nd = np.linspace(0,1,100)
+ if curved_length:
+ curved_length = np.cumsum(np.sqrt((np.diff(self.c2nd(np.linspace(0,1,100)),1,0)[:,:3]**2).sum(1)))
+ assert np.all(l>=curved_length[0]) and np.all(l<=curved_length[-1])
+ return self.c2nd(r_nd[np.argmin(np.abs(curved_length-l))+1])
+ else:
+ assert np.all(l>=self.c2def[0,2]) and np.all(l<=self.c2def[-1,2])
+ return self.c2nd(l/self.c2def[-1, 2])
+
+
class H2aeroBladeInfo(H2BladeInfo):
def __init__(self, at_time_filename, ae_filename, pc_filename, htc_filename):
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 1c23189523a582029ac7679b47f75623a9d5e8f2..64456106b2ceb33eb1005cccd8fa906752119e3a 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -87,7 +87,7 @@ class HTCFile(HTCContents, HTCDefaults):
if filename is not None:
self.filename = filename
self.modelpath = modelpath or self.auto_detect_modelpath()
- if filename and not os.path.isabs(self.modelpath):
+ if filename and self.modelpath!="unknown" and not os.path.isabs(self.modelpath):
self.modelpath = os.path.realpath(os.path.join(os.path.dirname(self.filename), self.modelpath))
@@ -99,11 +99,14 @@ class HTCFile(HTCContents, HTCDefaults):
#print (["../"*i for i in range(3)])
import numpy as np
- found = ([np.sum([os.path.isfile(os.path.join(os.path.dirname(self.filename), "../"*i, f)) for f in self.input_files() if not os.path.isabs(f)]) for i in range(4)])
+ input_files = HTCFile(self.filename, 'unknown').input_files()
+ rel_input_files = [f for f in input_files if not os.path.isabs(f)]
+ found = ([np.sum([os.path.isfile(os.path.join(os.path.dirname(self.filename), "../"*i, f)) for f in rel_input_files]) for i in range(4)])
#for f in self.input_files():
# print (os.path.isfile(os.path.join(os.path.dirname(self.filename), "../",f)), f)
if max(found)>0:
- return "../"* np.argmax(found)
+ relpath = "../"* np.argmax(found)
+ return os.path.abspath(os.path.join(os.path.dirname(self.filename), relpath))
else:
raise ValueError("Modelpath cannot be autodetected for '%s'.\nInput files not found near htc file"%self.filename)
@@ -161,12 +164,15 @@ class HTCFile(HTCContents, HTCDefaults):
for l in lines:
if l.lower().lstrip().startswith('continue_in_file'):
filename = l.lstrip().split(";")[0][len("continue_in_file"):].strip().lower()
- filename = os.path.join(self.modelpath, filename)
-
- for line in self.readlines(filename):
- if line.lstrip().lower().startswith('exit'):
- break
- htc_lines.append(line)
+
+ if self.modelpath=='unknown':
+ self.htc_inputfiles.append(filename)
+ else:
+ filename = os.path.join(self.modelpath, filename)
+ for line in self.readlines(filename):
+ if line.lstrip().lower().startswith('exit'):
+ break
+ htc_lines.append(line)
else:
htc_lines.append(l)
return htc_lines
@@ -213,12 +219,15 @@ class HTCFile(HTCContents, HTCDefaults):
self.simulation.newmark.deltat = step
if start is not None:
self.output.time = start, stop
- if "wind" in self and self.wind.turb_format[0] > 0:
+ if "wind" in self:# and self.wind.turb_format[0] > 0:
self.wind.scale_time_start = start
def input_files(self):
self.contents # load if not loaded
- files = [os.path.abspath(f).replace("\\","/") for f in self.htc_inputfiles]
+ if self.modelpath=="unknown":
+ files = [f.replace("\\","/") for f in self.htc_inputfiles]
+ else:
+ files = [os.path.abspath(f).replace("\\","/") for f in self.htc_inputfiles]
if 'new_htc_structure' in self:
for mb in [self.new_htc_structure[mb] for mb in self.new_htc_structure.keys() if mb.startswith('main_body')]:
if "timoschenko_input" in mb:
diff --git a/wetb/hawc2/mainbody.py b/wetb/hawc2/mainbody.py
index 02f89796a012b53b74700399d2fa22840737dc1c..0744294d0b2aefb591f8ee0fd61776ea66ded8fe 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/simulation.py b/wetb/hawc2/simulation.py
index 387f2913c1dbbf81b514689451b182343303df4b..a5e4edfe82c4c2bfbf044a49e4aee7793c0301f2 100755
--- a/wetb/hawc2/simulation.py
+++ b/wetb/hawc2/simulation.py
@@ -100,7 +100,7 @@ class Simulation(object):
self.time_stop = self.htcFile.simulation.time_stop[0]
self.hawc2exe = hawc2exe
self.copy_turbulence = copy_turbulence
- self.simulation_id = (htcfilename + "_%d" % id(self)).replace("\\","/").replace("/", "_")
+ self.simulation_id = (htcfilename.replace("\\","/").replace("/", "_")[:50]+ "_%d" % id(self))
if self.simulation_id.startswith("input_"):
self.simulation_id = self.simulation_id[6:]
self.stdout_filename = fmt_path(os.path.join(os.path.relpath(self.exepath, self.modelpath),
diff --git a/wetb/hawc2/tests/test_AtTimeFile.py b/wetb/hawc2/tests/test_AtTimeFile.py
index 09573fd33ba82feb1f5dc5d52cc5ba1ec1ea0b21..d6ae0cf24f018976aa39e2726f88157303e2af64 100644
--- a/wetb/hawc2/tests/test_AtTimeFile.py
+++ b/wetb/hawc2/tests/test_AtTimeFile.py
@@ -28,8 +28,8 @@ class TestAtTimeFile(unittest.TestCase):
self.assertEqual(atfile.attribute_names, ['radius_s', 'twist', 'chord'])
np.testing.assert_array_equal(atfile[:3, 1], [ 0., -0.775186, -2.91652 ])
np.testing.assert_array_equal(atfile.twist()[:3], [ 0. , -0.775186 , -2.91652 ])
- self.assertAlmostEqual(atfile.twist(radius=10), -5.34743208242399) # Twist at radius = 10 (interpolated)
- self.assertEqual(atfile.twist(curved_length=10), -5.34743208242399) # Twist at radius = 10 (interpolated)
+ self.assertAlmostEqual(atfile.twist(10), -5.34743208242399) # Twist at radius = 10 (interpolated)
+ self.assertEqual(atfile.twist(10,curved_length=True), -5.34743208242399) # Twist at radius = 10 (interpolated)
@@ -43,22 +43,22 @@ class TestAtTimeFile(unittest.TestCase):
def test_at_time_file_at_curved_radius(self):
atfile = AtTimeFile(self.testfilepath + "at_time.dat")
- self.assertEqual(atfile.radius_s(curved_length=9), 9)
- self.assertEqual(atfile.twist(curved_length=9), -6.635983309665461)
- self.assertEqual(atfile.chord(curved_length=9), 1.3888996578373045)
+ self.assertEqual(atfile.radius_s(9, curved_length=True), 9)
+ self.assertEqual(atfile.twist(9, curved_length=True), -6.635983309665461)
+ self.assertEqual(atfile.chord(9, curved_length=True), 1.3888996578373045)
def test_at_time_file_at_radius(self):
atfile = AtTimeFile(self.testfilepath + "at_time.dat", bladetip_radius=20.501/2)
- self.assertEqual(atfile.radius_s(radius=9/2), 9)
- self.assertEqual(atfile.twist(radius=9/2), -6.635983309665461)
- self.assertEqual(atfile.chord(radius=9/2), 1.3888996578373045)
+ self.assertEqual(atfile.radius_s(9/2), 9)
+ self.assertEqual(atfile.twist(9/2), -6.635983309665461)
+ self.assertEqual(atfile.chord(9/2), 1.3888996578373045)
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']
diff --git a/wetb/hawc2/tests/test_files/htcfiles/sub/continue_in_file.htc b/wetb/hawc2/tests/test_files/htcfiles/sub/continue_in_file.htc
new file mode 100644
index 0000000000000000000000000000000000000000..f65c52419c10c0784cc184ea48e5c5f754c2035e
--- /dev/null
+++ b/wetb/hawc2/tests/test_files/htcfiles/sub/continue_in_file.htc
@@ -0,0 +1,519 @@
+begin Simulation; test
+ time_stop 10 ;
+ solvertype 1 ; (newmark)
+ on_no_convergence continue ;
+ convergence_limits 1E3 1.0 1E-7 ;
+ logfile ./log/oc4_p2_Load_case_3-1.log ;
+ animation ./anim/oc4_p2_Load_case_3-1.dat;
+;
+ begin newmark;
+ deltat 0.025;
+ end newmark;
+end simulation;
+;
+begin new_htc_structure;
+; beam_output_file_name ./log/oc4_p2_Load_case_3-1_beam.dat; Optional - Calculated beam properties of the bodies are written to file
+; body_output_file_name ./log/oc4_p2_Load_case_3-1_body.dat; Optional - Body initial position and orientation are written to file
+; struct_inertia_output_file_name ./log/oc4_p2_Load_case_3-1_struct.dat;
+; body_eigenanalysis_file_name ./oc4_load_case_1_1/oc4_p2_Load_case_3-1_body_eigen.dat;
+; structure_eigenanalysis_file_name ./oc4_load_case_1_1/oc4_p2_Load_case_3-1_strc_eigen.dat ;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+;
+ continue_in_file OC5_Phase_II.mbdy; Definition of substructure
+;
+ begin main_body;
+ name tower ;
+ type timoschenko ;
+ nbodies 1 ;
+ node_distribution c2_def;
+ ; concentrated_mass 1 0.0 0.0 0.0 125332 0.0 0.0 0.0 ; un-tuned values instrument mass 101762.00
+ concentrated_mass 1 0.0 0.0 0.0 87846 0.0 0.0 0.0 ; tuned values instrument mass
+ damping_posdef 0.0 0.0 0.0 0.86E-02 0.87E-02 4.3E-03 ;
+ gravity 9.80665;
+ begin timoschenko_input ;
+ filename ./data/OC5_5MW_st.txt ;
+ set 1 2 ; set subset
+ end timoschenko_input;
+ begin c2_def; Definition of centerline (main_body coordinates)
+ nsec 18 ;
+ sec 1 0 0 0 0 ;
+ sec 2 0 0 -0.312018 0 ;
+ sec 3 0 0 -0.313582 0 ;
+ sec 4 0 0 -8.601218 0 ;
+ sec 5 0 0 -8.602782 0 ;
+ sec 6 0 0 -11.651018 0 ;
+ sec 7 0 0 -11.652582 0 ;
+ sec 8 0 0 -12.354818 0 ;
+ sec 9 0 0 -12.356382 0 ;
+ sec 10 0 0 -72.177818 0 ;
+ sec 11 0 0 -72.179382 0 ;
+ sec 12 0 0 -73.429018 0 ;
+ sec 13 0 0 -73.430582 0 ;
+ sec 14 0 0 -74.054618 0 ;
+ sec 15 0 0 -74.056182 0 ;
+ sec 16 0 0 -74.993018 0 ;
+ sec 17 0 0 -74.994582 0 ;
+ sec 18 0 0 -78.2 0 ;
+ end c2_def ;
+ end main_body;
+;
+;
+ ; begin main_body;
+ ; name tow_dummy ; Dummy structure with other element coordinate than the tower, for output only
+ ; type timoschenko ;
+ ; nbodies 1 ;
+ ; node_distribution c2_def ;
+ ; damping_posdef 2.00E-05 2.00E-05 2.00E-04 3.00E-06 3.00E-06 2.00E-05;
+ ; gravity 9.80665;
+ ; begin timoschenko_input;
+ ; filename ./data/NREL_5MW_st.txt ;
+ ; set 4 2 ;
+ ; end timoschenko_input;
+ ; begin c2_def; Definition of centerline (main_body coordinates)
+ ; nsec 2;
+ ; sec 1 0.0 0.0 0.0 0.0 ; x,y,z,twist
+ ; sec 2 0.0 0.0 0.1 0.0 ;
+ ; end c2_def ;
+ ; end main_body;
+; ;
+ ; begin main_body;
+ ; name MC_dummy ; Dummy structure with other element coordinate than the tower, for output only
+ ; type timoschenko ;
+ ; nbodies 1 ;
+ ; node_distribution c2_def ;
+ ; damping_posdef 2.00E-05 2.00E-05 2.00E-04 3.00E-06 3.00E-06 2.00E-05;
+ ; gravity 9.80665;
+ ; begin timoschenko_input;
+ ; filename ./data/NREL_5MW_st.txt ;
+ ; set 4 2 ;
+ ; end timoschenko_input;
+ ; begin c2_def; Definition of centerline (main_body coordinates)
+ ; nsec 2;
+ ; sec 1 0.0 0.0 0.0 0.0 ; x,y,z,twist
+ ; sec 2 0.0 0.0 0.1 0.0 ;
+ ; end c2_def ;
+ ; end main_body;
+;
+ begin main_body;
+ name towertop ;
+ type timoschenko ;
+ nbodies 1 ;
+ node_distribution c2_def ;
+; damping_posdef 9.025E-06 9.025E-06 8.0E-05 8.3E-06 8.3E-06 8.5E-05 ;
+ damping_posdef 2.50E-04 1.40E-04 2.00E-03 3.00E-05 3.00E-05 2.00E-04 ;
+ concentrated_mass 1 0.0 -1.13 0.0 4.7790E+05 8.5004E+07 6.6413E+07 8.4394E+07; Nacelle mass and inertia
+ gravity 9.80665;
+ begin timoschenko_input;
+ filename ./data/NREL_5MW_st.txt ;
+ set 2 2 ;
+ end timoschenko_input;
+ begin c2_def; Definition of centerline (main_body coordinates)
+ nsec 2;
+ sec 1 0.0 0.0 0.0 0.0 ; x,y,z,twist
+ sec 2 0.0 0.0 -1.8 0.0 ;
+ end c2_def ;
+ end main_body;
+;
+ begin main_body;
+ name shaft ;
+ type timoschenko ;
+ nbodies 1 ;
+ node_distribution c2_def ;
+; damping_posdef 7.00E-3 7.00E-03 7.00E-02 3.48E-04 3.48E-04 1.156E-03 ;
+ damping_posdef 0.0 0.0 7.0725E-03 4.65E-04 4.65E-04 7.0725E-03 ; "tuned by Anyd 23/5/13 to 31.45 log decr. damping for free free with stiff rotor and tower"
+ gravity 9.80665;
+ begin timoschenko_input;
+ filename ./data/NREL_5MW_st.txt ;
+ set 3 2 ;
+ end timoschenko_input;
+ begin c2_def; Definition of centerline (main_body coordinates)
+ nsec 5;
+ sec 1 0.0 0.0 0.0 0.0 ; Tower top x,y,z,twist
+ sec 2 0.0 0.0 1.0 0.0 ;
+ sec 3 0.0 0.0 2.0 0.0 ;
+ sec 4 0.0 0.0 5.0 0.0 ; Main bearing
+ sec 5 0.0 0.0 10.6 0.0 ; Rotor centre
+ end c2_def ;
+ end main_body;
+;
+ begin main_body;
+ name hub1 ;
+ type timoschenko ;
+ nbodies 1 ;
+ node_distribution c2_def ;
+ damping_posdef 2.00E-05 2.00E-05 2.00E-04 3.00E-06 3.00E-06 2.00E-05;
+ gravity 9.80665;
+ begin timoschenko_input;
+ filename ./data/NREL_5MW_st.txt ;
+ set 4 1 ;
+ end timoschenko_input;
+ begin c2_def; Definition of centerline (main_body coordinates)
+ nsec 2;
+ sec 1 0.0 0.0 0.0 0.0 ; x,y,z,twist
+ sec 2 0.0 0.0 1.5 0.0 ;
+ end c2_def ;
+ end main_body;
+;
+ begin main_body;
+ name hub2 ;
+ copy_main_body hub1;
+ end main_body;
+;
+ begin main_body;
+ name hub3 ;
+ copy_main_body hub1 ;
+ end main_body;
+;
+ begin main_body;
+ name blade1 ;
+ type timoschenko ;
+ nbodies 1 ;
+ node_distribution c2_def;
+ concentrated_mass 7 0.0 0.0 2.004 2.2333E+4 0.0 0.0 0.0 ; Blade mass
+ concentrated_mass 1 0.0 0.0 0.0 0.0 5.46E+06 5.46E+06 0.0 ; Blade additional inertia
+ damping_posdef 0.0 0.0 0.0 1.41E-03 2.39E-03 4.5E-05 ; Mx My Mz Kx Ky Kz , M? raises overall level, K? raises high freguency level (3% log.decr with 9 bodies
+ begin timoschenko_input ;
+ filename ./data/OC5_5MW_st.txt ;
+ set 5 1 ; set subset
+ end timoschenko_input;
+ begin c2_def; Definition of centerline (main_body coordinates)
+ nsec 19 ;
+ sec 1 0 0 0 -50.377 ; x.y.z. twist
+ sec 2 0 0 1.398 -42.712 ;
+ sec 3 0 0 4.107 -31.187 ;
+ sec 4 0 0 6.816 -23.109 ;
+ sec 5 0 0 10.281 -16.389 ;
+ sec 6 0 0 14.376 -11.475 ;
+ sec 7 0 0 18.471 -8.502 ;
+ sec 8 0 0 22.566 -6.523 ;
+ sec 9 0 0 26.661 -5.052 ;
+ sec 10 0 0 30.756 -3.878 ; 50% blade radius
+ sec 11 0 0 34.851 -2.939 ;
+ sec 12 0 0 38.946 -2.216 ;
+ sec 13 0 0 43.041 -1.673 ;
+ sec 14 0 0 47.136 -1.245 ;
+ sec 15 0 0 51.231 -0.844 ;
+ sec 16 0 0 54.696 -0.497 ;
+ sec 17 0 0 57.405 -0.235 ;
+ sec 18 0 0 60.114 -0.064 ;
+ sec 19 0 0 61.5 0.0 ;
+ end c2_def ;
+ end main_body;
+;
+;
+ begin main_body;
+ name blade2 ;
+ copy_main_body blade1;
+ end main_body;
+;
+ begin main_body;
+ name blade3 ;
+ copy_main_body blade1 ;
+ end main_body;
+ ;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+; continue_in_file ./mooring_dynamic_init.inc ;
+; continue_in_file ./mooring_dynamic.inc;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+begin orientation;
+;----------------------------
+ continue_in_file ./orientation.dat;
+;----------------------------
+;
+ begin base;
+ body tower;
+ inipos 0.0 0.0 0.0 ; initial position of node 1
+ body_eulerang 0.0 0.0 0.0;
+ end base;
+;
+ ; begin relative;
+ ; body1 MC last;
+ ; body2 tower 1;
+ ; body2_eulerang 0.0 0.0 0.0;
+ ; end relative;
+; ;
+ ; begin relative;
+ ; body1 MC 8;
+ ; body2 MC_dummy 1;
+ ; body2_eulerang 0.0 0.0 0.0;
+ ; end relative;
+;
+ ; begin relative;
+ ; body1 tower 1;
+ ; body2 tow_dummy 1;
+ ; body2_eulerang 0.0 0.0 0.0;
+ ; end relative;
+;
+ begin relative;
+ body1 tower last;
+ body2 towertop 1;
+ body2_eulerang 0.0 0.0 0.0;
+ end relative;
+;
+ begin relative;
+ body1 towertop last;
+ body2 shaft 1;
+ body2_eulerang 90.0 0.0 0.0;
+ body2_eulerang 0.0 0.0 0.0; 0 deg tilt angle
+; body2_ini_rotvec_d1 0.0 0.0 -1.0 0.942477795 ; 12.1 rpm body initial rotation velocity x.y.z.angle velocity[rad/s] (body 2 coordinates)
+ end relative;
+;
+ begin relative;
+ body1 shaft last;
+ body2 hub1 1;
+ body2_eulerang -90.0 0.0 0.0;
+ body2_eulerang 0.0 180.0 0.0;
+ body2_eulerang 0.0 0.0 0.0; 0deg cone angle
+ end relative;
+;
+ begin relative;
+ body1 shaft last;
+ body2 hub2 1;
+ body2_eulerang -90.0 0.0 0.0;
+ body2_eulerang 0.0 60.0 0.0;
+ body2_eulerang 0.0 0.0 0.0; 0eg cone angle
+ end relative;
+;
+ begin relative;
+ body1 shaft last;
+ body2 hub3 1;
+ body2_eulerang -90.0 0.0 0.0;
+ body2_eulerang 0.0 -60.0 0.0;
+ body2_eulerang 0.0 0.0 0.0; 0deg cone angle
+ end relative;
+;
+ begin relative;
+ body1 hub1 last;
+ body2 blade1 1;
+ body2_eulerang 0.0 0.0 0;
+ end relative;
+;
+ begin relative;
+ body1 hub2 last;
+ body2 blade2 1;
+ body2_eulerang 0.0 0.0 0.0;
+ end relative;
+;
+ begin relative;
+ body1 hub3 last;
+ body2 blade3 1;
+ body2_eulerang 0.0 0.0 0.0;
+ end relative;
+;
+ end orientation;
+;---------------------------------------------------------------------------------------------------------------------------------------------------------------
+begin constraint;
+;---------------------------
+ continue_in_file ./constraint.dat;
+;---------------------------
+;
+ ; begin fix0;
+ ; mbdy tower;
+; ; disable_at ;
+ ; end fix0;
+;
+;--------------------------- constraints Turbine
+;
+ begin fix1;
+ mbdy1 MC last;
+ mbdy2 tower 1;
+ end fix1;
+;
+ ; begin fix1;
+ ; mbdy1 tower 1;
+ ; mbdy2 tow_dummy 1;
+ ; end fix1;
+;
+ ; begin fix1;
+ ; mbdy1 MC 8;
+ ; mbdy2 MC_dummy 1;
+ ; end fix1;
+;
+ begin fix1;
+ body1 tower last ;
+ body2 towertop 1;
+ end fix1;
+;
+ ; begin bearing1; free bearing
+ ; name shaft_rot;
+ ; body1 towertop last;
+ ; body2 shaft 1;
+ ; bearing_vector 2 0.0 0.0 -1.0; x=coo (0=global.1=body1.2=body2) vector in body2 coordinates where the free rotation is present
+ ; end bearing1;
+;
+ begin fix1; fixed rotor
+ body1 towertop last ;
+ body2 shaft 1;
+ end fix1;
+;
+ begin fix1;
+ body1 shaft last ;
+ body2 hub1 1;
+ end fix1;
+;
+ begin fix1;
+ body1 shaft last ;
+ body2 hub2 1;
+ end fix1;
+;
+ begin fix1;
+ body1 shaft last ;
+ body2 hub3 1;
+ end fix1;
+;
+ begin bearing2;
+ name pitch1;
+ body1 hub1 last;
+ body2 blade1 1;
+ bearing_vector 2 0.0 0.0 -1.0;
+ end bearing2;
+;
+ begin bearing2;
+ name pitch2;
+ body1 hub2 last;
+ body2 blade2 1;
+ bearing_vector 2 0.0 0.0 -1.0;
+ end bearing2;
+;
+ begin bearing2;
+ name pitch3;
+ body1 hub3 last;
+ body2 blade3 1;
+ bearing_vector 2 0.0 0.0 -1.0;
+ end bearing2;
+;
+; begin fix1;
+; body1 hub1 last ;
+; body2 blade1 1;
+; end fix1;
+;
+; begin fix1;
+; body1 hub2 last ;
+; body2 blade2 1;
+; end fix1;
+;
+; begin fix1;
+; body1 hub3 last ;
+; body2 blade3 1;
+; end fix1;
+;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+; continue_in_file ./mooring_constraints.inc ;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+end constraint;
+;
+end new_htc_structure;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------begin hydro;
+begin hydro;
+ begin water_properties;
+ rho 1025;
+ wave_direction 0 ;
+ gravity 9.80665;
+; current 2 0.5 0.1429 0; type, vel, alpha, current direction.
+ mwl 0.00;
+ mudlevel 200;
+ ; water_kinematics_dll ./wkin_dll.dll ./htc_hydro/reg_airy_h6_t10.inp;
+ end water_properties;
+ ;-------------------------------------------------------------
+; continue_in_file OC4_Phase_II_nw.hydro;
+ continue_in_file OC5_Phase_II.hydro;
+ ;-------------------------------------------------------------
+end hydro;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+; begin wind ;
+ ; density 1.225 ; to be checked
+ ; wsp 8 ;
+ ; tint 0;
+ ; horizontal_input 1 ; 0=false, 1=true
+ ; windfield_rotations 0.0 0.0 0.0 ; yaw, tilt, rotation
+ ; center_pos0 0.0 0.0 -90.0 ;
+ ; shear_format 1 0 ;0=none,1=constant,2=log,3=power,4=linear
+ ; turb_format 0 ; 0=none, 1=mann,2=flex
+ ; tower_shadow_method 3 ; 0=none, 1=potential flow, 2=jet
+ ; ; scale_time_start 350 ;
+; ;
+ ; ; begin mann;
+ ; ; filename_u ./turb/u.bin ;
+ ; ; filename_v ./turb/v.bin ;
+ ; ; filename_w ./turb/w.bin ;
+ ; ; box_dim_u 32768 ; ;
+ ; ; box_dim_v 64 3.125000119E+00;
+ ; ; box_dim_w 32 4.679999948E+00;
+ ; ; std_scaling 1.0 0.8 0.502 ;
+ ; ; end mann;
+; ;
+ ; begin tower_shadow_potential_2;
+ ; tower_mbdy_link tower;
+ ; nsec 4;
+ ; radius 0.0 1.683 ;
+ ; radius 12.09 1.683 ;
+ ; radius 12.1 1.27 ;
+ ; radius 78.2 1.27 ;
+ ; end tower_shadow_potential_2;
+; end wind;
+;
+;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+;
+; begin aero ;
+ ; nblades 3;
+ ; hub_vec shaft -3 ; rotor rotation vector (normally shaft composant directed from pressure to sustion side)
+ ; link 1 mbdy_c2_def blade1;
+ ; link 2 mbdy_c2_def blade2;
+ ; link 3 mbdy_c2_def blade3;
+ ; ae_filename ./data/OC5_5MW_ae.txt;
+ ; pc_filename ./data/OC5_5MW_pc.txt;
+ ; induction_method 1 ; 0=none, 1=normal
+ ; aerocalc_method 1 ; 0=ingen aerodynamic, 1=med aerodynamic
+ ; aerosections 30 ;
+ ; ae_sets 1 1 1;
+ ; tiploss_method 1 ; 0=none, 1=prandtl
+ ; dynstall_method 2 ; 0=none, 1=stig ??method,2=mhh method
+; end aero ;
+;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+;
+;----------------------------------------------------------------------------------------------------------------------------------------------------------------
+begin output;
+ filename ./res/oc4_p2_Load_case_eq ;
+;
+ ; data_format hawc_ascii;
+; time 350 410 ;
+ buffer 1 ;
+;
+ general time;---------- sensor 1 -----------
+ ; wind free_wind 1 0.0 0.0 -90.0; local wind at fixed position: coo (1=global,2=non-rotation rotor coo.), pos x, pos y, pos z ---------- sensor 2-4 -----------
+ hydro water_surface 0.0 0.0 ; x,y gl. pos ---------- sensor 5 -----------
+; general constant 0.0 ; sensor 6 - electrical power kW
+; general constant 0.0 ; sensor 7 - electrical generator torque kNm
+; general constant 0.0;Azimut Angle and angle velocity ---------- sensor 8-9
+; general constant 0.0;Azimut Angle and angle velocity ---------- sensor 8-9
+ ; constraint bearing1 shaft_rot 2; Azimut Angle and angle velocity ---------- sensor 8-9 -----------
+; general constant 0.0; generator high speed rpm
+ mbdy state pos blade1 18 1.0 hub1 only 2 # blade 1 tip pos ; ---------- sensor 11-12 -----------
+ mbdy state pos blade1 18 1.0 hub1 only 1 # blade 1 tip pos ; ---------- sensor 11-12 -----------
+ mbdy state_rot proj_ang blade1 18 1.0 blade1 only 3 # blade 1 tip twist ; ---------- sensor 13 -----------
+; constraint bearing2 pitch1 5 only 1; Blade1 pitch angle ---------- sensor 14 -----------
+ ; mbdy state pos towertop 1 1.0 tow_dummy # tower top flange position ; ---------- sensor 15-17-----------
+ ; mbdy state_rot proj_ang towertop 1 1.0 tow_dummy only 3 tower top twist ; ---------- sensor 13 -----------
+;
+; mbdy state pos MC 8 0.0 global # platform translation in surge sway and heave ; ---------- sensor 18-20-----------
+; mbdy state_rot proj_ang MC_dummy 1 0.0 global # platform rotation in roll pitch and yaw ; ---------- sensor 21-23 -----------
+;
+ mbdy forcevec hub1 1 2 hub1 # blade 1 root shear force and axial force ; ---------- sensor 24-26 -----------
+ mbdy momentvec hub1 1 2 hub1 # blade 1 root bending moment ; ---------- sensor 27-29 -----------
+ mbdy momentvec shaft 4 1 shaft # main bearing ; ---------- sensor 30-32 -----------
+ mbdy forcevec towertop 1 1 towertop # tower top shear force ; ---------- sensor 33-35 -----------
+ mbdy momentvec towertop 1 1 towertop # tower top bending moment ; ---------- sensor 36-38 -----------
+ mbdy forcevec tower 1 1 tower # tower base shear force ; ---------- sensor 39-41 -----------
+ mbdy momentvec tower 1 1 tower # tower base bending moment ; ---------- sensor 42-44 -----------
+ ; mbdy forcevec YU1 3 2 YU1 # tower base shear force ; ---------- sensor 45-47 -----------
+; mbdy forcevec DU1 1 2 DU1 # tower base shear force ; ---------- sensor 47-50 -----------
+;sensor 51-60 are mooring sensors
+ ; esys line1_1;
+ ; esys line1_3;
+ ; esys line2_1;
+ ; esys line2_3;
+ ; esys line3_1;
+ ; esys line3_3;
+end output;
+exit;
diff --git a/wetb/hawc2/tests/test_htc_file.py b/wetb/hawc2/tests/test_htc_file.py
index 5270c1b911f7f31e077be862dc1d73e56420df7e..e2237df20bafbe650a5834d9083c68236fc7605f 100644
--- a/wetb/hawc2/tests/test_htc_file.py
+++ b/wetb/hawc2/tests/test_htc_file.py
@@ -245,6 +245,15 @@ class TestHtcFile(unittest.TestCase):
self.assertEqual(str(htcfile).count("exit"), 1)
self.assertIn('filename\t./res/oc4_p2_load_case_eq;', str(htcfile))
+ def test_continue_in_files_autodetect_path(self):
+ htcfile = HTCFile(self.testfilepath + "sub/continue_in_file.htc")
+ self.assertIn('main_body__31', htcfile.new_htc_structure.keys())
+ self.assertIn(os.path.abspath(self.testfilepath + 'orientation.dat'), [os.path.abspath(f) for f in htcfile.input_files()])
+ self.assertIn('./data/NREL_5MW_st1.txt', htcfile.input_files())
+ self.assertEqual(str(htcfile).count("exit"), 1)
+ self.assertIn('filename\t./res/oc4_p2_load_case_eq;', str(htcfile))
+
+
def test_tjul_example(self):
htcfile = HTCFile(self.testfilepath + "./tjul.htc", ".")
htcfile.save("./temp.htc")
diff --git a/wetb/signal/__init__.py b/wetb/signal/__init__.py
index 42d8da654fe6b7fc28c9998298c8d8ef5c397ac5..57d5e281e4ae1495bf3f45e6025c04f049a673d5 100644
--- a/wetb/signal/__init__.py
+++ b/wetb/signal/__init__.py
@@ -3,7 +3,8 @@ d = None
d = dir()
from .interpolation import interpolate
-
+from .fit import *
+from .fix import *
__all__ = [m for m in set(dir()) - set(d)]
diff --git a/wetb/signal/filters/_despike.py b/wetb/signal/filters/_despike.py
index bdeb845295b753dae6445e753cb9a3485259167d..0a23195506262c4cd00e2d8fabf7f45317335317 100644
--- a/wetb/signal/filters/_despike.py
+++ b/wetb/signal/filters/_despike.py
@@ -33,8 +33,8 @@ def thresshold_finder(data, thresshold, plt=None):
def univeral_thresshold_finder(data, variation='mad', plt=None):
## Three variation measures in decreasing order of sensitivity to outliers
- variation = {'std': np.sqrt(np.mean((data - np.mean(data)) ** 2)), # standard deviation
- 'abs': np.mean(np.abs(data - np.mean(data))), # mean abs deviation
+ variation = {'std': np.nanstd(data), # standard deviation
+ 'abs': np.nanmean(np.abs(data - np.nanmean(data))), # mean abs deviation
'mad': nanmedian(np.abs(data - nanmedian(data))) # median abs deviation (mad)
}.get(variation, variation)
diff --git a/wetb/utils/caching.py b/wetb/utils/caching.py
index 1ca38d4bf4d77251898cfdd9921fbdb3c5828702..a4333a2b44aba2fd03bf7fdaff708b7754ab882e 100644
--- a/wetb/utils/caching.py
+++ b/wetb/utils/caching.py
@@ -9,6 +9,7 @@ from __future__ import division
from __future__ import absolute_import
from future import standard_library
import sys
+from collections import OrderedDict
standard_library.install_aliases()
import inspect
@@ -91,3 +92,18 @@ def cache_function(f):
raise AttributeError("Functions decorated with cache_function are not allowed to take a parameter called 'reload'")
return wrap
+class cache_method():
+ def __init__(self, N):
+ self.N = N
+ self.cache_dict = OrderedDict()
+
+ def __call__(self, f):
+ def wrapped(*args):
+ name = "_" + f.__name__
+ arg_id = ";".join([str(a) for a in args])
+ if arg_id not in self.cache_dict:
+ self.cache_dict[arg_id] = f(*args)
+ if len(self.cache_dict)>self.N:
+ self.cache_dict.popitem(last=False)
+ return self.cache_dict[arg_id]
+ return wrapped
\ No newline at end of file
diff --git a/wetb/utils/tests/test_caching.py b/wetb/utils/tests/test_caching.py
index ac529321356b3b26072364b2c9e64cc9576dfc5e..417087a1424374ee21c6770a5c56f0f9a5efeab1 100644
--- a/wetb/utils/tests/test_caching.py
+++ b/wetb/utils/tests/test_caching.py
@@ -8,6 +8,7 @@ from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from future import standard_library
+from collections import OrderedDict
standard_library.install_aliases()
import multiprocessing
import time
@@ -15,10 +16,12 @@ import unittest
from wetb.utils.timing import get_time
-from wetb.utils.caching import cache_function, set_cache_property
+from wetb.utils.caching import cache_function, set_cache_property, cache_method
import pdb
+
+
class Example(object):
def __init__(self, *args, **kwargs):
object.__init__(self, *args, **kwargs)
@@ -38,6 +41,16 @@ class Example(object):
def prop(self, prop):
return getattr(self, prop)
+
+ @cache_method(2)
+ def test_cache_method1(self, x):
+ time.sleep(1)
+ return x
+
+ @cache_method(2)
+ def test_cache_method2(self, x):
+ time.sleep(1)
+ return x*2
@@ -52,14 +65,14 @@ class TestCacheProperty(unittest.TestCase):
e = Example()
self.assertAlmostEqual(e.prop("test")[1], 1, 1)
self.assertAlmostEqual(e.prop("test")[1], 0, 2)
-
+
def testcache_property_pool(self):
e = Example()
e.prop("pool") #load pool
self.assertAlmostEqual(e.prop("pool")[1], 0, places=4)
#print (get_time(e.pool.map)(f, range(10)))
-
-
+
+
def test_cache_function(self):
e = Example()
self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 1, places=1)
@@ -68,11 +81,24 @@ class TestCacheProperty(unittest.TestCase):
self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 0, places=1)
e.clear_cache()
self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 1, places=1)
+
-
-
-
-
+ def test_cache_function_with_arguments(self):
+ e = Example()
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(3)[1], 1, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(3)[1], 0, places=1)
+ self.assertEqual(e.test_cache_method1(3), 3)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(4)[1], 1, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(3)[1], 0, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(4)[1], 0, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(5)[1], 1, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(4)[1], 0, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(5)[1], 0, places=1)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(3)[1], 1, places=1)
+ self.assertEqual(e.test_cache_method2(3), 6)
+ self.assertEqual(e.test_cache_method1(3), 3)
+ self.assertEqual(e.test_cache_method1(5), 5)
+ self.assertAlmostEqual(get_time(e.test_cache_method1)(5)[1], 0, places=1)
if __name__ == "__main__":
#import sys;sys.argv = ['', 'Test.testName']
unittest.main()
diff --git a/wetb/wind/__init__.py b/wetb/wind/__init__.py
index ae17e9a567028038ec2029f25b2abf6d80ffa4ee..36e41c9b930343edb20812e3aec44c8150e52fc0 100644
--- a/wetb/wind/__init__.py
+++ b/wetb/wind/__init__.py
@@ -1 +1 @@
-from .turbulence import *
\ No newline at end of file
+from .turbulence import *