From 73667717b7f719ef6d92fd0109a3e2cad3715b68 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Wed, 19 Jul 2017 10:51:50 +0200
Subject: [PATCH] rename wetb.wind.dir_mapping to wetb.wind.utils
---
wetb/wind/tests/test_Shear.py | 2 +-
wetb/wind/tests/test_mann_parameters.py | 2 +-
wetb/wind/turbulence/mann_parameters.py | 2 +-
wetb/wind/{dir_mapping.py => utils.py} | 17 +++++++++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
rename wetb/wind/{dir_mapping.py => utils.py} (91%)
diff --git a/wetb/wind/tests/test_Shear.py b/wetb/wind/tests/test_Shear.py
index 44a369a2..2de47b7b 100644
--- a/wetb/wind/tests/test_Shear.py
+++ b/wetb/wind/tests/test_Shear.py
@@ -11,7 +11,7 @@ from builtins import zip
from future import standard_library
standard_library.install_aliases()
import os
-from wetb.wind.dir_mapping import xyz2uvw
+from wetb.wind.utils import xyz2uvw
import wetb.gtsdf
from wetb.wind.shear import power_shear, fit_power_shear, fit_power_shear_ref, \
log_shear, fit_log_shear, stability_term
diff --git a/wetb/wind/tests/test_mann_parameters.py b/wetb/wind/tests/test_mann_parameters.py
index 0b3f8836..ec59acc9 100644
--- a/wetb/wind/tests/test_mann_parameters.py
+++ b/wetb/wind/tests/test_mann_parameters.py
@@ -5,7 +5,7 @@ Created on 20. feb. 2017
'''
import unittest
from wetb import gtsdf
-from wetb.wind.dir_mapping import wsp_dir2uv
+from wetb.wind.utils import wsp_dir2uv
from wetb.wind.turbulence.mann_parameters import fit_mann_model_spectra
import numpy as np
from wetb.wind.turbulence.spectra import spectra
diff --git a/wetb/wind/turbulence/mann_parameters.py b/wetb/wind/turbulence/mann_parameters.py
index 9a411fbb..995afdef 100644
--- a/wetb/wind/turbulence/mann_parameters.py
+++ b/wetb/wind/turbulence/mann_parameters.py
@@ -290,7 +290,7 @@ def plot_mann_spectra(ae, L, G, style='-', u_ref=1, plt=None, spectra=['uu', 'vv
if __name__ == "__main__":
from wetb import gtsdf
- from wetb.wind.dir_mapping import wsp_dir2uv
+ from wetb.wind.utils import wsp_dir2uv
from wetb import wind
import matplotlib.pyplot as plt
diff --git a/wetb/wind/dir_mapping.py b/wetb/wind/utils.py
similarity index 91%
rename from wetb/wind/dir_mapping.py
rename to wetb/wind/utils.py
index b2e6afe1..8125699e 100644
--- a/wetb/wind/dir_mapping.py
+++ b/wetb/wind/utils.py
@@ -7,6 +7,7 @@ Created on 19. dec. 2016
from wetb.utils.geometry import mean_deg, rad, tand, sind, deg, cosd
import numpy as np
+from scipy.signal import detrend
def wsp_dir2uv(wsp, dir, dir_ref=None):
@@ -218,3 +219,19 @@ def abvrel2xyz(alpha, beta, vrel):
return np.array([x, y, z]).T
+def detrend_uvw(u, v=None, w=None):
+# def _detrend(wsp):
+# if wsp is None:
+# return None
+# dwsp = np.atleast_2d(wsp.copy().T).T
+# t = np.arange(dwsp.shape[0])
+# A = np.vstack([t, np.ones(len(t))]).T
+# for i in range(dwsp.shape[1]):
+# trend, offset = np.linalg.lstsq(A, dwsp[:, i])[0]
+# dwsp[:, i] = dwsp[:, i] - t * trend + t[-1] / 2 * trend
+# return dwsp.reshape(wsp.shape)
+ def _detrend(y):
+ if y is None:
+ return None
+ return detrend(y)
+ return [_detrend(uvw) for uvw in [u, v, w]]
\ No newline at end of file
--
GitLab