From b803ee3343189d4442f3009553a7990fe9ba59bc Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Wed, 22 Mar 2017 13:52:41 +0100
Subject: [PATCH] Moved to signal
---
setup.py | 2 +-
wetb/hawc2/htc_file.py | 2 +-
wetb/{signal_tools => signal}/filters/__init__.py | 0
wetb/{signal_tools => signal}/filters/cy_filters.py | 0
wetb/{signal_tools => signal}/filters/cy_filters.pyx | 0
wetb/{signal_tools => signal}/filters/despike.py | 0
wetb/{signal_tools => signal}/filters/first_order.py | 0
wetb/{signal_tools => signal}/filters/replacer.py | 0
wetb/{signal_tools => signal}/spectrum.py | 0
wetb/{utils => signal}/subset_mean.py | 0
.../tests/test_first_order.py | 0
wetb/{signal_tools => signal}/tests/test_spectrum.py | 0
wetb/utils/cluster_tools/cluster_resource.py | 11 +++++++----
wetb/wind/air_density.py | 4 ++--
14 files changed, 11 insertions(+), 8 deletions(-)
rename wetb/{signal_tools => signal}/filters/__init__.py (100%)
rename wetb/{signal_tools => signal}/filters/cy_filters.py (100%)
rename wetb/{signal_tools => signal}/filters/cy_filters.pyx (100%)
rename wetb/{signal_tools => signal}/filters/despike.py (100%)
rename wetb/{signal_tools => signal}/filters/first_order.py (100%)
rename wetb/{signal_tools => signal}/filters/replacer.py (100%)
rename wetb/{signal_tools => signal}/spectrum.py (100%)
rename wetb/{utils => signal}/subset_mean.py (100%)
rename wetb/{signal_tools => signal}/tests/test_first_order.py (100%)
rename wetb/{signal_tools => signal}/tests/test_spectrum.py (100%)
diff --git a/setup.py b/setup.py
index 8b4a3a6..368d369 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ from Cython.Distutils import build_ext
def setup_package():
ex_info = [('wetb.fatigue_tools.rainflowcounting', ['pair_range', 'peak_trough', 'rainflowcount_astm']),
- ('wetb.signal_tools.filters', ['cy_filters'])]
+ ('wetb.signal.filters', ['cy_filters'])]
extlist = [Extension('%s.%s' % (module, n),
[os.path.join(module.replace(".","/"), n)+'.pyx'],
include_dirs=[np.get_include()]) for module, names in ex_info for n in names]
diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py
index 0f559e2..1c23189 100644
--- a/wetb/hawc2/htc_file.py
+++ b/wetb/hawc2/htc_file.py
@@ -14,7 +14,7 @@ from io import open
from builtins import str
from future import standard_library
from wetb.utils.process_exec import pexec
-from wetb.utils.cluster_tools.cluster_resource import unix_path, unix_path_old
+from wetb.utils.cluster_tools.cluster_resource import unix_path_old
standard_library.install_aliases()
from collections import OrderedDict
diff --git a/wetb/signal_tools/filters/__init__.py b/wetb/signal/filters/__init__.py
similarity index 100%
rename from wetb/signal_tools/filters/__init__.py
rename to wetb/signal/filters/__init__.py
diff --git a/wetb/signal_tools/filters/cy_filters.py b/wetb/signal/filters/cy_filters.py
similarity index 100%
rename from wetb/signal_tools/filters/cy_filters.py
rename to wetb/signal/filters/cy_filters.py
diff --git a/wetb/signal_tools/filters/cy_filters.pyx b/wetb/signal/filters/cy_filters.pyx
similarity index 100%
rename from wetb/signal_tools/filters/cy_filters.pyx
rename to wetb/signal/filters/cy_filters.pyx
diff --git a/wetb/signal_tools/filters/despike.py b/wetb/signal/filters/despike.py
similarity index 100%
rename from wetb/signal_tools/filters/despike.py
rename to wetb/signal/filters/despike.py
diff --git a/wetb/signal_tools/filters/first_order.py b/wetb/signal/filters/first_order.py
similarity index 100%
rename from wetb/signal_tools/filters/first_order.py
rename to wetb/signal/filters/first_order.py
diff --git a/wetb/signal_tools/filters/replacer.py b/wetb/signal/filters/replacer.py
similarity index 100%
rename from wetb/signal_tools/filters/replacer.py
rename to wetb/signal/filters/replacer.py
diff --git a/wetb/signal_tools/spectrum.py b/wetb/signal/spectrum.py
similarity index 100%
rename from wetb/signal_tools/spectrum.py
rename to wetb/signal/spectrum.py
diff --git a/wetb/utils/subset_mean.py b/wetb/signal/subset_mean.py
similarity index 100%
rename from wetb/utils/subset_mean.py
rename to wetb/signal/subset_mean.py
diff --git a/wetb/signal_tools/tests/test_first_order.py b/wetb/signal/tests/test_first_order.py
similarity index 100%
rename from wetb/signal_tools/tests/test_first_order.py
rename to wetb/signal/tests/test_first_order.py
diff --git a/wetb/signal_tools/tests/test_spectrum.py b/wetb/signal/tests/test_spectrum.py
similarity index 100%
rename from wetb/signal_tools/tests/test_spectrum.py
rename to wetb/signal/tests/test_spectrum.py
diff --git a/wetb/utils/cluster_tools/cluster_resource.py b/wetb/utils/cluster_tools/cluster_resource.py
index 5c128cc..19714b5 100644
--- a/wetb/utils/cluster_tools/cluster_resource.py
+++ b/wetb/utils/cluster_tools/cluster_resource.py
@@ -10,9 +10,7 @@ import re
import threading
from wetb.utils.cluster_tools import pbswrap
-from wetb.utils.cluster_tools.ssh_client import SSHClient, SharedSSHClient
-from wetb.utils.timing import print_time
-import time
+
def unix_path(path, cwd=None, fail_on_missing=False):
@@ -122,6 +120,7 @@ class SSHPBSClusterResource(Resource):
def new_ssh_connection(self):
+ from wetb.utils.cluster_tools.ssh_client import SSHClient
return SSHClient(self.host, self.ssh.username, self.ssh.password, self.ssh.port)
#return self.ssh
@@ -159,7 +158,11 @@ class SSHPBSClusterResource(Resource):
jobids = list(jobids)
self.ssh.execute("qdel %s" % (" ".join(jobids)))
-
+ def setup_wine(self):
+ self.ssh.execute("""rm -f ./config-wine-hawc2.sh &&
+wget https://gitlab.windenergy.dtu.dk/toolbox/pbsutils/raw/master/config-wine-hawc2.sh &&
+chmod 777 config-wine-hawc2.sh &&
+./config-wine-hawc2.sh""")
diff --git a/wetb/wind/air_density.py b/wetb/wind/air_density.py
index 0af9724..1378078 100644
--- a/wetb/wind/air_density.py
+++ b/wetb/wind/air_density.py
@@ -175,8 +175,8 @@ def R(rh=0, t=15, P=1014):
-------
Specific gas constant
"""
- assert np.all((900<P)&(P<1100)), "Pressure outside range 900 to 1100"
- assert np.all((-50<t)&(t<100)), "Temperature outside range -50 to 100"
+ #assert np.all((900<P)&(P<1100)), "Pressure outside range 900 to 1100"
+ #assert np.all((-50<t)&(t<100)), "Temperature outside range -50 to 100"
Tk = t + 273.15
return P * 100 / (air_density(P, t, rh) * Tk)
--
GitLab