diff --git a/README.md b/README.md index 9cf7de6..dc4485d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Scalars and arrays are supported as function inputs. The main exception is `csu_ To install CSU_RadarTools, download the source code and then run the following in the code's home directory: -```python setup.py install``` +```pip install .``` By default, if the `CSURT_F2PY` environment variable is not set (or set to a case-insensitive match for {`0`, `false`, `no`}, the package will be compiled using Cython to speed up KDP and other routines. This enables the widest cross-platform support. @@ -39,10 +39,7 @@ from csu_radartools import (csu_fhc, csu_liquid_ice_mass, csu_blended_rain, For help information do help on individual modules. There is also a demonstration IPython notebook in the notebooks directory that covers all the modules. -CSU_RadarTools is known to work under Python 2.7 and 3.4-3.7. -Other Python versions are untested. -Although we still fully support Python 2.7 at this time, we strongly recommend you move to Python >=3.6 as soon as practicable, given the Python 2 end of life date in less than a year, and the fact that many other scientific packages have dropped it already. -For more information, please see e.g. [the Python 3 Statement](https://python3statement.org/). +CSU_RadarTools is known to work under Python 3.X Latest release of CSU_RadarTools (v1.3): [![DOI](https://zenodo.org/badge/31606116.svg)](https://zenodo.org/badge/latestdoi/31606116) diff --git a/csu_radartools/_version.py b/csu_radartools/_version.py index 00626e1..2020a26 100644 --- a/csu_radartools/_version.py +++ b/csu_radartools/_version.py @@ -2,5 +2,5 @@ """Version File.""" -VERSION_INFO = (1, 3, 0, 'dev0') +VERSION_INFO = (1, 4, 0, 'dev0') __version__ = '.'.join(map(str, VERSION_INFO)) diff --git a/notebooks/CSU_RadarTools_Demo.ipynb b/notebooks/CSU_RadarTools_Demo.ipynb index 3b69302..cd88af3 100644 --- a/notebooks/CSU_RadarTools_Demo.ipynb +++ b/notebooks/CSU_RadarTools_Demo.ipynb @@ -31,16 +31,7 @@ "cell_type": "code", "execution_count": 1, "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "/Users/tjlang/anaconda/envs/py3/lib/python3.6/site-packages/h5py/__init__.py:36: FutureWarning: Conversion of the second argument of issubdtype from `float` to `np.floating` is deprecated. In future, it will be treated as `np.float64 == np.dtype(float).type`.\n", - " from ._conv import register_converters as _register_converters\n" - ] - } - ], + "outputs": [], "source": [ "from __future__ import print_function\n", "import numpy as np\n", @@ -73,7 +64,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -130,10 +121,9 @@ } ], "source": [ - "#Read in the data\n", - "sndfile = '/Users/tjlang/Documents/OVWST/CPOL/soundings/snd_Darwin.txt'\n", - "radarfile = '/Users/tjlang/Documents/OVWST/CPOL/output/20060119/' + \\\n", - " 'cfrad.20060119_170029.000_to_20060121_020810.000_CPOL_v1_PPI.nc'\n", + "# Read in the data\n", + "sndfile = './snd_Darwin.txt'\n", + "radarfile = './cfrad.20060119_170029.000_to_20060121_020810.000_CPOL_v1_PPI.nc'\n", "radar = pyart.io.read(radarfile)\n", "print(radar.fields.keys())\n", "sounding = SkewT.Sounding(sndfile)" @@ -276,20 +266,19 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 13, "metadata": {}, "outputs": [], "source": [ - "scores = csu_fhc.csu_fhc_summer(dz=dz, zdr=dr, rho=rh, kdp=kd, use_temp=True, band='C',\n", - " T=radar_T)\n", - "fh = np.argmax(scores, axis=0) + 1" + "fh = csu_fhc.csu_fhc_summer(dz=dz, zdr=dr, rho=rh, kdp=kd, use_temp=True, band='C',\n", + " T=radar_T)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "To enable the ability to find out the second-ranked (or third, etc.) species, `csu_fhc_summer` returns the scores for all the different categories, not just the max. So to get the traditional HID category number you have to use `numpy.argmax` as above. The summer HID from CSU returns 10 possible categories:\n", + "To enable the ability to find out the second-ranked (or third, etc.) species, `csu_fhc_summer` returns the category with the maximum score. The summer HID from CSU returns 10 possible categories:\n", "