Develop (#98)

* add a category attribute to the tracks (#77) * WIP: First pass incorporating landfall intensity script * WIP: Add more logging statements * WIP: PEP8 conformance * Add 3.8 to travis.yml, extra libs, use conda environment file * Update setup.py, bump version * Fix for #94 Co-authored-by: Umma Zannat
GeoscienceAustralia · Jul 10, 2020 · 7ac8fe9 · 7ac8fe9
1 parent aa14be0
commit 7ac8fe9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,9 @@ install:
   - conda update -q conda
   - conda config --add channels conda-forge
   - conda config --set channel_priority strict
-  - conda create -q -n test-env python=$TRAVIS_PYTHON_VERSION pip numpy scipy matplotlib basemap shapely nose netcdf4 cftime coverage coveralls pycurl pyproj seaborn simplejson sqlite statsmodels libgdal gdal configparser cartopy affine tqdm xarray gxx_linux-64 pthread-stubs imageio boto3 botocore
-  - source activate test-env
+  - conda env create -q -f tcrmenv.yml python=$TRAVIS_PYTHON_VERSION 
+  - source activate tcrm
+
 branches:
   except:
     - config

diff --git a/Utilities/metutils.py b/Utilities/metutils.py
@@ -420,10 +420,12 @@ def convert(value, inunits, outunits):
           "Pa":1.0}
 
     # Lengths:
-    km = {"m":0.001, "mi":0.621371192, "deg":0.00899886, "nm":0.539957,
+    km = {"m":1000., "mi":0.621371192, "deg":0.00899886, "nm":0.539957,
           "rad":0.0001570783}
     deg = {"km":111.1251, "m":111125.1, "mi":69.0499358, "nm":60.0,
            "rad":math.pi/180.}
+    m = {"km":0.001, "mi":0.000621371, "deg":0.00000899886, "nm":0.000539957,
+         "rad":0.0000001570783}
     mi = {"km":1.60934, "m":1609.34, "deg":0.014482}
     nm = {"km":1.852, "m":1852, "deg":0.01666, "rad":math.pi/10800.}
     rad = {"nm":10800./math.pi, "km":6366.248653, "deg":180./math.pi}
@@ -446,6 +448,7 @@ def convert(value, inunits, outunits):
                "F":F,
                "K":K,
                "km":km,
+               "m":m,
                "deg":deg,
                "mi":mi,
                "nm":nm,

diff --git a/tests/test_data/vorticityTestData.pkl b/tests/test_data/vorticityTestData.pkl
diff --git a/tests/test_data/windFieldTestData.pkl b/tests/test_data/windFieldTestData.pkl
diff --git a/tests/test_data/windProfileTestData.pkl b/tests/test_data/windProfileTestData.pkl
diff --git a/tests/test_metutils.py b/tests/test_metutils.py
@@ -73,6 +73,22 @@ def test_deg2km(self):
         self.assertAlmostEqual(metutils.convert(1, "deg", "km"), (1/(360/(2*pi*6367))), 3)
         self.assertAlmostEqual(metutils.convert(2, "deg", "km"), (2/(360/(2*pi*6367))), 3)
         self.assertAlmostEqual(metutils.convert(10, "deg", "km"), (10/(360/(2*pi*6367))), 3)
+
+    def test_km2m(self):
+        """Convert distance in km to distance in m"""
+        self.assertEqual(metutils.convert(0, "km", "m"), 0)
+        self.assertAlmostEqual(metutils.convert(1, "km", "m"), 1000)
+
+    def test_m2km(self):
+        """Convert distance in m to distance in km"""
+        self.assertEqual(metutils.convert(0, "m", "km"), 0)
+        self.assertAlmostEqual(metutils.convert(1000., "m", "km"), 1.)
+        self.assertAlmostEqual(metutils.convert(10000., "m", "km"), 10.)
+
+    def test_m2nm(self):
+        self.assertEqual(metutils.convert(0, "m", "nm"), 0)
+        self.assertAlmostEqual(metutils.convert(1000., "m", "nm"), 0.539957)
+
 
     def test_hPa2Pa(self):
         """Convert pressure from hPa to Pa"""