Merge branch 'master' of gitlab.windenergy.dtu.dk:toolbox/WindEnergyToolbox

wetb/hawc2/at_time_file.py

@@ -42,7 +42,7 @@ class AtTimeFile(object):
         for column, att_name in enumerate(self.attribute_names):
             setattr(self, att_name, func_factory(column))
 
-    def radius(self, radius=None):
+    def curved_radius(self, radius=None):
         """Radius of calculation point(s)
 
         Parameters

wetb/hawc2/htc_file.py

@@ -14,6 +14,7 @@ from io import open
 from builtins import str
 from future import standard_library
 from wetb.utils.process_exec import pexec
+from wetb.gtsdf.unix_time import from_unix
 
 standard_library.install_aliases()
 from collections import OrderedDict
@@ -68,11 +69,18 @@ class HTCFile(HTCContents, HTCDefaults):
                     break
         #assert 'simulation' in self.contents, "%s could not be loaded. 'simulation' section missing" % filename
 
+
+    def readfilelines(self, filename):
+        with open(filename, encoding='cp1252') as fid:
+            lines = list(fid.readlines())
+        if lines[0].encode().startswith(b'\xc3\xaf\xc2\xbb\xc2\xbf'):
+            lines[0] = lines[0][3:]
+        return lines
+
     def readlines(self, filename):
         self.htc_inputfiles.append(filename)
         htc_lines = []
-        with open(filename, encoding='cp1252') as fid:
-            lines = fid.readlines()
+        lines = self.readfilelines(filename)
         for l in lines:
             if l.lower().lstrip().startswith('continue_in_file'):
                 filename = l.lstrip().split(";")[0][len("continue_in_file"):].strip()
@@ -101,7 +109,7 @@ class HTCFile(HTCContents, HTCDefaults):
         # exist_ok does not exist in Python27
         if not os.path.exists(os.path.dirname(filename)):
             os.makedirs(os.path.dirname(filename))  #, exist_ok=True)
-        with open(filename, 'w', encoding='utf-8') as fid:
+        with open(filename, 'w', encoding='cp1252') as fid:
             fid.write(str(self))
 
     def set_name(self, name, htc_folder="htc", log_folder="log", res_folder="res"):
@@ -217,7 +225,21 @@ class HTCFile(HTCContents, HTCDefaults):
             return [res_filename + ".sel", res_filename + ".dat"]
 
 
-    def simulate(self, exe):
+    def simulate(self, exe, skip_if_up_to_date=False):
+        if skip_if_up_to_date:
+            from os.path import isfile, getmtime, isabs
+            res_file = os.path.join(self.modelpath, self.res_file_lst()[0])
+            htc_file = os.path.join(self.modelpath, self.filename)
+            if isabs(exe):
+                exe_file = exe
+            else:
+                exe_file = os.path.join(self.modelpath, exe)
+            #print (from_unix(getmtime(res_file)), from_unix(getmtime(htc_file)))
+            if (isfile(htc_file) and isfile(res_file) and isfile(exe_file) and
+                getmtime(res_file) > getmtime(htc_file) and getmtime(res_file) > getmtime(exe_file)):
+                if "".join(self.readfilelines(htc_file)) == str(self):
+                        return
+
         self.save()
         htcfile = os.path.relpath(self.filename, self.modelpath)
         hawc2exe = exe

wetb/hawc2/tests/test_AtTimeFile.py

@@ -49,9 +49,9 @@ class TestAtTimeFile(unittest.TestCase):
 
     def test_at_time_file_radius(self):
         atfile = AtTimeFile(self.testfilepath + "at_time.dat")
-        self.assertEqual(atfile.radius()[12], 10.2505)
-        self.assertEqual(atfile.radius(10), 10.2505)
-        self.assertEqual(atfile.radius(10.5), 10.2505)
+        self.assertEqual(atfile.curved_radius()[12], 10.2505)
+        self.assertEqual(atfile.curved_radius(10), 10.2505)
+        self.assertEqual(atfile.curved_radius(10.5), 10.2505)
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']

wetb/hawc2/tests/test_htc_file.py

@@ -241,6 +241,11 @@ class TestHtcFile(unittest.TestCase):
     def test_ansi(self):
         htcfile = HTCFile(self.testfilepath + "./ansi.htc")
 
+    def test_file_with_BOM(self):
+        htcfile = HTCFile(self.testfilepath + 'DLC15_wsp11_wdir000_s0000_phi000_Free_v2_visual.htc')
+        self.assertEqual(str(htcfile)[0], ";")
+
+
 
 
 

wetb/utils/tests/test_caching.py

@@ -62,12 +62,12 @@ class TestCacheProperty(unittest.TestCase):
 
     def test_cache_function(self):
         e = Example()
-        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 1, places=2)
-        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 0, places=2)
-        self.assertAlmostEqual(get_time(e.test_cache_function)(reload=True)[1], 1, places=2)
-        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 0, places=2)
+        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 1, places=1)
+        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 0, places=1)
+        self.assertAlmostEqual(get_time(e.test_cache_function)(reload=True)[1], 1, places=1)
+        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=2)
+        self.assertAlmostEqual(get_time(e.test_cache_function)()[1], 1, places=1)