diff --git a/.gitattributes b/.gitattributes index aafaecf..ac85c03 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ +src/* linguist-vendored + .gitattributes text eol=lf .gitignore text eol=lf Makefile text eol=lf diff --git a/.travis.yml b/.travis.yml index ad7021a..aece02c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,4 @@ language: python -sudo: required -dist: xenial group: travis_latest git: @@ -9,7 +7,6 @@ git: python: - 3.6 -- 3.7 os: - linux diff --git a/README.md b/README.md index 3636d07..4b47a09 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,20 @@ python setup.py build_ext --inplace --compiler=mingw32 ![image](figures/iri2DExample01.png) * Latitude vs Longitude: plot of foF2 a function of geographic latitude and [longitude](scripts/iri2DExample02.py) ![image](figures/iri2DExample02.png) + +### Matlab +Many Python programs--including IRI2016--are readily accessible from Matlab. +Here's what's you'll need: + +1. Python ≥ 3.6. Check which Python version you have simply by typing from Terminal/Command Prompt (not in Matlab) + ```sh + python3 + ``` + If you need to install Python, consider [Miniconda](https://conda.io/miniconda.html) as it's a small install (normally, use the 64-bit version). +2. Matlab ≥ R2017b, as this is when Python 3.6 was enabled. + If you're stuck with older Matlab < R2017b, you can try to [force-enable Python 3.6](https://www.scivision.co/matlab-python-user-module-import/) +3. The function [iri2016.m](iri2016.m) gives some examples of what you can do (run, plot) IRI2016 from Matlab calling Python (and ultimately the original Fortran code). + The functions in that file `xarrayind2vector()` and `xarray2mat()` translate Python's advanced Xarray N-D data structures to Matlab arrays. ## Notes diff --git a/README_matlab.md b/README_matlab.md deleted file mode 100644 index 3c824bb..0000000 --- a/README_matlab.md +++ /dev/null @@ -1,12 +0,0 @@ -Many Python programs--including IRI2016--are readily accessible from Matlab. -Here's what's you'll need: - -1. Python ≥ 3.6. Check which Python version you have simply by typing from Terminal/Command Prompt (not in Matlab) - ```sh - python3 - ``` - If you need to install Python, consider [Miniconda](https://conda.io/miniconda.html) as it's a small install (normally, use the 64-bit version). -2. Matlab ≥ R2017b, as this is when Python 3.6 was enabled. - If you're stuck with older Matlab < R2017b, you can try to [force-enable Python 3.6](https://www.scivision.co/matlab-python-user-module-import/) -3. The function [iri2016.m](iri2016.m) gives some examples of what you can do (run, plot) IRI2016 from Matlab calling Python (and ultimately the original Fortran code). - The functions in that file `xarrayind2vector()` and `xarray2mat()` translate Python's advanced Xarray N-D data structures to Matlab arrays. diff --git a/tests/test_mod.py b/tests/test_mod.py index 898c488..887628a 100755 --- a/tests/test_mod.py +++ b/tests/test_mod.py @@ -29,4 +29,4 @@ def test_altitude_profile(): if __name__ == '__main__': - pytest.main(['-x', __file__]) + pytest.main(['-xv', __file__]) diff --git a/tests/test_scripts.py b/tests/test_scripts.py index b864633..eeb0b06 100644 --- a/tests/test_scripts.py +++ b/tests/test_scripts.py @@ -22,4 +22,4 @@ def test_alt(): if __name__ == '__main__': - pytest.main(['-x', __file__]) + pytest.main(['-xv', __file__])