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

requirements.txt

@@ -11,4 +11,5 @@ h5py
 pandas
 tables
 future
-paramiko
+paramiko
\ No newline at end of file
+psutil

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.utils.timing import print_time
 standard_library.install_aliases()
 import warnings
 from wetb.gtsdf.unix_time import from_unix
@@ -16,8 +15,6 @@ import numpy as np
 import numpy.ma as ma
 block_name_fmt = "block%04d"
 
-
-@print_time
 def load(filename, dtype=None):
     """Load a 'General Time Series Data Format'-hdf5 datafile
 

wetb/hawc2/cluster_simulation.py

 from wetb.hawc2.simulation import Simulation, SimulationThread
-import os  
+import os
 import sys
 from threading import  Thread
 class ClusterSimulation(Simulation):
@@ -17,7 +17,7 @@ class ClusterSimulation(Simulation):
 
     def update_status(self, *args, **kwargs):
         Simulation.update_status(self, *args, **kwargs)
-        with open("/home/mmpe/.hawc2launcher/status_%s" % self.simulation_id, 'w') as fid:
+        with open("/home/%s/.hawc2launcher/status_%s" % (os.environ['USER'], self.simulation_id), 'w') as fid:
             fid.write (";".join([self.simulation_id, self.status] + [str(getattr(self.logFile, v)) for v in ['status', 'pct', 'remaining_time', 'lastline']]) + "\n")
 
     def show_status(self):

wetb/hawc2/htc_file.py

@@ -234,6 +234,9 @@ class HTCFile(HTCContents, HTCDefaults):
             raise Exception (str(stdout) + str(stderr))
 
 if "__main__" == __name__:
-    f = HTCFile(r"C:\mmpe\HAWC2\models\PhaseIJacketv30\htc", "../../")
+    f = HTCFile(r"C:\mmpe\HAWC2\models\DTU10MWRef6.0\htc\DTU_10MW_RWT_power_curve.htc", "../")
+    f.save(r"C:\mmpe\HAWC2\models\DTU10MWRef6.0\htc\DTU_10MW_RWT_power_curve.htc")
 
+    f = HTCFile(r"C:\mmpe\HAWC2\models\DTU10MWRef6.0\htc\DTU_10MW_RWT.htc", "../")
+    f.save(r"C:\mmpe\HAWC2\models\DTU10MWRef6.0\htc\DTU_10MW_RWT.htc")