From eb1ec87257d235918e04fc575e0f2906ab3e0df5 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 13 Jul 2017 15:16:11 +0200
Subject: [PATCH] rads2rpm implemented
---
wetb/utils/geometry.py | 6 +++++-
wetb/utils/tests/test_geometry.py | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/wetb/utils/geometry.py b/wetb/utils/geometry.py
index 211a8114..a50b18be 100644
--- a/wetb/utils/geometry.py
+++ b/wetb/utils/geometry.py
@@ -88,4 +88,8 @@ def std_rad(dir):
return np.sqrt(1 - (np.nanmean(np.sin(dir)) ** 2 + np.nanmean(np.cos(dir)) ** 2))
def rpm2rads(rpm):
- return rpm * 2 * np.pi / 60
\ No newline at end of file
+ return rpm * 2 * np.pi / 60
+
+
+def rads2rpm(rads):
+ return rads/ (2 * np.pi) * 60
\ No newline at end of file
diff --git a/wetb/utils/tests/test_geometry.py b/wetb/utils/tests/test_geometry.py
index 581dc349..db2f099d 100644
--- a/wetb/utils/tests/test_geometry.py
+++ b/wetb/utils/tests/test_geometry.py
@@ -13,7 +13,8 @@ import unittest
import numpy as np
-from wetb.utils.geometry import rad, deg, mean_deg, sind, cosd, std_deg, tand
+from wetb.utils.geometry import rad, deg, mean_deg, sind, cosd, std_deg, tand,\
+ rpm2rads, rads2rpm
import os
@@ -67,6 +68,10 @@ class TestGeometry(unittest.TestCase):
def test_std_deg_nan(self):
self.assertAlmostEqual(std_deg(np.array([0, 90, 180, 270, np.nan])), 57.296, 2)
+
+ def test_rpm2rads(self):
+ self.assertAlmostEqual(rpm2rads(1),.1047,4)
+ self.assertAlmostEqual(rads2rpm(rpm2rads(1)), 1)
if __name__ == "__main__":
--
GitLab