diff --git a/requirements.txt b/requirements.txt index 2214468c6e445e3bf4d172ec8481720a9677f3d1..c0cbf307fd2526758c6e2d7495a5b2793ef47d2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,5 @@ h5py pandas tables future -paramiko \ No newline at end of file +paramiko +psutil diff --git a/wetb/gtsdf/gtsdf.py b/wetb/gtsdf/gtsdf.py index 66e6ae14527c2870a0a097d5b2266914db75d169..9ebf787774ff817bf18cb7af9d71ed0ce99a9b61 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.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 diff --git a/wetb/hawc2/cluster_simulation.py b/wetb/hawc2/cluster_simulation.py index 544cde2fb5761169ba2b58ec2f9d2cf0fd8fbb8c..05623625836643ad22778d55b28e1c576fddd4c2 100644 --- a/wetb/hawc2/cluster_simulation.py +++ b/wetb/hawc2/cluster_simulation.py @@ -1,5 +1,5 @@ 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): diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py index 5c38bdc97caeba1bdf9b57721e449c1ced48aff4..92740e805ce5d9b21e70d4980bbea2335b27013b 100644 --- a/wetb/hawc2/htc_file.py +++ b/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")