diff --git a/.gitignore b/.gitignore
index 1e37b3381e243aacfcddd94599c6055bfa310ede..af0eb9b0f50b99777d739b1669678d00d450e3be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,7 @@ wetb/prepost/tests/data/demo_dlc/remote*
/wetb/fatigue_tools/rainflowcounting/compile.py
/docs/api
/htmlcov
+wetb/fatigue_tools/rainflowcounting/pair_range.c
+wetb/fatigue_tools/rainflowcounting/peak_trough.c
+wetb/fatigue_tools/rainflowcounting/rainflowcount_astm.c
+wetb/signal/filters/cy_filters.c
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a510aab648f45657254307a706f8cec5833869ea..c64b0da6d41da5f89a4c50e478644de73d370f07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,5 +11,7 @@ test-3.4:
image: mmpe/wetb
script:
#- python3 setup.py test
+ - pip3 install pytest
- python3 -m pytest --cov=wetb
-
+ tags:
+ - python
diff --git a/wetb/gtsdf/gtsdf.py b/wetb/gtsdf/gtsdf.py
index 859545bc05a1c1a453540ad2083bcc40802d88c4..04edb5573055ec4325fef0c8bc8b9781de2cfc7d 100644
--- a/wetb/gtsdf/gtsdf.py
+++ b/wetb/gtsdf/gtsdf.py
@@ -3,7 +3,6 @@ from builtins import zip
from builtins import range
from builtins import str
from future import standard_library
-from wetb.fatigue_tools.fatigue import eq_load
standard_library.install_aliases()
import warnings
from wetb.gtsdf.unix_time import from_unix
@@ -430,6 +429,7 @@ def _get_statistic(time, data, statistics=['min','mean','max','std','eq3','eq4',
if hasattr(np, stat):
return getattr(np,stat)(data,0)
elif (stat.startswith("eq") and stat[2:].isdigit()):
+ from wetb.fatigue_tools.fatigue import eq_load
m = float(stat[2:])
return [eq_load(sensor, 46, m, time[-1]-time[0]+time[1]-time[0])[0][0] for sensor in data.T]
return np.array([get_stat(stat) for stat in statistics]).T
diff --git a/wetb/hawc2/Hawc2io.py b/wetb/hawc2/Hawc2io.py
index d295f6762f93b4b71bff977d22af8401a16f6080..0984b18ba6eb24a6c85887d0ada1e8aa257bde59 100644
--- a/wetb/hawc2/Hawc2io.py
+++ b/wetb/hawc2/Hawc2io.py
@@ -77,6 +77,8 @@ class ReadHawc2(object):
"""
# read *.sel hawc2 output file for result info
+ if self.FileName.lower().endswith('.sel'):
+ self.FileName = self.FileName[:-4]
fid = opent(self.FileName + '.sel', 'r')
Lines = fid.readlines()
fid.close()
@@ -138,7 +140,7 @@ class ReadHawc2(object):
self.Freq = 1 / temp[1];
self.ScaleFactor = np.fromfile(fid, 'f', self.NrCh)
fid.seek(2 * 4 * self.NrCh + 48 * 2)
- self.NrSc = len(np.fromfile(fid, 'int16')) / self.NrCh
+ self.NrSc = int(len(np.fromfile(fid, 'int16')) / self.NrCh)
self.Time = self.NrSc * temp[1]
self.t = np.arange(0, self.Time, temp[1])
fid.close()
@@ -150,13 +152,14 @@ class ReadHawc2(object):
self.Iknown = [] # to keep track of what has been read all ready
self.Data = np.zeros(0)
self.alias = {}
- if os.path.isfile(FileName + ".sel"):
- self._ReadSelFile()
- elif os.path.isfile(self.FileName + ".int"):
- self.FileFormat = 'FLEX'
- self._ReadSensorFile()
- elif os.path.isfile(self.FileName + ".hdf5"):
+ if FileName.lower().endswith('.sel') or os.path.isfile(FileName + ".sel"):
+ self._ReadSelFile()
+ elif FileName.lower().endswith('.int') or os.path.isfile(self.FileName + ".int"):
+ self.FileFormat = 'FLEX'
+ self._ReadSensorFile()
+ elif FileName.lower().endswith('.hdf5') or os.path.isfile(self.FileName + ".hdf5"):
self.FileFormat = 'GTSDF'
+ self.ReadGtsdf()
else:
print ("unknown file: " + FileName)
################################################################################
@@ -193,15 +196,16 @@ class ReadHawc2(object):
# Read results in GTSD format
def ReadGtsdf(self):
self.t, data, info = gtsdf.load(self.FileName + '.hdf5')
- self.Time = self.t[-1]
- self.ChInfo = [info['attribute_names'],
- info['attribute_units'],
- info['attribute_descriptions']]
- self.NrCh = data.shape[1]
+ self.Time = self.t
+ self.ChInfo = [['Time'] + info['attribute_names'],
+ ['s'] + info['attribute_units'],
+ ['Time'] + info['attribute_descriptions']]
+ self.NrCh = data.shape[1] + 1
self.NrSc = data.shape[0]
self.Freq = self.NrSc / self.Time
self.FileFormat = 'GTSDF'
self.gtsdf_description = info['description']
+ data = np.hstack([self.Time[:,np.newaxis], data])
return data
################################################################################
# One stop call for reading all data formats
diff --git a/wetb/hawc2/hawc2_simulation.py b/wetb/hawc2/hawc2_simulation.py
index 600ef60d3b35968553bc5dc195ff018d6c964b45..7849ccc7befcb949236c8d0ddad6ce4ed32bd7ae 100644
--- a/wetb/hawc2/hawc2_simulation.py
+++ b/wetb/hawc2/hawc2_simulation.py
@@ -50,6 +50,8 @@ class Hawc2_Simulation(object):
# The directories for the source and the destination
self.source_directory = None
self.write_directory = None
+ #CMOS: company file.
+ self.company_files = None
# indicates that the sensors in the source htc file are normalized
self.source_sensors_normalized = False
# indicates that the object should keep the sensors normalized
@@ -195,6 +197,22 @@ class Hawc2_Simulation(object):
if self.write_directory == self.source_directory and not force_write:
raise Exception('Cannot write the contents into the source directory without the write being forced')
+ #CMOS: Copying company files:
+ if not self.company_files is None:
+ company_index = 0
+ for company_file in self.company_files:
+ if self.company_destinations[company_index] is None:
+ shutil.copy(company_file,self.write_directory)
+ else:
+ try:
+ shutil.copy(company_file,self.write_directory+self.company_destinations[company_index])
+ except:
+ print('CMOS: Something went wrong when copying company files. The file is put in the writing directory')
+ shutil.copy(company_file,self.write_directory)
+ company_index += 1
+ #CMOS - end
+
+
# Get the directory
old_home = os.getcwd()
@@ -251,6 +269,18 @@ class Hawc2_Simulation(object):
# This will set the write directory
def set_write_directory(self, write_directory):
self.write_directory = os.path.abspath(os.path.realpath(write_directory))
+
+ #CMOS: Set company file:
+ def set_company_file(self, company_file, destination=None):
+ if self.company_files is None:
+ self.company_files = list()
+ self.company_files.append(os.path.abspath(os.path.realpath(company_file)))
+ self.company_destinations = list()
+ self.company_destinations.append(destination)
+ else:
+ self.company_files.append(os.path.abspath(os.path.realpath(company_file)))
+ self.company_destiantions.append(destination)
+ #CMOS - end
# Tests whether the input for the current state has already been written
def does_input_exist(self):
diff --git a/wetb/hawc2/htc_contents.py b/wetb/hawc2/htc_contents.py
index d22a169fdc7e7ec1625080861db113fc461a80c7..7f0ad7a416ea6c64ee8c6039c7fb42a47bb4abde 100644
--- a/wetb/hawc2/htc_contents.py
+++ b/wetb/hawc2/htc_contents.py
@@ -215,7 +215,12 @@ class HTCContents(object):
def add_section(self, name, allow_duplicate_section=False):
if name in self and allow_duplicate_section is False:
return self[name]
- section = HTCSection(name)
+ if name == "output":
+ section = HTCOutputSection(name)
+ elif name.startswith("output_at_time"):
+ section = HTCOutputAtTimeSection(name)
+ else:
+ section = HTCSection(name)
self._add_contents(section)
return section
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 9982c1e204381fbf5b37671fe2af0d678837fb7f..70d4ba5a304c6b4cd7834444af8f938772511e74 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -22,6 +22,129 @@ from wetb.hawc2.htc_contents import HTCContents, HTCSection, HTCLine
from wetb.hawc2.htc_extensions import HTCDefaults, HTCExtensions
import os
from copy import copy, deepcopy
+
+class Input_File_Data(object):
+
+ def __init__(self, key_in=None, original_file_in=None, file_object_in=None, written_file_in=None):
+
+ self.key=key_in
+ self.original_file=original_file_in
+ self.file_object=file_object_in
+ self.written_file=written_file_in
+
+ def __getitem__(self, item_key):
+
+ if isinstance(item_key, str):
+ if item_key.isdigit() or (item_key[0] in ('-', '+') and item_key[1:].isdigit()):
+ item_key = int(item_key)
+
+ if not isinstance(item_key, int):
+ if item_key == 'key':
+ item_key = 0
+ elif item_key == 'original_file':
+ item_key = 1
+ elif item_key == 'file_object':
+ item_key = 2
+ elif item_key == 'written_file':
+ item_key = 3
+
+ if item_key == 0:
+ return self.key
+ elif item_key == 1:
+ return self.original_file
+ elif item_key == 2:
+ return self.file_object
+ elif item_key == 3:
+ return self.written_file
+ else:
+ raise KeyError('That key does not exist')
+
+ def __setitem__(self, item_key, item_val):
+
+ if isinstance(item_key, str):
+ if item_key.isdigit() or (item_key[0] in ('-', '+') and item_key[1:].isdigit()):
+ item_key = int(item_key)
+
+ if not isinstance(item_key, int):
+ if item_key == 'key':
+ item_key = 0
+ elif item_key == 'original_file':
+ item_key = 1
+ elif item_key == 'file_object':
+ item_key = 2
+ elif item_key == 'written_file':
+ item_key = 3
+
+ if item_key == 0:
+ self.key = item_val
+ elif item_key == 1:
+ self.original_file = item_val
+ elif item_key == 2:
+ self.file_object = item_val
+ elif item_key == 3:
+ self.written_file = item_val
+ else:
+ raise KeyError('That key does not exist')
+
+ def __str__(self):
+ if self.key is None and self.original_file is None and self.file_object is None and self.written_file is None:
+ return 'Input_File_Data()'
+ retval = 'Input_File_Data('
+ has_arg = False
+ if not self.key is None:
+ retval += 'key_in = '+str(self.key)
+ has_arg = True
+ if not self.original_file is None:
+ if has_arg:
+ retval += ', '
+ retval += 'original_file_in = '+str(self.original_file)
+ has_arg = True
+ if not self.file_object is None:
+ if has_arg:
+ retval += ', '
+ retval += 'file_object_in = '+str(self.file_object)
+ has_arg = True
+ if not self.written_file is None:
+ if has_arg:
+ retval += ', '
+ retval += 'written_file_in = '+str(self.written_file)
+ has_arg = True
+ retval += ')'
+
+ return retval
+
+class HAWC2_Input_Files(dict):
+
+ def __init__(self):
+ super(HAWC2_Input_Files, self).__init__()
+
+ def _get_leaves(self, container):
+
+ retval = []
+ if isinstance(container,Input_File_Data):
+ return [container]
+ elif isinstance(container, list):
+ for obj in container:
+ retval.extend(self._get_leaves(obj))
+ elif isinstance(container, dict):
+ for obj in container.values():
+ retval.extend(self._get_leaves(obj))
+ else:
+ raise Exception('That container type has not been implemented')
+
+ return retval
+
+ def get_all_extra_inputs(self):
+
+ retval = []
+ for key, container in self.items():
+ if key != 'htc':
+ retval.extend(self._get_leaves(container))
+ return retval
+
+def fmt_path(path):
+ return path.lower().replace("\\","/")
+>>>>>>> 45f79ceaa861e72d66206b1c8bfc9ceb3d29c74c
class Input_File_Data(object):
@@ -598,6 +721,7 @@ class HTCFile(HTCContents, HTCDefaults, HTCExtensions):
if errorcode or 'Elapsed time' not in log:
raise Exception (str(stdout) + str(stderr))
+ return str(stdout) + str(stderr), log
def deltat(self):
return self.simulation.newmark.deltat[0]
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index c754717e9e5dfab3a8c8abc7c19d07d1a65ed87b..c3fe5ae90e5bc4242e09c92ce441a84470327887 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -56,6 +56,12 @@ from wetb.prepost import prepost
from wetb.dlc import high_level as dlc
from wetb.prepost.GenerateHydro import hydro_input
from wetb.utils.envelope import compute_envelope
+from os.path import join as os_path_join
+
+def join_path(*args):
+ return os_path_join(*args).replace("\\","/")
+os.path.join = join_path
+
def load_pickled_file(source):
FILE = open(source, 'rb')
diff --git a/wetb/prepost/hawcstab2.py b/wetb/prepost/hawcstab2.py
index 5d630e929b31eab836a357f799c2c29642c18b9c..62f812f4b2002e50b1e6e6aa65af506da77611de 100644
--- a/wetb/prepost/hawcstab2.py
+++ b/wetb/prepost/hawcstab2.py
@@ -410,9 +410,16 @@ class ReadControlTuning(object):
def __init__(self):
"""
"""
- pass
+ self._aerogains = False
def parse_line(self, line, controller):
+ """Parses the output lines with the controller tuning parameters.
+ Does not parse the aerodynamic gain lines.
+ """
+
+ if line.startswith('Aerodynamic gains'):
+ self._aerogains = True
+ return
split1 = line.split('=')
var1 = split1[0].strip()
@@ -449,8 +456,21 @@ class ReadControlTuning(object):
elif i == 10:
controller = 'aero_damp'
setattr(self, controller, dummy())
- else:
+ elif not self._aerogains:
self.parse_line(line, controller)
+ # do not break since we want to see if aero gains are included
+ # elif self._aerogains:
+ # break
+
+ self.aero_gains_units = ['[deg]', '[kNm/deg]', '[kNm/deg]',
+ '[kNm/(rad/s)]', '[kNm/(rad/s)]']
+ self.aero_gains = pd.DataFrame()
+ # in case the gains are missing from the file, don't try to read it
+ if i > 17:
+ arr = np.loadtxt(fpath, skiprows=17)
+ columns = ['theta', 'dq/dtheta', 'dq/dtheta_fit', 'dq/domega',
+ 'dq/domega_fit']
+ self.aero_gains = pd.DataFrame(arr, columns=columns)
# set some parameters to zero for the linear case, or when aerodynamic
# gain scheduling is not used
diff --git a/wetb/prepost/simchunks.py b/wetb/prepost/simchunks.py
index 785e9dd6b4ec544bd32af7e353b0c744baec0e89..abb00f702267cc51d535d652bc1d42a013275be4 100644
--- a/wetb/prepost/simchunks.py
+++ b/wetb/prepost/simchunks.py
@@ -147,7 +147,7 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
pbs_tmplate += "#PBS -q [queue]\n"
pbs_tmplate += "\n"
- # this causes troubles on CI runner for the tests (line endings?)
+ # FIXME: this causes troubles on CI runner for the tests (line endings?)
# pbs_tmplate = """
# ### Standard Output
# #PBS -N [job_name]
@@ -299,11 +299,17 @@ def create_chunks_htc_pbs(cases, sort_by_values=['[Windspeed]'], ppn=20, i0=0,
for db, base_name in zip(turb_db_tags, base_name_tags):
turb_db_dirs = df[db] + df[base_name]
# When set to None, the DataFrame will have text as None
- # FIXME: CI runner has and old pandas version
+ # FIXME: CI runner has and old pandas version (v0.14.1)
try:
turb_db_src = turb_db_dirs[turb_db_dirs.str.find('None')==-1]
except AttributeError:
- turb_db_src = turb_db_dirs[turb_db_dirs.str.findall('None')==-1]
+ # and findall returns list with the search str occuring as
+ # many times as found in the str...
+ # sel should be True if str does NOT occur in turb_db_dirs
+ # meaning if findall returns empty list
+ findall = turb_db_dirs.str.findall('None').tolist()
+ sel = [True if len(k)==0 else False for k in findall]
+ turb_db_src = turb_db_dirs[sel]
pbs += '\n'
pbs += '# copy to scratch db directory for %s, %s\n' % (db, base_name)
for k in turb_db_src.unique():
diff --git a/wetb/prepost/tests/data/controller_input_quadratic.txt b/wetb/prepost/tests/data/controller_input_quadratic.txt
index 062781f61b1750095b78c74865637282accd90ea..4b883b2a078f0bc3549bdace48445ea9a58b08c6 100644
--- a/wetb/prepost/tests/data/controller_input_quadratic.txt
+++ b/wetb/prepost/tests/data/controller_input_quadratic.txt
@@ -11,3 +11,22 @@ K1 = 7.30949 [deg], K2 = 1422.81187 [deg^2] (dq/dtheta = -176.489
Additional terms due to the Aerodynamic damping
Kp2 = 0.240394E-01 [rad/(rad/s)]
Ko1 = -1.69769 [deg], Ko2 = -15.02688 [deg^2] (dq/domega = 243.08924 kNm/(rad/s))
+********************************************
+Aerodynamic gains:
+********************************************
+ (1) theta [deg] (2) dq/dtheta [kNm/deg] (3) fit [kNm/deg] (4) dq/domega [kNm/(rad/s)] (5) fit [kNm/(rad/s)]
+ 0.00000 -1165.04860 -1182.80164 -393.03157 -950.85937
+ 4.10000 -1665.72575 -1655.44826 -6919.03943 -6544.84749
+ 6.69000 -2012.86015 -1998.12171 -13119.30826 -12659.67192
+ 8.62000 -2290.61883 -2275.67536 -18911.31597 -18515.75425
+ 10.26000 -2535.50152 -2526.42508 -24632.87239 -24364.04365
+ 11.74000 -2757.11114 -2764.46364 -30186.31522 -30329.61030
+ 13.10000 -2991.31463 -2993.03195 -36257.79933 -36386.82912
+ 14.38000 -3213.58048 -3216.75546 -42410.93450 -42591.10977
+ 15.59000 -3428.46978 -3435.91220 -48626.47812 -48904.89826
+ 16.76000 -3642.91400 -3654.91116 -55070.40445 -55424.76312
+ 17.88000 -3858.46084 -3871.07886 -61702.38984 -62048.05630
+ 18.97000 -4075.53879 -4087.58722 -68581.71761 -68852.77188
+ 20.03000 -4295.29300 -4303.93692 -75700.65394 -75809.68369
+ 21.05000 -4524.66782 -4517.52214 -83045.36607 -82820.10608
+ 22.05000 -4758.62680 -4732.06052 -90639.34883 -89993.97031
diff --git a/wetb/prepost/tests/test_Simulations.py b/wetb/prepost/tests/test_Simulations.py
index 8af4bec76c15921366dbb2689ad1f8b612e2b945..4f18d65ccc4d3a2263610fade66b1fa395ab2570 100644
--- a/wetb/prepost/tests/test_Simulations.py
+++ b/wetb/prepost/tests/test_Simulations.py
@@ -68,7 +68,38 @@ class TestGenerateInputs(Template):
postpro_node_zipchunks=False,
postpro_node=False)
- # we can not check-in empty dirs so we can not compare the complete
+ def cmp_dir(dir1, dir2):
+ lst1, lst2 = map(os.listdir, (dir1, dir2))
+ self.assertEqual(";".join(lst1), ";".join(lst2))
+ for f1, f2 in zip(lst1, lst2):
+ if f1.endswith(".zip") or f1.endswith(".xlsx"):
+ continue
+ if os.path.isdir(os.path.join(dir1, f1)):
+ cmp_dir(os.path.join(dir1, f1), os.path.join(dir2, f2))
+ else:
+ try:
+ with open(os.path.join(dir1, f1)) as fid1:
+ l1 = fid1.readlines()
+ with open(os.path.join(dir2, f2)) as fid2:
+ l2 = fid2.readlines()
+
+ self.assertEqual(len(l1), len(l2))
+ self.assertTrue(all([l1_ == l2_ for l1_, l2_ in zip(l1, l2)]))
+ except:
+ print("=" * 30)
+ print(os.path.join(dir1, f1))
+ print(os.path.join(dir2, f2))
+ print(dir1[[d1 != d2 for d1, d2 in zip(dir1, dir2)].index(True):])
+ print(f1)
+ for i in range(len(l1)):
+ if l1[i] != l2[i]:
+ print("%03d, rem: %s" % (i, l1[i].strip()))
+ print("%03d, ref: %s" % (i, l2[i].strip()))
+ print()
+ raise
+
+
+ # we can not git check-in empty dirs so we can not compare the complete
# directory structure withouth manually creating the empty dirs here
for subdir in ['control', 'data', 'htc', 'pbs_in', 'pbs_in_turb',
'htc/_master', 'htc/dlc01_demos', 'pbs_in/dlc01_demos',
@@ -78,6 +109,7 @@ class TestGenerateInputs(Template):
# the zipfiles are taken care of separately
ignore = ['remote_chnk_00000.zip']
cmp = filecmp.dircmp(remote, ref, ignore=ignore)
+ cmp_dir(remote, ref)
self.assertEqual(len(cmp.diff_files), 0,
"{} {}".format(subdir, cmp.diff_files))
self.assertEqual(len(cmp.right_only), 0,
diff --git a/wetb/prepost/tests/test_hawcstab2.py b/wetb/prepost/tests/test_hawcstab2.py
index f1fb229cf213a3e0a2499b2bd5127bf02acd3fe8..20c95d440c6c572e3af55e9c2b779aede464d63c 100644
--- a/wetb/prepost/tests/test_hawcstab2.py
+++ b/wetb/prepost/tests/test_hawcstab2.py
@@ -71,6 +71,8 @@ class Tests(unittest.TestCase):
self.assertEqual(hs2.aero_damp.Ko1, -4.21472)
self.assertEqual(hs2.aero_damp.Ko2, 0.0)
+ self.assertEqual(hs2.aero_gains.shape, (0, 0))
+
def test_quadratic_file(self):
hs2 = ReadControlTuning()
@@ -91,6 +93,38 @@ class Tests(unittest.TestCase):
self.assertEqual(hs2.aero_damp.Ko1, -1.69769)
self.assertEqual(hs2.aero_damp.Ko2, -15.02688)
+ self.assertEqual(hs2.aero_gains.shape, (15, 5))
+ cols = ['theta', 'dq/dtheta', 'dq/dtheta_fit', 'dq/domega',
+ 'dq/domega_fit']
+ self.assertEqual(hs2.aero_gains.columns.tolist(), cols)
+
+ tmp = np.array([0, 4.1, 6.69, 8.62, 10.26, 11.74, 13.1, 14.38, 15.59,
+ 16.76, 17.88, 18.97, 20.03, 21.05, 22.05])
+ np.testing.assert_allclose(hs2.aero_gains['theta'].values, tmp)
+
+ tmp = [-1165.0486, -1665.72575, -2012.86015, -2290.61883,
+ -2535.50152, -2757.11114, -2991.31463, -3213.58048,
+ -3428.46978, -3642.914, -3858.46084, -4075.53879,
+ -4295.293, -4524.66782, -4758.6268]
+ np.testing.assert_allclose(hs2.aero_gains['dq/dtheta'].values, tmp)
+
+ tmp = [-1182.80164, -1655.44826, -1998.12171, -2275.67536, -2526.42508,
+ -2764.46364, -2993.03195, -3216.75546, -3435.9122, -3654.91116,
+ -3871.07886, -4087.58722, -4303.93692, -4517.52214, -4732.06052]
+ np.testing.assert_allclose(hs2.aero_gains['dq/dtheta_fit'].values, tmp)
+
+ tmp = [-393.03157, -6919.03943, -13119.30826, -18911.31597,
+ -24632.87239, -30186.31522, -36257.79933, -42410.9345,
+ -48626.47812, -55070.40445, -61702.38984, -68581.71761,
+ -75700.65394, -83045.36607, -90639.34883]
+ np.testing.assert_allclose(hs2.aero_gains['dq/domega'].values, tmp)
+
+ tmp = [-950.85937, -6544.84749, -12659.67192, -18515.75425,
+ -24364.04365, -30329.6103, -36386.82912, -42591.10977,
+ -48904.89826, -55424.76312, -62048.0563, -68852.77188,
+ -75809.68369, -82820.10608, -89993.97031]
+ np.testing.assert_allclose(hs2.aero_gains['dq/domega_fit'].values, tmp)
+
def test_ind_file(self):
fnames = ['dtu10mw_nofull_defl_u10000.ind',
'dtu10mw_nofull_fext_u10000.ind',
@@ -108,7 +142,7 @@ class Tests(unittest.TestCase):
res = results()
df_data = res.load_ind(fname)
data = np.loadtxt(fname)
- np.testing.assert_almost_equal(data, df_data.values)
+ np.testing.assert_allclose(data, df_data.values)
def test_pwr_file(self):
fnames = ['dtu10mw_nofull.pwr',
@@ -121,19 +155,7 @@ class Tests(unittest.TestCase):
df_data, units = res.load_pwr_df(fname)
data = np.loadtxt(fname)
self.assertEqual(data.shape, df_data.shape)
- print(fname)
- print(data.dtype)
- print(df_data.values.dtype)
- for i in range(data.shape[0]):
- a = data[i,:]
- b = df_data.values[i,:]
- if not np.allclose(a,b):
- print(i)
- print(a-b)
- print(a)
- print(b)
- np.testing.assert_almost_equal(a, b)
- np.testing.assert_almost_equal(data, df_data.values, decimal=6)
+ np.testing.assert_allclose(data, df_data.values)
if __name__ == "__main__":
diff --git a/wetb/utils/test_files.py b/wetb/utils/test_files.py
index 6e230c3fe903baf6e51a12f3e53971a42ea4d6f1..e4e3e88d3f428605e8b49c6094006eee6f0e83cc 100644
--- a/wetb/utils/test_files.py
+++ b/wetb/utils/test_files.py
@@ -6,7 +6,11 @@ Created on 20. jul. 2017
import os
import wetb
import inspect
-wetb_rep_path = os.path.join(os.path.dirname(wetb.__file__), "../")
+from urllib.request import urlretrieve
+
+wetb_rep_path = os.path.abspath(os.path.dirname(wetb.__file__) + "/../") + "/"
+local_TestFiles_path = wetb_rep_path + "TestFiles/"
+remote_TestFiles_url = "https://gitlab.windenergy.dtu.dk/toolbox/TestFiles/raw/master/"
def _absolute_filename(filename):
@@ -19,10 +23,13 @@ def _absolute_filename(filename):
def get_test_file(filename):
filename = _absolute_filename(filename)
- if os.path.exists(filename):
- return filename
- else:
- return os.path.join(wetb_rep_path, 'TestFiles', os.path.relpath(filename, wetb_rep_path))
+ if not os.path.exists(filename):
+ rel_path = os.path.relpath(filename, wetb_rep_path).replace("\\","/")
+ filename = local_TestFiles_path + rel_path
+ if not os.path.exists(filename):
+ urlretrieve(remote_TestFiles_url + rel_path, filename)
+ return filename
+
diff --git a/wetb/utils/tests/test_test_files.py b/wetb/utils/tests/test_test_files.py
index 6cbe8f67d33fbf84ef8e154cb61d65c9824f2182..1b38c2d3fdf607137f83ff8f386648350bd0f8c0 100644
--- a/wetb/utils/tests/test_test_files.py
+++ b/wetb/utils/tests/test_test_files.py
@@ -4,7 +4,8 @@ Created on 20. jul. 2017
@author: mmpe
'''
import unittest
-from wetb.utils.test_files import move2test_files, get_test_file
+from wetb.utils.test_files import move2test_files, get_test_file,\
+ local_TestFiles_path
import os
from wetb.utils import test_files
import wetb
@@ -24,6 +25,9 @@ class Test_test_files(unittest.TestCase):
self.assertTrue(os.path.isfile(dst))
def test_test_files(self):
+ fn = local_TestFiles_path + "wetb/utils/tests/test_files/test_file.txt"
+ if os.path.isfile(fn):
+ os.remove(fn)
fn1 = get_test_file(tfp+'test_file.txt')
self.assertTrue(os.path.isfile(fn1))
fn2 = get_test_file('test_file.txt')